Remove all comments from multiline expressions (as mentioned in bug #704)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 28 insertions, 25 deletions

diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index 7f242d94df..7c72a09257 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -16,13 +16,14 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
            file://filechooser-props.patch;patch=1 \
            file://filechooser-default.patch;patch=1 \
            file://filechooser-sizefix.patch;patch=1 \
+          "
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#        file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;patch=1
+#           file://menu-deactivate.patch;patch=1
+#        file://combo-arrow-size.patch;patch=1;pnum=0
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1 \
-          "
+#           file://pangoxft2.10.6.diff;patch=1
+
 
 EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 5060829e4b..deea3d07cd 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -10,18 +10,20 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
            file://cellrenderer-cairo.patch;patch=1;pnum=0 \
            file://toggle-font.diff;patch=1;pnum=0 \
            file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \
-# TO MERGE
-#           file://entry-cairo.patch;patch=1;pnum=0 \
-#           file://filesystem-volumes.patch;patch=1 \
-#           file://filechooser-props.patch;patch=1 \
-#           file://filechooser-default.patch;patch=1 \
-#           file://filechooser-sizefix.patch;patch=1 \
-# temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#        file://combo-arrow-size.patch;patch=1;pnum=0 \
             file://disable-gio-png-sniff-test.diff;patch=1 \
           "
+# TO MERGE
+#           file://entry-cairo.patch;patch=1;pnum=0
+#           file://filesystem-volumes.patch;patch=1
+#           file://filechooser-props.patch;patch=1
+#           file://filechooser-default.patch;patch=1
+#           file://filechooser-sizefix.patch;patch=1
+# temporary
+#           file://gtklabel-resize-patch;patch=1
+#           file://menu-deactivate.patch;patch=1
+#        file://combo-arrow-size.patch;patch=1;pnum=0
+
+
 
 EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups"
 
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
index e311a8cc44..9ae762da35 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
@@ -15,18 +15,18 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
            file://toggle-font.diff;patch=1;pnum=0 \
            file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \
            file://doc-fixes.patch \
+          "
 # TO MERGE
-#           file://entry-cairo.patch;patch=1;pnum=0 \
-#           file://filesystem-volumes.patch;patch=1 \
-#           file://filechooser-props.patch;patch=1 \
-#           file://filechooser-default.patch;patch=1 \
-#           file://filechooser-sizefix.patch;patch=1 \
+#           file://entry-cairo.patch;patch=1;pnum=0
+#           file://filesystem-volumes.patch;patch=1
+#           file://filechooser-props.patch;patch=1
+#           file://filechooser-default.patch;patch=1
+#           file://filechooser-sizefix.patch;patch=1
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#        file://combo-arrow-size.patch;patch=1;pnum=0 \
-#            file://configurefix.patch;patch=1 \
-          "
+#           file://gtklabel-resize-patch;patch=1
+#           file://menu-deactivate.patch;patch=1
+#        file://combo-arrow-size.patch;patch=1;pnum=0
+#            file://configurefix.patch;patch=1
 
 SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9"
 SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07"