summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-04-23 06:05:24 +0000
committerZach van Rijn <me@zv.io>2022-06-12 23:51:36 +0000
commit22f416cca74058e432532f31f28784fca40ea5c4 (patch)
tree2ef56c08821a5a28fd1b5db36cf4e2298a23fe38
parent69b2917807cb26574cc35abd69a14a39b8f5c8c7 (diff)
downloadpackages-22f416cca74058e432532f31f28784fca40ea5c4.tar.gz
packages-22f416cca74058e432532f31f28784fca40ea5c4.tar.bz2
packages-22f416cca74058e432532f31f28784fca40ea5c4.tar.xz
packages-22f416cca74058e432532f31f28784fca40ea5c4.zip
user/scrot: bump { 1.4 --> 1.7 }. correct build dep. fixes #587.
-rw-r--r--user/scrot/0001-remove-ax-forbid.patch21
-rw-r--r--user/scrot/APKBUILD11
2 files changed, 5 insertions, 27 deletions
diff --git a/user/scrot/0001-remove-ax-forbid.patch b/user/scrot/0001-remove-ax-forbid.patch
deleted file mode 100644
index 60894d04b..000000000
--- a/user/scrot/0001-remove-ax-forbid.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e89ac2c..df64719 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,8 +3,6 @@ dnl Process this file with autoconf to create configure.
- AC_INIT([scrot], [1.4], [https://github.com/resurrecting-open-source-projects/scrot/issues])
- AC_CONFIG_SRCDIR([src/main.c])
- AM_INIT_AUTOMAKE
--AC_CONFIG_HEADER([src/config.h])
--AX_PREFIX_CONFIG_H([src/scrot_config.h])
-
- AC_PROG_CC
- AM_PROG_CC_STDC
-@@ -29,7 +27,5 @@ AC_SUBST(GIBLIB_CFLAGS)
- AC_CHECK_FUNC(getopt_long,,[LIBOBJS="$LIBOBJS getopt.o getopt1.o"])
- AC_SUBST(LIBOBJS)
-
--m4_pattern_forbid([^AX_],[=> GNU autoconf-archive not present. <=])
--
- AC_CONFIG_FILES([Makefile src/Makefile])
- AC_OUTPUT
diff --git a/user/scrot/APKBUILD b/user/scrot/APKBUILD
index 9bb69ee27..d5316fe45 100644
--- a/user/scrot/APKBUILD
+++ b/user/scrot/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Nathan <ndowens@artixlinux.org>
# Maintainer: Zach van Rijn <me@zv.io>
pkgname=scrot
-pkgver=1.4
+pkgver=1.7
pkgrel=0
pkgdesc="Simple command-line screenshot utility for X"
options="!check" # No testsuite
@@ -10,11 +10,11 @@ arch="all"
license="MIT"
depends=""
makedepends="giblib-dev imlib2-dev libx11-dev libxfixes-dev libxcomposite-dev
- automake libtool autoconf autoconf-archive sed"
+ automake libtool autoconf autoconf-archive-dev sed"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/resurrecting-open-source-projects/scrot/archive/$pkgver/$pkgname-$pkgver.tar.gz
- 0001-remove-ax-forbid.patch
- config.h"
+ config.h
+ "
prepare() {
default_prepare
@@ -36,6 +36,5 @@ package() {
make DESTDIR="$pkgdir" docsdir=/usr/share/doc/scrot install
}
-sha512sums="8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11 scrot-1.4.tar.gz
-ca7a40345b031c84ccc083202184dbff2418feb97472aca9fd441ba21501608562bdda061283db7793ad07a6d80e302c8f15a2819ac20dff8b741c6c539cbcd2 0001-remove-ax-forbid.patch
+sha512sums="9f9a29b69e9c216bad7c6028fe0043b2729393a716dccc1389665cf1e9496a6f1d370b97a7c8432b31af7d69477b4fc1d41dffd4ca2a78a49bb98e908975612f scrot-1.7.tar.gz
95429feb7c107c5adeadf33b5a3e3ff9dc4fb95f0d58f92c6a8de27d776a07256fa9f1825896d569eb32beb77300f46995dcafd1359f305d22861eb5748de84a config.h"