commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2020-06-09 00:02:22
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new.3606 (New)
Package is "gcin"
Tue Jun 9 00:02:22 2020 rev:38 rq:812375 version:2.9.0
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2019-04-18
09:57:33.829384208 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new.3606/gcin.changes 2020-06-09
00:04:53.129337770 +0200
@@ -1,0 +2,8 @@
+Mon Jun 8 02:26:19 UTC 2020 - Gary Ching-Pang Lin
+
+- Update to 2.9.0
+ + Fix gtab word choosing area mismatching
+ + Fix an issue with hsu keyboard
+ + gcc 10 compatibility
+
+---
Old:
gcin-2.8.9.tar.xz
New:
gcin-2.9.0.tar.xz
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.Dx22Bi/_old 2020-06-09 00:04:54.429342382 +0200
+++ /var/tmp/diff_new_pack.Dx22Bi/_new 2020-06-09 00:04:54.429342382 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define build_qt4 0%{?is_opensuse} && 0%{?suse_version} < 1550
Name: gcin
-Version:2.8.9
+Version:2.9.0
Release:0
Summary:Chinese input method server
License:LGPL-2.1-only
Group: System/I18n/Chinese
-Url:http://hyperrate.com/dir.php?eid=67
+URL:http://hyperrate.com/dir.php?eid=67
Source: http://hyperrate.com/gcin-source/%{name}-%{version}.tar.xz
Source1:xim.d-gcin
Source2:gcin-README.suse
++ gcin-2.8.9.tar.xz -> gcin-2.9.0.tar.xz ++
8855 lines of diff (skipped)
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2019-04-18 09:57:32
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new.17052 (New)
Package is "gcin"
Thu Apr 18 09:57:32 2019 rev:37 rq:695394 version:2.8.9
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2019-04-02
09:22:12.368705933 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new.17052/gcin.changes 2019-04-18
09:57:33.829384208 +0200
@@ -1,0 +2,5 @@
+Wed Apr 17 14:53:36 CEST 2019 - ti...@suse.de
+
+- Drop build of gcin-qt4 subpackage on TW due to EOL of Qt4.
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.MJXQbT/_old 2019-04-18 09:57:34.853384846 +0200
+++ /var/tmp/diff_new_pack.MJXQbT/_new 2019-04-18 09:57:34.857384849 +0200
@@ -12,10 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%define build_qt4 0%{?is_opensuse} && 0%{?suse_version} < 1550
+
Name: gcin
Version:2.8.9
Release:0
@@ -57,7 +59,7 @@
BuildRequires: libXtst-devel
BuildRequires: libcurl-devel
BuildRequires: libjpeg-devel
-%if 0%{?is_opensuse}
+%if %{build_qt4}
BuildRequires: libqt4-devel
%endif
BuildRequires: libqt5-qtbase-devel
@@ -67,7 +69,7 @@
Requires: %{name}-branding
Requires: %{name}-gtk2 = %{version}
Requires: %{name}-gtk3 = %{version}
-%if 0%{?is_opensuse}
+%if %{build_qt4}
Requires: %{name}-qt4 = %{version}
%endif
Requires: %{name}-qt5 = %{version}
@@ -112,7 +114,7 @@
%description gtk2
gcin gtk2 immodule, support gtk2-based applications
-%if 0%{?is_opensuse}
+%if %{build_qt4}
%package qt4
Summary:Gcin qt4 immodule
License:GPL-2.0-only
@@ -244,7 +246,7 @@
/sbin/ldconfig
%{gtk3_immodule_postun}
-%if 0%{?is_opensuse}
+%if %{build_qt4}
%post qt4 -p /sbin/ldconfig
%postun qt4 -p /sbin/ldconfig
%endif
@@ -280,7 +282,7 @@
%defattr(-,root,root)
%{_libdir}/gtk-2.0/2.10.0/immodules/im-gcin.so
-%if 0%{?is_opensuse}
+%if %{build_qt4}
%files qt4
%defattr(-,root,root)
%{_libdir}/qt4/plugins/inputmethods/im-gcin.so
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2019-04-02 09:22:07
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new.25356 (New)
Package is "gcin"
Tue Apr 2 09:22:07 2019 rev:36 rq:690307 version:2.8.9
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2018-12-28
12:35:37.927950467 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new.25356/gcin.changes 2019-04-02
09:22:12.368705933 +0200
@@ -1,0 +2,9 @@
+Mon Apr 1 09:37:49 UTC 2019 - Gary Ching-Pang Lin
+
+- Update to 2.8.9
+ + Fix issues with gtk3 and switch to gtk3 by default
+ + Fix an issue with 41 keys bopomofo
+- Add gcin-remove-dead-code.patch to remove the dead code which
+ causes the useless warning
+
+---
Old:
gcin-2.8.8.tar.xz
New:
gcin-2.8.9.tar.xz
gcin-remove-dead-code.patch
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.mRXGXZ/_old 2019-04-02 09:22:13.340706585 +0200
+++ /var/tmp/diff_new_pack.mRXGXZ/_new 2019-04-02 09:22:13.340706585 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,7 +17,7 @@
Name: gcin
-Version:2.8.8
+Version:2.8.9
Release:0
Summary:Chinese input method server
License:LGPL-2.1-only
@@ -46,6 +46,8 @@
Patch9: gcin-fix-qt5-iid.patch
# PATCH-FIX-OPENSUSE g...@suse.com - 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 gcin-remove-dead-code.patch - remove the dead code to
avoid the warning
+Patch11:gcin-remove-dead-code.patch
BuildRequires: anthy-devel
BuildRequires: fdupes
BuildRequires: gtk2-devel
@@ -168,6 +170,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++ gcin-2.8.8.tar.xz -> gcin-2.8.9.tar.xz ++
4428 lines of diff (skipped)
++ gcin-remove-dead-code.patch ++
diff --git a/gcin-setup-pho.cpp b/gcin-setup-pho.cpp
index 1330c94..8ea888c 100644
--- a/gcin-setup-pho.cpp
+++ b/gcin-setup-pho.cpp
@@ -260,17 +260,10 @@ static void cb_save_tsin_phrase_line_color(GtkWidget
*widget, gpointer user_data
static gboolean cb_tsin_phrase_line_color( GtkWidget *widget,
gpointer data )
{
-#if GTK_CHECK_VERSION(3,10,0)
- GtkColorChooser *color_selector = gtk_color_chooser_new("詞音標示詞的底線顏色", NULL);
- gtk_color_chooser_set_rgba (color_selector, &tsin_phrase_line_gcolor);
-#else
GtkWidget *color_selector = gtk_color_selection_dialog_new("詞音標示詞的底線顏色");
gtk_color_selection_set_current_color(
GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_selector))),
&tsin_phrase_line_gcolor);
-#endif
-
-
#if 0
g_signal_connect (GTK_OBJECT (color_selector->ok_button),
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2018-12-28 12:35:33
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new.28833 (New)
Package is "gcin"
Fri Dec 28 12:35:33 2018 rev:35 rq:661560 version:2.8.8
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2018-05-29
10:43:40.783238626 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new.28833/gcin.changes 2018-12-28
12:35:37.927950467 +0100
@@ -1,0 +2,10 @@
+Thu Dec 27 08:42:44 UTC 2018 - Gary Ching-Pang Lin
+
+- Update to 2.8.8
+ + Fix a cursor issue in 26 keys bopomofo
+ + Fix a issue with Hsu's keyboard layout and enabling
+"more UTF-8 characters"
+- Refresh gcin-fix-qt5-iid.patch
+- Use %license for COPYING
+
+---
Old:
gcin-2.8.6.tar.xz
New:
gcin-2.8.8.tar.xz
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.0OdZ6z/_old 2018-12-28 12:35:38.483950078 +0100
+++ /var/tmp/diff_new_pack.0OdZ6z/_new 2018-12-28 12:35:38.483950078 +0100
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: gcin
-Version:2.8.6
+Version:2.8.8
Release:0
Summary:Chinese input method server
License:LGPL-2.1-only
@@ -250,7 +250,8 @@
%files -f %{name}.lang
%defattr(-,root,root)
-%doc README.html Changelog.html COPYING AUTHORS gcin-README.suse
xim.gcin.suse.template
+%license COPYING
+%doc README.html Changelog.html AUTHORS gcin-README.suse xim.gcin.suse.template
%config %{_sysconfdir}/X11/xim.d/
%{_bindir}/*
%{_datadir}/gcin/
++ gcin-2.8.6.tar.xz -> gcin-2.8.8.tar.xz ++
21752 lines of diff (skipped)
++ gcin-fix-qt5-iid.patch ++
--- /var/tmp/diff_new_pack.0OdZ6z/_old 2018-12-28 12:35:39.803949154 +0100
+++ /var/tmp/diff_new_pack.0OdZ6z/_new 2018-12-28 12:35:39.807949152 +0100
@@ -7,19 +7,16 @@
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
+Index: gcin-2.8.8/qt5-im/gcin-qt5.h
+===
+--- gcin-2.8.8.orig/qt5-im/gcin-qt5.h
gcin-2.8.8/qt5-im/gcin-qt5.h
+@@ -9,7 +9,7 @@ class QGcinPlatformInputContextPlugin :
{
Q_OBJECT
public:
--Q_PLUGIN_METADATA(IID
"org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "gcin.json")
+-Q_PLUGIN_METADATA(IID
"org.qt-project.Qt.QPlatformInputContextFactoryInterface.5.1" 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
-
commit gcin for openSUSE:Factory
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.changes2017-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 - g...@suse.com
+
+- 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 g...@suse.com - 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:
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2017-09-05 15:19:05
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin"
Tue Sep 5 15:19:05 2017 rev:33 rq:520955 version:2.8.5
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2017-06-21
13:58:11.434915646 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2017-09-05
15:19:18.458764272 +0200
@@ -1,0 +2,5 @@
+Mon Sep 4 17:10:44 UTC 2017 - bwiedem...@suse.com
+
+- Add gcin-reproducible.patch to initialize memory
+
+---
New:
gcin-reproducible.patch
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.ihBR1Z/_old 2017-09-05 15:19:19.366636658 +0200
+++ /var/tmp/diff_new_pack.ihBR1Z/_new 2017-09-05 15:19:19.370636096 +0200
@@ -46,6 +46,8 @@
Patch9: gcin-fix-qt5-iid.patch
# PATCH-FIX-OPENSUSE g...@suse.com - 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
@@ -170,6 +172,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++ gcin-reproducible.patch ++
Author: Bernhard M. Wiedemann
A PIN_JUYIN struct occupies 10 bytes
(from how compilers do alignment and padding)
but the code only writes 9 of them
leading to random bytes in the output file
which makes builds unreproducible
unless ASLR is disabled in the build system
See https://reproducible-builds.org/ for why this matters.
Index: gcin-2.8.5/pin-juyin.cpp
===
--- gcin-2.8.5.orig/pin-juyin.cpp
+++ gcin-2.8.5/pin-juyin.cpp
@@ -16,6 +16,7 @@ int main()
PIN_JUYIN pinju[1024];
short pinjuN=0;
+ bzero(pinju, sizeof(pinju));
if ((fp=fopen(fnamein, "r"))==NULL)
p_err("cannot open %s", fnamein);
commit gcin for openSUSE:Factory
Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2017-06-21 13:58:08 Comparing /work/SRC/openSUSE:Factory/gcin (Old) and /work/SRC/openSUSE:Factory/.gcin.new (New) Package is "gcin" Wed Jun 21 13:58:08 2017 rev:32 rq:505185 version:2.8.5 Changes: --- /work/SRC/openSUSE:Factory/gcin/gcin.changes2017-03-03 17:54:55.269101950 +0100 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2017-06-21 13:58:11.434915646 +0200 @@ -1,0 +2,5 @@ +Wed Jun 21 04:25:04 UTC 2017 - g...@suse.com + +- Amend gcin-improve-build-with-pkgconfig.patch for Qt 5.9.0 + +--- Other differences: -- ++ gcin-improve-build-with-pkgconfig.patch ++ --- /var/tmp/diff_new_pack.z2aVuU/_old 2017-06-21 13:58:12.598751478 +0200 +++ /var/tmp/diff_new_pack.z2aVuU/_new 2017-06-21 13:58:12.602750914 +0200 @@ -2,7 +2,7 @@ === --- gcin-2.8.5.orig/qt5-im/Makefile +++ gcin-2.8.5/qt5-im/Makefile -@@ -3,11 +3,11 @@ QT=qt5 +@@ -3,11 +3,13 @@ QT=qt5 QTIM=$(QT)/plugins/platforminputcontexts IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM) @@ -12,11 +12,13 @@ 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)/ 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 +22,10 @@ all:$(GCIN_QT5) +@@ -22,10 +24,10 @@ all:$(GCIN_QT5) $(CXX) -E $(CFLAGS) $(INCS) $< > $@ moc_gcin-qt5.cpp: gcin-qt5.h
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2017-03-03 17:54:54
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin"
Fri Mar 3 17:54:54 2017 rev:31 rq:461871 version:2.8.5
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2017-02-24
02:54:27.192418592 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2017-03-03
17:54:55.269101950 +0100
@@ -1,0 +2,6 @@
+Thu Mar 2 10:22:42 UTC 2017 - g...@suse.com
+
+- Add gcin-dont-copy-gcin-qt5-header.patch to avoid overwriting
+ the patched gcin-qt5.h
+
+---
New:
gcin-dont-copy-gcin-qt5-header.patch
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.d0ec57/_old 2017-03-03 17:54:56.000998572 +0100
+++ /var/tmp/diff_new_pack.d0ec57/_new 2017-03-03 17:54:56.000998572 +0100
@@ -44,6 +44,8 @@
Patch8: gcin-improve-build-with-pkgconfig.patch
# PATCH-FIX-UPSTREAM boo#951750 g...@suse.com - fix the qt5 iid
Patch9: gcin-fix-qt5-iid.patch
+# PATCH-FIX-OPENSUSE g...@suse.com - Don't copy gcin-qt5.h.in since we already
patched gcin-qt5.h
+Patch10:gcin-dont-copy-gcin-qt5-header.patch
BuildRequires: anthy-devel
BuildRequires: fdupes
BuildRequires: gtk2-devel
@@ -167,6 +169,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++ gcin-dont-copy-gcin-qt5-header.patch ++
diff --git a/configure b/configure
index bbe87e9..9a251df 100755
--- a/configure
+++ b/configure
@@ -336,15 +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"
-sed -e "s/FactoryInterface/FactoryInterface.5.1/" < gcin-qt5.h.in >
gcin-qt5.h
- else
-cp gcin-qt5.h.in gcin-qt5.h
- fi
- cd ..
for i in /usr/share/qt5/bin/moc /usr/lib/qt5/bin/moc
/usr/lib/x86_64-linux-gnu/qt5/bin/moc /usr/lib/i386-linux-gnu/qt5/bin/moc
/usr/lib64/qt5/bin/moc /usr/bin/moc
do
[ ! -x $i ] && continue
commit gcin for openSUSE:Factory
Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2017-02-24 02:54:25 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.changes2016-10-13 11:32:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2017-02-24 02:54:27.192418592 +0100 @@ -1,0 +2,11 @@ +Thu Feb 9 03:50:40 UTC 2017 - g...@suse.com + +- Update to 2.8.5 + + Fix a typing bug with Hsu layout + + Fix the missing pre-select phrases when using Array input +method +- Refresh patches: + + gcin-improve-build-with-pkgconfig.patch + + gcin-parallel-compiling.patch + +--- Old: gcin-2.8.4.tar.xz New: gcin-2.8.5.tar.xz Other differences: -- ++ gcin.spec ++ --- /var/tmp/diff_new_pack.nTipEK/_old 2017-02-24 02:54:28.280250106 +0100 +++ /var/tmp/diff_new_pack.nTipEK/_new 2017-02-24 02:54:28.280250106 +0100 @@ -1,7 +1,7 @@ # # spec file for package gcin # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,7 +17,7 @@ Name: gcin -Version:2.8.4 +Version:2.8.5 Release:0 Summary:Chinese input method server License:LGPL-2.1 ++ gcin-2.8.4.tar.xz -> gcin-2.8.5.tar.xz ++ 78042 lines of diff (skipped) ++ gcin-improve-build-with-pkgconfig.patch ++ --- /var/tmp/diff_new_pack.nTipEK/_old 2017-02-24 02:54:30.019980669 +0100 +++ /var/tmp/diff_new_pack.nTipEK/_new 2017-02-24 02:54:30.019980669 +0100 @@ -1,19 +1,18 @@ -Index: b/qt5-im/Makefile +Index: gcin-2.8.5/qt5-im/Makefile === a/qt5-im/Makefile -+++ b/qt5-im/Makefile +--- gcin-2.8.5.orig/qt5-im/Makefile gcin-2.8.5/qt5-im/Makefile @@ -3,11 +3,11 @@ 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 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 -+INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui + 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/ 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 ++ gcin-parallel-compiling.patch ++ --- /var/tmp/diff_new_pack.nTipEK/_old 2017-02-24 02:54:30.035978191 +0100 +++ /var/tmp/diff_new_pack.nTipEK/_new 2017-02-24 02:54:30.039977571 +0100 @@ -1,14 +1,14 @@ -diff --git a/Makefile b/Makefile -index e173adc..949268c 100644 a/Makefile -+++ b/Makefile -@@ -108,19 +108,19 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec +Index: gcin-2.8.5/Makefile +=== +--- gcin-2.8.5.orig/Makefile gcin-2.8.5/Makefile +@@ -112,19 +112,19 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path) -gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) +gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) im-client/libgcin-im-client.so - $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) + $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/X11R6/$(LIB) rm -f core.* vgcore.* ln -sf $@ $@.test @@ -26,7 +26,7 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client $(LDFLAGS) ts-contribute:ts-e
commit gcin for openSUSE:Factory
Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2016-10-13 11:32: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.changes2016-09-12 13:25:57.0 +0200 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2016-10-13 11:32:19.0 +0200 @@ -1,0 +2,6 @@ +Wed Oct 12 02:55:52 UTC 2016 - g...@suse.com + +- Amend baselibs.conf to avoid the immodules to require gcin-32bit + (boo#1002566) + +--- Other differences: -- ++ baselibs.conf ++ --- /var/tmp/diff_new_pack.OT5E98/_old 2016-10-13 11:32:21.0 +0200 +++ /var/tmp/diff_new_pack.OT5E98/_new 2016-10-13 11:32:21.0 +0200 @@ -1,18 +1,8 @@ -gcin - requires "gcin-branding" - requires "libgcin-im-client1- = " - requires "gcin-gtk2- = " - requires "gcin-gtk3- = " - requires "gcin-qt4- = " - requires "gcin-qt5- = " - recommends "libreoffice-gnome" - post "/sbin/ldconfig" - postun "/sbin/ldconfig" libgcin-im-client1 post "/sbin/ldconfig" postun "/sbin/ldconfig" gcin-gtk2 - requires "gcin- = " + requires "gcin = " provides "gcin-gtk2-immodule- = " obsoletes "gcin-gtk2-immodule- <= 2.8.4-77.16" post "/sbin/ldconfig" @@ -20,7 +10,7 @@ postun "/sbin/ldconfig" postun "%gtk2_immodule_postun" gcin-gtk3 - requires "gcin- = " + requires "gcin = " provides "gcin-gtk3-immodule- = " obsoletes "gcin-gtk3-immodule- <= 2.8.4-77.16" post "/sbin/ldconfig" @@ -28,14 +18,20 @@ postun "/sbin/ldconfig" postun "%gtk3_immodule_postun" gcin-qt4 - requires "gcin- = " + requires "gcin = " provides "gcin-qt4-immodule- = " obsoletes "gcin-qt4-immodule- <= 2.8.4-77.16" post "/sbin/ldconfig" postun "/sbin/ldconfig" gcin-qt5 - requires "gcin- = " + requires "gcin = " provides "gcin-qt5-immodule- = " obsoletes "gcin-qt5-immodule- <= 2.8.4-77.16" post "/sbin/ldconfig" postun "/sbin/ldconfig" +gcin-anthy + requires "gcin = " + provides "gcin-anthy-immodule- = " + obsoletes "gcin-anthy-immodule- <= 2.8.4-77.16" + post "/sbin/ldconfig" + postun "/sbin/ldconfig"
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2016-09-12 13:25:56
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.changes2016-06-19
10:42:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2016-09-12
13:25:57.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 9 09:48:26 UTC 2016 - g...@suse.com
+
+- Remove libappindicator since KDE already brought system tray icon
+ back.
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.rf4oj2/_old 2016-09-12 13:25:58.0 +0200
+++ /var/tmp/diff_new_pack.rf4oj2/_new 2016-09-12 13:25:58.0 +0200
@@ -57,13 +57,6 @@
BuildRequires: libQt5PlatformSupport-devel-static
BuildRequires: libqt5-qtbase-devel
%endif
-%if 0%{?suse_version} > 1315
-BuildRequires: libappindicator3-devel
-%else
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
-BuildRequires: libappindicator3-devel
-%endif
-%endif
Requires: %{name}-branding
Requires: %{name}-gtk2 = %{version}
Requires: %{name}-qt4 = %{version}
@@ -78,13 +71,6 @@
%if 0%{?suse_version} >= 1310
Requires: %{name}-qt5 = %{version}
%endif
-%if 0%{?suse_version} > 1315
-Requires: libappindicator3-1
-%else
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
-Requires: libappindicator3-1
-%endif
-%endif
%description
gcin is a Chinese input method server for traditional Chinese.
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2016-06-19 10:42: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.changes2015-10-28
17:30:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2016-06-19
10:42:18.0 +0200
@@ -1,0 +2,11 @@
+Wed Jun 8 01:47:55 UTC 2016 - i...@marguerite.su
+
+- fix tumbleweed build
+- refresh patch: gcin-improve-build-with-pkgconfig.patch
+ * Qt5PlatformSupport has gone from Qt 5.6.0
+ * fix include for qinputmethod.h
+- add gcin-qt5 to baselibs.conf
+- rename the sub-packages in openSUSE style
+- split libgcin-im-client1 library
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.HpsxMV/_old 2016-06-19 10:42:20.0 +0200
+++ /var/tmp/diff_new_pack.HpsxMV/_new 2016-06-19 10:42:20.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -65,19 +65,18 @@
%endif
%endif
Requires: %{name}-branding
-Requires: %{name}-gtk2-immodule = %{version}
-Requires: %{name}-qt4-immodule = %{version}
+Requires: %{name}-gtk2 = %{version}
+Requires: %{name}-qt4 = %{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} > 1130
-Requires: %{name}-gtk3-immodule = %{version}
-%endif
-%if 0%{?suse_version} > 1310
-Requires: %{name}-qt5-immodule = %{version}
+%if 0%{?suse_version} >= 1310
+Requires: %{name}-qt5 = %{version}
%endif
%if 0%{?suse_version} > 1315
Requires: libappindicator3-1
@@ -103,54 +102,72 @@
%description branding-upstream
This package provides upstream look and feel for gcin
-%package gtk2-immodule
+%package -n libgcin-im-client1
+Summary:Share libraries of gcin
+License:LGPL-2.1
+Group: System/Libraries
+
+%description -n libgcin-im-client1
+This package provides runtime libraries for gcin.
+
+%package gtk2
Summary:Gcin gtk2 immodule
License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
+Provides: %{name}-gtk2-immodule = %{version}
+Obsoletes: %{name}-gtk2-immodule <= 2.8.4-77.16
%{gtk2_immodule_requires}
-%description gtk2-immodule
+%description gtk2
gcin gtk2 immodule, support gtk2-based applications
-%package qt4-immodule
+%package qt4
Summary:Gcin qt4 immodule
License:GPL-2.0
Group: System/I18n/Chinese
Requires: %{name} = %{version}
+Provides: %{name}-qt4-immodule = %{version}
+Obsoletes: %{name}-qt4-immodule <= 2.8.4-77.16
-%description qt4-immodule
+%description qt4
gcin qt4 immodule, support Qt4-based applications
-%if 0%{?suse_version} > 1310
-%package qt5-immodule
+%if 0%{?suse_version} >= 1310
+%package qt5
Summary:Gcin qt5 immodule
License:GPL-2.0
Group: System/I18n/Chinese
Requires: %{name} = %{version}
+Provides: %{name}-qt5-immodule = %{version}
+Obsoletes: %{name}-qt5-immodule <= 2.8.4-77.16
-%description qt5-immodule
+%description qt5
gcin qt5 immodule, support Qt5-based applications
%endif
-%package anthy-module
+%package anthy
Summary:Gcin anthy module
License:LGPL-2.1
-Group: System/I18n/Chinese
+Group: System/I18n/Japanese
Requires: %{name} = %{version}
+Provides: %{name}-anthy-module = %{version}
+Obsoletes: %{name}-anthy-module <= 2.8.4-77.16
-%description anthy-module
+%description anthy
gcin anthy module, try this to input Japanese with libanthy
%if 0%{?suse_version} > 1130
-%package gtk3-immodule
+%package gtk3
Summary:Gcin gtk3 immodule
License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
+Provides: %{name}-gtk3-immodule = %{version}
+Obsoletes: %{name}-gtk3-immodule <= 2.8.4-77.16
%{gtk3_immodule_requires}
-%description gtk3-immodule
+%description gtk3
gcin gtk3 immodule, support gtk3-based applications
%endif
@@ -203,24 +220,24 @@
%find_lang %{name}
%fdupes %{buildr
commit gcin for openSUSE:Factory
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.changes2015-10-25
19:13:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-10-28
17:30:24.0 +0100
@@ -1,0 +2,16 @@
+Mon Oct 26 08:07:25 UTC 2015 - m...@suse.com
+
+- 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 - g...@suse.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.SnFw21/_new 2015-10-28 17:30:25.0 +0100
@@ -40,6 +40,10 @@
Patch5: gcin-keep-debug-symbols.patch
# PATCH-FIX-UPSTREAM g...@suse.com - fix the Makefile dependency for parallel
compiling
Patch7: gcin-parallel-compiling.patch
+# PATCH-FIX-OPENSUSE m...@suse.com - improve build with pkgconfig and add
private headers at moc period
+Patch8: gcin-improve-build-with-pkgconfig.patch
+# PATCH-FIX-UPSTREAM boo#951750 g...@suse.com - 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
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) ;\
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2015-10-25 19:13:20
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.changes2015-10-06
13:24:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-10-25
19:13:23.0 +0100
@@ -1,0 +2,10 @@
+Fri Oct 23 08:50:18 UTC 2015 - g...@suse.com
+
+- Update to 2.8.4
+ + Switch to appindicator by default
+ + Changes: http://hyperrate.com/gcin-source/Changelog.html
+- Drop upstreamed fixes
+ + qt5gui-header-path-fix.patch
+ + plasma5-dirty-fix.patch
+
+---
Old:
gcin-2.8.3.tar.xz
plasma5-dirty-fix.patch
qt5gui-header-path-fix.patch
New:
gcin-2.8.4.tar.xz
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.K3ZcKY/_old 2015-10-25 19:13:24.0 +0100
+++ /var/tmp/diff_new_pack.K3ZcKY/_new 2015-10-25 19:13:24.0 +0100
@@ -17,7 +17,7 @@
Name: gcin
-Version:2.8.3
+Version:2.8.4
Release:0
Summary:Chinese input method server
License:LGPL-2.1
@@ -40,10 +40,6 @@
Patch5: gcin-keep-debug-symbols.patch
# PATCH-FIX-UPSTREAM g...@suse.com - fix the Makefile dependency for parallel
compiling
Patch7: gcin-parallel-compiling.patch
-# PATCH-FIX-UPSTREAM rama...@gmail.com - Fix incorrect search path of Qt5Gui
header
-Patch8: qt5gui-header-path-fix.patch
-# PATCH-FIX-UPSTREAM rama...@gmail.com - Plasma 5 starting dirty fix
-Patch9: plasma5-dirty-fix.patch
BuildRequires: anthy-devel
BuildRequires: fdupes
BuildRequires: gtk2-devel
@@ -162,10 +158,6 @@
%patch4 -p1
%patch5 -p1
%patch7 -p1
-%if 0%{?suse_version} > 1310
-%patch8 -p1
-%patch9 -p1
-%endif
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++ gcin-2.8.3.tar.xz -> gcin-2.8.4.tar.xz ++
26700 lines of diff (skipped)
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2015-10-06 13:24:59
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.changes2015-09-08
18:05:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-10-06
13:24:59.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 29 06:41:42 UTC 2015 - rama...@gmail.com
+
+- Add gcin-qt5-immodule, libappindicator3-1 as runtime dependencies
+ for Plasma 5 (the program does own binding with dlsym())
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.iszS9C/_old 2015-10-06 13:25:00.0 +0200
+++ /var/tmp/diff_new_pack.iszS9C/_new 2015-10-06 13:25:00.0 +0200
@@ -76,6 +76,16 @@
%if 0%{?suse_version} > 1130
Requires: %{name}-gtk3-immodule = %{version}
%endif
+%if 0%{?suse_version} > 1310
+Requires: %{name}-qt5-immodule = %{version}
+%endif
+%if 0%{?suse_version} > 1315
+Requires: libappindicator3-1
+%else
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
+Requires: libappindicator3-1
+%endif
+%endif
%description
gcin is a Chinese input method server for traditional Chinese.
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2015-09-08 17:44:48
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.changes2015-06-01
09:52:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-09-08
18:05:13.0 +0200
@@ -1,0 +2,6 @@
+Mon Sep 7 08:11:22 UTC 2015 - g...@suse.com
+
+- Add libappindicator3-devel to BuildRequires to enable appindicator
+ support for Plasma 5
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.yhA1Mv/_old 2015-09-08 18:05:23.0 +0200
+++ /var/tmp/diff_new_pack.yhA1Mv/_new 2015-09-08 18:05:23.0 +0200
@@ -57,6 +57,13 @@
BuildRequires: libQt5PlatformSupport-devel-static
BuildRequires: libqt5-qtbase-devel
%endif
+%if 0%{?suse_version} > 1315
+BuildRequires: libappindicator3-devel
+%else
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
+BuildRequires: libappindicator3-devel
+%endif
+%endif
Requires: %{name}-branding
Requires: %{name}-gtk2-immodule = %{version}
Requires: %{name}-qt4-immodule = %{version}
commit gcin for openSUSE:Factory
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.changes2015-03-11
09:57:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-06-01
09:52:15.0 +0200
@@ -1,0 +2,10 @@
+Wed May 27 18:12:40 UTC 2015 - rama...@gmail.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.QYOl8A/_new 2015-06-01 09:52:16.0 +0200
@@ -40,6 +40,10 @@
Patch5: gcin-keep-debug-symbols.patch
# PATCH-FIX-UPSTREAM g...@suse.com - fix the Makefile dependency for parallel
compiling
Patch7: gcin-parallel-compiling.patch
+# PATCH-FIX-UPSTREAM rama...@gmail.com - Fix incorrect search path of Qt5Gui
header
+Patch8: qt5gui-header-path-fix.patch
+# PATCH-FIX-UPSTREAM rama...@gmail.com - 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(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
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2015-03-11 09:57:25
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.changes2014-05-15
19:10:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-03-11
09:57:27.0 +0100
@@ -1,0 +2,11 @@
+Sun Mar 8 04:29:50 UTC 2015 - i...@marguerite.su
+
+- add baselibs.conf as source
+
+---
+Sat Mar 7 15:49:58 UTC 2015 - i...@marguerite.su
+
+- update version 2.8.3
+ * read http://hyperrate.com/gcin-source/Changelog.html
+
+---
Old:
gcin-2.8.2.tar.bz2
New:
gcin-2.8.3.tar.xz
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.Xmoi7F/_old 2015-03-11 09:57:28.0 +0100
+++ /var/tmp/diff_new_pack.Xmoi7F/_new 2015-03-11 09:57:28.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,16 +17,17 @@
Name: gcin
-Version:2.8.2
+Version:2.8.3
Release:0
Summary:Chinese input method server
License:LGPL-2.1
Group: System/I18n/Chinese
Url:http://hyperrate.com/dir.php?eid=67
-Source: gcin-%{version}.tar.bz2
+Source: http://hyperrate.com/gcin-source/%{name}-%{version}.tar.xz
Source1:xim.d-gcin
Source2:gcin-README.suse
Source3:xim.gcin.suse.template
+Source99: baselibs.conf
# PATCH-FIX-UPSTREAM g...@suse.com - just install the _only_ icon to pixmaps
Patch1: icon_path.diff
# PATCH-FIX-UPSTREAM swy...@opensuse.org - fix qt3 detection in configure
@@ -46,18 +47,19 @@
BuildRequires: libqt4-devel
BuildRequires: pkg-config
BuildRequires: update-desktop-files
-%if 0%{?suse_version} > 1130
-BuildRequires: gtk3-devel
-%endif
+BuildRequires: xz
Requires: %{name}-branding
Requires: %{name}-gtk2-immodule = %{version}
Requires: %{name}-qt4-immodule = %{version}
-%if 0%{?suse_version} > 1130
-Requires: %{name}-gtk3-immodule = %{version}
-%endif
Recommends: libreoffice-gnome
Provides: locale(zh_TW;zh_HK;zh_MO)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1130
+BuildRequires: gtk3-devel
+%endif
+%if 0%{?suse_version} > 1130
+Requires: %{name}-gtk3-immodule = %{version}
+%endif
%description
gcin is a Chinese input method server for traditional Chinese.
@@ -69,8 +71,8 @@
Group: System/I18n/Chinese
Requires: gcin = %{version}
Supplements:packageand(%{name}:branding-upstream)
-Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
+Provides: %{name}-branding = %{version}
%description branding-upstream
This package provides upstream look and feel for gcin
@@ -80,7 +82,7 @@
License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
-%gtk2_immodule_requires
+%{gtk2_immodule_requires}
%description gtk2-immodule
gcin gtk2 immodule, support gtk2-based applications
@@ -104,13 +106,12 @@
gcin anthy module, try this to input Japanese with libanthy
%if 0%{?suse_version} > 1130
-
%package gtk3-immodule
Summary:Gcin gtk3 immodule
License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
-%gtk3_immodule_requires
+%{gtk3_immodule_requires}
%description gtk3-immodule
gcin gtk3 immodule, support gtk3-based applications
@@ -141,7 +142,7 @@
make %{?_smp_mflags}
%install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/gcin
@@ -164,23 +165,26 @@
%fdupes %{buildroot}
%post -p /sbin/ldconfig
+
%postun -p /sbin/ldconfig
+
%post anthy-module -p /sbin/ldconfig
+
%postun anthy-module -p /sbin/ldconfig
%post gtk2-immodule
/sbin/ldconfig
-%gtk2_immodule_post
+%{gtk2_immodule_post}
%postun gtk2-immodule
/sbin/ldconfig
-%gtk2_immodule_postun
+%{gtk2_immodule_postun}
%if 0%{?suse_version} > 1130
%post gtk3-immodule
/sbin/ldconfig
#Add icons to gnome3 panel
-TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js"
+TARGET="%{_datadir}/gnome-shell/js/u
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2014-05-15 19:10:52
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.changes2014-01-15
16:24:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2014-05-15
19:10:53.0 +0200
@@ -1,0 +2,13 @@
+Wed May 14 04:07:10 UTC 2014 - g...@suse.com
+
+- Update to 2.8.2
+ + Make the pre-select phrases more precise
+ + The tray icon now can show the status of CAPLOCK
+- refresh patches
+ + icon_path.diff
+ + doc_dir.diff
+ + gcin-keep-debug-symbols.patch
+- drop gcin-bnc858193-fixes-frozen-gnome-shell.patch since upstream
+ fixed the bug
+
+---
Old:
gcin-2.8.1.tar.bz2
gcin-bnc858193-fixes-frozen-gnome-shell.patch
New:
gcin-2.8.2.tar.bz2
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.zVUMLH/_old 2014-05-15 19:10:55.0 +0200
+++ /var/tmp/diff_new_pack.zVUMLH/_new 2014-05-15 19:10:55.0 +0200
@@ -17,7 +17,7 @@
Name: gcin
-Version:2.8.1
+Version:2.8.2
Release:0
Summary:Chinese input method server
License:LGPL-2.1
@@ -37,8 +37,6 @@
Patch4: doc_dir.diff
# PATCH-FIX-UPSTREAM g...@suse.com - keep the debug symbols
Patch5: gcin-keep-debug-symbols.patch
-# PATCH-FIX-UPSTREAM bnc#858193 g...@suse.com - fix the deadlock between
gnome-shell
-Patch6: gcin-bnc858193-fixes-frozen-gnome-shell.patch
# PATCH-FIX-UPSTREAM g...@suse.com - fix the Makefile dependency for parallel
compiling
Patch7: gcin-parallel-compiling.patch
BuildRequires: anthy-devel
@@ -123,9 +121,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4
+%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++ doc_dir.diff ++
--- /var/tmp/diff_new_pack.zVUMLH/_old 2014-05-15 19:10:55.0 +0200
+++ /var/tmp/diff_new_pack.zVUMLH/_new 2014-05-15 19:10:55.0 +0200
@@ -1,7 +1,11 @@
configure.orig 2013-11-28 07:40:47.499934754 +0800
-+++ configure 2013-11-28 07:41:59.696292756 +0800
-@@ -323,11 +323,11 @@
- echo "OPTFLAGS=$OPTFLAGS" >> config.mak
+---
+ configure |8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/configure
b/configure
+@@ -337,11 +337,11 @@ if [ "$USE_INDICATOR" = 'Y' ]; then
+ fi
if [ "$doc_version_dir" = 'N' ]; then
- echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak
++ gcin-2.8.1.tar.bz2 -> gcin-2.8.2.tar.bz2 ++
/work/SRC/openSUSE:Factory/gcin/gcin-2.8.1.tar.bz2
/work/SRC/openSUSE:Factory/.gcin.new/gcin-2.8.2.tar.bz2 differ: char 11, line 1
++ gcin-keep-debug-symbols.patch ++
--- /var/tmp/diff_new_pack.zVUMLH/_old 2014-05-15 19:10:55.0 +0200
+++ /var/tmp/diff_new_pack.zVUMLH/_new 2014-05-15 19:10:55.0 +0200
@@ -1,8 +1,10 @@
-diff --git a/Makefile b/Makefile
-index f6ab8ca..e173adc 100644
+---
+ Makefile |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/Makefile
+++ b/Makefile
-@@ -236,7 +236,7 @@ install:
+@@ -239,7 +239,7 @@ install:
else \
install -d $(DOC_DIR_i); \
install -m 644 README.html Changelog.html $(DOC_DIR_i); \
@@ -10,4 +12,4 @@
+ install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
rm -f $(bindir)/ts-contribute; ln -sf ts-edit
$(bindir)/ts-contribute; \
- fi
+ rm -f $(bindir)/ts-contribute-en; ln -sf ts-edit
$(bindir)/ts-contribute-en; \
++ icon_path.diff ++
--- /var/tmp/diff_new_pack.zVUMLH/_old 2014-05-15 19:10:55.0 +0200
+++ /var/tmp/diff_new_pack.zVUMLH/_new 2014-05-15 19:10:55.0 +0200
@@ -4,11 +4,11 @@
--- a/Makefile
+++ b/Makefile
-@@ -211,7 +211,7 @@ ibin: gcin-nocur
+@@ -212,7 +212,7 @@ ibin: gcin-nocur
rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute
install $(GCIN_SO) $(gcinlibdir)
--icons_apps=$(datadir)/icons/hicolor/64x64/apps
+-icons_apps=$(datadir)/icons/hicolor/64x64/apps
+icons_apps=$(datadir)/pixmaps
install:
install -d $(icons_apps)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2014-01-15 16:24:57
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.changes2013-11-28
16:50:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2014-01-15
16:24:58.0 +0100
@@ -1,0 +2,9 @@
+Mon Jan 13 06:37:22 UTC 2014 - g...@suse.com
+
+- Add gcin-bnc858193-fixes-frozen-gnome-shell.patch to fix the
+ deadlock between gnome-shell (bnc#858193)
+- Add gcin-keep-debug-symbols.patch to keep the debug symbols
+- Add gcin-parallel-compiling.patch to fix the Makefile dependency
+ for parallel compiling
+
+---
New:
gcin-bnc858193-fixes-frozen-gnome-shell.patch
gcin-keep-debug-symbols.patch
gcin-parallel-compiling.patch
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.4dMtC8/_old 2014-01-15 16:24:59.0 +0100
+++ /var/tmp/diff_new_pack.4dMtC8/_new 2014-01-15 16:24:59.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,12 @@
Patch3: gcin-2.8.1-gtk_immodules_path.patch
# PATCH-FIX-UPSTREAM swy...@opensuse.org - fix doc path (used to open doc from
gcin-tools)
Patch4: doc_dir.diff
+# PATCH-FIX-UPSTREAM g...@suse.com - keep the debug symbols
+Patch5: gcin-keep-debug-symbols.patch
+# PATCH-FIX-UPSTREAM bnc#858193 g...@suse.com - fix the deadlock between
gnome-shell
+Patch6: gcin-bnc858193-fixes-frozen-gnome-shell.patch
+# PATCH-FIX-UPSTREAM g...@suse.com - fix the Makefile dependency for parallel
compiling
+Patch7: gcin-parallel-compiling.patch
BuildRequires: anthy-devel
BuildRequires: fdupes
BuildRequires: gtk2-devel
@@ -118,6 +124,9 @@
%patch2 -p1
%patch3 -p1
%patch4
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++ gcin-bnc858193-fixes-frozen-gnome-shell.patch ++
diff --git a/eve.cpp b/eve.cpp
index 7a37666..510bd2c 100755
--- a/eve.cpp
+++ b/eve.cpp
@@ -1486,24 +1486,6 @@ int xim_ForwardEventHandler(IMForwardEventStruct
*call_data)
void gcin_reset();
-#if UNIX
-gboolean is_tip_window(Window inpwin)
-{
- // Dirty fix for chrome, doesn't work well.
- if (!inpwin)
- return FALSE;
- XWindowAttributes att;
- XGetWindowAttributes(dpy, inpwin, &att);
-
- dbg("%d, %d\n", att.width, att.height);
-// chrome window is override_redirect
-// if (att.override_redirect)
-// return;
-
- return att.override_redirect && att.height < 24;
-}
-#endif
-
int gcin_FocusIn(ClientState *cs)
{
dbg("gcin_FocusIn %p\n", cs);
@@ -1517,11 +1499,7 @@ int gcin_FocusIn(ClientState *cs)
Window win = cs->client_win;
if (!win)
return FALSE;
-#if UNIX
- if (is_tip_window(win)) {
- return FALSE;
- }
-#endif
+
reset_current_in_win_xy();
if (cs) {
@@ -1615,13 +1593,6 @@ int gcin_FocusOut(ClientState *cs)
if (!cs->client_win)
return FALSE;
-#if UNIX
- if (is_tip_window(cs->client_win)) {
- return FALSE;
- }
-#endif
-
-
if (t - last_focus_out_time < 10) {
last_focus_out_time = t;
return FALSE;
++ gcin-keep-debug-symbols.patch ++
diff --git a/Makefile b/Makefile
index f6ab8ca..e173adc 100644
--- a/Makefile
+++ b/Makefile
@@ -236,7 +236,7 @@ install:
else \
install -d $(DOC_DIR_i); \
install -m 644 README.html Changelog.html $(DOC_DIR_i); \
- install -s $(PROGS) $(bindir); \
+ install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
rm -f $(bindir)/ts-contribute; ln -sf ts-edit
$(bindir)/ts-contribute; \
fi
++ gcin-parallel-compiling.patch ++
diff --git a/Makefile b/Makefile
index e173adc..949268c 100644
--- a/Makefile
+++ b/Makefile
@@ -108,19 +108,19 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA)
$(PROGS_CV) gcin.spec gcin-fedora.spec
#gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
-gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
+gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) im-client/libgcin-im-client.so
$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB)
$(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.* vgcore.*
ln -sf $@ $@.test
-gcin-nocur: $(OBJS) $(IMdk
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-11-28 16:50:53
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.changes2013-11-24
18:11:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-11-28
16:50:53.0 +0100
@@ -1,0 +2,6 @@
+Wed Nov 27 23:47:36 UTC 2013 - swy...@gmail.com
+
+- add doc_dir.diff patch to fix doc path
+ this path is used to open doc from gcin-tools
+
+---
New:
doc_dir.diff
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.DEvfZ9/_old 2013-11-28 16:50:54.0 +0100
+++ /var/tmp/diff_new_pack.DEvfZ9/_new 2013-11-28 16:50:54.0 +0100
@@ -33,6 +33,8 @@
Patch2: gcin-libdir.patch
# PATCH-FIX-UPSTREAM marguer...@opensuse.org - fix gtk2/3 immodules install
path
Patch3: gcin-2.8.1-gtk_immodules_path.patch
+# PATCH-FIX-UPSTREAM swy...@opensuse.org - fix doc path (used to open doc from
gcin-tools)
+Patch4: doc_dir.diff
BuildRequires: anthy-devel
BuildRequires: fdupes
BuildRequires: gtk2-devel
@@ -115,7 +117,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-
+%patch4
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++ doc_dir.diff ++
--- configure.orig 2013-11-28 07:40:47.499934754 +0800
+++ configure 2013-11-28 07:41:59.696292756 +0800
@@ -323,11 +323,11 @@
echo "OPTFLAGS=$OPTFLAGS" >> config.mak
if [ "$doc_version_dir" = 'N' ]; then
- echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak
- echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak
+ echo "DOC_DIR=\$(datadir_r)/doc/packages/gcin" >> config.mak
+ echo "DOC_DIR_i=\$(datadir)/doc/packages/gcin" >> config.mak
else
- echo "DOC_DIR=\$(datadir_r)/doc/gcin-$GCIN_VERSION" >> config.mak
- echo "DOC_DIR_i=\$(datadir)/doc/gcin-$GCIN_VERSION" >> config.mak
+ echo "DOC_DIR=\$(datadir_r)/doc/packages/gcin-$GCIN_VERSION" >> config.mak
+ echo "DOC_DIR_i=\$(datadir)/doc/packages/gcin-$GCIN_VERSION" >> config.mak
fi
echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-11-24 18:11:30
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.changes2013-11-18
10:52:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-11-24
18:11:31.0 +0100
@@ -1,0 +2,11 @@
+Sun Nov 24 00:26:33 UTC 2013 - swy...@gmail.com
+
+- modify baselibs.conf
+
+---
+Sat Nov 23 14:42:22 UTC 2013 - swy...@gmail.com
+
+- fix gcin can't on_the_spot, because libreoffice-gnome's lib name changed
+ remove the test to force OOO_FORCE_DESKTOP=gnome
+
+---
Other differences:
--
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.e6MPls/_old 2013-11-24 18:11:32.0 +0100
+++ /var/tmp/diff_new_pack.e6MPls/_new 2013-11-24 18:11:32.0 +0100
@@ -9,31 +9,15 @@
gcin-gtk2-immodule
requires "gcin- = "
post "/sbin/ldconfig"
-post "%if "%_lib" == "lib64""
-post "%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
-post "%else"
-post "%{_bindir}/gtk-query-immodules-2.0 --update-cache"
-post "%endif"
+post "%gtk2_immodule_post"
postun "/sbin/ldconfig"
-postun "%if "%_lib" == "lib64""
-postun "%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
-postun "%else"
-postun "%{_bindir}/gtk-query-immodules-2.0 --update-cache"
-postun "%endif"
+postun "%gtk2_immodule_postun"
gcin-gtk3-immodule
requires "gcin- = "
post "/sbin/ldconfig"
-post "%if "%_lib" == "lib64""
-post "%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
-post "%else"
-post "%{_bindir}/gtk-query-immodules-3.0 --update-cache"
-post "%endif"
+post "%gtk3_immodule_post"
postun "/sbin/ldconfig"
-postun "%if "%_lib" == "lib64""
-postun "%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
-postun "%else"
-postun "%{_bindir}/gtk-query-immodules-3.0 --update-cache"
-postun "%endif"
+postun "%gtk3_immodule_postun"
gcin-qt4-immodule
requires "gcin- = "
post "/sbin/ldconfig"
++ xim.d-gcin ++
--- /var/tmp/diff_new_pack.e6MPls/_old 2013-11-24 18:11:32.0 +0100
+++ /var/tmp/diff_new_pack.e6MPls/_new 2013-11-24 18:11:32.0 +0100
@@ -3,11 +3,9 @@
return 1
fi
-# If libreoffice-gnome was installed, Force OOo to use gtk-immodule
+# Force OOo to use gtk-immodule
# so gcin can use on_the_spot mod to insert characters
- if [ -f /usr/lib/libreoffice/program/gconfbe1.uno.so ] || [ -f
/usr/lib64/libreoffice/program/gconfbe1.uno.so ] ; then
export OOO_FORCE_DESKTOP=gnome
- fi
# Environment Variables
export LC_CTYPE=$LANG
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-11-18 10:52:56
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.changes2013-10-04
15:58:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-11-18
10:52:57.0 +0100
@@ -1,0 +2,6 @@
+Mon Nov 18 02:31:47 UTC 2013 - swy...@gmail.com
+
+- test remove gtk2(3) scriptlets in spec file, use macro (same as fcitx)
+ instead
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.FFuym3/_old 2013-11-18 10:52:58.0 +0100
+++ /var/tmp/diff_new_pack.FFuym3/_new 2013-11-18 10:52:58.0 +0100
@@ -70,7 +70,7 @@
This package provides upstream look and feel for gcin
%package gtk2-immodule
-Summary:Gcin gtk3 immodule
+Summary:Gcin gtk2 immodule
License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
@@ -155,23 +155,6 @@
%find_lang %{name}
%fdupes %{buildroot}
-# Convenient definition for the scriplets
-%if "%{_lib}" == "lib64"
-%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0-64
-%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} >
%{_sysconfdir}/gtk-2.0/gtk64.immodules
-%else
-%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0
-%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} >
%{_sysconfdir}/gtk-2.0/gtk.immodules
-%endif
-
-# Convenient definition for the scriplets
-%if "%{_lib}" == "lib64"
-%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64
-%else
-%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0
-%endif
-%define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules}
--update-cache
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post anthy-module -p /sbin/ldconfig
@@ -179,11 +162,11 @@
%post gtk2-immodule
/sbin/ldconfig
-%{_gtk2_query_immodules_update_cache}
+%gtk2_immodule_post
%postun gtk2-immodule
/sbin/ldconfig
-%{_gtk2_query_immodules_update_cache}
+%gtk2_immodule_postun
%if 0%{?suse_version} > 1130
%post gtk3-immodule
@@ -198,11 +181,11 @@
fi
fi
-%{_gtk3_query_immodules_update_cache}
+%gtk3_immodule_post
%postun gtk3-immodule
/sbin/ldconfig
-%{_gtk3_query_immodules_update_cache}
+%gtk3_immodule_postun
%endif
%files -f %{name}.lang
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-10-04 15:58:10
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.changes2013-07-29
17:41:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-10-04
15:58:11.0 +0200
@@ -1,0 +2,17 @@
+Thu Oct 3 07:24:22 UTC 2013 - i...@marguerite.su
+
+- remove gcin_scripts_modify-XIM_103.diff
+ * qt3 is long dead, just drop scripts/modify-XIM which was also
+targeting for Mandriva/Fedora
+- split gcin-gtk2-immodule, it's better
+- fix xim.d-gcin
+ * can't input in firefox/chrome, have to export GTK3_IM_MODULE
+ * /usr/bin is already in $PATH. no /usr/X11R6/bin at all.
+ * remove skim part, as it's dropped from openSUSE, newer scim
+don't need skim to support kde4/kde3.
+ * remove the useless LC_TYPE test, we're installed, we just keep
+every locale work, so just export'em.
+- add patch: gcin-2.8.1-gtk_immodules_path.patch
+ * fix gtk2/3 immodule install path
+
+---
Old:
gcin_scripts_modify-XIM_103.diff
New:
gcin-2.8.1-gtk_immodules_path.patch
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.I5f3dB/_old 2013-10-04 15:58:13.0 +0200
+++ /var/tmp/diff_new_pack.I5f3dB/_new 2013-10-04 15:58:13.0 +0200
@@ -16,41 +16,42 @@
#
-Summary:Chinese input method server
-License:LGPL-2.1
-Group: System/I18n/Chinese
Name: gcin
Version:2.8.1
Release:0
+Summary:Chinese input method server
+License:LGPL-2.1
+Group: System/I18n/Chinese
Url:http://hyperrate.com/dir.php?eid=67
-Source0:gcin-%{version}.tar.bz2
+Source: gcin-%{version}.tar.bz2
Source1:xim.d-gcin
Source2:gcin-README.suse
Source3:xim.gcin.suse.template
-Patch1: gcin_scripts_modify-XIM_103.diff
-Patch2: icon_path.diff
-Patch3: gcin-libdir.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
+# PATCH-FIX-UPSTREAM g...@suse.com - just install the _only_ icon to pixmaps
+Patch1: icon_path.diff
+# PATCH-FIX-UPSTREAM swy...@opensuse.org - fix qt3 detection in configure
+Patch2: gcin-libdir.patch
+# PATCH-FIX-UPSTREAM marguer...@opensuse.org - fix gtk2/3 immodules install
path
+Patch3: gcin-2.8.1-gtk_immodules_path.patch
BuildRequires: anthy-devel
+BuildRequires: fdupes
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
BuildRequires: libqt4-devel
BuildRequires: pkg-config
BuildRequires: update-desktop-files
-%gtk2_immodule_requires
-%if %suse_version > 1130
+%if 0%{?suse_version} > 1130
BuildRequires: gtk3-devel
%endif
Requires: %{name}-branding
-Requires: %{name}-qt4-immodule
-Requires: gtk2 >= 2.2.4
-%if %suse_version > 1130
-Requires: %{name}-gtk3-immodule
+Requires: %{name}-gtk2-immodule = %{version}
+Requires: %{name}-qt4-immodule = %{version}
+%if 0%{?suse_version} > 1130
+Requires: %{name}-gtk3-immodule = %{version}
%endif
-PreReq: /usr/bin/touch
-Provides: locale(zh_TW;zh_HK;zh_MO)
Recommends: libreoffice-gnome
+Provides: locale(zh_TW;zh_HK;zh_MO)
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
gcin is a Chinese input method server for traditional Chinese.
@@ -60,14 +61,24 @@
Summary:Upstream branding of gcin
License:LGPL-2.1
Group: System/I18n/Chinese
+Requires: gcin = %{version}
Supplements:packageand(%{name}:branding-upstream)
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
-Requires: gcin
%description branding-upstream
This package provides upstream look and feel for gcin
+%package gtk2-immodule
+Summary:Gcin gtk3 immodule
+License:LGPL-2.1
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}
+%gtk2_immodule_requires
+
+%description gtk2-immodule
+gcin gtk2 immodule, support gtk2-based applications
+
%package qt4-immodule
Summary:Gcin qt4 immodule
License:GPL-2.0
@@ -86,7 +97,7 @@
%description anthy-module
gcin anthy module, try this to input Japanese with libanthy
-%if %suse_version > 1130
+%if 0%{?suse_version} > 1130
%package gtk3-immodule
Summary:Gcin gtk3 immodule
@@ -100,32 +111,39 @@
%endif
%prep
-%setup
-%patch1
+%setup -q
+%patch1 -p1
%patch2 -p1
%patch3 -p1
+cp -r %{SOURCE2} .
+cp -r %{SOURCE3} .
+
+# scripts/modify-XIM is mainly for Fed
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-07-29 17:41:18
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.changes2013-07-18
16:06:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-07-29
17:41:21.0 +0200
@@ -1,0 +2,14 @@
+Fri Jul 26 08:43:14 UTC 2013 - g...@suse.com
+
+- Update to 2.8.1
+ + Fix crash caused by keypad keys when there are words in the
+editing area.
+ + Fix a file name issue when exporting the thesaurus
+ + Clear unfinished changjie codes after switching to English mode
+ + Support new input method: Array 10 keys
+- Refresh icon_path.diff
+ + Although gcin icon is installed to hicolor/64x64 by default,
+the icon size is actually 64x51, not suitable for a fixed-size
+dir.
+
+---
Old:
gcin-2.8.0.tar.bz2
New:
gcin-2.8.1.tar.bz2
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.ab6OIm/_old 2013-07-29 17:41:22.0 +0200
+++ /var/tmp/diff_new_pack.ab6OIm/_new 2013-07-29 17:41:22.0 +0200
@@ -20,7 +20,7 @@
License:LGPL-2.1
Group: System/I18n/Chinese
Name: gcin
-Version:2.8.0
+Version:2.8.1
Release:0
Url:http://hyperrate.com/dir.php?eid=67
Source0:gcin-%{version}.tar.bz2
@@ -102,7 +102,7 @@
%prep
%setup
%patch1
-%patch2
+%patch2 -p1
%patch3 -p1
%build
++ gcin-2.8.0.tar.bz2 -> gcin-2.8.1.tar.bz2 ++
/work/SRC/openSUSE:Factory/gcin/gcin-2.8.0.tar.bz2
/work/SRC/openSUSE:Factory/.gcin.new/gcin-2.8.1.tar.bz2 differ: char 11, line 1
++ icon_path.diff ++
--- /var/tmp/diff_new_pack.ab6OIm/_old 2013-07-29 17:41:22.0 +0200
+++ /var/tmp/diff_new_pack.ab6OIm/_new 2013-07-29 17:41:22.0 +0200
@@ -1,13 +1,15 @@
Makefile-orig 2009-12-12 23:19:23.0 +0800
-+++ Makefile 2009-12-12 23:39:23.0 +0800
-@@ -243,8 +243,8 @@
+---
+ Makefile |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile
b/Makefile
+@@ -211,7 +211,7 @@ ibin: gcin-nocur
+ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute
install $(GCIN_SO) $(gcinlibdir)
+-icons_apps=$(datadir)/icons/hicolor/64x64/apps
++icons_apps=$(datadir)/pixmaps
install:
-- install -d $(datadir)/icons
-- install -m 644 gcin.png $(datadir)/icons
-+ install -d $(datadir)/pixmaps
-+ install -m 644 gcin.png $(datadir)/pixmaps
- $(MAKE) -C icons install
- install -d $(gcinlibdir)
- install $(GCIN_SO) $(gcinlibdir)
+ install -d $(icons_apps)
+ install -m 644 gcin.png $(icons_apps)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-07-18 16:06:52
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.changes2013-02-28
07:08:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-07-18
16:06:54.0 +0200
@@ -1,0 +2,5 @@
+Wed Jul 17 08:21:47 UTC 2013 - co...@suse.com
+
+- remove qt3 support, long dead
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.aGFGNO/_old 2013-07-18 16:06:54.0 +0200
+++ /var/tmp/diff_new_pack.aGFGNO/_new 2013-07-18 16:06:54.0 +0200
@@ -37,7 +37,6 @@
BuildRequires: libjpeg-devel
BuildRequires: libqt4-devel
BuildRequires: pkg-config
-BuildRequires: qt3-devel
BuildRequires: update-desktop-files
%gtk2_immodule_requires
%if %suse_version > 1130
@@ -69,15 +68,6 @@
%description branding-upstream
This package provides upstream look and feel for gcin
-%package qt3-immodule
-Summary:Gcin qt3 immodule
-License:GPL-2.0
-Group: System/I18n/Chinese
-Requires: %{name} = %{version}
-
-%description qt3-immodule
-gcin qt3 immodule, support Qt3-based applications
-
%package qt4-immodule
Summary:Gcin qt4 immodule
License:GPL-2.0
@@ -116,7 +106,10 @@
%patch3 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y --use_qt3=Y \
+%if %_lib == lib64
+sed -e "s,^LIB='lib',LIB=lib64," -i configure
+%endif
+CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y \
--use_anthy=Y --doc_version_dir=N
make
@@ -265,10 +258,6 @@
%{_datadir}/icons/gcin/tsin.png
%{_datadir}/icons/gcin/vocabulary.png
-%files qt3-immodule
-%defattr(-,root,root)
-%{_libdir}/qt3/plugins/inputmethods/*
-
%files qt4-immodule
%defattr(-,root,root)
%{_libdir}/qt4/plugins/inputmethods/*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-02-28 07:08:03
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2013-01-22
22:21:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-02-28
07:08:04.0 +0100
@@ -1,0 +2,15 @@
+Fri Feb 22 07:49:23 UTC 2013 - swy...@gmail.com
+
+- remove patch configure146p12.diff, use --doc_version_dir=N instead
+
+---
+Fri Feb 22 03:26:30 UTC 2013 - swy...@gmail.com
+
+- Update to 2.8.0
+- fix gtk_show_uri in Ubuntu, gcin will now open uri with gcin's own
+ script
+- fix pop-up status position
+- Tray/OSD icon of Capslock status
+- more bug fix and new features
+
+---
Old:
configure146p12.diff
gcin-2.7.9.tar.bz2
New:
gcin-2.8.0.tar.bz2
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.1itXaq/_old 2013-02-28 07:08:06.0 +0100
+++ /var/tmp/diff_new_pack.1itXaq/_new 2013-02-28 07:08:06.0 +0100
@@ -20,14 +20,13 @@
License:LGPL-2.1
Group: System/I18n/Chinese
Name: gcin
-Version:2.7.9
+Version:2.8.0
Release:0
Url:http://hyperrate.com/dir.php?eid=67
Source0:gcin-%{version}.tar.bz2
Source1:xim.d-gcin
Source2:gcin-README.suse
Source3:xim.gcin.suse.template
-Patch0: configure146p12.diff
Patch1: gcin_scripts_modify-XIM_103.diff
Patch2: icon_path.diff
Patch3: gcin-libdir.patch
@@ -112,14 +111,14 @@
%prep
%setup
-%patch0
%patch1
%patch2
%patch3 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y --use_qt3=Y \
---use_anthy=Y
+--use_anthy=Y --doc_version_dir=N
+
make
%install
@@ -129,6 +128,8 @@
DESTDIR=$RPM_BUILD_ROOT make install LIB=%_lib
+rm -rf $RPM_BUILD_ROOT/usr/share/doc
+
%suse_update_desktop_file -r -G "Set Up your inputmethod" gcin-tools Settings
System SystemSetup
PRIORITY=30
pushd $RPM_BUILD_ROOT/etc/X11/xim.d/
++ gcin-2.7.9.tar.bz2 -> gcin-2.8.0.tar.bz2 ++
/work/SRC/openSUSE:Factory/gcin/gcin-2.7.9.tar.bz2
/work/SRC/openSUSE:Factory/.gcin.new/gcin-2.8.0.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2013-01-22 22:21:46
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2012-12-07
14:08:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-01-22
22:21:48.0 +0100
@@ -1,0 +2,16 @@
+Sun Jan 20 06:00:11 UTC 2013 - swy...@gmail.com
+
+- Add libreoffice-gnome dependency as Recommends,
+ so you will not install the whole office suite for gcin.
+- Remove Requires gcin-anthy-module,
+ most of the user don't need to input Japanese characters.
+- modify xim.d-gcin to test if libreoffice-gnome was installed
+- add a section about libreoffice-kde4's problem and workaround
+ in gcin-README.suse
+
+---
+Fri Jan 18 01:40:50 UTC 2013 - swy...@gmail.com
+
+- test remove libreoffice-gnome dependency
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.YcE5sl/_old 2013-01-22 22:21:49.0 +0100
+++ /var/tmp/diff_new_pack.YcE5sl/_new 2013-01-22 22:21:49.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -49,11 +49,10 @@
Requires: gtk2 >= 2.2.4
%if %suse_version > 1130
Requires: %{name}-gtk3-immodule
-Requires: libreoffice-gnome
%endif
-Requires: %{name}-anthy-module
PreReq: /usr/bin/touch
Provides: locale(zh_TW;zh_HK;zh_MO)
+Recommends: libreoffice-gnome
%description
gcin is a Chinese input method server for traditional Chinese.
++ gcin-README.suse ++
--- /var/tmp/diff_new_pack.YcE5sl/_old 2013-01-22 22:21:49.0 +0100
+++ /var/tmp/diff_new_pack.YcE5sl/_new 2013-01-22 22:21:49.0 +0100
@@ -1,5 +1,31 @@
gcin README for openSUSE
-How to start using gcin
+
+*On the spot mod for libreoffice (OpenOffice)
+
+English:
+
+On the spot and over the spot mod are not working with libreoffice-kde4
+You can still input characters with gcin, but your input_windows will
+fixed in the upper-left corner.
+If you are suffered with this problem, upstream suggested a workaround:
+You can install libreoffice-gnome package even if you are using a DE other
than gnome.
+Re-login your DE, gcin start script will auto-detect your system, and add
+OOO_FORCE_DESKTOP=gnome
+env variable.
+Libreoffice will work just fine for you.
+
+中文：
+On the spot 和 Over the spot 模式無法在 libreoffice-kde4 環境中使用，
+您仍可以用 gcin 輸入字元，但是您的輸入視窗會固定在左上角。
+如果您對這個問題覺得困擾，上游建議以下的暫時解決方案：
+您可以安裝 libreoffice-gnome 套件，即使您不是使用 gnome，
+重新登入您的桌面， gcin 的啟動程序將加入
+OOO_FORCE_DESKTOP=gnome
+的環境變數。
+Libreoffice 就會正常運作了。
+
+
+*How to start using gcin
English:
++ xim.d-gcin ++
--- /var/tmp/diff_new_pack.YcE5sl/_old 2013-01-22 22:21:49.0 +0100
+++ /var/tmp/diff_new_pack.YcE5sl/_new 2013-01-22 22:21:49.0 +0100
@@ -34,8 +34,11 @@
;;
esac
-# Force OOo to use gtk-immodule
-export OOO_FORCE_DESKTOP=gnome
+# If libreoffice-gnome was installed, Force OOo to use gtk-immodule
+# so can gcin use on_the_spot mod to insert characters
+ if [ -f /usr/lib/libreoffice/program/gconfbe1.uno.so ] || [ -f
/usr/lib64/libreoffice/program/gconfbe1.uno.so ] ; then
+ export OOO_FORCE_DESKTOP=gnome
+ fi
# Determine the LC_CTYPE locale category setting
tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2012-12-07 14:08:43
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2012-11-13
17:03:06.0 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2012-12-07
14:08:45.0 +0100
@@ -1,0 +2,6 @@
+Fri Dec 7 08:56:27 UTC 2012 - meiss...@suse.com
+
+- readd a new gcin-libdir.patch as the bug was fixed only for
+ strange subforms of x86_64 and not all other platforms.
+
+---
New:
gcin-libdir.patch
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.ufZ4q8/_old 2012-12-07 14:08:46.0 +0100
+++ /var/tmp/diff_new_pack.ufZ4q8/_new 2012-12-07 14:08:46.0 +0100
@@ -30,6 +30,7 @@
Patch0: configure146p12.diff
Patch1: gcin_scripts_modify-XIM_103.diff
Patch2: icon_path.diff
+Patch3: gcin-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: anthy-devel
@@ -115,6 +116,8 @@
%patch0
%patch1
%patch2
+%patch3 -p1
+
%build
CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y --use_qt3=Y \
--use_anthy=Y
@@ -125,7 +128,7 @@
mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
install -m 644 $RPM_SOURCE_DIR/xim.d-gcin $RPM_BUILD_ROOT/etc/X11/xim.d/gcin
-DESTDIR=$RPM_BUILD_ROOT make install
+DESTDIR=$RPM_BUILD_ROOT make install LIB=%_lib
%suse_update_desktop_file -r -G "Set Up your inputmethod" gcin-tools Settings
System SystemSetup
PRIORITY=30
++ gcin-libdir.patch ++
Index: gcin-2.7.9/configure
===
--- gcin-2.7.9.orig/configure
+++ gcin-2.7.9/configure
@@ -175,10 +175,10 @@ fi
LIB='lib'
-if [ -d /usr/lib64 -a -d /lib64 -a ! -d /lib/x86_64-linux-gnu ]; then
-LIB='lib64'
-# for fedora 64bit
-GTK_QUERY_IM_64='-64'
+if pkg-config --libs qt-mt | grep lib64 >/dev/null ; then
+ LIB='lib64'
+ # for fedora 64bit
+ GTK_QUERY_IM_64='-64'
fi
QT_IM='N'
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2012-11-13 17:03:02
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2012-10-08
07:11:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2012-11-13
17:03:06.0 +0100
@@ -1,0 +2,18 @@
+Thu Nov 8 03:10:10 UTC 2012 - swy...@gmail.com
+
+-remove gcin-libdir.patch, upstream had solved the bug
+
+---
+Wed Nov 7 01:22:39 UTC 2012 - swy...@gmail.com
+
+- update to 2.7.9
+- fix problem about switch to tsin from systray
+- add %flag_keypad_input_key to .cin files
+- fix problem about Ctrl+Shift+* in firefox
+- use gtk2 UI as default
+- add vietnamese and german input method support
+- remove chewing support temporary, need more develpment
+- screen keyboard will keep on the top of all applications
+- other minor bugs fixed
+
+---
Old:
gcin-2.7.5.tar.bz2
gcin-libdir.patch
New:
gcin-2.7.9.tar.bz2
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.7Bcj0V/_old 2012-11-13 17:03:09.0 +0100
+++ /var/tmp/diff_new_pack.7Bcj0V/_new 2012-11-13 17:03:09.0 +0100
@@ -20,7 +20,7 @@
License:LGPL-2.1
Group: System/I18n/Chinese
Name: gcin
-Version:2.7.5
+Version:2.7.9
Release:0
Url:http://hyperrate.com/dir.php?eid=67
Source0:gcin-%{version}.tar.bz2
@@ -30,7 +30,6 @@
Patch0: configure146p12.diff
Patch1: gcin_scripts_modify-XIM_103.diff
Patch2: icon_path.diff
-Patch3: gcin-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: anthy-devel
@@ -43,7 +42,6 @@
%gtk2_immodule_requires
%if %suse_version > 1130
BuildRequires: gtk3-devel
-BuildRequires: libchewing-devel
%endif
Requires: %{name}-branding
Requires: %{name}-qt4-immodule
@@ -53,7 +51,6 @@
Requires: libreoffice-gnome
%endif
Requires: %{name}-anthy-module
-Requires: %{name}-chewing-module
PreReq: /usr/bin/touch
Provides: locale(zh_TW;zh_HK;zh_MO)
@@ -101,15 +98,6 @@
gcin anthy module, try this to input Japanese with libanthy
%if %suse_version > 1130
-%package chewing-module
-Summary:Gcin chewing module
-License:LGPL-2.1
-Group: System/I18n/Chinese
-Requires: %{name} = %{version}
-
-%description chewing-module
-gcin chewing module, support famous chewing inputmethod for traditional
-Chinese users
%package gtk3-immodule
Summary:Gcin gtk3 immodule
@@ -127,10 +115,9 @@
%patch0
%patch1
%patch2
-%patch3 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y --use_qt3=Y \
---use_anthy=Y --use_chewing=Y
+--use_anthy=Y
make
%install
@@ -195,6 +182,7 @@
%{_datadir}/gcin/table/tsin32.idx
%{_datadir}/gcin/table/s-tsin32
%{_datadir}/gcin/table/s-tsin32.idx
+%{_datadir}/gcin/table/hangul-phrase.txt
%{_datadir}/gcin/script/*
%{_datadir}/icons/*
%{_datadir}/pixmaps/gcin.png
@@ -287,9 +275,6 @@
%{_libdir}/gcin/anthy-module.so
%if %suse_version > 1130
-%files chewing-module
-%defattr(-,root,root)
-%{_libdir}/gcin/chewing-module.so
%files gtk3-immodule
%defattr(-,root,root)
@@ -319,9 +304,6 @@
%postun gtk3-immodule
/sbin/ldconfig
%{_gtk3_query_immodules_update_cache}
-
-%postun chewing-module
-/sbin/ldconfig
%endif
%postun
++ gcin-2.7.5.tar.bz2 -> gcin-2.7.9.tar.bz2 ++
/work/SRC/openSUSE:Factory/gcin/gcin-2.7.5.tar.bz2
/work/SRC/openSUSE:Factory/.gcin.new/gcin-2.7.9.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2012-10-08 07:11:23
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2012-06-05
15:31:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2012-10-08
07:11:26.0 +0200
@@ -1,0 +2,5 @@
+Fri Oct 5 15:31:37 UTC 2012 - dval...@suse.com
+
+- Better detect for architecture specific libdir
+
+---
New:
gcin-libdir.patch
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.cfH1BW/_old 2012-10-08 07:11:27.0 +0200
+++ /var/tmp/diff_new_pack.cfH1BW/_new 2012-10-08 07:11:27.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products 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,12 +17,12 @@
Summary: Chinese input method server
-Name: gcin
-Version: 2.7.5
-Release: 1
License: LGPL-2.1
-URL: http://hyperrate.com/dir.php?eid=67
Group: System/I18n/Chinese
+Name: gcin
+Version:2.7.5
+Release:0
+Url:http://hyperrate.com/dir.php?eid=67
Source0: gcin-%{version}.tar.bz2
Source1: xim.d-gcin
Source2: gcin-README.suse
@@ -30,24 +30,30 @@
Patch0: configure146p12.diff
Patch1: gcin_scripts_modify-XIM_103.diff
Patch2: icon_path.diff
-BuildRoot: %{_builddir}/%{name}-%{version}-root
+Patch3: gcin-libdir.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: libjpeg-devel pkg-config gtk2-devel libqt4-devel
update-desktop-files
BuildRequires: anthy-devel
+BuildRequires: gtk2-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libqt4-devel
+BuildRequires: pkg-config
BuildRequires: qt3-devel
+BuildRequires: update-desktop-files
%gtk2_immodule_requires
%if %suse_version > 1130
-BuildRequires: gtk3-devel libchewing-devel
+BuildRequires: gtk3-devel
+BuildRequires: libchewing-devel
%endif
-Requires: gtk2 >= 2.2.4
Requires: %{name}-branding
Requires: %{name}-qt4-immodule
+Requires: gtk2 >= 2.2.4
%if %suse_version > 1130
Requires: %{name}-gtk3-immodule
Requires: libreoffice-gnome
%endif
-Requires: %{name}-chewing-module
Requires: %{name}-anthy-module
+Requires: %{name}-chewing-module
PreReq: /usr/bin/touch
Provides: locale(zh_TW;zh_HK;zh_MO)
@@ -57,17 +63,19 @@
%package branding-upstream
Summary: Upstream branding of gcin
+License:LGPL-2.1
Group: System/I18n/Chinese
Supplements:packageand(%{name}:branding-upstream)
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
Requires: gcin
+
%description branding-upstream
This package provides upstream look and feel for gcin
%package qt3-immodule
-License: GPL-2.0
Summary: Gcin qt3 immodule
+License:GPL-2.0
Group: System/I18n/Chinese
Requires: %{name} = %{version}
@@ -75,8 +83,8 @@
gcin qt3 immodule, support Qt3-based applications
%package qt4-immodule
-License: GPL-2.0
Summary: Gcin qt4 immodule
+License:GPL-2.0
Group: System/I18n/Chinese
Requires: %{name} = %{version}
@@ -85,6 +93,7 @@
%package anthy-module
Summary: Gcin anthy module
+License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
@@ -94,6 +103,7 @@
%if %suse_version > 1130
%package chewing-module
Summary: Gcin chewing module
+License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
@@ -103,6 +113,7 @@
%package gtk3-immodule
Summary: Gcin gtk3 immodule
+License:LGPL-2.1
Group: System/I18n/Chinese
Requires: %{name} = %{version}
%gtk3_immodule_requires
@@ -111,12 +122,12 @@
gcin gtk3 immodule, support gtk3-based applications
%endif
-
%prep
%setup
%patch0
%patch1
%patch2
+%patch3 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y --use_qt3=Y \
--use_anthy=Y --use_chewing=Y
@@ -286,7 +297,6 @@
%{_libdir}/gtk-3.0/immodules/im-gcin.so
%endif
-
%post
/sbin/ldconfig
%{_gtk2_query_immodules_update_cache}
@@ -323,5 +333,4 @@
%postun anthy-module
/sbin/ldconfig
-
%changelog
++ gcin-libdir.patch ++
Index: gcin-2.7.5/configure
===
--- gcin-2.7.5.orig/configure
+++ gcin-2.7.5/configure
@@ -161,12 +161,11 @@ els
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2012-06-05 15:31:04
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2012-05-14
16:14:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2012-06-05
15:31:15.0 +0200
@@ -1,0 +2,6 @@
+Mon Jun 4 12:13:51 UTC 2012 - i...@marguerite.su
+
+- update bzip as source compression format.
+ * sles can't recognize xz.
+
+---
Old:
gcin-2.7.5.tar.xz
New:
gcin-2.7.5.tar.bz2
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.fbgLLW/_old 2012-06-05 15:31:17.0 +0200
+++ /var/tmp/diff_new_pack.fbgLLW/_new 2012-06-05 15:31:17.0 +0200
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Summary: Chinese input method server
Name: gcin
@@ -25,7 +23,7 @@
License: LGPL-2.1
URL: http://hyperrate.com/dir.php?eid=67
Group: System/I18n/Chinese
-Source0: gcin-%{version}.tar.xz
+Source0: gcin-%{version}.tar.bz2
Source1: xim.d-gcin
Source2: gcin-README.suse
Source3: xim.gcin.suse.template
@@ -36,7 +34,7 @@
BuildRequires: libjpeg-devel pkg-config gtk2-devel libqt4-devel
update-desktop-files
BuildRequires: anthy-devel
-BuildRequires: qt3-devel xz
+BuildRequires: qt3-devel
%gtk2_immodule_requires
%if %suse_version > 1130
BuildRequires: gtk3-devel libchewing-devel
@@ -144,9 +142,6 @@
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
# Convenient %define for the scriplets
%if "%_lib" == "lib64"
%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0-64
++ gcin-2.7.5.tar.xz -> gcin-2.7.5.tar.bz2 ++
1075554 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit gcin for openSUSE:Factory
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2012-05-14 16:14:13
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
Package is "gcin", Maintainer is ""
Changes:
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes2012-04-23
09:12:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2012-05-14
16:14:18.0 +0200
@@ -1,0 +2,6 @@
+Sat May 12 12:59:55 UTC 2012 - i...@marguerite.su
+
+- bring in gcin as default IM for TW/HK/MO locale.
+- add Provides: locale(zh_TW;zh_HK;zh_MO).
+
+---
Other differences:
--
++ gcin.spec ++
--- /var/tmp/diff_new_pack.IH3M2Z/_old 2012-05-14 16:14:19.0 +0200
+++ /var/tmp/diff_new_pack.IH3M2Z/_new 2012-05-14 16:14:19.0 +0200
@@ -51,6 +51,7 @@
Requires: %{name}-chewing-module
Requires: %{name}-anthy-module
PreReq: /usr/bin/touch
+Provides: locale(zh_TW;zh_HK;zh_MO)
%description
gcin is a Chinese input method server for traditional Chinese.
@@ -133,7 +134,7 @@
%suse_update_desktop_file -r -G "Set Up your inputmethod" gcin-tools Settings
System SystemSetup
PRIORITY=30
pushd $RPM_BUILD_ROOT/etc/X11/xim.d/
-for lang in en zh_TW zh_HK zh_CN zh_SG ; do
+for lang in en zh_TW zh_HK zh_MO ; do
mkdir $lang
pushd $lang
ln -s ../gcin $PRIORITY-gcin
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
