[packages/ibus-chewing] - new URLs, updated to 1.4.14 - added format patch (fixes build with -Werror=format-security)

qboosh qboosh at pld-linux.org
Sun Apr 3 17:14:06 CEST 2016 

commit 2b1f03acd68b7e57e5a746714cb5cce86b5de26a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 3 17:14:14 2016 +0200

    - new URLs, updated to 1.4.14
    - added format patch (fixes build with -Werror=format-security)

 ibus-chewing-format.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 ibus-chewing.spec         | 41 ++++++++++++++++++-----------------------
 2 files changed, 61 insertions(+), 23 deletions(-)
---
diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index 06a6a18..ee52740 100644
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -2,27 +2,27 @@ Summary:	The Chewing engine for IBus input platform
 Summary(pl.UTF-8):	Silnik Chewing dla platformy wprowadzania znaków IBus
 Summary(zh_TW.UTF-8):	IBus新酷音輸入法
 Name:		ibus-chewing
-Version:	1.4.7
+Version:	1.4.14
 Release:	1
 License:	GPL v2+
 Group:		Libraries
-#Source0Download: http://code.google.com/p/ibus/downloads/list
-Source0:	http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
-# Source0-md5:	d15b276e88095996c599bc5c011dba26
-URL:		http://code.google.com/p/ibus/
-BuildRequires:	GConf2-devel
+#Source0Download: https://github.com/definite/ibus-chewing/releases
+Source0:	https://github.com/definite/ibus-chewing/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	cc2dd8448adeaa740e2ca3f5807e3450
+Patch0:		%{name}-format.patch
+URL:		http://chewing.im/projects/ibus-chewing
 BuildRequires:	cmake >= 2.6.2
+BuildRequires:	cmake-fedora-modules
 BuildRequires:	gettext-tools
 BuildRequires:	gob2 >= 2.0.16
+BuildRequires:	glib2-devel >= 1:2.26
 BuildRequires:	gtk+2-devel >= 2.0
 BuildRequires:	ibus-devel >= 1.4
 BuildRequires:	libchewing-devel >= 0.3.3
 BuildRequires:	pkgconfig
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	rpmbuild(macros) >= 1.604
-Requires(post,preun):	GConf2
-Requires:	GConf2
+BuildRequires:	xorg-lib-libX11-devel
+Requires(post,preun):	glib2 >= 1:2.26
 Requires:	ibus >= 1.4
 Requires:	libchewing >= 0.3.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,7 +53,8 @@ Dvorak許氏 及大千26鍵。
 本輸入法也同時支援帶調漢語拼音輸入。
 
 %prep
-%setup -q -n %{name}-%{version}-Source
+%setup -q
+%patch0 -p1
 
 %build
 %cmake \
@@ -72,29 +73,23 @@ rm -rf $RPM_BUILD_ROOT
 # We install document using %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{de_DE,de}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{es_ES,es}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{fr_FR,fr}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{it_IT,it}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ja_JP,ja}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ko_KR,ko}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{uk_UA,uk}
-
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install ibus-chewing.schemas
+%glib_compile_schemas
 
-%preun
-%gconf_schema_uninstall ibus-chewing.schemas
+%postun
+%glib_compile_schemas
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE
 %attr(755,root,root) %{_libexecdir}/ibus-engine-chewing
+%attr(755,root,root) %{_libexecdir}/ibus-setup-chewing
 %{_datadir}/%{name}
+%{_datadir}/glib-2.0/schemas/org.freedesktop.IBus.Chewing.gschema.xml
 %{_datadir}/ibus/component/chewing.xml
-%{_sysconfdir}/gconf/schemas/ibus-chewing.schemas
+%{_desktopdir}/ibus-setup-chewing.desktop
diff --git a/ibus-chewing-format.patch b/ibus-chewing-format.patch
new file mode 100644
index 0000000..1fb266a
--- /dev/null
+++ b/ibus-chewing-format.patch
@@ -0,0 +1,43 @@
+--- ibus-chewing-1.4.14/src/MakerDialogUtil.c.orig	2014-12-15 15:06:27.000000000 +0100
++++ ibus-chewing-1.4.14/src/MakerDialogUtil.c	2016-04-03 10:57:28.094233446 +0200
+@@ -120,7 +120,7 @@
+ 	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%d", intValue);
+ 	break;
+     case G_TYPE_STRING:
+-	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH,
++	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%s",
+ 		   g_value_get_string(value));
+ 	break;
+     default:
+--- ibus-chewing-1.4.14/src/GSettingsBackend.c.orig	2014-12-15 15:06:27.000000000 +0100
++++ ibus-chewing-1.4.14/src/GSettingsBackend.c	2016-04-03 11:04:06.900883376 +0200
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
++#include <inttypes.h>
+ #include <ibus.h>
+ #include <glib.h>
+ #include "MakerDialogUtil.h"
+@@ -122,7 +123,7 @@
+ 	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%u",
+ 		   g_variant_get_uint32(gVar));
+     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT64)) {
+-	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%lu",
++	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%" PRIu64,
+ 		   g_variant_get_uint64(gVar));
+     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT16)) {
+ 	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%d",
+@@ -131,10 +132,10 @@
+ 	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%d",
+ 		   g_variant_get_int32(gVar));
+     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT64)) {
+-	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%ld",
++	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%" PRId64,
+ 		   g_variant_get_int64(gVar));
+     } else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_STRING)) {
+-	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH,
++	g_snprintf(result, MAKER_DIALOG_VALUE_LENGTH, "%s",
+ 		   g_variant_get_string(gVar, NULL));
+     }
+     return result;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ibus-chewing.git/commitdiff/2b1f03acd68b7e57e5a746714cb5cce86b5de26a

More information about the pld-cvs-commit mailing list