Hello community, here is the log from the commit of package scim-tables for openSUSE:Factory checked in at 2015-09-24 06:14:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-tables (Old) and /work/SRC/openSUSE:Factory/.scim-tables.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-tables" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-tables/scim-tables.changes 2015-03-25 21:05:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim-tables.new/scim-tables.changes 2015-09-24 06:14:35.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 18 15:14:16 UTC 2015 - [email protected] + +- use macros from macros.scim +- add patch: G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch + * define G_GNUC_BEGIN/END_IGNORE_DEPRECATIONS for glib < 2.32 +- add patch: unused-variable.patch + * delete unused variables + +------------------------------------------------------------------- New: ---- G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch unused-variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-tables.spec ++++++ --- /var/tmp/diff_new_pack.RU5zyp/_old 2015-09-24 06:14:36.000000000 +0200 +++ /var/tmp/diff_new_pack.RU5zyp/_new 2015-09-24 06:14:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-tables # -# Copyright (c) 2015 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 @@ -24,19 +24,21 @@ Group: System/I18n/Chinese Url: https://github.com/scim-im/scim-tables Source: https://github.com/scim-im/scim-tables/archive/%{name}-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake +#PATCH-FIX-SLE define G_GNUC_BEGIN/END_xx for glib < 2.32 +Patch: G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch +#PATCH-FIX-UPSTREAM delete unused variables +Patch1: unused-variable.patch BuildRequires: gcc-c++ -%if 0%{?sles_version} -BuildRequires: gtk2-devel -%else -BuildRequires: gtk3-devel -%endif BuildRequires: intltool BuildRequires: libtool BuildRequires: scim-devel Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?sles_version} +BuildRequires: gtk2-devel +%else +BuildRequires: gtk3-devel +%endif %description Data files for SCIM generic table input method module. @@ -87,183 +89,171 @@ %lang_package %prep -%define scim_binary_version %(pkg-config --variable=scim_binary_version scim) %setup -q -n %{name}-%{name}-%{version} +%patch -p1 +%patch1 -p1 %build ./bootstrap -%configure --enable-debug +%configure \ + --enable-debug make %{?_smp_mflags} %install -%makeinstall -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/*/*.{a,la} -%find_lang scim-tables +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -name "*.a" -delete -print +find %{buildroot} -name "*.la" -delete -print +%find_lang %{name} %files %defattr(-,root,root) %doc AUTHORS COPYING README ChangeLog -%doc %{_mandir}/man?/* %{_bindir}/scim-make-table -%dir %{_libdir}/scim-1.0 -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/ -%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/ -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/ -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/* -%{_datadir}/scim/icons/table.png +%{_mandir}/man1/scim-make-table.1%{ext_man} +%{_scim_enginedir}/table.so +%{_scim_uidir}/table-imengine-setup.so +%{_scim_icondir}/table.png %files zh %defattr(-,root,root) %doc tables/zh/README-CangJie.txt %doc tables/zh/README-Erbi.txt %doc tables/zh/README-Wu.txt -%dir %{_datadir}/scim/ -%dir %{_datadir}/scim/tables -%{_datadir}/scim/tables/Array30.bin -%{_datadir}/scim/tables/CangJie.bin -%{_datadir}/scim/tables/CangJie3.bin -%{_datadir}/scim/tables/CangJie5.bin -%{_datadir}/scim/tables/Cantonese.bin -%{_datadir}/scim/tables/CantonHK.bin -%{_datadir}/scim/tables/CNS11643.bin -%{_datadir}/scim/tables/Dayi3.bin -%{_datadir}/scim/tables/Erbi.bin -%{_datadir}/scim/tables/Erbi-QS.bin -%{_datadir}/scim/tables/EZ-Big.bin -%{_datadir}/scim/tables/Jyutping.bin -%{_datadir}/scim/tables/Quick.bin -%{_datadir}/scim/tables/Simplex.bin -%{_datadir}/scim/tables/Stroke5.bin -%{_datadir}/scim/tables/Wu.bin -%{_datadir}/scim/tables/Wubi.bin -%{_datadir}/scim/tables/ZhuYin.bin -%{_datadir}/scim/tables/ZhuYin-Big.bin -%{_datadir}/scim/tables/Ziranma.bin -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/Array30.png -%{_datadir}/scim/icons/CangJie.png -%{_datadir}/scim/icons/CangJie3.png -%{_datadir}/scim/icons/Cantonese.png -%{_datadir}/scim/icons/CantonHK.png -%{_datadir}/scim/icons/CNS11643.png -%{_datadir}/scim/icons/Dayi.png -%{_datadir}/scim/icons/EZ.png -%{_datadir}/scim/icons/Erbi-QS.png -%{_datadir}/scim/icons/Erbi.png -%{_datadir}/scim/icons/Jyutping.png -%{_datadir}/scim/icons/Quick.png -%{_datadir}/scim/icons/Simplex.png -%{_datadir}/scim/icons/Stroke5.png -%{_datadir}/scim/icons/Wu.png -%{_datadir}/scim/icons/Wubi.png -%{_datadir}/scim/icons/ZhuYin.png -%{_datadir}/scim/icons/Ziranma.png +%{_scim_tabledir}/Array30.bin +%{_scim_tabledir}/CangJie.bin +%{_scim_tabledir}/CangJie3.bin +%{_scim_tabledir}/CangJie5.bin +%{_scim_tabledir}/Cantonese.bin +%{_scim_tabledir}/CantonHK.bin +%{_scim_tabledir}/CNS11643.bin +%{_scim_tabledir}/Dayi3.bin +%{_scim_tabledir}/Erbi.bin +%{_scim_tabledir}/Erbi-QS.bin +%{_scim_tabledir}/EZ-Big.bin +%{_scim_tabledir}/Jyutping.bin +%{_scim_tabledir}/Quick.bin +%{_scim_tabledir}/Simplex.bin +%{_scim_tabledir}/Stroke5.bin +%{_scim_tabledir}/Wu.bin +%{_scim_tabledir}/Wubi.bin +%{_scim_tabledir}/ZhuYin.bin +%{_scim_tabledir}/ZhuYin-Big.bin +%{_scim_tabledir}/Ziranma.bin +%{_scim_icondir}/Array30.png +%{_scim_icondir}/CangJie.png +%{_scim_icondir}/CangJie3.png +%{_scim_icondir}/Cantonese.png +%{_scim_icondir}/CantonHK.png +%{_scim_icondir}/CNS11643.png +%{_scim_icondir}/Dayi.png +%{_scim_icondir}/EZ.png +%{_scim_icondir}/Erbi-QS.png +%{_scim_icondir}/Erbi.png +%{_scim_icondir}/Jyutping.png +%{_scim_icondir}/Quick.png +%{_scim_icondir}/Simplex.png +%{_scim_icondir}/Stroke5.png +%{_scim_icondir}/Wu.png +%{_scim_icondir}/Wubi.png +%{_scim_icondir}/ZhuYin.png +%{_scim_icondir}/Ziranma.png %files ja %defattr(-,root,root) -%dir %{_datadir}/scim/ -%dir %{_datadir}/scim/tables -%{_datadir}/scim/tables/HIRAGANA.bin -%{_datadir}/scim/tables/KATAKANA.bin -%{_datadir}/scim/tables/Nippon.bin -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/HIRAGANA.png -%{_datadir}/scim/icons/KATAKANA.png -%{_datadir}/scim/icons/Nippon.png +%{_scim_tabledir}/HIRAGANA.bin +%{_scim_tabledir}/KATAKANA.bin +%{_scim_tabledir}/Nippon.bin +%{_scim_icondir}/HIRAGANA.png +%{_scim_icondir}/KATAKANA.png +%{_scim_icondir}/Nippon.png %files ko %defattr(-,root,root) -%dir %{_datadir}/scim/ -%dir %{_datadir}/scim/tables -%{_datadir}/scim/tables/Hangul.bin -%{_datadir}/scim/tables/Hanja.bin -%{_datadir}/scim/tables/HangulRomaja.bin -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/Hangul.png -%{_datadir}/scim/icons/Hanja.png +%{_scim_tabledir}/Hangul.bin +%{_scim_tabledir}/Hanja.bin +%{_scim_tabledir}/HangulRomaja.bin +%{_scim_icondir}/Hangul.png +%{_scim_icondir}/Hanja.png %files additional %defattr(-, root, root) -%dir %{_datadir}/scim/ -%dir %{_datadir}/scim/tables -%{_datadir}/scim/tables/Amharic.bin -%{_datadir}/scim/tables/Arabic.bin -%{_datadir}/scim/tables/Nepali_Rom.bin -%{_datadir}/scim/tables/Nepali_Trad.bin -%{_datadir}/scim/tables/Yawerty.bin -%{_datadir}/scim/tables/Viqr.bin -%{_datadir}/scim/tables/IPA-X-SAMPA.bin -%{_datadir}/scim/tables/LaTeX.bin -%{_datadir}/scim/tables/Bengali-inscript.bin -%{_datadir}/scim/tables/Bengali-probhat.bin -%{_datadir}/scim/tables/Gujarati-inscript.bin -%{_datadir}/scim/tables/Gujarati-phonetic.bin -%{_datadir}/scim/tables/Hindi-inscript.bin -%{_datadir}/scim/tables/Hindi-phonetic.bin -%{_datadir}/scim/tables/Kannada-inscript.bin -%{_datadir}/scim/tables/Kannada-kgp.bin -%{_datadir}/scim/tables/Malayalam-inscript.bin -%{_datadir}/scim/tables/Malayalam-phonetic.bin -%{_datadir}/scim/tables/Punjabi-inscript.bin -%{_datadir}/scim/tables/Punjabi-jhelum.bin -%{_datadir}/scim/tables/Punjabi-phonetic.bin -%{_datadir}/scim/tables/Tamil-inscript.bin -%{_datadir}/scim/tables/Tamil-phonetic.bin -%{_datadir}/scim/tables/Tamil-remington.bin -%{_datadir}/scim/tables/Telugu-inscript.bin -%{_datadir}/scim/tables/Thai.bin -%{_datadir}/scim/tables/Translit.bin -%{_datadir}/scim/tables/Ukrainian-Translit.bin -%{_datadir}/scim/tables/Hindi-remington.bin -%{_datadir}/scim/tables/IPA-Kirshenbaum.bin -%{_datadir}/scim/tables/Marathi-remington.bin -%{_datadir}/scim/tables/Punjabi-remington.bin -%{_datadir}/scim/tables/RussianTraditional.bin -%{_datadir}/scim/tables/SmartCangJie6.bin -%{_datadir}/scim/tables/Tamil-tamil99.bin -%{_datadir}/scim/tables/Uyghur-Romanized.bin -%{_datadir}/scim/tables/Uyghur-Standard.bin -%{_datadir}/scim/tables/classicalhebrew.bin -%{_datadir}/scim/tables/greekpoly.bin -%{_datadir}/scim/tables/HebrewComputer.bin -%{_datadir}/scim/tables/RussianComputer.bin -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/Amharic.png -%{_datadir}/scim/icons/Arabic.png -%{_datadir}/scim/icons/Nepali.png -%{_datadir}/scim/icons/Yawerty.png -%{_datadir}/scim/icons/Viqr.png -%{_datadir}/scim/icons/IPA-X-SAMPA.png -%{_datadir}/scim/icons/LaTeX.png -%{_datadir}/scim/icons/Bengali-inscript.png -%{_datadir}/scim/icons/Bengali-probhat.png -%{_datadir}/scim/icons/Gujarati-inscript.png -%{_datadir}/scim/icons/Gujarati-phonetic.png -%{_datadir}/scim/icons/Hindi-inscript.png -%{_datadir}/scim/icons/Hindi-phonetic.png -%{_datadir}/scim/icons/Kannada-inscript.png -%{_datadir}/scim/icons/Kannada-kgp.png -%{_datadir}/scim/icons/Malayalam-inscript.png -%{_datadir}/scim/icons/Malayalam-phonetic.png -%{_datadir}/scim/icons/Punjabi-inscript.png -%{_datadir}/scim/icons/Punjabi-jhelum.png -%{_datadir}/scim/icons/Punjabi-phonetic.png -%{_datadir}/scim/icons/Tamil-inscript.png -%{_datadir}/scim/icons/Tamil-phonetic.png -%{_datadir}/scim/icons/Tamil-remington.png -%{_datadir}/scim/icons/Telugu-inscript.png -%{_datadir}/scim/icons/Thai.png -%{_datadir}/scim/icons/Hindi-remington.png -%{_datadir}/scim/icons/Marathi-remington.png -%{_datadir}/scim/icons/Punjabi-remington.png -%{_datadir}/scim/icons/RussianTraditional.png -%{_datadir}/scim/icons/SmartCangJie6.png -%{_datadir}/scim/icons/Tamil-tamil99.png -%{_datadir}/scim/icons/Translit.png -%{_datadir}/scim/icons/Ukrainian-Translit.png -%{_datadir}/scim/icons/Uyghur.png -%{_datadir}/scim/icons/HebrewComputer.png -%{_datadir}/scim/icons/RussianComputer.png +%{_scim_tabledir}/Amharic.bin +%{_scim_tabledir}/Arabic.bin +%{_scim_tabledir}/Nepali_Rom.bin +%{_scim_tabledir}/Nepali_Trad.bin +%{_scim_tabledir}/Yawerty.bin +%{_scim_tabledir}/Viqr.bin +%{_scim_tabledir}/IPA-X-SAMPA.bin +%{_scim_tabledir}/LaTeX.bin +%{_scim_tabledir}/Bengali-inscript.bin +%{_scim_tabledir}/Bengali-probhat.bin +%{_scim_tabledir}/Gujarati-inscript.bin +%{_scim_tabledir}/Gujarati-phonetic.bin +%{_scim_tabledir}/Hindi-inscript.bin +%{_scim_tabledir}/Hindi-phonetic.bin +%{_scim_tabledir}/Kannada-inscript.bin +%{_scim_tabledir}/Kannada-kgp.bin +%{_scim_tabledir}/Malayalam-inscript.bin +%{_scim_tabledir}/Malayalam-phonetic.bin +%{_scim_tabledir}/Punjabi-inscript.bin +%{_scim_tabledir}/Punjabi-jhelum.bin +%{_scim_tabledir}/Punjabi-phonetic.bin +%{_scim_tabledir}/Tamil-inscript.bin +%{_scim_tabledir}/Tamil-phonetic.bin +%{_scim_tabledir}/Tamil-remington.bin +%{_scim_tabledir}/Telugu-inscript.bin +%{_scim_tabledir}/Thai.bin +%{_scim_tabledir}/Translit.bin +%{_scim_tabledir}/Ukrainian-Translit.bin +%{_scim_tabledir}/Hindi-remington.bin +%{_scim_tabledir}/IPA-Kirshenbaum.bin +%{_scim_tabledir}/Marathi-remington.bin +%{_scim_tabledir}/Punjabi-remington.bin +%{_scim_tabledir}/RussianTraditional.bin +%{_scim_tabledir}/SmartCangJie6.bin +%{_scim_tabledir}/Tamil-tamil99.bin +%{_scim_tabledir}/Uyghur-Romanized.bin +%{_scim_tabledir}/Uyghur-Standard.bin +%{_scim_tabledir}/classicalhebrew.bin +%{_scim_tabledir}/greekpoly.bin +%{_scim_tabledir}/HebrewComputer.bin +%{_scim_tabledir}/RussianComputer.bin +%{_scim_icondir}/Amharic.png +%{_scim_icondir}/Arabic.png +%{_scim_icondir}/Nepali.png +%{_scim_icondir}/Yawerty.png +%{_scim_icondir}/Viqr.png +%{_scim_icondir}/IPA-X-SAMPA.png +%{_scim_icondir}/LaTeX.png +%{_scim_icondir}/Bengali-inscript.png +%{_scim_icondir}/Bengali-probhat.png +%{_scim_icondir}/Gujarati-inscript.png +%{_scim_icondir}/Gujarati-phonetic.png +%{_scim_icondir}/Hindi-inscript.png +%{_scim_icondir}/Hindi-phonetic.png +%{_scim_icondir}/Kannada-inscript.png +%{_scim_icondir}/Kannada-kgp.png +%{_scim_icondir}/Malayalam-inscript.png +%{_scim_icondir}/Malayalam-phonetic.png +%{_scim_icondir}/Punjabi-inscript.png +%{_scim_icondir}/Punjabi-jhelum.png +%{_scim_icondir}/Punjabi-phonetic.png +%{_scim_icondir}/Tamil-inscript.png +%{_scim_icondir}/Tamil-phonetic.png +%{_scim_icondir}/Tamil-remington.png +%{_scim_icondir}/Telugu-inscript.png +%{_scim_icondir}/Thai.png +%{_scim_icondir}/Hindi-remington.png +%{_scim_icondir}/Marathi-remington.png +%{_scim_icondir}/Punjabi-remington.png +%{_scim_icondir}/RussianTraditional.png +%{_scim_icondir}/SmartCangJie6.png +%{_scim_icondir}/Tamil-tamil99.png +%{_scim_icondir}/Translit.png +%{_scim_icondir}/Ukrainian-Translit.png +%{_scim_icondir}/Uyghur.png +%{_scim_icondir}/HebrewComputer.png +%{_scim_icondir}/RussianComputer.png %files lang -f %{name}.lang %defattr(-, root, root) ++++++ G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch ++++++ Index: scim-tables-scim-tables-0.5.14.1/src/scim_table_imengine_setup.cpp =================================================================== --- scim-tables-scim-tables-0.5.14.1.orig/src/scim_table_imengine_setup.cpp +++ scim-tables-scim-tables-0.5.14.1/src/scim_table_imengine_setup.cpp @@ -76,6 +76,19 @@ #define SCIM_TABLES_USE_GTK_TREE_VIEW_SET_RULES_HINT #endif +#if ! GLIB_CHECK_VERSION(2, 32, 0) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#define G_GNUC_END_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic pop") +#else +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS +#define G_GNUC_END_IGNORE_DEPRECATIONS +#endif +#endif + using namespace scim; #define scim_module_init table_imengine_setup_LTX_scim_module_init ++++++ unused-variable.patch ++++++ Index: scim-tables-scim-tables-0.5.14.1/src/scim_generic_table.cpp =================================================================== --- scim-tables-scim-tables-0.5.14.1.orig/src/scim_generic_table.cpp +++ scim-tables-scim-tables-0.5.14.1/src/scim_generic_table.cpp @@ -2181,7 +2181,6 @@ GenericTableLibrary::load_header () GenericTableHeader header; bool ok = false; - bool binary = false; magic = _get_line (fp); version = _get_line (fp); Index: scim-tables-scim-tables-0.5.14.1/src/scim_table_imengine_setup.cpp =================================================================== --- scim-tables-scim-tables-0.5.14.1.orig/src/scim_table_imengine_setup.cpp +++ scim-tables-scim-tables-0.5.14.1/src/scim_table_imengine_setup.cpp @@ -660,7 +660,6 @@ create_table_management_page () GtkWidget *vbox; GtkWidget *label; GtkWidget *scrolledwindow; - GtkWidget *treeview; GtkWidget *hbox; GtkWidget *button; GtkCellRenderer *renderer; @@ -3034,7 +3033,6 @@ on_table_properties_clicked (GtkButton * GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *selection; - GtkWidget *msg; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (__widget_table_list_view));
