Hello community, here is the log from the commit of package scim-anthy for openSUSE:Factory checked in at 2012-06-07 15:40:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-anthy (Old) and /work/SRC/openSUSE:Factory/.scim-anthy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-anthy", Maintainer is "fjk...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-anthy/scim-anthy.changes 2012-02-14 19:08:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim-anthy.new/scim-anthy.changes 2012-06-07 15:40:39.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jun 4 08:20:44 UTC 2012 - bi...@opensuse.org + +- Add fix-GtkWidget-migration.patch to migration to GTK3. + Add fix-GtkDialog-has-no-number-named-vbox-error.patch which + provided by Marguerite Su. + +------------------------------------------------------------------- +Mon Jun 4 05:28:48 UTC 2012 - bi...@opensuse.org + +- Add scim-anthy-use-gtk2.patch to fix build with scim1.4.13. + +------------------------------------------------------------------- New: ---- fix-GtkDialog-has-no-number-named-vbox-error.patch fix-GtkWidget-migration.patch scim-anthy-use-gtk2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-anthy.spec ++++++ --- /var/tmp/diff_new_pack.1jtxRV/_old 2012-06-07 15:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.1jtxRV/_new 2012-06-07 15:40:40.000000000 +0200 @@ -28,6 +28,11 @@ Provides: locale(scim:ja) Url: http://sourceforge.jp/projects/scim-imengine/ Source0: scim-anthy-%{version}.tar.bz2 +%if 0%{?suse_version} >= 1140 +Patch0: scim-anthy-use-gtk2.patch +Patch1: fix-GtkDialog-has-no-number-named-vbox-error.patch +Patch2: fix-GtkWidget-migration.patch +%endif Patch355863: bnc355863-add-Eisu_toggle-to-default-keybindings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Anthy Input Method Engine for SCIM @@ -41,6 +46,11 @@ %define scim_binary_version %(pkg-config --variable=scim_binary_version scim) %define build_setup 1 %setup -q -n %{name}-%{version} +%if 0%{?suse_version} >= 1140 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%endif %patch355863 -p1 %build @@ -49,7 +59,7 @@ %configure \ --disable-static \ --enable-debug -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install make DESTDIR=${RPM_BUILD_ROOT} install @@ -57,9 +67,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/anthy-imengine-setup.{a,la} %find_lang scim-anthy -%clean -#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; - %files -f scim-anthy.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog ++++++ bnc355863-add-Eisu_toggle-to-default-keybindings.patch ++++++ --- /var/tmp/diff_new_pack.1jtxRV/_old 2012-06-07 15:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.1jtxRV/_new 2012-06-07 15:40:40.000000000 +0200 @@ -1,6 +1,7 @@ -diff -ru scim-anthy-1.2.4.orig//src/scim_anthy_prefs.h scim-anthy-1.2.4/src/scim_anthy_prefs.h ---- scim-anthy-1.2.4.orig//src/scim_anthy_prefs.h 2007-04-16 07:04:01.000000000 +0200 -+++ scim-anthy-1.2.4/src/scim_anthy_prefs.h 2008-02-11 14:29:52.000000000 +0100 +Index: scim-anthy-1.2.7/src/scim_anthy_prefs.h +=================================================================== +--- scim-anthy-1.2.7.orig/src/scim_anthy_prefs.h ++++ scim-anthy-1.2.7/src/scim_anthy_prefs.h @@ -214,7 +214,7 @@ #define SCIM_ANTHY_CONFIG_KEY_THEME_DEFAULT "Default" #define SCIM_ANTHY_CONFIG_KEY_THEME_FILE_DEFAULT "" ++++++ fix-GtkDialog-has-no-number-named-vbox-error.patch ++++++ diff -urN scim-anthy-1.2.7.orig/src/scim_anthy_color_button.cpp scim-anthy-1.2.7/src/scim_anthy_color_button.cpp --- scim-anthy-1.2.7.orig/src/scim_anthy_color_button.cpp 2012-06-04 14:35:15.433829462 +0800 +++ scim-anthy-1.2.7/src/scim_anthy_color_button.cpp 2012-06-04 15:20:08.525161186 +0800 @@ -212,7 +212,7 @@ gint swap_w = 0, swap_h = 0; gint rect_w, rect_h; - if (!GTK_WIDGET_DRAWABLE (widget)) + if (!gtk_widget_is_drawable(widget)) return FALSE; width = widget->allocation.width; diff -urN scim-anthy-1.2.7.orig/src/scim_anthy_setup_kana.cpp scim-anthy-1.2.7/src/scim_anthy_setup_kana.cpp --- scim-anthy-1.2.7.orig/src/scim_anthy_setup_kana.cpp 2012-06-04 14:35:15.432829474 +0800 +++ scim-anthy-1.2.7/src/scim_anthy_setup_kana.cpp 2012-06-04 14:49:28.598163441 +0800 @@ -272,9 +272,9 @@ // option menu area GtkWidget *hbox = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, FALSE, 0); - gtk_box_reorder_child (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, 0); + gtk_box_reorder_child (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, 0); gtk_widget_show(hbox); GtkWidget *label = gtk_label_new_with_mnemonic (_("Layout _table:")); @@ -344,9 +344,9 @@ // option menu area GtkWidget *hbox = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, FALSE, 0); - gtk_box_reorder_child (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, 0); + gtk_box_reorder_child (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, 0); gtk_widget_show(hbox); GtkWidget *label = gtk_label_new_with_mnemonic (_("Layout _table:")); diff -urN scim-anthy-1.2.7.orig/src/scim_anthy_setup_romaji.cpp scim-anthy-1.2.7/src/scim_anthy_setup_romaji.cpp --- scim-anthy-1.2.7.orig/src/scim_anthy_setup_romaji.cpp 2012-06-04 14:35:15.433829462 +0800 +++ scim-anthy-1.2.7/src/scim_anthy_setup_romaji.cpp 2012-06-04 14:46:39.129282092 +0800 @@ -187,9 +187,9 @@ // option menu area GtkWidget *hbox = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, FALSE, 0); - gtk_box_reorder_child (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, 0); + gtk_box_reorder_child (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, 0); gtk_widget_show(hbox); GtkWidget *label = gtk_label_new_with_mnemonic (_("Romaji _table:")); diff -urN scim-anthy-1.2.7.orig/src/scim_anthy_table_editor.cpp scim-anthy-1.2.7/src/scim_anthy_table_editor.cpp --- scim-anthy-1.2.7.orig/src/scim_anthy_table_editor.cpp 2012-06-04 14:35:15.433829462 +0800 +++ scim-anthy-1.2.7/src/scim_anthy_table_editor.cpp 2012-06-04 15:03:50.948382580 +0800 @@ -134,7 +134,7 @@ // edit area GtkWidget *hbox = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), hbox, + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(editor))), hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); ++++++ fix-GtkWidget-migration.patch ++++++ Index: scim-anthy-1.2.7/src/scim_anthy_color_button.cpp =================================================================== --- scim-anthy-1.2.7.orig/src/scim_anthy_color_button.cpp +++ scim-anthy-1.2.7/src/scim_anthy_color_button.cpp @@ -211,13 +211,22 @@ scim_anthy_color_button_expose (GtkWidge gint width, height; gint swap_w = 0, swap_h = 0; gint rect_w, rect_h; - + GtkAllocation *allocation = NULL; + if (!gtk_widget_is_drawable(widget)) return FALSE; - width = widget->allocation.width; - height = widget->allocation.height; + allocation = g_new0 (GtkAllocation, 1); + if (allocation == NULL) + return FALSE; + + gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); + width = allocation->width; + height = allocation->height; + if (allocation != NULL) + g_free (allocation); + /* draw the swap colors pixbuf */ if (!button->swap_icon) { button->swap_icon @@ -231,7 +240,7 @@ scim_anthy_color_button_expose (GtkWidge } if (swap_w < width / 2 && swap_h < height / 2) { - gdk_draw_pixbuf (widget->window, NULL, button->swap_icon, + gdk_draw_pixbuf (gtk_widget_get_window (widget), NULL, button->swap_icon, 0, 0, width - swap_w, 0, swap_w, swap_h, GDK_RGB_DITHER_NORMAL, 0, 0); } else { @@ -252,14 +261,14 @@ scim_anthy_color_button_expose (GtkWidge /* draw the background area */ scim_anthy_color_button_draw_rect (button, - widget->window, - widget->style->fg_gc[0], + gtk_widget_get_window (widget), + gtk_widget_get_style (widget)->fg_gc[0], (width - rect_w), (height - rect_h), rect_w, rect_h, &button->bg_color); - gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, + gtk_paint_shadow (gtk_widget_get_style (widget), gtk_widget_get_window (widget), GTK_STATE_NORMAL, GTK_SHADOW_IN, NULL, widget, NULL, (width - rect_w), @@ -269,13 +278,13 @@ scim_anthy_color_button_expose (GtkWidge /* draw the foreground area */ scim_anthy_color_button_draw_rect (button, - widget->window, - widget->style->fg_gc[0], + gtk_widget_get_window (widget), + gtk_widget_get_style (widget)->fg_gc[0], 0, 0, rect_w, rect_h, &button->fg_color); - gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, + gtk_paint_shadow (gtk_widget_get_style (widget), gtk_widget_get_window (widget), GTK_STATE_NORMAL, GTK_SHADOW_IN, NULL, widget, NULL, 0, 0, @@ -289,11 +298,22 @@ scim_anthy_color_button_target (ScimAnth gint x, gint y) { - gint width = GTK_WIDGET (button)->allocation.width; - gint height = GTK_WIDGET (button)->allocation.height; + GtkAllocation *allocation = NULL; + gint width, height; gint rect_w = button->rect_width; gint rect_h = button->rect_height; + allocation = g_new0 (GtkAllocation, 1); + if (allocation == NULL) + return INVALID_AREA; + + gtk_widget_get_allocation(GTK_WIDGET(button), allocation); + width = allocation->width; + height = allocation->height; + + if (allocation != NULL) + g_free (allocation); + if (x > 0 && x < rect_w && y > 0 && y < rect_h) return FOREGROUND_AREA; else if (x > (width - rect_w) && x < width && @@ -322,7 +342,7 @@ scim_anthy_color_button_open_color_dialo dialog = gtk_color_selection_dialog_new (title); - gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel), + gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)), color); gtk_widget_show (dialog); @@ -330,7 +350,7 @@ scim_anthy_color_button_open_color_dialo switch (result) { case GTK_RESPONSE_OK: - gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel), + gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)), color); g_signal_emit (button, button_signals[COLOR_CHANGED], 0); break; ++++++ scim-anthy-use-gtk2.patch ++++++ Index: scim-anthy-1.2.7/src/Makefile.am =================================================================== --- scim-anthy-1.2.7.orig/src/Makefile.am +++ scim-anthy-1.2.7/src/Makefile.am @@ -104,16 +104,19 @@ anthy_imengine_setup_la_SOURCES = \ scim_anthy_table_editor.cpp \ scim_anthy_color_button.cpp -anthy_imengine_setup_la_CFLAGS = @SCIM_GTKUTILS_CFLAGS@ \ +anthy_imengine_setup_la_CFLAGS = @GTK2_CFLAGS@ \ + @SCIM_GTKUTILS_CFLAGS@ \ @SCIM_CFLAGS@ \ @SCIM_DEBUG_FLAGS@ -anthy_imengine_setup_la_CXXFLAGS= @SCIM_GTKUTILS_CFLAGS@ \ +anthy_imengine_setup_la_CXXFLAGS= @GTK2_CFLAGS@ \ + @SCIM_GTKUTILS_CFLAGS@ \ @SCIM_CFLAGS@ \ @SCIM_DEBUG_FLAGS@ anthy_imengine_setup_la_LDFLAGS = -avoid-version \ -rpath $(setupmoduledir) \ -module \ @LIBTOOL_EXPORT_OPTIONS@ \ + @GTK2_LIBS@ \ @SCIM_GTKUTILS_LIBS@ \ @INTLLIBS@ \ @SCIM_LIBS@ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
