Hello community, here is the log from the commit of package scim-canna for openSUSE:Factory checked in at 2012-06-13 13:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-canna (Old) and /work/SRC/openSUSE:Factory/.scim-canna.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-canna", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-canna/scim-canna.changes 2011-09-23 12:45:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-canna.new/scim-canna.changes 2012-06-13 13:33:09.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jun 12 07:58:36 UTC 2012 - [email protected] + +- still fix for factory + * add gtk_combobox migration patch, thanks to mgorse. + +------------------------------------------------------------------- +Thu Jun 7 07:34:32 UTC 2012 - [email protected] + +- fix for factory + * add gtktooltips migration patch. + * run spec-cleaner. + +------------------------------------------------------------------- New: ---- gtk-2.12+-gtktooltips-migration.patch gtk-2.4+-combobox-migration.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-canna.spec ++++++ --- /var/tmp/diff_new_pack.YhaoLQ/_old 2012-06-13 13:33:10.000000000 +0200 +++ /var/tmp/diff_new_pack.YhaoLQ/_new 2012-06-13 13:33:10.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package scim-canna (Version 1.0.0) +# spec file for package scim-canna # -# 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,23 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: scim-canna -BuildRequires: canna-devel gcc-c++ gtk2-devel scim-devel update-desktop-files Version: 1.0.0 -Release: 251 +Release: 0 +Summary: Canna Input Method Engine for SCIM License: GPL-2.0+ Group: System/I18n/Japanese -AutoReqProv: on -Provides: locale(scim:ja) Url: http://sourceforge.jp/projects/scim-imengine/ Source0: http://osdn.dl.sourceforge.jp/scim-imengine/18849/scim-canna-1.0.0.tar.bz2 Patch1: libtool-autoconf.patch Patch2: missing-includes.patch +#PATCH-FIX-UPSTREAM migration old gtk functions: gtktooltips +Patch3: gtk-2.12+-gtktooltips-migration.patch +#PATCH-FIX-UPSTREAM convert old gtk_combo to new gtk_combobox +Patch4: gtk-2.4+-combobox-migration.patch +BuildRequires: canna-devel +BuildRequires: gcc-c++ +BuildRequires: gtk2-devel +BuildRequires: scim-devel +BuildRequires: update-desktop-files +Provides: locale(scim:ja) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Canna Input Method Engine for SCIM %description Canna Input Method Engine for SCIM @@ -39,16 +44,20 @@ %prep %define scim_binary_version %(pkg-config --variable=scim_binary_version scim) %define build_setup 1 -%setup -q -n %{name}-%{version} +%setup -q %patch2 -p1 -%if %suse_version <= 1110 +%if 0%{?suse_version} <= 1110 %patch1 -p1 libtoolize --force autoreconf -I /opt/gnome/share/aclocal --force --install --verbose %endif +%if 0%{?suse_version} >= 1140 +%patch3 -p1 +%patch4 -p1 +%endif %build -CXXFLAGS="$RPM_OPT_FLAGS" \ +CXXFLAGS="%{optflags}" \ ./configure --prefix=/usr \ --sysconfdir=%{_sysconfdir} \ --libdir=%{_libdir} \ @@ -57,13 +66,11 @@ make %install -make DESTDIR=${RPM_BUILD_ROOT} install -rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/canna.{a,la} -rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/canna-imengine-setup.{a,la} +%makeinstall +rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/canna.{a,la} +rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/canna-imengine-setup.{a,la} %find_lang scim-canna -%clean - %files -f scim-canna.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog ++++++ gtk-2.12+-gtktooltips-migration.patch ++++++ diff -urN scim-canna-1.0.0.orig/src/scim_canna_imengine_setup.cpp scim-canna-1.0.0/src/scim_canna_imengine_setup.cpp --- scim-canna-1.0.0.orig/src/scim_canna_imengine_setup.cpp 2012-06-12 16:00:29.119758108 +0800 +++ scim-canna-1.0.0/src/scim_canna_imengine_setup.cpp 2012-06-12 16:02:31.848223793 +0800 @@ -151,8 +151,6 @@ // Internal data declaration. static bool __have_changed = true; -static GtkTooltips * __widget_tooltips = 0; - static BoolConfigData __config_bool_common [] = { { @@ -283,11 +281,9 @@ entry); gtk_widget_show (entry->widget); - if (!__widget_tooltips) - __widget_tooltips = gtk_tooltips_new(); if (entry->tooltip) - gtk_tooltips_set_tip (__widget_tooltips, entry->widget, - _(entry->tooltip), NULL); + gtk_widget_set_tooltip_text (entry->widget, + _(entry->tooltip)); return entry->widget; } @@ -323,11 +319,9 @@ (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (GTK_FILL), 4, 4); - if (!__widget_tooltips) - __widget_tooltips = gtk_tooltips_new(); if (entry->tooltip) - gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget), - _(entry->tooltip), NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), + _(entry->tooltip)); return GTK_WIDGET (entry->widget); } @@ -370,11 +364,9 @@ G_CALLBACK (on_default_combo_changed), entry); - if (!__widget_tooltips) - __widget_tooltips = gtk_tooltips_new(); if (entry->tooltip) - gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget), - _(entry->tooltip), NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), + _(entry->tooltip)); return GTK_WIDGET (entry->widget); } @@ -405,9 +397,6 @@ vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox); - if (!__widget_tooltips) - __widget_tooltips = gtk_tooltips_new(); - /* specify initialize file name */ frame = gtk_frame_new (""); gtk_container_set_border_width (GTK_CONTAINER (frame), 4); ++++++ gtk-2.4+-combobox-migration.patch ++++++ diff -urN scim-canna-1.0.0.orig/src/scim_canna_imengine_setup.cpp scim-canna-1.0.0/src/scim_canna_imengine_setup.cpp --- scim-canna-1.0.0.orig/src/scim_canna_imengine_setup.cpp 2012-06-12 16:03:17.658651082 +0800 +++ scim-canna-1.0.0/src/scim_canna_imengine_setup.cpp 2012-06-12 23:35:08.360720666 +0800 @@ -344,23 +344,22 @@ (GtkAttachOptions) (GTK_FILL), 4, 4); gtk_widget_show (label); - entry->widget = gtk_combo_new (); + entry->widget = gtk_combo_box_text_new_with_entry (); + GtkWidget *entry_inner = gtk_bin_get_child (GTK_BIN (entry->widget)); gtk_label_set_mnemonic_widget (GTK_LABEL (label), - GTK_COMBO (entry->widget)->entry); - gtk_combo_set_value_in_list (GTK_COMBO (entry->widget), TRUE, FALSE); - gtk_combo_set_case_sensitive (GTK_COMBO (entry->widget), TRUE); - gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (entry->widget)->entry), + entry_inner); + gtk_editable_set_editable (GTK_EDITABLE (entry_inner), FALSE); gtk_widget_show (GTK_WIDGET (entry->widget)); gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (entry->widget), 1, 2, idx, idx + 1, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (GTK_FILL), 4, 4); - g_object_set_data (G_OBJECT (GTK_COMBO (entry->widget)->entry), + g_object_set_data (G_OBJECT (entry_inner), DATA_POINTER_KEY, (gpointer) candidates_p); - g_signal_connect ((gpointer) GTK_COMBO (entry->widget)->entry, "changed", + g_signal_connect ((gpointer) entry_inner, "changed", G_CALLBACK (on_default_combo_changed), entry); @@ -535,27 +534,23 @@ } static void -setup_combo_value (GtkCombo *combo, const String & str) +setup_combo_value (GtkComboBoxText *combo, const String & str) { - GList *list = NULL; const char *defval = NULL; ComboConfigCandidate *data = static_cast<ComboConfigCandidate*> - (g_object_get_data (G_OBJECT (GTK_COMBO(combo)->entry), + (g_object_get_data (G_OBJECT (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo)))), DATA_POINTER_KEY)); for (unsigned int i = 0; data[i].label; i++) { - list = g_list_append (list, (gpointer) _(data[i].label)); + gtk_combo_box_text_append_text (combo, _(data[i].label)); if (!strcmp (data[i].data, str.c_str ())) defval = _(data[i].label); } - gtk_combo_set_popdown_strings (combo, list); - g_list_free (list); - if (defval) - gtk_entry_set_text (GTK_ENTRY (combo->entry), defval); + gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo))), defval); } static void @@ -570,8 +565,8 @@ for (unsigned int i = 0; i < __config_string_common_num; i++) { StringConfigData &entry = __config_string_common[i]; - if (entry.widget && GTK_IS_COMBO (entry.widget)) - setup_combo_value (GTK_COMBO (entry.widget), entry.value); + if (entry.widget && GTK_IS_COMBO_BOX (entry.widget)) + setup_combo_value (GTK_COMBO_BOX_TEXT (entry.widget), entry.value); else if (entry.widget && GTK_IS_ENTRY (entry.widget)) gtk_entry_set_text (GTK_ENTRY (entry.widget), entry.value.c_str ()); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
