fltk14-devel: Modified patch for autoconf setup

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fltk14-devel: Modified patch for autoconf setup
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Wed, 09 Oct 2019 14:58:36 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Wed Oct 9 16:58:36 2019 +0200
Changeset:	dea8473797d7def0d271b85932e90a65967f5c8b

Modified Files:
	fltk14-devel/distinfo
	fltk14-devel/patches/patch-configure.ac

Log Message:
fltk14-devel: Modified patch for autoconf setup

It now uses pkg-config for pango detection.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dea8473797d7def0d271b85932e90a65967f5c8b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fltk14-devel/distinfo                   |  2 +-
 fltk14-devel/patches/patch-configure.ac | 75 +++++++++++++++++++++++++--------
 2 files changed, 59 insertions(+), 18 deletions(-)

diffs:
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 7913f09ee1..3c27aea878 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -5,7 +5,7 @@ RMD160 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 736dfdbba96d8
 SHA512 (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 9f7aa0fe4ee515b0bb0d3d7a70d9823b235b53f8ccf98c243522e7e6bdf4f155564e0a611df19dc40d872dc8fe292d4e71435c66e16b6cfb984ad3c3467c39c8
 Size (fltk-1.4.x-940b7ba13d26dcde4fbd4574d56167501e598327.zip) = 6722087 bytes
 SHA1 (patch-Makefile) = 7db024b114282797a0b1b20df70f73a487fec0e2
-SHA1 (patch-configure.ac) = 7c34af898d3c4b8e9f6715854568febaeb696ccc
+SHA1 (patch-configure.ac) = d4bfad45fefa60ce6a62ba2c429ac8c1f1552397
 SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
 SHA1 (patch-fluid_Makefile) = 8a727140bbcea9ca3bd8ce16ec3cb9b37cef3bb4
 SHA1 (patch-makeinclude.in) = b79a32c2d7571f79078f8ec6036a0e41604f6fac
diff --git a/fltk14-devel/patches/patch-configure.ac b/fltk14-devel/patches/patch-configure.ac
index 9c61a0f9f4..72dbc6ad7c 100644
--- a/fltk14-devel/patches/patch-configure.ac
+++ b/fltk14-devel/patches/patch-configure.ac
@@ -4,16 +4,18 @@ Modifications for "--enable-libtool".
 
 Remove OS specific CXXFLAGS and PANGOLIBDIR selection
 (tested to fail on GNU/Linux).
+Use pkg-config for Pango Flags/Libs instead.
 
---- configure.ac.orig	2019-04-07 09:24:20.000000000 +0000
+--- configure.ac.orig	2019-09-24 10:57:29.000000000 +0000
 +++ configure.ac
-@@ -217,7 +217,20 @@ fi
+@@ -217,7 +217,21 @@ fi
  AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [[default=yes]]])
  
  AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [[default=no]]])
 -if test x$enable_shared = xyes; then
 +
 +# Check whether --enable-libtool or --disable-libtool was given.
++AC_ARG_ENABLE(libtool, [  --enable-libtool        use libtool [[default=no]]])
 +if test "${enable_libtool+set}" = set; then
 +  enableval="$enable_libtool"
 +
@@ -29,7 +31,7 @@ Remove OS specific CXXFLAGS and PANGOLIBDIR selection
      PICFLAG=1
      SHAREDSUFFIX=""
      FLUID="fluid-shared"
-@@ -390,6 +403,21 @@ else
+@@ -390,6 +404,21 @@ else
      LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
  fi
  
@@ -51,7 +53,7 @@ Remove OS specific CXXFLAGS and PANGOLIBDIR selection
  AC_SUBST(DSOCOMMAND)
  AC_SUBST(DSOFLAGS)
  AC_SUBST(DSOLINK)
-@@ -1087,25 +1115,27 @@ case $host_os_gui in
+@@ -1087,33 +1116,58 @@ case $host_os_gui in
  
          pango_found=no
  	if test x$enable_pango = xyes; then
@@ -74,27 +76,66 @@ Remove OS specific CXXFLAGS and PANGOLIBDIR selection
 -	    	  LDFLAGS="-Wl,-rpath,/usr/pkg/lib $LDFLAGS"
 -	    	  ;;
 -   	    esac
