Update to 1.3.4-2 from upstream.

2 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84b24c49c103..7f9f9f5dfed6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
-# Generated by mksrcinfo v8
-# Thu Dec 15 19:54:54 UTC 2016
 pkgbase = lib32-fltk
 	pkgdesc = Graphical user interface toolkit for X (32-bit)
-	pkgver = 1.3.4
+	pkgver = 1.3.4.2
 	pkgrel = 1
 	url = http://www.fltk.org
 	arch = x86_64
-	license = LGPL
-	makedepends = gcc-multilib
+	license = custom:LGPL
+	makedepends = lib32-gcc-libs
 	depends = fltk
 	depends = lib32-gcc-libs
 	depends = lib32-glu
@@ -16,9 +14,9 @@ pkgbase = lib32-fltk
 	depends = lib32-libxcursor
 	depends = lib32-libxinerama
 	depends = lib32-libxft
-	source = http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-source.tar.gz
+	source = http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-2-source.tar.gz
 	source = fltk-config-dynlibs.patch
-	sha512sums = 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
+	sha512sums = cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d
 	sha512sums = c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5
 
 pkgname = lib32-fltk
diff --git a/PKGBUILD b/PKGBUILD
index b854df919569..d1d85bcbf39c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,27 @@
 # Contributor: genesis66
 
 pkgname=lib32-fltk
-pkgver=1.3.4
+_pkgver=1.3.4-2
+pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="Graphical user interface toolkit for X (32-bit)"
 arch=('x86_64')
 url="http://www.fltk.org"
-license=('LGPL')
+license=('custom:LGPL')
 depends=("${pkgname#lib32-}" 'lib32-gcc-libs' 'lib32-glu' 'lib32-libjpeg-turbo' 'lib32-libpng' 'lib32-libxcursor' 'lib32-libxinerama' 'lib32-libxft')
-makedepends=('gcc-multilib')
-source=("http://fltk.org/pub/${pkgname#lib32-}/${pkgver}/${pkgname#lib32-}-${pkgver}-source.tar.gz"
+makedepends=('lib32-gcc-libs')
+source=("http://fltk.org/pub/${pkgname#lib32-}/${_pkgver%"-2"}/${pkgname#lib32-}-${_pkgver}-source.tar.gz"
         "fltk-config-dynlibs.patch")
-sha512sums=('92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2'
+sha512sums=('cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d'
             'c2f15a5c134a258082454dacf8db14b4d276c8c9ed207b1d2275690a2829272cfee81186caf794031339f7ed619898485bd59c6d59d2e71cd98facfbb564c1f5')
 
 prepare() {
-  cd "${pkgname#lib32-}-${pkgver}"
+  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
 }
 
 build() {
@@ -30,7 +33,7 @@ build() {
   export LDFLAGS="-m32 ${LDFLAGS}"
   export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
 
-  cd "${pkgname#lib32-}-${pkgver}"
+  cd "${pkgname#lib32-}-${_pkgver}"
   ./configure \
     --build=i686-pc-linux-gnu \
     --prefix=/usr \
@@ -43,9 +46,10 @@ build() {
 }
 
 package() {
-  cd "${pkgname#lib32-}-${pkgver}"
+  cd "${pkgname#lib32-}-${_pkgver}"
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C fluid install install-linux
   chmod 644 "${pkgdir}"/usr/lib32/*.a
   rm -rf "${pkgdir}/usr/"{bin,include,share}
+  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }