gtk+: merge two related patches into a single file

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3822 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch b/meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch
similarity index 60%
rename from meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch
rename to meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch
index 45cfd4fd606e35c7480eab09978f74f9fdd8a1b3..7d55f3cbb983d231f19a7ab113c77887711a02cf 100644 (file)
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch
+++ b/meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch
@@ -1,3 +1,28 @@
+Index: gtk+-2.12.3/gtk/gtkfilechooser.c
+===================================================================
+--- gtk+-2.12.3.orig/gtk/gtkfilechooser.c      2007-12-04 16:52:08.000000000 +0000
++++ gtk+-2.12.3/gtk/gtkfilechooser.c   2008-01-02 13:15:38.000000000 +0000
+@@ -272,6 +272,20 @@
+                                                               "if necessary."),
+                                                            FALSE,
+                                                            GTK_PARAM_READWRITE));
++
++  g_object_interface_install_property (g_iface,
++                                     g_param_spec_string ("root-folder",
++                                                          P_("File System Root"),
++                                                          P_("Root folder for the file system below which the user should not be able to switch"),
++                                                          NULL,
++                                                          G_PARAM_WRITABLE));
++
++  g_object_interface_install_property (g_iface,
++                                     g_param_spec_boolean ("show-create-folder",
++                                                           P_("Show Create Folder button"),
++                                                           P_("Whether the Create Folder button should be visible on the bar"),
++                                                           TRUE,
++                                                           G_PARAM_READWRITE));
+ }
+ 
+ /**
 Index: gtk+-2.12.3/gtk/gtkfilechooserutils.h
 ===================================================================
 --- gtk+-2.12.3.orig/gtk/gtkfilechooserutils.h 2007-12-04 16:52:08.000000000 +0000

diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser.patch b/meta/packages/gtk+/gtk+-2.12.7/filechooser.patch
deleted file mode 100644 (file)
index c422f60..0000000
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: gtk+-2.12.3/gtk/gtkfilechooser.c
-===================================================================
---- gtk+-2.12.3.orig/gtk/gtkfilechooser.c      2007-12-04 16:52:08.000000000 +0000
-+++ gtk+-2.12.3/gtk/gtkfilechooser.c   2008-01-02 13:15:38.000000000 +0000
-@@ -272,6 +272,20 @@
-                                                               "if necessary."),
-                                                            FALSE,
-                                                            GTK_PARAM_READWRITE));
-+
-+  g_object_interface_install_property (g_iface,
-+                                     g_param_spec_string ("root-folder",
-+                                                          P_("File System Root"),
-+                                                          P_("Root folder for the file system below which the user should not be able to switch"),
-+                                                          NULL,
-+                                                          G_PARAM_WRITABLE));
-+
-+  g_object_interface_install_property (g_iface,
-+                                     g_param_spec_boolean ("show-create-folder",
-+                                                           P_("Show Create Folder button"),
-+                                                           P_("Whether the Create Folder button should be visible on the bar"),
-+                                                           TRUE,
-+                                                           G_PARAM_READWRITE));
- }
- 
- /**

diff --git a/meta/packages/gtk+/gtk+_2.12.7.bb b/meta/packages/gtk+/gtk+_2.12.7.bb
index 79784dd0264bdbf1b1a0d4c2382dd4eeb40dfc66..a29bd313fb5dc2e964c7e5dd87732740efa4e277 100644 (file)
--- a/meta/packages/gtk+/gtk+_2.12.7.bb
+++ b/meta/packages/gtk+/gtk+_2.12.7.bb
@@ -14,8 +14,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
            file://toggle-font.diff;patch=1;pnum=0 \
            file://scrolled-placement.patch;patch=1;pnum=0 \
            file://filesystem-volumes.patch;patch=1 \
-           file://filechooser-utils.patch;patch=1 \
-           file://filechooser.patch;patch=1 \
+           file://filechooser-props.patch;patch=1 \
            file://filechooser-default.patch;patch=1 \
 # temporary
 #           file://gtklabel-resize-patch;patch=1 \