diff options
| author | TBK <tbk@jjtc.dk> | 2018-04-04 06:44:32 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-04-05 07:39:53 +0000 |
| commit | 232948dba791b54b3c865392145880da63b70f58 (patch) | |
| tree | b3f9d2a05b0202f10e48fae79c98ec19d8eb32e9 | |
| parent | 26f036d4004feebb77acf473da3fbf71fc68e0f6 (diff) | |
| download | aports-232948dba791b54b3c865392145880da63b70f58.tar.bz2 aports-232948dba791b54b3c865392145880da63b70f58.tar.xz | |
main/xfce4-battery-plugin: upgrade to 1.1.0, modernize
| -rw-r--r-- | main/xfce4-battery-plugin/APKBUILD | 44 | ||||
| -rw-r--r-- | main/xfce4-battery-plugin/fix-includes.patch | 17 |
2 files changed, 23 insertions, 38 deletions
diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD index 4c7b4c7b96..aac53b9511 100644 --- a/main/xfce4-battery-plugin/APKBUILD +++ b/main/xfce4-battery-plugin/APKBUILD @@ -1,53 +1,33 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-battery-plugin -pkgver=1.0.5 -pkgrel=2 +pkgver=1.1.0 +pkgrel=0 pkgdesc="A battery monitor plugin for the Xfce panel" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" arch="all" license="GPL-2.0" -makedepends="xfce4-panel-dev libxfce4ui-dev perl-xml-parser intltool - linux-headers" -install= +makedepends="xfce4-panel-dev libxfce4ui-dev perl-xml-parser intltool linux-headers" subpackages="$pkgname-lang" source="http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - fix-includes.patch " - -_builddir="$srcdir/$pkgname-$pkgver" - -prepare() { - cd "$_builddir" - find -name config.sub | xargs chmod u+w - update_config_sub || return 1 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +# fix-includes.patch +# " +builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$_builddir" + cd "$builddir" ./configure \ - --build=$CBUILD \ - --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ - --disable-static \ - || return 1 - make || return 1 + --disable-static + make } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install } -md5sums="ca2d394e411a20442a519efa0d14f8ec xfce4-battery-plugin-1.0.5.tar.bz2 -f4d49568be25e3180288fe8c3d019e8c fix-includes.patch" -sha256sums="f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11 xfce4-battery-plugin-1.0.5.tar.bz2 -383210ebe9b41d5bae9325991bfc9e5c9d272538a9ed46fb4cca0b5c0f24fa75 fix-includes.patch" -sha512sums="f49f33178a771b952442f498cee2c722146c9982cb27453e6547a7c7838eaa0a22588a7d2a56f189f7e9e7b90ed7e5ac7a4e6cfee55dc5e43d32c5ef95b20062 xfce4-battery-plugin-1.0.5.tar.bz2 -cd200c872b2baf6c1709c2d4b0f46b162a54a4513b5fa319c335ebeb1b5447a3563179634c3602e43ad5469912c9499c479bd02eae9ff08b48bad96f0a58c910 fix-includes.patch" + +sha512sums="d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09 xfce4-battery-plugin-1.1.0.tar.bz2" diff --git a/main/xfce4-battery-plugin/fix-includes.patch b/main/xfce4-battery-plugin/fix-includes.patch index de78c8c835..207ac63bde 100644 --- a/main/xfce4-battery-plugin/fix-includes.patch +++ b/main/xfce4-battery-plugin/fix-includes.patch @@ -1,11 +1,16 @@ ---- xfce4-battery-plugin-1.0.5.orig/panel-plugin/libacpi.c -+++ xfce4-battery-plugin-1.0.5/panel-plugin/libacpi.c -@@ -52,9 +52,10 @@ - #include <sys/sysctl.h> - #include <err.h> - #include <errno.h> +--- a/panel-plugin/libacpi.c ++++ b/panel-plugin/libacpi.c +@@ -29,7 +29,6 @@ + #include <sys/types.h> + #include <dirent.h> + #include <glob.h> -#include <unistd.h> + #ifdef __FreeBSD__ + #include <fcntl.h> +@@ -55,6 +54,8 @@ + #include <errno.h> + #endif + +#include <unistd.h> |