[packages/paragui] - added physfs patch (adjust for physfs 3) - added c++ patch (fix build with C++11 STL, avoid <array
qboosh
qboosh at pld-linux.org
Wed Nov 25 20:45:12 CET 2020
commit 0f671289c910db2f4008a1a807dd8b54e21954a9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Nov 25 20:45:29 2020 +0100
- added physfs patch (adjust for physfs 3)
- added c++ patch (fix build with C++11 STL, avoid <array> header conflict)
- drop .la file
- release 6
paragui-c++.patch | 23 +++++++++++++++++++++++
paragui-physfs.patch | 38 ++++++++++++++++++++++++++++++++++++++
paragui.spec | 25 ++++++++++++++++++-------
3 files changed, 79 insertions(+), 7 deletions(-)
---
diff --git a/paragui.spec b/paragui.spec
index 22a228a..14be385 100644
--- a/paragui.spec
+++ b/paragui.spec
@@ -2,8 +2,8 @@ Summary: ParaGUI - A complete GUI/Windowing system for SDL
Summary(pl.UTF-8): ParaGUI - kompletne środowisko okienkowe dla SDL
Name: paragui
Version: 1.1.8
-Release: 5
-License: LGPL
+Release: 6
+License: LGPL v2+
Group: X11/Libraries
Source0: http://savannah.nongnu.org/download/paragui/%{name}-%{version}.tar.gz
# Source0-md5: 6741b8f704b47b2c6b62fef29759c89c
@@ -15,21 +15,27 @@ Patch4: %{name}-no_cairotest.patch
Patch5: gcc45.patch
Patch6: SDL_Sint16.patch
Patch7: pkg-config-includedir.patch
+Patch8: %{name}-physfs.patch
+Patch9: %{name}-c++.patch
URL: http://savannah.nongnu.org/projects/paragui/
BuildRequires: SDL-devel >= 1.2.6
BuildRequires: SDL_image-devel >= 1.2.0
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: expat-devel
+BuildRequires: expat-devel >= 1.95
BuildRequires: freetype-devel >= 2.1.0
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libsigc++12-devel >= 1.2.5
BuildRequires: libtiff-devel
BuildRequires: libtool >= 2:1.4d
-BuildRequires: physfs-devel
+BuildRequires: physfs-devel >= 3
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.213
+Requires: SDL >= 1.2.6
+Requires: SDL_image >= 1.2.0
+Requires: freetype >= 2.1.0
+Requires: libsigc++12 >= 1.2.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -50,7 +56,7 @@ Requires: libjpeg-devel
Requires: libpng-devel
Requires: libsigc++12-devel >= 1.2.5
Requires: libtiff-devel
-Requires: physfs-devel
+Requires: physfs-devel >= 3
%description devel
Header files for ParaGUI library - a complete GUI/Windowing system for
@@ -83,6 +89,8 @@ Statyczna wersja biblioteki paragui.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%build
%{__libtoolize}
@@ -109,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
pkgconfigdir=%{_pkgconfigdir} \
m4datadir=%{_aclocaldir}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libparagui.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -117,7 +128,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README-ParaGUI.txt AUTHORS TODO README
+# COPYING is license header, not LGPL text
+%doc AUTHORS COPYING README README-ParaGUI.txt TODO
%attr(755,root,root) %{_libdir}/libparagui-*.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libparagui-*.so.8
%{_datadir}/paragui
@@ -126,7 +138,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/paragui-config
%attr(755,root,root) %{_libdir}/libparagui.so
-%{_libdir}/libparagui.la
%{_includedir}/paragui
%{_aclocaldir}/paragui.m4
%{_pkgconfigdir}/paragui.pc
diff --git a/paragui-c++.patch b/paragui-c++.patch
new file mode 100644
index 0000000..0385c4e
--- /dev/null
+++ b/paragui-c++.patch
@@ -0,0 +1,23 @@
+Rename array example, so it won't be included instead of <array> STL header
+--- paragui-1.1.8/test/Makefile.am.orig 2020-11-25 19:39:21.436952328 +0100
++++ paragui-1.1.8/test/Makefile.am 2020-11-25 19:52:10.049455064 +0100
+@@ -11,7 +11,7 @@
+ sigc \
+ widgetlistbug \
+ eventbug \
+- array \
++ array_ \
+ writefile \
+ stress1 \
+ stress2 \
+@@ -46,8 +46,8 @@
+ eventbug_SOURCES = event_bug.cpp
+ eventbug_LDADD = $(LFLAGS)
+
+-array_SOURCES = array.cpp
+-array_LDADD = $(LFLAGS)
++array__SOURCES = array.cpp
++array__LDADD = $(LFLAGS)
+
+ writefile_SOURCES = writefile.cpp
+ writefile_LDADD = $(LFLAGS)
diff --git a/paragui-physfs.patch b/paragui-physfs.patch
new file mode 100644
index 0000000..907e707
--- /dev/null
+++ b/paragui-physfs.patch
@@ -0,0 +1,38 @@
+--- paragui-1.1.8/src/core/physfsrwops.h.orig 2002-06-07 09:29:30.000000000 +0200
++++ paragui-1.1.8/src/core/physfsrwops.h 2020-11-25 19:47:00.974462800 +0100
+@@ -39,7 +39,7 @@
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
+
+ /**
+ * Open a platform-independent filename for writing, and make it accessible
+@@ -51,7 +51,7 @@
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
+
+ /**
+ * Open a platform-independent filename for appending, and make it accessible
+@@ -63,7 +63,7 @@
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
+
+ /**
+ * Make a SDL_RWops from an existing PhysicsFS file handle. You should
+@@ -75,7 +75,7 @@
+ * @return A valid SDL_RWops structure on success, NULL on error. Specifics
+ * of the error can be gleaned from PHYSFS_getLastError().
+ */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
+
+ #ifdef __cplusplus
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/paragui.git/commitdiff/0f671289c910db2f4008a1a807dd8b54e21954a9
More information about the pld-cvs-commit
mailing list