From ed3dd04f9723bd612d9299f0967f81a44522c5c9 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 17:40:00 +0100 Subject: [PATCH] automatic version update by autodist [release 1.4.17-1mamba;Sun Jul 03 2016] --- scim-1.4.14-libgtk-3.20.0.patch | 19 +++++++++++++++++++ scim.spec | 28 ++++++++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 scim-1.4.14-libgtk-3.20.0.patch diff --git a/scim-1.4.14-libgtk-3.20.0.patch b/scim-1.4.14-libgtk-3.20.0.patch new file mode 100644 index 0000000..9a9e398 --- /dev/null +++ b/scim-1.4.14-libgtk-3.20.0.patch @@ -0,0 +1,19 @@ +commit 88fbabed7dc236642021f8263f1b25bf67c6806e +Author: Tz-Huan Huang +Date: Fri Oct 24 13:12:32 2014 +0800 + + Disable subdir-objects + +diff --git a/configure.ac b/configure.ac +index 3d89eb1..f3901ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain]) + ########################################################### + + # Init automake stuff +-AM_INIT_AUTOMAKE([subdir-objects]) ++AM_INIT_AUTOMAKE([]) + AM_CONFIG_HEADER([config.h]) + + # Init libtool diff --git a/scim.spec b/scim.spec index 706815a..f7dd76e 100644 --- a/scim.spec +++ b/scim.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f 1-2) %define apiver %{majver}.0 Name: scim -Version: 1.4.14 +Version: 1.4.17 Release: 1mamba Summary: A user friendly, full featured input method user interface and more Group: System/Tools @@ -13,6 +13,7 @@ Source: http://downloads.sourceforge.net/project/scim/scim/%{version}/sci Source1: scim-xprofile Source2: scim-sysconfig Patch0: %{name}-1.4.9-gcc44.patch +Patch1: scim-1.4.14-libgtk-3.20.0.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: bash @@ -63,9 +64,15 @@ This package contains static libraries and header files need for development. %prep %setup -q #%patch0 -p1 +#%patch1 -p1 %build -%configure +./bootstrap +%configure --disable-static \ +%ifarch arm + CXXFLAGS="-DQ_NO_PACKED_POINTERS" +%endif + %make %install @@ -114,19 +121,14 @@ exit 0 %{_libdir}/libscim-gtkutils-1.0.so.* %{_libdir}/libscim-x11utils-1.0.so.* %dir %{_libdir}/scim-1.0/%{apiver} -%{_libdir}/scim-1.0/%{apiver}/*/*.a %{_libdir}/scim-1.0/%{apiver}/*/*.la %{_libdir}/scim-1.0/%{apiver}/*/*.so -%{_libdir}/gtk-2.0/*/immodules/im-scim.a %{_libdir}/gtk-2.0/*/immodules/im-scim.la %{_libdir}/gtk-2.0/*/immodules/im-scim.so -%{_libdir}/gtk-3.0/*/immodules/im-scim.a %{_libdir}/gtk-3.0/*/immodules/im-scim.la %{_libdir}/gtk-3.0/*/immodules/im-scim.so -%{_libdir}/qt3/lib/qt3/plugins/inputmethods/im-scim.a %{_libdir}/qt3/lib/qt3/plugins/inputmethods/im-scim.la %{_libdir}/qt3/lib/qt3/plugins/inputmethods/im-scim.so -%{_libdir}/qt4/plugins/inputmethods/im-scim.a %{_libdir}/qt4/plugins/inputmethods/im-scim.la %{_libdir}/qt4/plugins/inputmethods/im-scim.so %{_libdir}/scim-1.0/scim-helper-launcher @@ -142,19 +144,25 @@ exit 0 %dir %{_includedir}/scim-1.0/gtk %{_includedir}/scim-1.0/*.h %{_includedir}/scim-1.0/x11/*.h -%{_libdir}/libscim-1.0.a %{_libdir}/libscim-1.0.la %{_libdir}/libscim-1.0.so -%{_libdir}/libscim-gtkutils-1.0.a %{_libdir}/libscim-gtkutils-1.0.la %{_libdir}/libscim-gtkutils-1.0.so -%{_libdir}/libscim-x11utils-1.0.a %{_libdir}/libscim-x11utils-1.0.la %{_libdir}/libscim-x11utils-1.0.so %{_libdir}/pkgconfig/*.pc %doc ChangeLog README THANKS TODO %changelog +* Sun Jul 03 2016 Automatic Build System 1.4.17-1mamba +- automatic version update by autodist + +* Fri Mar 25 2016 Silvan Calarco 1.4.15-1mamba +- update to 1.4.15 + +* Fri Mar 25 2016 Silvan Calarco 1.4.14-2mamba +- patch to fix undefined symbol: gdk_x11_drawable_get_xdisplay with recent gtk + * Sat Jun 23 2012 Automatic Build System 1.4.14-1mamba - automatic version update by autodist