diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | 0001-Unversioned-libs.patch | 13 | ||||
| -rw-r--r-- | Makefile.patch | 23 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
4 files changed, 25 insertions, 36 deletions
@@ -1,6 +1,6 @@ pkgbase = android-x86-giflib - pkgdesc = A library for reading and writing gif images (android) - pkgver = 5.2.1 + pkgdesc = A library for reading and writing gif images (Android x86) + pkgver = 5.2.2 pkgrel = 1 url = http://sourceforge.net/projects/giflib/ arch = any @@ -12,10 +12,9 @@ pkgbase = android-x86-giflib options = !buildflags options = staticlibs options = !emptydirs - source = https://downloads.sourceforge.net/project/giflib/giflib-5.2.1.tar.gz - source = Makefile.patch - md5sums = 6f03aee4ebe54ac2cc1ab3e4b0a049e5 - md5sums = 0c6a08273d51f7fd965c79c967f5e7ed + source = https://downloads.sourceforge.net/project/giflib/giflib-5.2.2.tar.gz + source = 0001-Unversioned-libs.patch + md5sums = 913dd251492134e235ee3c9a91987a4d + md5sums = 4009aa119ecad67d50f4350b7af83ddc pkgname = android-x86-giflib - diff --git a/0001-Unversioned-libs.patch b/0001-Unversioned-libs.patch new file mode 100644 index 000000000000..8b7efe0bc7e5 --- /dev/null +++ b/0001-Unversioned-libs.patch @@ -0,0 +1,13 @@ +--- a/Makefile ++++ b/Makefile +@@ -144,9 +144,7 @@ + install-lib: + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" + $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" +- $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)" +- ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)" +- ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" ++ $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" + install-man: + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1" diff --git a/Makefile.patch b/Makefile.patch deleted file mode 100644 index 8a30493ac17e..000000000000 --- a/Makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -68,7 +68,7 @@ - $(UTILS):: libgif.a libutil.a - - libgif.so: $(OBJECTS) $(HEADERS) -- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) -+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o libgif.so $(OBJECTS) - - libgif.a: $(OBJECTS) $(HEADERS) - $(AR) rcs libgif.a $(OBJECTS) -@@ -100,9 +100,7 @@ - install-lib: - $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" -- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" -- ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" -- ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" -+ $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so" - install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" - $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" - @@ -3,26 +3,26 @@ _android_arch=x86 pkgname=android-${_android_arch}-giflib -pkgver=5.2.1 +pkgver=5.2.2 pkgrel=1 -pkgdesc="A library for reading and writing gif images (android)" arch=('any') +pkgdesc="A library for reading and writing gif images (Android ${_android_arch})" url="http://sourceforge.net/projects/giflib/" license=("MIT") depends=('android-ndk') options=(!strip !buildflags staticlibs !emptydirs) makedepends=('android-environment' 'android-pkg-config') source=("https://downloads.sourceforge.net/project/giflib/giflib-${pkgver}.tar.gz" - 'Makefile.patch') -md5sums=('6f03aee4ebe54ac2cc1ab3e4b0a049e5' - '0c6a08273d51f7fd965c79c967f5e7ed') + '0001-Unversioned-libs.patch') +md5sums=('913dd251492134e235ee3c9a91987a4d' + '4009aa119ecad67d50f4350b7af83ddc') prepare() { cd "${srcdir}"/giflib-${pkgver} source android-env ${_android_arch} check_ndk_version_ge_than 18.0 - patch -Np1 -i "../Makefile.patch" + patch -Np1 -i ../0001-Unversioned-libs.patch } build() { |