Hello community,
here is the log from the commit of package scim-skk for openSUSE:Factory checked in at 2012-06-12 21:59:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scim-skk (Old)
and /work/SRC/openSUSE:Factory/.scim-skk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-skk", Maintainer is "FJKong@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/scim-skk/scim-skk.changes 2011-09-23 12:45:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.scim-skk.new/scim-skk.changes 2012-06-12 22:10:22.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jun 12 03:56:46 UTC 2012 - mgorse@suse.com
+
+- More gtk3 fixes
+
+-------------------------------------------------------------------
+Sun Jun 10 14:30:53 UTC 2012 - i@marguerite.su
+
+- fix gtk3 builds for factory.
+
+-------------------------------------------------------------------
New:
----
gtk-2.24+-replace-functions.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim-skk.spec ++++++
--- /var/tmp/diff_new_pack.TYrq2y/_old 2012-06-12 22:10:24.000000000 +0200
+++ /var/tmp/diff_new_pack.TYrq2y/_new 2012-06-12 22:10:24.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package scim-skk (Version 0.5.2)
+# spec file for package scim-skk
#
-# 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,18 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: scim-skk
-BuildRequires: anthy-devel gcc-c++ gtk2-devel scim-devel update-desktop-files
Version: 0.5.2
-Release: 293
+Release: 0
+Summary: SKK Input Method Engine for SCIM
License: GPL-2.0+
Group: System/I18n/Japanese
-AutoReqProv: on
-Requires: skkdic
-Provides: locale(scim:ja)
Url: http://sourceforge.jp/projects/scim-imengine/
Source0: http://osdn.dl.sourceforge.jp/scim-imengine/15351/scim-skk-0.5.2.tar.bz2
Patch0: commit-when-focus-out.patch
@@ -34,8 +29,16 @@
Patch2: missing-includes.patch
Patch3: scim-skk-iter-remove-fix.diff
Patch4: scim-skk-fix-returns.diff
+#PATCH-FOR-UPSTREAM fix builds against latest gtk.
+Patch5: gtk-2.24+-replace-functions.patch
+BuildRequires: anthy-devel
+BuildRequires: gcc-c++
+BuildRequires: gtk2-devel
+BuildRequires: scim-devel
+BuildRequires: update-desktop-files
+Requires: skkdic
+Provides: locale(scim:ja)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: SKK Input Method Engine for SCIM
%description
SKK Input Method Engine for SCIM
@@ -43,19 +46,22 @@
%prep
%define scim_binary_version %(pkg-config --variable=scim_binary_version scim)
%define build_setup 1
-%setup -q -n %{name}-%{version}
+%setup -q
%patch0 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%if %suse_version <= 1110
+%if 0%{?suse_version} <= 1110
%patch1 -p0
libtoolize --force
autoreconf -I /opt/gnome/share/aclocal --force --install --verbose
%endif
+%if 0%{?suse_version} >= 1140
+%patch5 -p1
+%endif
%build
-CXXFLAGS="$RPM_OPT_FLAGS" \
+CXXFLAGS="%{optflags}" \
./configure --prefix=/usr \
--sysconfdir=%{_sysconfdir} \
--libdir=%{_libdir} \
@@ -64,14 +70,11 @@
make
%install
-make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/skk.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/skk-imengine-setup.{a,la}
+%makeinstall
+rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/skk.{a,la}
+rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/skk-imengine-setup.{a,la}
%find_lang scim-skk
-%clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-
%files -f scim-skk.lang
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README* ChangeLog TODO
++++++ gtk-2.24+-replace-functions.patch ++++++
diff -ur scim-skk-0.5.2.orig/src/scim_skk_imengine_setup.cpp scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp
--- scim-skk-0.5.2.orig/src/scim_skk_imengine_setup.cpp 2012-06-11 22:12:16.007565280 -0500
+++ scim-skk-0.5.2/src/scim_skk_imengine_setup.cpp 2012-06-11 22:44:07.315670643 -0500
@@ -180,7 +180,6 @@
static GtkWidget * __widget_annot_highlight = 0;
static GtkWidget * __widget_ignore_return = 0;
static GtkWidget * __widget_selection_style = 0;
-static GtkTooltips * __widget_tooltips = 0;
static KeyboardConfigData __config_keyboards_common [] =
{
@@ -485,16 +484,15 @@
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
- *widget = gtk_combo_new ();
- gtk_combo_set_value_in_list (GTK_COMBO (*widget), TRUE, FALSE);
- gtk_combo_set_case_sensitive (GTK_COMBO (*widget), TRUE);
- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (*widget)->entry), FALSE);
+ *widget = gtk_combo_box_text_new_with_entry ();
+ GtkWidget *entry = gtk_bin_get_child (GTK_BIN (*widget));
+ gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
gtk_widget_show (*widget);
gtk_box_pack_start (GTK_BOX (hbox), *widget, FALSE, FALSE, 4);
- g_object_set_data (G_OBJECT (GTK_COMBO (*widget)->entry), DATA_POINTER_KEY,
+ g_object_set_data (G_OBJECT (entry), DATA_POINTER_KEY,
(gpointer) candidates_p);
- g_signal_connect ((gpointer) GTK_COMBO (*widget)->entry, "changed",
+ g_signal_connect ((gpointer) entry, "changed",
G_CALLBACK (on_default_combo_changed),
data_p);
@@ -529,11 +527,9 @@
if (label)
gtk_label_set_mnemonic_widget(GTK_LABEL(label), 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 hbox;
}
@@ -721,7 +717,7 @@
// Create keyboard setting.
for (unsigned int i = 0; data[i].key; ++ i) {
APPEND_ENTRY(_(data[i].label), data[i].entry, i);
- gtk_entry_set_editable (GTK_ENTRY (data[i].entry), FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE (data[i].entry), FALSE);
data[i].button = gtk_button_new_with_label ("...");
gtk_widget_show (data[i].button);
@@ -740,11 +736,9 @@
&(data[i].data));
}
- if (!__widget_tooltips)
- __widget_tooltips = gtk_tooltips_new();
for (unsigned int i = 0; data[i].key; ++ i) {
- gtk_tooltips_set_tip (__widget_tooltips, data[i].entry,
- _(data[i].tooltip), NULL);
+ gtk_widget_set_tooltip_text (data[i].entry,
+ _(data[i].tooltip));
}
return table;
@@ -794,40 +788,38 @@
}
static void
-setup_combo_value (GtkCombo *combo,
+setup_combo_value (GtkComboBoxText *combo,
ComboConfigData *data, const String & str)
{
- GList *list = NULL;
const char *defval = NULL;
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
setup_widget_value ()
{
if (__widget_selection_style) {
- setup_combo_value (GTK_COMBO (__widget_selection_style),
+ setup_combo_value (GTK_COMBO_BOX_TEXT (__widget_selection_style),
selection_style, __config_selection_style);
}
if (__widget_annot_pos) {
- setup_combo_value (GTK_COMBO (__widget_annot_pos),
+ setup_combo_value (GTK_COMBO_BOX_TEXT (__widget_annot_pos),
annot_position, __config_annot_pos);
}
if (__widget_annot_target) {
- setup_combo_value (GTK_COMBO (__widget_annot_target),
+ setup_combo_value (GTK_COMBO_BOX_TEXT (__widget_annot_target),
annot_target, __config_annot_target);
}
@@ -1059,17 +1051,19 @@
FileConfigData *data = static_cast