From 49343f8bada08f6c04359c002004c3eabb959375 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 29 Aug 2017 23:20:57 +0200 Subject: gtk+3: Update the patches to work with old versions of patch The patch "0003-Add-disable-opengl-configure-option.patch" used Git rename syntax, which is not supported by patch 2.6.x and older. (From OE-Core rev: 43e640ddcf32c718b3e0bb3f3654ed60eb497058) Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch') diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch index 0bda1f1074..c210bbc7d5 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch @@ -1,4 +1,4 @@ -From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001 +From 0ecaa5bab162abf0cb2057d77beeb7b89d5873b4 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 21 Jun 2016 14:53:56 +0300 Subject: [PATCH 1/4] Hardcoded libtool @@ -12,10 +12,10 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 23d3077..b6931d6 100644 +index 6628e21..f43ac09 100644 --- a/configure.ac +++ b/configure.ac -@@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) +@@ -617,7 +617,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc files]) case $enable_explicit_deps in auto) export SED @@ -24,7 +24,7 @@ index 23d3077..b6931d6 100644 if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then enable_explicit_deps=yes else -@@ -876,7 +876,7 @@ else +@@ -895,7 +895,7 @@ else dnl Now we check to see if our libtool supports shared lib deps dnl (in a rather ugly way even) if $dynworks; then @@ -33,7 +33,7 @@ index 23d3077..b6931d6 100644 module_deplibs_check=`$module_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) +@@ -1649,7 +1649,7 @@ AC_SUBST(GTK_PRINT_BACKENDS) # We are using gmodule-no-export now, but I'm leaving the stripping # code in place for now, since pango and atk still require gmodule. export SED @@ -43,5 +43,5 @@ index 23d3077..b6931d6 100644 GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` -- -2.1.4 +2.12.0 -- cgit 1.2.3-korg