File 0001-Look-for-system-update-icon-cache-when-cro... of Package mingw32-gtk3

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Look-for-system-update-icon-cache-when-cross-compili.patch of Package mingw32-gtk3 (Revision 66c41b024f8c9ceb0125724558e26395)

Currently displaying revision 66c41b024f8c9ceb0125724558e26395 , Show latest

From fdc742499a26e18e65f2084b05db48abff3764b7 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Mon, 1 Apr 2013 10:06:07 +0200
Subject: [PATCH] Look for system update-icon-cache when cross compiling

https://bugzilla.gnome.org/show_bug.cgi?id=696951
---
 configure.ac |   37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 34249fa..b08df12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -891,18 +891,15 @@ AC_CHECK_HEADER(sys/sysinfo.h,
                 AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
                           [Define to 1 if sys/sysinfo.h is available]))
 
-dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
 
-AS_IF([test "x$enable_gtk2_dependency" = xyes],
-      [AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-       if test x$GTK_UPDATE_ICON_CACHE = xno; then
-         REBUILD_PNGS=#
-       fi],
-
-      [test "x$cross_compiling" = xyes],
-      [# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf.
+if test "x$enable_gtk2_dependency" = xyes || test "x$cross_compiling" = xyes; then
+  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+  AS_IF(
+    [test x$GTK_UPDATE_ICON_CACHE != xno],
+      [use_external_icon_cache=yes],
+    [test "x$cross_compiling" = xyes],
+      [# If no system gtk-update-icon-cache and cross compiling, we build a native gtk-update-icon-cache.
        # pkg.m4 blocks all variable starting with PKG, so allow this one
        m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
 
@@ -917,20 +914,18 @@ AS_IF([test "x$enable_gtk2_dependency" = xyes],
        NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
        NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
        AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
-       AC_SUBST(NATIVE_GDKPIXBUF_LIBS)]
-)
-
-AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
+       AC_SUBST(NATIVE_GDKPIXBUF_LIBS)],
+    [test "x$enable_gtk2_dependency" = xyes && test ! -f $srcdir/gtk/gtkbuiltincache.h],
+      [AC_MSG_ERROR([
+*** gtkbuiltincache.h is not in the tree, and cannot be built because you
+*** do not have a prebuilt gtk-update-icon-cache on the build system.])]
+  )
+fi
+AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$use_external_icon_cache" = xyes])
 
+dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 
-if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
-   test "x$REBUILD_PNGS" = "x#" ; then
-     AC_MSG_ERROR([
-*** gtkbuiltincache.h is not in the tree, and cannot be built
-*** because you don't have libpng, or (when cross-compiling) you
-*** don't have a prebuilt gtk-update-icon-cache on the build system.])
-fi
 
 ########################################
 # Windowing system checks
-- 
1.7.10.4

Places

File 0001-Look-for-system-update-icon-cache-when-cross-compili.patch of Package mingw32-gtk3 (Revision 66c41b024f8c9ceb0125724558e26395)

Places