Hello community, here is the log from the commit of package scim-pinyin for openSUSE:Factory checked in at 2012-06-06 18:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-pinyin (Old) and /work/SRC/openSUSE:Factory/.scim-pinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-pinyin", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-pinyin/scim-pinyin.changes 2011-09-23 12:45:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-pinyin.new/scim-pinyin.changes 2012-06-06 18:03:05.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 5 09:08:10 UTC 2012 - [email protected] + +- fix openSUSE builds. + * add gtktooltips patch to migrate it to gtk > 2.12. + +------------------------------------------------------------------- New: ---- gtk-2.12+-gtktooltips-migration.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-pinyin.spec ++++++ --- /var/tmp/diff_new_pack.QK03Br/_old 2012-06-06 18:03:06.000000000 +0200 +++ /var/tmp/diff_new_pack.QK03Br/_new 2012-06-06 18:03:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package scim-pinyin (Version 0.5.91.20060705) +# spec file for package scim-pinyin # -# Copyright (c) 2010 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %if %suse_version > 1120 %bcond_with skim @@ -24,15 +23,16 @@ %endif Name: scim-pinyin -BuildRequires: gcc-c++ gtk2-devel scim-devel +BuildRequires: gcc-c++ +BuildRequires: gtk2-devel +BuildRequires: scim-devel %if %{with skim} -BuildRequires: kdelibs3-devel skim +BuildRequires: kdelibs3-devel +BuildRequires: skim +BuildRequires: qt3-devel %endif Version: 0.5.91.20060705 -Release: 267 -License: GPL-2.0+ -Group: System/I18n/Chinese -AutoReqProv: on +Release: 0 Provides: locale(scim:zh) PreReq: gconf2 libxml2 orbit2 glib2 Obsoletes: scim-chinese @@ -46,8 +46,11 @@ Patch3: scim-pinyin-0.5.91-fix-load.patch Patch4: scim-pinyin-0.5.91-save-in-temp.patch Patch5: add-configure.patch.bz2 +Patch6: gtk-2.12+-gtktooltips-migration.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Intelligent Pinyin input module for Smart Chinese/Common Input Method platform +License: GPL-2.0+ +Group: System/I18n/Chinese %description Intelligent Pinyin input module for Smart Chinese/Common Input Method @@ -56,7 +59,6 @@ %if %{with skim} %package -n scim-pinyin-skim -License: GPL-2.0+ Summary: skim setup module for scim-pinyin Group: System/I18n/Chinese Requires: %{name} = %{version} @@ -73,6 +75,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%if 0%{?suse_version} >= 1140 +%patch6 -p1 +%endif chmod a+x configure skim/configure %build ++++++ gtk-2.12+-gtktooltips-migration.patch ++++++ diff -urN scim-pinyin-0.5.91.20060705.orig/src/scim_pinyin_imengine_setup.cpp scim-pinyin-0.5.91.20060705/src/scim_pinyin_imengine_setup.cpp --- scim-pinyin-0.5.91.20060705.orig/src/scim_pinyin_imengine_setup.cpp 2012-06-04 16:12:29.509893474 +0800 +++ scim-pinyin-0.5.91.20060705/src/scim_pinyin_imengine_setup.cpp 2012-06-05 17:03:30.910790222 +0800 @@ -327,8 +327,6 @@ NULL, NULL, NULL }; -static GtkTooltips * __widget_tooltips = 0; - // Common callbacks static void __on_default_editable_changed (GtkEditable *editable, @@ -383,8 +381,6 @@ GtkWidget *hbox; GtkWidget *separator; - __widget_tooltips = gtk_tooltips_new (); - // Create the Notebook. notebook = gtk_notebook_new (); gtk_widget_show (notebook); @@ -683,7 +679,7 @@ gtk_table_attach (GTK_TABLE (table), __config_keyboards[i].entry, 1, 2, i, i+1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_entry_set_editable (GTK_ENTRY (__config_keyboards[i].entry), FALSE); + gtk_editable_set_editable (GTK_EDITABLE (__config_keyboards[i].entry), FALSE); __config_keyboards[i].button = gtk_button_new_with_label ("..."); gtk_widget_show (__config_keyboards[i].button); @@ -772,80 +768,80 @@ // Set all tooltips. - gtk_tooltips_set_tip (__widget_tooltips, __widget_user_data_binary, + gtk_widget_set_tooltip_text (__widget_user_data_binary, _("Store the user pinyin and phrase data in binary format, " - "this will increase the loading speed."), NULL); + "this will increase the loading speed.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_combine_phrase, - _("Combine inputed phrases into one longer phrase automatically."), NULL); + gtk_widget_set_tooltip_text (__widget_auto_combine_phrase, + _("Combine inputed phrases into one longer phrase automatically.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_auto_fill_preedit, + gtk_widget_set_tooltip_text (__widget_auto_fill_preedit, _("Fill the preedit string automatically " - "by a smart matching algorithm."), NULL); + "by a smart matching algorithm.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_match_longer_phrase, + gtk_widget_set_tooltip_text (__widget_match_longer_phrase, _("Phrases which are longer than the inputed keys " "can also be matched, this option is valid when " - "\"Auto combine phrase\" is checked."), NULL); + "\"Auto combine phrase\" is checked.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_always_show_lookup, + gtk_widget_set_tooltip_text (__widget_always_show_lookup, _("Lookup table will be always shown " - "when there are any candidate phrases."), NULL); + "when there are any candidate phrases.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_show_all_keys, + gtk_widget_set_tooltip_text (__widget_show_all_keys, _("All inputed keys will be shown, " "this option is only valid when " - "\"Auto fill preedit\" is checked."), NULL); + "\"Auto fill preedit\" is checked.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_dynamic_adjust, + gtk_widget_set_tooltip_text (__widget_dynamic_adjust, _("Phrase library will be adjusted dynamically " "according to the inputed contents. " "The changed part of the phrase library will be " - "stored in the user's local files."), NULL); + "stored in the user's local files.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_max_user_phrase_length, + gtk_widget_set_tooltip_text (__widget_max_user_phrase_length, _("Maxmium length of the custom phrases created " "by user. These phrases will be created automatically " - "when user inputs text."), NULL); + "when user inputs text.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_max_preedit_length, - _("Maxmium length of the preedit string."), NULL); + gtk_widget_set_tooltip_text (__widget_max_preedit_length, + _("Maxmium length of the preedit string.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_smart_match_level, + gtk_widget_set_tooltip_text (__widget_smart_match_level, _("Level of the smart matching algorithm. " "The larger the level the more accurate " - "the algorithm, but also slower."), NULL); + "the algorithm, but also slower.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_burst_stack_size, + gtk_widget_set_tooltip_text (__widget_burst_stack_size, _("Size of the burst stack. " "Newly inputed phrases will be placed onto the " "burst stack. The phrases in this stack " - "have higher priority than others."), NULL); + "have higher priority than others.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_dynamic_sensitivity, + gtk_widget_set_tooltip_text (__widget_dynamic_sensitivity, _("Sensitivity of the dynamic adjusting algorithm, " - "the higher the more sensitive."), NULL); + "the higher the more sensitive.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_save_period, + gtk_widget_set_tooltip_text (__widget_save_period, _("Time period, in seconds, to " - "save the user data."), NULL); + "save the user data.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_tone, + gtk_widget_set_tooltip_text (__widget_tone, _("Tone information will be used " - "in matching the pinyin key."), NULL); + "in matching the pinyin key.")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_incomplete, + gtk_widget_set_tooltip_text (__widget_incomplete, _("Pinyin keys which only have the initial part (Sheng Mu) " - "will be allowed. "), NULL); + "will be allowed. ")); - gtk_tooltips_set_tip (__widget_tooltips, __widget_ambiguities [0], + gtk_widget_set_tooltip_text (__widget_ambiguities [0], _("The following options control the ambiguous " "behaviour of the pinyin matching algorithm, " - "useful if the user cannot distinguish between them."), NULL); + "useful if the user cannot distinguish between them.")); for (i = 0; __config_keyboards [i].key; ++ i) { - gtk_tooltips_set_tip (__widget_tooltips, __config_keyboards [i].entry, - _(__config_keyboards [i].tooltip), NULL); + gtk_widget_set_tooltip_text (__config_keyboards [i].entry, + _(__config_keyboards [i].tooltip)); } window = notebook; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
