Hello community, here is the log from the commit of package fcitx-configtool for openSUSE:Factory checked in at 2017-02-15 10:06:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-configtool (Old) and /work/SRC/openSUSE:Factory/.fcitx-configtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-configtool" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-configtool/fcitx-configtool.changes 2016-11-15 18:01:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx-configtool.new/fcitx-configtool.changes 2017-02-15 10:06:04.239027892 +0100 @@ -1,0 +2,12 @@ +Sat Feb 11 22:49:37 UTC 2017 - i...@marguerite.su + +- update version 0.4.9 + * shouldn't create dummy config when cfdesc doesn't exist + * remove usage of some deprecated gtk3 functions and bump + requirement to 3.12 + * add qt5 wrapper support to use qt5's webengine since qt4's + webkiti is no longer maintained upstream +- add patch: fcitx-configtool-0.4.9-for-loop-init-declaration-c99.patch + * for loop initial declarations are only allowed in C99 mode + +------------------------------------------------------------------- Old: ---- _service fcitx-configtool-0.4.8.tar.xz New: ---- fcitx-configtool-0.4.9-for-loop-init-declaration-c99.patch fcitx-configtool-0.4.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-configtool.spec ++++++ --- /var/tmp/diff_new_pack.0uD8OQ/_old 2017-02-15 10:06:04.698963107 +0100 +++ /var/tmp/diff_new_pack.0uD8OQ/_new 2017-02-15 10:06:04.698963107 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx-configtool # -# Copyright (c) 2016 SUSE LINUX Products 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,15 +17,25 @@ %define pkgname fcitx-config-gtk3 - Name: fcitx-configtool -Version: 0.4.8 +Version: 0.4.9 Release: 0 Summary: GTK GUI config tool for FCITX License: GPL-2.0+ Group: System/I18n/Chinese -Url: http://code.google.com/p/fcitx +Url: https://github.com/fcitx/fcitx-configtool Source: http://download.fcitx-im.org/fcitx-configtool/%{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM for loop init declaration is only allowed in c99 mode +Patch: fcitx-configtool-0.4.9-for-loop-init-declaration-c99.patch +BuildRequires: cmake +BuildRequires: fcitx-devel +BuildRequires: gcc-c++ +BuildRequires: gtk3-devel +BuildRequires: intltool +BuildRequires: iso-codes-devel +BuildRequires: libtool +BuildRequires: xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: dbus-1-glib-devel %if 0%{?suse_version} <= 1140 @@ -37,15 +47,6 @@ BuildRequires: dbus-glib-devel BuildRequires: unique-devel %endif -BuildRequires: cmake -BuildRequires: fcitx-devel -BuildRequires: gcc-c++ -BuildRequires: gtk3-devel -BuildRequires: intltool -BuildRequires: iso-codes-devel -BuildRequires: libtool -BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description fcitx-config Gtk based configure tool for fcitx. @@ -55,6 +56,7 @@ %package -n %{pkgname} Summary: GTK GUI Config tool for FCITX Group: System/I18n/Chinese +Supplements: packageand(fcitx:libgtk-3-0) Provides: fcitx-config-gtk = %{version} Obsoletes: fcitx-config-gtk < %{version} Provides: fcitx-config-gtk2 = %{version} @@ -62,7 +64,6 @@ Provides: %{name} = %{version} Obsoletes: %{name} < %{version} Provides: locale(libgnome:ko;zh_CN;zh_SG) -Supplements: packageand(fcitx:libgtk-3-0) %{fcitx_requires} %description -n %{pkgname} @@ -72,29 +73,23 @@ %prep %setup -q +%patch -p1 %build -mkdir -pv build -pushd build -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - .. -make +%cmake +make %{?_smp_mflags} %install -pushd build -%makeinstall -popd +%cmake_install %find_lang %{name} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -n %{pkgname} -f %{name}.lang %defattr(-,root,root) %doc COPYING -%{_bindir}/* +%{_bindir}/fcitx-config-gtk3 %changelog ++++++ fcitx-configtool-0.4.9-for-loop-init-declaration-c99.patch ++++++ Index: b/gtk3/sub_config_widget.c =================================================================== --- a/gtk3/sub_config_widget.c +++ b/gtk3/sub_config_widget.c @@ -194,7 +194,8 @@ void open_native_file(GtkButton *button, fcitx_utils_get_fcitx_path_with_filename ("libdir", "fcitx/libexec/fcitx-qt5-gui-wrapper") }; char* wrapper = NULL; - for (int i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { + int i; + for (i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { if (qtguiwrapper[i]) { gchar* argv[4]; argv[0] = qtguiwrapper[i]; @@ -218,7 +219,7 @@ void open_native_file(GtkButton *button, g_spawn_async(NULL, argv2, NULL, 0, NULL, NULL, NULL, NULL); } - for (int i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { + for (i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { free(qtguiwrapper[i]); } @@ -271,7 +272,8 @@ void run_plugin(GtkButton* button, gpoin fcitx_utils_get_fcitx_path_with_filename ("libdir", "fcitx/libexec/fcitx-qt5-gui-wrapper") }; char* wrapper = NULL; - for (int i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { + int i; + for (i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { if (qtguiwrapper[i]) { gchar* argv[4]; argv[0] = qtguiwrapper[i]; @@ -295,7 +297,7 @@ void run_plugin(GtkButton* button, gpoin g_spawn_async(NULL, argv2, NULL, 0, NULL, NULL, NULL, NULL); } - for (int i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { + for (i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { free(qtguiwrapper[i]); } ++++++ fcitx-configtool-0.4.8.tar.xz -> fcitx-configtool-0.4.9.tar.xz ++++++ ++++ 1912 lines of diff (skipped)
