Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2018-05-29 10:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcin (Old) and /work/SRC/openSUSE:Factory/.gcin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin" Tue May 29 10:43:35 2018 rev:34 rq:612108 version:2.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2017-09-05 15:19:18.458764272 +0200 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2018-05-29 10:43:40.783238626 +0200 @@ -1,0 +2,17 @@ +Fri May 25 02:57:14 UTC 2018 - [email protected] + +- Update to 2.8.6 + + Fixed a selection key problem with ctrl-alt-, + + Use libcurl to upload/download phrases + + Improved pinyin pre-select phrases +- Add libcurl-devel and libXtst-devel to BuildRequires +- Drop upstreamed patch: gcin-reproducible.patch +- Refresh patches + + gcin-dont-copy-gcin-qt5-header.patch + + gcin-improve-build-with-pkgconfig.patch + + gcin-parallel-compiling.patch +- Remove the version check since openSUSE 13.1 is not supported + long ago +- Only build gcin-qt4 for openSUSE + +------------------------------------------------------------------- Old: ---- gcin-2.8.5.tar.xz gcin-reproducible.patch New: ---- gcin-2.8.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcin.spec ++++++ --- /var/tmp/diff_new_pack.UFBfNR/_old 2018-05-29 10:43:42.247184598 +0200 +++ /var/tmp/diff_new_pack.UFBfNR/_new 2018-05-29 10:43:42.251184450 +0200 @@ -1,7 +1,7 @@ # # spec file for package gcin # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ Name: gcin -Version: 2.8.5 +Version: 2.8.6 Release: 0 Summary: Chinese input method server -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/I18n/Chinese Url: http://hyperrate.com/dir.php?eid=67 Source: http://hyperrate.com/gcin-source/%{name}-%{version}.tar.xz @@ -46,35 +46,33 @@ Patch9: gcin-fix-qt5-iid.patch # PATCH-FIX-OPENSUSE [email protected] - Don't copy gcin-qt5.h.in since we already patched gcin-qt5.h Patch10: gcin-dont-copy-gcin-qt5-header.patch -# PATCH-FIX-UPSTREAM bwiedemann@suse - initialize memory to make build reproducible -Patch11: gcin-reproducible.patch BuildRequires: anthy-devel BuildRequires: fdupes BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: libQt5PlatformSupport-devel-static +BuildRequires: libXtst-devel +BuildRequires: libcurl-devel BuildRequires: libjpeg-devel +%if 0%{?is_opensuse} BuildRequires: libqt4-devel +%endif +BuildRequires: libqt5-qtbase-devel BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: xz -%if 0%{?suse_version} > 1310 -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libQt5PlatformSupport-devel-static -BuildRequires: libqt5-qtbase-devel -%endif Requires: %{name}-branding Requires: %{name}-gtk2 = %{version} +Requires: %{name}-gtk3 = %{version} +%if 0%{?is_opensuse} Requires: %{name}-qt4 = %{version} +%endif +Requires: %{name}-qt5 = %{version} Requires: libgcin-im-client1 = %{version} Recommends: libreoffice-gnome Provides: locale(zh_TW;zh_HK;zh_MO) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1130 -BuildRequires: gtk3-devel -Requires: %{name}-gtk3 = %{version} -%endif -%if 0%{?suse_version} >= 1310 -Requires: %{name}-qt5 = %{version} -%endif %description gcin is a Chinese input method server for traditional Chinese. @@ -82,7 +80,7 @@ %package branding-upstream Summary: Upstream branding of gcin -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/I18n/Chinese Requires: gcin = %{version} Supplements: packageand(%{name}:branding-upstream) @@ -94,7 +92,7 @@ %package -n libgcin-im-client1 Summary: Share libraries of gcin -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/Libraries %description -n libgcin-im-client1 @@ -102,7 +100,7 @@ %package gtk2 Summary: Gcin gtk2 immodule -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: %{name}-gtk2-immodule = %{version} @@ -112,9 +110,10 @@ %description gtk2 gcin gtk2 immodule, support gtk2-based applications +%if 0%{?is_opensuse} %package qt4 Summary: Gcin qt4 immodule -License: GPL-2.0 +License: GPL-2.0-only Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: %{name}-qt4-immodule = %{version} @@ -122,11 +121,11 @@ %description qt4 gcin qt4 immodule, support Qt4-based applications +%endif -%if 0%{?suse_version} >= 1310 %package qt5 Summary: Gcin qt5 immodule -License: GPL-2.0 +License: GPL-2.0-only Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: %{name}-qt5-immodule = %{version} @@ -134,11 +133,10 @@ %description qt5 gcin qt5 immodule, support Qt5-based applications -%endif %package anthy Summary: Gcin anthy module -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/I18n/Japanese Requires: %{name} = %{version} Provides: %{name}-anthy-module = %{version} @@ -147,10 +145,9 @@ %description anthy gcin anthy module, try this to input Japanese with libanthy -%if 0%{?suse_version} > 1130 %package gtk3 Summary: Gcin gtk3 immodule -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: %{name}-gtk3-immodule = %{version} @@ -159,7 +156,6 @@ %description gtk3 gcin gtk3 immodule, support gtk3-based applications -%endif %prep %setup -q @@ -172,7 +168,6 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 cp -r %{SOURCE2} . cp -r %{SOURCE3} . @@ -228,7 +223,6 @@ /sbin/ldconfig %{gtk2_immodule_postun} -%if 0%{?suse_version} > 1130 %post gtk3 /sbin/ldconfig #Add icons to gnome3 panel @@ -246,14 +240,13 @@ %postun gtk3 /sbin/ldconfig %{gtk3_immodule_postun} -%endif +%if 0%{?is_opensuse} %post qt4 -p /sbin/ldconfig %postun qt4 -p /sbin/ldconfig -%if 0%{?suse_version} >= 1310 +%endif %post qt5 -p /sbin/ldconfig %postun qt5 -p /sbin/ldconfig -%endif %files -f %{name}.lang %defattr(-,root,root) @@ -283,24 +276,22 @@ %defattr(-,root,root) %{_libdir}/gtk-2.0/2.10.0/immodules/im-gcin.so +%if 0%{?is_opensuse} %files qt4 %defattr(-,root,root) %{_libdir}/qt4/plugins/inputmethods/im-gcin.so +%endif -%if 0%{?suse_version} >= 1310 %files qt5 %defattr(-,root,root) %{_libdir}/qt5/plugins/platforminputcontexts/libgcinplatforminputcontextplugin.so -%endif %files anthy %defattr(-,root,root) %{_libdir}/gcin/anthy-module.so -%if 0%{?suse_version} > 1130 %files gtk3 %defattr(-,root,root) %{_libdir}/gtk-3.0/3.0.0/immodules/im-gcin.so -%endif %changelog ++++++ gcin-2.8.5.tar.xz -> gcin-2.8.6.tar.xz ++++++ ++++ 16024 lines of diff (skipped) ++++++ gcin-dont-copy-gcin-qt5-header.patch ++++++ --- /var/tmp/diff_new_pack.UFBfNR/_old 2018-05-29 10:43:43.763128651 +0200 +++ /var/tmp/diff_new_pack.UFBfNR/_new 2018-05-29 10:43:43.763128651 +0200 @@ -1,16 +1,22 @@ -diff --git a/configure b/configure -index bbe87e9..9a251df 100755 ---- a/configure -+++ b/configure -@@ -336,15 +336,6 @@ if [ $QT5_IM = 'N' ]; then +Index: gcin-2.8.6/configure +=================================================================== +--- gcin-2.8.6.orig/configure ++++ gcin-2.8.6/configure +@@ -336,21 +336,6 @@ if [ $QT5_IM = 'N' ]; then mv gcin.spec gcin.spec.tmp grep -v qt5/plugins/inputmethods gcin.spec.tmp > gcin.spec else - cd qt5-im -- pkg-config --modversion Qt5Core | grep 5.5.1 > /dev/null 2> /dev/null -- if [ $? = 0 ]; then -- echo "You have Qt 5.5.1" +- qtver=`pkg-config --modversion Qt5Core` +- minv=`echo $qtver | cut -d. -f2` +- if [ $minv -ge 5 ]; then +- echo "You have Qt > 5.5.1 " - sed -e "s/FactoryInterface/FactoryInterface.5.1/" < gcin-qt5.h.in > gcin-qt5.h +- if [ $minv -ge 9 ]; then +- cp -a Makefile59 Makefile +- else +- cp -a Makefile55 Makefile +- fi - else - cp gcin-qt5.h.in gcin-qt5.h - fi ++++++ gcin-improve-build-with-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.UFBfNR/_old 2018-05-29 10:43:43.779128060 +0200 +++ /var/tmp/diff_new_pack.UFBfNR/_new 2018-05-29 10:43:43.779128060 +0200 @@ -1,24 +1,26 @@ -Index: gcin-2.8.5/qt5-im/Makefile +Index: gcin-2.8.6/qt5-im/Makefile =================================================================== ---- gcin-2.8.5.orig/qt5-im/Makefile -+++ gcin-2.8.5/qt5-im/Makefile -@@ -3,11 +3,13 @@ QT=qt5 +--- gcin-2.8.6.orig/qt5-im/Makefile ++++ gcin-2.8.6/qt5-im/Makefile +@@ -3,7 +3,7 @@ QT=qt5 QTIM=$(QT)/plugins/platforminputcontexts IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM) --INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport QtDBus --cflags` +-INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui --cflags` +INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` MODVERSION=`pkg-config --modversion Qt5Gui` - QTINC=`pkg-config --variable=includedir Qt5Gui` - INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/QtGui --#INCS+=-I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -+INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/ -+INCS+=-I$(QTINC)/QtGui/ -+INCS+=-I$(QTINC)/QtCore/$(MODVERSION)/ - + INCS+=-I`pkg-config --variable=includedir Qt5Core`/QtCore/$(MODVERSION) + INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui/$(MODVERSION) +@@ -13,7 +13,7 @@ INCS+=-I`pkg-config --variable=includedi CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" OBJS= moc_gcin-qt5.o gcin-qt5.o gcin-imcontext-qt5.o moc_qgcinplatforminputcontext.o -@@ -22,10 +24,10 @@ all: $(GCIN_QT5) + .SUFFIXES: .c .cpp .a .so .E .h +-LDFLAGS=-L../im-client -lgcin-im-client `pkg-config Qt5Core Qt5Gui --libs` ++LDFLAGS=-L../im-client -lgcin-im-client `pkg-config Qt5Core Qt5Gui Qt5DBus --libs` + + GCIN_QT5 = libgcinplatforminputcontextplugin.so + +@@ -23,10 +23,10 @@ all: $(GCIN_QT5) $(CXX) -E $(CFLAGS) $(INCS) $< > $@ moc_gcin-qt5.cpp: gcin-qt5.h ++++++ gcin-parallel-compiling.patch ++++++ --- /var/tmp/diff_new_pack.UFBfNR/_old 2018-05-29 10:43:43.795127469 +0200 +++ /var/tmp/diff_new_pack.UFBfNR/_new 2018-05-29 10:43:43.799127322 +0200 @@ -1,7 +1,7 @@ -Index: gcin-2.8.5/Makefile +Index: gcin-2.8.6/Makefile =================================================================== ---- gcin-2.8.5.orig/Makefile -+++ gcin-2.8.5/Makefile +--- gcin-2.8.6.orig/Makefile ++++ gcin-2.8.6/Makefile @@ -112,19 +112,19 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path) @@ -23,7 +23,7 @@ -ts-edit: $(OBJS_TS_EDIT) +ts-edit: $(OBJS_TS_EDIT) im-client/libgcin-im-client.so - $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client $(LDFLAGS) + $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client -lcurl $(LDFLAGS) ts-contribute: ts-edit @@ -171,16 +171,16 @@ gtab-merge: $(OBJS_gtab_merge)
