[arch-commits] Commit in fltk/trunk (PKGBUILD fltk-config-dynlibs.patch)

[Eric Bélanger]

    Date: Wednesday, December 31, 2014 @ 22:12:25
  Author: eric
Revision: 228266

upgpkg: fltk 1.3.3-4

Remove reference to static libs in fltk-config (close FS#43106)

Modified:
  fltk/trunk/PKGBUILD
  fltk/trunk/fltk-config-dynlibs.patch

---------------------------+
 PKGBUILD                  |    4 +-
 fltk-config-dynlibs.patch |   68 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 66 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-31 20:27:10 UTC (rev 228265)
+++ PKGBUILD	2014-12-31 21:12:25 UTC (rev 228266)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.3
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
@@ -14,7 +14,7 @@
         tigervnc.patch fltk-config-dynlibs.patch)
 md5sums=('9ccdb0d19dc104b87179bd9fd10822e3'
          '45bb8f6be2b92710c8f21c1f91fad7d2'
-         'b7ca1a3f5055aabe9c823e650db5b0b0')
+         '401c6df25c78f766e6dff26a13806eb2')
 
 prepare() {
   cd $pkgbase-$pkgver

Modified: fltk-config-dynlibs.patch
===================================================================
--- fltk-config-dynlibs.patch	2014-12-31 20:27:10 UTC (rev 228265)
+++ fltk-config-dynlibs.patch	2014-12-31 21:12:25 UTC (rev 228266)
@@ -1,9 +1,69 @@
-diff -rupN a/fltk-config.in b/fltk-config.in
---- a/fltk-config.in	2011-07-19 06:49:30.000000000 +0200
-+++ b/fltk-config.in	2013-12-26 07:50:58.393155344 +0100
-@@ -357,26 +357,26 @@ if test "$echo_ldstaticflags" = "yes"; t
+diff -Naur fltk-1.3.3-orig/fltk-config.in fltk-1.3.3/fltk-config.in
+--- fltk-1.3.3-orig/fltk-config.in	2014-12-31 15:43:07.203519633 -0500
++++ fltk-1.3.3/fltk-config.in	2014-12-31 15:49:01.636277725 -0500
+@@ -54,21 +54,6 @@
+ 	bindir="$selfdir/fluid"
+ 	includedir="$selfdir"
+ 	libdir="$selfdir/lib"
+-
+-	if test -f "$libdir/libfltk_jpeg.a"; then
+-		CFLAGS="-I$includedir/jpeg $CFLAGS"
+-		CXXFLAGS="-I$includedir/jpeg $CXXFLAGS"
+-	fi
+-
+-	if test -f "$libdir/libfltk_z.a"; then
+-		CFLAGS="-I$includedir/zlib $CFLAGS"
+-		CXXFLAGS="-I$includedir/zlib $CXXFLAGS"
+-	fi
+-
+-	if test -f "$libdir/libfltk_png.a"; then
+-		CFLAGS="-I$includedir/png $CFLAGS"
+-		CXXFLAGS="-I$includedir/png $CXXFLAGS"
+-	fi
  fi
  
+ if test -d $includedir/FL/images; then
+@@ -76,11 +61,6 @@
+ 	CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
+ fi
+ 
+-if test -f "$libdir/libfltk_cairo.a"; then
+-	CFLAGS="$CAIROFLAGS $CFLAGS"
+-	CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+-fi
+-
+ # libraries to link with:
+ LIBNAME="@LIBNAME@"
+ DSONAME="@DSONAME@"
+@@ -230,25 +210,20 @@
+ fi
+ 
+ # Calculate needed libraries
+-LDSTATIC="$libdir/libfltk.a $LDLIBS"
+ LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
+ 
+ if test x$use_forms = xyes; then
+     LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
+-    LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
+ fi
+ if test x$use_gl = xyes; then
+     LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
+-    LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
+ fi
+ if test x$use_images = xyes; then
+     LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
+-    LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
+ fi
+ 
+ if test x$use_cairo = xyes; then
+     LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
+-    LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
+ fi
+ 
+ LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
+@@ -359,26 +334,26 @@
+ fi
+ 
  if test "$echo_libs" = "yes"; then
 -    USELIBS="$libdir/libfltk.a"
 +    USELIBS="$libdir/libfltk.so"