[arch-commits] Commit in fltk/repos/community-x86_64 (6 files)
David Runge
dvzrv at archlinux.org
Wed Jul 18 20:42:18 UTC 2018
Date: Wednesday, July 18, 2018 @ 20:42:17
Author: dvzrv
Revision: 362313
archrelease: copy trunk to community-x86_64
Added:
fltk/repos/community-x86_64/PKGBUILD
(from rev 362312, fltk/trunk/PKGBUILD)
fltk/repos/community-x86_64/fltk-config-dynlibs.patch
(from rev 362312, fltk/trunk/fltk-config-dynlibs.patch)
fltk/repos/community-x86_64/fltk-libpng.patch
(from rev 362312, fltk/trunk/fltk-libpng.patch)
fltk/repos/community-x86_64/fltk-pkgconf.patch
(from rev 362312, fltk/trunk/fltk-pkgconf.patch)
Deleted:
fltk/repos/community-x86_64/PKGBUILD
fltk/repos/community-x86_64/fltk-config-dynlibs.patch
---------------------------+
PKGBUILD | 149 ++++++++++++++++++---------------
fltk-config-dynlibs.patch | 194 ++++++++++++++++++++++----------------------
fltk-libpng.patch | 11 ++
fltk-pkgconf.patch | 19 ++++
4 files changed, 208 insertions(+), 165 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-18 20:41:57 UTC (rev 362312)
+++ PKGBUILD 2018-07-18 20:42:17 UTC (rev 362313)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: David Runge <dave at sleepmap.de>
-
-_pkgver=1.3.4-2
-pkgbase=fltk
-pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=${_pkgver//-/.}
-pkgrel=2
-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/${pkgbase}/${_pkgver%"-2"}/${pkgbase}-${_pkgver}-source.tar.gz"
- fltk-config-dynlibs.patch)
-sha512sums=('cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d'
- 'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5')
-
-prepare() {
- cd "${pkgbase}-${_pkgver}"
- # Fix broken removal of static linking: https://bugs.archlinux.org/task/38276
- 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
- sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
- -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
-}
-
-build() {
- cd "${pkgbase}-${_pkgver}"
- ./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 -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_fltk-docs() {
- pkgdesc="Graphical user interface toolkit for X (documentation)"
-
- cd "${pkgbase}-${_pkgver}/documentation"
- install -t "${pkgdir}/usr/share/doc/fltk/" -Dm644 html/*
- make DESTDIR="$pkgdir" -C ../test install
- install -Dm 644 ../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 -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: fltk/repos/community-x86_64/PKGBUILD (from rev 362312, fltk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-07-18 20:42:17 UTC (rev 362313)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: David Runge <dave at sleepmap.de>
+
+_pkgver=1.3.4-2
+pkgbase=fltk
+pkgname=('fltk' 'fltk-docs' 'fltk-games')
+pkgver=${_pkgver//-/.}
+pkgrel=3
+pkgdesc="Graphical user interface toolkit for X"
+arch=('x86_64')
+license=('custom' 'LGPL')
+url="http://www.fltk.org/"
+makedepends=('alsa-lib' 'desktop-file-utils' 'doxygen' 'glu' 'libjpeg'
+'libxcursor' 'libxft' 'libxinerama' 'mesa')
+source=("http://fltk.org/pub/${pkgbase}/${_pkgver%"-2"}/${pkgbase}-${_pkgver}-source.tar.gz"
+ "${pkgbase}-config-dynlibs.patch"
+ "${pkgbase}-libpng.patch"
+ "${pkgbase}-pkgconf.patch")
+sha512sums=('cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d'
+ 'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5'
+ 'e8e9b79936a09c333ce915a6215753878b6ac8a9800fd2b042e420c266ed1a05fa804eeb70a4fac6ee62ae94e2f24a7a08c4eea0767344524870d558ca1ffc02'
+ '68c42be32141de7a3014b3f4f180b80feae02af33a5345e9cd9000042b9887037f34f08cc74b7a771f66db668613638650c6153c8a7b2471158bec6ec203af35')
+
+prepare() {
+ cd "${pkgbase}-${_pkgver}"
+ # Fix broken removal of static linking: https://bugs.archlinux.org/task/38276
+ patch -p1 -i "../${pkgbase}-config-dynlibs.patch"
+ # Fix search for header of libpng
+ patch -p1 -i "../${pkgbase}-libpng.patch"
+ # Fix dead call to freetype-config by replacing it with call to pkgconf
+ patch -p1 -i "../${pkgbase}-pkgconf.patch"
+ sed -e 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' \
+ -i FL/x.H
+ sed -e 's/x-fluid.desktop/fluid.desktop/' \
+ -i fluid/Makefile
+ sed -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
+ -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' \
+ -i test/Makefile
+ ./autogen.sh
+}
+
+build() {
+ cd "${pkgbase}-${_pkgver}"
+ ./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' 'libxcursor' 'libxft' 'libxinerama'
+ 'desktop-file-utils' 'glu' 'hicolor-icon-theme' 'xdg-utils')
+ options=('!docs')
+
+ cd "${pkgbase}-${_pkgver}"
+ make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C fluid install install-linux
+ install -vDm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_fltk-docs() {
+ pkgdesc="Graphical user interface toolkit for X (documentation)"
+
+ cd "${pkgbase}-${_pkgver}/documentation"
+ make DESTDIR="$pkgdir" -C ../test install
+ install -vDm 644 html/* -t "${pkgdir}/usr/share/doc/fltk/"
+ install -vDm 644 ../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 -vDm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: fltk-config-dynlibs.patch
===================================================================
--- fltk-config-dynlibs.patch 2018-07-18 20:41:57 UTC (rev 362312)
+++ fltk-config-dynlibs.patch 2018-07-18 20:42:17 UTC (rev 362313)
@@ -1,97 +0,0 @@
-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
Copied: fltk/repos/community-x86_64/fltk-config-dynlibs.patch (from rev 362312, fltk/trunk/fltk-config-dynlibs.patch)
===================================================================
--- fltk-config-dynlibs.patch (rev 0)
+++ fltk-config-dynlibs.patch 2018-07-18 20:42:17 UTC (rev 362313)
@@ -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
Copied: fltk/repos/community-x86_64/fltk-libpng.patch (from rev 362312, fltk/trunk/fltk-libpng.patch)
===================================================================
--- fltk-libpng.patch (rev 0)
+++ fltk-libpng.patch 2018-07-18 20:42:17 UTC (rev 362313)
@@ -0,0 +1,11 @@
+--- fltk-1.3.4-2-a/configure.ac 2016-09-30 22:51:45.000000000 +0200
++++ fltk-1.3.4-2-c/configure.ac 2018-07-18 22:30:44.021616512 +0200
+@@ -727,7 +727,7 @@
+ [AC_CHECK_HEADER(png.h,
+ AC_DEFINE(HAVE_PNG_H)
+ syspnginc_ok=yes)
+- AC_CHECK_HEADER(libpng/png.h,
++ AC_CHECK_HEADER(libpng16/png.h,
+ AC_DEFINE(HAVE_LIBPNG_PNG_H)
+ syspnginc_ok=yes)
+ if test x$syspnginc_ok = xyes; then
Copied: fltk/repos/community-x86_64/fltk-pkgconf.patch (from rev 362312, fltk/trunk/fltk-pkgconf.patch)
===================================================================
--- fltk-pkgconf.patch (rev 0)
+++ fltk-pkgconf.patch 2018-07-18 20:42:17 UTC (rev 362313)
@@ -0,0 +1,19 @@
+--- fltk-1.3.4-2-a/configure.ac 2016-09-30 22:51:45.000000000 +0200
++++ fltk-1.3.4-2-b/configure.ac 2018-07-18 21:27:39.362105340 +0200
+@@ -1006,12 +1006,12 @@
+
+ xft_found=no
+ if test x$enable_xft != xno; then
+- AC_PATH_PROG(FTCONFIG, freetype-config)
++ AC_PATH_PROG(FTCONFIG, pkgconf)
+
+ if test "x$FTCONFIG" != x; then
+- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
+- CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
+- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
++ CPPFLAGS="`$FTCONFIG --cflags freetype2` $CPPFLAGS"
++ CFLAGS="`$FTCONFIG --cflags freetype2` $CFLAGS"
++ CXXFLAGS="`$FTCONFIG --cflags freetype2` $CXXFLAGS"
+
+ AC_CHECK_LIB(fontconfig, FcPatternCreate)
+ AC_CHECK_HEADER(X11/Xft/Xft.h,
More information about the arch-commits
mailing list