summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
-rw-r--r--cli.patch12
3 files changed, 30 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6863fd5c7708..19a08cda0394 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = apng-utils
pkgdesc = apngasm for assembling apng files, apngdis for disassembling apng files, and gif2apng/apng2gif for converting.
pkgver = 3.1.6
- pkgrel = 4
+ pkgrel = 5
url = https://sourceforge.net/projects/apngdis/
arch = i686
arch = x86_64
@@ -18,13 +18,15 @@ pkgbase = apng-utils
noextract = apng2gif-1.8-src.zip
noextract = apngdis-2.9-src.zip
source = https://sourceforge.net/projects/apngdis/files/2.9/apngdis-2.9-src.zip
- source = https://github.com/apngasm/apngasm/archive/3.1.6.tar.gz
+ source = apng-utils-3.1.6.tar.gz::https://github.com/apngasm/apngasm/archive/3.1.6.tar.gz
source = https://sourceforge.net/projects/gif2apng/files/1.9/gif2apng-1.9-src.zip
source = https://sourceforge.net/projects/apng2gif/files/1.8/apng2gif-1.8-src.zip
+ source = cli.patch
sha512sums = 4bcce5066c37ea5e4db0bfaf2f6a81e4d3ba7f5b6c952f598facff27f84cc1a3af778f4db096119cb9f4aa57c0193c90acf7bed28f283b6930f5b3121dd9cf32
sha512sums = cbc6f0ad119a7ce17079be3434e516265bea619ecb46fe147d652bbaff4652a858698df07a072f5095894961137fe32546f75ad603c7483476be7ffe463cf999
sha512sums = 6f161699aad949466c60e0fb6abb2f38e7ec8353dd15e65ccb9944a66dabc5a4acf32523cb64073c73290e54cc2b753db68123c14f3f7789343491a4f65dcd2c
sha512sums = 54fee0bf1e5448531298a816562a611cb5f2f661d40ade622e2d24e58a30de96fa69254ee891c5329e8b065c999b95620215d6e1ae276f0c596ffe69b0b31cda
+ sha512sums = 1998f8a86581eadf456daaa7c8674455c06d81c3716485348740183efada4969557612fabebbab8f30cc6d19f4717df8ff5a3afffc7e7ca0168bf590aee6e258
pkgname = apng-utils
diff --git a/PKGBUILD b/PKGBUILD
index 2a16cdaf66e4..81452518239e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _apngdis_pkgver=2.9
_apngasm_pkgver=3.1.6
_gif2apng_pkgver=1.9
_apng2gif_pkgver=1.8
-pkgrel=4
+pkgrel=5
pkgdesc="apngasm for assembling apng files, apngdis for disassembling apng files, and gif2apng/apng2gif for converting."
arch=('i686' 'x86_64')
url="https://sourceforge.net/projects/apngdis/"
@@ -22,20 +22,26 @@ license=('LGPL')
depends=('libpng' 'gcc-libs')
makedepends=('cmake' 'boost')
source=("https://sourceforge.net/projects/apngdis/files/${_apngdis_pkgver}/apngdis-${_apngdis_pkgver}-src.zip"
- "https://github.com/apngasm/apngasm/archive/${_apngasm_pkgver}.tar.gz"
+ "$pkgname-$pkgver.tar.gz::https://github.com/apngasm/apngasm/archive/${_apngasm_pkgver}.tar.gz"
"https://sourceforge.net/projects/gif2apng/files/${_gif2apng_pkgver}/gif2apng-${_gif2apng_pkgver}-src.zip"
"https://sourceforge.net/projects/apng2gif/files/${_apng2gif_pkgver}/apng2gif-${_apng2gif_pkgver}-src.zip"
-)
+ cli.patch)
sha512sums=('4bcce5066c37ea5e4db0bfaf2f6a81e4d3ba7f5b6c952f598facff27f84cc1a3af778f4db096119cb9f4aa57c0193c90acf7bed28f283b6930f5b3121dd9cf32'
'cbc6f0ad119a7ce17079be3434e516265bea619ecb46fe147d652bbaff4652a858698df07a072f5095894961137fe32546f75ad603c7483476be7ffe463cf999'
'6f161699aad949466c60e0fb6abb2f38e7ec8353dd15e65ccb9944a66dabc5a4acf32523cb64073c73290e54cc2b753db68123c14f3f7789343491a4f65dcd2c'
- '54fee0bf1e5448531298a816562a611cb5f2f661d40ade622e2d24e58a30de96fa69254ee891c5329e8b065c999b95620215d6e1ae276f0c596ffe69b0b31cda')
+ '54fee0bf1e5448531298a816562a611cb5f2f661d40ade622e2d24e58a30de96fa69254ee891c5329e8b065c999b95620215d6e1ae276f0c596ffe69b0b31cda'
+ '1998f8a86581eadf456daaa7c8674455c06d81c3716485348740183efada4969557612fabebbab8f30cc6d19f4717df8ff5a3afffc7e7ca0168bf590aee6e258')
noextract=(
"gif2apng-${_gif2apng_pkgver}-src.zip"
"apng2gif-${_apng2gif_pkgver}-src.zip"
"apngdis-${_apngdis_pkgver}-src.zip"
)
+prepare() {
+ cd "$srcdir"/apngasm-${_apngasm_pkgver}
+ patch -Np1 < "$srcdir"/cli.patch
+}
+
build() {
# Several packages now use a different build approach than before.
for _pack in "${noextract[@]}"; do
@@ -50,6 +56,7 @@ build() {
done
cd "${srcdir}/apngasm-${_apngasm_pkgver}"
+
[[ -d build ]] || mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX="/usr" ../
@@ -58,13 +65,13 @@ build() {
package() {
cd "${srcdir}"
- install -d "$pkgdir/usr/bin/"
+ install -d "$pkgdir"/usr/bin/
for _pack in "${noextract[@]}"; do
_builddir=${_pack%%-*}
- install -Dm755 "$_builddir/$_builddir" "$pkgdir/usr/bin/"
+ install -Dm755 "$_builddir/$_builddir" "$pkgdir"/usr/bin/
done
- cd "${srcdir}/apngasm-${_apngasm_pkgver}/build"
+ cd "$srcdir"/apngasm-${_apngasm_pkgver}/build
make DESTDIR="${pkgdir}" install
install -Dm644 "${pkgdir}"/usr/man/man1/apngasm.1 "${pkgdir}"/usr/share/man/man1/apngasm.1
rm -r "${pkgdir}"/usr/man
diff --git a/cli.patch b/cli.patch
new file mode 100644
index 000000000000..53251696edba
--- /dev/null
+++ b/cli.patch
@@ -0,0 +1,12 @@
+diff -Naur apngasm-3.1.6.orig/cli/src/cli.cpp apngasm-3.1.6.new/cli/src/cli.cpp
+--- apngasm-3.1.6.orig/cli/src/cli.cpp 2015-08-21 07:57:18.000000000 +0200
++++ apngasm-3.1.6.new/cli/src/cli.cpp 2021-05-25 17:31:15.729027302 +0200
+@@ -80,7 +80,7 @@
+ createParentDirs(filePath);
+ return true;
+ }
+- if(!filesystem::exists(filesystem::path(filePath))) {
++ if(!boost::filesystem::exists(boost::filesystem::path(filePath))) {
+ createParentDirs(filePath);
+ return true;
+ }