diff options
| -rw-r--r-- | user/giflib/APKBUILD | 25 | ||||
| -rw-r--r-- | user/giflib/xmlto-skip-validation.patch | 19 |
2 files changed, 9 insertions, 35 deletions
diff --git a/user/giflib/APKBUILD b/user/giflib/APKBUILD index c8f01adce..8ab3be41d 100644 --- a/user/giflib/APKBUILD +++ b/user/giflib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=giflib -pkgver=5.1.4 -pkgrel=3 +pkgver=5.1.9 +pkgrel=0 pkgdesc="Library for reading and writing GIF images" url="https://sourceforge.net/projects/giflib/" arch="all" @@ -10,27 +10,21 @@ depends="" makedepends="libsm-dev libx11-dev util-linux-dev xmlto" checkdepends="coreutils" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - xmlto-skip-validation.patch" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-static - make + sed -i '/^PREFIX =/d + /^OFLAGS/d' \ + Makefile + make PREFIX=/usr OFLAGS="$CFLAGS" } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + make PREFIX=/usr DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } @@ -40,5 +34,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d giflib-5.1.4.tar.bz2 -36f92cb092ee9dc463aa1b6b9857d1a1591fa5ed6bf973b02385a979a7178cf2c1f7fc75d6474c2fa90c090e9659178ab8cfe6bb3e147425828a1b5a59ca6f06 xmlto-skip-validation.patch" +sha512sums="f1e0c91fb90c7bf3f2b073f79b1bd4041df5178ff2e5b93975158fc2c6dd6c8ac888f8ff95c3a1804f988ce09154539c20a3196a40704b4d42a0f5846155e0ea giflib-5.1.9.tar.bz2" diff --git a/user/giflib/xmlto-skip-validation.patch b/user/giflib/xmlto-skip-validation.patch deleted file mode 100644 index 96573ad6c..000000000 --- a/user/giflib/xmlto-skip-validation.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./doc/Makefile.in.orig 2013-07-15 14:59:04.840695596 +0000 -+++ ./doc/Makefile.in 2013-07-15 14:59:30.667643646 +0000 -@@ -379,13 +379,13 @@ - - - .xml.html: -- xmlto xhtml-nochunks $< -+ xmlto --skip-validation xhtml-nochunks $< - - .xml.1: -- xmlto man $< -+ xmlto --skip-validation man $< - - .xml.txt: -- xmlto txt $< -+ xmlto --skip-validation txt $< - - all: allhtml manpages - |