From 6187ff264b5efa35df843775c71c6f6cf8a3ef8711492e8a8dc5873d2971abcf Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 15 Oct 2008 23:25:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp-gap?expand=0&rev=2 --- gimp-gap-no-gimp_proc_view_new.patch | 195 +++++++++++++++++++++++++++ gimp-gap.changes | 5 + gimp-gap.spec | 20 ++- 3 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 gimp-gap-no-gimp_proc_view_new.patch diff --git a/gimp-gap-no-gimp_proc_view_new.patch b/gimp-gap-no-gimp_proc_view_new.patch new file mode 100644 index 0000000..6f53fd7 --- /dev/null +++ b/gimp-gap-no-gimp_proc_view_new.patch @@ -0,0 +1,195 @@ +Remove copy of gimp_proc_view_new(), which is available in gimp-2.6: +gap_dbbrowser_utils.c:160: error: conflicting types for 'gimp_proc_view_new' +/usr/include/gimp-2.0/libgimp/gimpprocview.h:31: error: previous declaration of 'gimp_proc_view_new' was here +================================================================================ +--- gap/gap_dbbrowser_utils.c ++++ gap/gap_dbbrowser_utils.c +@@ -151,188 +151,6 @@ + ); + + +-/* ------------------------ +- * gimp_proc_view_new +- * ------------------------ +- * this procedure is a copy of gimp-2.1.7/plug-ins/dbbrowser/gimpprocbrowser.c +- */ +-GtkWidget * +-gimp_proc_view_new (const gchar *name, +- const gchar *menu_path, +- const gchar *blurb, +- const gchar *help, +- const gchar *author, +- const gchar *copyright, +- const gchar *date, +- GimpPDBProcType type, +- gint n_params, +- gint n_return_vals, +- GimpParamDef *params, +- GimpParamDef *return_vals) +-{ +- GtkWidget *main_vbox; +- GtkWidget *frame; +- GtkWidget *vbox; +- GtkWidget *table; +- GtkWidget *label; +- GtkSizeGroup *name_group; +- GtkSizeGroup *type_group; +- GtkSizeGroup *desc_group; +- gint row; +- +- if (blurb && strlen (blurb) < 2) blurb = NULL; +- if (help && strlen (help) < 2) help = NULL; +- if (author && strlen (author) < 2) author = NULL; +- if (date && strlen (date) < 2) date = NULL; +- if (copyright && strlen (copyright) < 2) copyright = NULL; +- +- if (blurb && help && ! strcmp (blurb, help)) +- help = NULL; +- +- main_vbox = gtk_vbox_new (FALSE, 12); +- +- /* show the name */ +- +- frame = gimp_frame_new (name); +- label = gtk_frame_get_label_widget (GTK_FRAME (frame)); +- gtk_label_set_selectable (GTK_LABEL (label), TRUE); +- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); +- gtk_widget_show (frame); +- +- vbox = gtk_vbox_new (FALSE, 8); +- gtk_container_add (GTK_CONTAINER (frame), vbox); +- gtk_widget_show (vbox); +- +- label = gtk_label_new (GimpPDBProcType_to_string (type)); +- gimp_label_set_attributes (GTK_LABEL (label), +- PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC, +- -1); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); +- gtk_widget_show (label); +- +- if (menu_path) +- { +- label = gtk_label_new_with_mnemonic (menu_path); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); +- gtk_label_set_selectable (GTK_LABEL (label), TRUE); +- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); +- gtk_widget_show (label); +- } +- +- if (blurb) +- { +- label = gtk_label_new (blurb); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); +- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); +- gtk_widget_show (label); +- } +- +- name_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); +- type_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); +- desc_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); +- +- /* in parameters */ +- if (n_params) +- { +- frame = gimp_frame_new (_("Parameters")); +- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); +- gtk_widget_show (frame); +- +- table = gimp_proc_view_create_params (params, n_params, +- name_group, type_group, desc_group); +- gtk_container_add (GTK_CONTAINER (frame), table); +- gtk_widget_show (table); +- } +- +- /* out parameters */ +- if (n_return_vals) +- { +- frame = gimp_frame_new (_("Return Values")); +- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); +- gtk_widget_show (frame); +- +- table = gimp_proc_view_create_params (return_vals, n_return_vals, +- name_group, type_group, desc_group); +- gtk_container_add (GTK_CONTAINER (frame), table); +- gtk_widget_show (table); +- } +- +- if (! help && ! author && ! date && ! copyright) +- return main_vbox; +- +- frame = gimp_frame_new (_("Additional Information")); +- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); +- gtk_widget_show (frame); +- +- vbox = gtk_vbox_new (FALSE, 8); +- gtk_container_add (GTK_CONTAINER (frame), vbox); +- gtk_widget_show (vbox); +- +- /* show the help */ +- if (help) +- { +- label = gtk_label_new (help); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); +- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); +- gtk_widget_show (label); +- } +- +- /* show the author & the copyright */ +- +- if (! author && ! date && ! copyright) +- return main_vbox; +- +- table = gtk_table_new ((author != 0) + (date != 0) + (copyright != 0), 2, +- FALSE); +- gtk_table_set_col_spacings (GTK_TABLE (table), 6); +- gtk_table_set_row_spacings (GTK_TABLE (table), 4); +- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); +- gtk_widget_show (table); +- +- row = 0; +- +- if (author) +- { +- label = gtk_label_new (author); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); +- +- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, +- _("Author:"), 0.0, 0.0, +- label, 3, FALSE); +- } +- +- if (date) +- { +- label = gtk_label_new (date); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); +- +- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, +- _("Date:"), 0.0, 0.0, +- label, 3, FALSE); +- } +- +- if (copyright) +- { +- label = gtk_label_new (copyright); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); +- +- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++, +- _("Copyright:"), 0.0, 0.0, +- label, 3, FALSE); +- } +- +- return main_vbox; +-} /* end gimp_proc_view_new */ +- +- +- + static GtkWidget * + gimp_proc_view_create_params (GimpParamDef *params, + gint n_params, diff --git a/gimp-gap.changes b/gimp-gap.changes index 03f4151..4ea6644 100644 --- a/gimp-gap.changes +++ b/gimp-gap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 15 18:56:14 CEST 2008 - sbrabec@suse.cz + +- Removed copy of gimp_proc_view_new() available in gimp-2.6. + ------------------------------------------------------------------- Fri Jun 6 11:09:06 CEST 2008 - sbrabec@suse.cz diff --git a/gimp-gap.spec b/gimp-gap.spec index 42808ed..c9e981e 100644 --- a/gimp-gap.spec +++ b/gimp-gap.spec @@ -2,9 +2,16 @@ # spec file for package gimp-gap (Version 2.4.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: gimp-gap Version: 2.4.0 -Release: 2 +Release: 52 # Patched code is built by default. # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to name original code as -orig. @@ -41,6 +48,9 @@ Source: ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.4/gap/%{name}-%{version} Source: %{name}-%{version}-patched.tar.bz2 %endif Patch: %{name}-patched.patch +Patch1: %{name}-no-gimp_proc_view_new.patch +# Patch %{name}-no-gimp_proc_view_new.patch makes it binary incompatible with 2.4 +Requires: gimp-2.0 >= 2.6.0 Source1: %{name}-patch-source.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,6 +95,7 @@ Authors: %if ! 0%{?BUILD_ORIG} %patch %endif +%patch1 %build autoreconf -f -i @@ -129,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gimp/2.0/scripts/*.scm %files lang -f gimp20-gap.lang + %changelog +* Wed Oct 15 2008 sbrabec@suse.cz +- Removed copy of gimp_proc_view_new() available in gimp-2.6. * Fri Jun 06 2008 sbrabec@suse.cz - New SuSE package, version 2.4.0.