[Pkg-xfce-commits] r5986 - in desktop/trunk/xfce4-dev-tools/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-09-05 19:18:56 +0000 (Mon, 05 Sep 2011)
New Revision: 5986

Added:
   desktop/trunk/xfce4-dev-tools/debian/patches/
   desktop/trunk/xfce4-dev-tools/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch
   desktop/trunk/xfce4-dev-tools/debian/patches/series
Modified:
   desktop/trunk/xfce4-dev-tools/debian/changelog
Log:
* debian/patches:
  - 0001-Use-pkg-config-macro-for-detection-bug-7787 cherry picked from
    upstream, fix Makefile generation for multi-arch.         closes: #632502

Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog	2011-09-05 19:08:04 UTC (rev 5985)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog	2011-09-05 19:18:56 UTC (rev 5986)
@@ -1,3 +1,11 @@
+xfce4-dev-tools (4.8.0-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 0001-Use-pkg-config-macro-for-detection-bug-7787 cherry picked from
+      upstream, fix Makefile generation for multi-arch.         closes: #632502
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 05 Sep 2011 21:17:17 +0200
+
 xfce4-dev-tools (4.8.0-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Added: desktop/trunk/xfce4-dev-tools/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch	                        (rev 0)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/0001-Use-pkg-config-macro-for-detection-bug-7787.patch	2011-09-05 19:18:56 UTC (rev 5986)
@@ -0,0 +1,74 @@
+From f2eb2c2e9ca7d042eb35fa56f392df4dbaf9924c Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Sun, 3 Jul 2011 19:42:38 +0200
+Subject: [PATCH] Use pkg-config macro for detection (bug #7787).
+
+Use the macro shipped with pkg-config for detection of
+$PKG_CONFIG. This to fix cross-build compatibility.
+---
+ m4macros/xdt-depends.m4 |   40 +++++++++++++++++-----------------------
+ 1 files changed, 17 insertions(+), 23 deletions(-)
+
+diff --git a/m4macros/xdt-depends.m4 b/m4macros/xdt-depends.m4
+index ccf5a44..e5f6b8c 100644
+--- a/m4macros/xdt-depends.m4
++++ b/m4macros/xdt-depends.m4
+@@ -43,11 +43,23 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
+   # minimum supported version of pkg-config
+   xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+ 
+-  # lookup pkg-config utility
+-  if test x"$PKG_CONFIG" = x""; then
+-    AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+-
+-    if test x"$PKG_CONFIG" = x"no"; then
++  m4_ifdef([PKG_PROG_PKG_CONFIG],
++    [
++      PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION])
++
++      if test x"$PKG_CONFIG" = x""; then
++        echo
++        echo "*** Your version of pkg-config is too old. You need atleast"
++        echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
++        echo "*** from the freedesktop.org software repository at"
++        echo "***"
++        echo "***    http://www.freedesktop.org/software/pkgconfig"
++        echo "***"
++        exit 1;
++      fi
++    ],
++    [
++      echo
+       echo "*** The pkg-config utility could not be found on your system."
+       echo "*** Make sure it is in your path, or set the PKG_CONFIG"
+       echo "*** environment variable to the full path to pkg-config."
+@@ -57,25 +69,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
+       echo "***    http://www.freedesktop.org/software/pkgconfig"
+       echo "***"
+       exit 1
+-    fi
+-
+-    # check pkg-config version
+-    AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION])
+-    if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
+-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
+-      AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
+-    else
+-      xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
+-      AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
+-      echo "*** Your version of pkg-config is too old. You need atleast"
+-      echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
+-      echo "*** from the freedesktop.org software repository at"
+-      echo "***"
+-      echo "***    http://www.freedesktop.org/software/pkgconfig"
+-      echo "***"
+-      exit 1
+-    fi
+-  fi
++    ])
+ ])
+ 
+ 
+-- 
+1.7.5.4
+

Added: desktop/trunk/xfce4-dev-tools/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/series	2011-09-05 19:18:56 UTC (rev 5986)
@@ -0,0 +1 @@
+0001-Use-pkg-config-macro-for-detection-bug-7787.patch