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

[Bartłomiej Piotrowski]

    Date: Thursday, December 26, 2013 @ 08:00:36
  Author: bpiotrowski
Revision: 202753

upgpkg: fltk 1.3.2-5

- fix detection of dynamic ftlk libraries in fltk-config (FS#38276)

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

---------------------------+
 PKGBUILD                  |   11 +++++++----
 fltk-config-dynlibs.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-25 21:31:15 UTC (rev 202752)
+++ PKGBUILD	2013-12-26 07:00:36 UTC (rev 202753)
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
@@ -11,13 +11,16 @@
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
              'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
-        tigervnc.patch)
+        tigervnc.patch
+        fltk-config-dynlibs.patch)
 md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d'
-         '9efdf03a449d7639b6da493cb0972bba')
+         '9efdf03a449d7639b6da493cb0972bba'
+         'b7ca1a3f5055aabe9c823e650db5b0b0')
 
 prepare() {
   cd $pkgbase-$pkgver
-  patch -Np1 -i ../tigervnc.patch
+  patch -p1 -i ../tigervnc.patch
+  patch -p1 -i ../fltk-config-dynlibs.patch
 }
 
 build() {

Added: fltk-config-dynlibs.patch
===================================================================
--- fltk-config-dynlibs.patch	                        (rev 0)
+++ fltk-config-dynlibs.patch	2013-12-26 07:00:36 UTC (rev 202753)
@@ -0,0 +1,37 @@
+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
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    USELIBS="$libdir/libfltk.a"
++    USELIBS="$libdir/libfltk.so"
+ 
+     if test x$use_forms = xyes; then
+-        USELIBS="$libdir/libfltk_forms.a $USELIBS"
++        USELIBS="$libdir/libfltk_forms.so $USELIBS"
+     fi
+ 
+     if test x$use_gl = xyes; then
+-        USELIBS="$libdir/libfltk_gl.a $USELIBS"
++        USELIBS="$libdir/libfltk_gl.so $USELIBS"
+     fi
+ 
+     if test x$use_cairo = xyes; then
+-        USELIBS="$libdir/libfltk_cairo.a $USELIBS"
++        USELIBS="$libdir/libfltk_cairo.so $USELIBS"
+     fi
+ 
+     if test x$use_images = xyes; then
+-        USELIBS="$libdir/libfltk_images.a $USELIBS"
++        USELIBS="$libdir/libfltk_images.so $USELIBS"
+ 
+         for lib in fltk_jpeg fltk_png fltk_z; do
+-            if test -f $libdir/lib$lib.a; then
+-                USELIBS="$libdir/lib$lib.a $USELIBS"
++            if test -f $libdir/lib$lib.so; then
++                USELIBS="$libdir/lib$lib.so $USELIBS"
+             fi
+ 	done
+     fi