diff options
Diffstat (limited to 'user')
66 files changed, 386 insertions, 540 deletions
diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD index ac04541d5..5fd885123 100644 --- a/user/atril/APKBUILD +++ b/user/atril/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=atril pkgver=1.22.1 -pkgrel=0 +pkgrel=1 pkgdesc="Document viewer for the MATE desktop environment" url="https://mate-desktop.org" arch="all" @@ -12,7 +12,7 @@ depends="" makedepends="caja-dev djvulibre-dev gobject-introspection-dev gtk+3.0-dev intltool itstool libgxps-dev libsecret-dev libsm-dev libspectre-dev libxml2-dev libxml2-utils poppler-dev python3 tiff-dev" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/1.22/atril-$pkgver.tar.xz" build() { diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD index a17bf9711..306299ae0 100644 --- a/user/calligra/APKBUILD +++ b/user/calligra/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=calligra pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Office suite" url="https://www.calligra.org/" arch="all" diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index 7ebfd4e0d..db56726fe 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters pkgver=1.22.5 -pkgrel=0 +pkgrel=1 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" arch="all" diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index 57b0bf6c1..fcc9c4ebb 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: pkgname=enchant -pkgver=2.2.3 +pkgver=2.2.4 pkgrel=0 -pkgdesc="A wrapper library for generic spell checking" +pkgdesc="Generic library for spell checking" url="https://abiword.github.io/enchant/" arch="all" options="!check" # Requires dictionary that it can't find @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6 enchant-2.2.3.tar.gz" +sha512sums="3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870 enchant-2.2.4.tar.gz" diff --git a/user/eudev/APKBUILD b/user/eudev/APKBUILD index f1cc65903..f2ed0a333 100644 --- a/user/eudev/APKBUILD +++ b/user/eudev/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=eudev -pkgver=3.2.7 -pkgrel=1 +pkgver=3.2.8 +pkgrel=0 pkgdesc="OpenRC compatible fork of systemd-udev" url="https://wiki.gentoo.org/wiki/Project:Eudev" arch="all" @@ -28,10 +28,8 @@ source="http://dev.gentoo.org/~blueness/$pkgname/$pkgname-$pkgver.tar.gz udev-settle.confd udev-trigger.confd " -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -49,17 +47,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" sharepkgconfigdir=/usr/lib/pkgconfig \ install - local i for i in udev udev-settle udev-trigger; do install -Dm755 "$srcdir"/$i.initd \ "$pkgdir"/etc/init.d/$i @@ -73,11 +67,6 @@ package() { "$pkgdir"/sbin/setup-udev } -dev() { - replaces="udev-dev" - default_dev -} - libs() { pkgdesc="Dynamic library to access udev device information" replaces="libudev" @@ -110,7 +99,7 @@ openrc() { "$subpkgdir"/usr/share/runlevels/openrc/sysinit/udev-trigger } -sha512sums="e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40 eudev-3.2.7.tar.gz +sha512sums="13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42 eudev-3.2.8.tar.gz 683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index 9f8ba5d66..a98bf2cf9 100644 --- a/user/evince/APKBUILD +++ b/user/evince/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=evince pkgver=3.32.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" arch="all" diff --git a/user/exiv2/0000-pthread-init-fix.patch b/user/exiv2/0000-pthread-init-fix.patch deleted file mode 100644 index ac69b14c1..000000000 --- a/user/exiv2/0000-pthread-init-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 620ef04e96f4c0d0894d976fc361588b6526a116 Mon Sep 17 00:00:00 2001 -From: clanmills <robin@clanmills.com> -Date: Tue, 20 Jun 2017 20:41:30 +0100 -Subject: [PATCH] https://github.com/Exiv2/exiv2/issues/9 Fix submitted. - ---- - src/actions.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/actions.cpp b/src/actions.cpp -index 0ebe8505..17444c5b 100644 ---- a/src/actions.cpp -+++ b/src/actions.cpp -@@ -2045,9 +2045,13 @@ namespace { - #else - /* Unix/Linux/Cygwin/MacOSX */ - #include <pthread.h> -+ /* This is the critical section object (statically allocated). */ - #if defined(__APPLE__) -- /* This is the critical section object (statically allocated). */ -- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; -+ #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER) -+ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; -+ #else -+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; -+ #endif - #else - static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - #endif diff --git a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch b/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch deleted file mode 100644 index 86412532d..000000000 --- a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d775683f579543c35463ab2a8d9425da10d2f016 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 4 Oct 2017 00:15:30 -0500 -Subject: [PATCH] Amend fix for #9 to apply to other Unix systems - -At least the musl libc on Linux has the same issue as Mac OS X: the -PTHREAD_RECURSIVE_* static initialiser does not exist. This is a -documented and purposeful omission: - -http://www.openwall.com/lists/musl/2017/02/20/3 - -This commit uses similar logic to the Apple test on other Unixes. ---- - src/actions.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/actions.cpp b/src/actions.cpp -index fe14de4..aa15ec7 100644 ---- a/src/actions.cpp -+++ b/src/actions.cpp -@@ -2051,7 +2051,11 @@ namespace { - static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; - #endif - #else -- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) -+ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ #else -+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; -+ #endif - #endif - #endif - --- -2.10.0 - diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index 7cf8693fe..963fe871c 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -1,47 +1,101 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=exiv2 -pkgver=0.26 -pkgrel=2 +pkgver=0.27.1 +pkgrel=0 pkgdesc="Exif, IPTC and XMP metadata library and tools" url="https://www.exiv2.org/" arch="all" -options="!check" # No test suite. license="GPL-2.0+" depends="" depends_dev="expat-dev zlib-dev" -makedepends="$depends_dev bash" +makedepends="$depends_dev bash cmake" +checkdepends="python3 libxml2 cmd:which" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.exiv2.org/builds/exiv2-$pkgver-trunk.tar.gz - 0000-pthread-init-fix.patch - 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch - CVE-2018-19535.patch - " -builddir="$srcdir"/exiv2-trunk +source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz" +builddir="$srcdir/$pkgname-$pkgver-Source" # secfixes: # 0.26-r2: # - CVE-2018-19535 +# 0.27.1-r0: +# - CVE-2017-9239 +# - CVE-2017-9953 +# - CVE-2017-11336 +# - CVE-2017-11337 +# - CVE-2017-11338 +# - CVE-2017-11339 +# - CVE-2017-11340 +# - CVE-2017-11553 +# - CVE-2017-11591 +# - CVE-2017-11592 +# - CVE-2017-11683 +# - CVE-2017-12955 +# - CVE-2017-12956 +# - CVE-2017-12957 +# - CVE-2017-14857 +# - CVE-2017-14858 +# - CVE-2017-14859 +# - CVE-2017-14860 +# - CVE-2017-14861 +# - CVE-2017-14862 +# - CVE-2017-14863 +# - CVE-2017-14864 +# - CVE-2017-14865 +# - CVE-2017-14866 +# - CVE-2017-17669 +# - CVE-2017-17722 +# - CVE-2017-17723 +# - CVE-2017-17724 +# - CVE-2017-17725 +# - CVE-2017-18005 +# - CVE-2017-1000126 +# - CVE-2017-1000127 +# - CVE-2017-1000128 +# - CVE-2018-4868 +# - CVE-2018-5772 +# - CVE-2018-8976 +# - CVE-2018-8977 +# - CVE-2018-9145 +# - CVE-2018-10772 +# - CVE-2018-10780 +# - CVE-2018-10958 +# - CVE-2018-10998 +# - CVE-2018-10999 +# - CVE-2018-11037 +# - CVE-2018-11531 +# - CVE-2018-12264 +# - CVE-2018-12265 +# - CVE-2018-14046 +# - CVE-2018-14338 +# - CVE-2018-16336 +# - CVE-2018-17229 +# - CVE-2018-17230 +# - CVE-2018-17282 +# - CVE-2018-17581 +# - CVE-2018-19107 +# - CVE-2018-19108 prepare() { - cd "$builddir" default_prepare - update_config_sub + mkdir build } + build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr + cd "$builddir/build" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo .. make } +check() { + cd "$builddir/build" + make tests +} + package() { - cd "$builddir" + cd "$builddir/build" make DESTDIR="$pkgdir" install } -sha512sums="d1e9cab886e279b045768dd9ec781f07d2d36d573119403d0b76dc571442173aae6972f86ec55c3ea53fb3ee9ca3571eb8fd63a2a6643a970852813e88634a86 exiv2-0.26-trunk.tar.gz -9721d359708c385be7c86a8f8a63de43b05b2578a29b4339861e82873aa81a98a7ee7252847b6c55529341187d40f552c488589b416fd9d1e27418925929c018 0000-pthread-init-fix.patch -485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce 0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch -ac145a9b4df21e7f5fdd3099e6ae4c1e12ae2cdccc455d0262c5d38b8e07ce6437036a19264bd04b1cb1fffd01d89672044ca82fddd5e71dcd0d84d48356ab12 CVE-2018-19535.patch" +sha512sums="038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529 exiv2-0.27.1-Source.tar.gz" diff --git a/user/exiv2/CVE-2018-19535.patch b/user/exiv2/CVE-2018-19535.patch deleted file mode 100644 index ba9355012..000000000 --- a/user/exiv2/CVE-2018-19535.patch +++ /dev/null @@ -1,239 +0,0 @@ -From 03173751b4d7053d6ddf52a15904e8f751f78f56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Sun, 2 Sep 2018 14:39:52 +0200 -Subject: [PATCH 2/5] Fix bug in PngChunk::readRawProfile - -- Now it takes into account text.size_ when searching for a newline -char. ---- - src/pngchunk.cpp | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp -index 58281b3ff..755872c94 100644 ---- a/src/pngchunk.cpp -+++ b/src/pngchunk.cpp -@@ -629,11 +629,19 @@ namespace Exiv2 { - - - sp = (char*)text.pData_+1; -+ int pointerPos = 1; - - // Look for newline -- -- while (*sp != '\n') -+ while (*sp != '\n' && pointerPos < (text.size_ - 1)) -+ { - sp++; -+ pointerPos++; -+ } -+ -+ if (pointerPos == (text.size_ - 1)) -+ { -+ return DataBuf(); -+ } - - // Look for length - - -From cf3ba049a2792ec2a4a877e343f5dd9654da53dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> -Date: Mon, 3 Sep 2018 08:51:08 +0200 -Subject: [PATCH 3/5] Fix more issues in PngChunk::readRawProfile - ---- - src/pngchunk.cpp | 36 +++++++++++++----------- - 1 file changed, 20 insertions(+), 16 deletions(-) - -diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp -index 755872c94..9b3faf1aa 100644 ---- a/src/pngchunk.cpp -+++ b/src/pngchunk.cpp -@@ -606,11 +606,6 @@ namespace Exiv2 { - DataBuf PngChunk::readRawProfile(const DataBuf& text,bool iTXt) - { - DataBuf info; -- register long i; -- register unsigned char *dp; -- const char *sp; -- unsigned int nibbles; -- long length; - unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, -@@ -627,8 +622,7 @@ namespace Exiv2 { - return info; - } - -- -- sp = (char*)text.pData_+1; -+ const char *sp = (char*)text.pData_+1; - int pointerPos = 1; - - // Look for newline -@@ -638,20 +632,30 @@ namespace Exiv2 { - pointerPos++; - } - -+ // Look for length -+ while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) -+ { -+ sp++; -+ pointerPos++; -+ } -+ - if (pointerPos == (text.size_ - 1)) - { - return DataBuf(); - } - -- // Look for length -+ long length = (long) atol(sp); - -- while (*sp == '\0' || *sp == ' ' || *sp == '\n') -+ while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) -+ { - sp++; -+ pointerPos++; -+ } - -- length = (long) atol(sp); -- -- while (*sp != ' ' && *sp != '\n') -- sp++; -+ if (pointerPos == (text.size_ - 1)) -+ { -+ return DataBuf(); -+ } - - // Allocate space - -@@ -674,10 +678,10 @@ namespace Exiv2 { - - // Copy profile, skipping white space and column 1 "=" signs - -- dp = (unsigned char*)info.pData_; -- nibbles = length * 2; -+ unsigned char *dp = (unsigned char*)info.pData_; -+ unsigned int nibbles = length * 2; - -- for (i = 0; i < (long) nibbles; i++) -+ for (long i = 0; i < (long) nibbles; i++) - { - while (*sp < '0' || (*sp > '9' && *sp < 'a') || *sp > 'f') - { - -From 8b480bc5b2cc2abb8cf6fe4e16c24e58916464d2 Mon Sep 17 00:00:00 2001 -From: Robin Mills <robin@clanmills.com> -Date: Mon, 10 Sep 2018 20:54:53 +0200 -Subject: [PATCH 4/5] Fixes in PngChunk::readRawProfile - ---- - src/pngchunk.cpp | 55 ++++++++++++++++++++++---------------------- - 1 file changed, 27 insertions(+), 28 deletions(-) - -diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp -index 9b3faf1aa..f81b560aa 100644 ---- a/src/pngchunk.cpp -+++ b/src/pngchunk.cpp -@@ -607,11 +607,11 @@ namespace Exiv2 { - { - DataBuf info; - unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -- 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, -- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -- 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, -- 13,14,15}; -+ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -+ 0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0, -+ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, -+ 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12, -+ 13,14,15}; - if (text.size_ == 0) { - return DataBuf(); - } -@@ -622,52 +622,51 @@ namespace Exiv2 { - return info; - } - -- const char *sp = (char*)text.pData_+1; -- int pointerPos = 1; -+ const char *sp = (char*) text.pData_+1; // current byte (space pointer) -+ const char *eot = (char*) text.pData_+text.size_; // end of text - - // Look for newline -- while (*sp != '\n' && pointerPos < (text.size_ - 1)) -+ while (*sp != '\n' && sp < eot ) - { - sp++; -- pointerPos++; -+ if ( sp == eot ) -+ { -+ return DataBuf(); -+ } - } -+ sp++ ; // step over '\n' - - // Look for length -- while ((*sp == '\0' || *sp == ' ' || *sp == '\n') && pointerPos < (text.size_ - 1)) -+ while ( (*sp == '\0' || *sp == ' ' || *sp == '\n') && sp < eot ) - { - sp++; -- pointerPos++; -- } -- -- if (pointerPos == (text.size_ - 1)) -- { -- return DataBuf(); -+ if (sp == eot ) -+ { -+ return DataBuf(); -+ } - } - -- long length = (long) atol(sp); -- -- while (*sp != ' ' && *sp != '\n' && pointerPos < (text.size_ - 1)) -+ const char* startOfLength = sp; -+ while ( ('0' <= *sp && *sp <= '9') && sp < eot) - { - sp++; -- pointerPos++; -+ if (sp == eot ) -+ { -+ return DataBuf(); -+ } - } -+ sp++ ; // step over '\n' - -- if (pointerPos == (text.size_ - 1)) -- { -- return DataBuf(); -- } -+ long length = (long) atol(startOfLength); - - // Allocate space -- - if (length == 0) - { - #ifdef DEBUG - std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: invalid profile length\n"; - #endif - } -- - info.alloc(length); -- - if (info.size_ != length) - { - #ifdef DEBUG -@@ -678,7 +677,7 @@ namespace Exiv2 { - - // Copy profile, skipping white space and column 1 "=" signs - -- unsigned char *dp = (unsigned char*)info.pData_; -+ unsigned char *dp = (unsigned char*)info.pData_; // decode pointer - unsigned int nibbles = length * 2; - - for (long i = 0; i < (long) nibbles; i++) - diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index 1752b8bbf..8311d25a1 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=exo -pkgver=0.12.4 +pkgver=0.12.6 pkgrel=0 pkgdesc="Support library for the XFCE desktop environment" url="https://xfce.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8f84258aeb5c1fcfe91e775af1e5fed02f36b3d18aa72d497cd05294d54f050d679628cdb4339219c67b203a8cc663704a240fc18e6a918cef363cf4d9b94783 exo-0.12.4.tar.bz2" +sha512sums="468f8e95068135a08da58abd35e8b886864262550fe3860a8e61ed6376783491139ae837427e0cabfe9b46184b339e482f0e9a9c9c8439c695d4268c94b5e405 exo-0.12.6.tar.bz2" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index fc73865e7..ce151d6be 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=featherpad -pkgver=0.9.4 +pkgver=0.10.0 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -31,4 +31,4 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="95fe137ccc0de49bb464b15aec586287e46b04ff2fe636d6092e39a6c5e3d633ca0b809181a728a8931a6628cdcf51cd0b91d8dfa58eee6a551fb3ec4ff42280 FeatherPad-0.9.4.tar.gz" +sha512sums="63bde3a5b0febe2dc17700e5e789708696d842520dd1d69832cea19e5b7dc5e6498732cc20927bac4732fa20f516d5d035e38e77142c8e47c723a1b5a07bb901 FeatherPad-0.10.0.tar.gz" diff --git a/user/fltk/APKBUILD b/user/fltk/APKBUILD index fe5c3d55f..886584625 100644 --- a/user/fltk/APKBUILD +++ b/user/fltk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: pkgname=fltk -pkgver=1.3.4.2 -_realver=1.3.4-2 +pkgver=1.3.5 +_realver=1.3.5 pkgrel=0 pkgdesc="Cross-platform C++ GUI toolkit" url="https://www.fltk.org/" @@ -13,11 +13,10 @@ depends="" depends_dev="libx11-dev libxext-dev libxft-dev mesa-dev" makedepends="$depends_dev libjpeg-turbo-dev libpng-dev libxinerama-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-fluid" -source="https://fltk.org/pub/fltk/1.3.4/$pkgname-$_realver-source.tar.gz" +source="https://www.fltk.org/pub/fltk/1.3.5/$pkgname-$_realver-source.tar.gz" builddir="$srcdir"/$pkgname-$_realver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,7 +29,6 @@ build() { package() { - cd "$builddir" make DESTDIR="$pkgdir" install # remove static libs rm "$pkgdir"/usr/lib/*.a @@ -38,9 +36,9 @@ package() { fluid() { pkgdesc="Fast Light User Interface Designer" - depends= + depends="" mkdir -p "$subpkgdir"/usr/ mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="cc169449b71ca966b2043ceedc55e92220ccb6be07b0ac54eeec36bbed5d60e2f59c6faba2403b5292b9120f5255227880a066d98ac82e57d502522bc627fd4d fltk-1.3.4-2-source.tar.gz" +sha512sums="db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821 fltk-1.3.5-source.tar.gz" diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD index 14ce2c5f6..b526bb794 100644 --- a/user/gnu-ghostscript/APKBUILD +++ b/user/gnu-ghostscript/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnu-ghostscript pkgver=9.14.1 -pkgrel=2 +pkgrel=3 pkgdesc="PostScript utilities" url="https://www.gnu.org/software/ghostscript/" arch="all" @@ -14,6 +14,7 @@ makedepends="cups-dev dbus-dev fontconfig-dev freetype-dev lcms2-dev libice-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz do-not-use-sprintf.patch + locksafe.patch " build() { @@ -44,4 +45,5 @@ package() { } sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz -1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch" +1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch +959e0386e4ac268298ab5e9d3936afcf38560b1d3ab49256719d72d38783feef62ceb065d35235de9f7b7bc52ab119a297e115954ea0bb4d7c00046f333141aa locksafe.patch" diff --git a/user/gnu-ghostscript/locksafe.patch b/user/gnu-ghostscript/locksafe.patch new file mode 100644 index 000000000..d5df6948d --- /dev/null +++ b/user/gnu-ghostscript/locksafe.patch @@ -0,0 +1,14 @@ +Bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840691 +Symptom: 'invalidaccess -7' opening PostScript files in Evince, Okular, etc + +--- gnu-ghostscript-9.14.1/Resource/Init/gs_init.ps.old 2016-11-06 17:40:19.000000000 +0000 ++++ gnu-ghostscript-9.14.1/Resource/Init/gs_init.ps 2019-06-26 02:22:56.825331976 +0000 +@@ -2018,7 +2018,7 @@ + + /.locksafe { + .locksafe_userparams +- systemdict /getenv {pop //false} put ++ systemdict /getenv {pop //false} .forceput + % setpagedevice has the side effect of clearing the page, but + % we will just document that. Using setpagedevice keeps the device + % properties and pagedevice .LockSafetyParams in agreement even diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 841a87d05..81dca7aed 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.60.1 +pkgver=1.60.2 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -46,4 +46,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="01adbeffee08ff6487f11a303fd7a59a99c36714dce21be9bbae7fd2bf8f080665e830bc3a47566140a6081dc74f6c2f8d8232286759b761f70493545a9d90ea gobject-introspection-1.60.1.tar.xz" +sha512sums="8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e gobject-introspection-1.60.2.tar.xz" diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 7c3123ecb..6e5ff59c7 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -45,6 +45,9 @@ _build_flavor() { local flavor="$1" shift local _configure="$@" + case $CTARGET_ARCH in + ppc64) export CFLAGS="-O2 -ggdb -mcpu=970";; # Workaround for http://savannah.gnu.org/bugs/?52629 + esac msg "Building grub for platform $flavor" mkdir -p "$srcdir"/build-$flavor diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 57cbe384b..a3a5ff659 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.8 +pkgver=3.24.9 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -53,4 +53,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5 gtk+-3.24.8.tar.xz" +sha512sums="b303db40d5e277841738982a97edd67076febe41b3a455344aeff05c6a5b149c6d3b953cc5db1a792b63cdcc44c2d28f955d81065cb2c6b3f00d0b133a555d7a gtk+-3.24.9.tar.xz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 02a94f8f6..d698c149d 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1461 +pkgver=8.1.1583 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="4c0237808d126069cb023246fc58d7743f8b9813e934a37e8061da43391712abc388921ee62fedc5c76bd374e82496bd8aabc6d8a9248fd8e77064895450032a vim-8.1.1461.tar.gz" +sha512sums="ad66bfc031f61d652fe6700656416b3d5d708cc7407bc45c757ce89d1346ba5fc597a2623d7593b819626076f7a74179d768ac425fa5b145a5de0fb27a6474a1 vim-8.1.1583.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index 5038f3ae6..479d9ed1a 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview pkgver=19.04.2 -pkgrel=0 +pkgrel=1 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" arch="all" diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index 47a6f63b5..d57231f43 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=icewm -pkgver=1.5.4 +pkgver=1.5.5 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b5743872d328f937b49e2b79f7d6c0b8404326ef7e7a3b529c80138b36e8c2b30db79593125a8be76abe40282c779f79ca64b504f980ef2c87052448bdc076e icewm-1.5.4.tar.xz" +sha512sums="5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e icewm-1.5.5.tar.xz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 2dea1fd5f..c772977b2 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata pkgver=5.54.0 -pkgrel=1 +pkgrel=2 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" arch="all" diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index c8c83d7f4..e47058f3d 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum pkgver=5.5 -pkgrel=0 +pkgrel=1 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" arch="all" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 5023c7619..bbe0c9797 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita pkgver=4.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Digital painting program by KDE" url="https://krita.org/" arch="all" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 36ef18b69..d49285c0f 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 pkgver=19.04.2 -pkgrel=0 +pkgrel=1 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" arch="all" diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index 942d22442..c8dccafca 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -28,7 +28,7 @@ build() { check() { cd "$builddir" - make check + DISPLAY= make check } package() { diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD index 624c2d4bc..3e0bf669c 100644 --- a/user/libsigc++/APKBUILD +++ b/user/libsigc++/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsigc++ -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=0 pkgdesc="Library for type-safe callbacks in C++" url="https://libsigcplusplus.github.io/libsigcplusplus/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2 libsigc++-2.10.1.tar.xz" +sha512sums="33bc1ed20b3cec07aba3e090af24c3dcb0047b2ce4f693879fd7201a24abdeecb17f6b1307a2d0c0bc2b74f16cfa0c60f300b7cdf8ef13db1bfd990bdf8f9eb4 libsigc++-2.10.2.tar.xz" diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index 779e73a54..f1eddca71 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4ui -pkgver=4.13.4 +pkgver=4.13.5 pkgrel=0 pkgdesc="UI library for the XFCE desktop environment" url="https://xfce.org" @@ -12,7 +12,6 @@ makedepends="intltool gtk+3.0-dev gobject-introspection-dev vala-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-$pkgver.tar.bz2" -sha512sums="c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206 libxfce4ui-4.13.4.tar.bz2" build() { cd "$builddir" @@ -37,3 +36,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="5ce49c7052392ac0df74b0d5069fa7880d7b322a15b10c5c20932f10ae06529be2b21d95f7e1c10a8ecb2e38cce9a2d880ac107c3ce1e7f51d570d5ece7b7d3c libxfce4ui-4.13.5.tar.bz2" diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 55a5a62f7..deb744a29 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4util -pkgver=4.13.2 +pkgver=4.13.3 pkgrel=0 pkgdesc="Utility library for the XFCE desktop environment" url="https://xfce.org" @@ -11,7 +11,6 @@ makedepends="intltool glib-dev gobject-introspection-dev vala" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-$pkgver.tar.bz2" -sha512sums="3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4 libxfce4util-4.13.2.tar.bz2" build() { cd "$builddir" @@ -35,3 +34,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="e06bf58d46c5c3c6964a17ca8d998bd8e78bb61577ddcd855680878a890912a167212a2b4e3b347f41f84d2983e71fd1d76716db9c4a88a1d4f45a0f5aaf5e51 libxfce4util-4.13.3.tar.bz2" diff --git a/user/lua-sec/APKBUILD b/user/lua-sec/APKBUILD index e6fe5e684..27ea13b48 100644 --- a/user/lua-sec/APKBUILD +++ b/user/lua-sec/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=lua-sec -pkgver=0.7 +pkgver=0.8 pkgrel=0 pkgdesc="TLS/SSL Support for Lua" url="https://github.com/brunoos/luasec/wiki" @@ -29,4 +29,4 @@ package() { cp -r samples "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="6adf5241aa5a0d92c9dd7fc7f7e426969475548f47979ccc28187471b3bad4132c215de6da1f471d21b05c6558d36309264512c9c4ac70a53d6f6e204cac1358 luasec-0.7.tar.gz" +sha512sums="eebacc8bd3a3ba38a99ef885f61dcee662978d31332d367f8a810c25c30e009ed1fabe2b54c5f48fb584549be52a31e03f36ed59865350de38c5ae926025ca61 luasec-0.8.tar.gz" diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index 7bc21d7e0..f9ce9632f 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=luarocks -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=0 pkgdesc="Package manager for Lua software" url="https://luarocks.org/" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="78ef1d72302c88fa9989aaf4dba8d7043a2929b709631be2003d3419df828e9168b207365c56bbbf0b52bf81d15fc96b92a7c7abb5dd11dde3630d23886ff51c luarocks-3.1.2.tar.gz" +sha512sums="233e17cd89f99eb387b9e5256edb10c920fb0dd7a173561b24c09c45c341de62f85dba85787788546deef206022602d3f707291935da1a2aee5c05fcad6ddc1b luarocks-3.1.3.tar.gz" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index 2f7daa034..0790a1cd9 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=marco -pkgver=1.22.1 +pkgver=1.22.2 pkgrel=0 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -36,5 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f marco-1.22.1.tar.xz +sha512sums="96665120dbc698c78795eeaa559ae2bfd2a3c7ed4846e40bcfb1d6dfc8d7e359b860e1e715085a17e11c66ce7f31561d372da8372209c21c7b1ce6029a3f5ea1 marco-1.22.2.tar.xz b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49 correctly-posix.patch" diff --git a/user/notmuch/APKBUILD b/user/notmuch/APKBUILD index c97dce2cc..b585d685f 100644 --- a/user/notmuch/APKBUILD +++ b/user/notmuch/APKBUILD @@ -36,8 +36,8 @@ build() { check() { cd "$builddir" # config, regexp-query: musl issues, TODO: Fixed in master - # count, insert: gdb-based tests which fail at some optimization levels, or w/o -g. - NOTMUCH_SKIP_TESTS="config regexp-query count insert" make check + # atomicity, count, new, insert: gdb-based tests which fail randomly on some arches, with some CFLAGS, or during some moon phases + NOTMUCH_SKIP_TESTS="config regexp-query atomicity count new insert" make check } package() { diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 5f44334bb..5f204c6b1 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular pkgver=19.04.2 -pkgrel=0 +pkgrel=1 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" arch="all" diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index 6e2993bd6..c549987d8 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg pkgver=2.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" @@ -18,7 +18,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPENJPEG_INSTALL_LIB_DIR=lib \ - -DOPENJPEG_INSTALL_PACKAGE_DIR=/usr/lib/cmake/$pkgname-${pkgver%.*} + -DOPENJPEG_INSTALL_PACKAGE_DIR=lib/cmake/$pkgname-${pkgver%.*} make } diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD index bd139c4a3..478066c17 100644 --- a/user/otf-source-serif-pro/APKBUILD +++ b/user/otf-source-serif-pro/APKBUILD @@ -1,8 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=otf-source-serif-pro -pkgver=2.010 -_pkgver=1.010 +pkgver=3.000 pkgrel=0 pkgdesc="Serif font family for typesetting" url="https://adobe-fonts.github.io/source-serif-pro/" @@ -11,15 +10,14 @@ options="!check" # No tests license="OFL-1.1" depends="fontconfig" makedepends="" -source="https://github.com/adobe-fonts/source-serif-pro/releases/download/${pkgver}R-ro%2F${_pkgver}R-it/source-serif-pro-${pkgver}R-ro-${_pkgver}R-it.zip" -builddir="$srcdir/source-serif-pro-${pkgver}R-ro-${_pkgver}R-it" +source="https://github.com/adobe-fonts/source-serif-pro/releases/download/${pkgver}R/${pkgname#*-}-${pkgver}R.zip" package() { - cd "$builddir"/OTF + cd "$srcdir"/OTF mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} done } -sha512sums="464fe11a928a8d574912a87d6df66c57a0fba554bb39ff8ae7faf607440f2805f8022f40870ed408284e3676cc164ce114a483ba4259e23b4d06efeee4c0fc3f source-serif-pro-2.010R-ro-1.010R-it.zip" +sha512sums="865ea8ab6d5b8107b85a494f3b54da83a479a613c198c657d16fc6abe10022d0bbb1e441a328371a33a0d393467da599eba6458be31835cdd7391cfde4a6eec8 source-serif-pro-3.000R.zip" diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD index 1e75b8f9f..8ded0c7dc 100644 --- a/user/perl-bareword-filehandles/APKBUILD +++ b/user/perl-bareword-filehandles/APKBUILD @@ -1,34 +1,30 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-bareword-filehandles -pkgver=0.006 +pkgver=0.007 pkgrel=0 pkgdesc="Perl module for disabling support for bareword filehandles" url="https://metacpan.org/pod/bareword::filehandles" arch="all" license="Artistic-1.0-Perl" -depends="" -makedepends="perl-dev perl-b-hooks-op-check perl-extutils-depends" -install="" +depends="perl-b-hooks-op-check" +makedepends="perl-dev perl-extutils-depends" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/I/IL/ILMARI/bareword-filehandles-$pkgver.tar.gz" builddir="$srcdir/bareword-filehandles-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="73cf85f35d10d13d4ad3be471e30cce0a19a899a7c4d033d2202d815dae8e30aa54b2ad7923dba6d798db1c49d2dcbc7c4f72b2d3f1f08e6e009700682d4e65e bareword-filehandles-0.006.tar.gz" +sha512sums="e7bd4e2ce32b819086050d1619806a5ffedb08732a25a8786dc70f6c8bea3cb3dab2bcced2d5f02f8248ca816dcccdaa2a20c6c943dc5667f334e9e319dbee6d bareword-filehandles-0.007.tar.gz" diff --git a/user/perl-canary-stability/APKBUILD b/user/perl-canary-stability/APKBUILD index f68eadfc0..3aaa5ef2e 100644 --- a/user/perl-canary-stability/APKBUILD +++ b/user/perl-canary-stability/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-canary-stability -pkgver=2012 +pkgver=2013 pkgrel=0 pkgdesc="Canary to check Perl compatibility for schmorp's modules" url="https://metacpan.org/pod/Canary::Stability" @@ -9,26 +9,22 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/Canary-Stability-$pkgver.tar.gz" builddir="$srcdir/Canary-Stability-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="7780731e4142d536182e1820c041c43ae67c5b47c044f15d8dcc060646bbab10a974bddcb703fdb27f427db3cd4dbdff54e131dc708c0260d7275be869eb27b1 Canary-Stability-2012.tar.gz" +sha512sums="9dfb0e6d136048050aac7c29e1fc79dc2a7703c8800582aa837c5d9b9934c48bfcb0a9ef1c6b5bb7e71a10a709e7f7431b3c79ea12b8d9f374b33bfd4a3e468d Canary-Stability-2013.tar.gz" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index cccb8ee11..9ebee6f7b 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-datetime-timezone _pkgname=DateTime-TimeZone -pkgver=2.34 +pkgver=2.35 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -17,20 +17,17 @@ source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-$pkg builddir="$srcdir/DateTime-TimeZone-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="8525542dfee39f8b889889db310d455b03dd0f270d391a06c337c46d9d457969e365ebf9b8fa42eef71b1dbf2bbd3e25c1ef710f19701a300729bc1816bcaa0c DateTime-TimeZone-2.34.tar.gz" +sha512sums="5d103d89586c24f9409baba8233c0655cdf7799d5fa58b5a8708eb883289c35cc6f04f2488c90987b91be17932054293bedac3b682dd534206848bd4778f0ce5 DateTime-TimeZone-2.35.tar.gz" diff --git a/user/perl-datetime/APKBUILD b/user/perl-datetime/APKBUILD index 9bdd7a945..e92505389 100644 --- a/user/perl-datetime/APKBUILD +++ b/user/perl-datetime/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-datetime _pkgname=DateTime -pkgver=1.50 +pkgver=1.51 pkgrel=0 pkgdesc="Date and time object for Perl" url="https://metacpan.org/release/DateTime" @@ -18,20 +18,17 @@ source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.g builddir="$srcdir/DateTime-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="fa8f57aac2b736a5b8b70005b74a81ea4bc80143714a79f16896c4214776c591f3db6689841a6b5217070e02ccea6ccf30b565c3bb0acdce9d1ea44eb61fe85a DateTime-1.50.tar.gz" +sha512sums="d94d673ecefb7ed8bd485f7be9f3c2c0e9a07c402793f14f5af3bc026cc875d7d2a151f72f1c1d3518e08af133eab247796400215f4304f785d17d84e53caded DateTime-1.51.tar.gz" diff --git a/user/perl-devel-stacktrace/APKBUILD b/user/perl-devel-stacktrace/APKBUILD index 1420b82f3..3b14c894a 100644 --- a/user/perl-devel-stacktrace/APKBUILD +++ b/user/perl-devel-stacktrace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-devel-stacktrace -pkgver=2.03 +pkgver=2.04 pkgrel=0 pkgdesc="A Perl object representing a stack trace" url="https://metacpan.org/release/Devel-StackTrace" @@ -14,20 +14,17 @@ source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Devel-StackTrace-$pkgv builddir="$srcdir/Devel-StackTrace-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="a5263ec76f5adb83b83cc4906c18d6c341f50472a254617882a889315597698968988be1bacbbb4c6c0709974ff4ba67a14835d3c2278d672219c52e4c823514 Devel-StackTrace-2.03.tar.gz" +sha512sums="2330c1d8619cdcb42b5919090e6eaabbe34ab26b50d5c09c4cfd7ed099829817a50ffe582bd1f2a19a7d5be050819796f22dee32b10e175259e6df177ce6d0a9 Devel-StackTrace-2.04.tar.gz" diff --git a/user/perl-dir-manifest/APKBUILD b/user/perl-dir-manifest/APKBUILD new file mode 100644 index 000000000..81ada3554 --- /dev/null +++ b/user/perl-dir-manifest/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-dir-manifest +_pkgname=Dir-Manifest +pkgver=0.0.5 +pkgrel=0 +pkgdesc="Perl module to turn a directory and files into a dictionary" +url="https://metacpan.org/release/Dir-Manifest" +arch="noarch" +license="X11" +depends="perl perl-moo perl-path-tiny" +makedepends="perl-dev perl-module-build" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + perl Build.PL installdirs=vendor + export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + ./Build +} + +check() { + ./Build test +} + +package() { + ./Build install destdir="$pkgdir" + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="531088dec5de10eb5de6d58e92e39e84e637f3913ddafc5f1d1510e7151bcd3f22a6a9a90934ad7c861352ef17f80e32248941a8bf40d66c5b8f9d4eab43daef Dir-Manifest-0.0.5.tar.gz" diff --git a/user/perl-games-solitaire-verify/APKBUILD b/user/perl-games-solitaire-verify/APKBUILD index 627484d38..185e64623 100644 --- a/user/perl-games-solitaire-verify/APKBUILD +++ b/user/perl-games-solitaire-verify/APKBUILD @@ -1,35 +1,34 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-games-solitaire-verify -pkgver=0.2000 +_pkgname=Games-Solitaire-Verify +pkgver=0.2201 pkgrel=0 pkgdesc="Verify solutions to solitaire games" url="https://metacpan.org/release/Games-Solitaire-Verify" arch="noarch" license="MIT" -depends="perl-class-xsaccessor perl-exception-class perl-list-moreutils" +depends="perl-class-xsaccessor perl-dir-manifest perl-exception-class + perl-list-moreutils" makedepends="perl-dev perl-module-build" checkdepends="perl-test-differences perl-path-tiny" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-$pkgver.tar.gz" -builddir="$srcdir/Games-Solitaire-Verify-$pkgver" +source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" perl Build.PL installdirs=vendor export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` ./Build } check() { - cd "$builddir" ./Build test } package() { - cd "$builddir" ./Build install destdir="$pkgdir" find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="4abc5cd68bc57f96115a2f273aa16076b2f2ff50a597a8e1f4bf5b6f6dcb26771346d7cff3cadfc10eb1f8584c79141b06ecd6b07b6b19610405dc80977d9382 Games-Solitaire-Verify-0.2000.tar.gz" +sha512sums="036c7eb81932ecf6cc6e9617f7e611e2a7dab032c60b3d7773554fe564fd93b54c4760e90f10c03408a4cf14bd23e54116f9b4f497113bdb2b2058d090ac2986 Games-Solitaire-Verify-0.2201.tar.gz" diff --git a/user/perl-getopt-long-descriptive/APKBUILD b/user/perl-getopt-long-descriptive/APKBUILD index 92fe31c60..c242ee5ce 100644 --- a/user/perl-getopt-long-descriptive/APKBUILD +++ b/user/perl-getopt-long-descriptive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-getopt-long-descriptive -pkgver=0.103 +pkgver=0.104 pkgrel=0 pkgdesc="Simpler Perl implementation of Getopt::Long" url="https://metacpan.org/release/Getopt-Long-Descriptive" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-$ builddir="$srcdir/Getopt-Long-Descriptive-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f Getopt-Long-Descriptive-0.103.tar.gz" +sha512sums="5579faa6f9012cd03ac4d51149b0854771f15d8e324f8df345fe6af1a8f3fdeaaef6c5becee55bf77515da85d92aa61a63dfc5ee8264d2d0368e02a4a4cbd7fa Getopt-Long-Descriptive-0.104.tar.gz" diff --git a/user/perl-inline-c/APKBUILD b/user/perl-inline-c/APKBUILD index f5065e0c5..480ebab83 100644 --- a/user/perl-inline-c/APKBUILD +++ b/user/perl-inline-c/APKBUILD @@ -1,35 +1,31 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-inline-c -pkgver=0.80 +pkgver=0.81 pkgrel=0 -pkgdesc="C Language Support for Inline" +pkgdesc="C language support for Inline" url="https://metacpan.org/pod/Inline::C" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl perl-inline perl-pegex perl-parse-recdescent" makedepends="perl-dev perl-file-sharedir-install" checkdepends="perl-test-warn perl-yaml-libyaml perl-file-copy-recursive" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/Inline-C-$pkgver.tar.gz" builddir="$srcdir/Inline-C-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f68eb9478374ef13a6eb0be6c5adc12ba9c052834ef45db6acc0c794ac295d5b47ffda57dd4d0b15345be96aa21ccaab8bf7e2be0ac0bc4cef73be782a346cf0 Inline-C-0.80.tar.gz" +sha512sums="c3d0d669c26017b4b63cc101377d067438c31fc5d1e6187d01194f70158049e386683b792716aad58772eae839512ecaefd4b3ac7a2377dd1404a651c24b2277 Inline-C-0.81.tar.gz" diff --git a/user/perl-inline/APKBUILD b/user/perl-inline/APKBUILD index c3343d150..43cb6de1f 100644 --- a/user/perl-inline/APKBUILD +++ b/user/perl-inline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-inline -pkgver=0.82 +pkgver=0.83 pkgrel=0 pkgdesc="Write Perl Subroutines in Other Programming Languages" url="https://metacpan.org/pod/Inline" @@ -10,26 +10,22 @@ license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl" makedepends="perl-dev" checkdepends="perl-test-warn" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/Inline-$pkgver.tar.gz" builddir="$srcdir/Inline-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c53d8ae250e8463bd8973be96cf9bc70cc46fc937fb99990f4c1872c30411356f63ce785a10b55234e0d032a123a88c8192516ad9ad19ed50c0966b77669806a Inline-0.82.tar.gz" +sha512sums="83ebc1f6e836117a49e991117be2a650c077ecd368b50547b80176b8da1ab776c12ee9615b54d30f07cc4ec9b1456929e6a940e52e3a05d8d8df568ad32709cd Inline-0.83.tar.gz" diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD index 0990e8cba..b9c1265f6 100644 --- a/user/perl-regexp-pattern/APKBUILD +++ b/user/perl-regexp-pattern/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-pattern -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=0 pkgdesc="Perl framework for regex collection standardization" url="https://metacpan.org/pod/Regexp::Pattern" @@ -9,26 +9,22 @@ arch="noarch" license="Artistic-1.0-Perl" depends="perl perl-test-exception" makedepends="" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/P/PE/PERLANCAR/Regexp-Pattern-$pkgver.tar.gz" builddir="$srcdir/Regexp-Pattern-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f2e1f1387b8ea563ad8066c8cdc1b94b2e5ba742b3833ab7764c9541974b8758998090840f74962250a8f5f3a7fd1cd03afbcf41ed942fc2cc1054ee15b4950e Regexp-Pattern-0.2.8.tar.gz" +sha512sums="5d08dad97ef9bf97a3a42132bee176b50da4cee9a399761f6189f39f70d6486a0c0915c5a00996be7d6d02092814cbd911c1d56775c72b103c511da95e9794c0 Regexp-Pattern-0.2.9.tar.gz" diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD index 4d1cdec4c..bc3a7f733 100644 --- a/user/perl-template-toolkit/APKBUILD +++ b/user/perl-template-toolkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-template-toolkit -pkgver=2.28 +pkgver=2.29 pkgrel=0 pkgdesc="Comprehensive template processing system" url="https://metacpan.org/release/Template-Toolkit" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Template-Toolkit-$pkgv builddir="$srcdir/Template-Toolkit-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="8f18a411e05108cddc4f2c5560c76b663d6b913f101c6b294b584390cd76d79805afa8208e1dfaf01011ff7d6364844a24587b33d8a3d330fb6b410e75e78a1d Template-Toolkit-2.28.tar.gz" +sha512sums="5b1bfeaf600a5628b6441e54de5c4af1cf4e01296792a79290d4bf2a698be47112e94a05fe3f47bf9ac64c4d8b9340aa6ef8738560fb1f96510d7d1c9f647a65 Template-Toolkit-2.29.tar.gz" diff --git a/user/perl-test-runvalgrind/APKBUILD b/user/perl-test-runvalgrind/APKBUILD index c6f31b336..4e6d9958c 100644 --- a/user/perl-test-runvalgrind/APKBUILD +++ b/user/perl-test-runvalgrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-runvalgrind -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=0 pkgdesc="Tests an external program is 'valgrind clean' from Perl" url="https://metacpan.org/release/Test-RunValgrind" @@ -16,21 +16,18 @@ source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Test-RunValgrind-$pkgv builddir="$srcdir/Test-RunValgrind-$pkgver" build() { - cd "$builddir" perl Build.PL installdirs=vendor ./Build } check() { - cd "$builddir" ./Build test } package() { - cd "$builddir" ./Build install destdir="$pkgdir" find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e85547d24fb7c8b0a8fd1a84826eec51d3c4c94d83cbb525517515ecc27b0ba530378a10f8a2ffee9fb1f48eb2e65a6a2654738ee069bd85adcec7f4c205f143 Test-RunValgrind-0.2.0.tar.gz +sha512sums="3ebe26bb06aa48e590d2714ef944b7f23b7a9db83410dafa252155524edd19ed9947e382cf532dbaae6e661bd1d8566d65b365fdf568452d164c1fd30ad230a0 Test-RunValgrind-0.2.1.tar.gz f2ebba2310df820666728e5f59c44f5b63cd03efdb42092f22700da13b4f099ae5c911292fb2a0f271f7629343727ea14c5953d2918c98419a580e5a998cb650 portable-memory-assumptions.patch" diff --git a/user/perl-test-taint/APKBUILD b/user/perl-test-taint/APKBUILD index 02488dfbf..35fc97e32 100644 --- a/user/perl-test-taint/APKBUILD +++ b/user/perl-test-taint/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-taint _pkgname=Test-Taint -pkgver=1.06 +pkgver=1.08 pkgrel=0 pkgdesc="Tools to test taintedness" url="https://metacpan.org/release/Test-Taint" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/Test-Taint-$pkgver.ta builddir="$srcdir/Test-Taint-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="58221b0145d9b908994c093168ca547a18cd56113f4923a4662bb9c113635378740363914d1fd43602f15c76a23cfe26d0682ed6ce22836d712692f439e782c2 Test-Taint-1.06.tar.gz" +sha512sums="2a7e3a60756c802dc33ac0b2a4102463de59fe92ba3cd83cb02e01e9f7aa13978c7a8ac7dcfdcf3c0d934af40e5189421874da819be9258e91080b777be71b20 Test-Taint-1.08.tar.gz" diff --git a/user/perl-test-time/APKBUILD b/user/perl-test-time/APKBUILD index f1b847587..4390a2d89 100644 --- a/user/perl-test-time/APKBUILD +++ b/user/perl-test-time/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-time _pkgname=Test-Time -pkgver=0.07 +pkgver=0.08 pkgrel=0 pkgdesc="Override Perl functions for testing" url="https://metacpan.org/release/Test-Time" @@ -15,20 +15,17 @@ source="https://cpan.metacpan.org/authors/id/S/SA/SATOH/Test-Time-$pkgver.tar.gz builddir="$srcdir/Test-Time-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b5ad87ea43eaae6b474be4aa7d153fe89bb9cc86254257e68073ff214b901846096037634a8d73b1e0852d5bf51fbee58e32c742c0726702ddb06d79679a65f9 Test-Time-0.07.tar.gz" +sha512sums="77f77f0f3aab033e1dd02c92ebae734a496e8c2e070f908ee73a70197971839009118f10c2e0ff2562172f4da62262eb2d67a05796c9dc77a46efaa9113f99df Test-Time-0.08.tar.gz" diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index 6382858fc..e0a2560a7 100644 --- a/user/perl-test2-suite/APKBUILD +++ b/user/perl-test2-suite/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test2-suite -pkgver=0.000120 +pkgver=0.000122 pkgrel=0 pkgdesc="Collection of Perl modules in the Test2 namespace" url="https://metacpan.org/pod/Test2::Suite" @@ -18,20 +18,17 @@ source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test2-Suite-$pkgver.ta builddir="$srcdir/Test2-Suite-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="bdaa2ee8eb6e4444b40598f42a87b29b7b049b8f8cd1629d3bd0c4a56de0579b610898312e0a6cb039f4107d4e8ca00510b31485e96a1e01db87a28102ea2c92 Test2-Suite-0.000120.tar.gz" +sha512sums="6332b4300ad37d16378a37a931f470b33c4c82603e4e0b3a0c42c707c75a735908001daecc47ed73361635aabd65c0909f37a74d731bc958f4345ea75207dab2 Test2-Suite-0.000122.tar.gz" diff --git a/user/perl-time-duration-parse/APKBUILD b/user/perl-time-duration-parse/APKBUILD index 22fbfbe7e..8cef9ca4c 100644 --- a/user/perl-time-duration-parse/APKBUILD +++ b/user/perl-time-duration-parse/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-time-duration-parse -pkgver=0.14 +pkgver=0.15 pkgrel=0 pkgdesc="Parse strings in Perl that represent time durations" url="https://metacpan.org/release/Time-Duration-Parse" @@ -14,20 +14,17 @@ source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Time-Duration-Parse-$pkg builddir="$srcdir/Time-Duration-Parse-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="49dcb7d3979df7e84141ebf9262b2283dfe535502b71633d95424376146d81bbf5d6932035dde878a5b1bef265d84a029412ff0187927569cf48ad193ea2f8e3 Time-Duration-Parse-0.14.tar.gz" +sha512sums="1cd4b303cedc58d8513165297369b3705c2fe07db9b626c922829a8a86586bbdf631cd06052924dfaa030a5179e121bbb9c0d8b7159d54e137cb9e70f3086e20 Time-Duration-Parse-0.15.tar.gz" diff --git a/user/perl-time-duration/APKBUILD b/user/perl-time-duration/APKBUILD index daf931ee5..48b864ba0 100644 --- a/user/perl-time-duration/APKBUILD +++ b/user/perl-time-duration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-time-duration -pkgver=1.20 +pkgver=1.21 pkgrel=0 pkgdesc="Rounded or exact English expression of time durations in Perl" url="https://metacpan.org/release/Time-Duration" @@ -14,20 +14,17 @@ source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Time-Duration-$pkgver.ta builddir="$srcdir/Time-Duration-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="74bdcbc2b65061ad30540a95467de24f552235cea2367a7770309d9ffefeb35717f438e4f7ebf6a1d63f338cd714ffe16b3f45808514995db9753d643892d5f9 Time-Duration-1.20.tar.gz" +sha512sums="2d03d73096967265f16f4ebde2d9fbb83fce591e15fa01f5f4f750123f27a4571bbd01d5d93f785f78ee8810aca9d945241e6a767b65f45abb4608d321108020 Time-Duration-1.21.tar.gz" diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD index 8e62189f4..5c0bbf4c8 100644 --- a/user/poppler-qt5/APKBUILD +++ b/user/poppler-qt5/APKBUILD @@ -1,40 +1,62 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=poppler-qt5 _realname=poppler -pkgver=0.74.0 +pkgver=0.77.0 pkgrel=0 +_testver=01c92874 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)" url="https://poppler.freedesktop.org/" arch="all" -options="!check" # Test data not included in tarball license="GPL-2.0+" makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev" depends="" depends_dev="$makedepends" subpackages="$pkgname-dev" -source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz" -builddir="$srcdir"/$_realname-$pkgver +source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz + https://dev.sick.bike/dist/poppler-test-$_testver.tar.gz" +builddir="$srcdir"/$_realname-$pkgver/build + +# secfixes: poppler +# 0.77.0-r0: +# - CVE-2019-9200 +# - CVE-2019-9631 +# - CVE-2019-9903 +# - CVE-2019-10872 +# - CVE-2019-10873 +# - CVE-2019-11026 +# - CVE-2019-12293 prepare() { - mkdir -p build + default_prepare + mkdir "$builddir" } build() { - cd "$builddir"/build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DTESTDATADIR="$srcdir/poppler-test-$_testver" \ .. make } +check() { + # check_qt5_annotations: fails on ppc64 and x86_64 as of 0.77.0-r0 + # FAIL! : TestAnnotations::checkFontSizeAndColor() Compared values are not the same + # Actual (textAnnot->contents()): "\u00C3\u00BE\u00C3\u00BF\u0000f\u0000o\u0000o\u0000b\u0000a\u0000r" + # Expected (contents) : "foobar" + # Loc: [src/poppler-0.77.0/qt5/tests/check_annotations.cpp(100)] + ctest --output-on-failure \ + -E check_qt5_annotations +} + package() { - cd "$builddir"/build install -D -m644 poppler-qt5.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt5.pc cd qt5 make DESTDIR="$pkgdir" install } -sha512sums="4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66 poppler-0.74.0.tar.xz" +sha512sums="7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040 poppler-0.77.0.tar.xz +5275541ffa0fef9c55a0c02411947c610b2e7eb621f0a0fa9529810f8b09e2b0194c1da4b64eb9641b2c3af7b099e6bb7d1212b9087a21cf3af893090a10506b poppler-test-01c92874.tar.gz" diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD index b1a6bf526..9c3385c8d 100644 --- a/user/poppler/APKBUILD +++ b/user/poppler/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: pkgname=poppler -pkgver=0.74.0 +pkgver=0.77.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" arch="all" -options="!check" # Test data is available in Git only. +options="!check" # Tests only cover Qt5 component. license="GPL-2.0+" depends="" depends_dev="cairo-dev glib-dev" @@ -16,6 +16,16 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-glib" source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz" builddir="$srcdir"/$pkgname-$pkgver/build +# secfixes: +# 0.77.0-r0: +# - CVE-2019-9200 +# - CVE-2019-9631 +# - CVE-2019-9903 +# - CVE-2019-10872 +# - CVE-2019-10873 +# - CVE-2019-11026 +# - CVE-2019-12293 + prepare() { default_prepare mkdir "$builddir" @@ -50,11 +60,4 @@ glib() { "$subpkgdir"/usr/lib/ } -_cpp() { - pkgdesc="Pure C++ wrapper for poppler" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libpoppler-cpp.so.* \ - "$subpkgdir"/usr/lib/ -} - -sha512sums="4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66 poppler-0.74.0.tar.xz" +sha512sums="7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040 poppler-0.77.0.tar.xz" diff --git a/user/py3-configargparse/APKBUILD b/user/py3-configargparse/APKBUILD index 4641df6e8..0d7d93490 100644 --- a/user/py3-configargparse/APKBUILD +++ b/user/py3-configargparse/APKBUILD @@ -9,6 +9,7 @@ pkgrel=0 pkgdesc="A drop-in replacement for argparse" url="https://github.com/bw2/ConfigArgParse" arch="noarch" +options="!check" # https://github.com/bw2/ConfigArgParse/issues/146 license="MIT" depends="python3" makedepends="python3-dev python3-tests" diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index 24c486a07..d1dfe928d 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pygobject -pkgver=3.32.1 +pkgver=3.32.2 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://wiki.gnome.org/Projects/PyGObject" @@ -28,4 +28,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915 pygobject-3.32.1.tar.xz" +sha512sums="50081bfed45e8b5f0b87fe5c95d4cc12d1b31085e869c603bbc70e34bca69059cc44e8a42270f51e7f04e3ecf2c98da524327a982ed7bb594621fb434d4227f6 pygobject-3.32.2.tar.xz" diff --git a/user/qpdfview/APKBUILD b/user/qpdfview/APKBUILD index 612cb251e..3f7876f4b 100644 --- a/user/qpdfview/APKBUILD +++ b/user/qpdfview/APKBUILD @@ -1,29 +1,29 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=qpdfview -pkgver=0.4.16 -pkgrel=1 +pkgver=0.4.18_beta1 +_pkgver=0.4.18beta1 +pkgrel=0 pkgdesc="A tabbed document viewer" url="https://launchpad.net/qpdfview" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cups-dev gnutls-dev poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev - qt5-qtsvg-dev" +makedepends="cups-dev djvulibre-dev gnutls-dev libspectre-dev + poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev qt5-qtsvg-dev" subpackages="$pkgname-doc" -source="$url/trunk/$pkgver/+download/qpdfview-$pkgver.tar.gz" +source="$url/trunk/$_pkgver/+download/qpdfview-$_pkgver.tar.gz" +builddir="$srcdir/$pkgname-$_pkgver" build() { - cd "$builddir" lrelease qpdfview.pro - qmake CONFIG+="without_ps without_djvu" qpdfview.pro + qmake qpdfview.pro make } package() { - cd "$builddir" make INSTALL_ROOT="$pkgdir" install } -sha512sums="d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584 qpdfview-0.4.16.tar.gz" +sha512sums="88c8f1a4a9f8d62ef4c073c50a7dfe57397a3c64621d3916578194c0aa6db3fc47c537652213c7851e70c2a655165fa4343f15ac615ba977c921648d7cfd834c qpdfview-0.4.18beta1.tar.gz" diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index f50676e5a..5af50c850 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico pkgver=3.2 -pkgrel=0 +pkgrel=1 pkgdesc="Collection manager" url="http://tellico-project.org/" arch="all" diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 5c400ece4..2f5685df1 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=tumbler pkgver=0.2.4 -pkgrel=0 +pkgrel=1 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" arch="all" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 3e6b0d5b0..8637da4ff 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vala -pkgver=0.44.3 +pkgver=0.44.5 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f074d537db94772565003a097c6a29e0dfcd58680baeb321ad04dec8ea056319eb8b7059117c259523b7570841651c2935feef06c03e3d82a11a94a293349b5a vala-0.44.3.tar.xz" +sha512sums="898ed675e0bdfac1ca2367363f6a5b930f021b3b6bc848314b8c1d43f37a312abfc54492eaa5e35f0d83b5b688fe27e5555ea46f1aba89a92cde7e6e8173d4fe vala-0.44.5.tar.xz" diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index bd9e7c4a5..0eee63bb6 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vte -pkgver=0.56.2 +pkgver=0.56.3 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -33,5 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8327a77abdfd97d7feda358e767046054ee24f9302c9187f2979e22c0034d4a6e9bf271fc327b866a43b404d7fe50ac36d1a4aebd58340744bdde24ecaa415ad vte-0.56.2.tar.xz +sha512sums="f78b3d532ca47e53c1bb51db6780697ce4692d493c0030d2dc4beb63a2595e44a43eb409ee31b94e4551eae259ac1baa8f06825a02fd66df8352e192f4ea1988 vte-0.56.3.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index b298be73a..5c8d91b84 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,8 +2,8 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=weechat -pkgver=2.4 -pkgrel=0 +pkgver=2.5 +pkgrel=1 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" arch="all" @@ -13,10 +13,11 @@ depends_dev="cmake aspell-dev curl-dev gnutls-dev libgcrypt-dev lua5.3-dev ncurses-dev perl-dev python3-dev zlib-dev" makedepends="$depends_dev" checkdepends="cpputest" -subpackages="$pkgname-dev $pkgname-aspell:_plugin $pkgname-lua:_plugin +subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang" source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz libintl-fix.patch + python.patch " # secfixes: @@ -48,8 +49,8 @@ _plugin() { local _dir=usr/lib/weechat/plugins pkgdesc="WeeChat $_name plugin" depends="weechat" - if [ "$_name" = python ]; then - depends="$depends python3" + if [ "$_name" = spell ]; then + provides="$pkgname-aspell=$pkgver-r$pkgrel" fi mkdir -p "$subpkgdir"/$_dir @@ -61,5 +62,6 @@ check() { ctest -V } -sha512sums="3537c3032237b0f1d103849516ccb461a29e13bf37f021af7905c75a3dc7c70fa4a76be2e8559b0299165c114d0408f3267fb74eb21a70f1661e6dac35e3bb9a weechat-2.4.tar.gz -59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" +sha512sums="1bf16c76e63668fc6d4b72d521f71980717b08bd2abc5c7f0825af32e6de9327c5c967067bfb025a0404eee627f54cecdd9f1f2b3618ea7a08798d8510a2487b weechat-2.5.tar.gz +59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch +b77bd5f31bf4547d1d5505fec5018b867f0b597ed0b6819d4ed0ff6a2b7f664f2308f6c1b094debc381673b4de6208f09ca36da3413eb72f40aca9924464d746 python.patch" diff --git a/user/weechat/python.patch b/user/weechat/python.patch new file mode 100644 index 000000000..a6e194719 --- /dev/null +++ b/user/weechat/python.patch @@ -0,0 +1,86 @@ +--- weechat-2.5/cmake/FindPython.cmake 2019-06-06 18:43:20.000000000 +0000 ++++ weechat-2.5/cmake/FindPython.cmake 2019-06-24 12:22:10.659972390 +0000 +@@ -25,7 +25,6 @@ + # + # PYTHON_EXECUTABLE = full path to the python binary + # PYTHON_INCLUDE_PATH = path to where python.h can be found +-# PYTHON_LIBRARY = path to where libpython.so* can be found + # PYTHON_LFLAGS = python compiler options for linking + + if(PYTHON_FOUND) +@@ -38,11 +37,19 @@ + NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python + PATHS /usr/bin /usr/local/bin /usr/pkg/bin + ) ++ find_program(PYTHON_CONFIG ++ NAMES python3-config ++ PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ ) + else() + find_program(PYTHON_EXECUTABLE + NAMES python2.7 python2.6 python2.5 python + PATHS /usr/bin /usr/local/bin /usr/pkg/bin + ) ++ find_program(PYTHON_CONFIG ++ NAMES python-config ++ PATHS /usr/bin /usr/local/bin /usr/pkg/bin ++ ) + endif() + + if(PYTHON_EXECUTABLE) +@@ -52,32 +59,17 @@ + ) + + execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))" +- OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH +- ) +- +- execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))" ++ COMMAND ${PYTHON_CONFIG} --libs + OUTPUT_VARIABLE PYTHON_LFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + find_path(PYTHON_INCLUDE_PATH + NAMES Python.h + HINTS ${PYTHON_INC_DIR} + ) +- if(ENABLE_PYTHON3) +- find_library(PYTHON_LIBRARY +- NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python +- HINTS ${PYTHON_POSSIBLE_LIB_PATH} +- ) +- else() +- find_library(PYTHON_LIBRARY +- NAMES python2.7 python2.6 python2.5 python +- HINTS ${PYTHON_POSSIBLE_LIB_PATH} +- ) +- endif() + +- if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) ++ if(PYTHON_LFLAGS AND PYTHON_INCLUDE_PATH) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])" + OUTPUT_VARIABLE PYTHON_VERSION +@@ -96,7 +88,6 @@ + mark_as_advanced( + PYTHON_EXECUTABLE + PYTHON_INCLUDE_PATH +- PYTHON_LIBRARY + PYTHON_LFLAGS + ) + +--- weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-06 18:43:20.000000000 +0000 ++++ weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-24 12:22:16.259972363 +0000 +@@ -24,8 +24,7 @@ + + if(PYTHON_FOUND) + include_directories(${PYTHON_INCLUDE_PATH}) +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LFLAGS}") +- target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts coverage_config) ++ target_link_libraries(python ${PYTHON_LFLAGS} weechat_plugins_scripts coverage_config) + endif() + + install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD index 0b13bd5a2..3484444cd 100644 --- a/user/xfmpc/APKBUILD +++ b/user/xfmpc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfmpc -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=0 pkgdesc="Graphical music player daemon client for the XFCE desktop environment" url="https://xfce.org" @@ -10,7 +10,7 @@ license="GPL-2.0+ AND LGPL-2.0+" makedepends="intltool gtk+2.0-dev libxfce4ui-dev libmpd-dev" subpackages="$pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfmpc/0.2/xfmpc-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2" build() { cd "$builddir" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be xfmpc-0.2.3.tar.bz2" +sha512sums="6e876aca2c2a6764fe97f061c97dc0fa9ce72b7ab6a2597b5f54bdce39789cc73bd038a0ef69b87d826c225efb9c3a2d19aa9ed7872ce7ee9ac5d7bd275444a3 xfmpc-0.3.0.tar.bz2" |