[packages/crossfire-client] - updated to 1.70.0

qboosh qboosh at pld-linux.org
Sun Mar 23 20:15:09 CET 2025 

commit a86c45d33fe4556b7a5024e3b31bcd9cf841066c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 23 20:02:17 2025 +0100

    - updated to 1.70.0

 crossfire-client-libpng15.patch | 11 ---------
 crossfire-client-link.patch     | 10 ++++++++
 crossfire-client-lua.patch      | 28 ++++++++++++++++++++++
 crossfire-client.spec           | 51 ++++++++++++++++++++++++-----------------
 4 files changed, 68 insertions(+), 32 deletions(-)
---
diff --git a/crossfire-client.spec b/crossfire-client.spec
index 84ea03e..146c00f 100644
--- a/crossfire-client.spec
+++ b/crossfire-client.spec
@@ -1,32 +1,37 @@
 #
 # Conditional build:
-%bcond_without	images	# don't build images package
+%bcond_without	images	# images package
 #
-%define		sndver	1.60.0
-%define		imgver	1.60.0
+%define		sndver	1.70.0
+%define		imgver	1.70.0
 Summary:	Crossfire client
 Summary(pl.UTF-8):	Klient Crossfire
 Name:		crossfire-client
-Version:	1.60.0
-Release:	3
-License:	GPL
+Version:	1.70.0
+Release:	1
+License:	GPL v2+
 Group:		Applications/Games
-Source0:	http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
-# Source0-md5:	7b22bf93ebb581a5bfd5682df107af76
-Source1:	http://downloads.sourceforge.net/crossfire/%{name}-sounds-%{sndver}.tar.gz
-# Source1-md5:	1985fc187a7624f48a4c4e9d609208ba
-Source2:	http://downloads.sourceforge.net/crossfire/%{name}-images-%{imgver}.tar.gz
-# Source2-md5:	e68b6f32c4d15e65af8535a346efe51a
-Patch0:		%{name}-libpng15.patch
+Source0:	https://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
+# Source0-md5:	657a773fc2223629474c7ec16635d2ef
+Source1:	https://downloads.sourceforge.net/crossfire/%{name}-sounds-%{sndver}.tar.gz
+# Source1-md5:	48133bb0d220d3b7dee60fa218819b08
+Source2:	https://downloads.sourceforge.net/crossfire/%{name}-images-%{imgver}.tar.gz
+# Source2-md5:	5f5dfa091ae1e3a3660c935f36bd8022
+Patch0:		%{name}-lua.patch
+Patch1:		%{name}-link.patch
 URL:		http://crossfire.real-time.com/
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-glut-devel
 BuildRequires:	SDL-devel
 BuildRequires:	SDL_image-devel
-BuildRequires:	autoconf
+BuildRequires:	SDL_mixer-devel
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	gtk+-devel
-BuildRequires:	gtk+2-devel
+BuildRequires:	gtk+2-devel >= 1:2.0.0
+BuildRequires:	libglade2-devel >= 2.0
 BuildRequires:	libtool
+BuildRequires:	lua-devel >= 5.1.0
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-lib-libICE-devel
@@ -87,8 +92,9 @@ Some images extracted from server for Crossfire.
 Trochę obrazków wyciągniętych z serwera do Crossfire.
 
 %prep
-%setup  -q -a1
+%setup -q -a1
 %patch -P0 -p1
+%patch -P1 -p1
 %{__mv} sounds cfsounds
 %if %{with images}
 install -d images
@@ -101,10 +107,12 @@ cd ..
 %{__libtoolize}
 %{__aclocal} -I macros
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	%{?debug:--enable-debug} \
 	--disable-alsa \
+	--enable-sdl_mixer \
 	--with-sound-dir=%{_datadir}/%{name}/sounds
 %{__perl} -i -p -e 's/\#define HAVE_DMALLOC_H 1/\/\* \#undef HAVE_DMALLOC_H \*\//' common/config.h
 %{__make}
