diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-09 19:47:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-09 19:59:50 +0000 |
| commit | 3b9214d436f1611f297b01f72469d66bfe729d6e (patch) | |
| tree | 6df339099d9fe53edda6d2f5df96c89842714355 /main/powertop | |
| parent | f5f5b6646c9c132c72d18f8ee02605949e6e179a (diff) | |
| download | aports-3b9214d436f1611f297b01f72469d66bfe729d6e.tar.bz2 aports-3b9214d436f1611f297b01f72469d66bfe729d6e.tar.xz | |
main/powertop: upgrade to 2.8
Diffstat (limited to 'main/powertop')
| -rw-r--r-- | main/powertop/APKBUILD | 31 | ||||
| -rw-r--r-- | main/powertop/libintl-underlink.patch | 20 | ||||
| -rw-r--r-- | main/powertop/strerror_r.patch | 20 |
3 files changed, 36 insertions, 35 deletions
diff --git a/main/powertop/APKBUILD b/main/powertop/APKBUILD index e8ba823992..7d80082e2e 100644 --- a/main/powertop/APKBUILD +++ b/main/powertop/APKBUILD @@ -1,19 +1,20 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Eivind Uggedal <eivind@uggedal.com> pkgname=powertop -pkgver=2.7 -pkgrel=1 +pkgver=2.8 +pkgrel=0 pkgdesc="Power consumption monitor" url="https://01.org/powertop" arch="all" license="GPLv2" depends= -makedepends="linux-headers ncurses-dev pciutils-dev zlib-dev libnl-dev gettext-dev" +makedepends="linux-headers ncurses-dev pciutils-dev zlib-dev libnl-dev + gettext-dev" install="" -subpackages="$pkgname-lang $pkgname-doc" +subpackages="$pkgname-doc" source="https://01.org/sites/default/files/downloads/$pkgname/$pkgname-$pkgver.tar.gz - libintl-underlink.patch musl-fix-headers.patch + strerror_r.patch " _builddir="$srcdir"/powertop-$pkgver @@ -29,7 +30,7 @@ prepare() { build() { cd "$_builddir" - ./configure --prefix=/usr + LIBS="-lintl" ./configure --prefix=/usr --disable-nls || return 1 make || return 1 } @@ -38,12 +39,12 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="e0d686e47daaf7e9d89031f7763432ef powertop-2.7.tar.gz -8610f6ff2d1c4bb0643b355e78756aac libintl-underlink.patch -2c73602679df7fc10d5112f7a8771903 musl-fix-headers.patch" -sha256sums="8d4b1490e2baad4467c0ded3c423db4472dcbf7b2dd8f8f2a928f54047c678ca powertop-2.7.tar.gz -ab9155f751fea4bdfe52e447fe32d0ecf98401db720052e3b1325867081d825d libintl-underlink.patch -aeecfe22758334e4290c35dcbc5418a3595645e2a7e96c846f16cb5d19c99a09 musl-fix-headers.patch" -sha512sums="7a69bee4dd5330d9d5d6da9c47615337cdde27eb1eeb3ffc75297df1a61b5ced9f2ee94684680154e71c0c46fac72e5485cadf7a43e943d8087b1d7b4f33f59d powertop-2.7.tar.gz -f4a22fe7e093aefd399337447e913c974ba0d1a86ecee72ddf390c00563f4141a0c668cae3c9e97bc8fc5595ec8b3accb84e20d0e4c3329407b03e3d6b1d5929 libintl-underlink.patch -d3bb0e8eaa56fe9ef5aed5d7bea4860be2135fc163ec0c669dc2d01f5ee46ee22ee58cac0835518dc1a4e2939748cf57f2ab37e8d0d879bbc0161d66db7d1919 musl-fix-headers.patch" +md5sums="c55fedb69203e480801b18bd7b886241 powertop-2.8.tar.gz +2c73602679df7fc10d5112f7a8771903 musl-fix-headers.patch +9cd5d96434218c1a85275ff7fea72eb2 strerror_r.patch" +sha256sums="a87b563f73106babfa3e74dcf92f252938c061e309ace20a361358bbfa579c5a powertop-2.8.tar.gz +aeecfe22758334e4290c35dcbc5418a3595645e2a7e96c846f16cb5d19c99a09 musl-fix-headers.patch +dcdde9ea35b25d83fdb3521601590218ce4a3ce7fd414aa08ac28295196cedcf strerror_r.patch" +sha512sums="253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80 powertop-2.8.tar.gz +d3bb0e8eaa56fe9ef5aed5d7bea4860be2135fc163ec0c669dc2d01f5ee46ee22ee58cac0835518dc1a4e2939748cf57f2ab37e8d0d879bbc0161d66db7d1919 musl-fix-headers.patch +0c3a67cae24ec675c71160bfb7222f32a01f59105726c6676b1a3c75ab91073782a593ec319d0e87e5391dbf455b900f6c18459f1fd58ac5789e82aa905c1046 strerror_r.patch" diff --git a/main/powertop/libintl-underlink.patch b/main/powertop/libintl-underlink.patch deleted file mode 100644 index cf6d034256..0000000000 --- a/main/powertop/libintl-underlink.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/Makefile.in.orig -+++ ./src/Makefile.in -@@ -526,7 +526,6 @@ - - powertop_CPPFLAGS = \ - -DLOCALEDIR=\"$(localedir)\" \ -- -D_FORTIFY_SOURCE=2 \ - $(GLIB2_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(LIBZ_CFLAGS) \ -@@ -543,7 +542,8 @@ - $(NCURSES_LIBS) \ - $(PCIUTILS_LIBS) \ - $(PTHREAD_LIBS) \ -- $(RESOLV_LIBS) -+ $(RESOLV_LIBS) \ -+ $(LTLIBINTL) - - BUILT_SOURCES = css.h - CLEANFILES = css.h diff --git a/main/powertop/strerror_r.patch b/main/powertop/strerror_r.patch new file mode 100644 index 0000000000..cf8659e1e3 --- /dev/null +++ b/main/powertop/strerror_r.patch @@ -0,0 +1,20 @@ +--- traceevent/event-parse.c.orig ++++ ./traceevent/event-parse.c +@@ -5121,12 +5121,17 @@ + const char *msg; + + if (errnum >= 0) { ++#if defined(__GLIBC__) + msg = strerror_r(errnum, buf, buflen); + if (msg != buf) { + size_t len = strlen(msg); + memcpy(buf, msg, min(buflen - 1, len)); + *(buf + min(buflen - 1, len)) = '\0'; + } ++#else ++ if (strerror_r(errnum, buf, buflen)) ++ snprintf(buf, buflen, "errnum %i", errnum); ++#endif + return 0; + } + |