[packages/crossmingw32-libglademm] - updated from libglademm.spec, drop .la file; release 2
qboosh
qboosh at pld-linux.org
Fri Sep 6 21:16:04 CEST 2019
commit 621198ec57725e3c2eb26cddecc1670a93f4990f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 6 21:18:54 2019 +0200
- updated from libglademm.spec, drop .la file; release 2
crossmingw32-libglademm.spec | 29 +++++++++++++++++++----------
libglademm-no-get_defs-in-gcc5.patch | 19 +++++++++++++++++++
2 files changed, 38 insertions(+), 10 deletions(-)
---
diff --git a/crossmingw32-libglademm.spec b/crossmingw32-libglademm.spec
index cf53b6b..9bb45f0 100644
--- a/crossmingw32-libglademm.spec
+++ b/crossmingw32-libglademm.spec
@@ -3,18 +3,21 @@ Summary(pl.UTF-8): Interfejsy C++ dla libglade (wersja skrośna MinGW32)
%define realname libglademm
Name: crossmingw32-%{realname}
Version: 2.6.7
-Release: 1
+Release: 2
License: LGPL v2+
Group: Development/Libraries
Source0: http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/%{realname}-%{version}.tar.bz2
# Source0-md5: f9ca5b67f6c551ea98790ab5f21c19d0
-URL: http://www.gtkmm.org/
+Patch0: %{realname}-no-get_defs-in-gcc5.patch
+URL: https://www.gtkmm.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: crossmingw32-gcc-c++
+BuildRequires: crossmingw32-glibmm >= 2.4
BuildRequires: crossmingw32-gtkmm >= 2.12.1
BuildRequires: crossmingw32-libglade2 >= 2.6.2
-BuildRequires: libtool >= 2:1.4d
+BuildRequires: libtool >= 2:1.5
+BuildRequires: m4
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.15
Requires: crossmingw32-gtkmm >= 2.12.1
@@ -34,12 +37,14 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define __cc %{target}-gcc
%define __cxx %{target}-g++
+%define _ssp_cflags %{nil}
%ifnarch %{ix86}
# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
%define optflags -O2
%endif
-# -z options are invalid for mingw linker
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
%define filterout_ld -Wl,-z,.*
+%define filterout_c -f[-a-z0-9=]*
%description
C++ wrappers for libglade (cross mingw32 version).
@@ -75,6 +80,7 @@ Biblioteka DLL libglademm dla Windows.
%prep
%setup -q -n %{realname}-%{version}
+%patch0 -p1
%build
export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -82,6 +88,8 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
%{__aclocal} -I scripts
%{__autoconf}
%{__automake}
+# std-threads require at least WinXP API
+CPPFLAGS="%{rpmcppflags} -DWINVER=0x0501"
%configure \
--target=%{target} \
--host=%{target} \
@@ -96,23 +104,24 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libglademm-*.la
%if 0%{!?debug:1}
%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
%endif
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libglademm-2.4/proc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{devhelp,doc/gnomemm-2.6}
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/libglademm-2.4/proc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{devhelp,doc/gnomemm-2.6}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS
-%{_libdir}/libglademm-2.4.la
+%doc AUTHORS ChangeLog NEWS README
%{_libdir}/libglademm-2.4.dll.a
%{_includedir}/libglademm-2.4
%{_libdir}/libglademm-2.4
@@ -124,4 +133,4 @@ rm -rf $RPM_BUILD_ROOT
%files dll
%defattr(644,root,root,755)
-%{_dlldir}/libglademm*-2.4-*.dll
+%{_dlldir}/libglademm-2.4-1.dll
diff --git a/libglademm-no-get_defs-in-gcc5.patch b/libglademm-no-get_defs-in-gcc5.patch
new file mode 100644
index 0000000..c1ab75b
--- /dev/null
+++ b/libglademm-no-get_defs-in-gcc5.patch
@@ -0,0 +1,19 @@
+--- libglademm-2.6.7/tools/Makefile.am~ 2008-07-01 11:40:39.000000000 +0200
++++ libglademm-2.6.7/tools/Makefile.am 2015-10-05 20:15:57.333539954 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = extra_defs_gen m4
++SUBDIRS = m4
+
+ include $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment
+
+--- libglademm-2.6.7/configure.in~ 2008-09-21 15:23:11.000000000 +0200
++++ libglademm-2.6.7/configure.in 2015-10-05 20:23:08.455086518 +0200
+@@ -143,7 +143,7 @@
+
+ # This macro is installed by glibmm
+ # Doxygen needs the path to the installed perl.
+-GLIBMM_CHECK_PERL([5.6.0])
++# GLIBMM_CHECK_PERL([5.6.0])
+
+ #########################################################################
+ # Dependancy checks
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-libglademm.git/commitdiff/621198ec57725e3c2eb26cddecc1670a93f4990f
More information about the pld-cvs-commit
mailing list