- updated to 2.99.0

[packages/gtk+3.git] / bashisms.patch

diff --git a/bashisms.patch b/bashisms.patch
index cd0457b84254ba28ea78e79e4829c1af1baae815..79595466054b953e80366e3dddf975ff3f8452c2 100644 (file)
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -1,43 +1,29 @@
-From 7032996c76c577a9ab13c47f01ecadc762b87506 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 28 Dec 2010 00:24:05 +0000
-Subject: Remove bashisms from configure.ac
-
-Pointed out by Koop Mast in
-https://bugzilla.gnome.org/show_bug.cgi?id=637974
----
-diff --git a/configure.ac b/configure.ac
-index 7be4641..a90f7d1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1520,16 +1520,16 @@ _______EOF
- ],[
- gdk_windowing=''
- if expr "$gdktarget" : ".*x11.*" > /dev/null ; then
--  gdk_windowing+='
-+  gdk_windowing='$gdk_windowing
- #define GDK_WINDOWING_X11'
+--- gtk+-2.99.0/configure.ac.wiget     2011-01-06 04:55:33.000000000 +0100
++++ gtk+-2.99.0/configure.ac   2011-01-09 21:32:51.429526702 +0100
+@@ -324,7 +324,7 @@ else
  fi
- if expr "$gdktarget" : ".*win32.*" > /dev/null ; then
--  gdk_windowing+='
-+  gdk_windowing='$gdk_windowing
- #define GDK_NATIVE_WINDOW_POINTER
- #define GDK_WINDOWING_WIN32'
- fi
- if expr "$gdktarget" : ".*quartz.*" > /dev/null ; then
--  gdk_windowing='
-+  gdk_windowing='$gdk_windowing
- #define GDK_WINDOWING_QUARTZ'
- fi
- ])
-@@ -1551,7 +1551,7 @@ AC_ARG_ENABLE(Bsymbolic,
-                            enable_Bsymbolic=no)
-                LDFLAGS="${SAVED_LDFLAGS}"])
  
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes" ; then
-   GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
- AC_SUBST(GTK_LINK_FLAGS)
---
-cgit v0.8.3.1
+ # strip leading space
+-GDK_BACKENDS=${GDK_BACKENDS/# }
++GDK_BACKENDS=${GDK_BACKENDS# }
+ 
+ AC_SUBST(GDK_BACKENDS)
+ 
+@@ -1162,7 +1162,7 @@ if test "x$enable_x11_backend" == xyes;
+   AM_CONDITIONAL(USE_X11, true)
+ 
+   # strip leading space
+-  X_EXTENSIONS=${X_EXTENSIONS/# }
++  X_EXTENSIONS=${X_EXTENSIONS# }
+ 
+ else
+   XPACKAGES=
+@@ -1658,7 +1658,7 @@ perf/Makefile
+ AC_OUTPUT
+ 
+ # beautify the immodule list a bit
+-included_immodules=${included_immodules//,/ }
++included_immodules="$(echo $included_immodules|sed -e 's/,/ /g')"
+ included_immodules=${included_immodules:-none}
+ 
+ echo "configuration:"