@@ -115,9 +123,10 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name}/sounds
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-install cfsounds/*.raw $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/
+
+cp -p cfsounds/*.raw $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds/
 %if %{with images}
-install images/bmaps.client images/crossfire.base images/crossfire.clsc \
+cp -p images/bmaps.client images/crossfire.base images/crossfire.clsc \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}
 %endif
 
@@ -126,9 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README
+%doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/crossfire-client-gtk2
-%{_mandir}/man?/crossfire-client-gtk2.*
+%{_mandir}/man6/crossfire-client-gtk2.6*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/glade-gtk2
 %{_datadir}/%{name}/themes
diff --git a/crossfire-client-libpng15.patch b/crossfire-client-libpng15.patch
deleted file mode 100644
index 51ede08..0000000
--- a/crossfire-client-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crossfire-client-1.60.0/gtk-v2/src/png.c.wiget	2011-01-28 07:17:57.000000000 +0100
-+++ crossfire-client-1.60.0/gtk-v2/src/png.c	2012-02-18 17:52:15.410954778 +0100
-@@ -571,7 +571,7 @@ int png_to_gdkpixmap(GdkWindow *window,
-         png_destroy_read_struct (&png_ptr, NULL, NULL);
-         return PNGX_OUTOFMEM;
-     }
--    if (setjmp (png_ptr->jmpbuf)) {
-+    if (setjmp (png_jmpbuf(png_ptr))) {
-         png_destroy_read_struct (&png_ptr, &info_ptr,NULL);
-         return PNGX_DATA;
-     }
diff --git a/crossfire-client-link.patch b/crossfire-client-link.patch
new file mode 100644
index 0000000..7f1a8f3
--- /dev/null
+++ b/crossfire-client-link.patch
@@ -0,0 +1,10 @@
+--- crossfire-client-1.70.0/sound-src/Makefile.am.orig	2025-03-23 19:09:10.871185111 +0100
++++ crossfire-client-1.70.0/sound-src/Makefile.am	2025-03-23 19:09:13.944501794 +0100
+@@ -61,6 +61,7 @@ cfsndserv_SOURCES = \
+ 	cfsndserv.c
+ 
+ cfsndserv_LDADD = \
++	$(SDL_LIBS) \
+ 	$(SND_LIBS) \
+ 	$(DMALLOC_LIB) \
+ 	$(common_LIBS)
diff --git a/crossfire-client-lua.patch b/crossfire-client-lua.patch
new file mode 100644
index 0000000..4067b28
--- /dev/null
+++ b/crossfire-client-lua.patch
@@ -0,0 +1,28 @@
+--- crossfire-client-1.70.0/configure.ac.orig	2012-03-18 07:18:25.000000000 +0100
++++ crossfire-client-1.70.0/configure.ac	2025-03-23 18:08:13.057667853 +0100
+@@ -195,12 +195,9 @@ AC_CHECK_LIB(m, sqrt)
+ 
+ AC_SEARCH_LIBS(pthread_create, [pthread, pthreadgc, pthreadgc1, pthreadgc2], [AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define to 1 if you have the 'pthread' library.])])
+ 
+-PKG_CHECK_MODULES(LUA, lua >= 5.0.0, [lua_scripting=yes], [lua_scripting=no])
+-if eval "test x$lua_scripting = xyes" ; then
+-    LUA_LIBS=`$PKG_CONFIG --libs lua`
+-fi
++PKG_CHECK_MODULES(LUA, lua5.0 >= 5.0.0, [lua_scripting=yes], [lua_scripting=no])
+ 
+-PKG_CHECK_MODULES(LUA, lua >= 5.1.0, [HAVE_LUA_5_1=yes], [HAVE_LUA_5_1=no])
++PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1.0, [HAVE_LUA_5_1=yes], [HAVE_LUA_5_1=no])
+ if eval "test x$HAVE_LUA_5_1 = xyes" ; then
+     AC_DEFINE(HAVE_LUA_5_1, 1, [Define to use Lua 5.1])
+ fi
+--- crossfire-client-1.70.0/common/Makefile.am.orig	2012-03-18 07:17:45.000000000 +0100
++++ crossfire-client-1.70.0/common/Makefile.am	2025-03-23 18:08:27.534256093 +0100
+@@ -64,7 +64,7 @@ EXTRA_DIST = \
+ 	item-types \
+ 	items.pl
+ 
+-AM_CFLAGS = $(PTHREAD_CFLAGS)
++AM_CFLAGS = $(PTHREAD_CFLAGS) $(LUA_CFLAGS)
+ 
+ proto:
+ 	cproto -DCPROTO -DCFCLIENT $(DEFAULT_INCLUDES) $(AM_CFLAGS) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossfire-client.git/commitdiff/a86c45d33fe4556b7a5024e3b31bcd9cf841066c

More information about the pld-cvs-commit mailing list