[arch-commits] Commit in (5 files)

[Antonio Rojas]

    Date: Monday, December 18, 2017 @ 11:19:29
  Author: arojas
Revision: 274756

extra2community: Moving fltk from extra to community

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

---------------------------+
 PKGBUILD                  |   66 +++++++++++++++++++++++++++++
 fltk-config-dynlibs.patch |   97 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

Added: fltk/trunk/PKGBUILD
===================================================================
--- fltk/trunk/PKGBUILD	                        (rev 0)
+++ fltk/trunk/PKGBUILD	2017-12-18 11:19:29 UTC (rev 274756)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer:
+
+pkgbase=fltk
+pkgname=('fltk' 'fltk-docs' 'fltk-games')
+pkgver=1.3.4
+pkgrel=1
+arch=('x86_64')
+license=('custom:LGPL')
+url="http://www.fltk.org/"
+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
+        fltk-config-dynlibs.patch)
+md5sums=('c0e43ac259ac8c5d0f7634566e21e3f8'
+         '401c6df25c78f766e6dff26a13806eb2')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -p1 -i ../fltk-config-dynlibs.patch
+  sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' FL/x.H
+  sed -i 's/x-fluid.desktop/fluid.desktop/' -i fluid/Makefile
+}
+
+build() {
+  cd $pkgbase-$pkgver
+  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
+         -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
+  ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
+  make
+  make -C documentation html
+}
+
+package_fltk() {
+  pkgdesc="Graphical user interface toolkit for X"
+  depends=('libjpeg' 'libxft' 'libxinerama' 'hicolor-icon-theme'
+           'desktop-file-utils' 'xdg-utils' 'libxcursor' 'glu')
+  options=('!docs')
+
+  cd $pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C fluid install install-linux
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_fltk-docs() {
+  pkgdesc="Graphical user interface toolkit for X (documentation)"
+
+  cd $pkgbase-$pkgver/documentation
+  install -d "$pkgdir"/usr/share/doc/fltk/
+  for _file in html/* ; do
+    install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
+  done
+  make DESTDIR="$pkgdir" -C ../test install
+  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_fltk-games() {
+  pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
+  depends=('alsa-lib' 'fltk')
+
+  cd $pkgbase-$pkgver/test
+  make DESTDIR="$pkgdir" install-linux
+  make DESTDIR="$pkgdir" -C ../documentation install-linux
+  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}


Property changes on: fltk/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: fltk/trunk/fltk-config-dynlibs.patch
===================================================================
--- fltk/trunk/fltk-config-dynlibs.patch	                        (rev 0)
+++ fltk/trunk/fltk-config-dynlibs.patch	2017-12-18 11:19:29 UTC (rev 274756)
@@ -0,0 +1,97 @@
+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"
+ 
+     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