Hello community, here is the log from the commit of package novel-pinyin for openSUSE:Factory checked in at 2012-06-13 13:23:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/novel-pinyin (Old) and /work/SRC/openSUSE:Factory/.novel-pinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "novel-pinyin", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/novel-pinyin/novel-pinyin.changes 2011-09-23 02:14:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.novel-pinyin.new/novel-pinyin.changes 2012-06-13 13:24:12.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 12 13:05:56 UTC 2012 - [email protected] + +- fix scim module. + +------------------------------------------------------------------- New: ---- gtk-2.12+-gtktooltips-migration.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ novel-pinyin.spec ++++++ --- /var/tmp/diff_new_pack.DLIHBt/_old 2012-06-13 13:24:15.000000000 +0200 +++ /var/tmp/diff_new_pack.DLIHBt/_new 2012-06-13 13:24:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package novel-pinyin (Version 0.2.4) +# spec file for package novel-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,59 +15,48 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: novel-pinyin -BuildRequires: db-devel gcc-c++ gtk2-devel intltool scim-devel -Summary: A Simplified Chinese Input Method Version: 0.2.4 -Release: 9 +Release: 0 +Summary: A Simplified Chinese Input Method License: GPL-2.0+ Group: System/I18n/Chinese -AutoReqProv: on Url: http://novel-pinyin.sf.net Source0: novel-pinyin-%{version}.tar.bz2 -#Patch1: urgent-patch-fix-novel-pinyin-first-load.patch Patch2: novel-pinyin-fixes-train-factor.patch Patch3: bnc528583.patch -ExclusiveArch: %{ix86} x86_64 +Patch4: gtk-2.12+-gtktooltips-migration.patch +BuildRequires: db-devel +BuildRequires: gcc-c++ +BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: scim-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %{ix86} x86_64 %define scim_moduledir %(pkg-config --variable=moduledir scim) %description A Simplified Chinese Sentence-Based Pinyin Input Method Engine Based On Markov Model. - - -Authors: --------- - Peng Wu <[email protected]> - %prep -%setup -q -n %{name}-%{version} -#%patch1 -p2 +%setup -q %patch2 -p1 %patch3 -p1 +%if 0%{?suse_version} >= 1140 +%patch4 -p1 +%endif find . -type f | xargs chmod u+w %build %configure -make +make %{_smp_mflags} %install -make DESTDIR=${RPM_BUILD_ROOT} install -rm -f $RPM_BUILD_ROOT/%{scim_moduledir}/IMEngine/novel_pinyin.*a -rm -f $RPM_BUILD_ROOT/%{scim_moduledir}/SetupUI/novel-pinyin-imengine-setup.*a -#install -m 644 $RPM_SOURCE_DIR/gb_char.bin \ -# $RPM_BUILD_ROOT/%{_datadir}/scim/novel-pinyin/gb_char.bin -#install -m 644 $RPM_SOURCE_DIR/gbk_char.bin \ -# $RPM_BUILD_ROOT/%{_datadir}/scim/novel-pinyin/gbk_char.bin -#install -m 644 $RPM_SOURCE_DIR/pinyin_index.bin \ -# $RPM_BUILD_ROOT/%{_datadir}/scim/novel-pinyin/pinyin_index.bin -#install -m 644 $RPM_SOURCE_DIR/bigram.db \ -# $RPM_BUILD_ROOT/%{_datadir}/scim/novel-pinyin/bigram.db +%makeinstall +rm -f %{buildroot}%{scim_moduledir}/IMEngine/novel_pinyin.*a +rm -f %{buildroot}%{scim_moduledir}/SetupUI/novel-pinyin-imengine-setup.*a %find_lang novel-pinyin %files -f novel-pinyin.lang ++++++ gtk-2.12+-gtktooltips-migration.patch ++++++ diff -urN novel-pinyin-0.2.4.orig/modules/scim/novel_pinyin_imengine_setup.cpp novel-pinyin-0.2.4/modules/scim/novel_pinyin_imengine_setup.cpp --- novel-pinyin-0.2.4.orig/modules/scim/novel_pinyin_imengine_setup.cpp 2012-06-12 20:56:35.391649146 +0800 +++ novel-pinyin-0.2.4/modules/scim/novel_pinyin_imengine_setup.cpp 2012-06-12 21:02:29.878217454 +0800 @@ -297,8 +297,6 @@ NULL, NULL, NULL }; -static GtkTooltips * __widget_tooltips = 0; - // Common callbacks static void __on_default_editable_changed (GtkEditable *editable, @@ -350,8 +348,6 @@ GtkWidget *hbox; GtkWidget *separator; - __widget_tooltips = gtk_tooltips_new (); - // Create the Notebook. notebook = gtk_notebook_new (); gtk_widget_show (notebook); @@ -514,7 +510,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); @@ -570,47 +566,47 @@ } - // Set all tooltips. + // Set all tooltip. - 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_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_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]
