diff options
author | Llewelyn Trahaearn | 2018-08-25 14:31:49 -0700 |
---|---|---|
committer | Llewelyn Trahaearn | 2018-08-25 14:31:49 -0700 |
commit | 265f1c093a452568040f776bc6b2523729246e10 (patch) | |
tree | d30392143a70c3ef67f56ffcaf72387765789d2a | |
parent | 9049f99989bfb96d5e0ebd066ac19e7772dbcbeb (diff) | |
download | aur-265f1c093a452568040f776bc6b2523729246e10.tar.gz |
Include patches from [Extra] to fix dead call to freetype-config.
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 33 | ||||
-rw-r--r-- | fltk-libpng.patch | 11 | ||||
-rw-r--r-- | fltk-pkgconf.patch | 19 |
4 files changed, 60 insertions, 14 deletions
@@ -1,23 +1,26 @@ pkgbase = lib32-fltk pkgdesc = Graphical user interface toolkit for X (32-bit) pkgver = 1.3.4.2 - pkgrel = 1 + pkgrel = 2 url = http://www.fltk.org arch = x86_64 license = custom:LGPL - makedepends = lib32-gcc-libs + makedepends = lib32-alsa-lib + makedepends = libxft depends = fltk - depends = lib32-gcc-libs depends = lib32-glu depends = lib32-libjpeg-turbo - depends = lib32-libpng depends = lib32-libxcursor depends = lib32-libxinerama depends = lib32-libxft source = http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-2-source.tar.gz source = fltk-config-dynlibs.patch + source = fltk-libpng.patch + source = fltk-pkgconf.patch sha512sums = cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d sha512sums = c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5 + sha512sums = e8e9b79936a09c333ce915a6215753878b6ac8a9800fd2b042e420c266ed1a05fa804eeb70a4fac6ee62ae94e2f24a7a08c4eea0767344524870d558ca1ffc02 + sha512sums = 68c42be32141de7a3014b3f4f180b80feae02af33a5345e9cd9000042b9887037f34f08cc74b7a771f66db668613638650c6153c8a7b2471158bec6ec203af35 pkgname = lib32-fltk @@ -5,25 +5,38 @@ pkgname=lib32-fltk _pkgver=1.3.4-2 pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=2 pkgdesc="Graphical user interface toolkit for X (32-bit)" arch=('x86_64') url="http://www.fltk.org" license=('custom:LGPL') -depends=("${pkgname#lib32-}" 'lib32-gcc-libs' 'lib32-glu' 'lib32-libjpeg-turbo' 'lib32-libpng' 'lib32-libxcursor' 'lib32-libxinerama' 'lib32-libxft') -makedepends=('lib32-gcc-libs') +depends=("${pkgname#lib32-}" 'lib32-glu' 'lib32-libjpeg-turbo' 'lib32-libxcursor' 'lib32-libxinerama' 'lib32-libxft') +makedepends=('lib32-alsa-lib' 'libxft') source=("http://fltk.org/pub/${pkgname#lib32-}/${_pkgver%"-2"}/${pkgname#lib32-}-${_pkgver}-source.tar.gz" - "fltk-config-dynlibs.patch") + "${pkgname#lib32-}-config-dynlibs.patch" + "${pkgname#lib32-}-libpng.patch" + "${pkgname#lib32-}-pkgconf.patch") sha512sums=('cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d' - 'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5') + 'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5' + 'e8e9b79936a09c333ce915a6215753878b6ac8a9800fd2b042e420c266ed1a05fa804eeb70a4fac6ee62ae94e2f24a7a08c4eea0767344524870d558ca1ffc02' + '68c42be32141de7a3014b3f4f180b80feae02af33a5345e9cd9000042b9887037f34f08cc74b7a771f66db668613638650c6153c8a7b2471158bec6ec203af35') prepare() { cd "${pkgname#lib32-}-${_pkgver}" - patch -Np1 -i ${srcdir}/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 + # Fix broken removal of static linking: https://bugs.archlinux.org/task/38276 + patch -p1 -i "../${pkgname#lib32-}-config-dynlibs.patch" + # Fix search for header of libpng + patch -p1 -i "../${pkgname#lib32-}-libpng.patch" + # Fix dead call to freetype-config by replacing it with call to pkgconf + patch -p1 -i "../${pkgname#lib32-}-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() { diff --git a/fltk-libpng.patch b/fltk-libpng.patch new file mode 100644 index 000000000000..be9d60067cd3 --- /dev/null +++ b/fltk-libpng.patch @@ -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 diff --git a/fltk-pkgconf.patch b/fltk-pkgconf.patch new file mode 100644 index 000000000000..7fdf2f548bf3 --- /dev/null +++ b/fltk-pkgconf.patch @@ -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, |