aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2017-12-14 12:06:13 +0100
committerLeonardo Arena <rnalrd@alpinelinux.org>2017-12-15 12:52:27 +0000
commit5680654057811ed634f5c6b041e2518b5584dae6 (patch)
tree53687f1907a42847b60c0007766d168c23c8e4fc
parentc7054f04ca2564f83a1f8584c51980f47d479bfc (diff)
downloadaports-5680654057811ed634f5c6b041e2518b5584dae6.tar.gz
aports-5680654057811ed634f5c6b041e2518b5584dae6.tar.bz2
aports-5680654057811ed634f5c6b041e2518b5584dae6.tar.xz
main/consolekit2: upgrade to 1.2.1
-rw-r--r--main/consolekit2/APKBUILD16
-rw-r--r--main/consolekit2/ac_disable_static.patch13
2 files changed, 6 insertions, 23 deletions
diff --git a/main/consolekit2/APKBUILD b/main/consolekit2/APKBUILD
index 669c215d46..ae1a21a0b5 100644
--- a/main/consolekit2/APKBUILD
+++ b/main/consolekit2/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgbase=ConsoleKit2
pkgname=consolekit2
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=0
pkgdesc="A framework for defining and tracking users, login sessions, and seats"
provides="consolekit=$pkgver"
replaces=consolekit
@@ -15,22 +15,19 @@ makedepends="git automake autoconf gettext-dev glib-dev zlib-dev libxslt-dev
polkit-dev eudev-dev libdrm-dev libnih-dev libtool
xorg-server-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz
- ac_disable_static.patch
0001-busybox-reboot-and-poweroff-support.patch
pam-foreground-compat.ck"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
builddir="$srcdir"/$pkgbase-$pkgver
+options="!check" #no testsuite provided
prepare() {
default_prepare
-
- cd "$srcdir"/$pkgbase-$pkgver
-
NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd "$srcdir"/$pkgbase-$pkgver
+ cd "$builddir"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -38,12 +35,11 @@ build() {
}
package() {
- cd "$srcdir"/$pkgbase-$pkgver
+ cd "$builddir"
make DESTDIR="$pkgdir" install
install -m 755 "$srcdir"/pam-foreground-compat.ck \
"$pkgdir"/usr/lib/ConsoleKit/run-session.d/
}
-sha512sums="30f2ceec14044669f40676e9b17513874350e2b70f0a918be934f7e64309c8595dbec4ac0937044c98dda51eb97c99443dc9d1de33f08365d72da8600296ad78 consolekit2-1.2.0.tar.gz
-0f628fd1589b1790ad9adcb2278de504b75cc6b4ec7284a1cbda44ebd34b9966014989f47f343cb936d8503acc4eeec43ddff07cb11f55388e47256b8420e2e8 ac_disable_static.patch
+sha512sums="b62a43b2748b9302b86847a3c4c84f931d7df9fef028dffbad091dd7b176c57109adec65e49f9f8a3c5e5e03a5d9b29f8b96e3328f9b9bfb32fd767fceecde81 consolekit2-1.2.1.tar.gz
ec0c88e640afac0561c84131d63fa8c9e2e29611b789ae5c163cd11465b22017602d88dc853866624f57bce2ee466ab63af075d083a9ba6e87327ad8d0a0769f 0001-busybox-reboot-and-poweroff-support.patch
3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910 pam-foreground-compat.ck"
diff --git a/main/consolekit2/ac_disable_static.patch b/main/consolekit2/ac_disable_static.patch
deleted file mode 100644
index 38d6f12ac1..0000000000
--- a/main/consolekit2/ac_disable_static.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 071a0d8..7469697 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,6 @@ AC_SEARCH_LIBS([strerror],[cposix])
- AC_PROG_CC
- AM_PROG_CC_C_O
- AC_HEADER_STDC
--AC_DISABLE_STATIC
--LT_INIT
-+LT_INIT([disable-static])
- AC_HEADER_STDC
- AC_FUNC_FORK