+-	        CPPFLAGS="$PANGOLIBDIR $CXXFLAGS"
+-	        AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h],
+-		   AC_CHECK_LIB(pango-1.0, pango_layout_new,
+-		    AC_CHECK_LIB(pangoxft-1.0, pango_xft_render_layout,
+-			AC_DEFINE(USE_PANGO)
+-                        pango_found=yes
+-			LIBS="$PANGOLIBDIR -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0 $LIBS")))
+-		CPPFLAGS=$CXXFLAGS
 +	dnl # Remove OS specific CXXFLAGS and PANGOLIBDIR selection for pkgsrc
 +	dnl # Use ${prefix} instead of hard coded locations
 +	dnl     case $host_os in
-+    	dnl 	darwin*)
++	dnl 	darwin*)
 +	dnl     	  CXXFLAGS="-I/sw/include/pango-1.0 -I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include $CXXFLAGS"
 +	dnl     	  PANGOLIBDIR="-L/sw/lib"
 +	dnl     	  ;;
-+    	dnl 	linux*)
++	dnl 	linux*)
 +	dnl     	  CXXFLAGS="-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $CXXFLAGS"
 +	dnl     	  CXXFLAGS="-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include $CXXFLAGS"
-+    	dnl     	  ;;
-+    	dnl     	freebsd*)
++	dnl     	  ;;
++	dnl     	freebsd*)
 +	dnl     	  CXXFLAGS="-I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include $CXXFLAGS"
 +	dnl     	  ;;
-+     	dnl     	netbsd*)
-+	    	  CXXFLAGS="-I$prefix/include/pango-1.0 -I$prefix/include/glib-2.0 -I$prefix/lib/glib-2.0/include $CXXFLAGS"
-+	    	  CXXFLAGS="-I$prefix/include/glib/glib-2.0 $CXXFLAGS"
-+	    	  PANGOLIBDIR="-L$prefix/lib"
-+	    	  LDFLAGS="-Wl,-rpath,$prefix/lib $LDFLAGS"
++	dnl     	netbsd*)
++	dnl     	  CXXFLAGS="-I$prefix/include/pango-1.0 -I$prefix/include/glib-2.0 -I$prefix/lib/glib-2.0/include $CXXFLAGS"
++	dnl     	  CXXFLAGS="-I$prefix/include/glib/glib-2.0 $CXXFLAGS"
++	dnl     	  PANGOLIBDIR="-L$prefix/lib"
++	dnl     	  LDFLAGS="-Wl,-rpath,$prefix/lib $LDFLAGS"
 +	dnl     	  ;;
-+   	dnl     esac
- 	        CPPFLAGS="$PANGOLIBDIR $CXXFLAGS"
- 	        AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h],
- 		   AC_CHECK_LIB(pango-1.0, pango_layout_new,
++	dnl     esac
++	dnl        CPPFLAGS="$PANGOLIBDIR $CXXFLAGS"
++		dnl -------------------------------------------------------------
++		dnl Use pkg-config instead for pkgsrc
++		AC_PATH_PROG(PKGCONFIG, pkg-config)
++		if test "x$PKGCONFIG" = x; then
++			AC_MSG_NOTICE([please install pkg-config or use 'configure --disable-pango'.])
++			AC_MSG_ERROR([Aborting.])
++                fi
++
++		TMP="`$PKGCONFIG --cflags-only-I pangoxft`"
++		if test "x$TMP" = x; then
++			AC_MSG_NOTICE([pkg-config failed for pango, consider use of 'configure --disable-pango'.])
++			AC_MSG_ERROR([Aborting.])
++		fi
++		CPPFLAGS="$TMP $CPPFLAGS"
++
++		TMP="`$PKGCONFIG --cflags-only-other pangoxft`"
++		CXXFLAGS="$TMP $CXXFLAGS"
++
++		TMP="`$PKGCONFIG --libs-only-L pangoxft`"
++		LDFLAGS="$TMP $LDFLAGS"
++
++		TMP="`$PKGCONFIG --libs-only-l pangoxft`"
++		LIBS="$TMP $LIBS"
++		dnl -------------------------------------------------------------
++		AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h],
++			AC_CHECK_LIB(pango-1.0, pango_layout_new,
++			AC_CHECK_LIB(pangoxft-1.0, pango_xft_render_layout,
++				AC_DEFINE(USE_PANGO)
++				pango_found=yes)))
++	dnl	CPPFLAGS=$CXXFLAGS
+ 	fi
+ 
+ 	dnl Check for the Xdbe extension unless disabled...
Prev by Date: py-Glances: Sorts the PLIST.
Next by Date: fltk14-devel: Silence some pkglint warnings
Previous by Thread: py-Glances: Sorts the PLIST.
Next by Thread: fltk14-devel: Silence some pkglint warnings
Indexes:
Home | Main Index | Thread Index | Old Index