Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2015-10-28 17:30:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-25 19:13:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-10-28 17:30:24.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Oct 26 08:07:25 UTC 2015 - [email protected] + +- Add gcin-improve-build-with-pkgconfig.patch + + Improve build with pkgconfig + + Add Qt5Gui private headers at moc period +- Update gcin-fix-qt5-iid.patch + + Use macro instead of string literal, better backward compatibility + for Qt5 < 5.5 + +------------------------------------------------------------------- +Sat Oct 24 06:50:58 UTC 2015 - [email protected] + +- Add gcin-fix-qt5-iid.patch to fix the qt5 iid so that the qt5 + applications can load the gcin immodule (boo#951750) + +------------------------------------------------------------------- New: ---- gcin-fix-qt5-iid.patch gcin-improve-build-with-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcin.spec ++++++ --- /var/tmp/diff_new_pack.SnFw21/_old 2015-10-28 17:30:25.000000000 +0100 +++ /var/tmp/diff_new_pack.SnFw21/_new 2015-10-28 17:30:25.000000000 +0100 @@ -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-OPENSUSE [email protected] - improve build with pkgconfig and add private headers at moc period +Patch8: gcin-improve-build-with-pkgconfig.patch +# PATCH-FIX-UPSTREAM boo#951750 [email protected] - fix the qt5 iid +Patch9: gcin-fix-qt5-iid.patch BuildRequires: anthy-devel BuildRequires: fdupes BuildRequires: gtk2-devel @@ -158,6 +162,8 @@ %patch4 -p1 %patch5 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 cp -r %{SOURCE2} . cp -r %{SOURCE3} . ++++++ gcin-fix-qt5-iid.patch ++++++ >From 7e8585ce969b760f5f0b9395b69ea6ea315036a2 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin <[email protected]> Date: Sat, 24 Oct 2015 14:10:16 +0800 Subject: [PATCH] use the right qt5 iid --- qt5-im/gcin-qt5.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-im/gcin-qt5.h b/qt5-im/gcin-qt5.h index 63aacc0..0f958af 100644 --- a/qt5-im/gcin-qt5.h +++ b/qt5-im/gcin-qt5.h @@ -9,7 +9,7 @@ class QGcinPlatformInputContextPlugin : public QPlatformInputContextPlugin { Q_OBJECT public: - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "gcin.json") + Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "gcin.json") QStringList keys() const; QGcinPlatformInputContext *create(const QString& system, const QStringList& paramList); }; -- 2.6.2 ++++++ gcin-improve-build-with-pkgconfig.patch ++++++ Index: b/qt5-im/Makefile =================================================================== --- a/qt5-im/Makefile +++ b/qt5-im/Makefile @@ -3,11 +3,10 @@ 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 Qt5PlatformSupport Qt5DBus --cflags` # dirty fix for ubuntu 14.04, pkg-config Qt5Gui --cflags return -I/usr/include/qt5/QtGui, missing 5.2.1/QtGui MODVERSION=`pkg-config --modversion Qt5Gui` -INCS+=-I/usr/include/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -INCS+=-I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui +INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui/$(MODVERSION)/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 @@ -22,10 +21,10 @@ all: $(GCIN_QT5) $(CXX) -E $(CFLAGS) $(INCS) $< > $@ moc_gcin-qt5.cpp: gcin-qt5.h - $(QT5_MOC) $< -o $@ + $(QT5_MOC) $(INCS) $< -o $@ moc_qgcinplatforminputcontext.cpp: qgcinplatforminputcontext.h - $(QT5_MOC) $< -o $@ + $(QT5_MOC) $(INCS) $< -o $@ $(GCIN_QT5): $(OBJS) export LD_RUN_PATH=$(gcinlibdir) ;\
