Packman Build Service PMBS

Changes of Revision 35

0002-Fix-gdlib-detection.patch Changed

@@ -1,22 +1,26 @@
+From 3ddceee70a54ec6532e3d5e3caacd97f9c9a97d3 Mon Sep 17 00:00:00 2001
+From: Johannes Obermayr <johannesobermayr@gmx.de>
+Date: Thu, 4 Feb 2016 17:37:46 +0100
+Subject: PATCH Fix gdlib detection.
+
+Bad hack but needed because "gdlib-config --version" returns ".." due to a bug in the script.
+---
+ m4/gdlib.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/m4/gdlib.m4 b/m4/gdlib.m4
-index 236da4b..9bc828e 100644
+index 236da4b..7d359b8 100644
 --- a/m4/gdlib.m4
 +++ b/m4/gdlib.m4
-@@ -69,14 +69,10 @@ m4_define(REQUIRED_VERSION_MICRO, m4_bregexp(REQUIRED_VERSION, $0-9+$\.\
+@@ -69,7 +69,7 @@ m4_define(REQUIRED_VERSION_MICRO, m4_bregexp(REQUIRED_VERSION, $0-9+$\.\
  		gdlib_config_minor_version=`echo $GDLIB_VERSION | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\2/'`
  		gdlib_config_micro_version=`echo $GDLIB_VERSION | sed 's/$0-9*$\.$0-9*$\.$0-9*$.*/\3/'`
  
-+		let REQUIRED_VERSION_INT=$REQUIRED_VERSION_MAJOR**16+$REQUIRED_VERSION_MINOR**8+REQUIRED_VERSION_MICRO
-+		let GDLIB_VERSION_INT=$gdlib_config_major_version**16+$gdlib_config_minor_version**8+$gdlib_config_micro_version
- 		gdlib_ver_ok=
--		MULE_IF(test $gdlib_config_major_version -gt REQUIRED_VERSION_MAJOR, gdlib_ver_ok=yes,
--			test $gdlib_config_major_version -eq REQUIRED_VERSION_MAJOR, 
--				MULE_IF(test $gdlib_config_minor_version -gt REQUIRED_VERSION_MINOR, gdlib_ver_ok=yes,
--					test $gdlib_config_minor_version -eq REQUIRED_VERSION_MINOR,
--						MULE_IF(test $gdlib_config_micro_version -ge REQUIRED_VERSION_MICRO, gdlib_ver_ok=yes))
--			)
--
-+		MULE_IF(test $GDLIB_VERSION_INT -ge $REQUIRED_VERSION_INT, gdlib_ver_ok=yes)
- 		AS_IF(test -z "$gdlib_ver_ok", 
- 			AS_IF(test -z "$GDLIB_VERSION", AC_MSG_RESULT(no), 
- 				AC_MSG_RESULT(no (version $GDLIB_VERSION is not new enough))
+-		gdlib_ver_ok=
++		gdlib_ver_ok=yes
+ 		MULE_IF(test $gdlib_config_major_version -gt REQUIRED_VERSION_MAJOR, gdlib_ver_ok=yes,
+ 			test $gdlib_config_major_version -eq REQUIRED_VERSION_MAJOR, 
+ 				MULE_IF(test $gdlib_config_minor_version -gt REQUIRED_VERSION_MINOR, gdlib_ver_ok=yes,
+-- 
+2.7.0
+