Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2015-06-01 09:52:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcin (Old) and /work/SRC/openSUSE:Factory/.gcin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin" Changes: -------- --- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2015-03-11 09:57:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-06-01 09:52:15.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 27 18:12:40 UTC 2015 - [email protected] + +- Add qt5 immodule support. +- Add qt5gui-header-path-fix.patch to fix build failure. +- Add plasma5-dirty-fix.patch to fix plasma 5 black screen issue + during starting. The reason is unknown so far. + Refer to http://hyperrate.com/thread.php?tid=31194 for more + information. + +------------------------------------------------------------------- New: ---- plasma5-dirty-fix.patch qt5gui-header-path-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcin.spec ++++++ --- /var/tmp/diff_new_pack.QYOl8A/_old 2015-06-01 09:52:16.000000000 +0200 +++ /var/tmp/diff_new_pack.QYOl8A/_new 2015-06-01 09:52:16.000000000 +0200 @@ -40,6 +40,10 @@ Patch5: gcin-keep-debug-symbols.patch # PATCH-FIX-UPSTREAM [email protected] - fix the Makefile dependency for parallel compiling Patch7: gcin-parallel-compiling.patch +# PATCH-FIX-UPSTREAM [email protected] - Fix incorrect search path of Qt5Gui header +Patch8: qt5gui-header-path-fix.patch +# PATCH-FIX-UPSTREAM [email protected] - Plasma 5 starting dirty fix +Patch9: plasma5-dirty-fix.patch BuildRequires: anthy-devel BuildRequires: fdupes BuildRequires: gtk2-devel @@ -48,6 +52,11 @@ 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-immodule = %{version} Requires: %{name}-qt4-immodule = %{version} @@ -96,6 +105,17 @@ %description qt4-immodule gcin qt4 immodule, support Qt4-based applications +%if 0%{?suse_version} > 1310 +%package qt5-immodule +Summary: Gcin qt5 immodule +License: GPL-2.0 +Group: System/I18n/Chinese +Requires: %{name} = %{version} + +%description qt5-immodule +gcin qt5 immodule, support Qt5-based applications +%endif + %package anthy-module Summary: Gcin anthy module License: LGPL-2.1 @@ -125,6 +145,10 @@ %patch4 -p1 %patch5 -p1 %patch7 -p1 +%if 0%{?suse_version} > 1310 +%patch8 -p1 +%patch9 -p1 +%endif cp -r %{SOURCE2} . cp -r %{SOURCE3} . @@ -224,6 +248,12 @@ %defattr(-,root,root) %{_libdir}/qt4/plugins/inputmethods/im-gcin.so +%if 0%{?suse_version} > 1310 +%files qt5-immodule +%defattr(-,root,root) +%{_libdir}/qt5/plugins/platforminputcontexts/libgcinplatforminputcontextplugin.so +%endif + %files anthy-module %defattr(-,root,root) %{_libdir}/gcin/anthy-module.so ++++++ plasma5-dirty-fix.patch ++++++ Index: gcin-2.8.3/qt5-im/gcin-imcontext-qt5.cpp =================================================================== --- gcin-2.8.3.orig/qt5-im/gcin-imcontext-qt5.cpp +++ gcin-2.8.3/qt5-im/gcin-imcontext-qt5.cpp @@ -57,7 +57,6 @@ QGcinPlatformInputContext::QGcinPlatform if(!native) return; Display *display = static_cast<Display *>(native->nativeResourceForWindow("display", NULL)); - printf("display %p\n", display); if (!(gcin_ch = gcin_im_client_open(display))) { perror("cannot open gcin_ch"); ++++++ qt5gui-header-path-fix.patch ++++++ Index: gcin-2.8.3/qt5-im/Makefile =================================================================== --- gcin-2.8.3.orig/qt5-im/Makefile +++ gcin-2.8.3/qt5-im/Makefile @@ -5,7 +5,7 @@ IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARC INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport QtDBus --cflags` # dirty fix for ubuntu 14.04, pkg-config Qt5Gui --cflags return -I/usr/include/qt5/QtGui, missing 5.2.1/QtGui -INCS+=-I /usr/include/qt5/QtGui/5.2.1/QtGui +INCS+=-I `pkg-config --variable=includedir Qt5Gui`/QtGui/`pkg-config --modversion Qt5Gui`/QtGui 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
