diff options
Diffstat (limited to 'user')
930 files changed, 7437 insertions, 6932 deletions
diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 25cbe8d4d..2e2da81ff 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" @@ -14,7 +14,9 @@ depends_dev="qt5-qtbase-dev akonadi-dev kcontacts-dev kcoreaddons-dev makedepends="$depends_dev cmake extra-cmake-modules akonadi-mime-dev kio-dev kmime-dev prison-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccb65c3874853dc9d9f9dd5b39d8f541357d49543386302c99bd1e978d87c9c5b9aee45f5e5589a4f61a04fd82a2867baf1d4fac0936036559957a9be463bb2d akonadi-contacts-20.04.3.tar.xz" +sha512sums="5d7a481b60cc7d6068e4bd12fd22e695f43652e3ebe4e03e5512c5901240193408a2e72227de91f00c76833b957d7c9b26c62a4fe16615028229b46d40360b4b akonadi-contacts-20.08.1.tar.xz +06ba7fb686e41eda820f98045832b80fd894e81c0b4a3edb50fbfbeb2d14a2e27e7536ca6729ad445326cd253c14ffa06653d73f7eaefa61ce9346b642792b73 lts.patch" diff --git a/user/akonadi-contacts/lts.patch b/user/akonadi-contacts/lts.patch new file mode 100644 index 000000000..946f29590 --- /dev/null +++ b/user/akonadi-contacts/lts.patch @@ -0,0 +1,11 @@ +--- akonadi-contacts-20.08.1/CMakeLists.txt.old 2020-09-01 06:34:26.000000000 +0000 ++++ akonadi-contacts-20.08.1/CMakeLists.txt 2020-09-17 16:27:53.030804534 +0000 +@@ -30,7 +30,7 @@ + set(KMIMELIB_VERSION "5.15.1") + set(AKONADI_VERSION "5.15.1") + +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) + ########### Find packages ########### + find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 238d026f5..d64e21806 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -12,7 +12,9 @@ depends_dev="qt5-qtbase-dev akonadi-dev kio-dev kmime-dev" makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev kdbusaddons-dev kconfig-dev kitemmodels-dev kxmlgui-dev shared-mime-info" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-mime-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-mime-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -42,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a22c8eaa5912fc2b13cf018b89062063157eb87570a9367d9fc4cabdf87e132fc564c81b21583fd0693b7ae4b2f13da6e2f7d6683a441ac2f320f594123bde0a akonadi-mime-20.04.3.tar.xz" +sha512sums="7bc468d93ba40ded4d3cb3fac23a2e1a06d76e3182c6b938fb21e09e6169ac96b8f5519becdc6d546ac269245f67b286afc37c6026cb05bc91e2e74b4f64a134 akonadi-mime-20.08.1.tar.xz +3feb62fbb888cb15b695a2cc86ff3d7cb8f63257f1185e1d87bc6b62cd0eb83e8b3c64eda37826eb5f97803a64f28c35ee4db40195be5c213569448535dde7b5 lts.patch" diff --git a/user/akonadi-mime/lts.patch b/user/akonadi-mime/lts.patch new file mode 100644 index 000000000..5f41c27bb --- /dev/null +++ b/user/akonadi-mime/lts.patch @@ -0,0 +1,11 @@ +--- akonadi-mime-20.08.1/CMakeLists.txt.old 2020-09-01 06:34:32.000000000 +0000 ++++ akonadi-mime-20.08.1/CMakeLists.txt 2020-09-17 16:25:49.944244189 +0000 +@@ -8,7 +8,7 @@ + + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + + include(KDEInstallDirs) + include(KDECMakeSettings) diff --git a/user/akonadi-search/APKBUILD b/user/akonadi-search/APKBUILD index 8e1957d8f..668d80bd8 100644 --- a/user/akonadi-search/APKBUILD +++ b/user/akonadi-search/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-search -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Search functionality for Akonadi" url="https://kde.org/" @@ -14,7 +14,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcmutils-dev kconfig-dev xapian-core-dev kauth-dev kcodecs-dev kcoreaddons-dev kitemmodels-dev kjobwidgets-dev kpackage-dev kservice-dev solid-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-search-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-search-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="902fdef259863d0d0789af29d7ac5cf49e0b95df4f3509a444a20fefd9948c134e024a685bddc1c547efef6d2ef7872d00e5a1f3ecb836b88103d17de47ce413 akonadi-search-20.04.3.tar.xz" +sha512sums="28e0235af1da68fac47b4535b0c5627d42de472d7d6238928a244dd729844f470c16c66c4092d25a33a373d790da8975c8b4d6fe429db209657003b50a39d7d3 akonadi-search-20.08.1.tar.xz +44245d992e5de6ebaa339c305e0f580f7ae83f605bc637180c9863421095feee9700d3ca6bd683a1360f90a727680a104737b5d985f8ec62a38c9aa7131d1b47 lts.patch" diff --git a/user/akonadi-search/lts.patch b/user/akonadi-search/lts.patch new file mode 100644 index 000000000..e2b050e4c --- /dev/null +++ b/user/akonadi-search/lts.patch @@ -0,0 +1,11 @@ +--- akonadi-search-20.08.1/CMakeLists.txt.old 2020-09-01 06:33:20.000000000 +0000 ++++ akonadi-search-20.08.1/CMakeLists.txt 2020-09-18 01:03:59.366321220 +0000 +@@ -34,7 +34,7 @@ + set(AKONADI_VERSION "5.15.1") + set(AKONADI_MIMELIB_VERSION "5.15.1") + set(KMIME_LIB_VERSION "5.15.1") +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Test) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n Config Crash DBusAddons KCMUtils KIO) diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 77c35b8ac..ddf5ff3c3 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -19,6 +19,7 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz akonadiserverrc atomics.patch + lts.patch " build() { @@ -48,6 +49,7 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="29612920af6794f096d6ae51d98830f38f4d94bfb3669e11b748fbf7556b2396fac1837f1ee14cfdbc2285164c8b08206d2d46a62d0929354af47c77d9978698 akonadi-20.04.3.tar.xz +sha512sums="e444f7449d4ac6ed184702d854785d3ce9a3c42878cb030934901a712a372cfc95c07d3e7b3ee70a1f0081a920f64d44372fbd194eb6c7c32b9938b69ab9ac5a akonadi-20.08.1.tar.xz b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc -6cdeece137523f0b67fac0384de446562ddca7530cf4a9cc7736d3eb582b6630e24a125f3648778f76b2b576b47e33d5b99a6bfd96770afa0dad97d1a1260cd1 atomics.patch" +6cdeece137523f0b67fac0384de446562ddca7530cf4a9cc7736d3eb582b6630e24a125f3648778f76b2b576b47e33d5b99a6bfd96770afa0dad97d1a1260cd1 atomics.patch +f9217e1632612206d0e86b4a3667544cf77218535109e2cdff4e9ddd84805bf8d04f38db3b84c909c405ac47c656e01fef170f1d48ebcd0c3e7bfadb3a0dd35c lts.patch" diff --git a/user/akonadi/lts.patch b/user/akonadi/lts.patch new file mode 100644 index 000000000..8a6e4bcc9 --- /dev/null +++ b/user/akonadi/lts.patch @@ -0,0 +1,11 @@ +--- akonadi-20.08.1/CMakeLists.txt.old 2020-09-01 06:33:15.000000000 +0000 ++++ akonadi-20.08.1/CMakeLists.txt 2020-09-17 06:42:47.218823728 +0000 +@@ -35,7 +35,7 @@ + + include(AkonadiMacros) + +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + set(RELEASE_SERVICE_VERSION "20.08.1") + set(AKONADI_FULL_VERSION "${PIM_VERSION} (${RELEASE_SERVICE_VERSION})") + diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index 685cfa1cb..0b3f062eb 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alkimia -pkgver=8.0.3 +pkgver=8.0.4 pkgrel=0 pkgdesc="Library for common financial functionality" url="https://community.kde.org/Alkimia/libalkimia" @@ -11,8 +11,8 @@ license="LGPL-2.1+" depends="" depends_dev="gmp-dev qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtwebkit-dev - kconfig-dev kcoreaddons-dev kdelibs4support-dev knewstuff-dev - kpackage-dev plasma-framework-dev" + kconfig-dev kcoreaddons-dev kdelibs4support-dev knewstuff-dev + kpackage-dev plasma-framework-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04debd3adeba6380ffe7e9d3949e927dca12ecd7f83dea7b7ba6295b158272c636978c89800757166889e632fed09f3e8b3ce19adc9b91e3369e3b16a5b6cb1e alkimia-8.0.3.tar.xz" +sha512sums="49b771ac28ec76143cf1237a21a834fa38689c91c773a472cc090e94f49287a79ad7790ef068cd6bebc4e64aa97e5026a9ea5be841bbdb3ca89b00b6ca7acc27 alkimia-8.0.4.tar.xz" diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD index 2ac0989d2..243392905 100644 --- a/user/alpine/APKBUILD +++ b/user/alpine/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=alpine -pkgver=2.23 +pkgver=2.24 pkgrel=0 pkgdesc="Terminal-based email client" url="http://alpine.x10host.com/alpine/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abc3675b18d6bd20a547b8e2c3f1f4c668aee2f2d20f426f28b4b3d4cfd66762777007441da3b0fda74e625c71bc2ef05434089508c2af804e62cf216df5554b alpine-2.23.tar.xz" +sha512sums="642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5 alpine-2.24.tar.xz" diff --git a/user/alsa-lib/APKBUILD b/user/alsa-lib/APKBUILD index 49f14066e..7cdf1108e 100644 --- a/user/alsa-lib/APKBUILD +++ b/user/alsa-lib/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alsa-lib -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=0 pkgdesc="Linux sound support system" url="https://www.alsa-project.org/wiki/Main_Page" @@ -13,6 +13,7 @@ source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 ucm_add_limits_h.patch remove-test.patch type_compat.patch + dlmisc_c.patch " build() { @@ -43,7 +44,8 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033 alsa-lib-1.2.2.tar.bz2 +sha512sums="12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844 alsa-lib-1.2.4.tar.bz2 3b37652d50809443b5f8e80f8d447108195b0cd66fd917805bb393fc091584b6f3dad4414f568742b61745617e7a695862058a0a0f93dcc31e4c97177a520352 ucm_add_limits_h.patch 0ce3c2b8a0a70e2dffb6d633b95c4aae74504cd694fe1507cbc409d931b5f733935b22de45e4adcf5a507587c9f80c60a6f0e798aac2ca2fbf0cbcdef0080079 remove-test.patch -bdcfa3d5fcc055fb6732922679e21689fc2ac19462fe7b72d16862c98ef8c995c3dd5becc4987ba417068e6b0e561bec7e6284d5f0a414e2966c8e00ac304fa8 type_compat.patch" +bdcfa3d5fcc055fb6732922679e21689fc2ac19462fe7b72d16862c98ef8c995c3dd5becc4987ba417068e6b0e561bec7e6284d5f0a414e2966c8e00ac304fa8 type_compat.patch +cfb008272df3f08fc9a3fcd086b199b3d7e88663cb60806aa67b01aea62cbd98bd63e468a34b66f0f18520e4a5bab0ac6db33aef58316f7ba329abfab0ebedee dlmisc_c.patch" diff --git a/user/alsa-lib/dlmisc_c.patch b/user/alsa-lib/dlmisc_c.patch new file mode 100644 index 000000000..b88dd3c29 --- /dev/null +++ b/user/alsa-lib/dlmisc_c.patch @@ -0,0 +1,29 @@ +From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela <perex@perex.cz> +Date: Thu, 22 Oct 2020 20:57:32 +0200 +Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be + declared even for \!DL_ORIGIN_AVAILABLE + +Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") +BugLink: https://github.com/alsa-project/alsa-lib/issues/91 +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + src/dlmisc.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/dlmisc.c b/src/dlmisc.c +index c9517c55..f20eb593 100644 +--- a/src/dlmisc.c ++++ b/src/dlmisc.c +@@ -42,11 +42,9 @@ + #ifndef PIC + struct snd_dlsym_link *snd_dlsym_start = NULL; + #endif +-#ifdef DL_ORIGIN_AVAILABLE + static int snd_plugin_dir_set = 0; + static char *snd_plugin_dir = NULL; + #endif +-#endif + + #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) + static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/user/alsa-utils/APKBUILD b/user/alsa-utils/APKBUILD index 569e8d6a4..cab801ab0 100644 --- a/user/alsa-utils/APKBUILD +++ b/user/alsa-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=alsa-utils -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=0 pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities" url="https://www.alsa-project.org/wiki/Main_Page" @@ -36,7 +36,7 @@ package() { install -Dm644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa } -sha512sums="30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9 alsa-utils-1.2.2.tar.bz2 +sha512sums="13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770 alsa-utils-1.2.4.tar.bz2 817215be6e9f103a8a187df5b1142c4d2e952f547a64579a9b8cfa58bd762d6a55bde75c0f66f018c0597744d07ccdb08216f7b368db464e36667cecedcc00f3 alsaconf.patch 7bf743024d7c5caed2fbf8af5cee73bcc569a7bab0bd6459541d3704cc6a7456d588b600b690e7406e122deaf0316dd1f67219a267bec4dff3f6c0f120edaae4 alsa.initd 6e716e6230fd3d2c33e3cb2dbf572d632c9ac6452c1768388bea7d3ca22f7c72cf6bcd702580f45cb9089983582011c8b04cbdb4420d14fb988167b1391ea547 alsa.confd" diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index d44a0451f..cfe52218a 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="25a5f20505f27902623029f0da416209186dd8274479c808a466225759efb0389816388e2fc77e708362ebde4815ca298840d67c98cbd43f516b73d66159c629 analitza-20.04.3.tar.xz" +sha512sums="ff9cf4b52e355c155b1b8dd2311e0314b4c87dc43d5d3bc3e54c66b6216b836cc675c17f5adc3d3b0cda5d8406cd07ef87035ebfc81e45e9e2d103af8c612e51 analitza-20.08.1.tar.xz" diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index 48fcaf26d..0c106a7ea 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=apache-httpd _pkgreal=httpd -pkgver=2.4.43 +pkgver=2.4.48 pkgrel=0 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" @@ -37,6 +37,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" options="suid !check" # secfixes: http_server +# 2.4.46-r0: +# - CVE-2020-9490 +# - CVE-2020-11984 +# - CVE-2020-11993 # 2.4.43-r0: # - CVE-2020-1934 # - CVE-2020-1927 @@ -146,7 +150,7 @@ ldap() { "$subpkgdir"/usr/libexec/apache2 } -sha512sums="d9879b8f8ef7d94dee1024e9c25b56d963a3b072520878a88a044629ad577c109a5456791b39016bf4f6672c04bf4a0e5cfd32381211e9acdc81d4a50b359e5e httpd-2.4.43.tar.gz +sha512sums="91980f757fc0dede8c6cbf54ed973f82a63098aa50d0fce15fe3537687b4ffbb48ed50cdb4ae14eb4a8703450f032daf73f4f3d5e2dd0f75721948e12a9c6dfb httpd-2.4.48.tar.gz c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd diff --git a/user/apkfoundry/APKBUILD b/user/apkfoundry/APKBUILD index 007c3d913..c06c33e20 100644 --- a/user/apkfoundry/APKBUILD +++ b/user/apkfoundry/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=apkfoundry -pkgver=0.5 +pkgver=0.6 pkgrel=0 pkgdesc="APK build orchestrator and distribution builder" url="https://dev.sick.bike/apkfoundry/" @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="169caf3b594929814c87fa7a3b7d8e56476a7862d64eaf7bfdf13468c4258e8879f5de738758de39631085a5cbae4b47f7656b4335bb4d7fafd2abce834ee233 apkfoundry-0.5.tar.gz" +sha512sums="71c1a0baabb2d1092e8873d438a14fba40eb953f7a11a93754e2dd6753da34a4427b2b7d50de6b7e7d34eb99b9bb91f829453d431649d3596a9789e1f1b34a0b apkfoundry-0.6.tar.gz" diff --git a/user/apkvitrine/APKBUILD b/user/apkvitrine/APKBUILD new file mode 100644 index 000000000..5ea799e72 --- /dev/null +++ b/user/apkvitrine/APKBUILD @@ -0,0 +1,22 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=apkvitrine +pkgver=0.2 +pkgrel=0 +pkgdesc="Package tracker and analyzer for APK repositories" +url="https://code.foxkit.us/sroracle/apkvitrine" +arch="noarch" +options="!check" # No test suite. +license="NCSA" +depends="apk-tools~2.12.0 py3-apkkit py3-flup py3-jinja2" +makedepends="" +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz" + +build() { + make +} + +package() { + make install DESTDIR="$pkgdir" +} + +sha512sums="11ec7adfdaaa9c72735a53514457e690f285e415dddeaaefe35024a09f8e01e654628654f2e55c9b67712a42c898e3a864f38d7f60ae8fa435bd64ad04bfc883 apkvitrine-0.2.tar.gz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 048af3204..869aebe4c 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ark -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -16,6 +16,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/ark-$pkgver.tar.xz" +# secfixes: +# 20.08.1-r0: +# - CVE-2020-16116 +# - CVE-2020-24654 + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -39,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6274483bc7cad9b8b3842a622a3f243fd5756aec147624eb9041459efd5c833e203c286412185bb105133d8c83a7503c8c7e519b8cb9cbd13830793c3429e142 ark-20.04.3.tar.xz" +sha512sums="1fae786d17a6e576e64b5b72e7d6886900a2fee3eedad41db174382dc70cb858c5c192c20896e5c2b6ec3c07f07d155fa5f52654496876808650a279b39eaa86 ark-20.08.1.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index 0441318f7..d57bc4db3 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=artikulate -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee7292aff6a4639f310284e2d508dcecad49f9b12550dfa9616e8a56f6955ae3b872733e20f7ba0135321a16bc9cc7b3fc72019b1e4b8ff00d8df31124f8c0ab artikulate-20.04.3.tar.xz" +sha512sums="907f23dd86dbd2de37f942a6c8446af1a62e0e1e805ee02eb7483cef74b7575a34cc0fbda52402ddf84f32c38fe8d15306cd8412aa8d449087af36327151a608 artikulate-20.08.1.tar.xz" diff --git a/user/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD index 4aa8979d1..33771f7b8 100644 --- a/user/aspell-dict-af/APKBUILD +++ b/user/aspell-dict-af/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-af pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD index 79e44d947..655453f04 100644 --- a/user/aspell-dict-am/APKBUILD +++ b/user/aspell-dict-am/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-am pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD index 6880ae201..ab2fa8016 100644 --- a/user/aspell-dict-ar/APKBUILD +++ b/user/aspell-dict-ar/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ar pkgver=1.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD index 9e7c0320c..c3302a23f 100644 --- a/user/aspell-dict-ast/APKBUILD +++ b/user/aspell-dict-ast/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ast pkgver=0.01 pkgrel=0 diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD index 9854bcc48..a97386923 100644 --- a/user/aspell-dict-az/APKBUILD +++ b/user/aspell-dict-az/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-az pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD index 8c0c67349..9846afced 100644 --- a/user/aspell-dict-be/APKBUILD +++ b/user/aspell-dict-be/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-be pkgver=0.01 pkgrel=0 diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD index 809c98aab..7fdfb97e9 100644 --- a/user/aspell-dict-bg/APKBUILD +++ b/user/aspell-dict-bg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-bg pkgver=4.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD index 92b006733..62e396f3f 100644 --- a/user/aspell-dict-bn/APKBUILD +++ b/user/aspell-dict-bn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-bn pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD index 0cc1b2057..8708d2806 100644 --- a/user/aspell-dict-br/APKBUILD +++ b/user/aspell-dict-br/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-br pkgver=0.50.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD index 74a2c7a6d..d1dcf07d3 100644 --- a/user/aspell-dict-ca/APKBUILD +++ b/user/aspell-dict-ca/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ca pkgver=2.5.0 pkgrel=0 diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD index 31a59210c..0cddbb21d 100644 --- a/user/aspell-dict-cs/APKBUILD +++ b/user/aspell-dict-cs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-cs pkgver=20040614.1 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD index 8e4be27dc..09f890e06 100644 --- a/user/aspell-dict-csb/APKBUILD +++ b/user/aspell-dict-csb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-csb pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD index e1f64d6c7..d357d42dd 100644 --- a/user/aspell-dict-cy/APKBUILD +++ b/user/aspell-dict-cy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-cy pkgver=0.50.3 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD index db515b3b9..e89c676ee 100644 --- a/user/aspell-dict-da/APKBUILD +++ b/user/aspell-dict-da/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-da pkgver=1.4.42.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD index 8140d5f0a..61fb0f6fd 100644 --- a/user/aspell-dict-de-alt/APKBUILD +++ b/user/aspell-dict-de-alt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-de-alt pkgver=2.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD index 7c0f5f834..0ae31545c 100644 --- a/user/aspell-dict-de/APKBUILD +++ b/user/aspell-dict-de/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-de pkgver=20161207 pkgrel=0 diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD index e0a194d90..ad8db028a 100644 --- a/user/aspell-dict-el/APKBUILD +++ b/user/aspell-dict-el/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-el pkgver=0.08.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD index bd3e44e93..a5abbf22a 100644 --- a/user/aspell-dict-en/APKBUILD +++ b/user/aspell-dict-en/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-en -pkgver=2019.10.06.0 +pkgver=2020.12.07.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} pkgrel=0 pkgdesc="English dictionaries for aspell" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e16c76bd2da4515af6f1e3dbbc1c5f26fc3be550e022cbb5b741b867be2acc1359a8902af1b359f6c8cff38de01b9aa43a02153a5a6bc618296e75bf86020a6e aspell6-en-2019.10.06-0.tar.bz2" +sha512sums="9ed4e64891242e5e5e7d6ac82a0d1fda3bdc5116bd9d926e787b8f381080b357915f0c9b39cae04c1da0f2ec6e47ffe30a584f7f3bf7d455a46e8518a7858547 aspell6-en-2020.12.07-0.tar.bz2" diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD index cefd65d6d..5bf6ffd88 100644 --- a/user/aspell-dict-eo/APKBUILD +++ b/user/aspell-dict-eo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-eo pkgver=2.1.20000225.a2 _pkgver=${pkgver%.*}${pkgver#*.*.*.} diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD index 80a8b2848..f9bafde42 100644 --- a/user/aspell-dict-es/APKBUILD +++ b/user/aspell-dict-es/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-es pkgver=1.11.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD index 4e84a1f9c..bb7c77612 100644 --- a/user/aspell-dict-et/APKBUILD +++ b/user/aspell-dict-et/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-et pkgver=0.1.21.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD index 93def9869..e84e0c811 100644 --- a/user/aspell-dict-fa/APKBUILD +++ b/user/aspell-dict-fa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fa pkgver=0.11.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD index 78a4fa207..67bc18365 100644 --- a/user/aspell-dict-fi/APKBUILD +++ b/user/aspell-dict-fi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fi pkgver=0.7.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD index d9631bffd..c186949bd 100644 --- a/user/aspell-dict-fo/APKBUILD +++ b/user/aspell-dict-fo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fo pkgver=0.2.16.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD index bb0a14d2b..335931c8a 100644 --- a/user/aspell-dict-fr/APKBUILD +++ b/user/aspell-dict-fr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fr pkgver=0.50.3 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD index 7331a46f9..d42f5fced 100644 --- a/user/aspell-dict-fy/APKBUILD +++ b/user/aspell-dict-fy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-fy pkgver=0.12.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD index 3ccdb1272..a6b610c0c 100644 --- a/user/aspell-dict-ga/APKBUILD +++ b/user/aspell-dict-ga/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ga -pkgver=5.0.0 +pkgver=5.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} _pkgver2=${pkgver%.*} pkgrel=0 @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="15c4e3d85c1ad589300f7288af054d0574e849163816e5e5aec56d464a71fcd02eba129ed74ed7ec341bb19ad2578091c6701b36ac23cc5a7972026742e9bb57 aspell5-ga-5.0-0.tar.bz2" +sha512sums="e13c66829b8d578c577539b9adea459ca85bca5fa535ca130aa76011cad0deb0e8bbf1d5a09c7c0317c9d419898755807b7a5af166c1ee52a34906825070214b aspell5-ga-5.1-0.tar.bz2" diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD index aff399a6b..29238c28c 100644 --- a/user/aspell-dict-gd/APKBUILD +++ b/user/aspell-dict-gd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gd pkgver=0.1.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD index 4001fd9cb..2e4f630d5 100644 --- a/user/aspell-dict-gl/APKBUILD +++ b/user/aspell-dict-gl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gl pkgver=0.5.a2 _pkgver=${pkgver%.*}${pkgver#*.*.} diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD index c5016e224..7ad9ac316 100644 --- a/user/aspell-dict-grc/APKBUILD +++ b/user/aspell-dict-grc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-grc pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD index feeadf574..95d3df597 100644 --- a/user/aspell-dict-gu/APKBUILD +++ b/user/aspell-dict-gu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gu pkgver=0.03.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD index 513a9491d..022042c0a 100644 --- a/user/aspell-dict-gv/APKBUILD +++ b/user/aspell-dict-gv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-gv pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD index cac888171..5052052c5 100644 --- a/user/aspell-dict-he/APKBUILD +++ b/user/aspell-dict-he/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-he pkgver=1.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD index 789b77dc2..7be1a71e8 100644 --- a/user/aspell-dict-hi/APKBUILD +++ b/user/aspell-dict-hi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hi pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD index f634034b9..13be13861 100644 --- a/user/aspell-dict-hil/APKBUILD +++ b/user/aspell-dict-hil/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hil pkgver=0.11.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD index c4bc01e03..1b73b5274 100644 --- a/user/aspell-dict-hr/APKBUILD +++ b/user/aspell-dict-hr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hr pkgver=0.51.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD index 8c8c85b1b..9c47957de 100644 --- a/user/aspell-dict-hsb/APKBUILD +++ b/user/aspell-dict-hsb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hsb pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD index a118ce6a9..9973ca8ed 100644 --- a/user/aspell-dict-hu/APKBUILD +++ b/user/aspell-dict-hu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hu pkgver=0.99.4.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.*.} diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD index 33e998e30..a33f44136 100644 --- a/user/aspell-dict-hus/APKBUILD +++ b/user/aspell-dict-hus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hus pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD index a88dbb382..da7a6ca99 100644 --- a/user/aspell-dict-hy/APKBUILD +++ b/user/aspell-dict-hy/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-hy pkgver=0.10.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD index fb8d26f62..908b26610 100644 --- a/user/aspell-dict-ia/APKBUILD +++ b/user/aspell-dict-ia/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ia pkgver=0.50.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD index 75b2839b9..28fce71e1 100644 --- a/user/aspell-dict-id/APKBUILD +++ b/user/aspell-dict-id/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-id pkgver=1.2.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD index 83d58f2bc..6e096c434 100644 --- a/user/aspell-dict-is/APKBUILD +++ b/user/aspell-dict-is/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-is pkgver=0.51.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD index 23b5cc043..6b9acdfb8 100644 --- a/user/aspell-dict-it/APKBUILD +++ b/user/aspell-dict-it/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-it pkgver=2.4.20070901.0 _pkgver=${pkgver%.*.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD index 6eefab144..a4885a08a 100644 --- a/user/aspell-dict-kn/APKBUILD +++ b/user/aspell-dict-kn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-kn pkgver=0.01.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD index 042c91bca..6fd0e03e0 100644 --- a/user/aspell-dict-ku/APKBUILD +++ b/user/aspell-dict-ku/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ku pkgver=0.20.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD index 0ec8c8552..68176d858 100644 --- a/user/aspell-dict-ky/APKBUILD +++ b/user/aspell-dict-ky/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ky pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD index 257624e08..24aa053c7 100644 --- a/user/aspell-dict-la/APKBUILD +++ b/user/aspell-dict-la/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-la pkgver=20020503.0 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD index 1f0f0c657..1eefd3d59 100644 --- a/user/aspell-dict-lt/APKBUILD +++ b/user/aspell-dict-lt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-lt pkgver=1.3 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD index 1640813f6..4ad0da3a2 100644 --- a/user/aspell-dict-lv/APKBUILD +++ b/user/aspell-dict-lv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-lv pkgver=0.5.5.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD index a93c2b691..fb04eb1e4 100644 --- a/user/aspell-dict-mg/APKBUILD +++ b/user/aspell-dict-mg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mg pkgver=0.03.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD index aa6db01e1..8cea7a75d 100644 --- a/user/aspell-dict-mi/APKBUILD +++ b/user/aspell-dict-mi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mi pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD index 324ab0c10..1d8960fb9 100644 --- a/user/aspell-dict-mk/APKBUILD +++ b/user/aspell-dict-mk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mk pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD index 03562f30c..c296d6f41 100644 --- a/user/aspell-dict-ml/APKBUILD +++ b/user/aspell-dict-ml/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ml pkgver=0.04.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD index f71c509d1..a76245c20 100644 --- a/user/aspell-dict-mn/APKBUILD +++ b/user/aspell-dict-mn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mn pkgver=0.06.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD index 583a1fb49..31f17d31d 100644 --- a/user/aspell-dict-mr/APKBUILD +++ b/user/aspell-dict-mr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mr pkgver=0.10.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD index 25a29a229..9e66bdcc8 100644 --- a/user/aspell-dict-ms/APKBUILD +++ b/user/aspell-dict-ms/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ms pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD index 5d22c27c3..88b601f80 100644 --- a/user/aspell-dict-mt/APKBUILD +++ b/user/aspell-dict-mt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-mt pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD index 6db6e6fb5..cfc57385a 100644 --- a/user/aspell-dict-nb/APKBUILD +++ b/user/aspell-dict-nb/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nb pkgver=0.50.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD index 9e4e26201..40ff55d26 100644 --- a/user/aspell-dict-nds/APKBUILD +++ b/user/aspell-dict-nds/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nds pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD index 87ffadacf..3d2a99759 100644 --- a/user/aspell-dict-nl/APKBUILD +++ b/user/aspell-dict-nl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nl pkgver=0.50.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD index cf8a0aa21..2f5f6a8b1 100644 --- a/user/aspell-dict-nn/APKBUILD +++ b/user/aspell-dict-nn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-nn pkgver=0.50.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD index f8f15a08d..cb998d970 100644 --- a/user/aspell-dict-ny/APKBUILD +++ b/user/aspell-dict-ny/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ny pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD index 4717c0f76..6f7a0790f 100644 --- a/user/aspell-dict-or/APKBUILD +++ b/user/aspell-dict-or/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-or pkgver=0.03.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD index 67fc9ca9f..089033fcd 100644 --- a/user/aspell-dict-pa/APKBUILD +++ b/user/aspell-dict-pa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pa pkgver=0.01.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD index ff226f2fe..209a45d47 100644 --- a/user/aspell-dict-pl/APKBUILD +++ b/user/aspell-dict-pl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pl pkgver=20200619 pkgrel=0 diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD index e83fb61b4..7200d86de 100644 --- a/user/aspell-dict-pt_BR/APKBUILD +++ b/user/aspell-dict-pt_BR/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pt_BR pkgver=20090702.0 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD index e21621b72..3b25dc636 100644 --- a/user/aspell-dict-pt_PT/APKBUILD +++ b/user/aspell-dict-pt_PT/APKBUILD @@ -1,8 +1,9 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-pt_PT -pkgver=20070510.0 -_pkgver=${pkgver%.*}-${pkgver#*.} +pkgver=20190329.1.0 +_pkgver=${pkgver%.*.*}-${pkgver#*.} +_pkgver=${_pkgver%.*}-${_pkgver#*.} pkgrel=0 pkgdesc="Portuguese dictionaries for aspell" url="http://aspell.net" @@ -11,7 +12,7 @@ options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="https://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2" +source="https://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-pt_PT-$_pkgver" build() { @@ -23,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eab60bfed51e4b044519e8e91fa2a4abb45d02431372310a45334c80abafd2022982331f3c0d39294d5029674d75536ad153877c23db01971f4b3d54b7b90cd6 aspell6-pt_PT-20070510-0.tar.bz2" +sha512sums="7c7edb79cd46bf4566814dbdef09f9b6d202f183abe5c25fda454e69c57d617948806657ed1da83039b508c1ccdb8a020d694b7119edfce63bae7defeafa1123 aspell6-pt_PT-20190329-1-0.tar.bz2" diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD index 10010ba13..f699cd6e4 100644 --- a/user/aspell-dict-qu/APKBUILD +++ b/user/aspell-dict-qu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-qu pkgver=0.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD index 449bf9276..76888dca9 100644 --- a/user/aspell-dict-ro/APKBUILD +++ b/user/aspell-dict-ro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ro pkgver=3.3.10 pkgrel=0 diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD index 29dbbf43e..1605b63a6 100644 --- a/user/aspell-dict-ru/APKBUILD +++ b/user/aspell-dict-ru/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ru pkgver=0.99f7.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD index e9a28d063..9708ede9e 100644 --- a/user/aspell-dict-rw/APKBUILD +++ b/user/aspell-dict-rw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-rw pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD index 8649e338f..b0ea6622b 100644 --- a/user/aspell-dict-sc/APKBUILD +++ b/user/aspell-dict-sc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sc pkgver=1.0 pkgrel=0 diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD index 466ee7cb7..ae5a93b65 100644 --- a/user/aspell-dict-sk/APKBUILD +++ b/user/aspell-dict-sk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sk pkgver=2.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD index 2665c4a17..54fb43e88 100644 --- a/user/aspell-dict-sl/APKBUILD +++ b/user/aspell-dict-sl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sl pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD index 3535a244c..fbebf7bcb 100644 --- a/user/aspell-dict-sr/APKBUILD +++ b/user/aspell-dict-sr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sr pkgver=0.02 pkgrel=0 diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD index 05c6da187..44a508d69 100644 --- a/user/aspell-dict-sv/APKBUILD +++ b/user/aspell-dict-sv/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sv pkgver=0.51.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD index b6da8032d..72e531448 100644 --- a/user/aspell-dict-sw/APKBUILD +++ b/user/aspell-dict-sw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-sw pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD index d9afb81d6..a5044a9a2 100644 --- a/user/aspell-dict-ta/APKBUILD +++ b/user/aspell-dict-ta/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-ta pkgver=20040424.1 _pkgver=${pkgver%.*}-${pkgver#*.} diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD index 9544673a1..f03f054e2 100644 --- a/user/aspell-dict-te/APKBUILD +++ b/user/aspell-dict-te/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-te pkgver=0.01.2 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD index fb58477b8..810cffb49 100644 --- a/user/aspell-dict-tet/APKBUILD +++ b/user/aspell-dict-tet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tet pkgver=0.1.1 pkgrel=0 diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD index 11e465c99..dcaf12fcb 100644 --- a/user/aspell-dict-tk/APKBUILD +++ b/user/aspell-dict-tk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tk pkgver=0.01.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD index 5e35eb565..f2e3782c7 100644 --- a/user/aspell-dict-tl/APKBUILD +++ b/user/aspell-dict-tl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tl pkgver=0.4.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD index ae25e480b..439954c7f 100644 --- a/user/aspell-dict-tn/APKBUILD +++ b/user/aspell-dict-tn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tn pkgver=1.0.1.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD index 6bbb12b99..4683cd993 100644 --- a/user/aspell-dict-tr/APKBUILD +++ b/user/aspell-dict-tr/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-tr pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD index d53c59b7c..f23364229 100644 --- a/user/aspell-dict-uk/APKBUILD +++ b/user/aspell-dict-uk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-uk pkgver=1.4.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD index 801711845..28baeb118 100644 --- a/user/aspell-dict-uz/APKBUILD +++ b/user/aspell-dict-uz/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-uz pkgver=0.6.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD index 680cdd9c0..7d767e987 100644 --- a/user/aspell-dict-vi/APKBUILD +++ b/user/aspell-dict-vi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-vi pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD index 8ac0dc480..4dd5b0a0d 100644 --- a/user/aspell-dict-wa/APKBUILD +++ b/user/aspell-dict-wa/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-wa pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD index 59f2eb444..30a5c12b6 100644 --- a/user/aspell-dict-yi/APKBUILD +++ b/user/aspell-dict-yi/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-yi pkgver=0.01.1.1 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD index 7e4846103..1d9108516 100644 --- a/user/aspell-dict-zu/APKBUILD +++ b/user/aspell-dict-zu/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=aspell-dict-zu pkgver=0.50.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index b64c2e0f2..85a16db16 100644 --- a/user/at-spi2-atk/APKBUILD +++ b/user/at-spi2-atk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-atk -pkgver=2.34.2 +pkgver=2.38.0 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -28,4 +28,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4 at-spi2-atk-2.34.2.tar.xz" +sha512sums="2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528 at-spi2-atk-2.38.0.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index 5788deb50..66b2ebcac 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.36.0 +pkgver=2.38.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6 at-spi2-core-2.36.0.tar.xz" +sha512sums="3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1 at-spi2-core-2.38.0.tar.xz" diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD index 448b2c8bb..87585bcc1 100644 --- a/user/atkmm/APKBUILD +++ b/user/atkmm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=atkmm pkgver=2.28.0 pkgrel=0 diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD index ac1897170..35640633f 100644 --- a/user/atril/APKBUILD +++ b/user/atril/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=atril pkgver=1.22.3 pkgrel=0 diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index cd5f1f6cc..54b395d0e 100644 --- a/user/attica/APKBUILD +++ b/user/attica/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attica -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8730c6b3f0b268c07e2b6f9752ccf0b41953148bdb91087ddee5bbdfb496012e119486e66c48ecb9d4790a875baa8e0066e0c008396027f0ee440f74648c38b attica-5.72.0.tar.xz" +sha512sums="261bcec9836c36c3e22df6d629dee35512dac6d8194a393bf2d818432696eb053edee04f5474383f4ab69559f5b875ac392a4c41727eedbea2df9d51b81a19e0 attica-5.74.0.tar.xz" diff --git a/user/avahi/APKBUILD b/user/avahi/APKBUILD index f1534a5e5..d831ec801 100644 --- a/user/avahi/APKBUILD +++ b/user/avahi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=avahi pkgver=0.8 -pkgrel=0 +pkgrel=1 pkgdesc="Local network service discovery library" url="https://avahi.org/" arch="all" @@ -40,7 +40,8 @@ build() { --with-distro=gentoo \ --enable-core-docs \ --disable-mono \ - --disable-gdbm + --disable-gdbm \ + --enable-compat-libdns_sd make } diff --git a/user/ayatana-ido/APKBUILD b/user/ayatana-ido/APKBUILD index fd0aaf9db..24717fa8b 100644 --- a/user/ayatana-ido/APKBUILD +++ b/user/ayatana-ido/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ayatana-ido -pkgver=0.4.4 -pkgrel=1 +pkgver=0.8.0 +pkgrel=0 pkgdesc="Indicator display object library for the Gnome desktop environment" url="https://ayatanaindicators.github.io/" arch="all" @@ -13,7 +13,6 @@ makedepends="glib-dev gobject-introspection-dev gtest-dev gtk+3.0-dev subpackages="$pkgname-dev" source="ayatana-ido-$pkgver.tar.gz::https://github.com/AyatanaIndicators/ayatana-ido/archive/$pkgver.tar.gz gtk-doc-fix.patch - remove-private.patch " prepare() { @@ -40,6 +39,5 @@ package() { DESTDIR="$pkgdir" make install } -sha512sums="ef04b0b6c959d209e88b1de322ac64ea33fdd043a73980bf3b043380603b6a448ea7bf43ba8e2750e1a0a9bef704a7099f7ae9b92a97d3ce0be2e9f48ba16703 ayatana-ido-0.4.4.tar.gz -92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch -a28c4cbfb5f386a9ee42ec50011bce603191b901760e6f9799a58b9ff2b223d03c15df00bd6fab6e13b9b9d5b70ecedef245665ebf4e240df1f1321e658b38fa remove-private.patch" +sha512sums="868a8b4f2b82261f3dc984a48efc781d5ab3f3ce1168f82ee3a89c2224f4dbe5100015fa536eb498ec83d15ab372d8502c57e7c58e899b7bd63d709c8773d4fd ayatana-ido-0.8.0.tar.gz +92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch" diff --git a/user/ayatana-ido/remove-private.patch b/user/ayatana-ido/remove-private.patch deleted file mode 100644 index 848b1b026..000000000 --- a/user/ayatana-ido/remove-private.patch +++ /dev/null @@ -1,2295 +0,0 @@ -Required to build against newer GLib, else: - -idocalendarmenuitem.c: In function ‘ido_calendar_menu_item_init’: -idocalendarmenuitem.c:109:13: error: G_ADD_PRIVATE [-Werror] - priv = item->priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); - ^~~~~~~~~~~~~~~ -idocalendarmenuitem.c: In function ‘ido_calendar_menu_item_finalize’: -idocalendarmenuitem.c:139:13: error: G_ADD_PRIVATE [-Werror] - IdoCalendarMenuItemPrivate *priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); - ^~~~~~~~~~~~~~~ - - -From 0ab4079b28220f4051f8d0935a976e550514ad7f Mon Sep 17 00:00:00 2001 -From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Date: Tue, 3 Dec 2019 22:14:51 +0000 -Subject: [PATCH] Avoid deprecated g_type_class_add_private. - ---- - src/idobasicmenuitem.c | 33 ++++------- - src/idobasicmenuitem.h | 2 - - src/idocalendarmenuitem.c | 116 +++++++++++++++++++++++-------------- - src/idocalendarmenuitem.h | 3 - - src/idodetaillabel.c | 42 +++++++------- - src/idodetaillabel.h | 2 - - src/idoentrymenuitem.c | 61 ++++++++++++------- - src/idoentrymenuitem.h | 3 - - src/idolocationmenuitem.c | 34 +++++------ - src/idolocationmenuitem.h | 2 - - src/idomessagedialog.c | 26 ++++----- - src/idorange.c | 20 +++---- - src/idorange.h | 2 - - src/idoscalemenuitem.c | 75 +++++++++++++----------- - src/idoscalemenuitem.h | 3 - - src/idoswitchmenuitem.c | 33 +++++++---- - src/idoswitchmenuitem.h | 3 - - src/idotimeline.c | 100 +++++++++++++++----------------- - src/idotimestampmenuitem.c | 65 ++++++++++----------- - src/idotimestampmenuitem.h | 2 - - src/idousermenuitem.c | 63 ++++++++++---------- - src/idousermenuitem.h | 2 - - 22 files changed, 356 insertions(+), 336 deletions(-) - -diff --git a/src/idobasicmenuitem.c b/src/idobasicmenuitem.c -index 382a150..cf57e7c 100644 ---- a/src/idobasicmenuitem.c -+++ b/src/idobasicmenuitem.c -@@ -37,8 +37,7 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoBasicMenuItemPrivate --{ -+typedef struct { - GIcon * icon; - char * text; - char * secondary_text; -@@ -46,11 +45,9 @@ struct _IdoBasicMenuItemPrivate - GtkWidget * image; - GtkWidget * label; - GtkWidget * secondary_label; --}; -- --typedef IdoBasicMenuItemPrivate priv_t; -+} IdoBasicMenuItemPrivate; - --G_DEFINE_TYPE (IdoBasicMenuItem, ido_basic_menu_item, GTK_TYPE_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoBasicMenuItem, ido_basic_menu_item, GTK_TYPE_MENU_ITEM); - - /*** - **** GObject Virtual Functions -@@ -63,7 +60,7 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (o); -- priv_t * p = self->priv; -+ IdoBasicMenuItemPrivate * p = ido_basic_menu_item_get_instance_private(self); - - switch (property_id) - { -@@ -117,7 +114,7 @@ static void - my_dispose (GObject * object) - { - IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - g_clear_object (&p->icon); - -@@ -128,7 +125,7 @@ static void - my_finalize (GObject * object) - { - IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - g_free (p->text); - g_free (p->secondary_text); -@@ -139,7 +136,7 @@ my_finalize (GObject * object) - static void - ido_basic_menu_item_update_image (IdoBasicMenuItem *self) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - gtk_image_clear (GTK_IMAGE (p->image)); - -@@ -191,8 +188,6 @@ ido_basic_menu_item_class_init (IdoBasicMenuItemClass *klass) - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoBasicMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -228,15 +223,11 @@ ido_basic_menu_item_class_init (IdoBasicMenuItemClass *klass) - static void - ido_basic_menu_item_init (IdoBasicMenuItem *self) - { -- priv_t * p; -+ - GtkWidget * w; - GtkGrid * grid; - -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_TYPE_BASIC_MENU_ITEM, -- IdoBasicMenuItemPrivate); -- -- p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - p->image = gtk_image_new (); - gtk_misc_set_alignment(GTK_MISC(p->image), 0.0, 0.0); -@@ -287,7 +278,7 @@ ido_basic_menu_item_new (void) - void - ido_basic_menu_item_set_icon (IdoBasicMenuItem * self, GIcon * icon) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - if (p->icon != icon) - { -@@ -314,7 +305,7 @@ ido_basic_menu_item_set_icon_from_file (IdoBasicMenuItem * self, const char * fi - void - ido_basic_menu_item_set_text (IdoBasicMenuItem * self, const char * text) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - if (g_strcmp0 (p->text, text)) - { -@@ -331,7 +322,7 @@ ido_basic_menu_item_set_text (IdoBasicMenuItem * self, const char * text) - void - ido_basic_menu_item_set_secondary_text (IdoBasicMenuItem * self, const char * secondary_text) - { -- IdoBasicMenuItemPrivate * p = self->priv; -+ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self); - - if (g_strcmp0 (p->secondary_text, secondary_text)) - { -diff --git a/src/idobasicmenuitem.h b/src/idobasicmenuitem.h -index 6a4b83a..38ae830 100644 ---- a/src/idobasicmenuitem.h -+++ b/src/idobasicmenuitem.h -@@ -30,7 +30,6 @@ G_BEGIN_DECLS - - typedef struct _IdoBasicMenuItem IdoBasicMenuItem; - typedef struct _IdoBasicMenuItemClass IdoBasicMenuItemClass; --typedef struct _IdoBasicMenuItemPrivate IdoBasicMenuItemPrivate; - - struct _IdoBasicMenuItemClass - { -@@ -44,7 +43,6 @@ struct _IdoBasicMenuItem - { - /*< private >*/ - GtkMenuItem parent; -- IdoBasicMenuItemPrivate * priv; - }; - - -diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c -index 557d898..f3881bc 100644 ---- a/src/idocalendarmenuitem.c -+++ b/src/idocalendarmenuitem.c -@@ -51,17 +51,14 @@ static void calendar_day_selected_double_click_cb (GtkWidget *widg - gpointer user_data); - static void calendar_day_selected_cb (GtkWidget *widget, - gpointer user_data); --struct _IdoCalendarMenuItemPrivate --{ -+typedef struct { - GtkWidget *box; - GtkWidget *calendar; - GtkWidget *parent; - gboolean selected; --}; -- --G_DEFINE_TYPE (IdoCalendarMenuItem, ido_calendar_menu_item, GTK_TYPE_MENU_ITEM) -+} IdoCalendarMenuItemPrivate; - --#define IDO_CALENDAR_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_CALENDAR_MENU_ITEM, IdoCalendarMenuItemPrivate)) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoCalendarMenuItem, ido_calendar_menu_item, GTK_TYPE_MENU_ITEM) - - static void - ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass) -@@ -84,8 +81,6 @@ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass) - - menu_item_class->hide_on_activate = TRUE; - -- g_type_class_add_private (gobject_class, sizeof (IdoCalendarMenuItemPrivate)); -- - g_signal_new("month-changed", G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, -@@ -104,9 +99,7 @@ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass) - static void - ido_calendar_menu_item_init (IdoCalendarMenuItem *item) - { -- IdoCalendarMenuItemPrivate *priv; -- -- priv = item->priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item); - - /* Will be disposed automatically */ - priv->calendar = g_object_new (gtk_calendar_get_type (), -@@ -136,7 +129,7 @@ static void - ido_calendar_menu_item_finalize (GObject *object) - { - IdoCalendarMenuItem *item = IDO_CALENDAR_MENU_ITEM (object); -- IdoCalendarMenuItemPrivate *priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item); - - if (G_IS_OBJECT (priv->calendar)) - { -@@ -183,13 +176,14 @@ ido_calendar_menu_item_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data) - { -- IdoCalendarMenuItem *menuitem = (IdoCalendarMenuItem *)data; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (data); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); - - g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (menuitem), FALSE); - -- if (menuitem->priv->selected) -+ if (priv->selected) - { -- GtkWidget *calendar = menuitem->priv->calendar; -+ GtkWidget *calendar = priv->calendar; - - gtk_widget_event (calendar, - ((GdkEvent *)(void*)(event))); -@@ -215,7 +209,10 @@ static gboolean - ido_calendar_menu_item_button_press (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *calendar = IDO_CALENDAR_MENU_ITEM (widget)->priv->calendar; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *calendar = priv->calendar; - - if (event->button == 1) { - if (gtk_widget_get_window (calendar) != NULL) { -@@ -265,7 +262,10 @@ static gboolean - ido_calendar_menu_item_button_release (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *calendar = IDO_CALENDAR_MENU_ITEM (widget)->priv->calendar; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *calendar = priv->calendar; - GTK_WIDGET_GET_CLASS(calendar)->button_release_event(GTK_WIDGET(calendar), event); - - return TRUE; -@@ -274,17 +274,23 @@ ido_calendar_menu_item_button_release (GtkWidget *widget, - static void - ido_calendar_menu_item_select (GtkMenuItem *item) - { -- IDO_CALENDAR_MENU_ITEM (item)->priv->selected = TRUE; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ priv->selected = TRUE; - -- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), TRUE); -+ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), TRUE); - } - - static void - ido_calendar_menu_item_deselect (GtkMenuItem *item) - { -- IDO_CALENDAR_MENU_ITEM (item)->priv->selected = FALSE; -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (item); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); - -- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), FALSE); -+ priv->selected = FALSE; -+ -+ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), FALSE); - } - - static void -@@ -296,25 +302,27 @@ calendar_realized_cb (GtkWidget *widget, - gdk_window_raise (gtk_widget_get_window (widget)); - } - -- item->priv->parent = gtk_widget_get_parent (GTK_WIDGET (item)); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item); -+ -+ priv->parent = gtk_widget_get_parent (GTK_WIDGET (item)); - -- g_object_add_weak_pointer (G_OBJECT (item->priv->parent), -- (gpointer*) &item->priv->parent); -+ g_object_add_weak_pointer (G_OBJECT (priv->parent), -+ (gpointer*) &priv->parent); - -- g_signal_connect (item->priv->parent, -+ g_signal_connect (priv->parent, - "key-press-event", - G_CALLBACK (ido_calendar_menu_item_key_press), - item); - -- g_signal_connect (item->priv->calendar, -+ g_signal_connect (priv->calendar, - "month-changed", - G_CALLBACK (calendar_month_changed_cb), - item); -- g_signal_connect (item->priv->calendar, -+ g_signal_connect (priv->calendar, - "day-selected", - G_CALLBACK (calendar_day_selected_cb), - item); -- g_signal_connect (item->priv->calendar, -+ g_signal_connect (priv->calendar, - "day-selected-double-click", - G_CALLBACK (calendar_day_selected_double_click_cb), - item); -@@ -327,7 +335,10 @@ calendar_move_focus_cb (GtkWidget *widget, - GtkDirectionType direction, - IdoCalendarMenuItem *item) - { -- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), FALSE); -+ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget); -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), FALSE); - - g_signal_emit_by_name (item, - "move-focus", -@@ -386,7 +397,9 @@ ido_calendar_menu_item_get_calendar (IdoCalendarMenuItem *menuitem) - { - g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (menuitem), NULL); - -- return menuitem->priv->calendar; -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ return priv->calendar; - } - - /** -@@ -402,8 +415,10 @@ gboolean - ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day) - { - g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); -- -- gtk_calendar_mark_day(GTK_CALENDAR (menuitem->priv->calendar), day); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_mark_day(GTK_CALENDAR (priv->calendar), day); - return TRUE; - } - -@@ -420,8 +435,10 @@ gboolean - ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day) - { - g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); -- -- gtk_calendar_unmark_day(GTK_CALENDAR (menuitem->priv->calendar), day); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_unmark_day(GTK_CALENDAR (priv->calendar), day); - return TRUE; - } - -@@ -435,8 +452,10 @@ void - ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem) - { - g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); -- -- gtk_calendar_clear_marks(GTK_CALENDAR (menuitem->priv->calendar)); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_clear_marks(GTK_CALENDAR (priv->calendar)); - } - - /** -@@ -450,8 +469,10 @@ void - ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCalendarDisplayOptions flags) - { - g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); -- -- gtk_calendar_set_display_options (GTK_CALENDAR (menuitem->priv->calendar), flags); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_set_display_options (GTK_CALENDAR (priv->calendar), flags); - } - - /** -@@ -466,8 +487,10 @@ GtkCalendarDisplayOptions - ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) - { - g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), 0); -- -- return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ return gtk_calendar_get_display_options (GTK_CALENDAR (priv->calendar)); - } - - /** -@@ -484,9 +507,12 @@ ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem, - guint *year, - guint *month, - guint *day) { -- -+ - g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem)); -- gtk_calendar_get_date (GTK_CALENDAR (menuitem->priv->calendar), year, month, day); -+ -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ -+ gtk_calendar_get_date (GTK_CALENDAR (priv->calendar), year, month, day); - } - - /** -@@ -510,13 +536,15 @@ ido_calendar_menu_item_set_date (IdoCalendarMenuItem *menuitem, - - g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE); - -+ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem); -+ - ido_calendar_menu_item_get_date (menuitem, &old_y, &old_m, &old_d); - - if ((old_y != year) || (old_m != month)) -- gtk_calendar_select_month (GTK_CALENDAR (menuitem->priv->calendar), month, year); -+ gtk_calendar_select_month (GTK_CALENDAR (priv->calendar), month, year); - - if (old_d != day) -- gtk_calendar_select_day (GTK_CALENDAR (menuitem->priv->calendar), day); -+ gtk_calendar_select_day (GTK_CALENDAR (priv->calendar), day); - - return TRUE; - } -diff --git a/src/idocalendarmenuitem.h b/src/idocalendarmenuitem.h -index 5cd913e..8c1528d 100644 ---- a/src/idocalendarmenuitem.h -+++ b/src/idocalendarmenuitem.h -@@ -39,13 +39,10 @@ G_BEGIN_DECLS - - typedef struct _IdoCalendarMenuItem IdoCalendarMenuItem; - typedef struct _IdoCalendarMenuItemClass IdoCalendarMenuItemClass; --typedef struct _IdoCalendarMenuItemPrivate IdoCalendarMenuItemPrivate; - - struct _IdoCalendarMenuItem - { - GtkMenuItem parent_instance; -- -- IdoCalendarMenuItemPrivate *priv; - }; - - struct _IdoCalendarMenuItemClass -diff --git a/src/idodetaillabel.c b/src/idodetaillabel.c -index b36b222..c502f92 100644 ---- a/src/idodetaillabel.c -+++ b/src/idodetaillabel.c -@@ -21,14 +21,11 @@ - - #include <math.h> - --G_DEFINE_TYPE (IdoDetailLabel, ido_detail_label, GTK_TYPE_WIDGET) -- --struct _IdoDetailLabelPrivate --{ -+typedef struct { - gchar *text; - PangoLayout *layout; - gboolean draw_lozenge; --}; -+} IdoDetailLabelPrivate; - - enum - { -@@ -39,6 +36,8 @@ enum - - static GParamSpec *properties[NUM_PROPERTIES]; - -+G_DEFINE_TYPE_WITH_PRIVATE (IdoDetailLabel, ido_detail_label, GTK_TYPE_WIDGET) -+ - static void - ido_detail_label_get_property (GObject *object, - guint property_id, -@@ -46,11 +45,12 @@ ido_detail_label_get_property (GObject *object, - GParamSpec *pspec) - { - IdoDetailLabel *self = IDO_DETAIL_LABEL (object); -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(self); - - switch (property_id) - { - case PROP_TEXT: -- g_value_set_string (value, self->priv->text); -+ g_value_set_string (value, priv->text); - break; - - default: -@@ -81,7 +81,7 @@ ido_detail_label_set_property (GObject *object, - static void - ido_detail_label_finalize (GObject *object) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (object)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (object)); - - g_free (priv->text); - -@@ -91,7 +91,7 @@ ido_detail_label_finalize (GObject *object) - static void - ido_detail_label_dispose (GObject *object) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (object)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (object)); - - g_clear_object (&priv->layout); - -@@ -101,7 +101,7 @@ ido_detail_label_dispose (GObject *object) - static void - ido_detail_label_ensure_layout (IdoDetailLabel *label) - { -- IdoDetailLabelPrivate *priv = label->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); - - if (priv->layout == NULL) - { -@@ -156,7 +156,8 @@ gtk_widget_get_font_metrics (GtkWidget *widget, - static gint - ido_detail_label_get_minimum_text_width (IdoDetailLabel *label) - { -- IdoDetailLabelPrivate *priv = label->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); -+ - PangoContext *context; - PangoFontMetrics *metrics; - gint char_width; -@@ -176,7 +177,8 @@ ido_detail_label_draw (GtkWidget *widget, - cairo_t *cr) - { - IdoDetailLabel *label = IDO_DETAIL_LABEL (widget); -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); -+ - PangoRectangle extents; - GtkAllocation allocation; - double x, w, h, radius; -@@ -224,7 +226,8 @@ ido_detail_label_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (widget)); -+ - PangoRectangle extents; - double radius; - -@@ -244,7 +247,7 @@ ido_detail_label_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural) - { -- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (widget)); - PangoContext *context; - PangoFontMetrics *metrics; - PangoRectangle extents; -@@ -277,8 +280,6 @@ ido_detail_label_class_init (IdoDetailLabelClass *klass) - widget_class->get_preferred_width = ido_detail_label_get_preferred_width; - widget_class->get_preferred_height = ido_detail_label_get_preferred_height; - -- g_type_class_add_private (klass, sizeof (IdoDetailLabelPrivate)); -- - properties[PROP_TEXT] = g_param_spec_string ("text", - "Text", - "The text of the label", -@@ -292,10 +293,6 @@ ido_detail_label_class_init (IdoDetailLabelClass *klass) - static void - ido_detail_label_init (IdoDetailLabel *self) - { -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_TYPE_DETAIL_LABEL, -- IdoDetailLabelPrivate); -- - gtk_widget_set_has_window (GTK_WIDGET (self), FALSE); - } - -@@ -311,7 +308,10 @@ const gchar * - ido_detail_label_get_text (IdoDetailLabel *label) - { - g_return_val_if_fail (IDO_IS_DETAIL_LABEL (label), NULL); -- return label->priv->text; -+ -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); -+ -+ return priv->text; - } - - /* collapse_whitespace: -@@ -362,7 +362,7 @@ ido_detail_label_set_text_impl (IdoDetailLabel *label, - const gchar *text, - gboolean draw_lozenge) - { -- IdoDetailLabelPrivate * priv = label->priv; -+ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label); - - g_clear_object (&priv->layout); - g_free (priv->text); -diff --git a/src/idodetaillabel.h b/src/idodetaillabel.h -index 1995fee..6b6f57a 100644 ---- a/src/idodetaillabel.h -+++ b/src/idodetaillabel.h -@@ -31,12 +31,10 @@ - - typedef struct _IdoDetailLabel IdoDetailLabel; - typedef struct _IdoDetailLabelClass IdoDetailLabelClass; --typedef struct _IdoDetailLabelPrivate IdoDetailLabelPrivate; - - struct _IdoDetailLabel - { - GtkWidget parent; -- IdoDetailLabelPrivate *priv; - }; - - struct _IdoDetailLabelClass -diff --git a/src/idoentrymenuitem.c b/src/idoentrymenuitem.c -index 5b5a3fb..d2948df 100644 ---- a/src/idoentrymenuitem.c -+++ b/src/idoentrymenuitem.c -@@ -27,6 +27,7 @@ - #include "idoentrymenuitem.h" - #include "config.h" - -+static void ido_entry_menu_item_finalize (GObject *item); - static void ido_entry_menu_item_select (GtkMenuItem *item); - static void ido_entry_menu_item_deselect (GtkMenuItem *item); - static gboolean ido_entry_menu_item_button_release (GtkWidget *widget, -@@ -44,16 +45,13 @@ static void entry_move_focus_cb (GtkWidget *widget, - GtkDirectionType direction, - IdoEntryMenuItem *item); - --struct _IdoEntryMenuItemPrivate --{ -+typedef struct { - GtkWidget *box; - GtkWidget *entry; - gboolean selected; --}; -- --G_DEFINE_TYPE (IdoEntryMenuItem, ido_entry_menu_item, GTK_TYPE_MENU_ITEM) -+} IdoEntryMenuItemPrivate; - --#define IDO_ENTRY_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_ENTRY_MENU_ITEM, IdoEntryMenuItemPrivate)) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoEntryMenuItem, ido_entry_menu_item, GTK_TYPE_MENU_ITEM) - - static void - ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass) -@@ -66,6 +64,8 @@ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass) - widget_class = GTK_WIDGET_CLASS (klass); - menu_item_class = GTK_MENU_ITEM_CLASS (klass); - -+ gobject_class->finalize = ido_entry_menu_item_finalize; -+ - widget_class->button_release_event = ido_entry_menu_item_button_release; - widget_class->button_press_event = ido_entry_menu_item_button_press; - -@@ -73,8 +73,6 @@ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass) - menu_item_class->deselect = ido_entry_menu_item_deselect; - - menu_item_class->hide_on_activate = TRUE; -- -- g_type_class_add_private (gobject_class, sizeof (IdoEntryMenuItemPrivate)); - } - - static void -@@ -88,7 +86,7 @@ ido_entry_menu_item_init (IdoEntryMenuItem *item) - border.top = 2; - border.bottom = 2; - -- priv = item->priv = IDO_ENTRY_MENU_ITEM_GET_PRIVATE (item); -+ priv = ido_entry_menu_item_get_instance_private(item); - - priv->entry = g_object_new (gtk_entry_get_type (), - "inner-border", &border, -@@ -135,12 +133,13 @@ ido_entry_menu_item_key_press (GtkWidget *widget, - GdkEventKey *event, - gpointer data) - { -- IdoEntryMenuItem *menuitem = (IdoEntryMenuItem *)data; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(data); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); - -- if (menuitem->priv->selected && -+ if (priv->selected && - is_key_press_valid (menuitem, event->keyval)) - { -- GtkWidget *entry = menuitem->priv->entry; -+ GtkWidget *entry = priv->entry; - - gtk_widget_event (entry, - ((GdkEvent *)(void*)(event))); -@@ -179,7 +178,10 @@ static gboolean - ido_entry_menu_item_button_press (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(widget); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *entry = priv->entry; - - if (event->button == 1) - { -@@ -206,7 +208,10 @@ static gboolean - ido_entry_menu_item_button_release (GtkWidget *widget, - GdkEventButton *event) - { -- GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(widget); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ GtkWidget *entry = priv->entry; - - gtk_widget_event (entry, - ((GdkEvent *)(void*)(event))); -@@ -217,17 +222,23 @@ ido_entry_menu_item_button_release (GtkWidget *widget, - static void - ido_entry_menu_item_select (GtkMenuItem *item) - { -- IDO_ENTRY_MENU_ITEM (item)->priv->selected = TRUE; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(item); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ priv->selected = TRUE; - -- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), TRUE); -+ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), TRUE); - } - - static void - ido_entry_menu_item_deselect (GtkMenuItem *item) - { -- IDO_ENTRY_MENU_ITEM (item)->priv->selected = FALSE; -+ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(item); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); - -- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), FALSE); -+ priv->selected = FALSE; -+ -+ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), FALSE); - } - - -@@ -253,7 +264,9 @@ entry_move_focus_cb (GtkWidget *widget, - GtkDirectionType direction, - IdoEntryMenuItem *item) - { -- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), FALSE); -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(item); -+ -+ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), FALSE); - - g_signal_emit_by_name (item, - "move-focus", -@@ -286,5 +299,13 @@ ido_entry_menu_item_get_entry (IdoEntryMenuItem *menuitem) - { - g_return_val_if_fail (IDO_IS_ENTRY_MENU_ITEM (menuitem), NULL); - -- return menuitem->priv->entry; -+ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem); -+ -+ return priv->entry; -+} -+ -+static void -+ido_entry_menu_item_finalize (GObject *gobject) -+{ -+ /* no-op */ - } -diff --git a/src/idoentrymenuitem.h b/src/idoentrymenuitem.h -index 417e774..7c5da79 100644 ---- a/src/idoentrymenuitem.h -+++ b/src/idoentrymenuitem.h -@@ -39,13 +39,10 @@ G_BEGIN_DECLS - - typedef struct _IdoEntryMenuItem IdoEntryMenuItem; - typedef struct _IdoEntryMenuItemClass IdoEntryMenuItemClass; --typedef struct _IdoEntryMenuItemPrivate IdoEntryMenuItemPrivate; - - struct _IdoEntryMenuItem - { - GtkMenuItem parent_instance; -- -- IdoEntryMenuItemPrivate *priv; - }; - - struct _IdoEntryMenuItemClass -diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c -index 335422a..eb6b38b 100644 ---- a/src/idolocationmenuitem.c -+++ b/src/idolocationmenuitem.c -@@ -37,16 +37,13 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoLocationMenuItemPrivate --{ -+typedef struct { - char * timezone; - - guint timestamp_timer; --}; -+} IdoLocationMenuItemPrivate; - --typedef IdoLocationMenuItemPrivate priv_t; -- --G_DEFINE_TYPE (IdoLocationMenuItem, ido_location_menu_item, IDO_TYPE_TIME_STAMP_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoLocationMenuItem, ido_location_menu_item, IDO_TYPE_TIME_STAMP_MENU_ITEM); - - /*** - **** Timestamp Label -@@ -58,7 +55,9 @@ update_timestamp (IdoLocationMenuItem * self) - GTimeZone * tz; - GDateTime * date_time; - -- tz = g_time_zone_new (self->priv->timezone); -+ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self); -+ -+ tz = g_time_zone_new (priv->timezone); - if (tz == NULL) - tz = g_time_zone_new_local (); - date_time = g_date_time_new_now (tz); -@@ -73,7 +72,7 @@ update_timestamp (IdoLocationMenuItem * self) - static void - stop_timestamp_timer (IdoLocationMenuItem * self) - { -- priv_t * p = self->priv; -+ IdoLocationMenuItemPrivate * p = ido_location_menu_item_get_instance_private(self); - - if (p->timestamp_timer != 0) - { -@@ -130,6 +129,7 @@ restart_timestamp_timer (IdoLocationMenuItem * self) - const char * fmt = ido_time_stamp_menu_item_get_format (IDO_TIME_STAMP_MENU_ITEM (self)); - gboolean timestamp_shows_seconds; - int interval_sec; -+ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self); - - stop_timestamp_timer (self); - -@@ -142,7 +142,7 @@ restart_timestamp_timer (IdoLocationMenuItem * self) - else - interval_sec = calculate_seconds_until_next_minute(); - -- self->priv->timestamp_timer = g_timeout_add_seconds (interval_sec, -+ priv->timestamp_timer = g_timeout_add_seconds (interval_sec, - on_timestamp_timer, - self); - } -@@ -158,7 +158,7 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoLocationMenuItem * self = IDO_LOCATION_MENU_ITEM (o); -- priv_t * p = self->priv; -+ IdoLocationMenuItemPrivate * p = ido_location_menu_item_get_instance_private(self); - - switch (property_id) - { -@@ -204,8 +204,9 @@ static void - my_finalize (GObject * object) - { - IdoLocationMenuItem * self = IDO_LOCATION_MENU_ITEM (object); -+ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self); - -- g_free (self->priv->timezone); -+ g_free (priv->timezone); - - G_OBJECT_CLASS (ido_location_menu_item_parent_class)->finalize (object); - } -@@ -219,8 +220,6 @@ ido_location_menu_item_class_init (IdoLocationMenuItemClass *klass) - { - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoLocationMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -239,10 +238,6 @@ ido_location_menu_item_class_init (IdoLocationMenuItemClass *klass) - static void - ido_location_menu_item_init (IdoLocationMenuItem *self) - { -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_LOCATION_MENU_ITEM_TYPE, -- IdoLocationMenuItemPrivate); -- - /* Update the timer whenever the format string changes - because it determines whether we update once per second or per minute */ - g_signal_connect (self, "notify::format", -@@ -271,10 +266,11 @@ void - ido_location_menu_item_set_timezone (IdoLocationMenuItem * self, - const char * timezone) - { -- priv_t * p; -+ IdoLocationMenuItemPrivate * p; - - g_return_if_fail (IDO_IS_LOCATION_MENU_ITEM (self)); -- p = self->priv; -+ -+ p = ido_location_menu_item_get_instance_private(self); - - g_free (p->timezone); - p->timezone = g_strdup (timezone); -diff --git a/src/idolocationmenuitem.h b/src/idolocationmenuitem.h -index 2ae231f..5d1c660 100644 ---- a/src/idolocationmenuitem.h -+++ b/src/idolocationmenuitem.h -@@ -31,7 +31,6 @@ G_BEGIN_DECLS - - typedef struct _IdoLocationMenuItem IdoLocationMenuItem; - typedef struct _IdoLocationMenuItemClass IdoLocationMenuItemClass; --typedef struct _IdoLocationMenuItemPrivate IdoLocationMenuItemPrivate; - - struct _IdoLocationMenuItemClass - { -@@ -48,7 +47,6 @@ struct _IdoLocationMenuItem - { - /*< private >*/ - IdoTimeStampMenuItem parent; -- IdoLocationMenuItemPrivate * priv; - }; - - -diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c -index 5b73950..ef5f148 100644 ---- a/src/idomessagedialog.c -+++ b/src/idomessagedialog.c -@@ -34,22 +34,18 @@ - #include "idotimeline.h" - #include "config.h" - --#define IDO_MESSAGE_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_MESSAGE_DIALOG, IdoMessageDialogPrivate)) -- - static GtkWidget *ido_message_dialog_get_secondary_label (IdoMessageDialog *dialog); - static GtkWidget *ido_message_dialog_get_primary_label (IdoMessageDialog *dialog); - --typedef struct _IdoMessageDialogPrivate IdoMessageDialogPrivate; --typedef struct _IdoMessageDialogMorphContext IdoMessageDialogMorphContext; -- --struct _IdoMessageDialogPrivate --{ -+typedef struct { - GtkWidget *action_area; - GtkWidget *primary_label; - GtkWidget *secondary_label; - - gboolean expanded; --}; -+} IdoMessageDialogPrivate; -+ -+typedef struct _IdoMessageDialogMorphContext IdoMessageDialogMorphContext; - - struct _IdoMessageDialogMorphContext - { -@@ -60,13 +56,13 @@ struct _IdoMessageDialogMorphContext - GtkRequisition end; - }; - --G_DEFINE_TYPE (IdoMessageDialog, ido_message_dialog, GTK_TYPE_MESSAGE_DIALOG) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoMessageDialog, ido_message_dialog, GTK_TYPE_MESSAGE_DIALOG) - - static void - ido_message_dialog_map (GtkWidget *widget) - { - IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget); -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (dialog); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - - GTK_WIDGET_CLASS (ido_message_dialog_parent_class)->map (widget); - -@@ -145,7 +141,7 @@ timeline_finished_cb (IdoTimeline *timeline, - gpointer user_data) - { - IdoMessageDialogMorphContext *context = user_data; -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (context->widget); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (IDO_MESSAGE_DIALOG (context->widget)); - - gtk_widget_show (priv->action_area); - gtk_widget_show (priv->secondary_label); -@@ -158,7 +154,7 @@ ido_message_dialog_focus_in_event (GtkWidget *widget, - GdkEventFocus *event) - { - IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget); -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (dialog); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - - if (!priv->expanded) - { -@@ -203,7 +199,9 @@ ido_message_dialog_focus_in_event (GtkWidget *widget, - static void - ido_message_dialog_constructed (GObject *object) - { -- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (object); -+ -+ IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (object); -+ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - GtkWidget *vbox; - GtkWidget *event_box; - -@@ -231,8 +229,6 @@ ido_message_dialog_class_init (IdoMessageDialogClass *class) - - widget_class->map = ido_message_dialog_map; - widget_class->focus_in_event = ido_message_dialog_focus_in_event; -- -- g_type_class_add_private (object_class, sizeof (IdoMessageDialogPrivate)); - } - - static void -diff --git a/src/idorange.c b/src/idorange.c -index acdfa5d..634b223 100644 ---- a/src/idorange.c -+++ b/src/idorange.c -@@ -27,10 +27,9 @@ - #include "idotypebuiltins.h" - #include "config.h" - --struct _IdoRangePrivate --{ -+typedef struct { - IdoRangeStyle style; --}; -+} IdoRangePrivate; - - static void ido_range_constructed (GObject *object); - static void ido_range_set_property (GObject *object, -@@ -42,9 +41,7 @@ static void ido_range_get_property (GObject *object, - GValue *value, - GParamSpec *pspec); - --#define IDO_RANGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_RANGE, IdoRangePrivate)) -- --G_DEFINE_TYPE (IdoRange, ido_range, GTK_TYPE_SCALE) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoRange, ido_range, GTK_TYPE_SCALE) - - enum { - PROP_0, -@@ -87,8 +84,6 @@ ido_range_class_init (IdoRangeClass *class) - G_MAXINT, - 8, - G_PARAM_READABLE)); -- -- g_type_class_add_private (class, sizeof (IdoRangePrivate)); - } - - static void -@@ -97,7 +92,8 @@ ido_range_get_property (GObject *object, - GValue *value, - GParamSpec *pspec) - { -- IdoRangePrivate *priv = IDO_RANGE (object)->priv; -+ IdoRange *range = IDO_RANGE (object); -+ IdoRangePrivate *priv = ido_range_get_instance_private (range); - - switch (prop_id) - { -@@ -117,7 +113,8 @@ ido_range_set_property (GObject *object, - const GValue *value, - GParamSpec *pspec) - { -- IdoRangePrivate *priv = IDO_RANGE (object)->priv; -+ IdoRange *range = IDO_RANGE (object); -+ IdoRangePrivate *priv = ido_range_get_instance_private (range); - - switch (prop_id) - { -@@ -135,6 +132,7 @@ static void - ido_range_constructed (GObject *object) - { - IdoRange *range = IDO_RANGE (object); -+ - IdoRangeStyle style; - char buf[1024]; - -@@ -163,7 +161,7 @@ ido_range_constructed (GObject *object) - static void - ido_range_init (IdoRange *range) - { -- range->priv = IDO_RANGE_GET_PRIVATE (range); -+ /* no-op */ - } - - /** -diff --git a/src/idorange.h b/src/idorange.h -index 7c2e79b..beef43f 100644 ---- a/src/idorange.h -+++ b/src/idorange.h -@@ -44,13 +44,11 @@ typedef enum - } IdoRangeStyle; - - typedef struct _IdoRange IdoRange; --typedef struct _IdoRangePrivate IdoRangePrivate; - typedef struct _IdoRangeClass IdoRangeClass; - - struct _IdoRange - { - GtkScale parent_instance; -- IdoRangePrivate *priv; - }; - - struct _IdoRangeClass -diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c -index de9884f..9f5f29c 100644 ---- a/src/idoscalemenuitem.c -+++ b/src/idoscalemenuitem.c -@@ -64,7 +64,7 @@ static void update_packing (IdoScaleMenuItem - static void default_primary_clicked_handler (IdoScaleMenuItem *self); - static void default_secondary_clicked_handler (IdoScaleMenuItem *self); - --struct _IdoScaleMenuItemPrivate { -+typedef struct { - GtkWidget *scale; - GtkAdjustment *adjustment; - GtkWidget *primary_image; -@@ -78,7 +78,7 @@ struct _IdoScaleMenuItemPrivate { - IdoRangeStyle range_style; - gboolean ignore_value_changed; - gboolean has_focus; --}; -+} IdoScaleMenuItemPrivate; - - enum { - SLIDER_GRABBED, -@@ -99,15 +99,15 @@ enum { - - static guint signals[LAST_SIGNAL] = { 0 }; - --G_DEFINE_TYPE (IdoScaleMenuItem, ido_scale_menu_item, GTK_TYPE_MENU_ITEM) -- --#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_SCALE_MENU_ITEM, IdoScaleMenuItemPrivate)) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoScaleMenuItem, ido_scale_menu_item, GTK_TYPE_MENU_ITEM) - - static gboolean - ido_scale_menu_item_scroll_event (GtkWidget *menuitem, - GdkEventScroll *event) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkWidget *scale = priv->scale; - - if (priv->reverse_scroll) -@@ -138,7 +138,7 @@ ido_scale_menu_item_scale_value_changed (GtkRange *range, - gpointer user_data) - { - IdoScaleMenuItem *self = user_data; -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); - - /* The signal is not sent when it was set through - * ido_scale_menu_item_set_value(). */ -@@ -151,7 +151,8 @@ static void - ido_scale_menu_item_constructed (GObject *object) - { - IdoScaleMenuItem *self = IDO_SCALE_MENU_ITEM (object); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); -+ - GObject *adj = G_OBJECT (gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 0.0)); - IdoRangeStyle range_style; - GtkWidget *hbox; -@@ -322,14 +323,13 @@ ido_scale_menu_item_class_init (IdoScaleMenuItemClass *item_class) - G_TYPE_NONE, - 1, G_TYPE_DOUBLE); - -- -- g_type_class_add_private (item_class, sizeof (IdoScaleMenuItemPrivate)); - } - - static void - update_packing (IdoScaleMenuItem *self, IdoScaleMenuItemStyle style) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); -+ - GtkBox * box = GTK_BOX (priv->hbox); - GtkContainer *container = GTK_CONTAINER (priv->hbox); - -@@ -366,7 +366,7 @@ update_packing (IdoScaleMenuItem *self, IdoScaleMenuItemStyle style) - static void - ido_scale_menu_item_init (IdoScaleMenuItem *self) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self); - - priv->reverse_scroll = TRUE; - -@@ -380,7 +380,7 @@ ido_scale_menu_item_set_property (GObject *object, - GParamSpec *pspec) - { - IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (object); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menu_item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - switch (prop_id) - { -@@ -413,7 +413,7 @@ ido_scale_menu_item_get_property (GObject *object, - GParamSpec *pspec) - { - IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (object); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menu_item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - GtkAdjustment *adjustment; - - switch (prop_id) -@@ -442,7 +442,8 @@ ido_scale_menu_item_parent_key_press_event (GtkWidget *widget, - GdkEventKey *event, - gpointer user_data) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (user_data); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (user_data); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - /* only listen to events when the playback menu item is selected */ - if (!priv->has_focus) -@@ -469,7 +470,8 @@ ido_scale_menu_item_parent_key_press_event (GtkWidget *widget, - static void - ido_scale_menu_item_select (GtkMenuItem *item) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - priv->has_focus = TRUE; - gtk_widget_set_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED, FALSE); -@@ -480,7 +482,8 @@ ido_scale_menu_item_select (GtkMenuItem *item) - static void - ido_scale_menu_item_deselect (GtkMenuItem *item) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); - - priv->has_focus = FALSE; - gtk_widget_unset_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED); -@@ -492,7 +495,9 @@ static gboolean - ido_scale_menu_item_button_press_event (GtkWidget *menuitem, - GdkEventButton *event) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkAllocation alloc; - gint x, y; - -@@ -516,7 +521,8 @@ ido_scale_menu_item_button_release_event (GtkWidget *menuitem, - GdkEventButton *event) - { - IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem); -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkWidget *scale = priv->scale; - GtkAllocation alloc; - gint x, y; -@@ -569,7 +575,9 @@ static gboolean - ido_scale_menu_item_motion_notify_event (GtkWidget *menuitem, - GdkEventMotion *event) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem); -+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (menuitem); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item); -+ - GtkAllocation alloc; - gint x, y; - -@@ -596,7 +604,7 @@ static void - menu_hidden (GtkWidget *menu, - IdoScaleMenuItem *scale) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (scale); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (scale); - - if (priv->grabbed) - { -@@ -718,7 +726,7 @@ ido_scale_menu_item_get_scale (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->scale; - } -@@ -739,7 +747,7 @@ ido_scale_menu_item_get_style (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), IDO_SCALE_MENU_ITEM_STYLE_NONE); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->style; - } -@@ -760,7 +768,7 @@ ido_scale_menu_item_set_style (IdoScaleMenuItem *menuitem, - - g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem)); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - priv->style = style; - -@@ -784,7 +792,7 @@ ido_scale_menu_item_get_primary_image (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->primary_image; - } -@@ -806,7 +814,7 @@ ido_scale_menu_item_get_secondary_image (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return priv->secondary_image; - } -@@ -859,7 +867,7 @@ ido_scale_menu_item_get_primary_label (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return gtk_label_get_text (GTK_LABEL (priv->primary_label)); - } -@@ -881,7 +889,7 @@ ido_scale_menu_item_get_secondary_label (IdoScaleMenuItem *menuitem) - - g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - return gtk_label_get_text (GTK_LABEL (priv->secondary_label)); - } -@@ -903,7 +911,7 @@ ido_scale_menu_item_set_primary_label (IdoScaleMenuItem *menuitem, - - g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem)); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - if (priv->primary_label) - { -@@ -928,7 +936,7 @@ ido_scale_menu_item_set_secondary_label (IdoScaleMenuItem *menuitem, - - g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem)); - -- priv = GET_PRIVATE (menuitem); -+ priv = ido_scale_menu_item_get_instance_private (menuitem); - - if (priv->secondary_label) - { -@@ -954,7 +962,8 @@ static void - default_primary_clicked_handler (IdoScaleMenuItem * item) - { - g_debug ("%s: setting scale to lower bound", G_STRFUNC); -- IdoScaleMenuItemPrivate * priv = GET_PRIVATE (item); -+ IdoScaleMenuItemPrivate * priv = ido_scale_menu_item_get_instance_private (item); -+ - GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); - gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj)); - } -@@ -977,7 +986,7 @@ static void - default_secondary_clicked_handler (IdoScaleMenuItem * item) - { - g_debug ("%s: setting scale to upper bound", G_STRFUNC); -- IdoScaleMenuItemPrivate * priv = GET_PRIVATE (item); -+ IdoScaleMenuItemPrivate * priv = ido_scale_menu_item_get_instance_private (item); - GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale)); - gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj)); - } -@@ -991,7 +1000,7 @@ static void - ido_scale_menu_item_set_value (IdoScaleMenuItem *item, - gdouble value) - { -- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item); -+ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item); - - /* set ignore_value_changed to signify to the scale menu item that it - * should not emit its own value-changed signal, as that should only -diff --git a/src/idoscalemenuitem.h b/src/idoscalemenuitem.h -index 2c32a49..de6968e 100644 ---- a/src/idoscalemenuitem.h -+++ b/src/idoscalemenuitem.h -@@ -47,13 +47,10 @@ typedef enum - - typedef struct _IdoScaleMenuItem IdoScaleMenuItem; - typedef struct _IdoScaleMenuItemClass IdoScaleMenuItemClass; --typedef struct _IdoScaleMenuItemPrivate IdoScaleMenuItemPrivate; - - struct _IdoScaleMenuItem - { - GtkMenuItem parent_instance; -- -- IdoScaleMenuItemPrivate *priv; - }; - - struct _IdoScaleMenuItemClass -diff --git a/src/idoswitchmenuitem.c b/src/idoswitchmenuitem.c -index d47392f..bd00e1d 100644 ---- a/src/idoswitchmenuitem.c -+++ b/src/idoswitchmenuitem.c -@@ -23,24 +23,25 @@ - #include "idoswitchmenuitem.h" - #include "idoactionhelper.h" - -+static void ido_switch_menu_finalize (GObject * item); - static gboolean ido_switch_menu_button_release_event (GtkWidget * widget, - GdkEventButton * event); - - --struct _IdoSwitchMenuItemPrivate -+typedef struct - { - GtkWidget * box; - GtkWidget * content_area; - GtkWidget * label; - GtkWidget * image; - GtkWidget * switch_w; --}; -+} IdoSwitchMenuItemPrivate; - - /*** - **** Life Cycle - ***/ - --G_DEFINE_TYPE (IdoSwitchMenuItem, ido_switch_menu_item, GTK_TYPE_CHECK_MENU_ITEM) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoSwitchMenuItem, ido_switch_menu_item, GTK_TYPE_CHECK_MENU_ITEM) - - static void - ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass) -@@ -50,7 +51,8 @@ ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass) - GtkCheckMenuItemClass * check_class; - - gobject_class = G_OBJECT_CLASS (klass); -- g_type_class_add_private (gobject_class, sizeof (IdoSwitchMenuItemPrivate)); -+ -+ gobject_class->finalize = ido_switch_menu_finalize; - - widget_class = GTK_WIDGET_CLASS (klass); - widget_class->button_release_event = ido_switch_menu_button_release_event; -@@ -62,9 +64,8 @@ ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass) - static void - ido_switch_menu_item_init (IdoSwitchMenuItem *item) - { -- IdoSwitchMenuItemPrivate *priv; -+ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item); - -- priv = item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, IDO_TYPE_SWITCH_MENU_ITEM, IdoSwitchMenuItemPrivate); - priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - priv->content_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - priv->switch_w = gtk_switch_new (); -@@ -134,6 +135,8 @@ ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item) - - g_return_val_if_fail (IDO_IS_SWITCH_MENU_ITEM(item), NULL); - -+ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item); -+ - if (!warned) - { - g_warning ("%s is deprecated. Please don't use it, especially if you're using" -@@ -141,7 +144,7 @@ ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item) - warned = TRUE; - } - -- return GTK_CONTAINER (item->priv->content_area); -+ return GTK_CONTAINER (priv->content_area); - } - - /** -@@ -160,7 +163,7 @@ ido_switch_menu_item_set_label (IdoSwitchMenuItem *item, - g_return_if_fail (IDO_IS_SWITCH_MENU_ITEM (item)); - g_return_if_fail (label != NULL); - -- priv = item->priv; -+ priv = ido_switch_menu_item_get_instance_private(item); - - if (priv->label == NULL) - { -@@ -189,7 +192,7 @@ ido_switch_menu_item_set_icon (IdoSwitchMenuItem *item, - g_return_if_fail (IDO_IS_SWITCH_MENU_ITEM (item)); - g_return_if_fail (icon == NULL || G_IS_ICON (icon)); - -- priv = item->priv; -+ priv = ido_switch_menu_item_get_instance_private(item); - - if (icon) - { -@@ -213,10 +216,11 @@ ido_source_menu_item_state_changed (IdoActionHelper *helper, - GVariant *state, - gpointer user_data) - { -- IdoSwitchMenuItem *item = user_data; -+ IdoSwitchMenuItem *item = IDO_SWITCH_MENU_ITEM (user_data); -+ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item); - - if (g_variant_is_of_type (state, G_VARIANT_TYPE_BOOLEAN)) -- gtk_switch_set_active (GTK_SWITCH (item->priv->switch_w), -+ gtk_switch_set_active (GTK_SWITCH (priv->switch_w), - g_variant_get_boolean (state)); - } - -@@ -269,3 +273,10 @@ ido_switch_menu_item_new_from_menu_model (GMenuItem *menuitem, - - return item; - } -+ -+static void -+ido_switch_menu_finalize (GObject * item) -+{ -+ /* no-op */ -+} -+ -diff --git a/src/idoswitchmenuitem.h b/src/idoswitchmenuitem.h -index 222b473..de218d1 100644 ---- a/src/idoswitchmenuitem.h -+++ b/src/idoswitchmenuitem.h -@@ -34,13 +34,10 @@ G_BEGIN_DECLS - - typedef struct _IdoSwitchMenuItem IdoSwitchMenuItem; - typedef struct _IdoSwitchMenuItemClass IdoSwitchMenuItemClass; --typedef struct _IdoSwitchMenuItemPrivate IdoSwitchMenuItemPrivate; - - struct _IdoSwitchMenuItem - { - GtkCheckMenuItem parent_instance; -- -- IdoSwitchMenuItemPrivate *priv; - }; - - struct _IdoSwitchMenuItemClass -diff --git a/src/idotimeline.c b/src/idotimeline.c -index 8eea4b5..4929ba3 100644 ---- a/src/idotimeline.c -+++ b/src/idotimeline.c -@@ -25,15 +25,11 @@ - #include <gtk/gtk.h> - #include <math.h> - --#define IDO_TIMELINE_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), IDO_TYPE_TIMELINE, IdoTimelinePriv)) - #define MSECS_PER_SEC 1000 - #define FRAME_INTERVAL(nframes) (MSECS_PER_SEC / nframes) - #define DEFAULT_FPS 30 - --typedef struct IdoTimelinePriv IdoTimelinePriv; -- --struct IdoTimelinePriv --{ -+typedef struct { - guint duration; - guint fps; - guint source_id; -@@ -48,7 +44,7 @@ struct IdoTimelinePriv - guint animations_enabled : 1; - guint loop : 1; - guint direction : 1; --}; -+} IdoTimelinePrivate; - - enum { - PROP_0, -@@ -81,7 +77,7 @@ static void ido_timeline_get_property (GObject *object, - static void ido_timeline_finalize (GObject *object); - - --G_DEFINE_TYPE (IdoTimeline, ido_timeline, G_TYPE_OBJECT) -+G_DEFINE_TYPE_WITH_PRIVATE (IdoTimeline, ido_timeline, G_TYPE_OBJECT) - - - static void -@@ -193,16 +189,12 @@ ido_timeline_class_init (IdoTimelineClass *klass) - g_cclosure_marshal_VOID__DOUBLE, - G_TYPE_NONE, 1, - G_TYPE_DOUBLE); -- -- g_type_class_add_private (klass, sizeof (IdoTimelinePriv)); - } - - static void - ido_timeline_init (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -- -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - priv->fps = DEFAULT_FPS; - priv->duration = 0.0; -@@ -251,11 +243,8 @@ ido_timeline_get_property (GObject *object, - GValue *value, - GParamSpec *pspec) - { -- IdoTimeline *timeline; -- IdoTimelinePriv *priv; -- -- timeline = IDO_TIMELINE (object); -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ IdoTimeline *timeline = IDO_TIMELINE (object); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - switch (prop_id) - { -@@ -282,9 +271,8 @@ ido_timeline_get_property (GObject *object, - static void - ido_timeline_finalize (GObject *object) - { -- IdoTimelinePriv *priv; -- -- priv = IDO_TIMELINE_GET_PRIV (object); -+ IdoTimeline *timeline = IDO_TIMELINE (object); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - if (priv->source_id) - { -@@ -301,11 +289,10 @@ ido_timeline_finalize (GObject *object) - static gboolean - ido_timeline_run_frame (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; - gdouble delta_progress, progress; - guint elapsed_time; - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline); - - elapsed_time = (guint) (g_timer_elapsed (priv->timer, NULL) * 1000); - g_timer_start (priv->timer); -@@ -395,12 +382,12 @@ ido_timeline_new_for_screen (guint duration, - void - ido_timeline_start (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - gboolean enable_animations = FALSE; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (!priv->source_id) - { -@@ -446,11 +433,11 @@ ido_timeline_start (IdoTimeline *timeline) - void - ido_timeline_pause (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (priv->source_id) - { -@@ -470,11 +457,11 @@ ido_timeline_pause (IdoTimeline *timeline) - void - ido_timeline_rewind (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (ido_timeline_get_direction(timeline) != IDO_TIMELINE_DIRECTION_FORWARD) - priv->progress = priv->last_progress = 1.; -@@ -502,11 +489,11 @@ ido_timeline_rewind (IdoTimeline *timeline) - gboolean - ido_timeline_is_running (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), FALSE); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - return (priv->source_id != 0); - } -@@ -522,11 +509,12 @@ ido_timeline_is_running (IdoTimeline *timeline) - guint - ido_timeline_get_fps (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 1); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->fps; - } - -@@ -542,12 +530,12 @@ void - ido_timeline_set_fps (IdoTimeline *timeline, - guint fps) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - g_return_if_fail (fps > 0); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - /* Coverity CID: 12650/12651: guard against division by 0. */ - priv->fps = fps > 0 ? fps : priv->fps; -@@ -575,11 +563,12 @@ ido_timeline_set_fps (IdoTimeline *timeline, - gboolean - ido_timeline_get_loop (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), FALSE); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->loop; - } - -@@ -595,11 +584,11 @@ void - ido_timeline_set_loop (IdoTimeline *timeline, - gboolean loop) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (loop != priv->loop) - { -@@ -619,11 +608,11 @@ void - ido_timeline_set_duration (IdoTimeline *timeline, - guint duration) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (duration != priv->duration) - { -@@ -643,11 +632,11 @@ ido_timeline_set_duration (IdoTimeline *timeline, - guint - ido_timeline_get_duration (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 0); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - return priv->duration; - } -@@ -663,11 +652,11 @@ void - ido_timeline_set_direction (IdoTimeline *timeline, - IdoTimelineDirection direction) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (direction != priv->direction) - { -@@ -687,11 +676,12 @@ ido_timeline_set_direction (IdoTimeline *timeline, - IdoTimelineDirection - ido_timeline_get_direction (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), IDO_TIMELINE_DIRECTION_FORWARD); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->direction; - } - -@@ -706,12 +696,12 @@ void - ido_timeline_set_screen (IdoTimeline *timeline, - GdkScreen *screen) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - g_return_if_fail (GDK_IS_SCREEN (screen)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (priv->screen) - g_object_unref (priv->screen); -@@ -732,11 +722,12 @@ ido_timeline_set_screen (IdoTimeline *timeline, - GdkScreen * - ido_timeline_get_screen (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), NULL); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->screen; - } - -@@ -751,11 +742,12 @@ ido_timeline_get_screen (IdoTimeline *timeline) - gdouble - ido_timeline_get_progress (IdoTimeline *timeline) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 0.); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); -+ - return priv->progress; - } - -@@ -769,11 +761,11 @@ ido_timeline_get_progress (IdoTimeline *timeline) - void - ido_timeline_set_progress (IdoTimeline *timeline, gdouble progress) - { -- IdoTimelinePriv *priv; -+ IdoTimelinePrivate *priv; - - g_return_if_fail (IDO_IS_TIMELINE (timeline)); - -- priv = IDO_TIMELINE_GET_PRIV (timeline); -+ priv = ido_timeline_get_instance_private (timeline); - - if (priv->source_id) - { -diff --git a/src/idotimestampmenuitem.c b/src/idotimestampmenuitem.c -index 0d33deb..0c9c086 100644 ---- a/src/idotimestampmenuitem.c -+++ b/src/idotimestampmenuitem.c -@@ -39,17 +39,14 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoTimeStampMenuItemPrivate --{ -+typedef struct { - char * format; - GDateTime * date_time; --}; -- --typedef IdoTimeStampMenuItemPrivate priv_t; -+} IdoTimeStampMenuItemPrivate; - --G_DEFINE_TYPE (IdoTimeStampMenuItem, -- ido_time_stamp_menu_item, -- IDO_TYPE_BASIC_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoTimeStampMenuItem, -+ ido_time_stamp_menu_item, -+ IDO_TYPE_BASIC_MENU_ITEM); - - /*** - **** GObject Virtual Functions -@@ -62,16 +59,16 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (o); -- priv_t * p = self->priv; -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); - - switch (property_id) - { - case PROP_FORMAT: -- g_value_set_string (v, p->format); -+ g_value_set_string (v, priv->format); - break; - - case PROP_DATE_TIME: -- g_value_set_boxed (v, p->date_time); -+ g_value_set_boxed (v, priv->date_time); - break; - - default: -@@ -108,9 +105,9 @@ static void - my_dispose (GObject * object) - { - IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); - -- g_clear_pointer (&p->date_time, g_date_time_unref); -+ g_clear_pointer (&priv->date_time, g_date_time_unref); - - G_OBJECT_CLASS (ido_time_stamp_menu_item_parent_class)->dispose (object); - } -@@ -119,9 +116,9 @@ static void - my_finalize (GObject * object) - { - IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (object); -- priv_t * p = self->priv; -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); - -- g_free (p->format); -+ g_free (priv->format); - - G_OBJECT_CLASS (ido_time_stamp_menu_item_parent_class)->finalize (object); - } -@@ -136,8 +133,6 @@ ido_time_stamp_menu_item_class_init (IdoTimeStampMenuItemClass *klass) - GParamFlags prop_flags; - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoTimeStampMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -167,20 +162,18 @@ ido_time_stamp_menu_item_class_init (IdoTimeStampMenuItemClass *klass) - static void - ido_time_stamp_menu_item_init (IdoTimeStampMenuItem *self) - { -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_TYPE_TIME_STAMP_MENU_ITEM, -- IdoTimeStampMenuItemPrivate); -- -+ /* no-op */ - } - - static void - update_timestamp_label (IdoTimeStampMenuItem * self) - { - char * str; -- priv_t * p = self->priv; - -- if (p->date_time && p->format) -- str = g_date_time_format (p->date_time, p->format); -+ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ if (priv->date_time && priv->format) -+ str = g_date_time_format (priv->date_time, priv->format); - else - str = NULL; - -@@ -210,14 +203,15 @@ void - ido_time_stamp_menu_item_set_date_time (IdoTimeStampMenuItem * self, - GDateTime * date_time) - { -- priv_t * p; -+ IdoTimeStampMenuItemPrivate * priv; - - g_return_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self)); -- p = self->priv; - -- g_clear_pointer (&p->date_time, g_date_time_unref); -+ priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ g_clear_pointer (&priv->date_time, g_date_time_unref); - if (date_time != NULL) -- p->date_time = g_date_time_ref (date_time); -+ priv->date_time = g_date_time_ref (date_time); - update_timestamp_label (self); - } - -@@ -234,20 +228,25 @@ void - ido_time_stamp_menu_item_set_format (IdoTimeStampMenuItem * self, - const char * strftime_fmt) - { -- priv_t * p; -+ IdoTimeStampMenuItemPrivate * priv; - - g_return_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self)); -- p = self->priv; - -- g_free (p->format); -- p->format = g_strdup (strftime_fmt); -+ priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ g_free (priv->format); -+ priv->format = g_strdup (strftime_fmt); - update_timestamp_label (self); - } - - const gchar * - ido_time_stamp_menu_item_get_format (IdoTimeStampMenuItem * self) - { -+ IdoTimeStampMenuItemPrivate * priv; -+ - g_return_val_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self), NULL); - -- return self->priv->format; -+ priv = ido_time_stamp_menu_item_get_instance_private(self); -+ -+ return priv->format; - } -diff --git a/src/idotimestampmenuitem.h b/src/idotimestampmenuitem.h -index 5847ba8..b596fad 100644 ---- a/src/idotimestampmenuitem.h -+++ b/src/idotimestampmenuitem.h -@@ -31,7 +31,6 @@ G_BEGIN_DECLS - - typedef struct _IdoTimeStampMenuItem IdoTimeStampMenuItem; - typedef struct _IdoTimeStampMenuItemClass IdoTimeStampMenuItemClass; --typedef struct _IdoTimeStampMenuItemPrivate IdoTimeStampMenuItemPrivate; - - struct _IdoTimeStampMenuItemClass - { -@@ -49,7 +48,6 @@ struct _IdoTimeStampMenuItem - { - /*< private >*/ - IdoBasicMenuItem parent; -- IdoTimeStampMenuItemPrivate * priv; - }; - - -diff --git a/src/idousermenuitem.c b/src/idousermenuitem.c -index 8d8673e..bbb7916 100644 ---- a/src/idousermenuitem.c -+++ b/src/idousermenuitem.c -@@ -42,8 +42,7 @@ enum - - static GParamSpec *properties[PROP_LAST]; - --struct _IdoUserMenuItemPrivate --{ -+typedef struct { - GtkWidget* user_image; - GtkWidget* user_name; - GtkWidget* container; -@@ -52,9 +51,9 @@ struct _IdoUserMenuItemPrivate - gboolean is_current_user; - gchar * label; - GIcon * icon; --}; -+} IdoUserMenuItemPrivate; - --G_DEFINE_TYPE (IdoUserMenuItem, ido_user_menu_item, GTK_TYPE_MENU_ITEM); -+G_DEFINE_TYPE_WITH_PRIVATE (IdoUserMenuItem, ido_user_menu_item, GTK_TYPE_MENU_ITEM); - - /* Prototypes */ - static gboolean ido_user_menu_item_primitive_draw_cb_gtk_3 (GtkWidget * image, -@@ -72,23 +71,24 @@ my_get_property (GObject * o, - GParamSpec * pspec) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (o); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - - switch (property_id) - { - case PROP_LABEL: -- g_value_set_string (value, self->priv->label); -+ g_value_set_string (value, priv->label); - break; - - case PROP_ICON: -- g_value_set_object (value, self->priv->icon); -+ g_value_set_object (value, priv->icon); - break; - - case PROP_IS_LOGGED_IN: -- g_value_set_boolean (value, self->priv->is_logged_in); -+ g_value_set_boolean (value, priv->is_logged_in); - break; - - case PROP_IS_CURRENT_USER: -- g_value_set_boolean (value, self->priv->is_current_user); -+ g_value_set_boolean (value, priv->is_current_user); - break; - - default: -@@ -104,6 +104,7 @@ my_set_property (GObject * o, - GParamSpec * pspec) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (o); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - - switch (property_id) - { -@@ -120,7 +121,7 @@ my_set_property (GObject * o, - break; - - case PROP_IS_CURRENT_USER: -- self->priv->is_current_user = g_value_get_boolean (value); -+ priv->is_current_user = g_value_get_boolean (value); - gtk_widget_queue_draw (GTK_WIDGET(self)); - break; - -@@ -134,8 +135,9 @@ static void - my_dispose (GObject *object) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (object); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - -- g_clear_object (&self->priv->icon); -+ g_clear_object (&priv->icon); - - G_OBJECT_CLASS (ido_user_menu_item_parent_class)->dispose (object); - } -@@ -144,8 +146,9 @@ static void - my_finalize (GObject *object) - { - IdoUserMenuItem * self = IDO_USER_MENU_ITEM (object); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - -- g_free (self->priv->label); -+ g_free (priv->label); - - G_OBJECT_CLASS (ido_user_menu_item_parent_class)->finalize (object); - } -@@ -156,8 +159,6 @@ ido_user_menu_item_class_init (IdoUserMenuItemClass *klass) - GParamFlags prop_flags; - GObjectClass * gobject_class = G_OBJECT_CLASS (klass); - -- g_type_class_add_private (klass, sizeof (IdoUserMenuItemPrivate)); -- - gobject_class->get_property = my_get_property; - gobject_class->set_property = my_set_property; - gobject_class->dispose = my_dispose; -@@ -197,13 +198,7 @@ ido_user_menu_item_class_init (IdoUserMenuItemClass *klass) - static void - ido_user_menu_item_init (IdoUserMenuItem *self) - { -- IdoUserMenuItemPrivate * priv; -- -- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, -- IDO_USER_MENU_ITEM_TYPE, -- IdoUserMenuItemPrivate); -- -- priv = self->priv; -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - - // Create the UI elements. - priv->user_image = gtk_image_new (); -@@ -260,7 +255,7 @@ ido_user_menu_item_primitive_draw_cb_gtk_3 (GtkWidget * widget, - - g_return_val_if_fail(IS_IDO_USER_MENU_ITEM(user_data), FALSE); - -- priv = IDO_USER_MENU_ITEM(user_data)->priv; -+ priv = ido_user_menu_item_get_instance_private(IDO_USER_MENU_ITEM(user_data)); - - /* Draw dot only when user is the current user. */ - if (priv->is_current_user) -@@ -303,6 +298,8 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self, - gint height; - GdkPixbuf *pixbuf; - -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ - file = g_file_icon_get_file (G_FILE_ICON (icon)); - path = g_file_get_path (file); - -@@ -316,7 +313,7 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self, - - if (pixbuf) - { -- gtk_image_set_from_pixbuf (GTK_IMAGE (self->priv->user_image), pixbuf); -+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->user_image), pixbuf); - g_object_unref (pixbuf); - return TRUE; - } -@@ -331,15 +328,15 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self, - void - ido_user_menu_item_set_icon (IdoUserMenuItem * self, GIcon * icon) - { -- IdoUserMenuItemPrivate * p = self->priv; -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); - -- if (p->icon == icon) -+ if (priv->icon == icon) - return; - -- g_clear_object (&p->icon); -+ g_clear_object (&priv->icon); - - if (icon) -- p->icon = g_object_ref (icon); -+ priv->icon = g_object_ref (icon); - - /* Avatars are always loaded from disk. Show the fallback when no icon - * is set, the icon is not a file icon, or the file could not be -@@ -349,7 +346,7 @@ ido_user_menu_item_set_icon (IdoUserMenuItem * self, GIcon * icon) - !G_IS_FILE_ICON (icon) || - !ido_user_menu_item_set_icon_from_file_icon (self, G_FILE_ICON (icon))) - { -- gtk_image_set_from_icon_name (GTK_IMAGE (p->user_image), -+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->user_image), - FALLBACK_ICON_NAME, - GTK_ICON_SIZE_MENU); - } -@@ -370,20 +367,26 @@ ido_user_menu_item_set_icon_from_file (IdoUserMenuItem * self, const char * file - void - ido_user_menu_item_set_logged_in (IdoUserMenuItem * self, gboolean is_logged_in) - { -- gtk_widget_set_visible (self->priv->tick_icon, is_logged_in); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ -+ gtk_widget_set_visible (priv->tick_icon, is_logged_in); - } - - void - ido_user_menu_item_set_current_user (IdoUserMenuItem * self, gboolean is_current_user) - { -- self->priv->is_current_user = is_current_user; -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ -+ priv->is_current_user = is_current_user; - gtk_widget_queue_draw (GTK_WIDGET (self)); - } - - void - ido_user_menu_item_set_label (IdoUserMenuItem * self, const char * label) - { -- gtk_label_set_label (GTK_LABEL(self->priv->user_name), label); -+ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self); -+ -+ gtk_label_set_label (GTK_LABEL(priv->user_name), label); - } - - GtkWidget* -diff --git a/src/idousermenuitem.h b/src/idousermenuitem.h -index d1d5729..093078d 100644 ---- a/src/idousermenuitem.h -+++ b/src/idousermenuitem.h -@@ -32,7 +32,6 @@ G_BEGIN_DECLS - - typedef struct _IdoUserMenuItem IdoUserMenuItem; - typedef struct _IdoUserMenuItemClass IdoUserMenuItemClass; --typedef struct _IdoUserMenuItemPrivate IdoUserMenuItemPrivate; - - /* property keys */ - #define IDO_USER_MENU_ITEM_PROP_LABEL "label" -@@ -49,7 +48,6 @@ struct _IdoUserMenuItem - { - /*< private >*/ - GtkMenuItem parent; -- IdoUserMenuItemPrivate * priv; - }; - - GType ido_user_menu_item_get_type (void) G_GNUC_CONST; diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index 609bbac16..605619a75 100644 --- a/user/baloo-widgets/APKBUILD +++ b/user/baloo-widgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo-widgets -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="831a063d15958cb96d86e4273fe66fb7fc8d0f408fd9ecac2871da411ed41b88623680ff4a449ba2013aa006cba0c2e6b5ff9e2e3214513f0eed1306b62dd504 baloo-widgets-20.04.3.tar.xz" +sha512sums="e64719df49742852fadd8ca7e18bb725c5e7259f9dee2b96f972e334eb3cf846b45ac5f9fb91a425e9354a9a2476d1bdb89761a34804d17c1f68e8958db9af5a baloo-widgets-20.08.1.tar.xz" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index b1672e90b..f432627b1 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -42,17 +42,18 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} . - make + ${CMAKE_CROSSOPTS} . \ + -Bbuild + make -C build } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="0c23bd056bfb934b1e623e0aeaa151d47d2f0f4938c40ece1b738b35bf81eb424b2d4772b276f8893e8c914b904c172f7b28d25ea2b5e96771cc5d1f121e64e5 baloo-5.72.0.tar.xz +sha512sums="e044b3d0aa924154e32d2a7a66c6de0c4a8b572d3357d5c2600e9a64ae3e32751ea5953a37bbb8a0bde939732b1298486ccceaa64a84400f6179e44cd360ec5f baloo-5.74.0.tar.xz a65c36808c56dff4bc3bb91e791fcc9cba3cdaca686a214adf51e4d87d86ef7ee07d9dd8e0634dfc53a732b77668c6942322c993be5054bc4fc51e7bd69908ac initialise-variable.patch" diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD index 44df1d5b1..0737141b1 100644 --- a/user/bash-completion/APKBUILD +++ b/user/bash-completion/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=bash-completion diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD index c1f6e0b04..0c7fa9cb1 100644 --- a/user/bcnm/APKBUILD +++ b/user/bcnm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bcnm -pkgver=0.0.1.0 +pkgver=0.0.1.2 pkgrel=0 pkgdesc="Client network manager" url="https://www.skarnet.org/software/bcnm/" @@ -9,7 +9,7 @@ arch="all" options="!check" # No test suite. license="ISC" depends="" -makedepends="skalibs-dev" +makedepends="skalibs-dev>=2.10" subpackages="$pkgname-dev" source="https://www.skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abe37c2629baa3c583734c7f783565c52f376ff553c503b5666e081cce042efa2e4d2a219b4911b23ea1c437f1ab0d9d1a928cc5126d8efb65e2981b86b220e1 bcnm-0.0.1.0.tar.gz" +sha512sums="41c69b4800dc347f12b06010fe6a64391ad18fc35f0171fdcedb7843725dc6308c1d1f0486b10618938f6f98c8ca63eb15567af64e271efffcf255a8b96c3add bcnm-0.0.1.2.tar.gz" diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 5135228af..44cd5cf30 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,12 +4,12 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.14.10 +pkgver=9.16.8 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} [ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p" -pkgrel=0 +pkgrel=1 pkgdesc="The ISC DNS server" url="https://www.isc.org/downloads/bind/" arch="all" @@ -25,10 +25,10 @@ license="ISC AND Apache-2.0 AND OpenSSL AND BSD-2-Clause AND BSD-3-Clause AND BS pkgusers="named" pkggroups="named" depends="" -makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply" +makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply libuv-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools" install="$pkgname.pre-install" -source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz +source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.xz bind.so_bsdcompat.patch named.initd named.confd @@ -41,6 +41,14 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz builddir="$srcdir/$pkgname-$_ver" # secfixes: +# 9.16.8-r0: +# - CVE-2020-8620 +# - CVE-2020-8621 +# - CVE-2020-8622 +# - CVE-2020-8623 +# - CVE-2020-8624 +# - CVE-2020-8618 +# - CVE-2020-8619 # 9.14.9-r0: # - CVE-2019-6477 # 9.14.7-r0: @@ -79,13 +87,13 @@ prepare() { export CFLAGS="$CFLAGS -D_GNU_SOURCE" # Adjusting PATHs in manpages - for i in bin/named/named.8 bin/check/named-checkconf.8 bin/rndc/rndc.8; do - sed -i \ - -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ - -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ - -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ - "${i}" - done + for i in bin/named/named.rst bin/check/named-checkconf.rst bin/rndc/rndc.rst; do + sed -i \ + -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ + -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ + -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ + "$i" +done } build() { @@ -153,7 +161,7 @@ tools() { done } -sha512sums="81d453c4e90fea3a21b2485bea2f5321ca8a7ef58eb9a9bc1eaa1463989aefa439e4e45c9a43b1ec6a62c52f0e73d82ebd91cd084ad6ef2a67b705736e9e8d00 bind-9.14.10.tar.gz +sha512sums="803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7 bind-9.16.8.tar.xz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD index c8774acd6..fd06fefd7 100644 --- a/user/bitlbee/APKBUILD +++ b/user/bitlbee/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=bitlbee pkgver=3.6 pkgrel=0 diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index f7592b23f..d02e4687b 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=blinken -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5c84a319d980be8273a593d2ae00fb75cd6444347f54f00b3f533d8d9b4cf5f1612f3db8a4a040a650dd30506d3070ad647a179d7498be4727315eb30ad2975e blinken-20.04.3.tar.xz" +sha512sums="18610007944c980f40d6f3c98f99194d2d103bb1bdd167177a9303cb89a0fa95278f28047b57eee21a4b34c30bb35b8554ed8bd5a47f61b709f535a97f6862c4 blinken-20.08.1.tar.xz" diff --git a/user/bluedevil/APKBUILD b/user/bluedevil/APKBUILD index be3635ac2..792d00772 100644 --- a/user/bluedevil/APKBUILD +++ b/user/bluedevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluedevil -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Bluetooth framework for KDE" url="https://userbase.kde.org/Bluedevil" @@ -15,7 +15,7 @@ makedepends="bluez-qt-dev cmake extra-cmake-modules kauth-dev kcodecs-dev kwindowsystem-dev kxmlgui-dev plasma-framework-dev qt5-qtbase-dev qt5-qtdeclarative-dev solid-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/bluedevil-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/bluedevil-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dbefd648e525b4dc15dad77748e27726bcdd4790d9a12b57cbcb878c45a8bba25d94e49f68fcf28fb77e41e95a26d0bfb00c1c7faf3983197ff500f462ae2c2d bluedevil-5.18.4.1.tar.xz" +sha512sums="4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323 bluedevil-5.18.5.tar.xz" diff --git a/user/bluez-qt/APKBUILD b/user/bluez-qt/APKBUILD index d4a8635d4..37a019767 100644 --- a/user/bluez-qt/APKBUILD +++ b/user/bluez-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez-qt -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt integration with BlueZ" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3b935d88e0ed5637b35f01ea1aaf32c693d2cbbcbcb0d64c06f7134995dd3b348399d7597fb26874bbb9a98fa2a224b09106ceb87aa797ebc064257c8242e862 bluez-qt-5.72.0.tar.xz" +sha512sums="dfd13e5610233453596e633766c0da30d4f6ba219af32249ce502f5f6a64e9315d26408a5bfd6fc2f51043df531c73127d9c431ff51a0159a043aa681bd743c6 bluez-qt-5.74.0.tar.xz" diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index 6f90834b1..3d7c3736a 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.54 -pkgrel=1 +pkgver=5.55 +pkgrel=0 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" @@ -10,8 +10,8 @@ depends="dbus elogind" makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev linux-headers ncurses-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd - $pkgname-btmon $pkgname-cups $pkgname-deprecated $pkgname-hid2hci - $pkgname-obexd $pkgname-openrc $pkgname-tools" + $pkgname-btmgmt $pkgname-btmon $pkgname-cups $pkgname-deprecated + $pkgname-hid2hci $pkgname-obexd $pkgname-openrc $pkgname-tools" source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz https://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz bluetooth.initd @@ -30,6 +30,8 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz " # secfixes: +# 5.55-r0: +# - CVE-2020-27153 # 5.54-r0: # - CVE-2020-0556 @@ -61,7 +63,8 @@ build() { --enable-library \ --enable-deprecated \ --enable-experimental \ - --enable-tools + --enable-tools \ + --enable-hid2hci make } @@ -91,6 +94,12 @@ btmon() { mv "$pkgdir"/usr/bin/btmon "$subpkgdir"/usr/bin/ } +btmgmt() { + pkgdesc="Bluez tool for the Bluetooth Management API" + install -Dm755 "$builddir"/tools/btmgmt -t \ + "$subpkgdir"/usr/bin +} + cups() { pkgdesc="BlueZ backend for CUPS" depends="cups" @@ -132,7 +141,7 @@ tools() { done } -sha512sums="e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe bluez-5.54.tar.xz +sha512sums="9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033 bluez-5.55.tar.xz 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f readline-8.0.tar.gz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 09519b7c7..760a9cd1d 100644 --- a/user/bomber/APKBUILD +++ b/user/bomber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bomber -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c4ecae31c9f1a4af628dc5a7dbc587f5d05d3bb141942584bb8ca6cb932f32e5df1cd77f8891189fb9fdad510cd027b664c75e520e9c90bf3d054a930dc6935d bomber-20.04.3.tar.xz" +sha512sums="ee39d29824e102cb681d537e38691cc175b95ab334c1036f5c00dadc8cb24e064a510d40bf9f220e3d9efb2382b9a18bddf36c924f1cfdd1adba5ee159bc4794 bomber-20.08.1.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 1cfaa4ff7..54206d732 100644 --- a/user/bovo/APKBUILD +++ b/user/bovo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bovo -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf01b8713aa79f562dd89744e7f6b070fdad30b257bd13d570c6e26a38b3bfb96882a36159ba432dc06fa4a81591a17a613deecdb09b2bfd129b97c2d6aa8bda bovo-20.04.3.tar.xz" +sha512sums="15ad14531fa769ed208c7e3f6a9c81c000faa4d4bb97ae6b2bfb823993917a6f6526c23cf3ed756df9b1dcaa08fd5990fbac051d1bb21e5482ad23efb93472e6 bovo-20.08.1.tar.xz" diff --git a/user/breeze-grub/APKBUILD b/user/breeze-grub/APKBUILD index a43740724..ea4ff8663 100644 --- a/user/breeze-grub/APKBUILD +++ b/user/breeze-grub/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-grub -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE Breeze theme for GRUB boot screen" url="https://www.kde.org/" @@ -12,11 +12,11 @@ depends="grub" makedepends="" subpackages="" install_if="grub breeze" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-grub-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/breeze-grub-$pkgver.tar.xz" package() { mkdir -p "$pkgdir"/usr/share/grub/themes cp -r breeze "$pkgdir"/usr/share/grub/themes/ } -sha512sums="1b170cc767f6d2178db4713d4ce68d61d9462ae2deda633b1afb3973e37cb16e156a012c94c98853855ef82d1087b4f95c0f0f0480b7b38a876e8bf3eedc762a breeze-grub-5.18.4.1.tar.xz" +sha512sums="969154c602cbd7b334dd48550eb53cbffce16b355aaf971c6b5b372ac43b42aba507bc0e972f0de0051f34b75c80ac295b4f3ef8e64d5762b56a7d0a8d216d69 breeze-grub-5.18.5.tar.xz" diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD index 07b9fca4e..80cad7dbd 100644 --- a/user/breeze-gtk/APKBUILD +++ b/user/breeze-gtk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze-gtk -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="GTK+ style that matches KDE Breeze" url="https://www.kde.org/" @@ -11,7 +11,7 @@ depends="breeze gtk+2.0" makedepends="breeze-dev cmake extra-cmake-modules py3-pycairo qt5-qtbase-dev sassc" # XXX should be installed if breeze and gtk+3.0 are installed, as well install_if="breeze~$pkgver gtk+2.0" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-gtk-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c04b7b438dd3f23526627b1c416ff9b29d8cb6d8f27370731ffae9aad53c6554251a36663097d84645597b3cc541fbb80988cad093786a5d497958bd5e9ff57b breeze-gtk-5.18.4.1.tar.xz" +sha512sums="3dea9af26cd18dc0388c76c070c5a375054b6a03ffa97e298341924fd909e2dcc49a7c7b431b36a158c1012ce6f9d48f98ef84fc6cda0965d9a24ab18c7c0951 breeze-gtk-5.18.5.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 6832d03e6..5ac1e8e6d 100644 --- a/user/breeze-icons/APKBUILD +++ b/user/breeze-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-icons -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -45,4 +45,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="c6a42baeb391ab236cfc28f856176dbb9a435dc967adc9ab30172dbdf344f6c53380fc9f5149c3b2eac5d42d1e1b3e886d7576a908e3768b66226cb0e92e4d84 breeze-icons-5.72.0.tar.xz" +sha512sums="735bfd7349a400b9709a1387119187ba1ca712020a8fbfc5acced97200f17b7dc8a8a6e823d7a3223012e2a990ef46af25293c013b5ffff231526ab18fd86935 breeze-icons-5.74.0.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index 721d99c3f..b311d646d 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=breeze -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Default KDE Plasma 5 style" url="https://www.kde.org/" @@ -13,7 +13,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 kcmutils-dev kconfigwidgets-dev kcoreaddons-dev kdecoration-dev kguiaddons-dev ki18n-dev kpackage-dev frameworkintegration-dev kwindowsystem-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="41c540c0136dafb35da6abcf84f6d0d9be905599c1448c1efa8a8c61a77a1b0903a11bfd821e26691deeb8aa7e5268e198c9d1846ab1d4c6590fbecc83d75342 breeze-5.18.4.1.tar.xz" +sha512sums="d4797d9ecabd1d1bcaa483722c255f1a79aad5d15bca0daee571eced2e5c295e39ed8cd6039fca39d9e1a1456bd823f30fd332b2811a04df2b2e3663a04abff5 breeze-5.18.5.tar.xz" diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD index e8412ef96..c2c423ff8 100644 --- a/user/btrfs-progs/APKBUILD +++ b/user/btrfs-progs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=btrfs-progs -pkgver=5.7 +pkgver=5.9 pkgrel=0 pkgdesc="File system utilities for Btrfs" url="https://btrfs.wiki.kernel.org/index.php/Main_Page" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16 btrfs-progs-v5.7.tar.xz" +sha512sums="38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94 btrfs-progs-v5.9.tar.xz" diff --git a/user/byobu/APKBUILD b/user/byobu/APKBUILD new file mode 100644 index 000000000..9d91403aa --- /dev/null +++ b/user/byobu/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=byobu +pkgver=5.133 +pkgrel=0 +pkgdesc="An enhancement of the GNU Screen" +url="https://launchpad.net/byobu" +arch="noarch" +license="GPL-3.0+" +depends="python3 tmux" +makedepends="" +subpackages="$pkgname-doc" +source="https://launchpad.net/byobu/trunk/$pkgver/+download/byobu_$pkgver.orig.tar.gz" + +build() { + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="4c0ef7a3b483e48c57f3e97dae1c7c77084797016efb677b201f2b56c6b9f4b771739d9a6d9a4fb612203a22e9fa460db80fde30c837b102ad830b1b2919db6c byobu_5.133.orig.tar.gz" diff --git a/user/c-ares/APKBUILD b/user/c-ares/APKBUILD index 8b9cc81ee..564b70ce9 100644 --- a/user/c-ares/APKBUILD +++ b/user/c-ares/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=c-ares -pkgver=1.15.0 -pkgrel=1 +pkgver=1.16.1 +pkgrel=0 pkgdesc="Asynchronous DNS/name resolver library" url="https://c-ares.haxx.se/" arch="all" @@ -11,9 +11,7 @@ license="MIT" depends="" makedepends="" subpackages="$pkgname-doc $pkgname-dev" -source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz - onion-segfault.patch - " +source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -34,5 +32,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50 c-ares-1.15.0.tar.gz -f26d4e981afc87fe734893d91210f1d5cbdf841d7704acf41a964991ab669fffd0ffd661c24be84d67edc9e1d6804214e6e7188e77f6555c01c9ad8165f6fbfa onion-segfault.patch" +sha512sums="4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471 c-ares-1.16.1.tar.gz" diff --git a/user/c-ares/onion-segfault.patch b/user/c-ares/onion-segfault.patch deleted file mode 100644 index 7e5a712cd..000000000 --- a/user/c-ares/onion-segfault.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 43a915a1b741b7c5bad2f622de90f353cdae7694 Mon Sep 17 00:00:00 2001 -From: Khaidi Chu <i@2333.moe> -Date: Mon, 4 Feb 2019 10:38:07 +0800 -Subject: [PATCH] fix: init bufp before reject .onion to make it can be free - correctly (#241) - -When querying a .onion domain, it returns directly without setting bufp to NULL. A subsequent free() that occurs can cause a segmentation fault. - -Fix By: Khaidi Chu (@XadillaX) ---- - ares_create_query.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ares_create_query.c b/ares_create_query.c -index 1606b1a1..9efce17c 100644 ---- a/ares_create_query.c -+++ b/ares_create_query.c -@@ -94,14 +94,14 @@ int ares_create_query(const char *name, int dnsclass, int type, - size_t buflen; - unsigned char *buf; - -- /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ -- if (ares__is_onion_domain(name)) -- return ARES_ENOTFOUND; -- - /* Set our results early, in case we bail out early with an error. */ - *buflenp = 0; - *bufp = NULL; - -+ /* Per RFC 7686, reject queries for ".onion" domain names with NXDOMAIN. */ -+ if (ares__is_onion_domain(name)) -+ return ARES_ENOTFOUND; -+ - /* Allocate a memory area for the maximum size this packet might need. +2 - * is for the length byte and zero termination if no dots or ecscaping is - * used. diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD index 7e22d21fd..33abf8249 100644 --- a/user/cairomm/APKBUILD +++ b/user/cairomm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=cairomm pkgver=1.12.2 pkgrel=0 diff --git a/user/caja-dropbox/APKBUILD b/user/caja-dropbox/APKBUILD index 7f32ac1ab..a4a44ded3 100644 --- a/user/caja-dropbox/APKBUILD +++ b/user/caja-dropbox/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=caja-dropbox pkgver=1.24.0 pkgrel=0 diff --git a/user/caja-extensions/APKBUILD b/user/caja-extensions/APKBUILD index 43dd48cbe..19895bfd4 100644 --- a/user/caja-extensions/APKBUILD +++ b/user/caja-extensions/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=caja-extensions -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Extensions for the Caja file manager" url="https://mate-desktop.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f05a7d83f16aebacb04f75b76ca86e44c1a01d9ad6c2aefeac19398c4d9da8385e6852fa0118c763aee630e7eb6c7c81d77e0c9452200aee9cf4f058487c4dbf caja-extensions-1.24.0.tar.xz" +sha512sums="b844a774271d81ac811b1aff1f04be4a65c6e38a683938dfb593f65297a6398fbfe4c8f6a51c649a1311fb5ca8134b4478860f51b1b3eaf9965a6b8776af2817 caja-extensions-1.24.1.tar.xz" diff --git a/user/caja/APKBUILD b/user/caja/APKBUILD index a29500eb0..fe126dc54 100644 --- a/user/caja/APKBUILD +++ b/user/caja/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=caja pkgver=1.24.0 pkgrel=0 diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD index 60d8a0e8e..7fa944d3a 100644 --- a/user/calligra/APKBUILD +++ b/user/calligra/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=calligra -pkgver=3.1.0 -pkgrel=4 +pkgver=3.2.1 +pkgrel=0 pkgdesc="KDE Office suite" url="https://www.calligra.org/" arch="all" @@ -23,35 +23,15 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev boost-dev eigen-dev fontconfig-dev freetype-dev gsl-dev lcms2-dev libetonyek-dev libgit2-dev libodfgen-dev librevenge-dev libvisio-dev libwpd-dev libwpg-dev libwps-dev marble-dev poppler-dev poppler-qt5-dev - qca-dev + qca-dev okular kcalendarcore-dev kcontacts-dev kdiagram-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz - https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz - c99-math.patch - kcalcore.patch - kf5.patch - plan.patch - poppler.patch - poppler2.patch - poppler3.patch - poppler4.patch - poppler-73.patch - poppler-81.patch - poppler-83.patch - qt5.patch + braindump.patch + ridiculous-typo.patch " -prepare() { - # Run this *before* default_prepare so patches can work on plan! - mv ../calligraplan-$pkgver plan - default_prepare - sed -e "/add_subdirectory(plan)/s/#//" \ - -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ - -i CMakeLists.txt -} - build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" @@ -64,7 +44,9 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ - -DPRODUCTSET="KARBON PLAN SHEETS STAGE WORDS" \ + -DPRODUCTSET=desktop \ + -DQt5WebKitWidgets_FOUND=True \ + -DAPP_BRAINDUMP=True \ -DBUILD_UNMAINTAINED=True \ ${CMAKE_CROSSOPTS} \ -Bbuild @@ -79,17 +61,6 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz -a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz -b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch -7c7c0dbf0603e1ff1dba640364c58922e1f59f0c60ef4a1afbd330e454259a2ef767d94d54e8c0ef5c228c6972e91cbdc32cb6242a27e5374ddf0c5d4ea983d6 kcalcore.patch -0edb2b9ef6c9aad374d3e25bbc637f9a3447a6e70d153fbec4ab87dc213e96076a6c8df5a65fb020d7f232269ee8cf4561f5d13724df827247379c321c15401d kf5.patch -7d4654810d0aa1bcbd3609e0d9067e357284a9cd97d50aa3782ef8e341478c3c16acba85428595ddb1d5b22397703f2383304d2c39c48d3fd5e2cfa2768bc6bc plan.patch -960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch -53296af0b1ad39c523bc93a0040f1316dfb52e2077d277a83841a741c5cb48d81efb1f6328b2af2c8f1dc92db12c4d771a9a65028498d7802b2c30dd702b9455 poppler2.patch -a22b78d9664284ee5de7a4299907ec37a7835cb6ae3af8e7c1ee0202cea8c1e544fbad7395e56115fb5fe13ec06aeff22e381431e20c6c151c93003cf8a45446 poppler3.patch -df0e592f8c314581b1811776f8aa1c3dd32f05f966f23ef4dd023c41dad759aea8b674b32e2bd7bee36efe4ba0ce0bdd08f3fc30d10115330605d09d46883a28 poppler4.patch -8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch -354d1ceab55dfd036c94aa0f9cd6792e58714011b2ef23f104f45fc46cd6d005a242ba18f47337dc1ead79fbeb1e3075062fc9d63d50a4058ca845ac9ec7810c poppler-81.patch -b65384ddc4be747907d17b1eb944130dd27155034156faa4d3e3b704507fff03331535e875cb9dec929d5cba2f0a317ba1a7e7978336e3b57f28807f5ad5b383 poppler-83.patch -440a5297ad0e1542c2892e6c84a6acf5cd61da3160dcf56163791ef4ade35d90f71c3bb3df28988deea60e9f68c292ce8ffa23150ddaa08d262b256dd91481f1 qt5.patch" +sha512sums="e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f calligra-3.2.1.tar.xz +786f02e5e21535c08343bee10ddf5d331dd34e778a117228edc010ca20dc497c285d3938a3166892f2faa20167133f3b64ab66f0a8b623ae5318601a7218359d braindump.patch +3fa0700f471202eb8b76ded3928b884f43aa1c52e3fa6fc33b7fb62d5b1dcff1df2823723963a40f383e466eb7bebb1a66db14f2bd076a41f25b74f1a5f7f8d5 ridiculous-typo.patch" diff --git a/user/calligra/braindump.patch b/user/calligra/braindump.patch new file mode 100644 index 000000000..741221700 --- /dev/null +++ b/user/calligra/braindump.patch @@ -0,0 +1,11 @@ +--- calligra-3.2.1/CMakeLists.txt.old 2020-05-14 06:53:49.000000000 +0000 ++++ calligra-3.2.1/CMakeLists.txt 2020-07-29 23:07:48.255879433 +0000 +@@ -1068,7 +1068,7 @@ + # e.g.: + # calligra_disable_product(APP_FOO "isn't buildable at the moment") + +-calligra_disable_product(APP_BRAINDUMP "Disabled, will (probably) be removed from Calligra") ++#calligra_disable_product(APP_BRAINDUMP "Disabled, will (probably) be removed from Calligra") + + ############################################# + #### Calculate buildable products #### diff --git a/user/calligra/c99-math.patch b/user/calligra/c99-math.patch deleted file mode 100644 index 4326dd7fa..000000000 --- a/user/calligra/c99-math.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt.old 2018-01-26 09:24:44.000000000 +0000 -+++ calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt 2018-10-24 23:22:43.440000000 +0000 -@@ -64,12 +64,12 @@ - set( CMAKE_REQUIRED_INCLUDES math.h ) - endif() - --check_function_exists( isinf HAVE_FUNC_ISINF ) --check_function_exists( isnan HAVE_FUNC_ISNAN ) -+check_symbol_exists( isinf math.h HAVE_FUNC_ISINF ) -+check_symbol_exists( isnan math.h HAVE_FUNC_ISNAN ) - if(MINGW) - add_definitions( -DHAVE_FUNC_ISFINITE ) - endif() --check_function_exists( finite HAVE_FUNC_FINITE ) -+check_symbol_exists( finite math.h HAVE_FUNC_FINITE ) - check_function_exists( _finite HAVE_FUNC__FINITE ) - - # diff --git a/user/calligra/kcalcore.patch b/user/calligra/kcalcore.patch deleted file mode 100644 index 8124192db..000000000 --- a/user/calligra/kcalcore.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 2d484fda1b31a72659088a4bfce5c3708e923cb0 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 23 Jul 2019 12:20:29 +0200 -Subject: Fix compilation after recent KCalCore API changes - ---- - .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -index 757d693..daf1c2d 100644 ---- a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -@@ -31,6 +31,7 @@ - #include <kcalcore/attachment.h> - #include <kcalcore/icalformat.h> - #include <kcalcore/memorycalendar.h> -+#include <kcalcore_version.h> - - #include <QTextCodec> - #include <QByteArray> -@@ -140,9 +141,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setOrganizer(node->projectNode()->leader()); - } - if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); -+ KCalCore::Attendee a(p.name(), p.email()); -+ a.setRole(KCalCore::Attendee::NonParticipant); -+#else - KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader()); - KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email())); - a->setRole(KCalCore::Attendee::NonParticipant); -+#endif - todo->addAttendee(a); - } - DateTime st = node->startTime(id); -@@ -161,13 +168,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - const QList<Resource*> lst = task->requestedResources(); - foreach(const Resource *r, lst) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - } else { - foreach(const Resource *r, s->resources()) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - -@@ -178,7 +193,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setPercentComplete(task->completion().percentFinished()); - } - foreach(const Document *doc, node->documents().documents()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ todo->addAttachment(KCalCore::Attachment(doc->url().url())); -+#else - todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url()))); -+#endif - } - if (! parent.isNull()) { - todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); --- -cgit v1.1 - diff --git a/user/calligra/kf5.patch b/user/calligra/kf5.patch deleted file mode 100644 index 1a424ef98..000000000 --- a/user/calligra/kf5.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9611a8b3e09f7ae4b53640c11a2196274f39d60f Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 10 Nov 2019 14:28:36 +0100 -Subject: port away from deprecated methods in KWindowSystem >= 5.62 - -(this is in order to make KWindowSystem independent from QtWidgets) ---- - plan/src/workpackage/commandlineparser.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/plan/src/workpackage/commandlineparser.cpp b/plan/src/workpackage/commandlineparser.cpp -index 432f99a..f9be208 100644 ---- a/plan/src/workpackage/commandlineparser.cpp -+++ b/plan/src/workpackage/commandlineparser.cpp -@@ -28,6 +28,7 @@ - #include <KStartupInfo> - #include <KWindowSystem> - #include <KMessageBox> -+#include <kwindowsystem_version.h> - - #include <QApplication> - #include <QDir> -@@ -65,7 +66,12 @@ void CommandLineParser::handleActivateRequest(const QStringList &arguments, cons - handleCommandLine(QDir(workingDirectory)); - - // terminate startup notification and activate the mainwindow -+#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5,62,0) -+ m_mainwindow->setAttribute(Qt::WA_NativeWindow, true); -+ KStartupInfo::setNewStartupId(m_mainwindow->windowHandle(), KStartupInfo::startupId()); -+#else - KStartupInfo::setNewStartupId(m_mainwindow, KStartupInfo::startupId()); -+#endif - KWindowSystem::forceActiveWindow(m_mainwindow->winId()); - - } --- -cgit v1.1 - diff --git a/user/calligra/plan.patch b/user/calligra/plan.patch deleted file mode 100644 index c8f8c91fb..000000000 --- a/user/calligra/plan.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 36ec68024620211edbcdb31a5ef6021545fe9451 Mon Sep 17 00:00:00 2001 -From: Dag Andersen <danders@get2net.dk> -Date: Fri, 9 Feb 2018 08:40:34 +0100 -Subject: Plan: Fix crash in tj scheduler if a resource does not have a - calendar - -This can happen when there is no default calendar and no calendar has been set for a resource. ---- - plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -index 4f4e825..548969e 100644 ---- a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -+++ b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp -@@ -259,6 +259,9 @@ bool PlanTJScheduler::kplatoToTJ() - addRequests(); - addStartEndJob(); - -+ if (result != -1) { -+ return false; -+ } - return check(); - } - -@@ -596,6 +599,7 @@ TJ::Resource *PlanTJScheduler::addResource( KPlato::Resource *r) - res->setEfficiency( (double)(r->units()) / 100. ); - } - Calendar *cal = r->calendar(); -+ Q_ASSERT(cal); - DateTime start = qMax( r->availableFrom(), m_project->constraintStartTime() ); - DateTime end = m_project->constraintEndTime(); - if ( r->availableUntil().isValid() && end > r->availableUntil() ) { -@@ -887,6 +891,11 @@ void PlanTJScheduler::addRequest( TJ::Task *job, Task *task ) - return; - } - foreach ( ResourceRequest *rr, task->requests().resourceRequests( true /*resolveTeam*/ ) ) { -+ if (!rr->resource()->calendar()) { -+ result = 1; // stops scheduling -+ logError(task, 0, i18n("No working hours defined for resource: %1",rr->resource()->name())); -+ continue; // may happen if no calendar is set, and no default calendar -+ } - TJ::Resource *tjr = addResource( rr->resource() ); - TJ::Allocation *a = new TJ::Allocation(); - a->setSelectionMode( TJ::Allocation::order ); --- -cgit v1.1 - diff --git a/user/calligra/poppler-73.patch b/user/calligra/poppler-73.patch deleted file mode 100644 index aa71e20b4..000000000 --- a/user/calligra/poppler-73.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2019-01-14 18:40:55.580000000 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-01-14 18:53:05.000000000 +0000 -@@ -402,7 +402,7 @@ - - QString str; - -- const char * p = s->getCString(); -+ const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -451,11 +451,11 @@ - *d->body << " y=\"" << y << "px\""; - - if (font && font->getFamily()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; -- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; -+ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); - } else if (font && font->getName()) { -- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; -- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); -+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; -+ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); - } - *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; - -@@ -488,7 +488,7 @@ - if (maskColors) { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - - for (int x = 0; x < width; x++) { -@@ -507,7 +507,7 @@ - } else { - for (int y = 0; y < height; y++) { - dest = (unsigned int *)(buffer + y * 4 * width); -- Guchar * pix = imgStr->getLine(); -+ unsigned char * pix = imgStr->getLine(); - colorMap->getRGBLine(pix, dest, width); - } - diff --git a/user/calligra/poppler-81.patch b/user/calligra/poppler-81.patch deleted file mode 100644 index 3211b7b8e..000000000 --- a/user/calligra/poppler-81.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt -index 8f462b7b597..945eebbe676 100644 ---- a/filters/karbon/pdf/CMakeLists.txt -+++ b/filters/karbon/pdf/CMakeLists.txt -@@ -1,4 +1,8 @@ - -+if(Poppler_VERSION VERSION_LESS "0.82.0") -+ add_definitions("-DHAVE_POPPLER_PRE_0_82") -+endif() -+ - set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 18c6fbb4a44..3ebb2281bf3 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -405,7 +405,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - const char * p = s->c_str(); - int len = s->getLength(); - CharCode code; -+#ifdef HAVE_POPPLER_PRE_0_82 - Unicode *u = nullptr; -+#else -+ const Unicode *u = nullptr; -+#endif - int uLen; - double dx, dy, originX, originY; - while (len > 0) { -@@ -474,9 +478,15 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - *d->body << "</text>" << endl; - } - --void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -+#ifdef HAVE_POPPLER_PRE_0_82 -+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ bool /*interpolate*/, int *maskColors, bool /*inlineImg*/) -+#else -+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool /*interpolate*/, int *maskColors, bool inlineImg) -+ bool /*interpolate*/, const int *maskColors, bool inlineImg) -+#endif - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 2c161ce50af..2b0ea41e30c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -61,9 +61,17 @@ public: - void drawString(GfxState * state, const GooString * s) override; - -+#ifdef HAVE_POPPLER_PRE_0_82 -+ // images -+ void drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ bool interpolate, int *maskColors, bool inlineImg) override; -+#else - // images - void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool interpolate, int *maskColors, bool inlineImg) override; -+ bool interpolate, const int *maskColors, bool inlineImg) override; -+#endif -+ - - // styles - void updateAll(GfxState *state) override; diff --git a/user/calligra/poppler-83.patch b/user/calligra/poppler-83.patch deleted file mode 100644 index e158ac4ff..000000000 --- a/user/calligra/poppler-83.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt.old 2020-01-13 11:57:23.529485941 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt 2020-01-13 12:08:05.610601265 +0000 -@@ -3,6 +3,10 @@ - add_definitions("-DHAVE_POPPLER_PRE_0_82") - endif() - -+if(Poppler_VERSION VERSION_LESS "0.83.0") -+ add_definitions("-DHAVE_POPPLER_PRE_0_83") -+endif() -+ - set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) - - add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) ---- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp.old 2020-01-13 10:34:30.622852616 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 2020-01-13 12:26:57.029441237 +0000 -@@ -60,19 +60,31 @@ - } - - // read config file -+#ifdef HAVE_POPPLER_PRE_0_83 - globalParams = new GlobalParams(); -+#else -+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams()); -+#endif - if (! globalParams) - return KoFilter::NotImplemented; - - GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); - PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); - if (! pdfDoc) { -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -+#else -+ globalParams.reset(); -+#endif - return KoFilter::StupidError; - } - - if (! pdfDoc->isOk()) { -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; -+#else -+ globalParams.reset(); -+#endif - delete pdfDoc; - return KoFilter::StupidError; - } -@@ -99,8 +111,12 @@ - - delete dev; - delete pdfDoc; -+#ifdef HAVE_POPPLER_PRE_0_83 - delete globalParams; - globalParams = 0; -+#else -+ globalParams.reset(); -+#endif - - return KoFilter::OK; - } ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2020-01-13 11:57:43.537339118 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2020-01-13 12:18:49.211663293 +0000 -@@ -172,7 +172,11 @@ - *d->body << "/>" << endl; - } - -+#ifdef HAVE_POPPLER_PRE_0_83 - QString SvgOutputDev::convertPath(GfxPath *path) -+#else -+QString SvgOutputDev::convertPath(const GfxPath *path) -+#endif - { - if (! path) - return QString(); -@@ -180,7 +184,12 @@ - QString output; - - for (int i = 0; i < path->getNumSubpaths(); ++i) { -- GfxSubpath * subpath = path->getSubpath(i); -+#ifdef HAVE_POPPLER_PRE_0_83 -+ GfxSubpath * subpath; -+#else -+ const GfxSubpath * subpath; -+#endif -+ subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); - int j = 1; ---- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h.old 2020-01-13 11:57:23.529485941 +0000 -+++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2020-01-13 12:11:30.918610131 +0000 -@@ -87,7 +87,11 @@ - /// Dumps content to svg file - void dumpContent(); - private: -+#ifdef HAVE_POPPLER_PRE_0_83 - QString convertPath(GfxPath *path); -+#else -+ QString convertPath(const GfxPath *path); -+#endif - QString convertMatrix(const QMatrix &matrix); - QString convertMatrix(const double * matrix); - QString printFill(); diff --git a/user/calligra/poppler.patch b/user/calligra/poppler.patch deleted file mode 100644 index 458a31514..000000000 --- a/user/calligra/poppler.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a615718222f8ad3bba4b88fad640382e517f7dd9 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Wed, 24 Oct 2018 08:28:00 +0200 -Subject: Fix build with poppler>=0.69 - -Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's - -Differential Revision: https://phabricator.kde.org/D16388 ---- - filters/karbon/pdf/PdfImport.cpp | 3 --- - filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- - filters/karbon/pdf/SvgOutputDev.h | 2 +- - 3 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index c3e96b0..48b08df 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - delete globalParams; - globalParams = 0; - -- // check for memory leaks -- Object::memCheck(stderr); -- - return KoFilter::OK; - } - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 931917a..7901317 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) - .arg(matrix.dx()) .arg(matrix.dy()); - } - --QString SvgOutputDev::convertMatrix(double * matrix) -+QString SvgOutputDev::convertMatrix(const double * matrix) - { - return QString("matrix(%1 %2 %3 %4 %5 %6)") - .arg(matrix[0]).arg(matrix[1]) -@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - - QString str; - -- char * p = s->getCString(); -+ const char * p = s->getCString(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - double x = state->getCurX(); - double y = state->getCurY(); - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - - QMatrix mirror; -@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - return; - } - -- double * ctm = state->getCTM(); -+ const double * ctm = state->getCTM(); - QMatrix m; - m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); - -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 85fe55d..2a44908 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -84,7 +84,7 @@ public: - private: - QString convertPath(GfxPath *path); - QString convertMatrix(const QMatrix &matrix); -- QString convertMatrix(double * matrix); -+ QString convertMatrix(const double * matrix); - QString printFill(); - QString printStroke(); - --- -cgit v0.11.2 - diff --git a/user/calligra/poppler2.patch b/user/calligra/poppler2.patch deleted file mode 100644 index 6f18c070f..000000000 --- a/user/calligra/poppler2.patch +++ /dev/null @@ -1,114 +0,0 @@ -From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Thu, 25 Oct 2018 23:04:39 +0200 -Subject: Mark the functions as override - -So when poppler API breaks (as it often does) it stops compiling and -someone has to fix it ---- - filters/karbon/pdf/SvgOutputDev.cpp | 13 +++-------- - filters/karbon/pdf/SvgOutputDev.h | 43 +++++++++++++++++-------------------- - 2 files changed, 23 insertions(+), 33 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 5692824..1d07f16 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke() - return stroke; - } - --void SvgOutputDev::drawString(GfxState * state, GooString * s) -+void SvgOutputDev::drawString(GfxState * state, const GooString * s) - { - int render = state->getRender(); - // check for invisible text -- this is used by Acrobat Capture -@@ -478,9 +478,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - *d->body << "</text>" << endl; - } - --void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, -+void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool /*inlineImg*/) -+ GBool /*interpolate*/, int *maskColors, GBool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -@@ -547,10 +547,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - delete imgStr; - } - --void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) --{ -- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); --} -- -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 2a44908..422027c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -46,38 +46,35 @@ public: - - GBool isOk(); - -- virtual GBool upsideDown(); -- virtual GBool useDrawChar(); -- virtual GBool interpretType3Chars(); -- virtual void startPage(int pageNum, GfxState *state, XRef *xref); -- virtual void endPage(); -+ GBool upsideDown() override; -+ GBool useDrawChar() override; -+ GBool interpretType3Chars() override; -+ void startPage(int pageNum, GfxState *state, XRef *xref) override; -+ void endPage() override; - - // path painting -- virtual void stroke(GfxState * state); -- virtual void fill(GfxState * state); -- virtual void eoFill(GfxState *state); -+ void stroke(GfxState * state) override; -+ void fill(GfxState * state) override; -+ void eoFill(GfxState *state) override; - - // text -- virtual void drawString(GfxState * state, GooString * s); -+ void drawString(GfxState * state, const GooString * s) override; - - // images -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- int *maskColors, GBool inlineImg); -- virtual void drawImage(GfxState *state, Object *ref, Stream *str, -- int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg); -+ GBool interpolate, int *maskColors, GBool inlineImg) override; - - // styles -- virtual void updateAll(GfxState *state); -- virtual void updateFillColor(GfxState *state); -- virtual void updateStrokeColor(GfxState *state); -- virtual void updateFillOpacity(GfxState *state); -- virtual void updateStrokeOpacity(GfxState *state); -- virtual void updateLineJoin(GfxState *state); -- virtual void updateLineCap(GfxState *state); -- virtual void updateMiterLimit(GfxState *state); -- virtual void updateLineWidth(GfxState *state); -+ void updateAll(GfxState *state) override; -+ void updateFillColor(GfxState *state) override; -+ void updateStrokeColor(GfxState *state) override; -+ void updateFillOpacity(GfxState *state) override; -+ void updateStrokeOpacity(GfxState *state) override; -+ void updateLineJoin(GfxState *state) override; -+ void updateLineCap(GfxState *state) override; -+ void updateMiterLimit(GfxState *state) override; -+ void updateLineWidth(GfxState *state) override; - - /// Dumps content to svg file - void dumpContent(); --- -cgit v1.1 - diff --git a/user/calligra/poppler3.patch b/user/calligra/poppler3.patch deleted file mode 100644 index 54702b515..000000000 --- a/user/calligra/poppler3.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Thu, 25 Oct 2018 23:06:34 +0200 -Subject: GBool -> bool - -It was just a typedef in poppler and it'll die in next versions ---- - filters/karbon/pdf/SvgOutputDev.cpp | 12 ++++++------ - filters/karbon/pdf/SvgOutputDev.h | 10 +++++----- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 1d07f16..870a940 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -52,7 +52,7 @@ public: - QString defsData; - QTextStream * defs; - QTextStream * body; -- GBool state; -+ bool state; - QSizeF pageSize; - QPen pen; - QBrush brush; -@@ -75,22 +75,22 @@ SvgOutputDev::~SvgOutputDev() - delete d; - } - --GBool SvgOutputDev::isOk() -+bool SvgOutputDev::isOk() - { - return d->state; - } - --GBool SvgOutputDev::upsideDown() -+bool SvgOutputDev::upsideDown() - { - return gTrue; - } - --GBool SvgOutputDev::useDrawChar() -+bool SvgOutputDev::useDrawChar() - { - return gFalse; - } - --GBool SvgOutputDev::interpretType3Chars() -+bool SvgOutputDev::interpretType3Chars() - { - return gFalse; - } -@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) - - void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool /*interpolate*/, int *maskColors, GBool inlineImg) -+ bool /*interpolate*/, int *maskColors, bool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - imgStr->reset(); -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 422027c..df2805c 100644 ---- a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -44,11 +44,11 @@ public: - explicit SvgOutputDev(const QString &fileName); - virtual ~SvgOutputDev(); - -- GBool isOk(); -+ bool isOk(); - -- GBool upsideDown() override; -- GBool useDrawChar() override; -- GBool interpretType3Chars() override; -+ bool upsideDown() override; -+ bool useDrawChar() override; -+ bool interpretType3Chars() override; - void startPage(int pageNum, GfxState *state, XRef *xref) override; - void endPage() override; - -@@ -63,7 +63,7 @@ public: - // images - void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- GBool interpolate, int *maskColors, GBool inlineImg) override; -+ bool interpolate, int *maskColors, bool inlineImg) override; - - // styles - void updateAll(GfxState *state) override; --- -cgit v1.1 - diff --git a/user/calligra/poppler4.patch b/user/calligra/poppler4.patch deleted file mode 100644 index 9a13bcdec..000000000 --- a/user/calligra/poppler4.patch +++ /dev/null @@ -1,76 +0,0 @@ -From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Fri, 2 Nov 2018 21:23:13 +0100 -Subject: Fix build with poppler 0.71 - -Port away from removed API - -Differential Revision: https://phabricator.kde.org/D16607 ---- - filters/karbon/pdf/PdfImport.cpp | 6 +++--- - filters/karbon/pdf/SvgOutputDev.cpp | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index 48b08df..e910dae 100644 ---- a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); - if (dev->isOk()) { - int rotate = 0; -- GBool useMediaBox = gTrue; -- GBool crop = gFalse; -- GBool printing = gFalse; -+ bool useMediaBox = true; -+ bool crop = false; -+ bool printing = false; - pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); - dev->dumpContent(); - } -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 9063e69..80f01a5 100644 ---- a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -39,7 +39,7 @@ class SvgOutputDev::Private - { - public: - Private(const QString &fname) -- : svgFile(fname), defs(0), body(0), state(gTrue) -+ : svgFile(fname), defs(0), body(0), state(true) - , brush(Qt::SolidPattern) {} - - ~Private() { -@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) - : d(new Private(fileName)) - { - if (! d->svgFile.open(QIODevice::WriteOnly)) { -- d->state = gFalse; -+ d->state = false; - return; - } - -@@ -82,17 +82,17 @@ bool SvgOutputDev::isOk() - - bool SvgOutputDev::upsideDown() - { -- return gTrue; -+ return true; - } - - bool SvgOutputDev::useDrawChar() - { -- return gFalse; -+ return false; - } - - bool SvgOutputDev::interpretType3Chars() - { -- return gFalse; -+ return false; - } - - void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) --- -cgit v1.1 - diff --git a/user/calligra/qt5.patch b/user/calligra/qt5.patch deleted file mode 100644 index a40d92127..000000000 --- a/user/calligra/qt5.patch +++ /dev/null @@ -1,293 +0,0 @@ -From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 18 Mar 2018 11:56:57 +0100 -Subject: Fix build with Qt 5.11 (missing headers) - -Reviewers: #calligra:_3.0, anthonyfieroni, danders - -Reviewed By: #calligra:_3.0, anthonyfieroni, danders - -Subscribers: anthonyfieroni, danders - -Tags: #calligra:_3.0 - -Differential Revision: https://phabricator.kde.org/D11454 ---- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plan/src/kptview.h | 1 + - plan/src/kptviewlist.cpp | 1 + - plan/src/libs/ui/kptaccountseditor.cpp | 1 + - plan/src/libs/ui/kptdocumentspanel.h | 1 + - plan/src/libs/ui/kptitemviewsettup.cpp | 2 +- - plan/src/libs/ui/kpttaskeditor.cpp | 1 + - plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + - plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + - plugins/formulashape/FormulaToolWidget.cpp | 1 + - sheets/dialogs/LayoutDialog.cpp | 1 + - words/part/dialogs/KWAnchoringProperties.cpp | 1 + - words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ - 15 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf6..cdca006 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include <QButtonGroup> - #include <QTextCodec> - #include <QTextStream> - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555c..a3816f9 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include <KoUnit.h> - -+#include <QButtonGroup> -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plan/src/kptview.h b/plan/src/kptview.h -index 44d1193..a98e553 100644 ---- a/plan/src/kptview.h -+++ b/plan/src/kptview.h -@@ -28,6 +28,7 @@ - #include "kptcontext.h" - #include "kptviewbase.h" - -+#include <QActionGroup> - #include <QDockWidget> - #include <QMap> - -diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp -index f34e702..0e6db7b 100644 ---- a/plan/src/kptviewlist.cpp -+++ b/plan/src/kptviewlist.cpp -@@ -25,6 +25,7 @@ - #include <QStyle> - #include <QBrush> - #include <QContextMenuEvent> -+#include <QHeaderView> - #include <QMenu> - - #include <kmessagebox.h> -diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp -index 7991faf..54e3a87 100644 ---- a/plan/src/libs/ui/kptaccountseditor.cpp -+++ b/plan/src/libs/ui/kptaccountseditor.cpp -@@ -40,6 +40,7 @@ - #include <QContextMenuEvent> - #include <QMenu> - #include <QAction> -+#include <QHeaderView> - - #include <KLocalizedString> - #include <kactioncollection.h> -diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h -index 00ea3af..491cb1e 100644 ---- a/plan/src/libs/ui/kptdocumentspanel.h -+++ b/plan/src/libs/ui/kptdocumentspanel.h -@@ -26,6 +26,7 @@ - - #include "kptdocuments.h" - -+#include <QModelIndexList> - #include <QWidget> - #include <kundo2qstack.h> - -diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp -index d1c3b1f..7c97a07 100644 ---- a/plan/src/libs/ui/kptitemviewsettup.cpp -+++ b/plan/src/libs/ui/kptitemviewsettup.cpp -@@ -25,9 +25,9 @@ - - #include "KoPageLayoutWidget.h" - -+#include <QHeaderView> - #include <QPushButton> - -- - namespace KPlato - { - -diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp -index 2154611..91db5ac 100644 ---- a/plan/src/libs/ui/kpttaskeditor.cpp -+++ b/plan/src/libs/ui/kpttaskeditor.cpp -@@ -45,6 +45,7 @@ - #include <QVBoxLayout> - #include <QDragMoveEvent> - #include <QAction> -+#include <QHeaderView> - #include <QMenu> - - #include <kactionmenu.h> -diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -index 344ebc2..9146f06 100644 ---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -@@ -31,6 +31,7 @@ - #include <KFile> - - #include <QAction> -+#include <QHeaderView> - #include <QTreeView> - #include <QStandardItemModel> - #include <QModelIndex> -diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -index c9e17b7..b67e984 100644 ---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp -+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include <KoUnit.h> - -+#include <QButtonGroup> -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136..d2a772e 100644 ---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include <QAbstractItemModel> -+#include <QAction> - - // Calligra - #include <KoIcon.h> -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed10919..8f52177 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include <QWidgetAction> - #include <QTableWidget> - #include <QAction> -+#include <QHeaderView> - #include <QMenu> - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832..7d7db53 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include <math.h> - - #include <QIntValidator> -+#include <QButtonGroup> - #include <QCheckBox> - #include <QFrame> - #include <QLabel> -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208c..bfddb3a 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> - #include <QComboBox> - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a..7e8b2d5 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { --- -cgit v1.1 - -From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 3 Apr 2018 00:31:19 +0200 -Subject: Fix compilation with Qt 5.11 (missing include) - ---- - stage/part/KPrPresentationTool.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index ae743da..3007f91 100644 ---- a/stage/part/KPrPresentationTool.cpp -+++ b/stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include <QDesktopServices> - #include <QUrl> - #include <QDBusConnection> -+#include <QFrame> - - #include <KoShape.h> - #include <KoShapeManager.h> --- -cgit v1.1 - -From acd0ef39e3c945d066d2902de0e19fa2d020c7f8 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 23 Jul 2019 12:20:03 +0200 -Subject: Fix compilation with Qt 5.13 (missing include) - ---- - plan/src/workpackage/view.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plan/src/workpackage/view.h b/plan/src/workpackage/view.h -index b10547e..c5231e59 100644 ---- a/plan/src/workpackage/view.h -+++ b/plan/src/workpackage/view.h -@@ -24,6 +24,7 @@ - #include <KoView.h> - - #include <QStackedWidget> -+#include <QMap> - - class QPrinter; - class QPrintDialog; --- -cgit v1.1 - -From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 23 Jul 2019 13:02:34 +0200 -Subject: Fix compilation with Qt 5.13 (missing include) - ---- - sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp -index b10b230..0c5eeb6 100644 ---- a/sheets/plugins/calendar/CalendarToolWidget.cpp -+++ b/sheets/plugins/calendar/CalendarToolWidget.cpp -@@ -30,6 +30,7 @@ - #include <kdatepicker.h> - - #include <QPushButton> -+#include <QDate> - - namespace Calligra - { --- -cgit v1.1 - diff --git a/user/calligra/ridiculous-typo.patch b/user/calligra/ridiculous-typo.patch new file mode 100644 index 000000000..9d81e899e --- /dev/null +++ b/user/calligra/ridiculous-typo.patch @@ -0,0 +1,11 @@ +--- calligra-3.2.1/braindump/src/layouts/ColumnLayout.cpp.old 2020-05-14 06:51:30.000000000 +0000 ++++ calligra-3.2.1/braindump/src/layouts/ColumnLayout.cpp 2020-07-30 00:37:08.634435315 +0000 +@@ -94,7 +94,7 @@ + qDebug() << _shape << _shape->absolutePosition(KoFlake::TopLeftCorner).y() << " " << _shape->position().y(); + } + qDebug() << "</moh>"; +- std:sort(m_shapes.begin(), m_shapes.end(), shapeIsLessThan); ++ std::sort(m_shapes.begin(), m_shapes.end(), shapeIsLessThan); + // Update position + qreal y = 0; + qDebug() << "<Updating>"; diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index 2ffb273ab..a2dfbd753 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="07351d8b4b72653394a337bc3ae5c8f8c669dd8cd66f4cf9d41bbdd25b47a8b3666f79580e319ef56c878ab626ce959d825b4a34243c5f639de96674a1bc111d cantor-20.04.3.tar.xz" +sha512sums="7f3193753a3368940cad14b51cb920f59a2c5550ef2ae527869c1011b238533e15b0d89b47c29b383d623709e7576457d9bc803a63124c641e58871115e72d6c cantor-20.08.1.tar.xz" diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD index a04ef7f61..d47dda0d0 100644 --- a/user/catfish/APKBUILD +++ b/user/catfish/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=catfish pkgver=1.4.13 pkgrel=0 diff --git a/user/cervisia/APKBUILD b/user/cervisia/APKBUILD index 8229df3f3..60cd9b2bf 100644 --- a/user/cervisia/APKBUILD +++ b/user/cervisia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cervisia -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="CVS Frontend" url="https://kde.org/applications/development/org.kde.cervisia" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cdbd6d9c212e92ca7f925c23c20442fa72cb07f666a5f2895a1cb631ff9bc87024bdf2bdbb8b2c638104f688cca585b64eaec5c8ed20ea153fa1184a2f5193c2 cervisia-20.04.3.tar.xz" +sha512sums="71fb3b7c691a5963df0c5e784dd49d6abddb4562aaee99725347687caba7ba1888a2b95822c712444d56b224783c755861b488ffbdca286fcffd76c35a3208cc cervisia-20.08.1.tar.xz" diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD index e267926a7..f5d4f3619 100644 --- a/user/chrony/APKBUILD +++ b/user/chrony/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=chrony -pkgver=3.5 -pkgrel=2 +pkgver=3.5.1 +pkgrel=0 pkgdesc="NTP client and server programs" url="https://chrony.tuxfamily.org" pkgusers="$pkgname" @@ -85,7 +85,7 @@ package() { chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/chrony } -sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c chrony-3.5.tar.gz +sha512sums="489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984 chrony-3.5.1.tar.gz 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e fix-tests.patch b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247 max_resolve_interval.patch 1ebb72341b4421060a43d6db164d743de9144f1c23370e052f0db92a17e5e34f24ac98baddeb5dbfef27f67479142d448c4401d927394e55024760730a27e8de chronyd.confd diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD index 798bb8a1e..17b83ab41 100644 --- a/user/cifs-utils/APKBUILD +++ b/user/cifs-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=cifs-utils -pkgver=6.10 +pkgver=6.11 pkgrel=0 pkgdesc="CIFS filesystem user-space tools" url="https://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -18,6 +18,10 @@ source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2 xattr_size_max.patch " +# secfixes: +# 6.11-r0: +# - CVE-2020-14342 + prepare() { default_prepare autoreconf -vif @@ -48,7 +52,7 @@ package() { chmod u+s "$pkgdir"/sbin/mount.cifs } -sha512sums="e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc cifs-utils-6.10.tar.bz2 +sha512sums="064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e cifs-utils-6.11.tar.bz2 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch f3acb4f7873628d67c7dfb2378135c302fe382e314277829ea5569710bac0ddb43684aa6d143327d735aec641997084eaa567823b534138ed884bd74044b652a respect-destdir.patch 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch" diff --git a/user/ckbcomp/APKBUILD b/user/ckbcomp/APKBUILD index 8f4de4ff3..8f025d141 100644 --- a/user/ckbcomp/APKBUILD +++ b/user/ckbcomp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ckbcomp -pkgver=1.195 +pkgver=1.196 pkgrel=0 pkgdesc="XKB keyboard layout translation utility" url="https://salsa.debian.org/installer-team/console-setup" @@ -12,11 +12,11 @@ depends="perl" makedepends="" subpackages="$pkgname-doc" source="http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz" -builddir="$srcdir/console-setup" +builddir="$srcdir"/console-setup-$pkgver package() { install -Dm755 -t "$pkgdir"/usr/bin Keyboard/ckbcomp install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/ckbcomp.1 } -sha512sums="f9ee8df45cfb78dea12b1ba3020e32f245dd940bc1d22801849f673f4448853c0ebadb6944a92b462e3e56c59ee13fd6d2130c260a1a406e1bb1c72e9902c04d console-setup_1.195.tar.xz" +sha512sums="f100cdf2226cdad94c595ca269e65155b52ec23996f2fee8d4916f7a414c7a6f70ae51e9ba2d3c7ae4a93a8830ee2e3eb2f1d09c636f49005d54d52ec674e938 console-setup_1.196.tar.xz" diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD index 72256b3a5..1554a00da 100644 --- a/user/claws-mail/APKBUILD +++ b/user/claws-mail/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=claws-mail -pkgver=3.17.6 +pkgver=3.17.8 pkgrel=0 pkgdesc="User-friendly, lightweight, and fast email client" url="https://www.claws-mail.org/" @@ -15,6 +15,10 @@ makedepends="compface-dev curl-dev dbus-glib-dev enchant-dev gnutls-dev subpackages="$pkgname-doc $pkgname-lang" source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz" +# secfixes: +# 3.17.8-r0: +# - CVE-2020-16094 + build() { ./configure \ --build=$CBUILD \ @@ -36,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0 claws-mail-3.17.6.tar.xz" +sha512sums="dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7 claws-mail-3.17.8.tar.xz" diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD index 328305587..906f45751 100644 --- a/user/cloc/APKBUILD +++ b/user/cloc/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=cloc -pkgver=1.86 +pkgver=1.88 pkgrel=0 pkgdesc="Perl utility for counting lines of code in various languages" url="https://github.com/AlDanial/cloc" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" -C Unix install } -sha512sums="dc88f7499ab371eef5ae39352e10539a507bd77fa7b83d562e3b9774e053872ea56529ea937db9fafd50971900e03d95236450348d8981fa0123f936e893975c cloc-1.86.tar.gz" +sha512sums="323f5ce4876ffe85ff3beb342a0cacb9514df23a6410c0912f048540719c9a038194620a81087377c9894dae2825b494ef7069ce4310f96f6e8cbe488b243a16 cloc-1.88.tar.gz" diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD index ff3469b1e..671c84733 100644 --- a/user/clutter/APKBUILD +++ b/user/clutter/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=clutter pkgver=1.26.4 pkgrel=0 diff --git a/user/cmus/APKBUILD b/user/cmus/APKBUILD index 936cfbff2..a6f7ac075 100644 --- a/user/cmus/APKBUILD +++ b/user/cmus/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=cmus pkgver=2.8.0 @@ -61,4 +61,4 @@ package() { } sha512sums="cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc cmus-2.8.0.tar.gz -06a91da06cc916aa475467aa90bd7170c7288b68459706c3416700e79ba8707fd7a85bded0c0d5d51d805c15f59ff395670f11318ca5a419d17ab1070a48775f ppc-libatomic.patch" +1993e5c891d1f88105373a448cf3841cdded4aeef5268ea0591f5940228f9eb5a638cd16e37d5127dcdf76bfd15563c632f780834ee3c0748d2e5015bc292285 ppc-libatomic.patch" diff --git a/user/cmus/ppc-libatomic.patch b/user/cmus/ppc-libatomic.patch index 7107fb5db..73cdf1457 100644 --- a/user/cmus/ppc-libatomic.patch +++ b/user/cmus/ppc-libatomic.patch @@ -1,5 +1,5 @@ From 9a56c86a663e53195a32b7908cf2bd4349bad5c3 Mon Sep 17 00:00:00 2001 -From: Luis Ressel <aranea@aixah.de> +From: Mira Ressel <aranea@aixah.de> Date: Fri, 29 Mar 2019 17:16:16 +0100 Subject: [PATCH] Link against libatomic on ppc32. DO NOT UPSTREAM. diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index 5cb9f34ef..98330463e 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=cogl pkgver=1.22.8 pkgrel=0 diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 093054850..a93426d1c 100644 --- a/user/compton-conf/APKBUILD +++ b/user/compton-conf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=compton-conf pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD index 82b9cc638..e888fc31e 100644 --- a/user/compton/APKBUILD +++ b/user/compton/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=compton pkgver=4 pkgrel=0 diff --git a/user/confuse/APKBUILD b/user/confuse/APKBUILD index efc38ab5c..fc31d73d1 100644 --- a/user/confuse/APKBUILD +++ b/user/confuse/APKBUILD @@ -1,10 +1,10 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=confuse -pkgver=3.2.2 +pkgver=3.3 pkgrel=0 pkgdesc="Small configuration file parser library for C" -url=" " +url="https://github.com/martinh/libconfuse" arch="all" license="ISC" depends="" @@ -12,6 +12,10 @@ makedepends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://github.com/martinh/libconfuse/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" +# secfixes: +# 3.3-r0: +# - CVE-2018-19760 + build() { ./configure \ --build=$CBUILD \ @@ -34,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9 confuse-3.2.2.tar.xz" +sha512sums="93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0 confuse-3.3.tar.xz" diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index efb5baccc..346878925 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters -pkgver=1.25.6 +pkgver=1.25.13 pkgrel=0 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" @@ -59,4 +59,4 @@ libs() { mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="14c958bcb98e4addde84c3c0d27e7056f1b4790b8502f5fb0c23c1e2cf80a6fd22fa39816a2f2e6c0501272a57cfcc84ce939a8614563e795e5d2ae035972f33 cups-filters-1.25.6.tar.xz" +sha512sums="4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611 cups-filters-1.25.13.tar.xz" diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD index ef8e9f89c..987ef76a3 100644 --- a/user/cups/APKBUILD +++ b/user/cups/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=cups -pkgver=2.2.12 +pkgver=2.2.13 pkgrel=0 pkgdesc="The CUPS Printing System" url="https://www.cups.org/" @@ -122,7 +122,7 @@ _mv() { done } -sha512sums="b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6 cups-2.2.12-source.tar.gz +sha512sums="dc323bdcec86f11ec98e4881c540aa8be24f82d289c8a4f866e42bfd6f107b686346f1418b6347b3794dabac3c23d6e604e212aa8e169879c58b746fb1bc490d cups-2.2.13-source.tar.gz cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate 2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd 7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD index 98f8bd549..ca2e18186 100644 --- a/user/dconf/APKBUILD +++ b/user/dconf/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=dconf -pkgver=0.36.0 +pkgver=0.38.0 pkgrel=0 pkgdesc="Configuration management for the Gnome desktop environment" url="https://gnome.org" @@ -30,4 +30,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d dconf-0.36.0.tar.xz" +sha512sums="795f723f34a8406a06323870f8425ca579bbc751c1661db02e170532f6a2653aee749cbb84ad4d7e5a84a07c0caf2662a868b34b6f0d383361c0ff1ad9aed355 dconf-0.38.0.tar.xz" diff --git a/user/dev86/APKBUILD b/user/dev86/APKBUILD index a17deec0f..7a5170e7f 100644 --- a/user/dev86/APKBUILD +++ b/user/dev86/APKBUILD @@ -4,7 +4,7 @@ pkgver=0.16.21 pkgrel=0 pkgdesc="Standalone 8086 assembler and linker" url="https://github.com/lkundrak/dev86/" -arch="pmmx x86 x86_64" +arch="all" options="!check" # Just compiles stuff with bcc which we don't build license="GPL-2.0 AND LGPL-2.0" depends="" diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD index 0bce275b4..15654cc28 100644 --- a/user/dina/APKBUILD +++ b/user/dina/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=dina pkgver=2.93 pkgrel=0 diff --git a/user/dmidecode/APKBUILD b/user/dmidecode/APKBUILD index 0d6ff8ac4..0368716b2 100644 --- a/user/dmidecode/APKBUILD +++ b/user/dmidecode/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=dmidecode -pkgver=3.2 +pkgver=3.3 pkgrel=0 pkgdesc="Utility for gathering information about system hardware" url="http://www.nongnu.org/dmidecode" @@ -20,4 +20,4 @@ package() { make prefix=/usr DESTDIR="${pkgdir}" install } -sha512sums="b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18 dmidecode-3.2.tar.xz" +sha512sums="dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22 dmidecode-3.3.tar.xz" diff --git a/user/doas/APKBUILD b/user/doas/APKBUILD new file mode 100644 index 000000000..99b3ac5c0 --- /dev/null +++ b/user/doas/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=doas +pkgver=6.6.1 +pkgrel=0 +pkgdesc="OpenBSD's escalation tool" +url="https://github.com/Duncaen/OpenDoas" +arch="all" +options="suid" +license="ISC" +depends="" +makedepends="bison" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz" +builddir="$srcdir/OpenDoas-$pkgver" + +build() { + ./configure \ + --prefix=/usr \ + --without-pam \ + --with-timestamp + make +} + +check() { + # doas -v returns 1 + ./doas -v || test $? = 1 +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678 doas-6.6.1.tar.gz" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index ada33e4a5..5da000be7 100644 --- a/user/dolphin/APKBUILD +++ b/user/dolphin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dolphin -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc4ad5ff645387d7a058cff42db00d55db8b0cb7793cdc3adbbaff2e8465c469a5ad6040625bfde564e18c25c16ae3962d6eb7ac9618e0ae8783a2fe030fc5ca dolphin-20.04.3.tar.xz" +sha512sums="fcc0797691c5b365cf0d7ad7f227feb88e3047bb8aa9547c71baf2e765f07abba4588eee39bde1b0b4f77a7b5297916144ef9a323eb604eba7cd2ae0b4b3a71e dolphin-20.08.1.tar.xz" diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index 5af5254e1..6f9a8d145 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -5,10 +5,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=dovecot -pkgver=2.3.10.1 +pkgver=2.3.14 _pkgvermajor=2.3 pkgrel=0 -_pigeonholever=0.5.9 +_pigeonholever=0.5.14 _pigeonholevermajor=${_pigeonholever%.*} pkgdesc="IMAP and POP3 server" url="https://www.dovecot.org/" @@ -16,58 +16,40 @@ arch="all" options="libtool" license="LGPL-2.0+" depends="openssl" +makedepends="autoconf automake libtool bzip2-dev clucene-dev expat-dev krb5-dev + libcap-dev libsodium-dev linux-headers linux-pam-dev mariadb-dev + openldap-dev openssl-dev postgresql-dev sqlite-dev zlib-dev" pkgusers="dovecot dovenull" pkggroups="dovecot dovenull" -makedepends=" - autoconf - automake - bzip2-dev - clucene-dev - expat-dev - krb5-dev - libcap-dev - openssl-dev - libtool - linux-headers - linux-pam-dev - mariadb-dev - openldap-dev - postgresql-dev - sqlite-dev - zlib-dev - libsodium-dev - " install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" -subpackages=" - $pkgname-doc - $pkgname-dev - $pkgname-openrc - $pkgname-lmtpd - $pkgname-pop3d - $pkgname-submissiond +subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc $pkgname-lmtpd + $pkgname-pop3d $pkgname-submissiond $pkgname-pigeonhole-plugin-ldap:_sieve_ldap $pkgname-pigeonhole-plugin:_sieve - $pkgname-sql - $pkgname-pgsql - $pkgname-mysql - $pkgname-sqlite - $pkgname-gssapi - $pkgname-ldap - $pkgname-fts-solr:_fts_solr - $pkgname-fts-lucene:_fts_lucene - " + $pkgname-sql $pkgname-pgsql $pkgname-mysql $pkgname-sqlite + $pkgname-gssapi $pkgname-ldap $pkgname-fts-solr:_fts_solr + $pkgname-fts-lucene:_fts_lucene" source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz skip-iconv-check.patch split-protocols.patch default-config.patch ssl-paths.patch + test-file-cache-enomem.patch + time64.patch dovecot.logrotate dovecot.initd " _builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever" # secfixes: +# 2.3.13-r0: +# - CVE-2020-24386 +# - CVE-2020-25275 +# 2.3.11.3-r0: +# - CVE-2020-12100 +# - CVE-2020-12673 +# - CVE-2020-12674 # 2.3.10.1-r0: # - CVE-2020-10957 # - CVE-2020-10958 @@ -276,11 +258,13 @@ _submv() { done } -sha512sums="5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06 dovecot-2.3.10.1.tar.gz -1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8 dovecot-2.3-pigeonhole-0.5.9.tar.gz +sha512sums="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103 dovecot-2.3.14.tar.gz +c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc dovecot-2.3-pigeonhole-0.5.14.tar.gz fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch 0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07 default-config.patch 5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f ssl-paths.patch +277d0b55583908cd6c063fb190eb3d2a362a3a33306e35a069a0bca28968f11627c455887d82d01884313b7f7e18530c056bd7a4cda0a1f9c4be7065cd033aa9 test-file-cache-enomem.patch +28e0e3efcb1dd06cd971f1a8caa88989a165dbf14fdebf26ec1ab083020c6831231fec08c2a9d363e6af74003deeeb27122d044eccd02cf7945b464758e04622 time64.patch 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0 dovecot.logrotate d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70 dovecot.initd" diff --git a/user/dovecot/test-file-cache-enomem.patch b/user/dovecot/test-file-cache-enomem.patch new file mode 100644 index 000000000..536b857de --- /dev/null +++ b/user/dovecot/test-file-cache-enomem.patch @@ -0,0 +1,20 @@ +--- a/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000 ++++ b/src/lib/test-file-cache.c 2021-01-05 14:10:50.160000000 +0000 +@@ -263,7 +263,7 @@ + }; + const char *errstr = + t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: " +- "Cannot allocate memory", page_size); ++ "Out of memory", page_size); + test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0); + test_expect_error_string(errstr); + test_assert(file_cache_set_size(cache, 1024) == -1); +@@ -271,7 +271,7 @@ + + /* same for mremap */ + errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: " +- "Cannot allocate memory", page_size*2); ++ "Out of memory", page_size*2); + test_assert(file_cache_set_size(cache, 1) == 0); + test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0); + test_expect_error_string(errstr); diff --git a/user/dovecot/time64.patch b/user/dovecot/time64.patch new file mode 100644 index 000000000..4cd5c46e1 --- /dev/null +++ b/user/dovecot/time64.patch @@ -0,0 +1,20 @@ +--- dovecot-2.3.14.orig/src/lib-oauth2/oauth2-jwt.c 2021-03-13 23:56:53.250000000 +0000 ++++ dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c 2021-03-13 23:57:23.640000000 +0000 +@@ -31,7 +31,7 @@ + } + + static int +-get_time_field(const struct json_tree *tree, const char *key, long *value_r) ++get_time_field(const struct json_tree *tree, const char *key, long long *value_r) + { + const char *value = get_field(tree, key); + int tz_offset ATTR_UNUSED; +@@ -313,7 +313,7 @@ + int ret; + long t0 = time(NULL); + /* default IAT and NBF to now */ +- long iat, nbf, exp; ++ long long iat, nbf, exp; + int tz_offset ATTR_UNUSED; + + if (sub == NULL) { diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD index 9255fda64..69a89354f 100644 --- a/user/doxygen/APKBUILD +++ b/user/doxygen/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=doxygen -pkgver=1.8.18 +pkgver=1.8.20 _pkgver=${pkgver%.*.*}_${pkgver#*.} _pkgver=${_pkgver%.*}_${pkgver#*.*.} pkgrel=0 @@ -37,5 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32b0d9e5fbb44e947eb771f323ce4aa76f8b31e940f47dcec2af6c5e98a20b58cb4627eff6e70faac6b8cb2ad67b88b0280496310a5b784466196c22e1174233 Release_1_8_18.tar.gz +sha512sums="25509cec8904b10431cf3d29f6e6bbdad49fbf3a763606b30c92c111f294ac0311aa13d53007d71ff1f55fcae6903e2ce8f80d1a6b4832fa43f6a9166184e005 Release_1_8_20.tar.gz 92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50 time64.patch" diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD index 744b206c5..025a3b0ca 100644 --- a/user/dracut/APKBUILD +++ b/user/dracut/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dracut pkgver=050 -pkgrel=1 +pkgrel=3 pkgdesc="Event-driven initramfs infrastructure" url="https://dracut.wiki.kernel.org/" arch="all" options="!check" # Test suite is for kernel developers only, requires ext3 rootfs license="GPL-2.0+" -depends="bash libarchive-tools musl-utils xz" +depends="bash gzip libarchive-tools musl-utils xz" makedepends="fts-dev kmod-dev" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch $pkgname-crypt::noarch $pkgname-lvm::noarch" diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 43548942e..7cb21edff 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dragonplayer -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1e802291d58fed6e9f0a51dfea8157e897b36ddab4e61a7af4d9350116f0d8ae871c15289f3bb0ee0c63401e830f8dc256f7709fa9d309b06f4f0f01afc8b59b dragon-20.04.3.tar.xz" +sha512sums="1ec08a57d625cb85c9decfe69e029dae0815fe52e624c2a31c354ecb5789c3b34942b5d451c9905bb61d278d1f30c99fa07c2b47c95628cfff996b4f420cabc3 dragon-20.08.1.tar.xz" diff --git a/user/drkonqi/APKBUILD b/user/drkonqi/APKBUILD index 3356bc9ce..5fb4b6d3e 100644 --- a/user/drkonqi/APKBUILD +++ b/user/drkonqi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=drkonqi -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Crash diagnostic system for KDE" url="https://www.kde.org/" @@ -15,7 +15,7 @@ makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev kwallet-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev qt5-qtbase-dev qt5-qtx11extras-dev solid-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/drkonqi-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/drkonqi-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5d9c7dfbe4687d88ffe43e6676d6dbd04c97816acb4819604ff6ea5a1f9b987834b2831e75281f8fbe6837a42c410a6a595d61e6f2a4b8a9bd6c23b2102ee544 drkonqi-5.18.4.1.tar.xz" +sha512sums="b4862297e969f501f526880560acbd02026b64a0bec2f6e3b2b30f4bfe5ff2abd1798e3bda920bd61adbb6c9a3455e0c4f304f3f37bcafed3f3d8e6de1bc67a9 drkonqi-5.18.5.tar.xz" diff --git a/user/eigen/APKBUILD b/user/eigen/APKBUILD index 125cf77fe..c44ed3011 100644 --- a/user/eigen/APKBUILD +++ b/user/eigen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bradley J Chambers <brad.chambers@gmail.com> # Maintainer: pkgname=eigen -pkgver=3.3.7 +pkgver=3.3.8 pkgrel=0 pkgdesc="Eigen is a C++ template library for linear algebra" url="http://eigen.tuxfamily.org/index.php?title=Main_Page" @@ -11,12 +11,9 @@ license="MPL-2.0" depends="" makedepends="" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::http://bitbucket.org/eigen/$pkgname/get/$pkgver.tar.gz" - -prepare() { - mv "$srcdir"/eigen-eigen-* "$builddir" # directory name contains hash - default_prepare -} +source="https://gitlab.com/libeigen/eigen/-/archive/$pkgver/eigen-$pkgver.tar.gz + assert-compile-error.patch + " package() { mkdir -p "$pkgdir"/usr/include/eigen3 @@ -24,4 +21,5 @@ package() { cp -r "$builddir"/unsupported "$pkgdir"/usr/include/eigen3 } -sha512sums="34cf600914cce719d61511577ef9cd26fbdcb7a6fad1d0ab8396f98b887fac6a5577d3967e84a8f56225cc50de38f3b91f34f447d14312028383e32b34ea1972 eigen-3.3.7.tar.gz" +sha512sums="5b4b5985b0294e07b3ed1155720cbbfea322fe9ccad0fc8b0a10060b136a9169a15d5b9cb7a434470cadd45dff0a43049edc20d2e1070005481a120212edc355 eigen-3.3.8.tar.gz +26cdf877d4d3378b322cc08c0430b0628a07279a030732661ba4acb85d6c835956c99474fc4587a170d11437ca6715e56d8eaabb625a1eba7c46ce4d6e4d66f9 assert-compile-error.patch" diff --git a/user/eigen/assert-compile-error.patch b/user/eigen/assert-compile-error.patch new file mode 100644 index 000000000..556474e8b --- /dev/null +++ b/user/eigen/assert-compile-error.patch @@ -0,0 +1,64 @@ +From ef3cc72cb65e2d500459c178c63e349bacfa834f Mon Sep 17 00:00:00 2001 +From: Luke Peterson <hazelnusse@gmail.com> +Date: Thu, 8 Oct 2020 12:16:53 -0700 +Subject: [PATCH] Remove error counting in OpenMP parallelize_gemm + +This resolves a compilation error associated with +Eigen::eigen_assert_exception. It also eliminates the counting of +exceptions that may occur in the OpenMP parallel section. If an +unhandled exception occurs in this section, the behavior is non-conforming +according to the OpenMP specification. +--- + Eigen/src/Core/products/Parallelizer.h | 14 +++++--------- + test/CMakeLists.txt | 2 +- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h +index 67b2442b5..a3cc05b77 100644 +--- a/Eigen/src/Core/products/Parallelizer.h ++++ b/Eigen/src/Core/products/Parallelizer.h +@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth, + + ei_declare_aligned_stack_constructed_variable(GemmParallelInfo<Index>,info,threads,0); + +- int errorCount = 0; +- #pragma omp parallel num_threads(threads) reduction(+: errorCount) ++ #pragma omp parallel num_threads(threads) + { + Index i = omp_get_thread_num(); + // Note that the actual number of threads might be lower than the number of request ones. +@@ -152,14 +151,11 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth, + info[i].lhs_start = r0; + info[i].lhs_length = actualBlockRows; + +- EIGEN_TRY { +- if(transpose) func(c0, actualBlockCols, 0, rows, info); +- else func(0, rows, c0, actualBlockCols, info); +- } EIGEN_CATCH(...) { +- ++errorCount; +- } ++ if(transpose) ++ func(c0, actualBlockCols, 0, rows, info); ++ else ++ func(0, rows, c0, actualBlockCols, info); + } +- if (errorCount) EIGEN_THROW_X(Eigen::eigen_assert_exception()); + #endif + } + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 0747aa6cb..b02577780 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -163,7 +163,7 @@ ei_add_test(constructor) + ei_add_test(linearstructure) + ei_add_test(integer_types) + ei_add_test(unalignedcount) +-if(NOT EIGEN_TEST_NO_EXCEPTIONS) ++if(NOT EIGEN_TEST_NO_EXCEPTIONS AND NOT EIGEN_TEST_OPENMP) + ei_add_test(exceptions) + endif() + ei_add_test(redux) +-- +GitLab + diff --git a/user/elogind/APKBUILD b/user/elogind/APKBUILD index 30dd59823..ac15c029f 100644 --- a/user/elogind/APKBUILD +++ b/user/elogind/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Session manager system" url=" " arch="all" license="LGPL-2.1+" -depends="dbus eudev polkit utmps" +depends="dbus eudev utmps" makedepends="meson ninja acl-dev dbus-dev docbook-xsl eudev-dev gperf libcap-dev libxslt-dev linux-headers linux-pam-dev m4 skalibs-libs-dev utmps-libs-dev" diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index f1aba2563..fab725135 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=enchant -pkgver=2.2.8 +pkgver=2.2.12 pkgrel=0 pkgdesc="Generic library for spell checking" url="https://abiword.github.io/enchant/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090 enchant-2.2.8.tar.gz" +sha512sums="ac284ed9649b11a13ff529db68cef8da829b5ff1c46ccfff36e5770fcd762055c1a75f6afbf1d2cdb00c3d8ae1cf7f336d1ff794de8f430dc2e89bb805525211 enchant-2.2.12.tar.gz" diff --git a/user/engrampa/APKBUILD b/user/engrampa/APKBUILD index 1656f8a25..2750a1841 100644 --- a/user/engrampa/APKBUILD +++ b/user/engrampa/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=engrampa -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Archive manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce engrampa-1.24.0.tar.xz" +sha512sums="9d51f24987cecfdd2c560b1ac8f8699bb5ed010bcd5b4a449a1103f725bc63046d0813d28424a3ae7dfcee0568dbf2a282f27ac5512b1c342dafeaec5bcd3b4b engrampa-1.24.1.tar.xz" diff --git a/user/eom/APKBUILD b/user/eom/APKBUILD index d7ed3dfd1..894927a9f 100644 --- a/user/eom/APKBUILD +++ b/user/eom/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=eom -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Image viewer for the MATE desktop environment" url="https://mate-desktop.org" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab eom-1.24.0.tar.xz" +sha512sums="70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0 eom-1.24.1.tar.xz" diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index d3d135619..8657537fb 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=exo pkgver=0.12.11 pkgrel=0 diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index 3d2b55f65..f653b5ae9 100644 --- a/user/extra-cmake-modules/APKBUILD +++ b/user/extra-cmake-modules/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=extra-cmake-modules -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -37,5 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4bae3b862b473df8115246924813b379f2b957ae700c4be45f13fe44519d7f011c235459a0dc8b10aad920dee318435747f1ff3ea8c270ca53ec2f4ebe90b098 extra-cmake-modules-5.72.0.tar.xz +sha512sums="5d4f612758bda73d8327cc582bda3550807de90e1b729d24a59ac7e70db127da208a53590f48cda9775f2be6e22a7db47958e3f01577b4baf0b8ef86672579a1 extra-cmake-modules-5.74.0.tar.xz a9e5d5e7ac8372099458ed18d2a6023fa0acf46955f51509880e7a467b4bd9e5df67c44c9ad032b1d70139efb73206390eaf7cd2baf63a82131e6e2b4acdbd71 posix.patch" diff --git a/user/f2fs-tools/APKBUILD b/user/f2fs-tools/APKBUILD index 7784c170d..59246c22e 100644 --- a/user/f2fs-tools/APKBUILD +++ b/user/f2fs-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: CyberLeo <cyberleo@cyberleo.net> # Maintainer: CyberLeo <cyberleo@cyberleo.net> pkgname=f2fs-tools -pkgver=1.13.0 +pkgver=1.14.0 pkgrel=0 pkgdesc="Tools for the Flash-Friendly File System (F2FS)" url="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git" @@ -13,6 +13,14 @@ makedepends="automake autoconf bsd-compat-headers libtool util-linux-dev linux-h subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz" +#secfixes: +# 1.14.0-r0: +# - CVE-2020-6104 +# - CVE-2020-6105 +# - CVE-2020-6106 +# - CVE-2020-6107 +# - CVE-2020-6108 + prepare() { default_prepare ./autogen.sh @@ -31,4 +39,4 @@ package() { install -D -m644 mkfs/f2fs_format_utils.h "$pkgdir"/usr/include/ } -sha512sums="fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f f2fs-tools-1.13.0.tar.gz" +sha512sums="951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d f2fs-tools-1.14.0.tar.gz" diff --git a/user/faad2/APKBUILD b/user/faad2/APKBUILD index 0a81a14f9..7f9d9a57a 100644 --- a/user/faad2/APKBUILD +++ b/user/faad2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=faad2 -pkgver=2.9.2 +pkgver=2.10.0 _pkgver="$(printf '%s' "$pkgver" | tr . _)" pkgrel=0 pkgdesc="ISO AAC audio decoder" @@ -55,4 +55,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="996c279a56c6abde13da964b91d4ff87ac4c611e889f1dd59882fa3898093dec68ab0714cf106db10a5e24952e2d6dddc049ec9bf4f07ff68378a705d5debee2 faad2-2.9.2.tar.gz" +sha512sums="92c8b5e79f85b7a7caac9e7954959c26d74ef148a658dcb37e2c1b303fc2fcc5a0d12f21e7bd476870498109bdd03916a56c13f578186a69d6eceb103222e771 faad2-2.10.0.tar.gz" diff --git a/user/fdupes/APKBUILD b/user/fdupes/APKBUILD index fa0891b31..3e8758f15 100644 --- a/user/fdupes/APKBUILD +++ b/user/fdupes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fdupes -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=0 pkgdesc="Identify or delete duplicate files in a directory tree" url=" " @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e098647f57d0f9fb183b9f3c4cc36d33427edb3982763a894251c5a9f8432302329cc8d1ab5a09dc27a247065bdd40936c48d3846f1babf3300ca011a37a1b7d fdupes-2.1.1.tar.gz" +sha512sums="ab16e83ff56f63555e70471d562b2d1e07edc988f2ce10ba633720f1793e8a6432dd13c3dd7340562f5784056591efca947fe2e458c24e7394e71093d0353973 fdupes-2.1.2.tar.gz" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index 848ca9e9b..c43f1b2dc 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=featherpad -pkgver=0.14.2 +pkgver=0.15.0 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -31,5 +31,5 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="d66b999b11fb42de0ffe270b01186a9fbdedd211bf03f81c3b2adc717c2d427f5292008c1e5319c01a90e50ec23bc92767940741a80780fa9160fd3ce4839016 FeatherPad-0.14.2.tar.gz +sha512sums="8cac212e8110c1b39342e7bc85f3677f662058c1f78babe8006cdbced966a8dc403132522050a84f2aa043881310f9171caff0d5cc23a95f1dbf01f274cd86e8 FeatherPad-0.15.0.tar.gz 471714eec9a376b138cc4c6c7b7d1339c9767091309c95b11ef2a8536250c796367b1544dca9610cc10babdbd08ac1436784d71292680b9da90e681dd855aaf0 hunspell-link.patch" diff --git a/user/felinks/APKBUILD b/user/felinks/APKBUILD new file mode 100644 index 000000000..bc263b9df --- /dev/null +++ b/user/felinks/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=felinks +pkgver=0.13.5 +pkgrel=0 +pkgdesc="A text mode web browser" +url="https://github.com/rkd77/felinks" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="autoconf automake bzip2-dev gettext-tiny openssl-dev zlib-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="$pkgname-$pkgver.tar.gz::https://github.com/rkd77/felinks/archive/v$pkgver.tar.gz + gettext-tiny.patch + " + +prepare() { + default_prepare + update_config_sub + autoreconf -fi +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-nls + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/lib/charset.alias + rm -rf "$pkgdir"/usr/lib +} + +sha512sums="786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b felinks-0.13.5.tar.gz +327a3b3193d1ddac891e5c46caf11a3dd946ca0a49d214a61303733eddb3e181c73a8b8d78962dc6e589b9401c7e56698154acade4d321515145cc85db834195 gettext-tiny.patch" diff --git a/user/felinks/gettext-tiny.patch b/user/felinks/gettext-tiny.patch new file mode 100644 index 000000000..27c2667d4 --- /dev/null +++ b/user/felinks/gettext-tiny.patch @@ -0,0 +1,14 @@ +gettext-tiny's msgfmt tries to use "--" as a literal output file (note +that --statistics is ignored) + +--- felinks-0.13.5/po/Makefile 2020-08-30 14:31:52.000000000 +0000 ++++ felinks-0.13.5/po/Makefile 2020-10-24 21:23:18.736882854 +0000 +@@ -22,7 +22,7 @@ POTFILES_ABS_LIST = potfiles.list + POTFILES_REL = $(shell find $(top_srcdir)/src/ -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort) + + quiet_cmd_gmsgfmt = ' [$(PO_COLOR)GMSGFMT$(END_COLOR)] $(RELPATH)$(@)' +- cmd_gmsgfmt = rm -f -- "$@" && $(GMSGFMT) --statistics -o "$@" -- "$<" ++ cmd_gmsgfmt = rm -f -- "$@" && $(GMSGFMT) --statistics -o "$@" "$<" + + + # Distributed elinks-*.tar.gz packages include po/*.gmo files, so that diff --git a/user/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD index b8f5f02a2..b788670d5 100644 --- a/user/ffmpegthumbnailer/APKBUILD +++ b/user/ffmpegthumbnailer/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ffmpegthumbnailer pkgver=2.2.2 pkgrel=0 diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 6986f1947..fe2ba9c21 100644 --- a/user/ffmpegthumbs/APKBUILD +++ b/user/ffmpegthumbs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpegthumbs -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8b9cbcbad56aed5924fa416d295a42cbe1fa992287919fb8475d1dde41fd45608afeb97fd8a747a77d71823f92597428c99896792291a3def0d539f29df3870e ffmpegthumbs-20.04.3.tar.xz" +sha512sums="74d962269ba89821d0c7b3292619e04a04d4caf3139db21d7ca278028a3724cc0c284fdc7c554b3bae31fcccd910cf1741d7d01538dc326ebec7bad76e849086 ffmpegthumbs-20.08.1.tar.xz" diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD index 08e2a6e47..91c779505 100644 --- a/user/fish/APKBUILD +++ b/user/fish/APKBUILD @@ -1,5 +1,5 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=fish pkgver=3.1.2 pkgrel=0 diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD index dcd9d98f2..db1aecdd3 100644 --- a/user/flite/APKBUILD +++ b/user/flite/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=flite pkgver=2.1 pkgrel=0 diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD index c14ed3770..a81f63c41 100644 --- a/user/fluidsynth/APKBUILD +++ b/user/fluidsynth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fluidsynth -pkgver=2.1.4 +pkgver=2.1.5 pkgrel=0 pkgdesc="Real-time, software synthesiser based on SoundFont 2" url="http://www.fluidsynth.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="22e8d2f8b144f96a334aff1f7d183b91e6c5418482bd61553028ff571836b0ca13fff89e7e3cc1c2d08e106a430331d179e607d78b00e218baec433b6d140190 fluidsynth-2.1.4.tar.gz" +sha512sums="171ee6b1983ab9636086fb414ae464508f7a9a412cd2c1e7800a19a84d3dff21bbd86d1971f9bb5985e977f808b60e0d0cfbde4551b85fcc4aae4928a1abadbc fluidsynth-2.1.5.tar.gz" diff --git a/user/font-alias/APKBUILD b/user/font-alias/APKBUILD index e995fa571..793405de7 100644 --- a/user/font-alias/APKBUILD +++ b/user/font-alias/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-alias -pkgver=1.0.3 -pkgrel=3 +pkgver=1.0.4 +pkgrel=0 pkgdesc="Font alias definitions from X.Org" url="https://www.X.Org/" arch="noarch" @@ -11,11 +11,6 @@ makedepends="util-macros" subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -32,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552 font-alias-1.0.3.tar.bz2" +sha512sums="c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d font-alias-1.0.4.tar.bz2" diff --git a/user/font-misc-ethiopic/APKBUILD b/user/font-misc-ethiopic/APKBUILD index 41b13186e..87b71086c 100644 --- a/user/font-misc-ethiopic/APKBUILD +++ b/user/font-misc-ethiopic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-misc-ethiopic -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Ethiopic X11 fonts" url="https://www.X.Org/" @@ -12,11 +12,6 @@ makedepends="util-macros" subpackages="" source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.bz2" -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -38,4 +33,4 @@ package() { find "$pkgdir" -name fonts.scale -exec rm {} + } -sha512sums="b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d font-misc-ethiopic-1.0.3.tar.bz2" +sha512sums="4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5 font-misc-ethiopic-1.0.4.tar.bz2" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index 61acf6bce..aa4cd5fc4 100644 --- a/user/frameworkintegration/APKBUILD +++ b/user/frameworkintegration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=frameworkintegration -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2b3da662fcb4b7f64597c4d69d0f8988466353a5064ecae80a4f82bb6f8b3d8b849aef83dce83cf6fc53577f47daee345d439d761548ff0b5f16f38d0b762df0 frameworkintegration-5.72.0.tar.xz" +sha512sums="4bf533b261c149a10ed4b4607f532b57b989f6e130c417a0398216ddbe1b4b3ab964009aa5c021bdc92960f8c25c7f5c66cf8606ed7956b25adfa401d0f08e68 frameworkintegration-5.74.0.tar.xz" diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD index c0f490ea0..19fa8cf15 100644 --- a/user/free42/APKBUILD +++ b/user/free42/APKBUILD @@ -38,5 +38,5 @@ package() { sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop 470eb88936c65a053860af94955bf979973bad48c4b1f593598818f8ff0c39c4869613a05ad0e82b7a3fc6ce19fa7b8642a38e726d4a48e3fe63a9cbac8a45d6 libx11.patch -33afc0d0deb88143b3ec0a09fd2ba3de14d6ad269c9ecff55c9e89348d7bf76e2bbf880e0eef9a2c71eedb1da9136051a471d4aaaf9aa5acd4e992964a69692b patch.patch +a1ee3f1b6e524d64c7f599072ac5a0e3cae17c5b45cb89a9cc2b5eaa2b2f7337ad92bae2f8566ee01d50772231a3fe68d26e241c8d8a54375a9edbd7160acccc patch.patch 2e2e6c5a00de96f2ca1c61a0039a945bf0416c889b9131abf89c6eca4d8816ff0144c32634ac7c7b112fc1bd8cd6d816f22f2aed31bde59b96a79b9588235a02 unsigned-char.patch" diff --git a/user/free42/patch.patch b/user/free42/patch.patch index f79bb6c8e..8a043fe74 100644 --- a/user/free42/patch.patch +++ b/user/free42/patch.patch @@ -11,7 +11,7 @@ + # ============================================================================== + +-__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 -++__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 12 13 +++__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 + + GetIndex = $(strip $(word 1,$(if $(word $(words $(__INDICES__)),$2), \ + $(error "List too large. Adjust __INDICES__"), \ @@ -22,9 +22,9 @@ +-ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u +-ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 +-ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 -++ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u ppc64 ppc armel aarch64 -++ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 -++ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 +++ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u ppc64 ppc armel aarch64 armv7l +++ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 +++ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 + ARCH_TYPES := IA32 IA64 EFI2 + + UARCH_LIST := SSE GSSE LRB LRB2 diff --git a/user/freetype/APKBUILD b/user/freetype/APKBUILD index 78c8d96ae..88f531f10 100644 --- a/user/freetype/APKBUILD +++ b/user/freetype/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=freetype -pkgver=2.10.2 +pkgver=2.10.4 pkgrel=0 pkgdesc="TrueType font rendering library" url="https://www.freetype.org/" @@ -14,6 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz" # secfixes: +# 2.10.4-r0: +# - CVE-2020-15999 # 2.9.1-r0: # - CVE-2018-6942 # 2.7.1-r1: @@ -37,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa freetype-2.10.2.tar.xz" +sha512sums="827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f freetype-2.10.4.tar.xz" diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD index 5d8d8f7bd..03d50022e 100644 --- a/user/fuse3/APKBUILD +++ b/user/fuse3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=fuse3 _pkgname=fuse -pkgver=3.9.2 +pkgver=3.9.3 pkgrel=0 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface" url="https://github.com/libfuse/libfuse" @@ -80,6 +80,6 @@ openrc() { install_if="openrc fuse-common=$pkgver-r$pkgrel" } -sha512sums="47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed fuse-3.9.2.tar.xz +sha512sums="e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26 fuse-3.9.3.tar.xz 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd" diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index 0c452a7a9..18a0fd9fc 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=garcon -pkgver=0.7.0 +pkgver=0.6.4 pkgrel=0 pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e865f68fe595bbc22d023d72ce4663c75e837a6789eb2158747e2cb7420ea2bba06dfd660e1de20675b9f9057cb2a9c1dc24221de8be93882e9b29bffb1fce37 garcon-0.7.0.tar.bz2" +sha512sums="96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510 garcon-0.6.4.tar.bz2" diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD index 5dc8d6c74..ea2f13e15 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gcompat -pkgver=0.9.0 +pkgver=1.0.0 pkgrel=0 pkgdesc="The GNU C Library compatibility layer for musl" -url="https://code.foxkit.us/adelie/gcompat" +url="https://git.adelielinux.org/adelie/gcompat" arch="all" options="!check" # No test suite. license="UoI-NCSA" @@ -32,4 +32,4 @@ package() { make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install } -sha512sums="d19a1b450f84de80579ce562946ad3da155fa50c2c0642f4b94c8ec22517151493852888455f6d813529816d7518468ec7b5178bb536514045596700fd05738c gcompat-0.9.0.tar.xz" +sha512sums="61e355445571760b7cb8c8a828e7182544fefb403dca602f0b3756f39430974b5161517b0fdf4636a8a513be8e64d4dcb13553b28e9c7833f15c3b9871c94455 gcompat-1.0.0.tar.xz" diff --git a/user/genext2fs/APKBUILD b/user/genext2fs/APKBUILD new file mode 100644 index 000000000..9d16a2792 --- /dev/null +++ b/user/genext2fs/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=genext2fs +pkgver=1.5.0 +pkgrel=0 +pkgdesc="ext2 filesystem generator for embedded systems" +url="https://github.com/bestouff/genext2fs" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="autoconf automake libarchive-dev" +subpackages="$pkgname-doc" +source=""$pkgname-$pkgver.tar.gz::https://github.com/bestouff/genext2fs/archive/v$pkgver.tar.gz + +prepare() { + NOCONFIGURE=1 ./autogen.sh +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --enable-libarchive + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="628994f4f5f6d534a42e16db5322e36addb227d0e0ee589ebebbbb6beda9c53774186a932d04fcb978fde1cbe534b8335fdbfea256aecd2d873c03bc5892a8ce genext2fs-1.5.0.tar.gz" diff --git a/user/giblib/APKBUILD b/user/giblib/APKBUILD index 85f255925..b6bc48c99 100644 --- a/user/giblib/APKBUILD +++ b/user/giblib/APKBUILD @@ -1,16 +1,15 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=giblib pkgver=1.2.4 -pkgrel=11 +pkgrel=12 pkgdesc="Graphics library built atop Imlib2" url="http://linuxbrit.co.uk/details.html" arch="all" license="MIT-feh" -subpackages="$pkgname-doc $pkgname-dev" depends="" depends_dev="freetype-dev imlib2-dev libx11-dev libxext-dev zlib-dev" makedepends="$depends_dev" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-dev" source="http://distfiles.gentoo.org/distfiles/$pkgname-$pkgver.tar.gz" prepare() { diff --git a/user/gleam/APKBUILD b/user/gleam/APKBUILD index 65271ea38..ebab3492b 100644 --- a/user/gleam/APKBUILD +++ b/user/gleam/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gleam pkgver=0.6.0 pkgrel=0 diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index f07a9d235..e18329b26 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.62.1 +pkgver=2.62.4 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -28,4 +28,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="6f9064d42d28b674dea0fb4ffcc954210aae92b7fcb7bcaae7a28a600b4a8782aed9077e61dd2a55ff0a8ade060c9a5556ba2e3bd2e697521f8d80bfdd241195 glib-networking-2.62.1.tar.xz" +sha512sums="cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a glib-networking-2.62.4.tar.xz" diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD index e404babdc..df19a6e1f 100644 --- a/user/glibmm/APKBUILD +++ b/user/glibmm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=glibmm pkgver=2.64.2 pkgrel=0 diff --git a/user/gmime/3.2.3-broken-tests.patch b/user/gmime/3.2.3-broken-tests.patch index 219580761..878873d7e 100644 --- a/user/gmime/3.2.3-broken-tests.patch +++ b/user/gmime/3.2.3-broken-tests.patch @@ -1,5 +1,5 @@ From e62f2a250092fc30ebe242c6acbf46320c1d0891 Mon Sep 17 00:00:00 2001 -From: Luis Ressel <aranea@aixah.de> +From: Mira Ressel <aranea@aixah.de> Date: Mon, 25 Feb 2019 07:34:54 +0100 Subject: [PATCH] Disable broken tests diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD index cad989ef8..913f6801d 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gmime pkgver=3.2.7 @@ -43,4 +43,4 @@ package() { } sha512sums="2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b gmime-3.2.7.tar.xz -443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch" +19395defdb4287cb0f605676b1431db4d218258e9c6183cc0bec49ceaf75e7966fb2a7e41529e80595d71306870d20424454ef4e9fb836a364f9d44df78fa96a 3.2.3-broken-tests.patch" diff --git a/user/gnu-netcat/APKBUILD b/user/gnu-netcat/APKBUILD new file mode 100644 index 000000000..6123aee0e --- /dev/null +++ b/user/gnu-netcat/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=gnu-netcat +pkgver=0.7.1 +pkgrel=0 +pkgdesc="GNU rewrite of netcat" +url="http://netcat.sourceforge.net" # No HTTPS +arch="all" +license="GPL-2.0+" +depends="" +makedepends="texinfo" +subpackages="$pkgname-doc $pkgname-lang" +source="https://downloads.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2" +builddir="$srcdir/netcat-$pkgver" + +prepare() { + update_config_guess + default_prepare +} + +build() { + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="283c02f849c3bb62615a5ccb7796192804dafcecb34f3c6b553cbc12c715654963b81e253762923c6069be9768b93dde576a392b89b167912c323354f1376e83 netcat-0.7.1.tar.bz2" diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index c54a49822..3182670a3 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric -pkgver=1.12.47 +pkgver=1.12.48 pkgrel=0 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" @@ -11,7 +11,7 @@ options="!check" # Fails with: # no clue. license="GPL-2.0-only OR GPL-3.0-only" depends="" -makedepends="byacc gobject-introspection-dev goffice-dev>=0.10.46 gtk+3.0-dev intltool +makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool itstool libgda-dev libxml2-utils perl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab gnumeric-1.12.47.tar.xz" +sha512sums="6c17e95ecd88b43da0f4f23d9c99dad5d0016f9618570a36be5998fa84c144bb5d13749fd9c4fe0c295e3c80d70c717d09763cc9904dfc1df062b96749b73ebc gnumeric-1.12.48.tar.xz" diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD index 7f5fe77e4..71d07cc79 100644 --- a/user/gnupg/APKBUILD +++ b/user/gnupg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnupg -pkgver=2.2.21 +pkgver=2.2.23 pkgrel=0 pkgdesc="Complete and free implementation of the OpenPGP standard" url="https://www.gnupg.org/" @@ -19,6 +19,8 @@ source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 60-scdaemon.rules" # secfixes: +# 2.2.23-r0: +# - CVE-2020-25125 # 2.2.19-r0: # - CVE-2019-14855 # 2.2.17-r0: @@ -52,7 +54,7 @@ package() { install -Dm644 "$srcdir"/60-scdaemon.rules "$pkgdir"/lib/udev/rules.d } -sha512sums="b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9 gnupg-2.2.21.tar.bz2 +sha512sums="736b39628f7e4adc650b3f9937c81f27e9ad41e77f5345dc54262c91c1cf7004243fa7f932313bcde955e0e9b3f1afc639bac18023ae878b1d26e3c5a3cabb90 gnupg-2.2.23.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch 4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules" diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index e75b1d552..5bce0b57d 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.14 +pkgver=3.6.15 pkgrel=0 pkgdesc="A TLS protocol implementation" url="https://www.gnutls.org/" @@ -32,6 +32,8 @@ source="https://www.gnupg.org/ftp/gcrypt/gnutls/v${_v}/$pkgname-$pkgver.tar.xz # 3.6.14-r0: # - CVE-2020-11501 # - CVE-2020-13777 +# 3.6.15-r0: +# - CVE-2020-24659 build() { LIBS="-lgmp" ./configure \ @@ -83,6 +85,6 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604 gnutls-3.6.14.tar.xz +sha512sums="f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c gnutls-3.6.15.tar.xz abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch 25400be364c1f27b88451002a471cbf841b9738dd93c42dcbeaf7644c3deea6afc85300b40d5ae32d29dc4d441237e8b311f3e07f0af2fb4788701ee4e240c0f disable-certtool-test.patch" diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index cc92875e1..24655fb08 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=gobject-introspection -pkgver=1.62.0 +pkgver=1.66.1 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -37,4 +37,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638 gobject-introspection-1.62.0.tar.xz" +sha512sums="ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d gobject-introspection-1.66.1.tar.xz" diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD index 13ba8b6d4..ebf81c6b3 100644 --- a/user/goffice/APKBUILD +++ b/user/goffice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=goffice -pkgver=0.10.47 +pkgver=0.10.48 pkgrel=0 pkgdesc="Library of document-centric objects and utilities built on top of GLib and Gtk+" url="https://www.gnome.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0db26fbd049893ee9274ee492e1dc3f10ae789cf99cc0b9dda3f1c2f106423e4679cc56515eb08bbf752aaf48492212777eee08d43a9fefb0b22048e883f5a76 goffice-0.10.47.tar.xz" +sha512sums="90ce49c666a164205f8f78dca9fa40c81ddf0312b1b7f76808b8813d168868b5ce46c307fd5405a1314b0a475a4e52e95ab379b2dc751c1626e085ecf846d0f3 goffice-0.10.48.tar.xz" diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD index 4ffe06950..9400b0400 100644 --- a/user/gprbuild/APKBUILD +++ b/user/gprbuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=gprbuild -pkgver=2019 -_pkgver=2019-20190517-194D8 -_xmlver=2019-20190429-19B9D +pkgver=2020 +_pkgver=2020-20200814-19ABE +_xmlver=2020-20200814-19BC4 pkgrel=0 pkgdesc="An advanced build system for multi-language systems" url="https://github.com/AdaCore/gprbuild" @@ -11,8 +11,8 @@ options="!check" # No test suite. license="GPL-3.0+" depends="" makedepends="gcc-gnat" -source="https://distfiles.adelielinux.org/source/$pkgname-$_pkgver-src.tar.gz - https://distfiles.adelielinux.org/source/xmlada-$_xmlver-src.tar.gz +source="$pkgname-$_pkgver-src.tar.gz::https://community.download.adacore.com/v1/4e13d41920eac86fd139b5d7984eb908d697d868?filename=$pkgname-$_pkgver-src.tar.gz + xmlada-$_xmlver-src.tar.gz::https://community.download.adacore.com/v1/9cf1ab59b526d1260e007fa9719126c5498632d2?filename=xmlada-$_xmlver-src.tar.gz foxkit.xml " builddir="$srcdir/$pkgname-$_pkgver-src" @@ -47,6 +47,6 @@ package() { "$pkgdir"/usr/share/gprconfig } -sha512sums="0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b gprbuild-2019-20190517-194D8-src.tar.gz -f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 xmlada-2019-20190429-19B9D-src.tar.gz +sha512sums="cd9cb2a1f7867f17a5b69d8500476f3a97ca4856b171344d3bf887f55a4860d0ae32ec89ad82e9c7cec13fa20e58cd8ab890554115774095111ed38f9760050e gprbuild-2020-20200814-19ABE-src.tar.gz +51365bc1baaa0886caf46d75d3d27d56b37d5a02f04673321a60bda14a2adda0edd43321f8b34583d4aeaf852f4a21a924f841899c458076b3f261d881bb29a1 xmlada-2020-20200814-19BC4-src.tar.gz e369c094963d3dcfb03d7ac0949825531bae6410ef9c4bec774cb0da70d2bd4a784bdec37db5151c0371ce769712ee02fc04f36896ccc8bddcdb585c1ee8dbbc foxkit.xml" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index 0d9df9720..29986c86a 100644 --- a/user/granatier/APKBUILD +++ b/user/granatier/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=granatier -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="612395ddca651052a8ffae48a3e977780297c0ef397946705baf735cdf447a0a782c4a0299cab496332592d0aac33000de969978669c4b8122e2353429e17613 granatier-20.04.3.tar.xz" +sha512sums="ea07e8cd4f7f99dde6436905a55c1e45d6e8df86308430d0b3e0b9f3334cda21f4268684b02902feb44aaa4d49895e59f9dea940cc8f24ad30a6567d9d3e6c5d granatier-20.08.1.tar.xz" diff --git a/user/grantleetheme/APKBUILD b/user/grantleetheme/APKBUILD index 6ac4749c7..843cdc2b0 100644 --- a/user/grantleetheme/APKBUILD +++ b/user/grantleetheme/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grantleetheme -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE Grantlee theme support library" url="https://kde.org/" @@ -13,7 +13,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules grantlee-dev kauth-dev kiconthemes-dev knewstuff-dev kservice-dev kwidgetsaddons-dev kxmlgui-dev attica-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/grantleetheme-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/grantleetheme-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4bf3dd73238fffa4db2c2ec8d619100570847684e2fc5ec84b2f23c651b505127cfa019d0a8ceb9f8b0237124f53007d7052d67d7476f0f43a51e29b92e787cf grantleetheme-20.04.3.tar.xz" +sha512sums="31e5979fcc5f575bdd26e4a814ae1b8717ea83473fb749cfd20ff61ea6e6cfb2276b55770b50041cb7e2bc263b674d58e1c6db51dc6d712e591587a833521f93 grantleetheme-20.08.1.tar.xz +b22a1bc395c1639a1654e7a8a1961f5e90b2cc77432ab9d9bc5421e78c4d0299495b073ef4835e3976bc569740ae7d7f855ade582b8ec76970fee6ece2a69566 lts.patch" diff --git a/user/grantleetheme/lts.patch b/user/grantleetheme/lts.patch new file mode 100644 index 000000000..6eb5bb73b --- /dev/null +++ b/user/grantleetheme/lts.patch @@ -0,0 +1,11 @@ +--- grantleetheme-20.08.1/CMakeLists.txt.old 2020-09-01 06:38:28.000000000 +0000 ++++ grantleetheme-20.08.1/CMakeLists.txt 2020-09-17 15:27:17.577617388 +0000 +@@ -31,7 +31,7 @@ + + set(GRANTLEETHEME_LIB_VERSION ${PIM_VERSION}) + +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + set(GRANTLEE_VERSION "5.2") + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index 46fd83a7e..3388b82d1 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gsettings-desktop-schemas -pkgver=3.36.1 +pkgver=3.38.0 pkgrel=0 pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" @@ -14,6 +14,8 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve prepare() { default_prepare sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in + # Correct pkgconfig install path + sed -i "/install_dir/s,datadir,libdir," meson.build } build() { @@ -29,12 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -dev() { - default_dev - depends="$pkgname" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/share/pkgconfig "$subpkgdir"/usr/lib -} - - -sha512sums="623a3759fe84cc5ea897043cc7c337a4f83302ebe5cfb9d214210a48e460e22b180518f5d768382ec18396bb2e86f22649dbc9b367a858e56b1ee8d2cab58fa8 gsettings-desktop-schemas-3.36.1.tar.xz" +sha512sums="5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756 gsettings-desktop-schemas-3.38.0.tar.xz" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 2b87ed367..34e5efe4f 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.21 +pkgver=3.24.24 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -13,7 +13,7 @@ makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev gobject-introspection-dev libepoxy-dev libice-dev libx11-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev pango-dev - tiff-dev zlib-dev" + tiff-dev wayland-dev wayland-protocols libxkbcommon-dev zlib-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" @@ -26,6 +26,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --enable-wayland-backend \ --enable-xkb \ --enable-xinerama \ --enable-xrandr \ @@ -48,4 +49,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="97ed88e69d9002279869044772e5aebc1ac4ed6f4a8afc1586a349710a1d414fc735e1257d5f34f6300914a0ca7c7ede073bd9429ee16077aa83f3594784c60e gtk+-3.24.21.tar.xz" +sha512sums="f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520 gtk+-3.24.24.tar.xz" diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD index e2ed4bb8a..ba2d3ccef 100644 --- a/user/gtkmm+3.0/APKBUILD +++ b/user/gtkmm+3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gtkmm+3.0 pkgver=3.24.2 pkgrel=0 diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD index 82ae71d56..68c2a6e8b 100644 --- a/user/gtksourceview-3.0/APKBUILD +++ b/user/gtksourceview-3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gtksourceview-3.0 pkgver=3.24.11 pkgrel=0 diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD index 1d2720d7d..ada44b78f 100644 --- a/user/gucharmap/APKBUILD +++ b/user/gucharmap/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gucharmap -pkgver=13.0.2 +pkgver=13.0.8 _unicode=13.0.0 pkgrel=0 pkgdesc="Unicode utility for the Gnome desktop environment" @@ -10,7 +10,8 @@ arch="all" license="GPL-3.0+" depends="" makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev gtk-doc - intltool itstool libxml2-utils meson ninja perl unicode-data vala" + intltool itstool libxml2-utils meson ninja perl unicode-data vala + wayland-protocols" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://gitlab.gnome.org/GNOME/gucharmap/-/archive/$pkgver/gucharmap-$pkgver.tar.gz" @@ -33,4 +34,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="66918666607190f6a364b4709fbd51a08ada29986b549ae779452ec98eb4944d0969ad593296ac84cac8dc4791d718dd522add6cf475116765426505647971a9 gucharmap-13.0.2.tar.gz" +sha512sums="15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf gucharmap-13.0.8.tar.gz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 4742f1256..7608d6817 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=gvim _pkgreal=vim -pkgver=8.2.1017 +pkgver=8.2.1900 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -71,4 +71,4 @@ package() { ln -s gvim rgvim } -sha512sums="6fe243c3aeefe2d63d67e1710d5212a4b76b8fd49e037ca588655e25901ca2af4285128cc97146622c42d0df77194e18fb7d5a2bdd74f26c3534f0c2cc0e5d8b vim-8.2.1017.tar.gz" +sha512sums="5810d090c1473b425c42cbf1df02db216dcfd482ed3f4cabf3a9a378afba827e4400b65ea425636bacc10f20a435d09edf2dc9d038d268222e3b396a793dac41 vim-8.2.1900.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index 8d017e520..77b8b0da4 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c670111e75938028713ea77695bbe6fdd8e76d0dea74acc0cff3a20dd5a7ee4c956ef79b67c7ac8e99bb07b9895c16fcf985580d91442005451c6439f19726f1 gwenview-20.04.3.tar.xz" +sha512sums="76382f3edb228667c85766049a4dad469496ef15364fbfec5b9c570cec0a7c6c083edd1832ccf82f8f7ed3c6d4819811cc2e784200db1a0298b9bc01ce606cb3 gwenview-20.08.1.tar.xz" diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD index c36f6fe1c..d546772f5 100644 --- a/user/hermit/APKBUILD +++ b/user/hermit/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=hermit pkgver=2.0 diff --git a/user/hexchat/APKBUILD b/user/hexchat/APKBUILD index 8ba05d268..9ee927d14 100644 --- a/user/hexchat/APKBUILD +++ b/user/hexchat/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=hexchat pkgver=2.14.3 pkgrel=0 diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index d32b4dc7b..024240aca 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.57 +pkgver=3.58 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -11,7 +11,7 @@ license="GPL-3.0+" depends="" makedepends="boost-dev lua5.3-dev" subpackages="$pkgname-doc" -source="http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2" +source="http://www.andre-simon.de/zip/$pkgname-$pkgver.zip" build() { make cli @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99 highlight-3.57.tar.bz2" +sha512sums="fed565a84daa62605e45ec83c8da187f32b50f720d4415e15647f0c80a7f1c0f5b42237c3321557593e072d85f49414bf0f6b714084b614e850f207e8bc6037e highlight-3.58.zip" diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD index dcc9d9bf7..8d2e480c2 100644 --- a/user/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=horizon -pkgver=0.9.3 +pkgver=0.9.6 pkgrel=0 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" @@ -30,6 +30,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DUNSUPPORTED_NONFREE_FIRMWARE=ON \ -DINSTALL=ON \ ${CMAKE_CROSSOPTS} \ -Bbuild @@ -43,6 +44,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DUNSUPPORTED_NONFREE_FIRMWARE=ON \ -DINSTALL=OFF \ ${CMAKE_CROSSOPTS} \ -Bbuild-wizard @@ -59,7 +61,7 @@ package() { image() { pkgdesc="Tools for generating images using HorizonScript" - depends="mtools" + depends="dracut mtools" mkdir -p "$subpkgdir"/usr/bin mkdir -p "$subpkgdir"/usr/lib mkdir -p "$subpkgdir"/usr/share/horizon @@ -104,7 +106,9 @@ boot() { depends="horizon-qt5 horizon kwin qt5ct sddm netsurf partitionmanager xterm" + mkdir -p "$subpkgdir"/etc/init.d mkdir -p "$subpkgdir"/etc/profile.d + mkdir -p "$subpkgdir"/etc/runlevels/default mkdir -p "$subpkgdir"/etc/sddm.conf.d mkdir -p "$subpkgdir"/etc/xdg/qt5ct mkdir -p "$subpkgdir"/usr/bin @@ -131,6 +135,12 @@ GLOBALS install -D -m644 "$builddir"/boot/horizon.sddm.conf \ "$subpkgdir"/etc/sddm.conf.d/horizon.conf + install -D -m755 "$builddir"/boot/gfxdetect \ + "$subpkgdir"/etc/init.d/gfxdetect + + ln -s ../../init.d/gfxdetect \ + "$subpkgdir"/etc/runlevels/default/gfxdetect + install -D -m755 "$builddir"/boot/start-horizon-qt5 \ "$subpkgdir"/usr/bin/start-horizon-qt5 @@ -146,4 +156,4 @@ GLOBALS "$subpkgdir"/usr/share/xsessions/horizon.desktop } -sha512sums="99c1d939abc33c4a072712e75c6c8ada16deb1fe59b9da839dffd695a0d40dbf48499cc00751285300127a7fc701e8e1c434e9f8a222f1981ccbebd6ee72e43e horizon-0.9.3.tar.xz" +sha512sums="d5ffe9bd423e98272ca780c59e6e32c42b284c68f3a0bace07bd693d457e2edcd68d7fc03f638b545960154ea26b7c09feee083dbffa986da2a7cd418be9500f horizon-0.9.6.tar.xz" diff --git a/user/horizon/fix-qt-runner.patch b/user/horizon/fix-qt-runner.patch deleted file mode 100644 index 39cab1181..000000000 --- a/user/horizon/fix-qt-runner.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9f737dbab8b9ed9fa57bdf15542cc00a8363d98b Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 4 Jun 2020 21:29:37 -0500 -Subject: [PATCH] Qt UI: Ensure log is opened when built in release modes - ---- - ui/qt5/runner/executepage.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ui/qt5/runner/executepage.cc b/ui/qt5/runner/executepage.cc -index 999731a..d5788df 100644 ---- a/ui/qt5/runner/executepage.cc -+++ b/ui/qt5/runner/executepage.cc -@@ -48,7 +48,7 @@ ExecutePage::ExecutePage(QWidget *parent) : HorizonWizardPage(parent) { - }); - - log.setFileName("/var/log/horizon/executor.log"); -- Q_ASSERT(log.open(QFile::Append)); -+ log.open(QFile::Append); - - this->current = Prepare; - markRunning(this->current); --- -2.25.4 - diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD index 64a2a2f3f..f143b6fc5 100644 --- a/user/i3status/APKBUILD +++ b/user/i3status/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=i3status pkgver=2.13 -pkgrel=1 +pkgrel=2 pkgdesc="Status bar generator for dzen2, xmobar or similar" url="https://i3wm.org/i3status/" arch="all" @@ -39,5 +39,5 @@ package() { } sha512sums="6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2 i3status-2.13.tar.bz2 -26527b9a0053d363f2b2991f9be3a15cb5fbf5553dca9498a9cff1c1a65e887f392215b60a484e329e6ef8efd63f9b67727826fb6ccfe1033c653feef34aaab8 asciidoctor.patch +7677e5f13f0b0e369775449a4097057cd709630f010790fa8601840858ab31ebe0455ecbfa764e6e4861e5a669cdc39e434c2c72513d45eb9705a49cc03953e5 asciidoctor.patch 765a5b64d79f61cd68280d77a7316e7f571a3c2e385d9a227885cde5fc057b1a892e92a65c0fc54832bfdda30743df6e9f82a847b55c9e7389575c7fbad9e0d4 glob_tilde.patch" diff --git a/user/i3status/asciidoctor.patch b/user/i3status/asciidoctor.patch index 575a00e1b..175f03150 100644 --- a/user/i3status/asciidoctor.patch +++ b/user/i3status/asciidoctor.patch @@ -1,5 +1,5 @@ From 1821c7cd94e2424352f0fcb1f2933b368a4c381c Mon Sep 17 00:00:00 2001 -From: Luis Ressel <aranea@aixah.de> +From: Mira Ressel <aranea@aixah.de> Date: Tue, 9 Jul 2019 13:18:43 +0200 Subject: [PATCH] Build man pages with asciidoctor diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index 39c7230ad..875d58a01 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=i3wm -pkgver=4.18.1 +pkgver=4.18.2 pkgrel=0 pkgdesc="Improved dynamic tiling window manager" url="https://i3wm.org" @@ -41,7 +41,7 @@ package() { install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/ } -sha512sums="b001f539b1daf78be6dd9335a7c0474d30f8d969f79d131391ebd9ca310a058a1cc1234e4a9e60552efd520fc4983571f3c0b8cbd7be978e45957daaf86b3e90 i3-4.18.1.tar.bz2 +sha512sums="997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc i3-4.18.2.tar.bz2 6378e3619076c03345b4faa1f9d54cab2e7173068bc4d5f2f2894af9cc0e5792fe45ce95cb06328f5040f0ba6d43f3e49c523968732ac2d2046b698042338caa i3wm-musl-glob-tilde.patch 77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7 i3wm-test-fix-off_t.patch a80384965dff62c51ce77e2baa3cf1b0b6db1df68994ce98383f96554bd296b4b59527fb5b1cb24b08c123699e294ba9b3baaa52afe88d87e7a76f0629194b1f i3wm-test-disable-branch-check.patch" diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index a23bf4866..90a74c89b 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=icewm -pkgver=1.6.6 +pkgver=2.6.0 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -9,9 +9,10 @@ arch="all" options="!check" # No test suite. license="LGPL-2.0-only AND MirOS" depends="" -makedepends="libxft-dev libxinerama-dev libxpm-dev libjpeg-turbo-dev - libxrandr-dev glib-dev fribidi-dev gdk-pixbuf-dev librsvg-dev - alsa-lib-dev libsndfile-dev libao-dev asciidoctor libxcomposite-dev" +makedepends="alsa-lib-dev asciidoctor fribidi-dev glib-dev gdk-pixbuf-dev + imlib2-dev libao-dev libice-dev libjpeg-turbo-dev librsvg-dev libsm-dev + libsndfile-dev libxcomposite-dev libxft-dev libxinerama-dev libxpm-dev + libxrandr-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.lz" @@ -34,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6d9848924253fee5f57be488d2eb0b602767f168ce623b10c768a73197dfc6265daee7e70373d45ff5fae1c15b029d62c77ad13f0f631283bbf13aaaa9c6234d icewm-1.6.6.tar.lz" +sha512sums="fe491c8c59aa530d48a20134857c787eccfeda5bd9529e063d865bd3c5f243ef41fbecba40aa06e7fa8037af89839958095debebc5d9b1acc9b5670bd0e12eb6 icewm-2.6.0.tar.lz" diff --git a/user/ido/APKBUILD b/user/ido/APKBUILD index 329b48ddd..dd3f36858 100644 --- a/user/ido/APKBUILD +++ b/user/ido/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ido pkgver=13.10.0 pkgrel=0 diff --git a/user/imlib2/APKBUILD b/user/imlib2/APKBUILD index 09733a11b..b7256e65d 100644 --- a/user/imlib2/APKBUILD +++ b/user/imlib2/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=imlib2 -pkgver=1.6.1 -pkgrel=2 +pkgver=1.7.0 +pkgrel=0 pkgdesc="Image manipulation library" url="https://sourceforge.net/projects/enlightenment" arch="all" @@ -11,7 +11,9 @@ depends_dev="freetype-dev libxext-dev libsm-dev" makedepends="$depends_dev tiff-dev giflib-dev bzip2-dev libpng-dev libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev" subpackages="$pkgname-dev" -source="https://downloads.sourceforge.net/enlightenment/$pkgname-src/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/enlightenment/$pkgname-src/$pkgname-$pkgver.tar.bz2 + loader-build.patch + " build() { ./configure \ @@ -41,4 +43,5 @@ package() { make DESTDIR=$pkgdir install } -sha512sums="ecdbdbfe8767ec2b1f22ce664cbab5e1d3f75be7a3c8f37488f5243b3c31dbc433414b8d50d2d1b70c67a80e31e42cc5398161991ce3955e991c114c82ddd58f imlib2-1.6.1.tar.bz2" +sha512sums="078126269565b55f4b167608ee65d558711e37c34283fb6193752b27f7fc59c738cbd38839b17203273defee20c2ffc41a495e44364089deebffbd39c67e6d72 imlib2-1.7.0.tar.bz2 +4f3139fa1caf64aff6f24f7fb95070b02280145119dcf5bb6f379ec1f4ded07d22317cb09eb42f911b12d90de4b84b6391ebf82305b129d6689089e5054c5e26 loader-build.patch" diff --git a/user/imlib2/loader-build.patch b/user/imlib2/loader-build.patch new file mode 100644 index 000000000..44af31f35 --- /dev/null +++ b/user/imlib2/loader-build.patch @@ -0,0 +1,26 @@ +From 92d3153fee9f915cf2bdbc92a7551e5a83985e81 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa <daniel@octaforge.org> +Date: Sun, 9 Aug 2020 21:00:46 +0200 +Subject: Fix big endian build + +--- + src/modules/loaders/loader_argb.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/modules/loaders/loader_argb.c b/src/modules/loaders/loader_argb.c +index ec58ca3..b915b7b 100644 +--- a/src/modules/loaders/loader_argb.c ++++ b/src/modules/loaders/loader_argb.c +@@ -7,6 +7,9 @@ load2(ImlibImage * im, int load_data) + int w = 0, h = 0, alpha = 0; + DATA32 *ptr; + int y; ++#ifdef WORDS_BIGENDIAN ++ int l; ++#endif + + rc = LOAD_FAIL; + +-- +cgit v1.2.1 + diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index a3b265ee5..b93c8a259 100644 --- a/user/iperf3/APKBUILD +++ b/user/iperf3/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iperf3 _pkgname=iperf -pkgver=3.8.1 +pkgver=3.9 pkgrel=0 pkgdesc="A tool to measure IP bandwidth using UDP or TCP" url="https://software.es.net/iperf/" @@ -17,6 +17,7 @@ source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgnam $_pkgname.confd build-fixes.patch + time64.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -45,7 +46,8 @@ package() { "$pkgdir"/etc/conf.d/$_pkgname } -sha512sums="0b80849d7705277f63982bbf7a1c159cd9eed65fc89e5f0d443364e8ada7ed0e670c8747a8c5464c3425c134c19ac8bb6b028867f892e70201d4450c7c5a033e iperf3-3.8.1.tar.gz +sha512sums="4a2af8a6028b0f6bded9b3ac51c5463bc7595c9a2d2ac13f28b0e2e8dee0ac0a299e7817125e23e409f12e8e80862ed28d5541eef3cda7cd9f7104bb720165ce iperf3-3.9.tar.gz 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8 iperf.initd fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd -126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch" +126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198 build-fixes.patch +5686858a8a220834e01ace8dd934f347c1fff952d1e30985cfb13eabef1eba82e467871323a9c544925230c4b7d7e67c71a2add59e85d30adcb3208e10e2df46 time64.patch" diff --git a/user/iperf3/time64.patch b/user/iperf3/time64.patch new file mode 100644 index 000000000..84806dc20 --- /dev/null +++ b/user/iperf3/time64.patch @@ -0,0 +1,75 @@ +From f19d964fd91a6f2b26aa70b6caa1290c3f6fdbc7 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sun, 27 Sep 2020 19:56:15 -0500 +Subject: [PATCH] auth: Ensure 64-bit time_t works on 32-bit systems + +On a 32-bit PowerPC Linux system using musl libc (with 64-bit time_t), +the t_auth test fails because `long` is not the same type as `time_t`. + +This patch uses an int64_t temporary value, which can be truncated to +32-bit if necessary. +--- + src/iperf_auth.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/iperf_auth.c b/src/iperf_auth.c +index eb4610f..a824deb 100644 +--- a/src/iperf_auth.c ++++ b/src/iperf_auth.c +@@ -35,6 +35,8 @@ + #define _WITH_GETLINE + #include <stdio.h> + #include <termios.h> ++#include <inttypes.h> ++#include <stdint.h> + + #if defined(HAVE_SSL) + +@@ -45,7 +47,7 @@ + #include <openssl/buffer.h> + #include <openssl/err.h> + +-const char *auth_text_format = "user: %s\npwd: %s\nts: %ld"; ++const char *auth_text_format = "user: %s\npwd: %s\nts: %"PRId64; + + void sha256(const char *string, char outputBuffer[65]) + { +@@ -291,7 +293,7 @@ int encode_auth_setting(const char *username, const char *password, EVP_PKEY *pu + if (text == NULL) { + return -1; + } +- snprintf(text, text_len, auth_text_format, username, password, utc_seconds); ++ snprintf(text, text_len, auth_text_format, username, password, (int64_t)utc_seconds); + + unsigned char *encrypted = NULL; + int encrypted_len; +@@ -309,7 +311,8 @@ int encode_auth_setting(const char *username, const char *password, EVP_PKEY *pu + int decode_auth_setting(int enable_debug, const char *authtoken, EVP_PKEY *private_key, char **username, char **password, time_t *ts){ + unsigned char *encrypted_b64 = NULL; + size_t encrypted_len_b64; +- Base64Decode(authtoken, &encrypted_b64, &encrypted_len_b64); ++ int64_t utc_seconds; ++ Base64Decode(authtoken, &encrypted_b64, &encrypted_len_b64); + + unsigned char *plaintext = NULL; + int plaintext_len; +@@ -331,7 +334,7 @@ int decode_auth_setting(int enable_debug, const char *authtoken, EVP_PKEY *priva + return -1; + } + +- int rc = sscanf((char *) plaintext, auth_text_format, s_username, s_password, ts); ++ int rc = sscanf((char *) plaintext, auth_text_format, s_username, s_password, &utc_seconds); + if (rc != 3) { + free(s_password); + free(s_username); +@@ -344,6 +347,7 @@ int decode_auth_setting(int enable_debug, const char *authtoken, EVP_PKEY *priva + } + *username = s_username; + *password = s_password; ++ *ts = (time_t)utc_seconds; + OPENSSL_free(plaintext); + return (0); + } +-- +2.25.4 + diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD index 3e6319e30..bc56c6174 100644 --- a/user/irssi/APKBUILD +++ b/user/irssi/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=irssi -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="Text-based IRC client" url="https://irssi.org" @@ -48,4 +48,4 @@ perl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi } -sha512sums="5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610 irssi-1.2.2.tar.xz" +sha512sums="826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc irssi-1.2.3.tar.xz" diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD index 51d8a3e6e..04cee761a 100644 --- a/user/isync/APKBUILD +++ b/user/isync/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=isync -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=0 pkgdesc="IMAP and MailDir mailbox synchronizer" url="http://isync.sourceforge.net/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9b45a7e80dca938329d4bf40996ddbaa008c1fb5a0ac2a7f6277ce78a86fd320083cd96041f6aa8e223b48e17e8b8dd9c5666e989e953a4cd7bc970c84763cba isync-1.3.2.tar.gz" +sha512sums="915824272606f75da8c05fb75872bc5cf528fa555024245094d14a25b190f1b813dd5723e9b87f27f3fbb14b100311ee487bc409d074a68d67e9ab675b12c7a1 isync-1.3.3.tar.gz" diff --git a/user/iw/APKBUILD b/user/iw/APKBUILD index 4ada251aa..18ef2dbca 100644 --- a/user/iw/APKBUILD +++ b/user/iw/APKBUILD @@ -1,12 +1,11 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=iw -pkgver=5.4 +pkgver=5.9 pkgrel=0 pkgdesc="CLI configuration utility for wireless devices" url="https://wireless.wiki.kernel.org/en/users/Documentation/iw" arch="all" -options="!check" # No usable test suite. license="ISC" depends="" makedepends="libnl3-dev linux-headers pkgconfig" @@ -17,8 +16,12 @@ build() { make V=1 } +check() { + make check +} + package() { make V=1 DESTDIR="$pkgdir" install } -sha512sums="84408194e5b3a2f119ae9711d856ecb4343734ebb91150e0441b2410af8f75f460ce9ab1ce7151b0dda3926270bcb80fa684058945b7549c98964a0379e39ba2 iw-5.4.tar.xz" +sha512sums="08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be iw-5.9.tar.xz" diff --git a/user/json-glib/APKBUILD b/user/json-glib/APKBUILD index cdc3df7ab..015b7b6e7 100644 --- a/user/json-glib/APKBUILD +++ b/user/json-glib/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=json-glib -pkgver=1.4.4 +pkgver=1.6.2 pkgrel=0 pkgdesc="GObject-based library for JSON (de)serialization" url="https://live.gnome.org/JsonGlib" @@ -11,7 +11,7 @@ license="LGPL-2.1+" depends="" makedepends="glib-dev gobject-introspection-dev meson ninja" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.gnome.org/sources/json-glib/1.4/json-glib-$pkgver.tar.xz" +source="https://download.gnome.org/sources/json-glib/${pkgver%.*}/json-glib-$pkgver.tar.xz" build() { meson \ @@ -28,4 +28,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f json-glib-1.4.4.tar.xz" +sha512sums="8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11 json-glib-1.6.2.tar.xz" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 8874668e0..090b5ff05 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=juk -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae0b998856129548b99abd5d9567fbec79a7760e9898a58c5d0334e2be2c8e54fc2dfb13ebadaf77aeea86ee3cea4677319a7a11f048b84322171580853ec562 juk-20.04.3.tar.xz" +sha512sums="423358bb3a55b69a3193534a39e7453d386ec0101e37710645efbcd5080ac7c01291e6daf9c47313439ce0806c873a7a49de7cf71fad6b3be5be942aa76d3e56 juk-20.08.1.tar.xz" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 28bced096..b3302acb4 100644 --- a/user/kactivities-stats/APKBUILD +++ b/user/kactivities-stats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities-stats -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="e3a7d4921a05b3e240f3ab526480d573ee397d0c363513d152e5165372d9841d7797d804bb44dadb3f594dd1a0276f73e6fc8e54745c32f18a076eee6d635f4c kactivities-stats-5.72.0.tar.xz" +sha512sums="0caa8afb52b7643cf21a6d3fdaa3e987b632f1414e9888fc174623fe8b646c3eef4a8f57a2d0d22f7d726e9952a074550d1f35fb0f65cc5d061222746a6dbbac kactivities-stats-5.74.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index 9580aa2c1..717412e03 100644 --- a/user/kactivities/APKBUILD +++ b/user/kactivities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="cf9642e2d1c9cb932eda588e2d1c32c654b467f5ce17af78b93d951a5a4315427f18ccca4c270cb5141298345eeb47d677333f88cc69df68301922f5db95bb5a kactivities-5.72.0.tar.xz" +sha512sums="fcfae3047e19dc7b41c0f0752c6aa95a652d635947c78ba9a3d069e365f9c68475b325c591a3a864c63ef285d243b473720f63e92d86802df661bfdd7826b7e7 kactivities-5.74.0.tar.xz" diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD index ce56755c7..7c64ed1e5 100644 --- a/user/kactivitymanagerd/APKBUILD +++ b/user/kactivitymanagerd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kactivitymanagerd -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Service to manage KDE Plasma activities" url="https://www.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev boost-dev python3 kconfig-dev kcoreaddons-dev kwindowsystem-dev kio-dev kglobalaccel-dev kxmlgui-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kactivitymanagerd-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="b3231305643247fa82f267ac942878136f1710faf1fe3b084efad25e8a3fb124ebbab5cf88251dd54d8e8bbbf3ac31088b25bf8047307adef95b5d40c8175ee0 kactivitymanagerd-5.18.4.1.tar.xz" +sha512sums="2ee59f78cc948fe11577373ea69f895efcaa7d4f239362d3e060382c3be0f67511a0baa64a404c1e0e53d5777775afba60f49e58476c70dcdef6c63358ca4dbc kactivitymanagerd-5.18.5.tar.xz" diff --git a/user/kaddressbook/APKBUILD b/user/kaddressbook/APKBUILD index 95ec26d52..ad05e017a 100644 --- a/user/kaddressbook/APKBUILD +++ b/user/kaddressbook/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kaddressbook -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE contact manager" url="https://kontact.kde.org/components/kaddressbook.html" @@ -19,7 +19,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules akonadi-dev boost-dev kwindowsystem-dev kxmlgui-dev libkdepim-dev libkleo-dev pimcommon-dev prison-dev solid-dev sonnet-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kaddressbook-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kaddressbook-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -45,4 +47,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3b9d3f17a73c5687a30b10909004aa9c6ed52210808cb147badae4bc07046cac44b0ae2f64e8c950344e755afe3da0f402fb3ed6688d825d99d5e0faf160df5a kaddressbook-20.04.3.tar.xz" +sha512sums="2904dcb07799489bab5e8e3faf2c36be0f0c44d084e8d96dccb014de7f3fcee745213ac9a5d5a72bfdfa89f14e9c0f1391669a1a2ae26454d2bc170f4b6a17c3 kaddressbook-20.08.1.tar.xz +e62666dacb00c4c7f2913ba8f5f6defd85d6c9061593711b90b48b2895aa3f91c71d38b6eaca616bf1e79fcc7a81b9d2bdfd76327cde383426e55ab38f9aec16 lts.patch" diff --git a/user/kaddressbook/lts.patch b/user/kaddressbook/lts.patch new file mode 100644 index 000000000..91f1b956b --- /dev/null +++ b/user/kaddressbook/lts.patch @@ -0,0 +1,11 @@ +--- kaddressbook-20.08.1/CMakeLists.txt.old 2020-09-01 06:35:02.000000000 +0000 ++++ kaddressbook-20.08.1/CMakeLists.txt 2020-09-18 01:29:00.873386709 +0000 +@@ -45,7 +45,7 @@ + set(KDEPIM_LIB_SOVERSION "5") + + +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintSupport) + set(LIBKDEPIM_LIB_VERSION_LIB "5.15.1") + set(KDEPIM_APPS_LIB_VERSION_LIB "5.15.1") diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index b83781b70..ee1d3dff1 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalgebra -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="215218105cb7fe76da3439aabfbdc97c1c5ab396aab21e9dfd8cc8d91c897d2fc94db06e405a44e45710e2d4211049b084306fb85595aaa84443828f8258acb0 kalgebra-20.04.3.tar.xz" +sha512sums="a19e4852f07a7471a55c0fa80df4b33a3b43b0973ff51f3beed0c536fdee62b21506288c57ab44464b451596136ce79b8bfd7da32e2bced94bf9f29f537bc129 kalgebra-20.08.1.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 87fb05861..e7fceec54 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalzium -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fa8f67128d35faa8bdc343cf425aedda8a9370584bdeb69e22ca229c0c1029a5d178f851d4131bd60c635d8d846c8bf1e9104fc030fddb15578ead4c2cba7ea0 kalzium-20.04.3.tar.xz" +sha512sums="60da587ba5001b718bd6106a384c26b5351e41d943ad6796def4b1e8e8c8aa8c077f58019e4a6e6796a90a3d594dfa61602cd149d82415d7cf7df0e6f453c5ee kalzium-20.08.1.tar.xz" diff --git a/user/kamera/APKBUILD b/user/kamera/APKBUILD index 13942f444..64e67ad11 100644 --- a/user/kamera/APKBUILD +++ b/user/kamera/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kamera -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Digital camera support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56393780a07c72c069595188a56eb449873683942a404343336a36c598036b4a339795af8441c073b2a9a5b5145b913ed19d0f7f19933cf999d87886e9aa5592 kamera-20.04.3.tar.xz" +sha512sums="8730584914b5f99059a16710b153576750d6266670a774443b2949921a93f75f68cb14664a9d75e4804e4b41af158268950eb9126173e62539f91b7695be0c59 kamera-20.08.1.tar.xz" diff --git a/user/kamoso/APKBUILD b/user/kamoso/APKBUILD index e87d3f305..abd5fda35 100644 --- a/user/kamoso/APKBUILD +++ b/user/kamoso/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kamoso -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE camera software" url="https://kde.org/applications/multimedia/org.kde.kamoso" arch="all" +options="!check" # Requires GLX GPU. license="GPL-2.0+" depends="gst-plugins-base qt5-qtgraphicaleffects qt5-qtquickcontrols qt5-qtquickcontrols2" @@ -42,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7da5f635cd5744215e7d3c3332729c149786b10a50ecb6c1e63843da8756da2dd2b355b837d24bed670c52990c7f5322b52d703ca61c5c6ec87d89de04458e80 kamoso-20.04.3.tar.xz" +sha512sums="4f28f112906c2fc888e723b9d3809dfc78cbb2ffd0ae4c14260c512ef48f63d574b5e5afbd0f183b1cfd958fd6323a006102a0eaa0f3ea44c4acf0e333bfa4aa kamoso-20.08.1.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index 43a7ece1d..88498d709 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kanagram -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e25f5bd4724b8f55ccf6b1fc71ab614ed7cb813c6558abafb0c1cfcc002d04edee856667f361c1a23b1297fc71b70af28069f320bab923403dcd56b48e2143a2 kanagram-20.04.3.tar.xz" +sha512sums="82a90e3ef602ec90755f82292b7dbafbbef91698c7279a7b20de66b5fc2bfa2ac5722d4f4852f0c919ca9f6b6b3db069649efe33b9d2c3df95856deeca11bab8 kanagram-20.08.1.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index 0837f3941..3edb143b5 100644 --- a/user/kapman/APKBUILD +++ b/user/kapman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kapman -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b291f4ab39e5f0fd3e0624bf65afc2fc1fb5990ce73cc90a2737fa8fd420d6d9692a64c75d15b6710d62e81045e41751e14cef5a9907a86b92e00bf93399c8a kapman-20.04.3.tar.xz" +sha512sums="0bc9577e52a7ccb5bef1eccdcce56dabb5f65085c3cddfb1f969916ce95f1a58b65282d14395eb7c20ca3eb2c4fd686b9bd11ecf58f92a0085afd1f8cd128b56 kapman-20.08.1.tar.xz" diff --git a/user/kapptemplate/APKBUILD b/user/kapptemplate/APKBUILD index b5cd35203..8f1b148e5 100644 --- a/user/kapptemplate/APKBUILD +++ b/user/kapptemplate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kapptemplate -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE application code template generator" url="https://kde.org/applications/development/org.kde.kapptemplate" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29d5be322cee268e308513c2080eb8b87cec251fa09bc8ff9aaf9705126c69a9bc8a7173fa96397125c5190f6ec8f8a46d460093a666ffeeb7aa5d74be5f041b kapptemplate-20.04.3.tar.xz" +sha512sums="02a3e9d0f7d6fc08059365eeaa070f906c8cb618b0f4b0ca69543eec493d97c57205211a71309088c3d0eea057a335224ed6dfdbb133ed6c90f1069d5b9d274a kapptemplate-20.08.1.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 74bf7a2b8..173653793 100644 --- a/user/karchive/APKBUILD +++ b/user/karchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=karchive -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d6ac7a618182467975c26ba4a5294c2500e4216e9fa8c6d0be89a5ef0c2ef4573e7ef5dadd3ab01f1e3e378c2a5031fd6bbca39b17aa17baac3fa8892e2c5d32 karchive-5.72.0.tar.xz" +sha512sums="c43aef33cd5cd1128637ab8ac3f7c8f26eaa27fb9f14ce0f2b5d122be2cf08f4b758fe08147c570969834600f714c1e236d1e7c05864ce1cd2dd8ca2f4e62069 karchive-5.74.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index e55886e1f..b8fa340b7 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -85,4 +85,4 @@ kwrite_lang() { done } -sha512sums="b2c850a94f8d07d4df29156c710d492422a021a75dceae53c9452fc2f569534b627646c39141dc39182d2d8c1d13691240f2c586220f6aa1ba7d1605903f04f9 kate-20.04.3.tar.xz" +sha512sums="63d1c2d8371047abbdc3b1ea2e96b94a6f85ccec05ff5addc19f19d593e2b1760c91b4d87145d329516bd40e0bed740a94306df7760d1a2936edf09c87f6982a kate-20.08.1.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 2d1f22e2f..33c937d2f 100644 --- a/user/katomic/APKBUILD +++ b/user/katomic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=katomic -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="757d63edb5541ad8cf8524b7bfcd9f42c9ee0b5ceb3fd90120442a8ca58c40779ac0c53f0c66f238c46d7917590cdc2d7c18e5a8a8126b8271c5b68b680f3370 katomic-20.04.3.tar.xz" +sha512sums="18a076797404ef7528c7acf76a4b6db4c93b6c7c251439b637d63506e4b7c7e599418f6702e1d8ff906214d8dda5efcba033984117753d684e0f9ee00a311c9a katomic-20.08.1.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index fcfb6079a..8a0c40b26 100644 --- a/user/kauth/APKBUILD +++ b/user/kauth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kauth -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e6b3ed0de6aa9537f0fb6630857b2f61fada3643f49fd4797366a6fa2c554fdaf10bb513245bac95dce3d73feabc8728ef01567cea26ff707622a876e8af4d90 kauth-5.72.0.tar.xz" +sha512sums="277ff88cf447fdcf6c413997b4a3be871e7bddc0cd23cb379cb35f05c4b93cf68d7f0792eabc5d56ec7f043bf6de53ba9cec223750c4569a72e88c27f8d36036 kauth-5.74.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 11a1d7779..1d6ca8fba 100644 --- a/user/kblackbox/APKBUILD +++ b/user/kblackbox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblackbox -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2b97dab5f04807f03d84fa9a5611b3bbe733db71cc88ef4bb240d67419eb0645cfd5ac7ba46ca25b71d3f8bb5862134b9c5b2d96ca8f763cfc32312a3b4a3399 kblackbox-20.04.3.tar.xz" +sha512sums="3d57a9c0df8baab8c98bd56a02d128e575ede8308bee91e8b47996d473ac1bed8bfee7519de9b6868a38f2aa106c919a2c11db8ac0eb3fd97cce5508979bdc50 kblackbox-20.08.1.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index a8e13d581..25809f8c5 100644 --- a/user/kblocks/APKBUILD +++ b/user/kblocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblocks -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9179ef69c21fcbf7e6c1071f34d1ff93045f4fe16f50db42a88a116c49f30acfaa16e7e78b3731be584de76d1907208d050fbef9b246602efdc48038ed8a8671 kblocks-20.04.3.tar.xz" +sha512sums="4d892cce5e2e14c3f44477757d56a74b01fbd15ec050162a2707e7b859f382ec040c3774798b0f47d8fde50ed16c8e2348fa44c670f46505f2b6dc85fd328b66 kblocks-20.08.1.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 0b0790980..8600ca3eb 100644 --- a/user/kbookmarks/APKBUILD +++ b/user/kbookmarks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbookmarks -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67311098678fc670fbadecf0a0f49d97e43d650196600c9d24d3c998785b0bdf72e622ed99d2adc4450ebb6c9df2e3ee25a8d2a3586ef09a119864fac375b431 kbookmarks-5.72.0.tar.xz" +sha512sums="c12bf2f54f64bb2bb7ff3c7e4124d404369878f29ae095d919aed2ea57b07b78b8c9b66f8c8631fd0653ea7623a05425a5bc7d383d69ae079cf0cfaeec662be7 kbookmarks-5.74.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 09a9973bd..c395b38cb 100644 --- a/user/kbounce/APKBUILD +++ b/user/kbounce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbounce -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9391502dc08513036fa5dcdb571fd14596f6d143dd72231b1f8c9d23862cc216f3ba9468dbf9cd57cea5ab13af5673557221bb0bf65bb69c65ba43d4f12be140 kbounce-20.04.3.tar.xz" +sha512sums="32b867e9a4c95925a40aa53d51e3bbfde2e2d603386c453df86e8fdceeedb7cd8f1701950935d66be8932fbf8273840464bbc344393166924438bf4007a3b9bf kbounce-20.08.1.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 5e54bf9aa..e6737e979 100644 --- a/user/kbreakout/APKBUILD +++ b/user/kbreakout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbreakout -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="70005972ae58e9571dde11f68d4874ab65d934cd905786cf537cd3ac29c19a1bba29d4c5a79963d258a81f51926e2e5de543dd9152cdf5c4758f0003004a7119 kbreakout-20.04.3.tar.xz" +sha512sums="238070a42d0e91b8e788b7eb9da613c2d1a3897fd2ca055ac0182808dadba97f024e6619d2bd7052753226ba94ce69a394e6837cc120292b7b0252aa17fbf9c3 kbreakout-20.08.1.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index b4cf2c7cd..910f08f4d 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbruch -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2cfb9bdac40fc025ddb87429f3bc6d79f8797be699761378bb23067bfe84ecfd5d9f05d51c4afa0e2e962370e2c588ff7b50483fb7e14f6283ec747784f8c6b8 kbruch-20.04.3.tar.xz" +sha512sums="59ae2b50f229009cafb03a786059db5bed4cfd4c6dd668bd9a5e616b0d81f6e664e5acfe69d9539b42d767ebf8e93ec8f758853e6d01ec70b195ad86dd7a4d03 kbruch-20.08.1.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index e140c7f41..795d54942 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=1 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d7d6f224293cfea1282d97fea543c22b235386e63633765b6c6431c586d24948f70df11478d2f1bf96b6f1b03585fa20f03461b7f24898435c6d266311d061e9 kcachegrind-20.04.3.tar.xz" +sha512sums="a3bfb41f618ad360319372effd22d22c9486ecf8eae830f2a81f9e2253f453096cbc80d5c3b26c26f31449727ff854e9a79f5eb52b73f38786321a96cacd540d kcachegrind-20.08.1.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 42780bcfa..50c8c948f 100644 --- a/user/kcalc/APKBUILD +++ b/user/kcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalc -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dcc6765a8e0341f833e147015d1f6547adbe21eba6fe2bb7233bb717c29bc97115772001a7d7c654297b884ec7cd08373371d26ff60a50d2c4d527ebc0cf538e kcalc-20.04.3.tar.xz" +sha512sums="13e9fc58d3a60934d5d648da113ff40701a4a81d0618f575c9cc7f6af4b7c9b283e9c699b448e83d462a63774d1e507df4d7a442360782425302ff9b0081e754 kcalc-20.08.1.tar.xz" diff --git a/user/kcalendarcore/APKBUILD b/user/kcalendarcore/APKBUILD index c51eb43b0..a313c8340 100644 --- a/user/kcalendarcore/APKBUILD +++ b/user/kcalendarcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalendarcore -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a25306ac357282c27a38ecb32ed3687ad259bf814bc67104c66a750fe4c6e76522fdc670e9237b1102f05b38685c8654688ff6a35cb8f8cbb84fc07a3d5cb626 kcalendarcore-5.72.0.tar.xz" +sha512sums="f6b48283d5433e171a1961abcbf47422fb8ce1e6412d0a83de20c16b2e81e065e16c1525440e1a29791b31ec74fbe672878cd554fceab703cc0c9c45c23524af kcalendarcore-5.74.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index b34bb275e..a808f1af6 100644 --- a/user/kcharselect/APKBUILD +++ b/user/kcharselect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcharselect -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f286115802d76d94ec7b42d874cbae750b707fccce00f3292cf861ded72ce32bc905a477c07afd03b24c214e3716ee7db445d1174bb6642fff9692a5046ff998 kcharselect-20.04.3.tar.xz" +sha512sums="7b6e2c2dbd7c7d78189963f99ff73833b1ac34f7c6e1a00ee23c1e2c522d58b6907fa70c587312bc0fee7f7709db48f0f6572e707bc07ce7996688de8908c0b6 kcharselect-20.08.1.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index cc68d5c4d..3608fe220 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7709e077b93999df5f3abca570a6f75f6866e70ca666dae02220b12daf92f0dfe06fa1f2bd62333e63e45472e6a0094d59df7d8b8b4b69bc37d8d8c4396d34fd kcmutils-5.72.0.tar.xz" +sha512sums="105664749e73eeb0b911479d3befe813eef290d7dafa4ec51c134a79c58826361f90e18acf6d8f5d5b7e8d5d6a5956a73bc31e2c6f3de9ad45fec80341963c7a kcmutils-5.74.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index d54696e0a..bef2f8247 100644 --- a/user/kcodecs/APKBUILD +++ b/user/kcodecs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcodecs -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -15,7 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcodecs-$pkgver.tar.xz" # secfixes: -# 5.72.0-r0: +# 5.74.0-r0: # - CVE-2013-0779 build() { @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="39e902a8e0b3485dd0d146f2af0d6b166c8373015ec6c7baed53ceea67285f64d95368eebf302a153e916338f53a1357ea88f9ff3940d90f6953daf9afbbf2f9 kcodecs-5.72.0.tar.xz" +sha512sums="1858eb0d18b79ee197e780d995a30bf208d63acc17d8f474d27ddb67ffb4e0e7c8a909a1f3750a1121088735b4a6087609bba6d7cbf0838d414adec2c53d6491 kcodecs-5.74.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 3a9036c79..9ceacacd3 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcolorchooser -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="21ceff866c4658be0672625e9f3143d47a1ca0afd08e82db4a2648e8369522c4746b762db1e36c9da462ab109d7c55184dcd59c99843b52bc9c6a2f8cd031909 kcolorchooser-20.04.3.tar.xz" +sha512sums="77d2c19fb851e75821e463b6501822223fc6f122ae8bfb4169823eb4a61aab28ec9205970676da3b76e33b4987066326f27bd4d1fdf9de83d91451fb3a1b9969 kcolorchooser-20.08.1.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index db9a15b3c..b45b3491f 100644 --- a/user/kcompletion/APKBUILD +++ b/user/kcompletion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcompletion -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8273b4130d7d4deb8f92baf1759af8ad3fa25d692d99530a2149c035c578dc6109da9cc6ff5c2860cacf3b2cbcd48710135430a96bcb3a66e4df2ae74bf90337 kcompletion-5.72.0.tar.xz" +sha512sums="d63bb7a1f4a2ed42888b3811328416d0a63ff3f9cd2fd64f836cbaaabcdd5a11847e26d00e96ab2794f08c02cbfd60a969caa53f9210c21c0a85a3ce688cdaba kcompletion-5.74.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 34b97505b..4012a2427 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="951e3efb9eb229337cce55a00e9a22688548d448fd65007bfe413eb8af98cf18faa3e825c572d50ae0d0ee760e692532055f5ed018d2f9d9ecff70acf7bf1069 kconfig-5.72.0.tar.xz" +sha512sums="6c2bbf8aabef7344e5e085664d77c50b97541f2412e2c60f64f76b553034369b7a25cfbdd251f2b62e3bb91c2cd98749051cea3855ed09fb5baf80a098274242 kconfig-5.74.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index de6095577..ec546b4b3 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="07ec3af4df3837549bdda248ee1db217d5423bd823355c09517bb08f2531e6358f08b2a8bdcbdf7f637fc306cd929cf124a56c1a4eef4e0daba3c8be813f3857 kconfigwidgets-5.72.0.tar.xz" +sha512sums="c51f005494aed3587a3f39a8582d5cb3e1f9e4c6da0074d9e9ad78038e63663278c891231c6358ca38ee9b41e00fe13da2bf0719b3213507eae8e5da35275e76 kconfigwidgets-5.74.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index 777362891..eff412c83 100644 --- a/user/kcontacts/APKBUILD +++ b/user/kcontacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcontacts -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="00a6331db40c315ae503dc84ddbf1a14e729925ab69f387d11ffa2669108ffa03d0494513d419f5006d4e99cff244acf519fd7f40311cc3e73995d8d029cd2e9 kcontacts-5.72.0.tar.xz" +sha512sums="a4c78e0676a52abbee473310924280a7776c79bec3cf2273379f0c90e904ea0a31f5b5bd372472b29bfa5ec3a7ca5764af9e422bfc6a06fe3158287182815c71 kcontacts-5.74.0.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index 12231fb2a..4c909a632 100644 --- a/user/kcoreaddons/APKBUILD +++ b/user/kcoreaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcoreaddons -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad984361399bd147dc9f67e1abcd5f648e1f2dea29e874fc74a239da4fb9ddc6c05f8a3d224004845f828a2ac60ae67caa36d7ba9c356d3c38873abcbad0c20b kcoreaddons-5.72.0.tar.xz +sha512sums="bbb1bdba02cf745ac705753558719d2b8b6b8279bdde2b77013da25f44f56421c5199efc061257f729ee4430e2674c4818941d89fd908b76a5a044628bbf9d3c kcoreaddons-5.74.0.tar.xz d462866912d9cc9a768477d872142eb67be6b616c044436a27aa71577546efe4aa323b3dac913f9dbb52fc62dbe27d464b30ac3c4cb23c5d7c414d96138e9300 utf8.patch" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index ae6d7438a..8c9a3813f 100644 --- a/user/kcrash/APKBUILD +++ b/user/kcrash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcrash -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="10e51007f6fa16bcf7e4e34d555c59ef613ca5237447212190e47e5accca598f4f2f0ac7945fc86f0992ec95712446df47399aff39aebfc7f791c9b05c4cd628 kcrash-5.72.0.tar.xz" +sha512sums="082a18aa69e62b05c262111396fbda62a5a5192f345ed9563f9f549ca05be34d6027e7339aef66d46d02a3fa7abc57c362db49dbbb71e94111815644890f0447 kcrash-5.74.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index 6fcb13e79..4da049c11 100644 --- a/user/kdbusaddons/APKBUILD +++ b/user/kdbusaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdbusaddons -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d7183b08a0d35d0ecaddd98bd7fe39924d77af8ebf0040f50090a82097f5e56f8fa5c55f5b2deff05ab040624074eac3fbd71459f79245ee148d705a058f2239 kdbusaddons-5.72.0.tar.xz" +sha512sums="752726ff477e0159491a4002b60720f962bc832fbf824c342cfd16194b253ef5d94963e2aaefa0daad46af73fe62b4afa888a05846123533f2a8b875be90e72a kdbusaddons-5.74.0.tar.xz" diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD index 02419dc38..219a46ee6 100644 --- a/user/kde-cli-tools/APKBUILD +++ b/user/kde-cli-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-cli-tools -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE command-like utilities" url="https://www.kde.org/" @@ -15,7 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kdeclarative-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev kinit-dev kio-dev kservice-dev kwindowsystem-dev libkworkspace-dev" subpackages="$pkgname-lang $pkgname-doc" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kde-cli-tools-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9cf32f4b87b1cf45f9e034c9929ed38a39de989c36cc0118d4f544fbb9ceb4b9419d2d518165a1c2d0b0dca4ec20f063f771dad4859bb6df1975afaa6388412e kde-cli-tools-5.18.4.1.tar.xz" +sha512sums="c73695a1ecb81b9222e213f0e98c37354560e32dc56fe8e5ebe1665f7f86a88326bd7a32f4b66d2a73826c9d684f5410306ef5e6660751601c77eae0c6f16d4c kde-cli-tools-5.18.5.tar.xz" diff --git a/user/kde-development/APKBUILD b/user/kde-development/APKBUILD index 72927d748..dd26afd8c 100644 --- a/user/kde-development/APKBUILD +++ b/user/kde-development/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-development -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Development software from the KDE Software Collection" url="https://www.kde.org/applications/development/" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 668049c39..edda9abd8 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 877430f84..029cf1163 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 752f4b885..867c26a03 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD index c6e951067..586a66039 100644 --- a/user/kde-gtk-config/APKBUILD +++ b/user/kde-gtk-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kde-gtk-config -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE System Settings panel for configuring GTK+ application styles" url="https://www.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev gtk+2.0-dev gtk+3.0-dev karchive-dev kcmutils-dev kconfigwidgets-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev gsettings-desktop-schemas-dev" subpackages="" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kde-gtk-config-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a6ba26c4d0b4936fcdc8a32a8d0e48294757a3315de38bba64bbeaed2d23a0ccf117d54208af502f30e5d5878a4a925a84c061adf23741d5f64db539efa2737 kde-gtk-config-5.18.4.1.tar.xz" +sha512sums="2ef81b454789136692fead9af2b8d7383805ed5cf91f9f781e637f65cbc293b9ac03be7583f5b5848c4db956da4212027c5b54a878c3796ff975292deef9aa84 kde-gtk-config-5.18.5.tar.xz" diff --git a/user/kde-internet/APKBUILD b/user/kde-internet/APKBUILD index 0c0b7826e..d21c76918 100644 --- a/user/kde-internet/APKBUILD +++ b/user/kde-internet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-internet -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Internet software from the KDE Software Collection" url="https://www.kde.org/applications/internet/" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index fa9aa4096..c38f200f4 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 4aa4bdc4a..cd87d7301 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-system -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" @@ -9,7 +9,7 @@ arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" depends="dolphin kdf khelpcenter kinfocenter konsole krfb ksysguard ksystemlog - kwalletmanager partitionmanager xdg-utils yakuake" + kwalletmanager partitionmanager systemsettings xdg-utils yakuake" makedepends="" source="org.adelie-linux.about-system.desktop" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index e9241812f..8f2a4c5c3 100644 --- a/user/kde-utilities/APKBUILD +++ b/user/kde-utilities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-utilities -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kdebugsettings/APKBUILD b/user/kdebugsettings/APKBUILD index d1b0bb962..62ebefaa9 100644 --- a/user/kdebugsettings/APKBUILD +++ b/user/kdebugsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdebugsettings -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Set KDE debug settings" url="https://kde.org/applications/development/org.kde.kdebugsettings" @@ -12,7 +12,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules kcompletion-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kitemviews-dev kwidgetsaddons-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kdebugsettings-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdebugsettings-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af6770415d7f8ba5ff56c13ce7227cc1b22b2db2f24da3ae5ee9d03d3275ced87dd0f73d310f0e4b1eaeb20bbe26df76f40b7c6a258be506529394d044826012 kdebugsettings-20.04.3.tar.xz" +sha512sums="991c066b949e213713df1880fd2a74d4dab536c22e690f63a28f1fdeda668a009d7b4bb0e1100afc4f357884d736f356d9c1d97ab1f9fd2bdf6a6f70899ae89c kdebugsettings-20.08.1.tar.xz +a2abbf3a3e0632ba30c68083f3df11e2a1dc29124b155fcf62c12e7af92324333be09b3c00117525a21f75a3e7439749389bf5df2f43ea52317c9725d15ee3b8 lts.patch" diff --git a/user/kdebugsettings/lts.patch b/user/kdebugsettings/lts.patch new file mode 100644 index 000000000..420e83f27 --- /dev/null +++ b/user/kdebugsettings/lts.patch @@ -0,0 +1,11 @@ +--- kdebugsettings-20.08.1/CMakeLists.txt.old 2020-09-01 06:20:11.000000000 +0000 ++++ kdebugsettings-20.08.1/CMakeLists.txt 2020-09-17 15:39:38.076796287 +0000 +@@ -6,7 +6,7 @@ + cmake_minimum_required (VERSION 3.5 FATAL_ERROR) + project(kdebugsettings VERSION ${RELEASE_SERVICE_VERSION}) + +-set(QT_MIN_VERSION "5.13.0") ++set(QT_MIN_VERSION "5.12.9") + set(KF5_MIN_VERSION "5.68.0") + + set(ECM_VERSION ${KF5_MIN_VERSION}) diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index be5aa701d..fa99d610c 100644 --- a/user/kdeclarative/APKBUILD +++ b/user/kdeclarative/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdeclarative -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -10,7 +10,7 @@ options="!check" # Requires accelerated X11 desktop running license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kiconthemes-dev kio-dev - kpackage-dev libepoxy-dev" + knotifications-dev kpackage-dev libepoxy-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="93d07dcb5c6d1afd94f08b370ec4c1400156e725d80ea955d21cad48ab511dcb828f95ccf2e301a120c49d22d8f29b94308e0c1fbf3059742701570f2038b988 kdeclarative-5.72.0.tar.xz" +sha512sums="8428a60146275dff201518764678bb7c5acce473bcfa584ea1b4924db485ade1b45e55f3aa758fbcf326b15e0e24dcb0913fbabbedd795b7b47e3b3f7e897f78 kdeclarative-5.74.0.tar.xz" diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD index 6dc6957d9..11bcdd7a2 100644 --- a/user/kdecoration/APKBUILD +++ b/user/kdecoration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdecoration -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Window decoration plugin library" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kdecoration-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kdecoration-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32ba5c14b8b11a9874131405f0cddcec8eec634afd016cb8454a0247ccef55a8411a718e1d3eccc5f23efedafa0a1d32a62e0dc9b20ce9133a09e23f4c6739e1 kdecoration-5.18.4.1.tar.xz" +sha512sums="ecbeeea7e2239999995facee481794bb35da359b3e64c0b4e10dd7b0d18d8cd43a6a13ff216ed963cd7f59a78b0b190ab994e6d30f7b84572a8cf69a74abb164 kdecoration-5.18.5.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index e125a4d7a..41944e59b 100644 --- a/user/kded/APKBUILD +++ b/user/kded/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kded -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9774fb214b454d699e0ca75f0c2f64ceb89aa030e04fc46a1c793418804bd11542ed21f3b1c812ab15b4e327902b2f8b9bbe767620ed96af027e889299d96bae kded-5.72.0.tar.xz" +sha512sums="625ffe6667a228d3330535d2049870fbee83a4c95ae221b733f9d22c608b37f4795c2e24c1cb91f87c78cf2863710062ea87c57146764323e14653d4baeedec3 kded-5.74.0.tar.xz" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index f424b235a..25ad3f1b8 100644 --- a/user/kdegraphics-thumbnailers/APKBUILD +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdegraphics-thumbnailers -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="03eebd6dbf39b4d06d4584478158a75ccaa2f5f04c102d542109972a3ce0458080763a4aa60a7a68d35ab822f45c9aa9f1d91cce20557574c2008e768f911c44 kdegraphics-thumbnailers-20.04.3.tar.xz" +sha512sums="025ec45838bacdec4d94d098e6a3a94b608023f4de0b2d8fafe8202493ca39f166951125243fa855ceb3ef77528810b6cd838cc5596d33f36d80c82a617d4cb5 kdegraphics-thumbnailers-20.08.1.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 79c246886..190fac6c3 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdelibs4support -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="00011144e62d188b686742b0f22ea8f68ea81dcec7d49b52cf0f9c0b13119f46f30185fda684f2e8e4ce1e8805d3eaf39d7b635915c2255a8a23039cc41b95f6 kdelibs4support-5.72.0.tar.xz" +sha512sums="a1b19ec933a947a1ebe3a60004341e1fa4fecd3a64de197ee997bbba6a14fae114e3409180d01de04d20e32e52182eeb9e85e131cba51601689f12eff4af3eab kdelibs4support-5.74.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 22fcf1c1b..fb0c11c6b 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive -pkgver=20.04.3 -pkgrel=0 +pkgver=20.08.1 +pkgrel=1 pkgdesc="Libre video editor" url="https://kdenlive.org/" arch="all" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a1b37440b212bd7a613fe1de16d8c42771f5bd0dedd80a2bccbab84517adb1a34f7649069b6a686f84114967b42c70278df9447107bfff361ca1a93bb366689 kdenlive-20.04.3.tar.xz" +sha512sums="540c13df8eb73f53d022895f4d4a67fd7523829b48628fd8b596af07962099dff8214f37aeb80339503afd4b0f11ab959b6af89b08e4d8a85f012fa1502e4246 kdenlive-20.08.1.tar.xz" diff --git a/user/kdepim-apps-libs/APKBUILD b/user/kdepim-apps-libs/APKBUILD index f8e1bd317..354992d24 100644 --- a/user/kdepim-apps-libs/APKBUILD +++ b/user/kdepim-apps-libs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdepim-apps-libs -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Runtime libraries for KDE PIM applications" url="https://kontact.kde.org/" @@ -16,7 +16,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules akonadi-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev libkleo-dev pimcommon-dev prison-dev solid-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kdepim-apps-libs-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kdepim-apps-libs-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -42,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3858a3ec173545383f71a02ca55662f7fd636d55f187cf0a46b1c2b663e793a298f053768e7ed4d0fec812e1cebdfce62a390d4a912bb2fc363673edeee464e1 kdepim-apps-libs-20.04.3.tar.xz" +sha512sums="0fddc873aad6e77c43d74aa5b2673ef7e815a477c2ad5f574c15a87ce68dfe39c786b3230d0d88891a6b039bfda935d3072343c3507faa2e0ebb3f775570ae7f kdepim-apps-libs-20.08.1.tar.xz +af2d17c3e388790d94ff88860df1401d9cc76a043bf62007870441d20e005f0e58c6704357dadd0cba8ffabf8cc5f99d2a3654489ef6f5b7fa99caac1f0c730c lts.patch" diff --git a/user/kdepim-apps-libs/lts.patch b/user/kdepim-apps-libs/lts.patch new file mode 100644 index 000000000..31a214918 --- /dev/null +++ b/user/kdepim-apps-libs/lts.patch @@ -0,0 +1,11 @@ +--- kdepim-apps-libs-20.08.1/CMakeLists.txt.old 2020-09-01 06:38:36.000000000 +0000 ++++ kdepim-apps-libs-20.08.1/CMakeLists.txt 2020-09-18 01:14:55.635098506 +0000 +@@ -28,7 +28,7 @@ + + set(KDEPIM_APPS_LIB_VERSION ${PIM_VERSION}) + +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + + set(AKONADI_VERSION "5.15.1") + set(GRANTLEETHEME_LIB_VERSION "5.15.1") diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD index 1d40d7213..170bd33d5 100644 --- a/user/kdeplasma-addons/APKBUILD +++ b/user/kdeplasma-addons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kdeplasma-addons -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Extra applets and toys for KDE Plasma" url="https://www.kde.org/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kross-dev krunner-dev kservice-dev kunitconversion-dev kholidays-dev plasma-framework-dev plasma-workspace-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kdeplasma-addons-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +41,4 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="1ec38e56b132e1d774973d2a8a758bfc88de01c96a11e95507bfebb4c5fcce35c6f9e446fabf5e9754678232d31ee95d8470340f7d5c861960ceca81b20b45ee kdeplasma-addons-5.18.4.1.tar.xz" +sha512sums="7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6 kdeplasma-addons-5.18.5.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index 327e4a51e..5a68295d6 100644 --- a/user/kdesignerplugin/APKBUILD +++ b/user/kdesignerplugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesignerplugin -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04d92a05353e8358623ae4762f1d5fe2c01ddf24147810c98d7c30ea52b7267953ce9018ad599c25a723eaf6c192fb026d712e0d35e8496455ccab113b0c9e6a kdesignerplugin-5.72.0.tar.xz" +sha512sums="3d1fe367322ace3dcc665775d5503e9d8d413de6b0a8af710b1f774e33cd7b335b7a42ba619191a6bb6729def7913ed7e606cd9adce8aeeee9ca96c5241e899e kdesignerplugin-5.74.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index a34776bf5..ec43df9a8 100644 --- a/user/kdesu/APKBUILD +++ b/user/kdesu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesu -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="04ee875bf81ce529ef731a4035b3fb94630a9e8223e038aa6b4d708df195d03345c7fe0e57fe3b26312636b80b00a16bff39fe4fc12a4aaf209094cb6e004c50 kdesu-5.72.0.tar.xz" +sha512sums="7d04ded1fd6e466d4d851bc87475c1ab9d459fe1b8c25f284a196ce90fb1ceb16d0c532a14f1bf75b005cf0f09049d07268270ffb508e0c334b8eb1a8af13b5f kdesu-5.74.0.tar.xz" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index affb0af1e..d6431c3db 100644 --- a/user/kdewebkit/APKBUILD +++ b/user/kdewebkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdewebkit -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="KDE integration with WebKit" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="35d03459adc4095027900f7b6f911e3a5ed82b40e12365cc89184293b472d92198c29106352b384350ebb5dfd2e49173fe3998fdf5a3fad7d51b16475a411693 kdewebkit-5.72.0.tar.xz" +sha512sums="2363bbcf1d83ddc4ab30c80347c44a0c5ec1a3527772ee476ba488d5e58ae7ff6cba942e5da46d4400844ea56afdd116ffdb8693571753b7d50aa1b73ca53c0d kdewebkit-5.74.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index 1db7b0aae..c19152870 100644 --- a/user/kdf/APKBUILD +++ b/user/kdf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdf -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df8ebbc258b5ffe9becd8beb4911dc16e0d18a5e0860a8dafb0e9a492997f6aa7741cbe789eff1eb89bfbb52ec4dd9a057d322669f3c9e2b5888bfdd3cede8aa kdf-20.04.3.tar.xz" +sha512sums="b529145d5f6a5d0ff84e3ce5843cafd8e370701d2fc1892410e1ec57e2cd6fcf9879b3925f9169032c8781eca2796a4bb230a7a138bc9eaa8d79da88805fab82 kdf-20.08.1.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index 9ccb170ce..994ae7218 100644 --- a/user/kdiamond/APKBUILD +++ b/user/kdiamond/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiamond -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b298724f37ca29784e9239716d97041c4219b9a1bff565bb034cbee7af40fc3609056ff019fba83d0c46a8005bc2b51e92130e4b431d427af068f95c5884e72 kdiamond-20.04.3.tar.xz" +sha512sums="35f13586c943893acae1db2bccc0166193a1e4cab90b6d43a4b37264ed9bac5851cee838b3f8db7e1ae74b57068f67602849626abffc05bb06db8d61b5eaab7b kdiamond-20.08.1.tar.xz" diff --git a/user/kdiff3/APKBUILD b/user/kdiff3/APKBUILD index 925b10184..ff523e7ed 100644 --- a/user/kdiff3/APKBUILD +++ b/user/kdiff3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiff3 -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=0 pkgdesc="Diff/Patch frontend for KDE" url="https://kde.org/applications/development/org.kde.kdiff3" @@ -20,6 +20,11 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + + case $CTARGET_ARCH in + ppc) export LDFLAGS="$LDFLAGS -Wl,--no-as-needed -latomic -Wl,--as-needed";; + esac + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -40,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d kdiff3-1.8.3.tar.xz" +sha512sums="100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8 kdiff3-1.8.4.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index 3e26dddd7..3a9e46819 100644 --- a/user/kdnssd/APKBUILD +++ b/user/kdnssd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdnssd -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9042e1873b996b9df5ab75f72cf2050035ea1e92af21fa2e47afe65bd3a6e57fd5e783a476494b18be7e2bc3f9c998b3fc0049a99a4579f069c12a901f6d4a7d kdnssd-5.72.0.tar.xz" +sha512sums="ec9ad5b4c3117accaabec7d02fea28cff503788d3dd8a3696f35478b677925071dbea2d714e5ffceeb76ad898fb66030f0e4c3dfbcc7cf7292e05a0fd5102ccc kdnssd-5.74.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index 801d04d2f..8c250ccca 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a4164b797a47353090725b6c9ee97220ea882aa8a15ff3d4ef143305423684c7fa611b923d458ae739252025d4930f72530c7b02f7f0d6933120c42bfc51e292 kdoctools-5.72.0.tar.xz" +sha512sums="51a410c7cb9440926b27908be77ea9c26050943e4d3bfc24125b803b4104e22c0ca2963c7ccf968ab0d334846a4a3588fa7ade341cf02ec7d8ede4a06fe20327 kdoctools-5.74.0.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 79e9325be..a780c5854 100644 --- a/user/kemoticons/APKBUILD +++ b/user/kemoticons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kemoticons -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c767351a3c3a6a857f3b4240205a92a705c9204394da15b0f5154e6aba2c3b834f403729aaec1774cc8e70be26b8a101185303f610dc752421a43b2908039127 kemoticons-5.72.0.tar.xz" +sha512sums="b4f2a232cac9b997d204b8bdc1a217d643091c7bb723208d3f35268997b6eb07dbb9dff1d26c4732c8dd5f96e0c2e37549293532d412f8c175b5498b6d472ea7 kemoticons-5.74.0.tar.xz" diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD index 63d1a84ca..00cfdc438 100644 --- a/user/keybinder-3.0/APKBUILD +++ b/user/keybinder-3.0/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=keybinder-3.0 pkgver=0.3.2 pkgrel=0 diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 9dd12361a..9877c3cb3 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6f1c8dad61428b32c3aaabdc6f178fec07c96fd831c9e4b2be92130258241ea6d51c4ff6c0f3e42d22bd29b1b8fbf742e12725e6ec4229b9e59ad18f68e7ce7d kfilemetadata-5.72.0.tar.xz +sha512sums="7b07d051f1bd339af6e24450c7ad325685d2ba1e4eda2adb14a25b91536f80d3a045d77501b143a41aa54012b043aed3a324f7c24fef60e72e63f42830034010 kfilemetadata-5.74.0.tar.xz ddbf9eb485b9f20c87284434bb705f2f401c77f6eaa2e611ee0cb4f15ef585c47c8dd39eb2f38e347f80db5e2bc0362861ed90beb8e09d9882172a899e473bff test-mimetype.patch" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index 1eb66211c..0acbaca6e 100644 --- a/user/kfind/APKBUILD +++ b/user/kfind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfind -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cedc192ad1247131a2f708c4ff1266636c57eaf60e46b58f2b5eb9aded61aca63ddbdca936ff8cdc216891569e7c2aca9cf61371f93468df1bca799f8df3117a kfind-20.04.3.tar.xz" +sha512sums="572e092baf9040b4fe31a4d4cf8b11ea1c9aa4f746404810b107d1a428f4699977beb0eaba32dec9706a52163fa986cd22d0313242979d209b02a44c044604bf kfind-20.08.1.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index a7290cffe..79beb55b5 100644 --- a/user/kfloppy/APKBUILD +++ b/user/kfloppy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfloppy -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0226a83e4350c10c3a706d2fc82fb64b510cb992b7c20a1d72dc880da3fb82896be8ff5804aa22c5fd47233625e42afed7239c6cc9ab7fa2f25c0fedef03f2ed kfloppy-20.04.3.tar.xz" +sha512sums="ca6421035f05481f47c826179686f309b49defa39ba2121cb25e012016a15b7d3ddce2cb74ad9bd952551e2d84e0c3e84a0ac2d89ac4d5188291316c643ddade kfloppy-20.08.1.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 8b0450af5..d290ecbda 100644 --- a/user/kfourinline/APKBUILD +++ b/user/kfourinline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfourinline -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="895fd642e6407d4b2d7f78dccc72a257585cb9e47986186428b40e8d78ab27926346cd79390911660f9673014b872d679adee815a37eb864a1d6923d662523c7 kfourinline-20.04.3.tar.xz" +sha512sums="92395b371b2cb92cefd97ce3fc3068ad9b4a9895b9cfa1319cb32dced7eb8f8abe7d05e0b34396d6a589dcb1777a0c680a281e6b7241f51f2c445ae1774a0d6d kfourinline-20.08.1.tar.xz" diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD index f033c706a..22d943607 100644 --- a/user/kgamma5/APKBUILD +++ b/user/kgamma5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kgamma5 -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Control monitor gamma from KDE 5" url="https://www.KDE.org/" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kconfigwidgets-dev kdoctools-dev ki18n-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kgamma5-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5ad1154a84568d0cfa7640f028f9059e5b9f09f1104990ef21d06fb7fdc3d74ba7c6fafcaaff7b4f303682bf521f10db76849b131f9a020a2b8d354b5e1160a5 kgamma5-5.18.4.1.tar.xz" +sha512sums="a6d242293468eb702600334361bc1299823235b059df64ecc6b2a6219f7801a1fb7ac7f13e71475d877ac03623d72043a6c35c31531fda97af883265deca735c kgamma5-5.18.5.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 3613979e5..f0e48df2b 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgeography -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5921fcba4fb2e72a78adad91bc0886818cf473b4c5ebba6d42496205ef76284836a9d71d283514add3cb75a7ce5970b23a62fb08c8444490302368dfe7bf7d5 kgeography-20.04.3.tar.xz" +sha512sums="a1de3e9efc855fa39c1247c30b6e1033d9cf3f2e9bc921560f848c4a73fe7882a3e4d8eea7e9fc4e5352f135d28fe44313fd45de3da0fe4cb2aec73a8878cc5d kgeography-20.08.1.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 10add8da1..dfc1e159a 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kget -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" arch="all" +options="!check" # Tests don't work without KIO/D-Bus. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev @@ -40,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="55223e8e32392ea46dd50d90e532119fe8908641c6e49a29e62bd2f6a67db29940efc5e6344089c9e090810e9319399ce3dbdde61bb93f737591df03bfdf7f33 kget-20.04.3.tar.xz" +sha512sums="24e3b63519d582fd52d8edd70e749b61c5d9a162dcc481a8cc67222925589b87020ee3e81ae726e525b8c0bf55ce277a7fae43cabb394862309418642996c206 kget-20.08.1.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index 0df19d87e..f856f5657 100644 --- a/user/kglobalaccel/APKBUILD +++ b/user/kglobalaccel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kglobalaccel -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05430b734df4f127b68149e4b08e563fb35ba132f047437eaa41877962fb1e8f82c95880a3573d5f3e91a87c138150db735a996ce54bdad4b26a9269d73a9ed5 kglobalaccel-5.72.0.tar.xz" +sha512sums="c97e35d0b2f2932f622dae406d385f2d98504fd5970ac75f48b66277283da2a5957e5d547fe6dc21369631a32827b561139f99307a30343e7bc93f54c8cd5918 kglobalaccel-5.74.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index fe2662190..91d2c1a9b 100644 --- a/user/kgoldrunner/APKBUILD +++ b/user/kgoldrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgoldrunner -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1c759f7e7fe7f4369f7fe1b1812f8e5a1e7cd5c6588f67c6998849e01c013826f517401d541130be8d03ab152b737176889a70f7f6c8e2a13cfe440fa9ffb91e kgoldrunner-20.04.3.tar.xz" +sha512sums="ea2c19a80fe0652ef878f3a2683f225a1aa97d7efe4a19dd70f06af4d3f7fde60062e4911c34680a599d66e36ddfb8f70b15439586b618e218a654805ae898bf kgoldrunner-20.08.1.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 1f93a580b..774184fa2 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgpg -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b36ff19ee02a8bbaa64cfece378178fd4d10700a0f62a44e3d911cebeb147564c577336681937e3be795924ab1da522a38b07a32335c95c3c7f711361f0a8a9c kgpg-20.04.3.tar.xz" +sha512sums="326a440b1fc12520c46e516d609697327d46eac5e62ef012411f3b3dd170256d4d72b2ddd741ca985c36934c63d999da80d6f6850db8a22fb640541dac918b2b kgpg-20.08.1.tar.xz" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index f1778e2a8..8c7ae7170 100644 --- a/user/kguiaddons/APKBUILD +++ b/user/kguiaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kguiaddons -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="03037263d10dc75d7a409856d64b460e078e550841261287a141325a72aca3dc09ff5cb62f6c6a53ae44259380d283c9e76d33edc2a6e777c7ad58e379e64f30 kguiaddons-5.72.0.tar.xz" +sha512sums="9943b908fefc12a82678102f439d79ccf4207dd8ebd00ac9cd23d0428cbdc5fcc41d11c04deaf7d63a76a1be24b28c1998e80098b620d7a9c7476ae412640686 kguiaddons-5.74.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index a54197585..10d8d732f 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khangman -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d70def96ffbfed0dfca4e3ac21613639f0344520d8364793d22fe8e90cea376ac7024959007660ffa9e9849fa66158752db83333acd15103e09467a5f5cf5037 khangman-20.04.3.tar.xz" +sha512sums="e158c4478de86b9b775caa6f967643932cae7a7944279c46abe7aaf82b5e02a6c66f67e2db6b6d7792043a8d998366abd5d8b579bb2c2cf6cd0a4fbbe8562cac khangman-20.08.1.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index f5c1c2e00..73458205b 100644 --- a/user/khelpcenter/APKBUILD +++ b/user/khelpcenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khelpcenter -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0859633ea0a9e8b9a304057e3261614e560d6764d60c42eb377c8cd2d1e9ef3c185feb7221276c6b160365c6041c6711891435d8ce23c1b53ef660706ead14c0 khelpcenter-20.04.3.tar.xz" +sha512sums="ea0ff074533b72b1fcafbd21535e6f5a5407a9dd254321047f6ea3958b1fa237925625e4460f2110dd604672e13213f4c554beaf46a4cdaa8b0af54fca04ad56 khelpcenter-20.08.1.tar.xz" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index 3050c693d..0682be65d 100644 --- a/user/kholidays/APKBUILD +++ b/user/kholidays/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kholidays -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca97d24de46db1131af391a4a45c38001bae88c04994f377f6b22dd3bbe35a40432adce34d29587dcde2863e96305844f10902f452621e1bca43035c95b021b6 kholidays-5.72.0.tar.xz" +sha512sums="f35ba7c9ee42383ff629ed61dbc054656d40c7f59172bde313e897e718ee7151db79c8827582abfeb286f05c5c7b4d875c75d9790800b43c5831eb98a66e2195 kholidays-5.74.0.tar.xz" diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD index e9aee7205..cdf0e785a 100644 --- a/user/khotkeys/APKBUILD +++ b/user/khotkeys/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=khotkeys -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Hot key mapping for KDE Plasma 5" url="https://www.KDE.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev libx11-dev kdbusaddons-dev kdelibs4support-dev kglobalaccel-dev ki18n-dev kio-dev kxmlgui-dev libice-dev libkworkspace-dev plasma-framework-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/khotkeys-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c290c75caf175e66b69f182cb81348d0926b03dd569533dd6da380c299d416fd42f06d6c18fc6791c913e31f955c9adc98c20215442d7d93561b9bdb278e36d khotkeys-5.18.4.1.tar.xz" +sha512sums="67e5d904127764e89d4a5c5d1c5fcc6ff0070d2a298f1032189dd3e9e17246482431ae651869d157625fc81caedee2a897947a6cb0bbe7508b5d76c61f5fca85 khotkeys-5.18.5.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index ee3bf8575..61e0cb2c6 100644 --- a/user/khtml/APKBUILD +++ b/user/khtml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khtml -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f1d5feca1e164d361ec9175277f5646ee39ebdc5bc601556cea2c0f0b859e1bb044043c685ddcb4d5e4d883e14ee5fd6f278838e2b5ddcf9f1fd4cbf982308a5 khtml-5.72.0.tar.xz" +sha512sums="c8c8453d05475196c6d91ec9289d1c396d7dc149d07955912119ce6c9cca44071d9e51676375499b23a923f626e906f18b0bd564db6760e53628985f1b7deb2e khtml-5.74.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index 41abc7789..8234ceeaa 100644 --- a/user/ki18n/APKBUILD +++ b/user/ki18n/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ki18n -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="754302680a70e8c8a68ee9b2873b6d42a806c4f473b2daf1d3435f4e70d9e285a5e93d092f8503218d17f8981d87be7cea388c5ca4998fab973c5baf806a582f ki18n-5.72.0.tar.xz" +sha512sums="5027dbd316ea429f72aa45ac215675d970ab5625741fe0908c63957646ec4f12b1d21e7649787364d2d716cd1ceab11a505a4271f28b85a0e18dcbc6c3b15ffe ki18n-5.74.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 2cccfa3e8..626dba356 100644 --- a/user/kiconthemes/APKBUILD +++ b/user/kiconthemes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiconthemes -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="55184ee31084ae56d47a1f618b2484c2994c2d022cd19e7eae75850f4affb25b7e90c4510c3e3d1a6bb81c5b4fd60e780819ade7947ab62f4c778606cc342acc kiconthemes-5.72.0.tar.xz" +sha512sums="1d34c98b2ec7c59f6960aacc222a9478212c5224eee883c4c6082dbfcba312d4fbedf164b11b5fc07d6f19a1bac65a593ed91ca65c38f998274f02c5b4ed2cfb kiconthemes-5.74.0.tar.xz" diff --git a/user/kidentitymanagement/APKBUILD b/user/kidentitymanagement/APKBUILD index 4c8cb0a59..9cb76e59e 100644 --- a/user/kidentitymanagement/APKBUILD +++ b/user/kidentitymanagement/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidentitymanagement -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Identity management library for KDE" url="https://kde.org/" @@ -13,7 +13,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev kpimtextedit-dev kservice-dev ktextwidgets-dev kxmlgui-dev solid-dev sonnet-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kidentitymanagement-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kidentitymanagement-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df5507c67fb151953b8e1ab98580d77e297a13fdede2ee5b484262768932335b8289ebfbb83ffa8eaf8a3e85c25f61b13ffd73823aa210fe9d940f3361a33f80 kidentitymanagement-20.04.3.tar.xz" +sha512sums="f31e44e5f94b0fc3209a4f5d5e9f638f6dafa36fdbb71a5e50ae450f34701b8eb431f5618f6fc74837b9b9f91d8906a7d04f544c69ba5cf6247c415a3f30c593 kidentitymanagement-20.08.1.tar.xz +23c745d4479e8eed9f855ff8e5333547457c2dc33fc09ad81cc3ba27acf6a3db2d7ed6e4ec455d6590e817eb8274d50d728768ee1366b0855b488bc6de524b34 lts.patch" diff --git a/user/kidentitymanagement/lts.patch b/user/kidentitymanagement/lts.patch new file mode 100644 index 000000000..48c8b639a --- /dev/null +++ b/user/kidentitymanagement/lts.patch @@ -0,0 +1,11 @@ +--- kidentitymanagement-20.08.1/CMakeLists.txt.old 2020-09-01 06:33:32.000000000 +0000 ++++ kidentitymanagement-20.08.1/CMakeLists.txt 2020-09-18 01:16:45.463179222 +0000 +@@ -5,7 +5,7 @@ + + # ECM setup + set(KF5_MIN_VERSION "5.71.0") +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index 8088dbc3f..7db4aab64 100644 --- a/user/kidletime/APKBUILD +++ b/user/kidletime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidletime -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a5fd03eabfbe99368b670fe78c985a65d354cd38eb3f4e5bc6fa25d71c36bfe48f14c8cbc64035d286ec9f29780fa168febc1e1284af9f1fac30cb7f94608cf kidletime-5.72.0.tar.xz" +sha512sums="4edc4b6ac3164da38401552bab8645ee2db025d519eadc87d9c2d93284b7e7d5b91410d18f443d64d7b1b0573d9e58b04945e3847e07401d62dd8826accccae3 kidletime-5.74.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 0f0c32039..55a85c583 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url="https://www.kde.org/applications/education/kig/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64d806c901387dfeaf799ededa22ffd6a2471025d6e3f91940e1f70c3619b86b8427aa1dd97bd59780083173d6e8951205cd8385714682131d45724d72efd963 kig-20.04.3.tar.xz" +sha512sums="2fa0b0ebf88159d8df8cc4d02264680d2fbe81f7c6fd7a177ac6784a8c6348b00843d09a3ac88eab6f8a9817129fff9e57ab5aa906e1a34b1981687cdcfe3d9e kig-20.08.1.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index ef83f27e1..6173ce292 100644 --- a/user/kigo/APKBUILD +++ b/user/kigo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kigo -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26d1bd6d282e5cd535408148be13ab468831ef7ff2c6e75052a65804123fb4440ba54a0fa1d280834ce83400d8f897825bfd34cc02751800660e953762779981 kigo-20.04.3.tar.xz" +sha512sums="c45e44667fc586e7f8ceb86e287f4f021861d80526e607dc05c77f3761b0990b238ce8ccfd9672786dfae0af7bee251869aed0a6f23a555b77ab78f712eef7de kigo-20.08.1.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 7e0c2afb9..85f4d7a32 100644 --- a/user/killbots/APKBUILD +++ b/user/killbots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=killbots -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0336667db017881a2bff454c2cfd2c5e80ee19d4567b89c517f072f190544616cce29664bd8471de517a9df3e1a7d7bdc726b564f3904965e03ba9464391441f killbots-20.04.3.tar.xz" +sha512sums="2b9315b89f73f81438f887b1231737b4b945a3296547df004300d48bbc5f7f8b98c251a8f8680a9db41469921e9f658fe6bce0b7711de92ab809ccc68793cd91 killbots-20.08.1.tar.xz" diff --git a/user/kimap/APKBUILD b/user/kimap/APKBUILD index aba216edf..f209f5c48 100644 --- a/user/kimap/APKBUILD +++ b/user/kimap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kimap -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="IMAP library for KDE" url="https://kde.org/" @@ -12,7 +12,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules cyrus-sasl-dev kauth-dev kcodecs-dev kcoreaddons-dev ki18n-dev kio-dev kjobwidgets-dev kmime-dev kservice-dev solid-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kimap-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kimap-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d9bfc2390270eb46b903e54f88e84fbc8dbae0cbf71fe69ad826d77d64978c1512b7c9de617ab64cb449d5c0d6fa386ab60f3da634bdcbce01b924a36a7c10e5 kimap-20.04.3.tar.xz" +sha512sums="57d81f46d81d338eadef445828d57cf1288533312265b72aa1eac384441a9d347f3e71b4a02eb85d6770bc47d93bbc5ce37cf4ca235d54cda89b989bfcaec332 kimap-20.08.1.tar.xz +9746ee64f706fe4b5cdce73caea2d4bc334bf336d741da8bc2814ad2ae5a18226dd68a09910e032624699ed08caa48098a202cc122f540f0f04abc461cd94100 lts.patch" diff --git a/user/kimap/lts.patch b/user/kimap/lts.patch new file mode 100644 index 000000000..b99272eb7 --- /dev/null +++ b/user/kimap/lts.patch @@ -0,0 +1,11 @@ +--- kimap-20.08.1/CMakeLists.txt.old 2020-09-01 06:33:38.000000000 +0000 ++++ kimap-20.08.1/CMakeLists.txt 2020-09-17 16:29:51.347885651 +0000 +@@ -25,7 +25,7 @@ + include(ECMQtDeclareLoggingCategory) + + +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + + set(KIMAP_LIB_VERSION ${PIM_VERSION}) + set(KMIME_LIBS_VERSION "5.15.1") diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD index c015c7713..22b748000 100644 --- a/user/kinfocenter/APKBUILD +++ b/user/kinfocenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kinfocenter -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Information about the running computer" url="https://userbase.kde.org/KInfoCenter" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev kservice-dev solid-dev kwidgetsaddons-dev kxmlgui-dev kdeclarative-dev kpackage-dev libraw1394-dev pciutils-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kinfocenter-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6b7c5c4c755afdc3c04ca15f6a958cf541d33b03c731fa77a5cf99fa015d0e35a00016ab7f21b6b1f30afd7c423dc4fdde03557645b040d325509a6ae8c44dcb kinfocenter-5.18.4.1.tar.xz" +sha512sums="c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886 kinfocenter-5.18.5.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index 191f08215..949af4d7e 100644 --- a/user/kinit/APKBUILD +++ b/user/kinit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinit -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a18ca2d8395964284b78fe662b2eac9141df9451e8de47a4a0d80f64226e8228d45382dd4bdaf4b29bbb6ae79f549fb5405a7206fd4fe266f4a6cc7643e51c39 kinit-5.72.0.tar.xz" +sha512sums="a75e972fc2b4d967c3a7600260b7aef0754b40e0b5ae8803ee29c2186736222fd88b22349431393a9731d59ef7ed9bb184f413a39df82ed735d82130042423a8 kinit-5.74.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 597696c56..67856146b 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio-extras -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="25de00a7e34ce9dce36a0935544a5f4684f31db6b73e191dd0e781cc3f3f0c761d504a8d85ce8fa1fbdb827f0adccb0f4fbb09c7295456074835ffb23e114ba3 kio-extras-20.04.3.tar.xz" +sha512sums="b8e40f54de08e813b775fa2f1a16c4c444cfb17c74d0c13dcb431a5a26e684beae5951662b8b28ef84d5c5f2a5d988dc7c0ce90d19cfa4bc76f5aa8b63db9fcd kio-extras-20.08.1.tar.xz" diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index c10d2ecc7..2620d60d0 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio -pkgver=5.72.0 +pkgver=5.74.1 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2e89d38a70274d34d2d5c45abcf75c35cf93bbf9987b4b590e351620fa9b2ecf360e24cc8d2f79e3ef2ada6e2a5f364ee16d6062f77f01a1b285b2527618529c kio-5.72.0.tar.xz +sha512sums="a563b939d2bc71443c6c748ddf293fab84072efebdcea639707d7aaf2739356a906668be3dca915464ce7c81b63d7482ac024df786e04bbafcf999cde5ebc5e2 kio-5.74.1.tar.xz a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch" diff --git a/user/kirigami-gallery/APKBUILD b/user/kirigami-gallery/APKBUILD index 348814521..34bc2ae89 100644 --- a/user/kirigami-gallery/APKBUILD +++ b/user/kirigami-gallery/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kirigami-gallery -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="View examples of Kirigami components" url="https://kde.org/applications/development/org.kde.kirigami2.gallery" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="860e4a09bdbf6a201ec3107b94a0cfcb6f956b26a93f9b01b89bc1ac9b67e13a798ced51d3d836ff7638ee352900eb4ae9085d266d0c3c07de407329713b4bd2 kirigami-gallery-20.04.3.tar.xz" +sha512sums="470a7d617005fb35e1ed7bad41dbe683bab1bf5019e872fa574e04d5b871d1a7b9c9d1315b3ee1f772de82970c0a3ec92995c88f8c659033d57893a639dfb7d7 kirigami-gallery-20.08.1.tar.xz" diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index 8c87980ba..13c617979 100644 --- a/user/kirigami2/APKBUILD +++ b/user/kirigami2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kirigami2 -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="1de45469e5804af015dc9bed531dfbb739163e10226e71c0b6d9b5ca3a2b193dc0b75c543775c9795e27d7bef5f4351ab4e312c212d2fcf47966e614946e26e9 kirigami2-5.72.0.tar.xz" +sha512sums="43059bc682e2d729a0a926e26ce5ba68947f275ffdd74836c124d9e063273429ccde8c0cebaef53168c46cfd62f41cb2c33d86f1f515ca619bde604aa7f5da5f kirigami2-5.74.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index d204153e9..5f9957dd3 100644 --- a/user/kiriki/APKBUILD +++ b/user/kiriki/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiriki -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f4d6eff93c3432d5606644ac4a30b37d37fdadbb0f2a05b5fb115fa99d5f226078dce16aca0ab6549d82f77131c802e7bd97d4fa67dd739b7ce3945030c54a7 kiriki-20.04.3.tar.xz" +sha512sums="eb57b5957cc57f2cd788473410663c789236ddb217b7a4901ddadde0ed671105dcb7a12a6e4745f3f5c799d03a96a54e22c1e30a63e446449e751f115c85ef61 kiriki-20.08.1.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index eff622e7c..169c7d516 100644 --- a/user/kitemmodels/APKBUILD +++ b/user/kitemmodels/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemmodels -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ea296038c0e4e5fe2ee665d28320668616c5ffb94683b081f4bde8e04748a1312e447987ba16406271ba2a67487b2a5590a88b186de0c5149dfb96e80a773bb3 kitemmodels-5.72.0.tar.xz" +sha512sums="f160c9dfb81bf1d835aef2930a7274ca22edbedb31a6423d5989661eb84bf958077f0ef24d63fc74f87a2c0d18b8f96abc110e3a40aa062f72d8c407b5f0d9db kitemmodels-5.74.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index feed1c343..75fbfe8ab 100644 --- a/user/kitemviews/APKBUILD +++ b/user/kitemviews/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemviews -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bb44a6dd41b1ccd8504458d7f28c3e0a8558d647aeea659158e27a051db86eb404b6f6b4ba080323266caa57ed0dc83d1d26ee99e47d305c7c215f2518854fab kitemviews-5.72.0.tar.xz" +sha512sums="873786ec95177b29be9456c39fbf77eb04f56b0dc48cc3dd6e6377c77eb5bfea493b9f044920267fc5363d6cff86610ef4a431f45427771aacedc580859d9503 kitemviews-5.74.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index 45f75c14e..5d90d220a 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiten -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7d2a11354ee2070ca02b733a2945530f0baaba0138b66973b1efac5bb9475a0bcead6951404af02d1e18d676c125c6e17f367f0d41e2b5e86bec874c44eddad6 kiten-20.04.3.tar.xz" +sha512sums="2878e4d12ccafa927d4bb2c115765a2430f5e7aa25314953f02fad7fe4487cb600d7bef36735dd97cbc5f95e21797920c48e1e10b45afd651f726de16f3a9590 kiten-20.08.1.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index 737c56cc2..da3f57b54 100644 --- a/user/kjobwidgets/APKBUILD +++ b/user/kjobwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjobwidgets -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6382fe45243abb5fdf5d58052f519bfef79f7bb59c1ca2b5420e449364d6ac722a56a3cc66c03b3bd6be723cd1be1c0db7bab15ec0fd7c05a6074cf456b3efd kjobwidgets-5.72.0.tar.xz" +sha512sums="0f7c16f360627b133e101e340e67aa22959b8539581f7495bb950e031ba69e931d6a3a2619b5f6f0c0d5164b6397b2edcd4afb8c8b2e4874477547dd200bee48 kjobwidgets-5.74.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index e01438a8c..4e504a42b 100644 --- a/user/kjs/APKBUILD +++ b/user/kjs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjs -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e926c5251954186c7ce8568b64a921cf6e7a7c379e8b481aeca5e4ce6d9fa4d1bba11109305e41832d8a167905462d63c43765c73df4bd5ae3067696ab56f6b2 kjs-5.72.0.tar.xz" +sha512sums="2b592547048dc7ecd2546e02adeeee20693e5f403e7efb9c8a134aefddb1a105e5baf4c7c55e1d3c3e60072cf0f4c17631c4a7d4c1760641114798a1da0f07e1 kjs-5.74.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 572aefdf0..ff8e04fce 100644 --- a/user/kjsembed/APKBUILD +++ b/user/kjsembed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjsembed -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="80761776f8ecc54a16d81749989b047cd3b088c0e26c1685a5de31d16f056f18407939055e88e7fd49a24f64e685b304eb42903f1a9c0c4f0eae8ba21664a6df kjsembed-5.72.0.tar.xz" +sha512sums="b9a317b62b4605effd59a24b55e37155adfbad0b802c885da666e7e9560ad8f7ed3ce65ac49622f47c185190394d722b73d5888077510e6e616c8ddcb92160f1 kjsembed-5.74.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index eb25d2357..d04a97ddc 100644 --- a/user/kjumpingcube/APKBUILD +++ b/user/kjumpingcube/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjumpingcube -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="63a37453020c2305efd8833cc223f5709f08f0f0ef3ea1a5dc8e5b0aab763ec9180199b249c7e28119bc5c8db16d525fe25d606a5b6c5c057c8fa889ad5b3e45 kjumpingcube-20.04.3.tar.xz" +sha512sums="c13e13021454829eb76f9a152fe503ac3b38092b1177affa3a96f1470e5de1b1a7520c9bde434b60a55d61ee0069e55f9705d04fbb5c669c9cd257a700216282 kjumpingcube-20.08.1.tar.xz" diff --git a/user/kldap/APKBUILD b/user/kldap/APKBUILD index 91ae10663..95a3a49ed 100644 --- a/user/kldap/APKBUILD +++ b/user/kldap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kldap -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE LDAP library" url="https://kde.org/" @@ -9,7 +9,7 @@ arch="all" license="LGPL-2.1+" depends="" makedepends="qt5-qtbase-dev cmake extra-cmake-modules cyrus-sasl-dev kauth-dev - kcodecs-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev + kcodecs-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev kwallet-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev openldap-dev solid-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/kldap-$pkgver.tar.xz" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ae46a9ca2bc6d44c4ff4ba17d9681e74d20e50307af2a924b323487f368ade746a8d13060b8d2410b6f67a7a8577df2ef413f3987faad5c73eb49d4ac36d303 kldap-20.04.3.tar.xz" +sha512sums="3a6993941767cb3f14a024213502d207fef12b6f1f47a7125fe13c38f9b161bf91133915220ae29a5fcadc5192bc8b539ecf5ed9ecb06622ca505724b746cc2d kldap-20.08.1.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index b75d88a78..0077ed5c2 100644 --- a/user/kleopatra/APKBUILD +++ b/user/kleopatra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kleopatra -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -12,7 +12,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev libkleo-dev kcmutils-dev libassuan-dev kitemmodels-dev kmime-dev knotifications-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kleopatra-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kleopatra-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b72ffb37b3116525d8a531c056a0457e6fb3257081d639fc1c175c8dd4566e4f3c0989cfc696c43c92b630b43dcad90f667a9f3496fede0121065553041c554a kleopatra-20.04.3.tar.xz" +sha512sums="6cbd3caa8c773380e4b7f7b396ba45f7a21ae39afc3e6b55d507ea0ef53c6a5663635de1ff494c325b88a57918665485a68c8100b67fe77292b632451b67e63c kleopatra-20.08.1.tar.xz +18cba4b5562abcaaa6e949b46e9bdcce3f5af9f56233e397e1cd5cef8d5773775f077a4e332694cabf33dba423cd82a9d7e4627a4dc1a39e75bb17188f764f00 lts.patch" diff --git a/user/kleopatra/lts.patch b/user/kleopatra/lts.patch new file mode 100644 index 000000000..ae0272b74 --- /dev/null +++ b/user/kleopatra/lts.patch @@ -0,0 +1,11 @@ +--- kleopatra-20.08.1/CMakeLists.txt.old 2020-09-01 06:33:52.000000000 +0000 ++++ kleopatra-20.08.1/CMakeLists.txt 2020-09-18 00:56:19.206283607 +0000 +@@ -16,7 +16,7 @@ + set(KF5_MIN_VERSION "5.71.0") + set(KMIME_VERSION "5.15.1") + set(LIBKLEO_VERSION "5.15.1") +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + set(GPGME_REQUIRED_VERSION "1.11.1") + + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index d407cf4ac..12e80d6fd 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klettres -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8fedb9dbbb0f7d19cf7fe2f0687d56371eb716d8e40da762eef7798f40e462da137430497cc13331766c87652c9b32e65c839a0d7b5279e6ef36a59b0fc1ae4 klettres-20.04.3.tar.xz" +sha512sums="83e2735f53c7fcadd26944ce9c10cab29acdbf87bc92238fc94fe935f648f845ff17b19f323274d8c2782a9d8142ba5cc779c5bbc2b591836baaa844401badff klettres-20.08.1.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index c59e7bd1a..c5341c647 100644 --- a/user/klickety/APKBUILD +++ b/user/klickety/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klickety -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="617b8d4d4a43a3056a36d29a36ff7c9948311f206567b4d8dba35ee55cf69059653e10de99820f2ea663e07e0427450a3a43c1a7146bdbc8c98dc269e7c6a870 klickety-20.04.3.tar.xz" +sha512sums="2e1bea8f7011e4a83096caf220a7478e3736c47f2cad70f963939549dca5c035e4a868a58d389f1845a830137b7cecd6c8effad5b9400627c3e51fdd8b0ee5db klickety-20.08.1.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 46d6187f0..95d97f8f3 100644 --- a/user/klines/APKBUILD +++ b/user/klines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klines -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccdb8191589ae8cbe3cd74d117acbb39828eb4e9c197e31af169f2acd824086f4e96adba59dd6bbc6051b78992899c234316a2ded5fcf5930cf83045fffbeb30 klines-20.04.3.tar.xz" +sha512sums="5ed2c4041943dabb6582efa16831715862b16f45d038b396e13b999d61b6e2d94406302418bceeda10e72a2938de5c7d6084b216ac0b8a1c3c7e859a3c4c0b6a klines-20.08.1.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index ac91f47b5..e9dc30344 100644 --- a/user/kmag/APKBUILD +++ b/user/kmag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmag -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="44806fa8130bc2fc96fbd7484da157c0a75e2f2a00c8f4b1193dd755f13f23a4f23dbb89aa51099011628a96e5126e5bdcf99f3344d0903ccf351b62e52b1909 kmag-20.04.3.tar.xz" +sha512sums="44a6e161953f7557959a7a258659a276058c6230198d2bc1b50cf140d4a6af5436b40d161ff7bb611451ddf0748ebe33be39d4396a1d2fe45042aab38ea51ff0 kmag-20.08.1.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 115de67fc..d79a6125c 100644 --- a/user/kmahjongg/APKBUILD +++ b/user/kmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmahjongg -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a59ce38dc083981ba619e1ed039159a8655884dd515cacd095a1ac1ab16f35bddee202eaf6cd41b56237f0ce6bf0e5a0f0ee853d80ba169e0bacbd4f57d3aa5 kmahjongg-20.04.3.tar.xz" +sha512sums="ab599f34502bbbe8563295f7061a15b779b2cd4ac2aec69ad0dae97c557dd83fc0452e0a9798c9a544fdf3e82c63cbcc32d2d62d984791dfb23751592c77c514 kmahjongg-20.08.1.tar.xz" diff --git a/user/kmailtransport/APKBUILD b/user/kmailtransport/APKBUILD index 1f862bce4..3b80ed99d 100644 --- a/user/kmailtransport/APKBUILD +++ b/user/kmailtransport/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmailtransport -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE email transport library" url="https://kde.org/" @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c49b5d5a4f58aab8bcf7a7a5bdc10df38d91caa61b05501cc57530e09a68046d527cd2bfe2fc634d64fde7fb24f41fb2ae657a9eb3bbb4b2dea2fede0ccadf93 kmailtransport-20.04.3.tar.xz -f775ef03389421b1818d5f781c65d45d4154ebcb28c3114164d698db7b7149ef56f7f5bd222ce49de143f06a8eb23b63ba69809791a010144075df42d4783385 degoogled.patch" +sha512sums="409475cf4a34b15f7f2bed4d5e7612c8c72e90cb39cc778ce79f1132180cde311a2d490e2172787c1461ca017348faff74fc10203aa482f51ef81550a15e310e kmailtransport-20.08.1.tar.xz +0fbde4a8983be652ee10cd1c64391240c80ccaae697c77c43f8c9bc0bfd85cbe0dd37a5fc6860185ed15575c8bfcd198276c8291bbfc83bb1811a57eea5ea6a7 degoogled.patch" diff --git a/user/kmailtransport/degoogled.patch b/user/kmailtransport/degoogled.patch index 1bb7086c5..52199c040 100644 --- a/user/kmailtransport/degoogled.patch +++ b/user/kmailtransport/degoogled.patch @@ -2,10 +2,10 @@ diff -Naur kmailtransport-20.04.3/CMakeLists.txt kmailtransport-degoogled/CMakeL --- kmailtransport-20.04.3/CMakeLists.txt 2020-07-18 22:38:18.572259714 +0000 +++ kmailtransport-degoogled/CMakeLists.txt 2020-07-18 22:38:06.963507959 +0000 @@ -29,7 +29,6 @@ - set(AKONADI_LIB_VERSION "5.14.3") - set(AKONADIMIME_LIB_VERSION "5.14.3") - set(KSMTP_LIB_VERSION "5.14.3") --set(KGAPI_LIB_VERSION "5.14.3") + set(AKONADI_LIB_VERSION "5.15.1") + set(AKONADIMIME_LIB_VERSION "5.15.1") + set(KSMTP_LIB_VERSION "5.15.1") +-set(KGAPI_LIB_VERSION "5.15.1") set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport") diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index ec0ed1dec..378032ec8 100644 --- a/user/kmediaplayer/APKBUILD +++ b/user/kmediaplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmediaplayer -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="faa511b885eaaa0ba403911baa50c7c09519326d8c1f75d835be4c7cdfa2ddfd313a8e5293a1579b52b8abf91c06c0660f56ff45fb2c7db43348ea9b34c629f8 kmediaplayer-5.72.0.tar.xz" +sha512sums="e7d0ba3d2720b9d1dc99cf4f4b11ab2f7c949181d6f1a8bd83ab476d248a67c4f6440e7786b26424347c08b3b8e03fbbf3de1184ce09a7071de501be452eec4c kmediaplayer-5.74.0.tar.xz" diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD index 0c3734bbb..6f8e3fd48 100644 --- a/user/kmenuedit/APKBUILD +++ b/user/kmenuedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kmenuedit -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Menu editor for Plasma 5" url="https://www.KDE.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev kiconthemes-dev kglobalaccel-dev kinit-dev kio-dev kitemviews-dev kxmlgui-dev sonnet-dev kdoctools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kmenuedit-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6a4e45a8c97de0badea82d70ec1085b3b34c06fd11723dd024263e966bbbbae5cfc4c42dfe217f79e59d84723c418f7146f0dee55ace0fbb77645714731f4a49 kmenuedit-5.18.4.1.tar.xz" +sha512sums="647aed82a3190e2c27bac4e50eec681684dac08c6f3f7e8e0d2d02b8667e58b367a35a66b830083037570999655652a94f26ae063e253ceedd0db1df00ef834f kmenuedit-5.18.5.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index 6a1e2be50..5dd69a987 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmime -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -12,7 +12,9 @@ depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 kcodecs-dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kmime-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmime-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f97616a576f02e81ad0ae2386c4ba4570a1b068e6221837ac34552810e51aa75407a0b55078c0f104ac149720d2bfc61efe73cf045548a3f435b7028b186ddb kmime-20.04.3.tar.xz" +sha512sums="aae0322d0805c1730757c0fc57d270215e15340ef9963d023f9f9259c209934eff153f66fd691d8033f175a06938be00ed638311a84da408bb6a8ac5f9b8430c kmime-20.08.1.tar.xz +d6419ba0cfdfe1db729f5817a517c0dc78f60cc00ea296bae0bcd583711f63eee083f25be9b762b8f6b461bcb4c4f317150014516d00682bbc6db612de009acf lts.patch" diff --git a/user/kmime/lts.patch b/user/kmime/lts.patch new file mode 100644 index 000000000..09d5a448c --- /dev/null +++ b/user/kmime/lts.patch @@ -0,0 +1,11 @@ +--- kmime-20.08.1/CMakeLists.txt.old 2020-09-01 06:34:04.000000000 +0000 ++++ kmime-20.08.1/CMakeLists.txt 2020-09-17 06:40:59.440568761 +0000 +@@ -23,7 +23,7 @@ + + + set(KMIME_LIB_VERSION ${PIM_VERSION}) +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) + + ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 9781d28c6..88d47f34f 100644 --- a/user/kmines/APKBUILD +++ b/user/kmines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmines -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb13f8fcaae9134941d942c2b9457849fef0397bbada55387f47a3f0a147bd33e308cf41c78124ab4abbb249db0ece6fbbdb8e23e47a250895b2f4f10e9bc7c0 kmines-20.04.3.tar.xz" +sha512sums="2e991306367697af2657ab9ca0a8251d7ed9d43e7e97893fa5267c52f4c26686a16a997d3f75b71fc4d54af4a1318d97c1f69ba3b694697a4b2b79eae1942294 kmines-20.08.1.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index e657b3061..ae77a743d 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmix -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="80387a63fb8a9155448ae0c78fbf214a471e148561609e20af61830fed5172f203585d7502ca2dc1ade404eb0e9259d81a84039ba99342a2e3bb9d5ed6ba3b78 kmix-20.04.3.tar.xz" +sha512sums="7a5de71d7b9e0b1965c82ac9775ba518d3362d33ea0ef16c3302f1f48b54532a9806431fcc76d603402ac74109d382d2e4ef271d8561c3a315f67ae8f331cd9a kmix-20.08.1.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index 16cdc2214..c38376a34 100644 --- a/user/kmousetool/APKBUILD +++ b/user/kmousetool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmousetool -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d949c5c54a3bbfdc1ae6ab1795efaa7d2f08a18310a528c196ebba97467894a32417be18c555bdbbf5e485012b4a5492451d4aba00e9cf1847e31a27abfa0f56 kmousetool-20.04.3.tar.xz" +sha512sums="4393e41e796705a0555be67a2fe6925593f72a4e738f70d3010d77bfaf65fe219edc8669a9c662397ad1d5d8d378e416c73ccc08fa15156c078a312e88cf74a3 kmousetool-20.08.1.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 4f514d012..23c02f2ee 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmplot -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="06cb19924e6d460b52f419d29e028ab4cb13cab6ab14f1a27216d3d0ecd467676d337ec04d2c3fcc2b081853d3e0858ce2f2cc46279efc8fe692b8ab6a4ee5ff kmplot-20.04.3.tar.xz" +sha512sums="2a53daf7b0581558c30f9490363f7c07806671a6e5a76e5f3384718e9104a047042ca9a2bf169ae0a327997f3701ba206c6007f088b3bf326cbc499329cc573e kmplot-20.08.1.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index 9e68ccbef..08eaa4c0e 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knavalbattle -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a4300f137f45adc62d1741239712e27e8033581f26c16feb8a32097b214c84e0e81602a27f7cfe078cf2c3d27896bd5f8b3a508e8fd8632c378c72c176ae4de4 knavalbattle-20.04.3.tar.xz" +sha512sums="4fb18a15b2ccdbc9ff9794f15ceff76dc5ceabd4ca252ef352071e29caac7922a30b3124bf6bf8955afa287f6417c66bb6a319a25a1172610e707eddbb638bd4 knavalbattle-20.08.1.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index 459c1850d..d6c9bb6d3 100644 --- a/user/knetwalk/APKBUILD +++ b/user/knetwalk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knetwalk -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b1466213ff25b5e8352669e4fbc82da444897934faa21e27b758b15d65e12c59384c5edac6400700c57b52a59a67a9452687f834000694a93503887b576296f3 knetwalk-20.04.3.tar.xz" +sha512sums="4258f52b501ee19c20ec08d3ad9f27e6c97a254fea83b4e87da90bb545c9fbf7d8a63687f0c3a7652bc93d84e9f2a96b45713d69dbfb1bce98e60d7c414d1477 knetwalk-20.08.1.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index 38205c34d..58923584b 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dc2b89b7be62bd5cecce0b250ed1afd85f9c7a69715eda39e20ba25b6fd296d8fb7c50d29e9f885e24a986a4cd6fb3e16691194ee235ec4ec697350e6bf7f7d3 knewstuff-5.72.0.tar.xz" +sha512sums="038af364cf048035bc2d1a505e4f4c8318fd90efbfdd9c2fdffd9c22b1196a29b0d153643e838a98d472c19094e994a55983f84c63ef50f47574013a8b9f697a knewstuff-5.74.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 38801651f..825834db0 100644 --- a/user/knotifications/APKBUILD +++ b/user/knotifications/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifications -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dfdbad7b477c03ce478da6452b0f7208364715240ff64ede5808e9ca87671e11c184cd3d134f58485551752e48cddd613403d00e3ba929110d6d9bd44a3b47bb knotifications-5.72.0.tar.xz" +sha512sums="a44d0b0ebb7e825adc8c0c5b99f999769149cb3a12c147b81570737736030449136f86b9934b3b2287131f3c41f639c8cba92256ea1ebd39f5083fd6b7158bff knotifications-5.74.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 9c261cc79..3d329ed62 100644 --- a/user/knotifyconfig/APKBUILD +++ b/user/knotifyconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifyconfig -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c9bc7c2c2e4baf8ab06cdc9f7c419f7bff31eddfc2ab0208a79ad2b25903b76c952c73514fe30466c2cccd3f9226e5f4f288b313521b9acdedb726e46daed24f knotifyconfig-5.72.0.tar.xz" +sha512sums="73957b4977ebccc47c53fa65c6352ff333af7a170a55a6021e5426df3715c167a43170fc6d82ee7a452246560cc57a976341a013c9ed7afc243b74a18c755ffe knotifyconfig-5.74.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index 99a7f2219..a789effa3 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolf -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1f5a1502a609f7e3ab9efefd22506a660d3d5b331fe7890ad52d3ef26372daf7d511ebe251aeb961343f54f04884d204fb2c675d5ee5b482152b8db46c32b37 kolf-20.04.3.tar.xz" +sha512sums="ccafb536e2d68245d50302442536dbc1d70db6c836bab82d9ee29889a4a57b3af3ce09dc62a8e1b33fba8308f5499fa55c820adb192ccc83c20a1fd5bf3eb060 kolf-20.08.1.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 516270fbc..9bf1b017a 100644 --- a/user/kollision/APKBUILD +++ b/user/kollision/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kollision -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="42458c1308d785c06019da797bb1948066a82da5de2607878299e17766b2ab3279efdc2382276b4afca24dc3d922fa17837a93fca12e0879a3306b0fd68ce155 kollision-20.04.3.tar.xz" +sha512sums="d9c43ff5c82b4c3bb1d5bf8c908c8a6d51a2e98dead0aecfb99e2cab4cf94ef6358f7f22d13d822af89ccaf3108dc1dc13dfef6ffdc9eb71626ff74d0b58161a kollision-20.08.1.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index d0a913d46..12bfc3eb9 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolourpaint -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fdefd7de9cbb65f791b1cd243d60a3ed81994b6ae4243a76efe024d7259e64f214f5bb6d67e6dfdc7339dd6dec93bb2498d0b4a3e80104b89022bd881ad0a1a1 kolourpaint-20.04.3.tar.xz" +sha512sums="e871b6861459750d3b4d9ae0eef9636693be0902f78ca0902ca77ab5a6570d5e8723274891c7c96d65be4055d5339ff60066378036949524e0fe4859bc741b5e kolourpaint-20.08.1.tar.xz" diff --git a/user/kompare/APKBUILD b/user/kompare/APKBUILD index d1ea99957..e94aa6054 100644 --- a/user/kompare/APKBUILD +++ b/user/kompare/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kompare -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="View and merge differences between files" url="https://kde.org/applications/development/org.kde.kompare" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5eb80a8e6aaa4bc05b24297f86ef5bb018f078a62d7eb99345ba49b0d95fe637eef75df0c5caf469c75f0b32c5d8afa6b40f10e3f3c9f2730a71469ead446ba2 kompare-20.04.3.tar.xz" +sha512sums="524a68563c18d33118f8b58aeb16faa718e8830fa071a2318ab0d8cfc218de269035650ca68e8415e5e6da5e037ba697bbe6d802ea68da76f9c66a93340f42ba kompare-20.08.1.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index b32e790bb..c6b085568 100644 --- a/user/konquest/APKBUILD +++ b/user/konquest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konquest -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df78794926668a2f58434df50a24d3093d2f60e2c29906d46b98b3323d5f766a774431bf4ae20740a8e55bc2a13047582f8607165d75f06c57b7942f1bb06e71 konquest-20.04.3.tar.xz" +sha512sums="4bc34101aac2de4f58156af85bc1d5a1bf7a806e05dad892b55c365fb48143477b67fb4baa51b3550eaee9602ebe6f0ee3971a6ccdea4492747f629197e61c16 konquest-20.08.1.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 416e3729c..1cb2878d6 100644 --- a/user/konsole/APKBUILD +++ b/user/konsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konsole -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="37607f7aab099b48478179eeb7e40e25a75c3c0b1b20496ae34ccd883d6f30644206d7ee95ebd56e9620b88b80700a03157671dfecf538767e6cad476632d813 konsole-20.04.3.tar.xz" +sha512sums="3321b97ee738eee10a7bc7f1085b1180a4cbbad67c587149a9acacd96439b89ec5e463028a44f9b9590308614d2c37acca7b31748e290274021031528ec7b995 konsole-20.08.1.tar.xz" diff --git a/user/kontactinterface/APKBUILD b/user/kontactinterface/APKBUILD index 4a7aae210..e448bd9b4 100644 --- a/user/kontactinterface/APKBUILD +++ b/user/kontactinterface/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kontactinterface -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Kontact public interface library" url="https://kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a702d601ed90c6d90442bf13bf739917180670912dab6c3c4792046daa545ccb7294c8cb6a206dbd9fe6ef411eb7cd4cf113bc87e6b6f2f4517e8180fb4a6c87 kontactinterface-20.04.3.tar.xz" +sha512sums="65e741bce8b7dc7732ae03b772af7de7f7e90a0c17e0bdd3afa86e799a43cd5987605a48ef5b1e8b3342af1671111ca4248494e2f2c6262134dd83e81c3b40c9 kontactinterface-20.08.1.tar.xz" diff --git a/user/kopete/APKBUILD b/user/kopete/APKBUILD index 8eb618417..4430978a3 100644 --- a/user/kopete/APKBUILD +++ b/user/kopete/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kopete -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE Instant Messenger (IM) client" url="https://kde.org/applications/internet/org.kde.kopete" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="979f84c986f78aaab9bd23fb9e0df265ea8734d855b8370c93adbe037d6dfeb4271658dbd27c2b315b363731976a62750e2ed5dace45bc69e72c0645a533b5a0 kopete-20.04.3.tar.xz" +sha512sums="8a02f93facc113e5ae13de27e8c96087d970f6c5df4abba4d3ea9e6c0d4554e735420e578f1ff315a6c75f34d63eed083958dbaf3dd3efe2ec9143628b261bb7 kopete-20.08.1.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index c325648be..729c72364 100644 --- a/user/kpackage/APKBUILD +++ b/user/kpackage/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpackage -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dcf424964b2a1db2f94121a9aac687b70520d263883f8dc236e6143d9c54a7d055e6889ef468637a0c9f51740586723d080f0b1be67dce96404ab5b54da035a5 kpackage-5.72.0.tar.xz" +sha512sums="93790ed0cf527c93b2ba434ce0d4e753dcd31ab027c86e69d65a6f8075771b7d4b9ca9628a5164d1ff5aa4a69f84f11093df8f8d63f284127e2943aa8e443e72 kpackage-5.74.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 389eab534..1453009a7 100644 --- a/user/kparts/APKBUILD +++ b/user/kparts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kparts -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="497cfb1d210d2947c3ef5212640ab918058a128f62815fa8f778c3525952584c9d4e2012269d5e9910379ca8e63a14e7388b8591b256323db87bd93bacd333e9 kparts-5.72.0.tar.xz" +sha512sums="477dc2bbb9f66ad9064d362e898072c3b33a59267ec46627c140cd0784858b1d2b1c2eddfe7addf50356523e86e37f1cc138c4e73ce80c61eb96711fceec86b0 kparts-5.74.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 895c4ac91..6106fe15d 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpat -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d178a1360b37acdbba9fa33de56929b51c19b81ff6ee01d3f8780fe507800d9c9c1155bd0ae4e2f8b6baff5410133020c113aa6ed3f86aee2238f448216ce7ad kpat-20.04.3.tar.xz" +sha512sums="6b762070b4ddbd9cd02de0a6500edd0e08d047571dddd3e310a18e852faccd5f439761b8dc5ee9b93d871098790b3a4423098428b55e446667388ee4720f9826 kpat-20.08.1.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index 79a5a68e5..6a2fbf1b2 100644 --- a/user/kpeople/APKBUILD +++ b/user/kpeople/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpeople -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Provides access to all contacts and groups them by physical person" url="https://api.kde.org/frameworks/kpeople/html/index.html" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3310188ef1ab1d1023f8997314481228f9e875a40ef4f40dc517f578c53ba84866accfdac70b0d79167eba8dc1a6d55d60117ba78279d9ced04e554ecba17842 kpeople-5.72.0.tar.xz +sha512sums="c85ed5e3010d25153957159f6bda46882dbe806b9029aeeb5326ecde6b8e4f3a43bd37a57104757563f1ee7014fb216385c962a25bc0438cf4633bb4b41016cc kpeople-5.74.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index efb9b4586..08929124a 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum -pkgver=5.6.1 +pkgver=5.7.0 pkgrel=0 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7 kphotoalbum-5.6.1.tar.xz" +sha512sums="36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851 kphotoalbum-5.7.0.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 269d4bdbc..98fecc698 100644 --- a/user/kpimtextedit/APKBUILD +++ b/user/kpimtextedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpimtextedit -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -16,7 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev ki18n-dev kdesignerplugin-dev kemoticons-dev kiconthemes-dev kio-dev kxmlgui-dev qt5-qtspeech-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/kpimtextedit-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kpimtextedit-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0d7e0d84d9c25dbeb28413350e7f17f45c643e5335cd26fac28fb5e4e2bc2797d223f9137cbfc2f9fe2f13806ab321ba2a058b7dc40c02762707170285336abe kpimtextedit-20.04.3.tar.xz" +sha512sums="778a5d51fcd37f1003437e2929990ca0b0aadd80855798184e379d1d2ae09e6f1ba7a23249e36f96d076782f8121284faf2b9f2b35a339e97c6f176d4ff8e229 kpimtextedit-20.08.1.tar.xz +84832b4ef9f04f8de9e1498bcba7e4856781617931d350786b1624d8a5c394b3b8790670c529fc3010e94e2c53b23d99136fa82d76fdc8697d5e62fcfb5dfe96 lts.patch" diff --git a/user/kpimtextedit/lts.patch b/user/kpimtextedit/lts.patch new file mode 100644 index 000000000..660af529f --- /dev/null +++ b/user/kpimtextedit/lts.patch @@ -0,0 +1,210 @@ +From 1f3695894e9ca44297dc4004448ece8b3647525b Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Tue, 26 May 2020 07:37:01 +0200 +Subject: [PATCH] don't depend against qt5.13 + +--- + .../commonwidget/texteditfindbarbase.h | 10 ++++++++++ + .../commonwidget/textfindreplacewidget.cpp | 19 +++++++++++++++++++ + .../commonwidget/textfindreplacewidget.h | 4 ++++ + .../plaintexteditor/plaintexteditfindbar.cpp | 11 +++++++++++ + .../plaintexteditor/plaintexteditfindbar.h | 4 ++++ + .../richtexteditor/richtexteditfindbar.cpp | 11 +++++++++++ + .../richtexteditor/richtexteditfindbar.h | 4 ++++ + 7 files changed, 63 insertions(+) + +diff --git a/src/texteditor/commonwidget/texteditfindbarbase.h b/src/texteditor/commonwidget/texteditfindbarbase.h +index ae049ad..b7ac825 100644 +--- a/src/texteditor/commonwidget/texteditfindbarbase.h ++++ b/src/texteditor/commonwidget/texteditfindbarbase.h +@@ -23,7 +23,9 @@ + #include "kpimtextedit_export.h" + #include <QWidget> + #include <QTextDocument> ++#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) + #include <QRegularExpression> ++#endif + namespace KPIMTextEdit { + class TextFindWidget; + class TextReplaceWidget; +@@ -56,7 +58,11 @@ protected: + virtual Q_REQUIRED_RESULT bool viewIsReadOnly() const = 0; + virtual Q_REQUIRED_RESULT bool documentIsEmpty() const = 0; + virtual Q_REQUIRED_RESULT bool searchInDocument(const QString &text, QTextDocument::FindFlags searchOptions) = 0; ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++ virtual Q_REQUIRED_RESULT bool searchInDocument(const QRegExp ®Exp, QTextDocument::FindFlags searchOptions) = 0; ++#else + virtual Q_REQUIRED_RESULT bool searchInDocument(const QRegularExpression ®Exp, QTextDocument::FindFlags searchOptions) = 0; ++#endif + virtual void autoSearchMoveCursor() = 0; + + bool event(QEvent *e) override; +@@ -83,7 +89,11 @@ private Q_SLOTS: + + protected: + QString mLastSearchStr; ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++ QRegExp mLastSearchRegExp; ++#else + QRegularExpression mLastSearchRegExp; ++#endif + TextFindWidget *mFindWidget = nullptr; + TextReplaceWidget *mReplaceWidget = nullptr; + bool mHideWhenClose = true; +diff --git a/src/texteditor/commonwidget/textfindreplacewidget.cpp b/src/texteditor/commonwidget/textfindreplacewidget.cpp +index 0e208d1..99d4bf5 100644 +--- a/src/texteditor/commonwidget/textfindreplacewidget.cpp ++++ b/src/texteditor/commonwidget/textfindreplacewidget.cpp +@@ -174,6 +174,24 @@ QString TextFindWidget::searchText() const + return mSearch->text(); + } + ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++QRegExp TextFindWidget::searchRegExp() const ++{ ++ QRegExp reg; ++ if (mCaseSensitiveAct->isChecked()) { ++ reg.setCaseSensitivity(Qt::CaseSensitive); ++ } else { ++ reg.setCaseSensitivity(Qt::CaseInsensitive); ++ } ++ QString searchTextString = mSearch->text(); ++ if (mWholeWordAct->isChecked()) { ++ searchTextString = QLatin1String("\\b") + searchTextString + QLatin1String("\\b"); ++ } ++ reg.setPattern(searchTextString); ++ return reg; ++} ++ ++#else + QRegularExpression TextFindWidget::searchRegExp() const + { + QRegularExpression reg; +@@ -188,6 +206,7 @@ QRegularExpression TextFindWidget::searchRegExp() const + return reg; + } + ++#endif + QTextDocument::FindFlags TextFindWidget::searchOptions() const + { + QTextDocument::FindFlags opt = {}; +diff --git a/src/texteditor/commonwidget/textfindreplacewidget.h b/src/texteditor/commonwidget/textfindreplacewidget.h +index c918ab4..13926d8 100644 +--- a/src/texteditor/commonwidget/textfindreplacewidget.h ++++ b/src/texteditor/commonwidget/textfindreplacewidget.h +@@ -41,7 +41,11 @@ public: + void setFoundMatch(bool match); + + Q_REQUIRED_RESULT bool isRegularExpression() const; ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++ Q_REQUIRED_RESULT QRegExp searchRegExp() const; ++#else + Q_REQUIRED_RESULT QRegularExpression searchRegExp() const; ++#endif + + Q_REQUIRED_RESULT QString searchText() const; + +diff --git a/src/texteditor/plaintexteditor/plaintexteditfindbar.cpp b/src/texteditor/plaintexteditor/plaintexteditfindbar.cpp +index 9f8f2c6..4ad7013 100644 +--- a/src/texteditor/plaintexteditor/plaintexteditfindbar.cpp ++++ b/src/texteditor/plaintexteditor/plaintexteditfindbar.cpp +@@ -75,6 +75,15 @@ bool PlainTextEditFindBar::searchInDocument(const QString &text, QTextDocument:: + return found; + } + ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++bool PlainTextEditFindBar::searchInDocument(const QRegExp ®Exp, QTextDocument::FindFlags searchOptions) ++{ ++ const bool found = d->mView->find(regExp, searchOptions); ++ mFindWidget->setFoundMatch(found); ++ return found; ++} ++ ++#else + bool PlainTextEditFindBar::searchInDocument(const QRegularExpression ®Exp, QTextDocument::FindFlags searchOptions) + { + const bool found = d->mView->find(regExp, searchOptions); +@@ -82,6 +91,8 @@ bool PlainTextEditFindBar::searchInDocument(const QRegularExpression ®Exp, QT + return found; + } + ++#endif ++ + void PlainTextEditFindBar::autoSearchMoveCursor() + { + QTextCursor cursor = d->mView->textCursor(); +diff --git a/src/texteditor/plaintexteditor/plaintexteditfindbar.h b/src/texteditor/plaintexteditor/plaintexteditfindbar.h +index 5f19429..cf7ed57 100644 +--- a/src/texteditor/plaintexteditor/plaintexteditfindbar.h ++++ b/src/texteditor/plaintexteditor/plaintexteditfindbar.h +@@ -43,7 +43,11 @@ protected: + Q_REQUIRED_RESULT bool viewIsReadOnly() const override; + Q_REQUIRED_RESULT bool documentIsEmpty() const override; + Q_REQUIRED_RESULT bool searchInDocument(const QString &text, QTextDocument::FindFlags searchOptions) override; ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++ Q_REQUIRED_RESULT bool searchInDocument(const QRegExp ®Exp, QTextDocument::FindFlags searchOptions) override; ++#else + Q_REQUIRED_RESULT bool searchInDocument(const QRegularExpression ®Exp, QTextDocument::FindFlags searchOptions) override; ++#endif + void autoSearchMoveCursor() override; + + public Q_SLOTS: +diff --git a/src/texteditor/richtexteditor/richtexteditfindbar.cpp b/src/texteditor/richtexteditor/richtexteditfindbar.cpp +index 2e76ba4..3c5ad36 100644 +--- a/src/texteditor/richtexteditor/richtexteditfindbar.cpp ++++ b/src/texteditor/richtexteditor/richtexteditfindbar.cpp +@@ -74,6 +74,15 @@ bool RichTextEditFindBar::searchInDocument(const QString &text, QTextDocument::F + return found; + } + ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++bool RichTextEditFindBar::searchInDocument(const QRegExp ®Exp, QTextDocument::FindFlags searchOptions) ++{ ++ const bool found = d->mView->find(regExp, searchOptions); ++ mFindWidget->setFoundMatch(found); ++ return found; ++} ++ ++#else + bool RichTextEditFindBar::searchInDocument(const QRegularExpression ®Exp, QTextDocument::FindFlags searchOptions) + { + const bool found = d->mView->find(regExp, searchOptions); +@@ -81,6 +90,8 @@ bool RichTextEditFindBar::searchInDocument(const QRegularExpression ®Exp, QTe + return found; + } + ++#endif ++ + void RichTextEditFindBar::autoSearchMoveCursor() + { + QTextCursor cursor = d->mView->textCursor(); +diff --git a/src/texteditor/richtexteditor/richtexteditfindbar.h b/src/texteditor/richtexteditor/richtexteditfindbar.h +index 5341c63..d0041e3 100644 +--- a/src/texteditor/richtexteditor/richtexteditfindbar.h ++++ b/src/texteditor/richtexteditor/richtexteditfindbar.h +@@ -42,7 +42,11 @@ protected: + Q_REQUIRED_RESULT bool viewIsReadOnly() const override; + Q_REQUIRED_RESULT bool documentIsEmpty() const override; + Q_REQUIRED_RESULT bool searchInDocument(const QString &text, QTextDocument::FindFlags searchOptions) override; ++#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) ++ Q_REQUIRED_RESULT bool searchInDocument(const QRegExp ®Exp, QTextDocument::FindFlags searchOptions) override; ++#else + Q_REQUIRED_RESULT bool searchInDocument(const QRegularExpression ®Exp, QTextDocument::FindFlags searchOptions) override; ++#endif + void autoSearchMoveCursor() override; + + public Q_SLOTS: +-- +GitLab + +--- kpimtextedit-20.08.1/CMakeLists.txt.old 2020-09-01 06:34:13.000000000 +0000 ++++ kpimtextedit-20.08.1/CMakeLists.txt 2020-09-17 16:33:36.113343815 +0000 +@@ -37,7 +37,7 @@ + SOVERSION 5 + ) + +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets) + + ########### Find packages ########### diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index ec59bf26e..362f5314e 100644 --- a/user/kplotting/APKBUILD +++ b/user/kplotting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kplotting -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cea99437675f47021573fb7bf4ec493b76a231c387bb88b198ceb2d543e87ebe414ab8c33bc43d1e0f658e86936b363f06af8012f17a3ace3aa684c45d110580 kplotting-5.72.0.tar.xz" +sha512sums="54559904c8d2a5ce6827aee23587838c97aff173682652e192e0e180d6643ec98d4dff6e85e89baa7fdbb92e5b8f99079beb300c3f71c589bad8cc2f21bd7426 kplotting-5.74.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index d2a55162d..ab0aa552a 100644 --- a/user/kpty/APKBUILD +++ b/user/kpty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpty -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1c80aed7b5ded81434734eebeb297eaddefe4411e5470a98363b43a7ecf89429048dcb56031c553004f5a96ac76c243fdc98f1446608ecbbb295e2c060ebfd4b kpty-5.72.0.tar.xz" +sha512sums="2fda1f9598401e3993d4a0ad1988e92856e4c6b3b682aec0e57cd6434256274a31da43d44b0141531d61fee64120511dbe844dbef9ccf805307f33c9a0d60172 kpty-5.74.0.tar.xz" diff --git a/user/kquickcharts/APKBUILD b/user/kquickcharts/APKBUILD index 7bc3c5281..9c4f44ab1 100644 --- a/user/kquickcharts/APKBUILD +++ b/user/kquickcharts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kquickcharts -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="A QtQuick plugin providing high-performance charts" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="170ef5c5928e0949584dc4905a86893a477a6922f85eccb6d5d70938b8808bfc67a534eb88a712ef7e4e7b64a65790ac0eb08035b9cb2dc833f5b458bb3ab44f kquickcharts-5.72.0.tar.xz" +sha512sums="873b5d40b20c995c5cd0ad7e5303dcf29083a8e7bef42f7e5370638e5589728df95fd074de00f7f5276c46a37a37b9b31c9722229d660e024041a8d99ec29e2b kquickcharts-5.74.0.tar.xz" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index b84f7999d..2a1ea26a9 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f7ff9be6ffa612e8da0766309f812e7041393eb9b5ff4b1cb58385f1f754c0851357a4509bff7eea76e0e035bcefac9580415710561f1369dab1dd4e9f86a4ff krdc-20.04.3.tar.xz" +sha512sums="5569d0a72ee99b5ef82d01fb746bffd32426d91b49901bb5b2ecfbb57b713ebed7fbf3d2211d4671486ea7704d26d29229aaa5a7b6e91cf7c204e08a0518d21c krdc-20.08.1.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index cb3c0246d..dc267eaf4 100644 --- a/user/kreversi/APKBUILD +++ b/user/kreversi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kreversi -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fe211d107b0ba1ce7b3edd0c108be13cbfc7d6a3257c62e5536a248cfae6953e10c7ac0ce47d021bd7dc3e1c6d77799919939285e5d73fc466fcfec6d887fbc5 kreversi-20.04.3.tar.xz" +sha512sums="70a5a30fcfc2a5119cc631ec0f912d51ce3c1655d4832d73c0660327f5fe4e69ce8b485bdbe470e2d0f4a9d7d8d51346bb1342b335db90c446cdaf4f20e6b0e6 kreversi-20.08.1.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index c968718d9..bee9dcf48 100644 --- a/user/krfb/APKBUILD +++ b/user/krfb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krfb -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="91a8281fb6e9756de262fcc02f98863b1ec74a30a2ed6e2a51a73808e293680ac3dbee555af4dd007f9c3ecfd6163c7328cabf4f6cc31fa55932b7db56cad65e krfb-20.04.3.tar.xz" +sha512sums="90b0ec45b4420c6b7c8a8738293b53a38126220f750787ffa935af118c84c767621f59ceb7ea2eaf5344a0f37d236584adb23f26b1b90098640bce2c33b99293 krfb-20.08.1.tar.xz" diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index 150e97f4d..aadae57c0 100644 --- a/user/kross/APKBUILD +++ b/user/kross/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kross -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="812680b9cb7fccb8056bc32e0fc0b46910a24979cce9f25ab9ae87c5302086ea7b8bbc2758cfd888406b368f385b35fe5389c2f33b7b95c751a0dfb707dea83b kross-5.72.0.tar.xz" +sha512sums="0fd08d620d90f78ad0ce62aaea372dab4ad4df17533aa29fc1d86b718d0c7ca19a691298498b59a1d0d057eae902ec838f68f5238b482c91d568595543964456 kross-5.74.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index f41e6fdc7..568ab6dc2 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kruler -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6b683dfab8ee15d84723af481c0ea031f96266b321135a932f6442081a97f9d016392e57c789fc2ca1c0585286bdac230ae9d1cfa4cd18c4a898d7e92754396 kruler-20.04.3.tar.xz" +sha512sums="319e3a98cd0ccfa832d183c7b6ff2285af8935799d882360e3aa5b6c44162aa21b6b68247c090d8c82b41a139a7c980fdb0cc1d01a3f627d109d771db57664f5 kruler-20.08.1.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index 52f97afc4..956ff5288 100644 --- a/user/krunner/APKBUILD +++ b/user/krunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krunner -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="60102796a301d839ee29724111f1ef22a0b6b1bf7bf11d5952d219106ef38dd4278dbadd05043814c3d2d5b619c68252d9de46631a9bb6577cfd0a2e8ada2547 krunner-5.72.0.tar.xz" +sha512sums="504fb43acff3337920477a8f67e995a79bdc9e3816e8a92ff5f259a6e50201e4a4edb90cc483a7496daa87c26e39597ffec2b91fd9b315850ace4677f9ac0796 krunner-5.74.0.tar.xz" diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD index 64c3da085..fc31e192b 100644 --- a/user/kscreenlocker/APKBUILD +++ b/user/kscreenlocker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kscreenlocker -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=1 pkgdesc="Secure X11 screen locker" url="https://www.kde.org/" @@ -17,7 +17,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev elogind-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kscreenlocker-$pkgver.tar.xz +source="https://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz kde.pam kde-np.pam " @@ -47,6 +47,6 @@ package() { install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np } -sha512sums="f58e46b6b86ab49f458ca00604655369755d51b54e7f97ad1f640d4fa51bab5d904ee26c0981a2252ee4edff3063a40f5792b860cd39d19f3db8ba93ec9aed5b kscreenlocker-5.18.4.1.tar.xz +sha512sums="27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47 kscreenlocker-5.18.5.tar.xz 56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam 565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam" diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index 7d5e0e5c6..3a0245ddf 100644 --- a/user/kservice/APKBUILD +++ b/user/kservice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kservice -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="b6e7d819dcc1747d6ddaa1936cb52f910b7f0e4fa6db792420bd35c8c0afb6cc670375c4618a6703ca046cb440fa9c45b860b6eaa2905c0a264b9c7ed622c7e3 kservice-5.72.0.tar.xz" +sha512sums="7756047069ff22d1e78494770ec3fb56a07ce96459a759b8275188f75a9e9e5d334df0f7bc7c09fdf6f357c0e144cc115ba077a15079f8598bb042f37e5ce490 kservice-5.74.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 8f8c031b9..af4044468 100644 --- a/user/kshisen/APKBUILD +++ b/user/kshisen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kshisen -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="15ab1702a08b9616d9fd84f9707cf4344d327410283e785bb47eb9f9126319c0e00f5f480830198bb6db426e1abc75d92e5c142aec37ec01b072c840d3c735c4 kshisen-20.04.3.tar.xz" +sha512sums="57f05b125e09b9b67c31ea729baa4fe5c880e74191cbf5490ceffc7ef7887063d995afc1c21ef048db623bc063dbb0f18a95f2c19a816150b13e477c58a46dfa kshisen-20.08.1.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index bdb1416a2..aa3f70b67 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksirk -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0f7e1bd3e3b9acf0927bb15b65a9d9cc8f4b9411ecf22c6f17f75402e991526d97defd64f5d98dda4a4f41690c0ff1835e0fef0805c5074b029d47b03b38edc ksirk-20.04.3.tar.xz" +sha512sums="399269847a7cb38a8e865247dc6e45e73cad9d54331e42f35d25e061b85a02e109e6bb54a152bc27feb09b66ed0262ab748e7c60e31af8663e157cfe4443b2cd ksirk-20.08.1.tar.xz" diff --git a/user/ksmtp/APKBUILD b/user/ksmtp/APKBUILD index 3ca2dcbc2..d36f72ce2 100644 --- a/user/ksmtp/APKBUILD +++ b/user/ksmtp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksmtp -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="SMTP library for KDE" url="https://kde.org/" @@ -12,7 +12,9 @@ makedepends="qt5-qtbase-dev cmake extra-cmake-modules kauth-dev kcodecs-dev kcoreaddons-dev ki18n-dev kio-dev kjobwidgets-dev kservice-dev solid-dev cyrus-sasl-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/ksmtp-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ksmtp-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c9794ca8dd93e25c79dd22fab38f71a421da1612658830ffe87cc8e751db9624a3d1924edd52d6fdaa97044e4d1accef5b6807f9461f857bedccc00f4d54f109 ksmtp-20.04.3.tar.xz" +sha512sums="2f1fda7840b59a889e1f73c5a84589a37ebb1edadd9255297b3979a722d1aa153b59392c4a2438d896f40b22a4936d724cfb377e932d77d5ee681897c718434e ksmtp-20.08.1.tar.xz +eb0fc856526bba24c5fe6f98f99696c14d6249cb175787f46545f3c70adc6f98a7d031f74b1c22f564d30cce724dd4569550ff9db23869b0f7eb83b57527ef7a lts.patch" diff --git a/user/ksmtp/lts.patch b/user/ksmtp/lts.patch new file mode 100644 index 000000000..e0197e86a --- /dev/null +++ b/user/ksmtp/lts.patch @@ -0,0 +1,11 @@ +--- ksmtp-20.08.1/CMakeLists.txt.old 2020-09-01 06:40:11.000000000 +0000 ++++ ksmtp-20.08.1/CMakeLists.txt 2020-09-17 16:31:26.187530238 +0000 +@@ -27,7 +27,7 @@ + + + set(KSMTP_LIB_VERSION ${PIM_VERSION}) +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + ecm_setup_version(PROJECT VARIABLE_PREFIX KSMTP + VERSION_HEADER ${KSMTP_BINARY_DIR}/ksmtp_version.h + PACKAGE_VERSION_FILE ${KSMTP_BINARY_DIR}/KPimSMTPConfigVersion.cmake diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index 867a3b7e3..cfa2cd1e7 100644 --- a/user/ksnakeduel/APKBUILD +++ b/user/ksnakeduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksnakeduel -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="43e336c8eb8a7fb7390d257f176b8f451fc940126fda75a2daaebbbc5fa18cfb0bdb4b7221fb919486575aff7d5fcb7d8efd4812ce6b4065f318554b5461eb6a ksnakeduel-20.04.3.tar.xz" +sha512sums="d455ddebf11b0bbc57f87cecddc633fe0ecb03ac23e09b092ea0e9330e13e55e4ba6d48997451c92abcfbde8170a14745e0e070b1f7581302881af7e33a7bde3 ksnakeduel-20.08.1.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 0723fda19..e0c884960 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kspaceduel -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c62b03feb0b91e2e061d0e5b4a342f9f5e6f79f8336c04bf72ea6dc83ec9b5f6908a95aefaeff9583b26e7138f296147c79024baa6b3a5e7d6445c516bbe255b kspaceduel-20.04.3.tar.xz" +sha512sums="692671f0aa822fb86759fa8144004a87973e9e52a6d28042fcf4a16ba10bd6574b6a505d4b43f0540c26d6d6c366967a83745182a00be830521c1b83672b4883 kspaceduel-20.08.1.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 7078222d4..972a60889 100644 --- a/user/ksquares/APKBUILD +++ b/user/ksquares/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksquares -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a334f0b990edecbe03441a9595242b057d26ff837014a82dfb8b61491b563c9a0821d7f08b40fd5c667ea1afb755c47f01a5ff3b47ec1c16fa3798bfa3e8f3d5 ksquares-20.04.3.tar.xz" +sha512sums="ff266251830de12b89b6048fc01aa637b7f3501df48c40c263cb41119c9397924e6a79e18f384e2d4b8a834bafcc39960d5fa8fa194c8930156b9a7a97900ee5 ksquares-20.08.1.tar.xz" diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD index f0c780cd9..5e5ccc56e 100644 --- a/user/ksshaskpass/APKBUILD +++ b/user/ksshaskpass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksshaskpass -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Plasma integration for SSH agents" url="https://www.KDE.org/" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kdoctools-dev ki18n-dev kwallet-dev kwidgetsaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/ksshaskpass-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="42d3615b631b225a455c939a72a0a1cd1766c7baa7bf9396b4509c880f37784beddaf2596d124362d9720901bad776aaf6b248ccf8b53e0691d74c948272c952 ksshaskpass-5.18.4.1.tar.xz" +sha512sums="8cf75491c04537cdbab11613dc0f9317631c282e4f371664164dc0936d08f744a39777b696b772e05b06ef1257d42f7ae29abfbbd022e661073fdf880fe63fcf ksshaskpass-5.18.5.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index df4488d3d..8ff32ce79 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="10e806c82b0704c6185c852c74035e7f74ef29d921df3bcde07cb161d86257e7deb4b13941294b699ed46ae5c8197a2f76dcd45599f0222139c584a626881304 kstars-3.4.2.tar.xz" +sha512sums="47adad28cccd749a7ac3c71df4b06d59a4bdf94bacc064fe5d658dcbe3150f2e4d13aaf23e0aedea57c64c28357452d731caaf764e8c91bc67f5469166cf7ad4 kstars-3.4.3.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index 3b8168ebf..736113ed9 100644 --- a/user/ksudoku/APKBUILD +++ b/user/ksudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksudoku -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="39002ce3aefcee4d1f166dd5178dc961df2530643b95db53c4eca8a8335c4d4a233524d725bbebc376d93f1326de164b423ecd4b5a84b3dbe50e421a57eb1abd ksudoku-20.04.3.tar.xz" +sha512sums="ce5a3818282690aae89e146e61aad88e3f433a265b9bf1cfb8db312e739b714be42354d7fbfe606584177e43b7c1a17c7bee1cb8190cc6dd066db769c670e5fd ksudoku-20.08.1.tar.xz" diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD index 11537dc35..79040f0bb 100644 --- a/user/ksysguard/APKBUILD +++ b/user/ksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=ksysguard -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE system monitor utility" url="https://www.kde.org/" @@ -13,7 +13,7 @@ makedepends="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev kio-dev knotifications-dev kwindowsystem-dev libksysguard-dev cmake extra-cmake-modules kdoctools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/ksysguard-$pkgver.tar.xz +source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz ksysguard-5.6.5-rindex-header.patch " @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2c2bb6596987effe558eeafe855a4914186da815a7688b68c75bf44daa29e5153b0cae4b2692f780fe2001042dbb12568e3c708b711c179f93fb7110f50dc696 ksysguard-5.18.4.1.tar.xz +sha512sums="2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3 ksysguard-5.18.5.tar.xz 75e07b80c647bc6fdfb092ad3855813ef6bfe91b0ad03562dacfe4e680cfdee201364a2e452db162822045684635c1791ab2392c47d8e5c560c9e617a970cf39 ksysguard-5.6.5-rindex-header.patch" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index bd8442053..5c439c34d 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05a358eac885d1ca2ca8ea0f2a49fc98b6310ff17c9e830f2a931e5c20ba38bbbf0b7597029549ff4ee9a2bd7e769da5b3bb7ed57b9a304be9202ebea20eca2e ksystemlog-20.04.3.tar.xz" +sha512sums="eef230567d062ba860bb59fc102c5546f1ebf15ab98f0042703fe49de6ba41409e010574fe44210fa649034756611b7c88ef87fef8882e4fd91d18ef8fdbcf0e ksystemlog-20.08.1.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 707e52353..4e622ed84 100644 --- a/user/kteatime/APKBUILD +++ b/user/kteatime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kteatime -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b9f9ffdc2e3b2d1fb1c63459073067af2afd9feed6e437efcd593a61fd6c9dd8054dc4c4e8d40a356abefdae5288d68465fd5e584b0e5f0770b5d4de98d94f7 kteatime-20.04.3.tar.xz" +sha512sums="470cbcb1eec6a2bfdff6f4f1c65b5a85b8a844f5ce264f391df7a1e381a4c786535b6889f66bae72b516faa2cf8e001c57995e9fd9c788f0bb9e60e547822256 kteatime-20.08.1.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index ef5e75a1e..c94f86717 100644 --- a/user/ktexteditor/APKBUILD +++ b/user/ktexteditor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktexteditor -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8dca328976699af3cb726f28a78caa11986056b2018a6c5e6d614e63ad0c247d69543aff72766cb000b7cf3fa30505889c95af7fde1b11fdd87bb21d69591521 ktexteditor-5.72.0.tar.xz" +sha512sums="d37d8f132cd33d403f0c4dc3b8773661dc4e708ffea17a37344534f5370c9d41ce947f6a3045fa740bda7ca0021de0f4519be5a21e8cbd2038bca6ff4b9e8e3c ktexteditor-5.74.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index af590223e..68359df06 100644 --- a/user/ktextwidgets/APKBUILD +++ b/user/ktextwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktextwidgets -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7ec2e3624aff5cc8e9d806f884eb98478e8e44c814e7a4912f14fffb3f4ccfb212ce6c40a66e923b038b10b1a66b8b322876960f330209e508ee839be0e3e3a1 ktextwidgets-5.72.0.tar.xz" +sha512sums="f471ea1b09cb73f2e32d506139e45a3f928d834d559f6d25df5bf05e74dcee5b756ba3b87a38eb2de3fc69c9248a8982e1bfec8c9fc5cba6061e24f8ff62ce5c ktextwidgets-5.74.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index cc802e222..dcf246033 100644 --- a/user/ktimer/APKBUILD +++ b/user/ktimer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktimer -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="313ff9e8627cb0553c6e4a9b60349a842c016f9f20f952bcf1347c2500641242f095226e85eb66330a6d6d5292de8d0b26ef74127ac17e226337324e3f517eb6 ktimer-20.04.3.tar.xz" +sha512sums="ce5e1170734296031010e680af9c2b076c90b41620222e53fc8ffd9b665f3a3c0f2e7b591e113f414eb861a0dd764dbf88ee33c705625aa0479ebc5dc99ed72e ktimer-20.08.1.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index 232a289d1..09ef3654b 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktouch -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ae31fc5bcb439ae0ac6fdf736fd79858e6aa24841d76f348efa12d085744594f6965608e01309b704a5500fdf91cc3b121de418a921c021f1bf4eeba42cb124 ktouch-20.04.3.tar.xz" +sha512sums="ff47d10afbb44f7f790843e92b4cefc5fbbffeaba3cbd26d70a4a4d5d71de90870a4dbc4f4792161c953d0adc05054c59f6c4be6d36050db359a0c23a79c92f7 ktouch-20.08.1.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index b87bb3d68..93dc5c633 100644 --- a/user/ktuberling/APKBUILD +++ b/user/ktuberling/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktuberling -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="12ebc06af1eef962fd2ce2e578ebed4512a2d5d829daaaa6027e85bb779f61305a29d0d12caa0aad6fac7ecb555c1d58b2a09d6ea1cb6724149c3d3793f12c6f ktuberling-20.04.3.tar.xz" +sha512sums="988a07fe266ceeb693d2c28b71905a36f2a9fdb4bbf4fbf306388dfafda6792d3edbb8b7f0ca26115d957b18e31b24fa1034a6e65c1a821dd468d59713e8e213 ktuberling-20.08.1.tar.xz" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index 140336d51..86e3e9811 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kturtle -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e6948dc9fb2b9d14bb823d2f25651352ab7630e82d0d883fcdcd90b7a159920bbd0795873cb8f987775e5319d08f34de61b1d17c1522b887ce6228bd44bb91f kturtle-20.04.3.tar.xz" +sha512sums="345055625a827190dc8bfe21839ddb9d591a1b0ce812cb5e230c739bc155fae43427a854b033b2c371562251710e81e5e5f900f19864499cc338eaef8ee773f5 kturtle-20.08.1.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 287034f55..69a9df99b 100644 --- a/user/kubrick/APKBUILD +++ b/user/kubrick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kubrick -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aa0c6b0003643fcd38b5e9953be373ecf5957458c73b77d0722c553f5fc806daa1102aee5b31664e459ef98e461efbde7dfdcfbe59f2d7b24236398f6ceb703d kubrick-20.04.3.tar.xz" +sha512sums="53f21b3f6409c991704f9ff6772baa42e847a38c9a98caf60d9dd9a084e3a4035f219001b319cca84f393d283c632ae607583e7c16a00e75d9d00e27e26ba762 kubrick-20.08.1.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index 559ad0d87..3a41ea27f 100644 --- a/user/kunitconversion/APKBUILD +++ b/user/kunitconversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kunitconversion -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c4516d1560e65418545af14a2380e72e82ffd08977a94f7453edec74b6ab55d2c43646d7f9ac614feb3a1368cfa780e5d7e9641dc7333cc4db558c96bab6ac88 kunitconversion-5.72.0.tar.xz" +sha512sums="065e6f5e48e1c76996d46bddf030edfd7ff3a5d221d93599030874779492ee4d6df89cd736e565ef9a7b0ece1068ea5fcf3f59bdc6dc65ca9fcd94806955c598 kunitconversion-5.74.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index fcd069e39..fed362960 100644 --- a/user/kwallet/APKBUILD +++ b/user/kwallet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwallet -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b7f76434fac04ef188bb032cd515db970ec38c8be782ab6a959bbdd30e41d61ab062f3ff20529da55e0dd757078964ebaba4c0df8cc38bafe83bfc3257cc2a0e kwallet-5.72.0.tar.xz +sha512sums="e18de73657c4b51c3150de88e2d764f710932527dc6e9fbfc8778e853b66e0776619fc5d8918cbf8fb6384f92d7b74836797c374d45a50223aa7d543cf743fa2 kwallet-5.74.0.tar.xz 229e001354c00832d15442b6ee2cd6062e759a560d67e9ded024735e5012aeec022f8e12ed346e090bbe2967c3bd335e5dd73b3fe5b7da93b89f1a7842411e3e kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index ef25ed3a2..188e251ef 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwalletmanager -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager5" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aa6dfcec025d73d4a1139321436ae122e16e4ce3d57cd624c95003df395ca7d4273191b480ea6cf6849e0d630fd6044b833dae9674dcb8bdec43592f2b8f8a0d kwalletmanager-20.04.3.tar.xz" +sha512sums="3c2428a55333c1fd5d8cbbfac1a7c894e4e0ab3987e824112b004731eeca6f05ffdeb04beffbf26fd8c62ecc3ae1fcd74224cffe4d7ebe56b7d2f13bb74fcd17 kwalletmanager-20.08.1.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 07d601e6e..e37a21052 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwave -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -17,6 +17,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtmultimedia-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/release-service/$pkgver/src/kwave-$pkgver.tar.xz es-doc-fix.patch + lts.patch remove-msgcat.patch " @@ -44,6 +45,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f57712472ba19695c77904a804c7dd599cc762e7018fed1d16398746156c25832795215d71aa54b143671342db6a1e442f79bfaed491e16657b820e14ac1306d kwave-20.04.3.tar.xz +sha512sums="e5d53bdfce2953662ab25edb5c6c3886bb9d4dee6f15c7fb7c09f5a559c9b835bc0e7d6be62eca79c8db298c8e51646a3279c5e200ae3aa2117943d52692b0e1 kwave-20.08.1.tar.xz 63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch +8662f4b8cd374c4f54b0fb5d6ff2c5f8966056e688140ba7fc6fca74e79b72024e932392d93770e3e1b2387b54c33a67255b4c349d3c506660ec6dd55f933e98 lts.patch 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwave/lts.patch b/user/kwave/lts.patch new file mode 100644 index 000000000..ccac61359 --- /dev/null +++ b/user/kwave/lts.patch @@ -0,0 +1,191 @@ +--- kwave-20.08.1/CMakeLists.txt.old 2020-09-01 06:22:40.000000000 +0000 ++++ kwave-20.08.1/CMakeLists.txt 2020-09-17 15:44:17.136338019 +0000 +@@ -87,7 +87,7 @@ + ENDIF (POLICY CMP0075) + + SET(ECM_MIN_VERSION "1.7.0") +-SET(QT_MIN_VERSION "5.14.0") ++SET(QT_MIN_VERSION "5.12.9") + SET(KF5_MIN_VERSION "5.33.0") + + ############################################################################# +--- kwave-20.08.1/libkwave/Filter.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/libkwave/Filter.cpp 2020-09-17 15:49:02.775161648 +0000 +@@ -147,9 +147,9 @@ + file.open(QIODevice::WriteOnly); + QTextStream out(&file); + +- out << ((m_fir) ? "FIR " : "IIR ") << count() << Qt::endl; ++ out << ((m_fir) ? "FIR " : "IIR ") << count() << endl; + for (unsigned int i = 0; i < count(); i++) { +- out << m_delay[i] << ' ' << m_coeff[i] << Qt::endl; ++ out << m_delay[i] << ' ' << m_coeff[i] << endl; + } + + file.close(); +--- kwave-20.08.1/libkwave/Logger.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/libkwave/Logger.cpp 2020-09-17 15:47:40.384154307 +0000 +@@ -89,14 +89,14 @@ + QTextStream out(m_logfile); + const KAboutData about_data = KAboutData::applicationData(); + +- out << "#Version: 1.0" << Qt::endl; +- out << "#Fields: x-status date time x-pid x-message" << Qt::endl; ++ out << "#Version: 1.0" << endl; ++ out << "#Fields: x-status date time x-pid x-message" << endl; + out << "#Software: " << about_data.displayName() << " " +- << about_data.version() << Qt::endl; ++ << about_data.version() << endl; + QDateTime now = QDateTime::currentDateTime(); + out << "#Start-Date: " + << now.toString(_("yyyy-MM-dd hh:mm:ss")) +- << Qt::endl; ++ << endl; + + return true; + } +@@ -135,7 +135,7 @@ + + out << "<" << x_status << "> " << + now.toString(_("yyyy-MM-dd hh:mm:ss.zzz")) << " " << +- x_pid << " " << msg << Qt::endl; ++ x_pid << " " << msg << endl; + } + + m_logfile->flush(); +--- kwave-20.08.1/libkwave/CodecBase.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/libkwave/CodecBase.cpp 2020-09-17 15:48:28.188936600 +0000 +@@ -51,7 +51,7 @@ + const QString type_name = _(name); + if (type_name.contains(_(","))) { + // list of mime types -> call recursively for each of them +- QStringList types = type_name.split(_(","), Qt::SkipEmptyParts); ++ QStringList types = type_name.split(_(","), QString::SkipEmptyParts); + foreach (const QString &mt, types) { + addMimeType(mt.trimmed().toUtf8().data(), description, patterns); + } +@@ -66,7 +66,7 @@ + // qWarning("mime type '%s' not registered, using built-in!", name); + type.name = type_name; + type.description = description; +- type.patterns = _(patterns).split(_("; "), Qt::SkipEmptyParts); ++ type.patterns = _(patterns).split(_("; "), QString::SkipEmptyParts); + } else { + type.description = t.comment(); + type.patterns = t.globPatterns(); +--- kwave-20.08.1/plugins/codec_mp3/MP3EncoderDialog.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/plugins/codec_mp3/MP3EncoderDialog.cpp 2020-09-17 15:55:34.602393880 +0000 +@@ -720,7 +720,7 @@ + const QLatin1Char separator = QLatin1Char(':'); + #endif + QStringList path = +- _(qgetenv("PATH")).split(separator, Qt::SkipEmptyParts); ++ _(qgetenv("PATH")).split(separator, QString::SkipEmptyParts); + + QFileInfo f(program); + QString d = f.path(); +--- kwave-20.08.1/plugins/codec_ascii/AsciiEncoder.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/plugins/codec_ascii/AsciiEncoder.cpp 2020-09-17 15:51:18.470350596 +0000 +@@ -100,10 +100,10 @@ + + // write out the default properties: + // sample rate, bits, tracks, length +- m_dst << META_PREFIX << "'rate'=" << info.rate() << Qt::endl; +- m_dst << META_PREFIX << "'tracks'=" << tracks << Qt::endl; +- m_dst << META_PREFIX << "'bits'=" << bits << Qt::endl; +- m_dst << META_PREFIX << "'length'=" << length << Qt::endl; ++ m_dst << META_PREFIX << "'rate'=" << info.rate() << endl; ++ m_dst << META_PREFIX << "'tracks'=" << tracks << endl; ++ m_dst << META_PREFIX << "'bits'=" << bits << endl; ++ m_dst << META_PREFIX << "'length'=" << length << endl; + + // write out all other, non-standard properties that we have + QMap<Kwave::FileProperty, QVariant> properties = info.properties(); +@@ -121,7 +121,7 @@ + // write the property + m_dst << META_PREFIX << "'" << info.name(p) << "'='" + << Kwave::Parser::escape(v.toString()).toUtf8() +- << "'" << Qt::endl; ++ << "'" << endl; + } + + // write out all labels +@@ -130,7 +130,7 @@ + m_dst << META_PREFIX << "'label[" + << QString::number(label.pos()) << "]'='" + << Kwave::Parser::escape(label.name()).toUtf8() +- << "'" << Qt::endl; ++ << "'" << endl; + } + + sample_index_t rest = length; +@@ -162,13 +162,13 @@ + pos++; + + // end of line +- m_dst << Qt::endl; ++ m_dst << endl; + } + + } while (false); + + // end of file +- m_dst << "# EOF " << Qt::endl << Qt::endl; ++ m_dst << "# EOF " << endl << endl; + + m_dst.setDevice(Q_NULLPTR); + dst.close(); +--- kwave-20.08.1/plugins/record/RecordDialog.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/plugins/record/RecordDialog.cpp 2020-09-17 15:54:28.909564227 +0000 +@@ -412,7 +412,7 @@ + foreach (QString dev_id, devices) { + QTreeWidgetItem *parent = Q_NULLPTR; + +- QStringList list = dev_id.split(_("||"), Qt::KeepEmptyParts); ++ QStringList list = dev_id.split(_("||"), QString::KeepEmptyParts); + foreach (QString token, list) { + QTreeWidgetItem *item = Q_NULLPTR; + +--- kwave-20.08.1/plugins/playback/PlayBackDialog.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/plugins/playback/PlayBackDialog.cpp 2020-09-17 15:54:58.066381771 +0000 +@@ -303,7 +303,7 @@ + foreach (const QString &dev_id, devices) { + QTreeWidgetItem *parent = Q_NULLPTR; + +- QStringList list = dev_id.split(_("||"), Qt::KeepEmptyParts); ++ QStringList list = dev_id.split(_("||"), QString::KeepEmptyParts); + foreach (const QString &t, list) { + QString token(t); + QTreeWidgetItem *item = Q_NULLPTR; +--- kwave-20.08.1/kwave/MainWidget.cpp.old 2020-08-31 18:36:59.000000000 +0000 ++++ kwave-20.08.1/kwave/MainWidget.cpp 2020-09-17 15:53:26.496376603 +0000 +@@ -304,8 +304,8 @@ + + // process only wheel events on the signal and overview frame, + // not on the channel controls or scrollbars +- if (!m_scroll_area.geometry().contains(event->position().toPoint()) && +- !m_overview->geometry().contains(event->position().toPoint()) ) ++ if (!m_scroll_area.geometry().contains(event->pos()) && ++ !m_overview->geometry().contains(event->pos()) ) + { + event->ignore(); + return; +@@ -331,8 +331,7 @@ + break; + case Qt::ControlModifier: { + // <Ctrl> + <WheelUp/Down> => zoom in/out +- int x = qMax(m_signal_widget.mapToViewPort( +- event->globalPosition().toPoint()), 0); ++ int x = qMax(m_signal_widget.mapToViewPort(event->globalPos()), 0); + if (event->angleDelta().ry() > 0) + executeCommand(_("view:zoom_in(%1)").arg(x)); + else if (event->angleDelta().ry() < 0) +@@ -1017,7 +1016,7 @@ + const QString name = Kwave::Parser::escape(label.name()); + out << _("label:add(") << pos; + if (name.length()) out << _(", ") << name; +- out << _(")") << Qt::endl; ++ out << _(")") << endl; + } + + file.close(); diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index 655539980..711aede77 100644 --- a/user/kwayland/APKBUILD +++ b/user/kwayland/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwayland -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends="" depends_dev="qt5-qtbase-dev wayland-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz qt5-qttools-dev qt5-qtwayland qt5-qtwayland-dev qt5-qtwayland-tools - wayland-protocols" + wayland-protocols plasma-wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwayland-$pkgver.tar.xz" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5a0c2ac98fc90d0d2b0ed9f7c8837a81814bd5f4657dff57a4e84b5e93dfd7a74d0585e753152e3c9c073a706caffad5988b047ea0f319f13ab00f13907617bb kwayland-5.72.0.tar.xz" +sha512sums="347841dd5dabedd9de13e92275a2b6edb201a45c177c757b69af681e2f3b60c261087c5387c97305869c0a125a5f07de08113208a174ccb946f6ace310445ebd kwayland-5.74.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index 07ee62917..b1ef5ee63 100644 --- a/user/kwidgetsaddons/APKBUILD +++ b/user/kwidgetsaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwidgetsaddons -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="53d5e7dfbb12b427bf73ac6c09e27ea7497b460f6e4716a8fe61e2de3aed5885334e2d4292bbf3ce5661a86207135e3afb662dea93489b64ae4ffc3da998bb4c kwidgetsaddons-5.72.0.tar.xz" +sha512sums="90e8d0806933b3735fd510e497b3ce7dae1c017265931799ec2c2012b9c4576a251739b7f7da69aa8dfae1b688322305fd95b94fa0baa49c254c5bc73caaf079 kwidgetsaddons-5.74.0.tar.xz" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index b9573edc3..3c5bbd9c6 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kwin -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" @@ -24,7 +24,7 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3 kservice-dev ktextwidgets-dev kwayland-dev kwidgetsaddons-dev kxmlgui-dev plasma-framework-dev qt5-qtvirtualkeyboard-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/kwin-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -50,4 +50,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5e2ef7a8bd2969121d560e6558791298d8506d1af4c67aca8e6d2377af76e10b8e6ee32f116911a85352a74195a1cbd6dd4d40054f1796ff4b54b1e5418a5772 kwin-5.18.4.1.tar.xz" +sha512sums="b703891824ec31e8ae29df27a11499579ab95789a838e893d5904e40aeba27b0ddc04836038d5b4c062d75ceed277d07e67eeb1b4e957ccf414f03786037d562 kwin-5.18.5.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index f5dfe3aa4..667df6d4f 100644 --- a/user/kwindowsystem/APKBUILD +++ b/user/kwindowsystem/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwindowsystem -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a13357a40b1d4364579b405ae467071414f4a775f0c79765a3867adb40c259a0e5b35cc5e6298e4310e1c54397c269f7b277d02a7adf2194614c44be6888ba68 kwindowsystem-5.72.0.tar.xz" +sha512sums="f27c2676a2b21ed0cb8b876aa75c9beeebef0403288af8e354a444c63cb653bb8e9b9d349cd06352699a749488441b0a05344c876724f20fd86f06a40ec71fda kwindowsystem-5.74.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 93482e1d2..56a010872 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwordquiz -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3c69549a37266f7228e851b60d2afb13e65087f54373e80f933dbaf21641cf9a2dde491e57afa9c4a767edbc8cd3d8892b04ba51f044861f1637691259c69167 kwordquiz-20.04.3.tar.xz" +sha512sums="78440901daf3a34704b1e6defa7d094b60a11b1c6d892fd92624636167b22e345a78fd0e708d9eff76f0f454ae7520fba6b50d471b340c4f9a72f57e3c75e5f9 kwordquiz-20.08.1.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index 9101596b1..f55b546e2 100644 --- a/user/kxmlgui/APKBUILD +++ b/user/kxmlgui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlgui -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="368e48c046441f525695f1c22cec13a893bb0ef8190d41c862aefbcdc45583268127de4c2deecff2eb0e1a82788c7ca677537a3e07d82879f11f8e5498165b12 kxmlgui-5.72.0.tar.xz" +sha512sums="98f3e65c30a095d17c0512894bbba0bb172b2044652a0d23324f843489f5bb726359be40a9d68a7916d45a2a6e135f0bbbf7924b35a1939611b75ad6d44ccd92 kxmlgui-5.74.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index dab02be61..9a617fc20 100644 --- a/user/kxmlrpcclient/APKBUILD +++ b/user/kxmlrpcclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlrpcclient -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd25199689fffcbe5db628a04f3acf4007be32b664c30533882445175f46624622185d5e0888acb19ea725b2d56da943aa14dfd41ee4a9c94ee80f5ca270cee7 kxmlrpcclient-5.72.0.tar.xz" +sha512sums="87221fc5166312030af1c40d95ccbbdc68c791d0278d9ac181f98aa37328fa713e82bb178932a18d23f1bb1483c0571b4267ec0ae5970046e23426b3a93bf135 kxmlrpcclient-5.74.0.tar.xz" diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD index 468e8f1ab..b16ffccee 100644 --- a/user/labplot/APKBUILD +++ b/user/labplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=labplot -pkgver=2.7.0 +pkgver=2.8.0 pkgrel=0 pkgdesc="Interactive tool for graphing and analysis of scientific data" url="https://www.kde.org/applications/education/labplot2" @@ -14,9 +14,12 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdoctools-dev ki18n-dev kiconthemes-dev kdelibs4support-dev kxmlgui-dev knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev - cantor-dev docbook-xsl lz4-dev poppler-dev poppler-qt5-dev" + cantor-dev docbook-xsl lz4-dev poppler-dev poppler-qt5-dev + kuserfeedback-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz" +source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz + cantor.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -42,4 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a labplot-2.7.0.tar.xz" +sha512sums="b96a758813a411801ca65082aab54857b2da77a705ea939f2ae49d6d75a3c472b666e61c501283482c7736975b1f589bf0710028a36b237ae2df9e56ac04f0e5 labplot-2.8.0.tar.xz +1d8b81a2eb9e4aa2909881f0ea481252200f5821250d8e8a47ac941bd223bb86f5b1c404c2b374af69b0d491c50f9179a34f30ba5829a5279119761dcf5fe49d cantor.patch" diff --git a/user/labplot/cantor.patch b/user/labplot/cantor.patch new file mode 100644 index 000000000..a35db4585 --- /dev/null +++ b/user/labplot/cantor.patch @@ -0,0 +1,25 @@ +From db67605842837583b1b885cf64ca19c5301480d1 Mon Sep 17 00:00:00 2001 +From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de> +Date: Wed, 16 Sep 2020 17:27:08 +0200 +Subject: [PATCH] [cantor] 20.08 will not get the new interface + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57ad46dd8..98130a30d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,7 +230,7 @@ IF (Cantor_FOUND) + ELSE () + MESSAGE (STATUS "Cantor Library ${Cantor_VERSION} TOO OLD. Minimum usable version is 19.12") + ENDIF () +- IF (${Cantor_VERSION} VERSION_GREATER "20.08") ++ IF (${Cantor_VERSION} VERSION_GREATER "20.08.9") + add_definitions (-DHAVE_NEW_CANTOR_LIBS) + ENDIF () + ELSE () +-- +GitLab + diff --git a/user/lame/APKBUILD b/user/lame/APKBUILD index 31913a204..1e25ea32a 100644 --- a/user/lame/APKBUILD +++ b/user/lame/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="LGPL-2.0+" depends="" makedepends="ncurses-dev" -([ $CBUILD_ARCH != "pmmx" ] && [ $CBUILD_ARCH != "x86_64" ]) || makedepends="$makedepends nasm" +([ is_$CBUILD_ARCH != "is_pmmx" ] && [ is_$CBUILD_ARCH != "is_x86_64" ]) || makedepends="$makedepends nasm" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/project/lame/lame/$pkgver/$pkgname-$pkgver.tar.gz" diff --git a/user/latte-dock/APKBUILD b/user/latte-dock/APKBUILD new file mode 100644 index 000000000..619645630 --- /dev/null +++ b/user/latte-dock/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=latte-dock +pkgver=0.9.11 +pkgrel=0 +pkgdesc="KDE dock" +url="https://kde.org/applications/utilities/org.kde.latte-dock" +arch="all" +license="GPL-2.0+" +depends="plasma-workspace qqc2-desktop-style qt5-qtgraphicaleffects + qt5-qtquickcontrols" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev + kactivities-dev karchive-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev + kdeclarative-dev kglobalaccel-dev kguiaddons-dev ki18n-dev + kiconthemes-dev knewstuff-dev knotifications-dev kwayland-dev + kwindowsystem-dev kxmlgui-dev plasma-framework-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/latte-dock/latte-dock-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d02747e4709de8f3091c4686f6d80129fa2fe9d6e994cec436083c59b0ceab0b01af3c1c92d946e497e725bd20efc8ec1e8d284666348a13cf6ba79e515c30d5 latte-dock-0.9.11.tar.xz" diff --git a/user/lcov/APKBUILD b/user/lcov/APKBUILD index 94bc30eb5..85c57f5f1 100644 --- a/user/lcov/APKBUILD +++ b/user/lcov/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lcov -pkgver=1.14 +pkgver=1.15 pkgrel=0 pkgdesc="Graphical frontend for GCC GCov" url="http://ltp.sourceforge.net/coverage/lcov.php" @@ -10,7 +10,7 @@ license="GPL-2.0+" depends="perl" makedepends="" subpackages="$pkgname-doc" -source="https://downloads.sourceforge.net/ltp/lcov-$pkgver.tar.gz" +source="https://github.com/linux-test-project/lcov/releases/download/v$pkgver/lcov-$pkgver.tar.gz" build() { make @@ -24,4 +24,4 @@ package() { GIT_DIR= make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc lcov-1.14.tar.gz" +sha512sums="dda0eadbd0ea2093f17cba039309ccda3dbcb7266d083b46bda61e02cd7f049d66de49be1e005157c3e5af910d2703ffbc9cfe7f1242bd67b9787f8508e4d052 lcov-1.15.tar.gz" diff --git a/user/libass/APKBUILD b/user/libass/APKBUILD index f39c95ee3..40679240d 100644 --- a/user/libass/APKBUILD +++ b/user/libass/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libass -pkgver=0.14.0 +pkgver=0.15.1 pkgrel=0 pkgdesc="Portable library for rendering (Advanced) Substation Alpha subtitles" url="https://github.com/libass/libass" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6 libass-0.14.0.tar.xz" +sha512sums="e5a1cca7a72b21de7da2f83fc46db6b35e822593b67fa16563451f4121965e16e825a1665996a0e6022992e6b0365fc2b9b898932dd8086d2ee87b48851ef307 libass-0.15.1.tar.xz" diff --git a/user/libayatana-indicator/APKBUILD b/user/libayatana-indicator/APKBUILD index b2903c795..98e63c245 100644 --- a/user/libayatana-indicator/APKBUILD +++ b/user/libayatana-indicator/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libayatana-indicator -pkgver=0.6.3 +pkgver=0.8.4 pkgrel=0 pkgdesc="Gnome library implementing the StatusNotifierItem specification" url="https://ayatanaindicators.github.io/" @@ -9,7 +9,8 @@ arch="all" options="!check" # incompetent test author license="GPL-3.0-only" depends="" -makedepends="autoconf automake ayatana-ido-dev gtk+3.0-dev libtool" +makedepends="autoconf automake ayatana-ido-dev gtk+3.0-dev libtool + wayland-protocols" subpackages="$pkgname-dev" source="libayatana-indicator-$pkgver.tar.gz::https://github.com/AyatanaIndicators/libayatana-indicator/archive/$pkgver.tar.gz" @@ -37,4 +38,4 @@ package() { DESTDIR="$pkgdir" make -j1 install } -sha512sums="5cd78d228d7c2afef229fa06dc9b0778b06fc2752dee0192c65d5140afbc28533b9862bc62ddb27f61f9f8fb26dfb736403202b2b4f90622fe892c61d621b888 libayatana-indicator-0.6.3.tar.gz" +sha512sums="33f1f89ee89ec865d1a828fc3d2fd8ae9d4d46cd294a30c3fd94985ec04d8f19b989ad8b5ef1938b8e2b0d781b86da18668175d9a80715ef98ffd4cdd52d3b7f libayatana-indicator-0.8.4.tar.gz" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index b10b69d05..85b12e42e 100644 --- a/user/libblockdev/APKBUILD +++ b/user/libblockdev/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libblockdev pkgver=2.24 -pkgrel=0 +pkgrel=1 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" arch="all" diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD index e6ff9bc25..305273d71 100644 --- a/user/libburn/APKBUILD +++ b/user/libburn/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libburn -pkgver=1.5.2 +pkgver=1.5.4 pkgrel=0 pkgdesc="Library for CD/DVD burning" url="https://dev.lovelyhq.com/libburnia/web/wikis/home" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3 libburn-1.5.2.tar.gz" +sha512sums="dd7b14093e62e2c02011955c24e01d70ed78969b14faf7e5a63c0da97a80c438b628922532eb135af7dea8ee7c7b83554b3354160306dad852ce5bf6eb1d5ac9 libburn-1.5.4.tar.gz" diff --git a/user/libcroco/APKBUILD b/user/libcroco/APKBUILD index 209720aaa..4470ac952 100644 --- a/user/libcroco/APKBUILD +++ b/user/libcroco/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libcroco pkgver=0.6.13 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME CSS 2 parsing and manipulation toolkit" url="https://gitlab.gnome.org/GNOME/libcroco" arch="all" @@ -11,11 +11,15 @@ subpackages="$pkgname-dev" depends="" makedepends="glib-dev libxml2-dev" checkdepends="cmd:which" -source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz" +source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz + CVE-2020-12825.patch + " # secfixes: # 0.6.12-r2: # - CVE-2017-7960 +# 0.6.13-r1: +# - CVE-2020-12825 build() { ./configure \ @@ -34,4 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 libcroco-0.6.13.tar.xz" +sha512sums="038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 libcroco-0.6.13.tar.xz +ae568a259a2a3a90f6cf107b4f0d5a0dbb6cb3a560262a43b96460457a4b72b7c5f45c2df9c061ed1f94c41b71bdcf69bd55582a77bf858e46c2c3c8a55fe6e3 CVE-2020-12825.patch" diff --git a/user/libcroco/CVE-2020-12825.patch b/user/libcroco/CVE-2020-12825.patch new file mode 100644 index 000000000..6fa66f659 --- /dev/null +++ b/user/libcroco/CVE-2020-12825.patch @@ -0,0 +1,187 @@ +From 44cbd1e718d6a08e59b9300280c340218a84e089 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@gnome.org> +Date: Wed, 12 Aug 2020 13:54:15 -0500 +Subject: [PATCH] libcroco: Limit recursion in block and any productions + (CVE-2020-12825) + +If we don't have any limits, we can recurse forever and overflow the +stack. + +This is per https://gitlab.gnome.org/Archive/libcroco/-/issues/8 + +https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1404 +--- + src/cr-parser.c | 44 ++++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 15 deletions(-) + +diff --git a/src/cr-parser.c b/src/st/croco/cr-parser.c +index 07f4ed9e8b..8304b75614 100644 +--- a/src/cr-parser.c ++++ b/src/cr-parser.c +@@ -136,6 +136,8 @@ struct _CRParserPriv { + + #define CHARS_TAB_SIZE 12 + ++#define RECURSIVE_CALLERS_LIMIT 100 ++ + /** + * IS_NUM: + *@a_char: the char to test. +@@ -343,9 +345,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this); + + static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this); + +-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls); + +-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls); + + static enum CRStatus cr_parser_parse_value_core (CRParser * a_this); + +@@ -783,7 +787,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_parser_try_to_skip_spaces_and_comments (a_this); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + } while (status == CR_OK); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, +@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, + FALSE); + goto done; +@@ -929,11 +933,11 @@ cr_parser_parse_selector_core (CRParser * a_this) + + RECORD_INITIAL_POS (a_this, &init_pos); + +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + + } while (status == CR_OK); + +@@ -955,10 +959,12 @@ cr_parser_parse_selector_core (CRParser * a_this) + *in chapter 4.1 of the css2 spec. + *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*; + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *FIXME: code this function. + */ + static enum CRStatus +-cr_parser_parse_block_core (CRParser * a_this) ++cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token = NULL; + CRInputPos init_pos; +@@ -966,6 +972,9 @@ cr_parser_parse_block_core (CRParser * a_this) + + g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token); +@@ -995,13 +1004,13 @@ cr_parser_parse_block_core (CRParser * a_this) + } else if (token->type == CBO_TK) { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } else { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } +@@ -1108,7 +1117,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + ref++; + goto continue_parsing; +@@ -1122,7 +1131,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + if (status == CR_OK) { + ref++; + goto continue_parsing; +@@ -1161,10 +1170,12 @@ cr_parser_parse_value_core (CRParser * a_this) + * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*; + * + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *@return CR_OK upon successfull completion, an error code otherwise. + */ + static enum CRStatus +-cr_parser_parse_any_core (CRParser * a_this) ++cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token1 = NULL, + *token2 = NULL; +@@ -1173,6 +1184,9 @@ cr_parser_parse_any_core (CRParser * a_this) + + g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1); +@@ -1211,7 +1225,7 @@ cr_parser_parse_any_core (CRParser * a_this) + *We consider parameter as being an "any*" production. + */ + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1236,7 +1250,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1264,7 +1278,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +-- +GitLab + diff --git a/user/libebml/APKBUILD b/user/libebml/APKBUILD index e9145cd5a..c7b2b1093 100644 --- a/user/libebml/APKBUILD +++ b/user/libebml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libebml -pkgver=1.3.10 +pkgver=1.4.0 pkgrel=0 pkgdesc="Library to parse Extensible Binary Meta-Language files" url="https://www.matroska.org/" @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49 libebml-1.3.10.tar.xz" +sha512sums="db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230 libebml-1.4.0.tar.xz" diff --git a/user/libetpan/APKBUILD b/user/libetpan/APKBUILD index 3ccfa2679..b8fe55fd2 100644 --- a/user/libetpan/APKBUILD +++ b/user/libetpan/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libetpan pkgver=1.9.4 -pkgrel=0 +pkgrel=1 pkgdesc="Mail library for C" url="https://www.etpan.org/libetpan.html" arch="all" @@ -13,8 +13,14 @@ makedepends="autoconf automake cyrus-sasl-dev db-dev expat-dev libtool subpackages="$pkgname-dev" source="libetpan-$pkgver.tar.gz::https://github.com/dinhviethoa/libetpan/archive/$pkgver.tar.gz missing-header.patch + CVE-2020-15953-a.patch + CVE-2020-15953-b.patch " +# secfixes: +# 1.9.4-r1: +# - CVE-2020-15953 + build() { ./autogen.sh \ --build=$CBUILD \ @@ -35,4 +41,6 @@ package() { } sha512sums="7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f libetpan-1.9.4.tar.gz -df0ba883c9328b7cab408a54f38e6f9c7f5f603b0f016b7ea2e9fa49aa4118ff6723218bb9942f278028291e1c7e9da0bb1d48ab2c471b0ddf5edc3e78a8a1df missing-header.patch" +df0ba883c9328b7cab408a54f38e6f9c7f5f603b0f016b7ea2e9fa49aa4118ff6723218bb9942f278028291e1c7e9da0bb1d48ab2c471b0ddf5edc3e78a8a1df missing-header.patch +17f2773dc7b807178b152293474e2dc05f4a0d708d56ca01a95a33f1a84af3839efa64e318fd18af946640311032e3c7c2e27a2259d9222ce8e175caa161dbc2 CVE-2020-15953-a.patch +61bfa931ce10a5a25caca261f672135f80202e266feaff981ffe994ea5d55d099b127c5734cca02194ad1bd0ef4d7d37a0022640e749a5168a9f56018580de5f CVE-2020-15953-b.patch" diff --git a/user/libetpan/CVE-2020-15953-a.patch b/user/libetpan/CVE-2020-15953-a.patch new file mode 100644 index 000000000..1130e3a51 --- /dev/null +++ b/user/libetpan/CVE-2020-15953-a.patch @@ -0,0 +1,27 @@ +From 8ceb0cf0191f8b374a7f05974b29c6242ce8f752 Mon Sep 17 00:00:00 2001 +From: Damian Poddebniak <poddebniak@fh-muenster.de> +Date: Thu, 23 Jul 2020 19:24:45 +0200 +Subject: [PATCH] Detect extra data after STARTTLS response and exit + +--- + src/low-level/imap/mailimap.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/low-level/imap/mailimap.c b/src/low-level/imap/mailimap.c +index bb17119d..4ffcf55d 100644 +--- a/src/low-level/imap/mailimap.c ++++ b/src/low-level/imap/mailimap.c +@@ -2428,6 +2428,13 @@ int mailimap_starttls(mailimap * session) + + mailimap_response_free(response); + ++ // Detect if the server send extra data after the STARTTLS response. ++ // This *may* be a "response injection attack". ++ if (session->imap_stream->read_buffer_len != 0) { ++ // Since it is also an IMAP protocol violation, exit. ++ return MAILIMAP_ERROR_STARTTLS; ++ } ++ + switch (error_code) { + case MAILIMAP_RESP_COND_STATE_OK: + return MAILIMAP_NO_ERROR; diff --git a/user/libetpan/CVE-2020-15953-b.patch b/user/libetpan/CVE-2020-15953-b.patch new file mode 100644 index 000000000..95e0385bb --- /dev/null +++ b/user/libetpan/CVE-2020-15953-b.patch @@ -0,0 +1,58 @@ +From 6068b0fa8310bced874b322b20ac470472c64784 Mon Sep 17 00:00:00 2001 +From: Fabian Ising <f.ising@fh-muenster.de> +Date: Fri, 24 Jul 2020 08:56:05 +0200 +Subject: [PATCH 1/2] Detect extra data after STLS response and return error + +--- + src/low-level/pop3/mailpop3.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/low-level/pop3/mailpop3.c b/src/low-level/pop3/mailpop3.c +index ab9535be..e2124bf8 100644 +--- a/src/low-level/pop3/mailpop3.c ++++ b/src/low-level/pop3/mailpop3.c +@@ -959,6 +959,14 @@ int mailpop3_stls(mailpop3 * f) + + if (r != RESPONSE_OK) + return MAILPOP3_ERROR_STLS_NOT_SUPPORTED; ++ ++ // Detect if the server send extra data after the STLS response. ++ // This *may* be a "response injection attack". ++ if (f->pop3_stream->read_buffer_len != 0) { ++ // Since it is also protocol violation, exit. ++ // There is no error type for STARTTLS errors in POP3 ++ return MAILPOP3_ERROR_SSL; ++ } + + return MAILPOP3_NO_ERROR; + } + +From 874ebf7ce9d108c6c1def733f90d156b44fb6ef7 Mon Sep 17 00:00:00 2001 +From: Fabian Ising <f.ising@fh-muenster.de> +Date: Fri, 24 Jul 2020 08:56:31 +0200 +Subject: [PATCH 2/2] Detect extra data after SMTP STARTTLS response and return + error + +--- + src/low-level/smtp/mailsmtp.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/low-level/smtp/mailsmtp.c b/src/low-level/smtp/mailsmtp.c +index b7fc459e..3145cadf 100644 +--- a/src/low-level/smtp/mailsmtp.c ++++ b/src/low-level/smtp/mailsmtp.c +@@ -1111,6 +1111,14 @@ int mailesmtp_starttls(mailsmtp * session) + return MAILSMTP_ERROR_STREAM; + r = read_response(session); + ++ // Detect if the server send extra data after the STARTTLS response. ++ // This *may* be a "response injection attack". ++ if (session->stream->read_buffer_len != 0) { ++ // Since it is also protocol violation, exit. ++ // There is no general error type for STARTTLS errors in SMTP ++ return MAILSMTP_ERROR_SSL; ++ } ++ + switch (r) { + case 220: + return MAILSMTP_NO_ERROR; diff --git a/user/libev/APKBUILD b/user/libev/APKBUILD index eb2a629e6..65eac2c9f 100644 --- a/user/libev/APKBUILD +++ b/user/libev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=libev -pkgver=4.31 +pkgver=4.33 pkgrel=0 pkgdesc="Event dispatch library" url="http://software.schmorp.de/pkg/libev.html" @@ -34,5 +34,5 @@ package() { rm "$pkgdir"/usr/include/event.h } -sha512sums="c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18 libev-4.31.tar.gz +sha512sums="c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b libev-4.33.tar.gz b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e libev-4.11-Add-pkgconfig-support.patch" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index 281501cc0..ef892cbf1 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=0 pkgdesc="Wrapper library for kernel event devices" url="https://www.freedesktop.org/wiki/Software/libevdev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a libevdev-1.9.0.tar.xz" +sha512sums="7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645 libevdev-1.9.1.tar.xz" diff --git a/user/libevent/APKBUILD b/user/libevent/APKBUILD index 999ca10ac..6e2ebd8d6 100644 --- a/user/libevent/APKBUILD +++ b/user/libevent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: pkgname=libevent -pkgver=2.1.11 +pkgver=2.1.12 pkgrel=0 pkgdesc="An event notification library" url="https://libevent.org/" @@ -48,5 +48,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3 libevent-2.1.11-stable.tar.gz +sha512sums="88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f libevent-2.1.12-stable.tar.gz ca097528f88b0a86248be594b44eaa7edcb3a1ee2b808685c09aa7947bb5c10342f4b584e7f2fcef6bc4a185fecb80da4a7a6660dd5c075f3416f9a55a1389b0 py3_rpcgen.patch" diff --git a/user/libfakekey/APKBUILD b/user/libfakekey/APKBUILD index af08c494c..ea1eec3f8 100644 --- a/user/libfakekey/APKBUILD +++ b/user/libfakekey/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libfakekey pkgver=0.3 pkgrel=0 diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD index 674621204..ac679104b 100644 --- a/user/libfm-qt/APKBUILD +++ b/user/libfm-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libfm-qt pkgver=0.15.1 pkgrel=0 diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD index 9b09c9104..e8dd25f21 100644 --- a/user/libglade/APKBUILD +++ b/user/libglade/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libglade pkgver=2.6.4 pkgrel=0 diff --git a/user/libgnome-keyring/APKBUILD b/user/libgnome-keyring/APKBUILD index 7ecb68377..fdc1af0dd 100644 --- a/user/libgnome-keyring/APKBUILD +++ b/user/libgnome-keyring/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libgnome-keyring pkgver=3.12.0 pkgrel=0 diff --git a/user/libgtop/APKBUILD b/user/libgtop/APKBUILD index 37b1ef0e2..a03e337e9 100644 --- a/user/libgtop/APKBUILD +++ b/user/libgtop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libgtop pkgver=2.40.0 pkgrel=0 diff --git a/user/libindicator/APKBUILD b/user/libindicator/APKBUILD index 3c57d570c..a76c9b185 100644 --- a/user/libindicator/APKBUILD +++ b/user/libindicator/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libindicator pkgver=16.10 pkgrel=0 diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD index b870b3be7..1365a7cc7 100644 --- a/user/libisofs/APKBUILD +++ b/user/libisofs/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libisofs -pkgver=1.5.2 +pkgver=1.5.4 pkgrel=0 pkgdesc="Library for creating and managing iso9660-based filesystems" url="https://dev.lovelyhq.com/libburnia/web/wikis/home" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab libisofs-1.5.2.tar.gz" +sha512sums="a06e834e81081358478cdd27d1dcc6f3bb52ffd2ea57ade59f3ff2f69868fb6886a0b38fd1580d24295b7ed936ac471f107df64d62c1ff42b57dd8ce0810e3f2 libisofs-1.5.4.tar.gz" diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index cbecdd1a4..5910e7011 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo -pkgver=2.0.4 -pkgrel=1 +pkgver=2.0.5 +pkgrel=0 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" arch="all" @@ -11,7 +11,6 @@ depends="" makedepends="cmake" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz - CVE-2020-13790.patch " case "$CTARGET_ARCH" in @@ -63,5 +62,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9 libjpeg-turbo-2.0.4.tar.gz -83752558d0cf60508a9ccd55505b91f4faa22277537916629a045b2aaa0cb3649e2f90b0df26d389687dc4aba78bdf76e64fc5e5eb324a65026ec86cd95dbe6a CVE-2020-13790.patch" +sha512sums="5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 libjpeg-turbo-2.0.5.tar.gz" diff --git a/user/libjpeg-turbo/CVE-2020-13790.patch b/user/libjpeg-turbo/CVE-2020-13790.patch deleted file mode 100644 index aaeec0c9c..000000000 --- a/user/libjpeg-turbo/CVE-2020-13790.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001 -From: DRC <information@libjpeg-turbo.org> -Date: Tue, 2 Jun 2020 14:15:37 -0500 -Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM - -This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to -include binary PPM files with maximum values < 255, thus preventing a -malformed binary PPM input file with those specifications from -triggering an overrun of the rescale array and potentially crashing -cjpeg, TJBench, or any program that uses the tjLoadImage() function. - -Fixes #433 - -diff --git a/rdppm.c b/rdppm.c -index 87bc33090..a8507b902 100644 ---- a/rdppm.c -+++ b/rdppm.c -@@ -5,7 +5,7 @@ - * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2009 by Bill Allombert, Guido Vollbeding. - * libjpeg-turbo Modifications: -- * Copyright (C) 2015-2017, D. R. Commander. -+ * Copyright (C) 2015-2017, 2020, D. R. Commander. - * For conditions of distribution and use, see the accompanying README.ijg - * file. - * -@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) - /* On 16-bit-int machines we have to be careful of maxval = 65535 */ - source->rescale = (JSAMPLE *) - (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, -- (size_t)(((long)maxval + 1L) * -+ (size_t)(((long)MAX(maxval, 255) + 1L) * - sizeof(JSAMPLE))); - half_maxval = maxval / 2; - for (val = 0; val <= (long)maxval; val++) { diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index e855609c2..061cff570 100644 --- a/user/libkdcraw/APKBUILD +++ b/user/libkdcraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdcraw -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b2ceae6785c356f7f169e2efd8b47d920663dfc187d7e5abbf7ffbec934deb78bbfa096e2417f712c2e298e720bd11c1a8883372ef151826a8573df65e772aa7 libkdcraw-20.04.3.tar.xz" +sha512sums="93a687e361c3d2c6b16c8acbb197127bb614f2ed4a0d511cacb584c7f7d4e263e9f2e1e76ad8c1cf408779f99480f51b6c4278cd75c5833da720e1bb07d4f1f1 libkdcraw-20.08.1.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index a33e9d83e..7950251c6 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -60,4 +60,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="4681b4b37a78796eecd0daf00d231909391510122de4ad2ecb0c50ba7309c3119895c3490e727425ef0088a84e76cae26bc595730f4a673f7cfdf9aa559f0a74 libkdegames-20.04.3.tar.xz" +sha512sums="bf72bd28d3db3f7aa7344c284e81fe0ae8a402965892e0338814870c34652575a5ac980e87b42a40e7ee056f1869c305b094bdc3050862ae9f8ff67c4f5b078e libkdegames-20.08.1.tar.xz" diff --git a/user/libkdepim/APKBUILD b/user/libkdepim/APKBUILD index f1a122510..2db131329 100644 --- a/user/libkdepim/APKBUILD +++ b/user/libkdepim/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdepim -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE PIM runtime library" url="https://kontact.kde.org/" @@ -17,7 +17,9 @@ makedepends="qt5-qtbase-dev qt5-qttools-dev cmake extra-cmake-modules boost-dev akonadi-dev akonadi-contacts-dev akonadi-mime-dev akonadi-search-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/libkdepim-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkdepim-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -43,4 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b1be6f143466b52342a659fd76124808354584355dbcb283ffc41b126bdbf79b4bf01028954be6be450f3634ced8748f2be4433ee0393505388f442e7393b0dc libkdepim-20.04.3.tar.xz" +sha512sums="064e0e9432709dbbcb30e4ff5266d0ce7c960bb35b66cbb1fe4b3feee089ccecb47422cb5258b4d39913d15a02260c4454e174e63c3ce3d2efd37a425e41017c libkdepim-20.08.1.tar.xz +56e0b6797219252f52c0e3d51015f8abf89b924d1f454911cba3c7de11920811e6a9d18ea52ffbe8fbec82e967c11cbd386b4060b90363b64ec44d603e847cf5 lts.patch" diff --git a/user/libkdepim/lts.patch b/user/libkdepim/lts.patch new file mode 100644 index 000000000..e14c8202a --- /dev/null +++ b/user/libkdepim/lts.patch @@ -0,0 +1,11 @@ +--- libkdepim-20.08.1/CMakeLists.txt.old 2020-09-01 06:38:42.000000000 +0000 ++++ libkdepim-20.08.1/CMakeLists.txt 2020-09-18 01:07:16.304948113 +0000 +@@ -24,7 +24,7 @@ + + + set(LIBKDEPIM_LIB_VERSION ${PIM_VERSION}) +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus Network) + diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index c1e55793c..571416ddb 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkeduvocdocument -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ab6d63394302eca90c3f430753daa9535b30a5883ef899b21e4ba3d90fb5faec5990a7593d3c21cd78916238a9b14ac3fb24ee062171035e3afacaeb99ba3d7e libkeduvocdocument-20.04.3.tar.xz" +sha512sums="a09ae63e9ba1687bc3ce1ca33d530546370e09772f6be008ad21eec965fc2d10ca51bb7bb3613cf86b5516925cf543bf35ae7fc8e3bcbbe227449062e90aced3 libkeduvocdocument-20.08.1.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 40e3f3dc2..6549cf034 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="88846e87b64e2b0b213afc2765af69e4fb034caa6708f73db3f6180bb52e34a1e6ea14f06416f939ef66ed16cf0e1a43b03d6452eabe0cb24c40faddf39376a9 libkexiv2-20.04.3.tar.xz" +sha512sums="b112661c00cbcf24d26d0ffa1fa62d9593651b59dd7cd374c66215dfefacab36c63afb6a21d97af3063c7c9f6fe8bf47bfb59391391d5003d2d9b63f85779338 libkexiv2-20.08.1.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 6c946d53a..f2d8e7bd0 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkipi -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0cd89507fcebacf64c69665e7d2e1c780f478c1234e714b4db0823aced184bc274ed363f78983e44c6e28e4654dbf8ba6792aec0225065e516749b381a8fed28 libkipi-20.04.3.tar.xz" +sha512sums="af98432c47babc35d094af4370b41e00098e51b926a197b8126986b0d90f2761a45b5ccf2ab7122eac686a34a7cd86f55204cc42bbfe713f218d6f942a569231 libkipi-20.08.1.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 5ac0da36b..5dd7227c8 100644 --- a/user/libkleo/APKBUILD +++ b/user/libkleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkleo -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev boost-dev gpgme-dev libgpg-error-dev ki18n-dev kwidg makedepends="$depends_dev cmake extra-cmake-modules kcompletion-dev kconfig-dev kcodecs-dev kcoreaddons-dev kpimtextedit-dev kwindowsystem-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/libkleo-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/libkleo-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a318ba0517e193e69969427e8edb69c8a127deea9ae7e8ebf6ad0a6766ee237cedcf67322c47e3fb6d65aef94e7f54bc2d6d444743aa9753e0daa422ad23e1fb libkleo-20.04.3.tar.xz" +sha512sums="9cf56658be7de95382eaf65559158cf793c2c66dd3cbaae784a6793701b575ec71b484172c6ac6f85c579bdc10b1955ba373c77b58be0e8329cec8cb926b6f49 libkleo-20.08.1.tar.xz +ec75b93602cff31a07b72596d8f4fb5519f834f870ca1afeaad7a1dd6a8a0fa1dfb270fe8e3d45ef64001679c89b844e32adc7a0c21e09d46efad751e031f835 lts.patch" diff --git a/user/libkleo/lts.patch b/user/libkleo/lts.patch new file mode 100644 index 000000000..3e6814d2c --- /dev/null +++ b/user/libkleo/lts.patch @@ -0,0 +1,11 @@ +--- libkleo-20.08.1/CMakeLists.txt.old 2020-09-01 06:38:56.000000000 +0000 ++++ libkleo-20.08.1/CMakeLists.txt 2020-09-18 00:54:08.580470084 +0000 +@@ -25,7 +25,7 @@ + + + set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + set(KDEPIMTEXTEDIT_VERSION "5.15.1") + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index d4a5a0cac..11772712a 100644 --- a/user/libkmahjongg/APKBUILD +++ b/user/libkmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkmahjongg -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8ad55d17a0b6e06cf1abdec265abb55bcd5dd5aa80c2d9f9a3ef7331875d89c5a0dfb6bfad3e8e23d34ba7e6e5a20a6499ed0391f8c5ddd7e356aaee7dfd9010 libkmahjongg-20.04.3.tar.xz" +sha512sums="a5d6345460f26ab3a6197c729d3b2cf2986b635a236e3db4881691e416c1834e031790958c8faa2c3fe043a47e4241b5a68dcbe500df58798f7781176d43ec03 libkmahjongg-20.08.1.tar.xz" diff --git a/user/libkomparediff2/APKBUILD b/user/libkomparediff2/APKBUILD index 99124c04e..9d36e25fc 100644 --- a/user/libkomparediff2/APKBUILD +++ b/user/libkomparediff2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkomparediff2 -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE diff library" url="https://kde.org/applications/development/org.kde.kompare" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="880b8ed7d8e3df82f82509ef42f0c951340ed5c735e19af067381c9b0613afd43af97695bd42c8b60febda5605f22c6fb215ff2acbc5f6754e7c0076455e891f libkomparediff2-20.04.3.tar.xz" +sha512sums="043982200ea9c51f114a80c80865f04fc028b5462c66185f76cf3cc7eac80f54733adc6ff13ca0311525507e13f0fb3eb647f32092542e20a412ae4f859bfe76 libkomparediff2-20.08.1.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 31a6c5b04..e779b30e6 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksane -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6c38f8978149bd3b823d94822996dd2bbed2542a23960a3b8e399eb0fedeee5536e65ab27760941ad037101dbc27ffadf51a4103d0323c4e674f25d5fa12481e libksane-20.04.3.tar.xz" +sha512sums="7ee4c83a28194f964b2b15f6d7a00d1b8f301e46a32522e9df99ded1ded8e47e11ca574f8199473060668dfd5e4208fdc80d028e0d413e25ffd98c439fb383f7 libksane-20.08.1.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index c262c702f..ea0915cc3 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libkscreen -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" @@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtx11extras-dev qt5-qttools-dev kwayland-dev doxygen" subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-doc $pkgname-wayland" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/libkscreen-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -53,4 +53,4 @@ wayland() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/ } -sha512sums="73e5d105701d11f1bbe403034614d89a6aab3e4f47d949633e2104c590c62a4e89e7643558056d45d16e43d326c52a950024b84f184dd86fff9cfd57f37efa43 libkscreen-5.18.4.1.tar.xz" +sha512sums="8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00 libkscreen-5.18.5.tar.xz" diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD index a72a949e6..f3b6ae8b8 100644 --- a/user/libksysguard/APKBUILD +++ b/user/libksysguard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libksysguard -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE system monitor library" url="https://www.kde.org/" @@ -16,7 +16,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev zlib-dev kwindowsystem-dev kwidgetsaddons-dev qt5-qtwebchannel-dev kio-dev kglobalaccel-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/libksysguard-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4407bb15ca4e1e70f8c082ba11c25b4855330ca54fea15c900610245e2966bf2eeebbb6d5ea94bc0627df869363837660bfcca0a88fbfec9cc2ca43e0b635cd8 libksysguard-5.18.4.1.tar.xz" +sha512sums="a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3 libksysguard-5.18.5.tar.xz" diff --git a/user/libkworkspace/APKBUILD b/user/libkworkspace/APKBUILD index 84b7e5e7a..4cad8faab 100644 --- a/user/libkworkspace/APKBUILD +++ b/user/libkworkspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=libkworkspace -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE Plasma 5 workspace library" url="https://www.kde.org/plasma-desktop" @@ -14,8 +14,7 @@ makedepends="cmake extra-cmake-modules libice-dev libsm-dev libxau-dev kcoreaddons-dev ki18n-dev kscreenlocker-dev kwin-dev kwindowsystem-dev plasma-framework-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-workspace-$pkgver.tar.xz - header-generation.patch +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz session.patch standalone.patch " @@ -33,19 +32,19 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} . - make + ${CMAKE_CROSSOPTS} . \ + -Bbuild + make -C build } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7 plasma-workspace-5.18.4.1.tar.xz -3f72f33219999bc39c52c143c047df37eb34b4149bf479ec9aee64ce14c78946635cf20cf120858f10a676a2b7c00cef0b95aa696e8e71b7412d936fbdd7e755 header-generation.patch -1c7a23a4bb13030b992b8bde125548f104dbc6db489b60a6c40d91e2b793b208f35f88cca9ad90a9cc116d92b902d5c536b0e643805799b07286fbc82a0dafe8 session.patch -520a29666deed549b9d6bafe9ae6576aae39004616a46383e40d874fc0622710497de85da508cf6299f55e27c2d2681fc140678efef592abb14253b02d0fce59 standalone.patch" +sha512sums="870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2 plasma-workspace-5.18.5.tar.xz +27d801b0d05c5fbcd172f4ff60d537f8ebc8d2658202ed290203effc7c9b81599d0bd1c644afada265200d2d48669a3762a66310780dcc23d0ea19fa7865f62b session.patch +4e0559902e3c718260a1f8bfdc8110b6c4dcc0647f2060a991ca27ce2c1c1b070f3d58512c5ef37db1216924a014b0ae84e2d28b2e546b113551e3d75dd2652b standalone.patch" diff --git a/user/libkworkspace/header-generation.patch b/user/libkworkspace/header-generation.patch deleted file mode 100644 index c78fad092..000000000 --- a/user/libkworkspace/header-generation.patch +++ /dev/null @@ -1,17 +0,0 @@ -[ 26%] Generating consolekit_manager_interface.cpp, consolekit_manager_interface.h -[ 29%] Generating login1_manager_interface.moc -moc: /usr/src/packages/user/libkworkspace/src/plasma-workspace-5.17.90/libkworkspace/login1_manager_interface.h: No such file - ---- libkworkspace/CMakeLists.txt.old 2020-01-26 23:49:13.514087630 +0000 -+++ libkworkspace/CMakeLists.txt 2020-01-26 23:49:50.290062909 +0000 -@@ -79,8 +79,8 @@ - endif() - - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" -- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" -- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Session.xml" -+ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Seat.xml" -+ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Session.xml" - PROPERTIES INCLUDE "loginddbustypes.h" ) - - qt5_add_dbus_interface(kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" login1_manager_interface) diff --git a/user/libkworkspace/session.patch b/user/libkworkspace/session.patch index ec29807c1..dd61f53c5 100644 --- a/user/libkworkspace/session.patch +++ b/user/libkworkspace/session.patch @@ -1,23 +1,11 @@ --- libkworkspace/sessionmanagementbackend.cpp.old 2020-01-16 12:37:11.000000000 +0000 +++ libkworkspace/sessionmanagementbackend.cpp 2020-01-26 23:48:25.419351063 +0000 -@@ -77,6 +77,11 @@ - - /*********************************************************************************/ - -+bool LogindSessionBackend::exists() -+{ -+ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1")); -+} -+ - LogindSessionBackend::LogindSessionBackend() - { - m_login1 = new OrgFreedesktopLogin1ManagerInterface(QStringLiteral("org.freedesktop.login1"), QStringLiteral("/org/freedesktop/login1"), QDBusConnection::systemBus(), this); @@ -199,7 +204,7 @@ bool ConsoleKitSessionBackend::exists() { - return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1")); -+ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConosleKit")); ++ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit")); } ConsoleKitSessionBackend::ConsoleKitSessionBackend() diff --git a/user/libkworkspace/standalone.patch b/user/libkworkspace/standalone.patch index 27ad62eab..e91ec552b 100644 --- a/user/libkworkspace/standalone.patch +++ b/user/libkworkspace/standalone.patch @@ -15,7 +15,7 @@ index 3c4c47870..53bc780b5 100644 +project(libkworkspace) + +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+ set(PROJECT_VERSION "5.18.4.1") ++ set(PROJECT_VERSION "5.18.5") + set(PROJECT_VERSION_MAJOR 5) + + cmake_minimum_required(VERSION 3.0) diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 24ff091bf..d9cd7cfa5 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=liblxqt pkgver=0.15.1 pkgrel=0 diff --git a/user/libmad/APKBUILD b/user/libmad/APKBUILD index 38f6a0deb..358496da1 100644 --- a/user/libmad/APKBUILD +++ b/user/libmad/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libmad pkgver=0.15.1b -pkgrel=9 +pkgrel=1 pkgdesc="A high-quality MPEG audio decoder" url="https://www.underbit.com/products/mad/" arch="all" @@ -15,10 +15,15 @@ source="https://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.g libmad-0.15.1b-cflags-O2.patch libmad-0.15.1b-cflags.patch automake.patch + CVE-2018-7263.patch Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch mad.pc " +# secfixes: +# 0.15.1b-r1: +# - CVE-2018-7263 + prepare() { update_config_sub default_prepare @@ -45,5 +50,6 @@ sha512sums="2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5 13a8bac30cea4861f903b4abc8673f9a35b6253aae6a02915f99b67e5e8c56460fc1fb059a0aa52143b665f888928baba098daf0ed022420e46317be4dbc6161 libmad-0.15.1b-cflags-O2.patch 01dc8421dba2b652aa8ca6d1f1a5c310645465b18190ebfdeaae516de881869957e8e7c0c373d0d09623da33719d01e028f2f6164790b54c43a71271f5b4dbba libmad-0.15.1b-cflags.patch e73ec5ae3b14e8d45579b52bcc561a309b85e1e51d946e061e2f0a9252f515e48e2d818e8bdce1adf5a9801ec314be8c911914d0bb12f9113a7afc54cf385250 automake.patch +dd412962246d4c9db8c07dbafcaba2f64fdc0c94cf6bcc3f4f0f88a92800f40e550cc56dc8a2324c0123d9c70a89055dc50cd714206d7886e2f6877d4cc26600 CVE-2018-7263.patch 9e9af20050c922c1c2f0b55009ae0eb20c9381eaff071f0dfee8a7b3a357e58f835f69364beb99820f5672459d88ac483d2419e1f9532d763779aafad7cbf72b Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08 mad.pc" diff --git a/user/libmad/CVE-2018-7263.patch b/user/libmad/CVE-2018-7263.patch new file mode 100644 index 000000000..80e48469e --- /dev/null +++ b/user/libmad/CVE-2018-7263.patch @@ -0,0 +1,817 @@ +From: Kurt Roeckx <kurt@roeckx.be> +Date: Sun, 28 Jan 2018 19:26:36 +0100 +Subject: Check the size before reading with mad_bit_read + +There are various cases where it attemps to read past the end of the buffer +using mad_bit_read(). Most functions didn't even know the size of the buffer +they were reading from. + +Index: libmad-0.15.1b/bit.c +=================================================================== +--- libmad-0.15.1b.orig/bit.c ++++ libmad-0.15.1b/bit.c +@@ -138,6 +138,9 @@ unsigned long mad_bit_read(struct mad_bi + { + register unsigned long value; + ++ if (len == 0) ++ return 0; ++ + if (bitptr->left == CHAR_BIT) + bitptr->cache = *bitptr->byte; + +Index: libmad-0.15.1b/frame.c +=================================================================== +--- libmad-0.15.1b.orig/frame.c ++++ libmad-0.15.1b/frame.c +@@ -120,11 +120,18 @@ static + int decode_header(struct mad_header *header, struct mad_stream *stream) + { + unsigned int index; ++ struct mad_bitptr bufend_ptr; + + header->flags = 0; + header->private_bits = 0; + ++ mad_bit_init(&bufend_ptr, stream->bufend); ++ + /* header() */ ++ if (mad_bit_length(&stream->ptr, &bufend_ptr) < 32) { ++ stream->error = MAD_ERROR_BUFLEN; ++ return -1; ++ } + + /* syncword */ + mad_bit_skip(&stream->ptr, 11); +@@ -225,8 +232,13 @@ int decode_header(struct mad_header *hea + /* error_check() */ + + /* crc_check */ +- if (header->flags & MAD_FLAG_PROTECTION) ++ if (header->flags & MAD_FLAG_PROTECTION) { ++ if (mad_bit_length(&stream->ptr, &bufend_ptr) < 16) { ++ stream->error = MAD_ERROR_BUFLEN; ++ return -1; ++ } + header->crc_target = mad_bit_read(&stream->ptr, 16); ++ } + + return 0; + } +@@ -338,7 +350,7 @@ int mad_header_decode(struct mad_header + stream->error = MAD_ERROR_BUFLEN; + goto fail; + } +- else if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) { ++ else if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) { + /* mark point where frame sync word was expected */ + stream->this_frame = ptr; + stream->next_frame = ptr + 1; +@@ -361,6 +373,8 @@ int mad_header_decode(struct mad_header + ptr = mad_bit_nextbyte(&stream->ptr); + } + ++ stream->error = MAD_ERROR_NONE; ++ + /* begin processing */ + stream->this_frame = ptr; + stream->next_frame = ptr + 1; /* possibly bogus sync word */ +@@ -413,7 +427,7 @@ int mad_header_decode(struct mad_header + /* check that a valid frame header follows this frame */ + + ptr = stream->next_frame; +- if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) { ++ if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) { + ptr = stream->next_frame = stream->this_frame + 1; + goto sync; + } +Index: libmad-0.15.1b/layer12.c +=================================================================== +--- libmad-0.15.1b.orig/layer12.c ++++ libmad-0.15.1b/layer12.c +@@ -72,10 +72,18 @@ mad_fixed_t const linear_table[14] = { + * DESCRIPTION: decode one requantized Layer I sample from a bitstream + */ + static +-mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb) ++mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb, struct mad_stream *stream) + { + mad_fixed_t sample; ++ struct mad_bitptr frameend_ptr; + ++ mad_bit_init(&frameend_ptr, stream->next_frame); ++ ++ if (mad_bit_length(ptr, &frameend_ptr) < nb) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return 0; ++ } + sample = mad_bit_read(ptr, nb); + + /* invert most significant bit, extend sign, then scale to fixed format */ +@@ -106,6 +114,10 @@ int mad_layer_I(struct mad_stream *strea + struct mad_header *header = &frame->header; + unsigned int nch, bound, ch, s, sb, nb; + unsigned char allocation[2][32], scalefactor[2][32]; ++ struct mad_bitptr bufend_ptr, frameend_ptr; ++ ++ mad_bit_init(&bufend_ptr, stream->bufend); ++ mad_bit_init(&frameend_ptr, stream->next_frame); + + nch = MAD_NCHANNELS(header); + +@@ -118,6 +130,11 @@ int mad_layer_I(struct mad_stream *strea + /* check CRC word */ + + if (header->flags & MAD_FLAG_PROTECTION) { ++ if (mad_bit_length(&stream->ptr, &bufend_ptr) ++ < 4 * (bound * nch + (32 - bound))) { ++ stream->error = MAD_ERROR_BADCRC; ++ return -1; ++ } + header->crc_check = + mad_bit_crc(stream->ptr, 4 * (bound * nch + (32 - bound)), + header->crc_check); +@@ -133,6 +150,11 @@ int mad_layer_I(struct mad_stream *strea + + for (sb = 0; sb < bound; ++sb) { + for (ch = 0; ch < nch; ++ch) { ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + nb = mad_bit_read(&stream->ptr, 4); + + if (nb == 15) { +@@ -145,6 +167,11 @@ int mad_layer_I(struct mad_stream *strea + } + + for (sb = bound; sb < 32; ++sb) { ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + nb = mad_bit_read(&stream->ptr, 4); + + if (nb == 15) { +@@ -161,6 +188,11 @@ int mad_layer_I(struct mad_stream *strea + for (sb = 0; sb < 32; ++sb) { + for (ch = 0; ch < nch; ++ch) { + if (allocation[ch][sb]) { ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6); + + # if defined(OPT_STRICT) +@@ -185,8 +217,10 @@ int mad_layer_I(struct mad_stream *strea + for (ch = 0; ch < nch; ++ch) { + nb = allocation[ch][sb]; + frame->sbsample[ch][s][sb] = nb ? +- mad_f_mul(I_sample(&stream->ptr, nb), ++ mad_f_mul(I_sample(&stream->ptr, nb, stream), + sf_table[scalefactor[ch][sb]]) : 0; ++ if (stream->error != 0) ++ return -1; + } + } + +@@ -194,7 +228,14 @@ int mad_layer_I(struct mad_stream *strea + if ((nb = allocation[0][sb])) { + mad_fixed_t sample; + +- sample = I_sample(&stream->ptr, nb); ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < nb) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } ++ sample = I_sample(&stream->ptr, nb, stream); ++ if (stream->error != 0) ++ return -1; + + for (ch = 0; ch < nch; ++ch) { + frame->sbsample[ch][s][sb] = +@@ -280,13 +321,21 @@ struct quantclass { + static + void II_samples(struct mad_bitptr *ptr, + struct quantclass const *quantclass, +- mad_fixed_t output[3]) ++ mad_fixed_t output[3], struct mad_stream *stream) + { + unsigned int nb, s, sample[3]; ++ struct mad_bitptr frameend_ptr; ++ ++ mad_bit_init(&frameend_ptr, stream->next_frame); + + if ((nb = quantclass->group)) { + unsigned int c, nlevels; + ++ if (mad_bit_length(ptr, &frameend_ptr) < quantclass->bits) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return; ++ } + /* degrouping */ + c = mad_bit_read(ptr, quantclass->bits); + nlevels = quantclass->nlevels; +@@ -299,8 +348,14 @@ void II_samples(struct mad_bitptr *ptr, + else { + nb = quantclass->bits; + +- for (s = 0; s < 3; ++s) ++ for (s = 0; s < 3; ++s) { ++ if (mad_bit_length(ptr, &frameend_ptr) < nb) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return; ++ } + sample[s] = mad_bit_read(ptr, nb); ++ } + } + + for (s = 0; s < 3; ++s) { +@@ -336,6 +391,9 @@ int mad_layer_II(struct mad_stream *stre + unsigned char const *offsets; + unsigned char allocation[2][32], scfsi[2][32], scalefactor[2][32][3]; + mad_fixed_t samples[3]; ++ struct mad_bitptr frameend_ptr; ++ ++ mad_bit_init(&frameend_ptr, stream->next_frame); + + nch = MAD_NCHANNELS(header); + +@@ -402,13 +460,24 @@ int mad_layer_II(struct mad_stream *stre + for (sb = 0; sb < bound; ++sb) { + nbal = bitalloc_table[offsets[sb]].nbal; + +- for (ch = 0; ch < nch; ++ch) ++ for (ch = 0; ch < nch; ++ch) { ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal); ++ } + } + + for (sb = bound; sb < sblimit; ++sb) { + nbal = bitalloc_table[offsets[sb]].nbal; + ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + allocation[0][sb] = + allocation[1][sb] = mad_bit_read(&stream->ptr, nbal); + } +@@ -417,8 +486,14 @@ int mad_layer_II(struct mad_stream *stre + + for (sb = 0; sb < sblimit; ++sb) { + for (ch = 0; ch < nch; ++ch) { +- if (allocation[ch][sb]) ++ if (allocation[ch][sb]) { ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 2) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2); ++ } + } + } + +@@ -441,6 +516,11 @@ int mad_layer_II(struct mad_stream *stre + for (sb = 0; sb < sblimit; ++sb) { + for (ch = 0; ch < nch; ++ch) { + if (allocation[ch][sb]) { ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6); + + switch (scfsi[ch][sb]) { +@@ -451,11 +531,21 @@ int mad_layer_II(struct mad_stream *stre + break; + + case 0: ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6); + /* fall through */ + + case 1: + case 3: ++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) { ++ stream->error = MAD_ERROR_LOSTSYNC; ++ stream->sync = 0; ++ return -1; ++ } + scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6); + } + +@@ -487,7 +577,9 @@ int mad_layer_II(struct mad_stream *stre + if ((index = allocation[ch][sb])) { + index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1]; + +- II_samples(&stream->ptr, &qc_table[index], samples); ++ II_samples(&stream->ptr, &qc_table[index], samples, stream); ++ if (stream->error != 0) ++ return -1; + + for (s = 0; s < 3; ++s) { + frame->sbsample[ch][3 * gr + s][sb] = +@@ -505,7 +597,9 @@ int mad_layer_II(struct mad_stream *stre + if ((index = allocation[0][sb])) { + index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1]; + +- II_samples(&stream->ptr, &qc_table[index], samples); ++ II_samples(&stream->ptr, &qc_table[index], samples, stream); ++ if (stream->error != 0) ++ return -1; + + for (ch = 0; ch < nch; ++ch) { + for (s = 0; s < 3; ++s) { +Index: libmad-0.15.1b/layer3.c +=================================================================== +--- libmad-0.15.1b.orig/layer3.c ++++ libmad-0.15.1b/layer3.c +@@ -598,7 +598,8 @@ enum mad_error III_sideinfo(struct mad_b + static + unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr, + struct channel *channel, +- struct channel *gr1ch, int mode_extension) ++ struct channel *gr1ch, int mode_extension, ++ unsigned int bits_left, unsigned int *part2_length) + { + struct mad_bitptr start; + unsigned int scalefac_compress, index, slen[4], part, n, i; +@@ -644,8 +645,12 @@ unsigned int III_scalefactors_lsf(struct + + n = 0; + for (part = 0; part < 4; ++part) { +- for (i = 0; i < nsfb[part]; ++i) ++ for (i = 0; i < nsfb[part]; ++i) { ++ if (bits_left < slen[part]) ++ return MAD_ERROR_BADSCFSI; + channel->scalefac[n++] = mad_bit_read(ptr, slen[part]); ++ bits_left -= slen[part]; ++ } + } + + while (n < 39) +@@ -690,7 +695,10 @@ unsigned int III_scalefactors_lsf(struct + max = (1 << slen[part]) - 1; + + for (i = 0; i < nsfb[part]; ++i) { ++ if (bits_left < slen[part]) ++ return MAD_ERROR_BADSCFSI; + is_pos = mad_bit_read(ptr, slen[part]); ++ bits_left -= slen[part]; + + channel->scalefac[n] = is_pos; + gr1ch->scalefac[n++] = (is_pos == max); +@@ -703,7 +711,8 @@ unsigned int III_scalefactors_lsf(struct + } + } + +- return mad_bit_length(&start, ptr); ++ *part2_length = mad_bit_length(&start, ptr); ++ return MAD_ERROR_NONE; + } + + /* +@@ -712,7 +721,8 @@ unsigned int III_scalefactors_lsf(struct + */ + static + unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel, +- struct channel const *gr0ch, unsigned int scfsi) ++ struct channel const *gr0ch, unsigned int scfsi, ++ unsigned int bits_left, unsigned int *part2_length) + { + struct mad_bitptr start; + unsigned int slen1, slen2, sfbi; +@@ -728,12 +738,20 @@ unsigned int III_scalefactors(struct mad + sfbi = 0; + + nsfb = (channel->flags & mixed_block_flag) ? 8 + 3 * 3 : 6 * 3; +- while (nsfb--) ++ while (nsfb--) { ++ if (bits_left < slen1) ++ return MAD_ERROR_BADSCFSI; + channel->scalefac[sfbi++] = mad_bit_read(ptr, slen1); ++ bits_left -= slen1; ++ } + + nsfb = 6 * 3; +- while (nsfb--) ++ while (nsfb--) { ++ if (bits_left < slen2) ++ return MAD_ERROR_BADSCFSI; + channel->scalefac[sfbi++] = mad_bit_read(ptr, slen2); ++ bits_left -= slen2; ++ } + + nsfb = 1 * 3; + while (nsfb--) +@@ -745,8 +763,12 @@ unsigned int III_scalefactors(struct mad + channel->scalefac[sfbi] = gr0ch->scalefac[sfbi]; + } + else { +- for (sfbi = 0; sfbi < 6; ++sfbi) ++ for (sfbi = 0; sfbi < 6; ++sfbi) { ++ if (bits_left < slen1) ++ return MAD_ERROR_BADSCFSI; + channel->scalefac[sfbi] = mad_bit_read(ptr, slen1); ++ bits_left -= slen1; ++ } + } + + if (scfsi & 0x4) { +@@ -754,8 +776,12 @@ unsigned int III_scalefactors(struct mad + channel->scalefac[sfbi] = gr0ch->scalefac[sfbi]; + } + else { +- for (sfbi = 6; sfbi < 11; ++sfbi) ++ for (sfbi = 6; sfbi < 11; ++sfbi) { ++ if (bits_left < slen1) ++ return MAD_ERROR_BADSCFSI; + channel->scalefac[sfbi] = mad_bit_read(ptr, slen1); ++ bits_left -= slen1; ++ } + } + + if (scfsi & 0x2) { +@@ -763,8 +789,12 @@ unsigned int III_scalefactors(struct mad + channel->scalefac[sfbi] = gr0ch->scalefac[sfbi]; + } + else { +- for (sfbi = 11; sfbi < 16; ++sfbi) ++ for (sfbi = 11; sfbi < 16; ++sfbi) { ++ if (bits_left < slen2) ++ return MAD_ERROR_BADSCFSI; + channel->scalefac[sfbi] = mad_bit_read(ptr, slen2); ++ bits_left -= slen2; ++ } + } + + if (scfsi & 0x1) { +@@ -772,14 +802,19 @@ unsigned int III_scalefactors(struct mad + channel->scalefac[sfbi] = gr0ch->scalefac[sfbi]; + } + else { +- for (sfbi = 16; sfbi < 21; ++sfbi) ++ for (sfbi = 16; sfbi < 21; ++sfbi) { ++ if (bits_left < slen2) ++ return MAD_ERROR_BADSCFSI; + channel->scalefac[sfbi] = mad_bit_read(ptr, slen2); ++ bits_left -= slen2; ++ } + } + + channel->scalefac[21] = 0; + } + +- return mad_bit_length(&start, ptr); ++ *part2_length = mad_bit_length(&start, ptr); ++ return MAD_ERROR_NONE; + } + + /* +@@ -933,19 +968,17 @@ static + enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576], + struct channel *channel, + unsigned char const *sfbwidth, +- unsigned int part2_length) ++ signed int part3_length) + { + signed int exponents[39], exp; + signed int const *expptr; + struct mad_bitptr peek; +- signed int bits_left, cachesz; ++ signed int bits_left, cachesz, fakebits; + register mad_fixed_t *xrptr; + mad_fixed_t const *sfbound; + register unsigned long bitcache; + +- bits_left = (signed) channel->part2_3_length - (signed) part2_length; +- if (bits_left < 0) +- return MAD_ERROR_BADPART3LEN; ++ bits_left = part3_length; + + III_exponents(channel, sfbwidth, exponents); + +@@ -956,8 +989,12 @@ enum mad_error III_huffdecode(struct mad + cachesz = mad_bit_bitsleft(&peek); + cachesz += ((32 - 1 - 24) + (24 - cachesz)) & ~7; + ++ if (bits_left < cachesz) { ++ cachesz = bits_left; ++ } + bitcache = mad_bit_read(&peek, cachesz); + bits_left -= cachesz; ++ fakebits = 0; + + xrptr = &xr[0]; + +@@ -986,7 +1023,7 @@ enum mad_error III_huffdecode(struct mad + + big_values = channel->big_values; + +- while (big_values-- && cachesz + bits_left > 0) { ++ while (big_values-- && cachesz + bits_left - fakebits > 0) { + union huffpair const *pair; + unsigned int clumpsz, value; + register mad_fixed_t requantized; +@@ -1023,10 +1060,19 @@ enum mad_error III_huffdecode(struct mad + unsigned int bits; + + bits = ((32 - 1 - 21) + (21 - cachesz)) & ~7; ++ if (bits_left < bits) { ++ bits = bits_left; ++ } + bitcache = (bitcache << bits) | mad_bit_read(&peek, bits); + cachesz += bits; + bits_left -= bits; + } ++ if (cachesz < 21) { ++ unsigned int bits = 21 - cachesz; ++ bitcache <<= bits; ++ cachesz += bits; ++ fakebits += bits; ++ } + + /* hcod (0..19) */ + +@@ -1041,6 +1087,8 @@ enum mad_error III_huffdecode(struct mad + } + + cachesz -= pair->value.hlen; ++ if (cachesz < fakebits) ++ return MAD_ERROR_BADHUFFDATA; + + if (linbits) { + /* x (0..14) */ +@@ -1054,10 +1102,15 @@ enum mad_error III_huffdecode(struct mad + + case 15: + if (cachesz < linbits + 2) { +- bitcache = (bitcache << 16) | mad_bit_read(&peek, 16); +- cachesz += 16; +- bits_left -= 16; ++ unsigned int bits = 16; ++ if (bits_left < 16) ++ bits = bits_left; ++ bitcache = (bitcache << bits) | mad_bit_read(&peek, bits); ++ cachesz += bits; ++ bits_left -= bits; + } ++ if (cachesz - fakebits < linbits) ++ return MAD_ERROR_BADHUFFDATA; + + value += MASK(bitcache, cachesz, linbits); + cachesz -= linbits; +@@ -1074,6 +1127,8 @@ enum mad_error III_huffdecode(struct mad + } + + x_final: ++ if (cachesz - fakebits < 1) ++ return MAD_ERROR_BADHUFFDATA; + xrptr[0] = MASK1BIT(bitcache, cachesz--) ? + -requantized : requantized; + } +@@ -1089,10 +1144,15 @@ enum mad_error III_huffdecode(struct mad + + case 15: + if (cachesz < linbits + 1) { +- bitcache = (bitcache << 16) | mad_bit_read(&peek, 16); +- cachesz += 16; +- bits_left -= 16; ++ unsigned int bits = 16; ++ if (bits_left < 16) ++ bits = bits_left; ++ bitcache = (bitcache << bits) | mad_bit_read(&peek, bits); ++ cachesz += bits; ++ bits_left -= bits; + } ++ if (cachesz - fakebits < linbits) ++ return MAD_ERROR_BADHUFFDATA; + + value += MASK(bitcache, cachesz, linbits); + cachesz -= linbits; +@@ -1109,6 +1169,8 @@ enum mad_error III_huffdecode(struct mad + } + + y_final: ++ if (cachesz - fakebits < 1) ++ return MAD_ERROR_BADHUFFDATA; + xrptr[1] = MASK1BIT(bitcache, cachesz--) ? + -requantized : requantized; + } +@@ -1128,6 +1190,8 @@ enum mad_error III_huffdecode(struct mad + requantized = reqcache[value] = III_requantize(value, exp); + } + ++ if (cachesz - fakebits < 1) ++ return MAD_ERROR_BADHUFFDATA; + xrptr[0] = MASK1BIT(bitcache, cachesz--) ? + -requantized : requantized; + } +@@ -1146,6 +1210,8 @@ enum mad_error III_huffdecode(struct mad + requantized = reqcache[value] = III_requantize(value, exp); + } + ++ if (cachesz - fakebits < 1) ++ return MAD_ERROR_BADHUFFDATA; + xrptr[1] = MASK1BIT(bitcache, cachesz--) ? + -requantized : requantized; + } +@@ -1155,9 +1221,6 @@ enum mad_error III_huffdecode(struct mad + } + } + +- if (cachesz + bits_left < 0) +- return MAD_ERROR_BADHUFFDATA; /* big_values overrun */ +- + /* count1 */ + { + union huffquad const *table; +@@ -1167,15 +1230,24 @@ enum mad_error III_huffdecode(struct mad + + requantized = III_requantize(1, exp); + +- while (cachesz + bits_left > 0 && xrptr <= &xr[572]) { ++ while (cachesz + bits_left - fakebits > 0 && xrptr <= &xr[572]) { + union huffquad const *quad; + + /* hcod (1..6) */ + + if (cachesz < 10) { +- bitcache = (bitcache << 16) | mad_bit_read(&peek, 16); +- cachesz += 16; +- bits_left -= 16; ++ unsigned int bits = 16; ++ if (bits_left < 16) ++ bits = bits_left; ++ bitcache = (bitcache << bits) | mad_bit_read(&peek, bits); ++ cachesz += bits; ++ bits_left -= bits; ++ } ++ if (cachesz < 10) { ++ unsigned int bits = 10 - cachesz; ++ bitcache <<= bits; ++ cachesz += bits; ++ fakebits += bits; + } + + quad = &table[MASK(bitcache, cachesz, 4)]; +@@ -1188,6 +1260,11 @@ enum mad_error III_huffdecode(struct mad + MASK(bitcache, cachesz, quad->ptr.bits)]; + } + ++ if (cachesz - fakebits < quad->value.hlen + quad->value.v ++ + quad->value.w + quad->value.x + quad->value.y) ++ /* We don't have enough bits to read one more entry, consider them ++ * stuffing bits. */ ++ break; + cachesz -= quad->value.hlen; + + if (xrptr == sfbound) { +@@ -1236,22 +1313,8 @@ enum mad_error III_huffdecode(struct mad + + xrptr += 2; + } +- +- if (cachesz + bits_left < 0) { +-# if 0 && defined(DEBUG) +- fprintf(stderr, "huffman count1 overrun (%d bits)\n", +- -(cachesz + bits_left)); +-# endif +- +- /* technically the bitstream is misformatted, but apparently +- some encoders are just a bit sloppy with stuffing bits */ +- +- xrptr -= 4; +- } + } + +- assert(-bits_left <= MAD_BUFFER_GUARD * CHAR_BIT); +- + # if 0 && defined(DEBUG) + if (bits_left < 0) + fprintf(stderr, "read %d bits too many\n", -bits_left); +@@ -2348,10 +2411,11 @@ void III_freqinver(mad_fixed_t sample[18 + */ + static + enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame, +- struct sideinfo *si, unsigned int nch) ++ struct sideinfo *si, unsigned int nch, unsigned int md_len) + { + struct mad_header *header = &frame->header; + unsigned int sfreqi, ngr, gr; ++ int bits_left = md_len * CHAR_BIT; + + { + unsigned int sfreq; +@@ -2383,6 +2447,7 @@ enum mad_error III_decode(struct mad_bit + for (ch = 0; ch < nch; ++ch) { + struct channel *channel = &granule->ch[ch]; + unsigned int part2_length; ++ unsigned int part3_length; + + sfbwidth[ch] = sfbwidth_table[sfreqi].l; + if (channel->block_type == 2) { +@@ -2391,18 +2456,30 @@ enum mad_error III_decode(struct mad_bit + } + + if (header->flags & MAD_FLAG_LSF_EXT) { +- part2_length = III_scalefactors_lsf(ptr, channel, ++ error = III_scalefactors_lsf(ptr, channel, + ch == 0 ? 0 : &si->gr[1].ch[1], +- header->mode_extension); ++ header->mode_extension, bits_left, &part2_length); + } + else { +- part2_length = III_scalefactors(ptr, channel, &si->gr[0].ch[ch], +- gr == 0 ? 0 : si->scfsi[ch]); ++ error = III_scalefactors(ptr, channel, &si->gr[0].ch[ch], ++ gr == 0 ? 0 : si->scfsi[ch], bits_left, &part2_length); + } ++ if (error) ++ return error; ++ ++ bits_left -= part2_length; + +- error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part2_length); ++ if (part2_length > channel->part2_3_length) ++ return MAD_ERROR_BADPART3LEN; ++ ++ part3_length = channel->part2_3_length - part2_length; ++ if (part3_length > bits_left) ++ return MAD_ERROR_BADPART3LEN; ++ ++ error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part3_length); + if (error) + return error; ++ bits_left -= part3_length; + } + + /* joint stereo processing */ +@@ -2519,11 +2596,13 @@ int mad_layer_III(struct mad_stream *str + unsigned int nch, priv_bitlen, next_md_begin = 0; + unsigned int si_len, data_bitlen, md_len; + unsigned int frame_space, frame_used, frame_free; +- struct mad_bitptr ptr; ++ struct mad_bitptr ptr, bufend_ptr; + struct sideinfo si; + enum mad_error error; + int result = 0; + ++ mad_bit_init(&bufend_ptr, stream->bufend); ++ + /* allocate Layer III dynamic structures */ + + if (stream->main_data == 0) { +@@ -2587,14 +2666,15 @@ int mad_layer_III(struct mad_stream *str + unsigned long header; + + mad_bit_init(&peek, stream->next_frame); ++ if (mad_bit_length(&peek, &bufend_ptr) >= 57) { ++ header = mad_bit_read(&peek, 32); ++ if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) { ++ if (!(header & 0x00010000L)) /* protection_bit */ ++ mad_bit_skip(&peek, 16); /* crc_check */ + +- header = mad_bit_read(&peek, 32); +- if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) { +- if (!(header & 0x00010000L)) /* protection_bit */ +- mad_bit_skip(&peek, 16); /* crc_check */ +- +- next_md_begin = +- mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8); ++ next_md_begin = ++ mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8); ++ } + } + + mad_bit_finish(&peek); +@@ -2653,7 +2733,7 @@ int mad_layer_III(struct mad_stream *str + /* decode main_data */ + + if (result == 0) { +- error = III_decode(&ptr, frame, &si, nch); ++ error = III_decode(&ptr, frame, &si, nch, md_len); + if (error) { + stream->error = error; + result = -1; diff --git a/user/libmatekbd/APKBUILD b/user/libmatekbd/APKBUILD index 30b8fb665..871efed9d 100644 --- a/user/libmatekbd/APKBUILD +++ b/user/libmatekbd/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmatekbd -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Keyboard libraries for the MATE desktop environment" url="https://mate-desktop.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6a04f4f38ac1d1ef372fdbaddfe4c935d79039cce1a3d68a6876fa5550556f1d568de1d53857531c6f0bd5994e815f2c9e5be0436218e97718f87e17973ea655 libmatekbd-1.24.0.tar.xz" +sha512sums="982f973e90bd08c4068fc42f6c62d9d32f8ba4855f5616b3e4ce7167df787bd9dacf47fac3d95ddd0e7d622870bc394c1a22cfb929d0f3293c26095c2b5fe7e3 libmatekbd-1.24.1.tar.xz" diff --git a/user/libmatemixer/APKBUILD b/user/libmatemixer/APKBUILD index 3d668c996..b2a791106 100644 --- a/user/libmatemixer/APKBUILD +++ b/user/libmatemixer/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmatemixer -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Sound mixer library for the MATE desktop environment" url="https://mate-desktop.org" @@ -46,4 +46,4 @@ pulse() { mv "$pkgdir"/usr/lib/$pkgname/$pkgname-pulse.so "$subpkgdir"/usr/lib/$pkgname } -sha512sums="bf8c807bd45f3626bbf881eefa1e4638165daf61637bc63a704492d2a67eeec622e35e58c041649d33411294f96f79c99b3ea2406ae6fcf83294ec625cca9dbf libmatemixer-1.24.0.tar.xz" +sha512sums="c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6 libmatemixer-1.24.1.tar.xz" diff --git a/user/libmateweather/APKBUILD b/user/libmateweather/APKBUILD index 44c7bd1b0..4e29d4d8c 100644 --- a/user/libmateweather/APKBUILD +++ b/user/libmateweather/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmateweather -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Weather library for the MATE desktop environment" url="https://mate-desktop.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300 libmateweather-1.24.0.tar.xz" +sha512sums="1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156 libmateweather-1.24.1.tar.xz" diff --git a/user/libmatroska/APKBUILD b/user/libmatroska/APKBUILD index 076e9a9e2..de30dc6ba 100644 --- a/user/libmatroska/APKBUILD +++ b/user/libmatroska/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libmatroska -pkgver=1.5.2 +pkgver=1.6.2 pkgrel=0 pkgdesc="Library to parse Matroska files" url="https://www.matroska.org/" @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2 libmatroska-1.5.2.tar.xz" +sha512sums="c0b2b475f01e01b064348e96a4cd25f594e93b21ab6f66236d6872d1242b6076d501c155a19dedd642ded8338c0a71be09450fc086e77802099413c8849abab1 libmatroska-1.6.2.tar.xz" diff --git a/user/libmaxminddb/APKBUILD b/user/libmaxminddb/APKBUILD index f1762c4ca..c03397a46 100644 --- a/user/libmaxminddb/APKBUILD +++ b/user/libmaxminddb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=libmaxminddb -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=0 pkgdesc="Library for the MaxMind DB file format" url="http://maxmind.github.io/libmaxminddb/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1 libmaxminddb-1.4.2.tar.gz" +sha512sums="7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e libmaxminddb-1.4.3.tar.gz" diff --git a/user/libmpd/APKBUILD b/user/libmpd/APKBUILD index c1fa255fd..f15d1b0fd 100644 --- a/user/libmpd/APKBUILD +++ b/user/libmpd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libmpd pkgver=11.8.17 pkgrel=0 diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 80bdb5e5b..d9a3771a0 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=libnftnl -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407 libnftnl-1.1.7.tar.bz2" +sha512sums="173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e libnftnl-1.1.8.tar.bz2" diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD index a03e7c089..f3cea249b 100644 --- a/user/libopenraw/APKBUILD +++ b/user/libopenraw/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libopenraw pkgver=0.1.3 pkgrel=0 diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index 74e405157..9fc1333a4 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libpeas -pkgver=1.26.0 +pkgver=1.28.0 pkgrel=0 pkgdesc="GObject-based plugin framework" url="https://gnome.org" @@ -29,5 +29,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f libpeas-1.26.0.tar.xz +sha512sums="43f8bc426238f519d7a3b26409af2f7578e921893c085d00fab74699a45649d8343e5646658003980e6639f51e74f3b25519c3bbc248d5161b11c999f7dd0374 libpeas-1.28.0.tar.xz 307f198078d3d1b0f8d914011ecffaae500e4d8f71cbc876fef36b5f25c49858fe1c929c572e2c75146097068771524cc50fbb4638cbbbf90cbb3eab29c0964b use-locale.h.patch" diff --git a/user/libproxy/APKBUILD b/user/libproxy/APKBUILD index 1cdb0c9b5..7a13ebc05 100644 --- a/user/libproxy/APKBUILD +++ b/user/libproxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libproxy pkgver=0.4.15 -pkgrel=2 +pkgrel=3 pkgdesc="Library providing automatic proxy configuration management" url="http://libproxy.github.io/libproxy/" arch="all" @@ -14,8 +14,15 @@ subpackages="$pkgname-dev $pkgname-bin py3-$pkgname:py" source="$pkgname-$pkgver.tar.gz::https://github.com/libproxy/libproxy/archive/$pkgver.tar.gz libproxy-0.4.7-unistd.patch fix-includes.patch + CVE-2020-25219.patch + CVE-2020-26154.patch " +# secfixes: +# 0.4.15-r3: +# - CVE-2020-25219 +# - CVE-2020-26154 + build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -55,4 +62,6 @@ py() { sha512sums="8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b libproxy-0.4.15.tar.gz 9929c308195bc59c1b9a7ddaaf708fb831da83c5d86d7ce122cb9774c9b9b16aef3c17fb721356e33a865de1af27db493f29a99d292e1e258cd0135218cacd32 libproxy-0.4.7-unistd.patch -e35b4f806e5f60e9b184d64dceae62e6e343c367ee96d7e461388f2665fe2ab62170d41848c9da5322bb1719eff3bfaecb273e40a97ce940a5e88d29d03bd8d9 fix-includes.patch" +e35b4f806e5f60e9b184d64dceae62e6e343c367ee96d7e461388f2665fe2ab62170d41848c9da5322bb1719eff3bfaecb273e40a97ce940a5e88d29d03bd8d9 fix-includes.patch +908fbf49bec18764a8c2ab81ef5d5e6e1fc2423cf9a6608cc7d3a6d5ac44676e171646b0f95b39b7ade108afd62cc2ede8f7b57d6ba0d67025f30b18e5084292 CVE-2020-25219.patch +01c784a8016bb2a2bf5058b6af7fac29250542bfd4e0679a91fa223c821336d651f8f4a968763072edb86a78a743618c312a2daeb2963c8e5207109f2d26a18f CVE-2020-26154.patch" diff --git a/user/libproxy/CVE-2020-25219.patch b/user/libproxy/CVE-2020-25219.patch new file mode 100644 index 000000000..03cfbc00e --- /dev/null +++ b/user/libproxy/CVE-2020-25219.patch @@ -0,0 +1,57 @@ +From a83dae404feac517695c23ff43ce1e116e2bfbe0 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@gnome.org> +Date: Wed, 9 Sep 2020 11:12:02 -0500 +Subject: [PATCH] Rewrite url::recvline to be nonrecursive + +This function processes network input. It's semi-trusted, because the +PAC ought to be trusted. But we still shouldn't allow it to control how +far we recurse. A malicious PAC can cause us to overflow the stack by +sending a sufficiently-long line without any '\n' character. + +Also, this function failed to properly handle EINTR, so let's fix that +too, for good measure. + +Fixes #134 +--- + libproxy/url.cpp | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/libproxy/url.cpp b/libproxy/url.cpp +index ee776b2..68d69cd 100644 +--- a/libproxy/url.cpp ++++ b/libproxy/url.cpp +@@ -388,16 +388,24 @@ string url::to_string() const { + return m_orig; + } + +-static inline string recvline(int fd) { +- // Read a character. +- // If we don't get a character, return empty string. +- // If we are at the end of the line, return empty string. +- char c = '\0'; +- +- if (recv(fd, &c, 1, 0) != 1 || c == '\n') +- return ""; +- +- return string(1, c) + recvline(fd); ++static string recvline(int fd) { ++ string line; ++ int ret; ++ ++ // Reserve arbitrary amount of space to avoid small memory reallocations. ++ line.reserve(128); ++ ++ do { ++ char c; ++ ret = recv(fd, &c, 1, 0); ++ if (ret == 1) { ++ if (c == '\n') ++ return line; ++ line += c; ++ } ++ } while (ret == 1 || (ret == -1 && errno == EINTR)); ++ ++ return line; + } + + char* url::get_pac() { diff --git a/user/libproxy/CVE-2020-26154.patch b/user/libproxy/CVE-2020-26154.patch new file mode 100644 index 000000000..929083327 --- /dev/null +++ b/user/libproxy/CVE-2020-26154.patch @@ -0,0 +1,93 @@ +From 4411b523545b22022b4be7d0cac25aa170ae1d3e Mon Sep 17 00:00:00 2001 +From: Fei Li <lifeibiren@gmail.com> +Date: Fri, 17 Jul 2020 02:18:37 +0800 +Subject: [PATCH] Fix buffer overflow when PAC is enabled + +The bug was found on Windows 10 (MINGW64) when PAC is enabled. It turned +out to be the large PAC file (more than 102400 bytes) returned by a +local proxy program with no content-length present. +--- + libproxy/url.cpp | 44 +++++++++++++++++++++++++++++++------------- + 1 file changed, 31 insertions(+), 13 deletions(-) + +diff --git a/libproxy/url.cpp b/libproxy/url.cpp +index ee776b2..8684086 100644 +--- a/libproxy/url.cpp ++++ b/libproxy/url.cpp +@@ -54,7 +54,7 @@ using namespace std; + #define PAC_MIME_TYPE_FB "text/plain" + + // This is the maximum pac size (to avoid memory attacks) +-#define PAC_MAX_SIZE 102400 ++#define PAC_MAX_SIZE 0x800000 + // This is the default block size to use when receiving via HTTP + #define PAC_HTTP_BLOCK_SIZE 512 + +@@ -478,15 +478,13 @@ char* url::get_pac() { + } + + // Get content +- unsigned int recvd = 0; +- buffer = new char[PAC_MAX_SIZE]; +- memset(buffer, 0, PAC_MAX_SIZE); ++ std::vector<char> dynamic_buffer; + do { + unsigned int chunk_length; + + if (chunked) { + // Discard the empty line if we received a previous chunk +- if (recvd > 0) recvline(sock); ++ if (!dynamic_buffer.empty()) recvline(sock); + + // Get the chunk-length line as an integer + if (sscanf(recvline(sock).c_str(), "%x", &chunk_length) != 1 || chunk_length == 0) break; +@@ -498,21 +496,41 @@ char* url::get_pac() { + + if (content_length >= PAC_MAX_SIZE) break; + +- while (content_length == 0 || recvd != content_length) { +- int r = recv(sock, buffer + recvd, +- content_length == 0 ? PAC_HTTP_BLOCK_SIZE +- : content_length - recvd, 0); ++ while (content_length == 0 || dynamic_buffer.size() != content_length) { ++ // Calculate length to recv ++ unsigned int length_to_read = PAC_HTTP_BLOCK_SIZE; ++ if (content_length > 0) ++ length_to_read = content_length - dynamic_buffer.size(); ++ ++ // Prepare buffer ++ dynamic_buffer.resize(dynamic_buffer.size() + length_to_read); ++ ++ int r = recv(sock, dynamic_buffer.data() + dynamic_buffer.size() - length_to_read, length_to_read, 0); ++ ++ // Shrink buffer to fit ++ if (r >= 0) ++ dynamic_buffer.resize(dynamic_buffer.size() - length_to_read + r); ++ ++ // PAC size too large, discard ++ if (dynamic_buffer.size() >= PAC_MAX_SIZE) { ++ chunked = false; ++ dynamic_buffer.clear(); ++ break; ++ } ++ + if (r <= 0) { + chunked = false; + break; + } +- recvd += r; + } + } while (chunked); + +- if (content_length != 0 && string(buffer).size() != content_length) { +- delete[] buffer; +- buffer = NULL; ++ if (content_length == 0 || content_length == dynamic_buffer.size()) { ++ buffer = new char[dynamic_buffer.size() + 1]; ++ if (!dynamic_buffer.empty()) { ++ memcpy(buffer, dynamic_buffer.data(), dynamic_buffer.size()); ++ } ++ buffer[dynamic_buffer.size()] = '\0'; + } + } + diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD index 66d49e293..a45b2876a 100644 --- a/user/libpsl/APKBUILD +++ b/user/libpsl/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libpsl -pkgver=0.21.0 +pkgver=0.21.1 pkgrel=0 pkgdesc="C library for examining the Public Suffix List" url="https://rockdaboot.github.io/libpsl" @@ -10,7 +10,7 @@ license="MIT AND BSD-3-Clause" depends="" makedepends="python3 libidn2-dev libunistring-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$pkgver/libpsl-$pkgver.tar.gz +source="https://github.com/rockdaboot/libpsl/releases/download/$pkgver/libpsl-$pkgver.tar.gz use-python3.patch " @@ -33,5 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d libpsl-0.21.0.tar.gz +sha512sums="a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5 libpsl-0.21.1.tar.gz 00c9c09bac334efcd7ae6240b740ac88453425cc380cc23b443a0579f4ccabf86eafdb90f5f05027cc55ee20f6c1d4388939792a55cd95705d5e6919d40b30e5 use-python3.patch" diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD index 7b0e70656..76807b5bf 100644 --- a/user/libqtxdg/APKBUILD +++ b/user/libqtxdg/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libqtxdg pkgver=3.5.0 pkgrel=0 diff --git a/user/libraw/APKBUILD b/user/libraw/APKBUILD index d280c6402..881e60074 100644 --- a/user/libraw/APKBUILD +++ b/user/libraw/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libraw pkgver=0.19.5 -pkgrel=0 +pkgrel=1 pkgdesc="Read RAW image files from digital cameras" url="https://www.libraw.org/" arch="all" @@ -10,9 +10,15 @@ license="LGPL-2.1-only OR CDDL-1.0" depends="" makedepends="jasper-dev lcms2-dev libjpeg-turbo-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.libraw.org/data/LibRaw-$pkgver.tar.gz" +source="https://www.libraw.org/data/LibRaw-$pkgver.tar.gz + CVE-2020-15503.patch + " builddir="$srcdir/LibRaw-$pkgver" +# secfixes: +# 0.19.5-r1: +# - CVE-2020-15503 + build() { ./configure \ --build=$CBUILD \ @@ -32,4 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826 LibRaw-0.19.5.tar.gz" +sha512sums="4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826 LibRaw-0.19.5.tar.gz +49feadef114b219222c0ca143f45aaa1595b7c7a4a8f8472cd6f18449082d75b3fb4314e4beba549f8f69bc49d7790777129ff1f12ee8a110988fdf12f20caae CVE-2020-15503.patch" diff --git a/user/libraw/CVE-2020-15503.patch b/user/libraw/CVE-2020-15503.patch new file mode 100644 index 000000000..94c28b6ab --- /dev/null +++ b/user/libraw/CVE-2020-15503.patch @@ -0,0 +1,131 @@ +--- a/libraw/libraw_const.h.orig 2020-07-03 11:22:46.761804592 -0500 ++++ b/libraw/libraw_const.h 2020-07-03 11:23:02.620793431 -0500 +@@ -24,6 +24,12 @@ + #define LIBRAW_MAX_ALLOC_MB 2048L + #endif + ++/* limit thumbnail size, default is 512Mb*/ ++#ifndef LIBRAW_MAX_THUMBNAIL_MB ++#define LIBRAW_MAX_THUMBNAIL_MB 512L ++#endif ++ ++ + /* Change to non-zero to allow (broken) CRW (and other) files metadata + loop prevention */ + #ifndef LIBRAW_METADATA_LOOP_PREVENTION +--- a/src/libraw_cxx.cpp.orig 2020-07-03 11:20:21.810906602 -0500 ++++ b/src/libraw_cxx.cpp 2020-07-03 11:37:33.802869028 -0500 +@@ -3712,6 +3712,21 @@ + return NULL; + } + ++ if (T.tlength < 64u) ++ { ++ if (errcode) ++ *errcode = EINVAL; ++ return NULL; ++ } ++ ++ if (INT64(T.tlength) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) ++ { ++ if (errcode) ++ *errcode = LIBRAW_TOO_BIG; ++ return NULL; ++ } ++ ++ + if (T.tformat == LIBRAW_THUMBNAIL_BITMAP) + { + libraw_processed_image_t *ret = (libraw_processed_image_t *)::malloc(sizeof(libraw_processed_image_t) + T.tlength); +@@ -3976,6 +3991,12 @@ + if (ID.toffset + est_datasize > ID.input->size() + THUMB_READ_BEYOND) + throw LIBRAW_EXCEPTION_IO_EOF; + ++ if(INT64(T.theight) * INT64(T.twidth) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) ++ throw LIBRAW_EXCEPTION_IO_CORRUPT; ++ ++ if (INT64(T.theight) * INT64(T.twidth) < 64ULL) ++ throw LIBRAW_EXCEPTION_IO_CORRUPT; ++ + // some kodak cameras + ushort s_height = S.height, s_width = S.width, s_iwidth = S.iwidth, s_iheight = S.iheight; + ushort s_flags = libraw_internal_data.unpacker_data.load_flags; +@@ -4237,6 +4258,25 @@ + CHECK_ORDER_LOW(LIBRAW_PROGRESS_IDENTIFY); + CHECK_ORDER_BIT(LIBRAW_PROGRESS_THUMB_LOAD); + ++#define THUMB_SIZE_CHECKT(A) \ ++ do { \ ++ if (INT64(A) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ ++ if (INT64(A) > 0 && INT64(A) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ ++ } while (0) ++ ++#define THUMB_SIZE_CHECKTNZ(A) \ ++ do { \ ++ if (INT64(A) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ ++ if (INT64(A) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ ++ } while (0) ++ ++ ++#define THUMB_SIZE_CHECKWH(W,H) \ ++ do { \ ++ if (INT64(W)*INT64(H) > 1024ULL * 1024ULL * LIBRAW_MAX_THUMBNAIL_MB) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ ++ if (INT64(W)*INT64(H) < 64ULL) throw LIBRAW_EXCEPTION_IO_CORRUPT; \ ++ } while (0) ++ + try + { + if (!libraw_internal_data.internal_data.input) +@@ -4267,6 +4307,7 @@ + + if (INT64(ID.toffset) + tsize > ID.input->size() + THUMB_READ_BEYOND) + throw LIBRAW_EXCEPTION_IO_EOF; ++ THUMB_SIZE_CHECKT(tsize); + } + else + { +@@ -4280,6 +4321,7 @@ + ID.input->seek(ID.toffset, SEEK_SET); + if (write_thumb == &LibRaw::jpeg_thumb) + { ++ THUMB_SIZE_CHECKTNZ(T.tlength); + if (T.thumb) + free(T.thumb); + T.thumb = (char *)malloc(T.tlength); +@@ -4326,6 +4368,7 @@ + { + if (t_bytesps > 1) + throw LIBRAW_EXCEPTION_IO_CORRUPT; // 8-bit thumb, but parsed for more bits ++ THUMB_SIZE_CHECKWH(T.twidth, T.theight); + int t_length = T.twidth * T.theight * t_colors; + + if (T.tlength && T.tlength < t_length) // try to find tiff ifd with needed offset +@@ -4351,8 +4394,12 @@ + T.tcolors = 1; + } + T.tlength = total_size; ++ THUMB_SIZE_CHECKTNZ(T.tlength); + if (T.thumb) + free(T.thumb); ++ ++ THUMB_SIZE_CHECKTNZ(T.tlength); ++ + T.thumb = (char *)malloc(T.tlength); + merror(T.thumb, "ppm_thumb()"); + +@@ -4400,10 +4447,15 @@ + if (t_bytesps > 2) + throw LIBRAW_EXCEPTION_IO_CORRUPT; // 16-bit thumb, but parsed for more bits + int o_bps = (imgdata.params.raw_processing_options & LIBRAW_PROCESSING_USE_PPM16_THUMBS) ? 2 : 1; ++ THUMB_SIZE_CHECKWH(T.twidth, T.theight); + int o_length = T.twidth * T.theight * t_colors * o_bps; + int i_length = T.twidth * T.theight * t_colors * 2; + if (!T.tlength) + T.tlength = o_length; ++ THUMB_SIZE_CHECKTNZ(o_length); ++ THUMB_SIZE_CHECKTNZ(i_length); ++ THUMB_SIZE_CHECKTNZ(T.tlength); ++ + ushort *t_thumb = (ushort *)calloc(i_length, 1); + ID.input->read(t_thumb, 1, i_length); + if ((libraw_internal_data.unpacker_data.order == 0x4949) == (ntohs(0x1234) == 0x1234)) diff --git a/user/librdkafka/APKBUILD b/user/librdkafka/APKBUILD index 793f43392..aff21f6f1 100644 --- a/user/librdkafka/APKBUILD +++ b/user/librdkafka/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=librdkafka -pkgver=1.4.4 +pkgver=1.5.0 pkgrel=0 pkgdesc="The Apache Kafka C/C++ library" url="https://github.com/edenhill/librdkafka" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d librdkafka-1.4.4.tar.gz" +sha512sums="ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262 librdkafka-1.5.0.tar.gz" diff --git a/user/libseccomp/APKBUILD b/user/libseccomp/APKBUILD new file mode 100644 index 000000000..f666e777f --- /dev/null +++ b/user/libseccomp/APKBUILD @@ -0,0 +1,46 @@ +# Maintainer: Zach van Rijn <me@zv.io> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Contributor: Dan Williams <dan@ma.ssive.co> +pkgname=libseccomp +pkgver=2.5.0 +pkgrel=0 +pkgdesc="An interface to the Linux Kernel's syscall filtering mechanism" +url="https://github.com/seccomp/libseccomp" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="linux-headers gperf" +checkdepends="bash cmd:which" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/seccomp/libseccomp/releases/download/v$pkgver/libseccomp-$pkgver.tar.gz + remove-redefinition-prctl.patch + " + +# secfixes: +# 2.4.0-r0: +# - CVE-2019-9893 + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-static \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae libseccomp-2.5.0.tar.gz +f2c31dcafdc9a1ad78e32e76b75e1c1603071eaa3f979e1f2483b879a34ad07e0a4ef3642196a695415cdf81e1ed2bf325175872fb4e203ef9d0e668c287493f remove-redefinition-prctl.patch" diff --git a/user/libseccomp/remove-redefinition-prctl.patch b/user/libseccomp/remove-redefinition-prctl.patch new file mode 100644 index 000000000..2ea88fe05 --- /dev/null +++ b/user/libseccomp/remove-redefinition-prctl.patch @@ -0,0 +1,10 @@ +--- ./src/system.c.orig ++++ ./src/system.c +@@ -21,7 +21,6 @@ + + #include <stdlib.h> + #include <errno.h> +-#include <sys/prctl.h> + + #include <seccomp.h> + diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD index 943216d01..393d18e77 100644 --- a/user/libsigc++/APKBUILD +++ b/user/libsigc++/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libsigc++ pkgver=2.10.2 pkgrel=0 diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index 7992f7d22..dc5d4c132 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libsoup pkgver=2.70.0 pkgrel=0 diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD index 45a2bc72d..c1724f0d8 100644 --- a/user/libstatgrab/APKBUILD +++ b/user/libstatgrab/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libstatgrab pkgver=0.92 pkgrel=0 diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD index 6c4e0ffc4..9f20151ed 100644 --- a/user/libsysstat/APKBUILD +++ b/user/libsysstat/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libsysstat pkgver=0.4.3 _lxqt_build=0.7.0 diff --git a/user/libvorbis/APKBUILD b/user/libvorbis/APKBUILD index 1dd35bf77..3fb3aa3d6 100644 --- a/user/libvorbis/APKBUILD +++ b/user/libvorbis/APKBUILD @@ -1,21 +1,21 @@ # Maintainer: pkgname=libvorbis -pkgver=1.3.6 +pkgver=1.3.7 pkgrel=0 pkgdesc="Vorbis audio codec library" url="https://xiph.org/vorbis/" arch="all" -options="!check" # Test suite doesn't compile. license="BSD-3-Clause" depends="" makedepends="libogg-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.xz - CVE-2017-14160-and-2018-10393.patch - CVE-2018-10392.patch " # secfixes: +# 1.3.7-r0: +# - CVE-2018-10392 +# - CVE-2018-10393 # 1.3.6-r1: # - CVE-2018-10392 # 1.3.5-r4: @@ -36,10 +36,12 @@ build() { make } +check() { + make -j1 check +} + package() { make DESTDIR="$pkgdir" install } -sha512sums="a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132 libvorbis-1.3.6.tar.xz -332081da5dd8fb28ee70dfbc123e7fcef279317ee977be9da97e97a105e788da452c33097bf597f369fea0e49749f876a93d6af0fa2fa20405acbc57771c89a9 CVE-2017-14160-and-2018-10393.patch -294de5e0c40b64d495df7f53196260be5ffaba11c75fc4a1a54ec0c058eeba4793c1ef685c8cf866195a2972c91a7a896df5f05f478b7f25a564abb3f82f331f CVE-2018-10392.patch" +sha512sums="bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd libvorbis-1.3.7.tar.xz" diff --git a/user/libvorbis/CVE-2017-14160-and-2018-10393.patch b/user/libvorbis/CVE-2017-14160-and-2018-10393.patch deleted file mode 100644 index 3a7097ec7..000000000 --- a/user/libvorbis/CVE-2017-14160-and-2018-10393.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001 -From: Thomas Daede <daede003@umn.edu> -Date: Wed, 9 May 2018 14:56:59 -0700 -Subject: [PATCH] CVE-2017-14160: fix bounds check on very low sample rates. - ---- - lib/psy.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/psy.c b/lib/psy.c -index 422c6f1..1310123 100644 ---- a/lib/psy.c -+++ b/lib/psy.c -@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b, - for (i = 0, x = 0.f;; i++, x += 1.f) { - - lo = b[i] >> 16; -- if( lo>=0 ) break; - hi = b[i] & 0xffff; -+ if( lo>=0 ) break; -+ if( hi>=n ) break; - - tN = N[hi] + N[-lo]; - tX = X[hi] - X[-lo]; --- -2.22.0 - diff --git a/user/libvorbis/CVE-2018-10392.patch b/user/libvorbis/CVE-2018-10392.patch deleted file mode 100644 index a12038a94..000000000 --- a/user/libvorbis/CVE-2018-10392.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001 -From: Thomas Daede <daede003@umn.edu> -Date: Thu, 17 May 2018 16:19:19 -0700 -Subject: [PATCH] Sanity check number of channels in setup. - -Fixes #2335. ---- - lib/vorbisenc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c -index 4fc7b62..64a51b5 100644 ---- a/lib/vorbisenc.c -+++ b/lib/vorbisenc.c -@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){ - highlevel_encode_setup *hi=&ci->hi; - - if(ci==NULL)return(OV_EINVAL); -+ if(vi->channels<1||vi->channels>255)return(OV_EINVAL); - if(!hi->impulse_block_p)i0=1; - - /* too low/high an ATH floater is nonsensical, but doesn't break anything */ --- -2.22.0 - diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD index a003a6b92..215b3b850 100644 --- a/user/libwebp/APKBUILD +++ b/user/libwebp/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: pkgname=libwebp pkgver=1.0.3 diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD index 2a33337a0..bf38f30bd 100644 --- a/user/libwnck/APKBUILD +++ b/user/libwnck/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libwnck pkgver=3.36.0 _pkgmaj=${pkgver%.*} diff --git a/user/libx11/APKBUILD b/user/libx11/APKBUILD index 25703a6ef..8672d1b39 100644 --- a/user/libx11/APKBUILD +++ b/user/libx11/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libx11 -pkgver=1.6.9 +pkgver=1.6.12 pkgrel=0 pkgdesc="X11 client-side library" url="https://www.X.Org/" @@ -14,6 +14,10 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libX11-$pkgver.tar.bz2" builddir="$srcdir"/libX11-$pkgver +# secfixes: +# 1.6.12-r0: +# - CVE-2020-14363 + build() { ./configure \ --build=$CBUILD \ @@ -33,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31 libX11-1.6.9.tar.bz2" +sha512sums="79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47 libX11-1.6.12.tar.bz2" diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index 62acc0a53..85300dd25 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libxfce4ui pkgver=4.14.1 pkgrel=0 diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 823692e8e..1b3b0c22b 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libxfce4util pkgver=4.14.0 pkgrel=0 diff --git a/user/libxklavier/APKBUILD b/user/libxklavier/APKBUILD index 6a788bbce..a8ecb207c 100644 --- a/user/libxklavier/APKBUILD +++ b/user/libxklavier/APKBUILD @@ -1,13 +1,13 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=libxklavier pkgver=5.4 -pkgrel=1 +pkgrel=2 pkgdesc="High-level API for XKB" url="https://www.freedesktop.org/wiki/Software/LibXklavier/" arch="all" license="LGPL-2.0+" -depends="" +depends="iso-codes" makedepends="gobject-introspection-dev libx11-dev libxml2-dev glib-dev libxcb-dev libxkbcommon-dev libxkbfile-dev libxi-dev iso-codes-dev vala-dev" diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index fead388fb..224755425 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2020.07.09 +pkgver=2020.07.31 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -51,4 +51,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="9734235d7ad36d044da7296ccb39e173df0153013ff817381c9727e65b1ec5f00f3447e8ba9d7af8a2ab04843c0b0a8e98756255b3a578b8770a7e16eca84314 live.2020.07.09.tar.gz" +sha512sums="e23f6da5b0b1767c959bc3591276f8e0678732d4f197b1369aea2963ef2bf1e37a9ac714deded783819c1d5b5f9319cff0ed15f349908d88986649dc16e2da15 live.2020.07.31.tar.gz" diff --git a/user/livecd-support/APKBUILD b/user/livecd-support/APKBUILD new file mode 100644 index 000000000..85fca324e --- /dev/null +++ b/user/livecd-support/APKBUILD @@ -0,0 +1,65 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=livecd-support +pkgver=1.0 +pkgrel=0 +pkgdesc="Support files for booting Adélie live media" +url="https://www.adelielinux.org/" +arch="noarch" +options="!check suid" # Metapackage +license="NCSA" +subpackages="$pkgname-kde $pkgname-lxqt $pkgname-mate $pkgname-horizon" +depends="" +install="livecd-support.post-install livecd-support.post-deinstall" +source="kde.sddm.conf + lxqt.sddm.conf + mate.sddm.conf + horizon-ui + " + +package() { + mkdir -p $pkgdir +} + +horizon() { + pkgdesc="Add the ability to install Adélie from live media" + depends="horizon-qt5 horizon netsurf partitionmanager xterm" + + install -D -m4755 "$srcdir"/horizon-ui "$subpkgdir"/usr/sbin/horizon-ui + + mkdir -p "$subpkgdir"/usr/share/applications + cat >"$subpkgdir"/usr/share/applications/horizon.desktop <<DESKTOP +[Desktop Entry] +Type=Application +Version=1.1 +Name=System Installation +Comment=Install Adélie Linux to your computer +Icon=system-software-install +Exec=/usr/sbin/horizon-ui +Categories=System; +DESKTOP +} + + +kde() { + pkgdesc="$pkgdesc (KDE spin)" + depends="livecd-support adelie-kde-theme kde sddm x11" + install -D -m644 "$srcdir"/kde.sddm.conf "$subpkgdir"/etc/sddm.conf.d/kde.conf +} + +lxqt() { + pkgdesc="$pkgdesc (LXQt spin)" + depends="livecd-support lxqt-desktop sddm x11" + install -D -m644 "$srcdir"/lxqt.sddm.conf "$subpkgdir"/etc/sddm.conf.d/lxqt.conf +} + +mate() { + pkgdesc="$pkgdesc (MATE spin)" + depends="livecd-support mate-complete sddm x11" + install -D -m644 "$srcdir"/mate.sddm.conf "$subpkgdir"/etc/sddm.conf.d/mate.conf +} + +sha512sums="eddcc68917b4dc376bb9b7e7ed5e2c06379957c787c7152e654f31adb402f5811463bff69ce2a41a2cb87b0fa83a4aa3718b63d830eb9ee46b7d0d2058663d34 kde.sddm.conf +9a9a61035c0a8c5ee84d235f319ca158216056221d03a0f5a3846982cb6110c569d7b4eadd2e24de66a75a428c18850e0393e20412e0edcfc8ad41c9d4783604 lxqt.sddm.conf +603d2a5b1fdad0cb0abfefa8a4019c690ee4f5f9ac45057eeeac3bac3207e7871bdb32a564791fb99d965959b39a7de979d575db2694c2d1d88a4a16b68adb25 mate.sddm.conf +b6d39b2feb0aa400ac7013d6b8c9080ab00ffc1c8b40dbf9489df999fe08b86aebd878c84d968a53ad29bc2a2c30209d8c6ff5daa4171aab03d5b921f966e08d horizon-ui" diff --git a/user/livecd-support/horizon-ui b/user/livecd-support/horizon-ui new file mode 100644 index 000000000..e984e9476 --- /dev/null +++ b/user/livecd-support/horizon-ui @@ -0,0 +1,8 @@ +#!/bin/sh +# +# Welcome to Adélie Linux. +# This script allows you to run Horizon as the live user. +# + +horizon-qt5 +if [ $? -eq 0 ]; then horizon-run-qt5; fi diff --git a/user/livecd-support/kde.sddm.conf b/user/livecd-support/kde.sddm.conf new file mode 100644 index 000000000..d8b190abe --- /dev/null +++ b/user/livecd-support/kde.sddm.conf @@ -0,0 +1,3 @@ +[Autologin] +User=live +Session=plasma.desktop diff --git a/user/livecd-support/livecd-support.post-deinstall b/user/livecd-support/livecd-support.post-deinstall new file mode 100644 index 000000000..cfd0c59ac --- /dev/null +++ b/user/livecd-support/livecd-support.post-deinstall @@ -0,0 +1,3 @@ +#!/bin/sh + +sed -i 's/pam_unix.so nullok_secure$/pam_unix.so/' /etc/pam.d/base-auth diff --git a/user/livecd-support/livecd-support.post-install b/user/livecd-support/livecd-support.post-install new file mode 100644 index 000000000..9556f5a52 --- /dev/null +++ b/user/livecd-support/livecd-support.post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +sed -i 's/pam_unix.so$/pam_unix.so nullok_secure/' /etc/pam.d/base-auth diff --git a/user/livecd-support/lxqt.sddm.conf b/user/livecd-support/lxqt.sddm.conf new file mode 100644 index 000000000..797782fed --- /dev/null +++ b/user/livecd-support/lxqt.sddm.conf @@ -0,0 +1,3 @@ +[Autologin] +User=live +Session=lxqt.desktop diff --git a/user/livecd-support/mate.sddm.conf b/user/livecd-support/mate.sddm.conf new file mode 100644 index 000000000..56e53c6fb --- /dev/null +++ b/user/livecd-support/mate.sddm.conf @@ -0,0 +1,3 @@ +[Autologin] +User=live +Session=mate.desktop diff --git a/user/lokalize/APKBUILD b/user/lokalize/APKBUILD index b48609fd4..1dab84a20 100644 --- a/user/lokalize/APKBUILD +++ b/user/lokalize/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lokalize -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Computer-aided translation system" url="https://kde.org/applications/development/org.kde.lokalize" @@ -16,7 +16,9 @@ makedepends="qt5-qtbase-dev qt5-qtscript-dev cmake extra-cmake-modules kauth-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev solid-dev sonnet-dev hunspell-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/lokalize-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/lokalize-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -42,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="becc88705957386a1012378e28c025eb4087f46e2f0953eaa3d8f8d6625cce3be1d23bf1a92ef38f02793a0f175115141839e360bce7f9adcf6ccd494b17b65c lokalize-20.04.3.tar.xz" +sha512sums="9ac2990ee4147114e42ae0098e65ea608a8052d836b5d8a4a4b721d1fa631f6e40a21431ef8c00c03adb7fcc668ea76704f3be207c74347480c33f59ad4f6a22 lokalize-20.08.1.tar.xz +75b6e97aec4941b7d9ae2d84df58a5f9554169d91dffbf765ee780f8d408bb8aad1f581d8213194df843159677dde9170663740ca78ac7ac3655165dae1fea26 lts.patch" diff --git a/user/lokalize/lts.patch b/user/lokalize/lts.patch new file mode 100644 index 000000000..755fdd610 --- /dev/null +++ b/user/lokalize/lts.patch @@ -0,0 +1,37 @@ +12c12 +< set(QT_MIN_VERSION "5.14.0") +--- +> set(QT_MIN_VERSION "5.12.9") +--- lokalize-20.08.1/CMakeLists.txt.old 2020-09-01 06:29:46.000000000 +0000 ++++ lokalize-20.08.1/CMakeLists.txt 2020-09-17 15:42:19.559171111 +0000 +@@ -9,7 +9,7 @@ + + project(lokalize VERSION ${RELEASE_SERVICE_VERSION}) + +-set(QT_MIN_VERSION "5.14.0") ++set(QT_MIN_VERSION "5.12.9") + set(KF5_MIN_VERSION "5.71.0") + + # search packages used +--- lokalize-20.08.1/src/glossary/glossaryview.cpp.old 2020-08-31 19:21:04.000000000 +0000 ++++ lokalize-20.08.1/src/glossary/glossaryview.cpp 2020-09-18 02:08:40.084992048 +0000 +@@ -166,7 +166,7 @@ + + bool found = false; + //m_flowLayout->setEnabled(false); +- foreach (const QByteArray& termId, QSet<QByteArray>(termIds.begin(), termIds.end())) { ++ foreach (const QByteArray& termId, termIds.toSet()) { + // now check which of them are really hits... + foreach (const QString& enTerm, glossary.terms(termId, sourceLangCode)) { + // ...and if so, which part of termEn list we must thank for match ... +--- lokalize-20.08.1/src/tests/projectmodeltest.cpp.old 2020-08-31 19:21:04.000000000 +0000 ++++ lokalize-20.08.1/src/tests/projectmodeltest.cpp 2020-09-18 02:19:03.517276672 +0000 +@@ -87,7 +87,7 @@ + model->setUrl(QUrl::fromLocalFile(QFINDTESTDATA("data/dir-halftranslated")), {}); + + // Wait for signal +- while (!loaded.loadRelaxed()) { ++ while (!loaded.load()) { + QCoreApplication::processEvents(); + } + diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 47b2c741f..a71e82c30 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lskat -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Lieutenant Skat, an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2a3efc2843ed8749ba145d7d633915489fb3924ec91c7b12a218732fb705a716bf48bc79cced2e4dbd85db5a6576687a2b171a4834daa74e8190074abda0d0e6 lskat-20.04.3.tar.xz" +sha512sums="237ebfb3886516f4d2ddcab7c66c0aed23aff7b4a103c10f5010d39accd23ba1dd41e84cd4fa6af31145f7e19cdd2e536783bbd25344374930efbacfbb696bcd lskat-20.08.1.tar.xz" diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD index 704f89173..55929a9f1 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Contribtor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lua-expat pkgver=1.3.3 pkgrel=0 diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index c4449467b..40d6fd1a8 100644 --- a/user/lua-filesystem/APKBUILD +++ b/user/lua-filesystem/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lua-filesystem _pkgname=luafilesystem pkgver=1.8.0 diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD index 7c0197036..18db2ba8b 100644 --- a/user/lua-socket/APKBUILD +++ b/user/lua-socket/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Mika Havela <mika.havela@gmail.com> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lua-socket _name=luasocket pkgver=3.0_rc1_git20160306 diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index 44440a3ef..7048a179b 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=luarocks -pkgver=3.3.1 +pkgver=3.4.0 pkgrel=0 pkgdesc="Package manager for Lua software" url="https://luarocks.org/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a luarocks-3.3.1.tar.gz" +sha512sums="111ef93cbc4c0d79fdb26d9696b76e6b9e7fb1e30029db43feae9622cc6dd89991f1a62f87af0ca11f4043cb0d445ec73c5edf53e1af5f0d9bc4f756d4c18151 luarocks-3.4.0.tar.gz" diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index 1dce23e0f..185bb86bb 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lximage-qt pkgver=0.15.0 pkgrel=0 diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD index 903ec3079..22de994d3 100644 --- a/user/lxmenu-data/APKBUILD +++ b/user/lxmenu-data/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxmenu-data pkgver=0.1.5 pkgrel=1 diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD index 799843b1c..4f65e7a69 100644 --- a/user/lxqt-about/APKBUILD +++ b/user/lxqt-about/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-about pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD index 5267f2663..b455996cf 100644 --- a/user/lxqt-admin/APKBUILD +++ b/user/lxqt-admin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-admin pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-archiver/APKBUILD b/user/lxqt-archiver/APKBUILD index b3a23905a..0dd3851c0 100644 --- a/user/lxqt-archiver/APKBUILD +++ b/user/lxqt-archiver/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-archiver pkgver=0.2.0 _lxqt=0.15.0 diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index 3439629fe..baf55aab0 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-build-tools pkgver=0.7.0 pkgrel=0 diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 9f7b280df..2e7a56379 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-config pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD index af52254f2..4434caeb6 100644 --- a/user/lxqt-desktop/APKBUILD +++ b/user/lxqt-desktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-desktop pkgver=0.15.0 pkgrel=0 diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD index 5e8f3d607..b15bcfdae 100644 --- a/user/lxqt-globalkeys/APKBUILD +++ b/user/lxqt-globalkeys/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-globalkeys pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD index 8b670254e..dc635ccf6 100644 --- a/user/lxqt-l10n/APKBUILD +++ b/user/lxqt-l10n/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-l10n pkgver=0.13.0 pkgrel=1 diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index 186659ef6..6b35346fc 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-notificationd pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD index 522c95b77..ead20c606 100644 --- a/user/lxqt-openssh-askpass/APKBUILD +++ b/user/lxqt-openssh-askpass/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-openssh-askpass pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index 612652a82..a089cce0c 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-panel pkgver=0.15.1 _lxqt_build=0.7.0 diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD index c1944f330..621c6a3de 100644 --- a/user/lxqt-policykit/APKBUILD +++ b/user/lxqt-policykit/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-policykit pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD index 775735e4c..d92980e83 100644 --- a/user/lxqt-powermanagement/APKBUILD +++ b/user/lxqt-powermanagement/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-powermanagement pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD index e9b2485d8..464689f9e 100644 --- a/user/lxqt-qtplugin/APKBUILD +++ b/user/lxqt-qtplugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-qtplugin pkgver=0.15.1 pkgrel=0 diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD index 865c21555..4e9c876df 100644 --- a/user/lxqt-runner/APKBUILD +++ b/user/lxqt-runner/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-runner pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index a10f61174..0fcd1a3b4 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-session pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD index 8014d2bd9..7ee30f853 100644 --- a/user/lxqt-sudo/APKBUILD +++ b/user/lxqt-sudo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-sudo pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD index 63ff10079..83b049c99 100644 --- a/user/lxqt-themes/APKBUILD +++ b/user/lxqt-themes/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lxqt-themes pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD index 4bd75c160..011cf2822 100644 --- a/user/lynx/APKBUILD +++ b/user/lynx/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=lynx pkgver=2.8.9_p1 _relver="${pkgver%_p*}rel.${pkgver#*_p}" diff --git a/user/mach64-drm/APKBUILD b/user/mach64-drm/APKBUILD new file mode 100644 index 000000000..96fe34b04 --- /dev/null +++ b/user/mach64-drm/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +_kver="5.4.66-mc1" +pkgname=mach64-drm +pkgver=5.6 +pkgrel=0 +pkgdesc="Kernel driver for Mach64 GPUs" +url=" " +arch="pmmx ppc" +options="!check !dbg !strip" # No test suite. +license="MIT" +depends="easy-kernel-modules-$_kver" +makedepends="easy-kernel-src-$_kver" +subpackages="" +source="mach64-drm-$pkgver.tar.gz::https://github.com/trya/mach64-drm/archive/v$pkgver.tar.gz + header-fix.patch + " + +build() { + make -C /usr/src/linux-$_kver M="$builddir" modules +} + +package() { + if [ -f $HOME/kernel_key.pem ]; then + /usr/src/linux-$_kver/scripts/sign-file sha512 \ + $HOME/kernel_key.pem $HOME/kernel_key.pem \ + "$builddir"/mach64.ko + fi + make -C /usr/src/linux-$_kver DEPMOD=true INSTALL_MOD_PATH="$pkgdir" M="$builddir" modules_install +} + +sha512sums="c130a93e9a578943dbdfeb31040165cba3534014bf32fb6670b688ec464d6e83e781556d4b320127e0d95ad0c30c573f667cd8e9d6cd210d0edad14faedba75f mach64-drm-5.6.tar.gz +2262aedb693fcba9110ad07775b4524313d16032e5afdb23bfb610ce7ee242293c282abf6d11d528b7a0d226439a08877f432f1bde04df7cb5ce503ced02ffa6 header-fix.patch" diff --git a/user/mach64-drm/header-fix.patch b/user/mach64-drm/header-fix.patch new file mode 100644 index 000000000..797bf8194 --- /dev/null +++ b/user/mach64-drm/header-fix.patch @@ -0,0 +1,10 @@ +--- mach64-drm-5.6/mach64_drv.c.old 2020-04-24 00:36:27.000000000 +0000 ++++ mach64-drm-5.6/mach64_drv.c 2020-08-09 20:03:14.816701578 +0000 +@@ -32,6 +32,7 @@ + + #include <drm/drm_drv.h> + #include <drm/drm_file.h> ++#include <drm/drm_pci.h> + + #include "mach64_drm.h" + #include "mach64_drv.h" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 1d895ffdd..7e452f5cf 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=marble -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -32,8 +32,17 @@ build() { make } +libs() { + pkgdesc="$pkgdesc (libraries)" + local file= + for file in "$pkgdir"/usr/lib/lib*.so.[0-9]*; do + mkdir -p "$subpkgdir"/usr/lib + mv "$file" "$subpkgdir"/usr/lib/ + done +} + package() { make DESTDIR="$pkgdir" install } -sha512sums="5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd marble-20.04.3.tar.xz" +sha512sums="4306ba2ca620d7081b289b309abca9d741ee3376583ee662b34d09a1b03b42e00f034c34be371fed03a1196df5dd21fecf7e6c981053acfc9511a2bd85417485 marble-20.08.1.tar.xz" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index 30c55065c..28dbba45c 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=marco -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,5 +34,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428 marco-1.24.0.tar.xz +sha512sums="55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85 marco-1.24.1.tar.xz b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49 correctly-posix.patch" diff --git a/user/mate-applets/APKBUILD b/user/mate-applets/APKBUILD index f91b6ff04..bf91290a6 100644 --- a/user/mate-applets/APKBUILD +++ b/user/mate-applets/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-applets -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Utility applications for the MATE desktop environment" url="https://mate-desktop.org" @@ -17,6 +17,7 @@ source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-applets-$pkgver. build() { rm -r mateweather/docs/ru + rm -r accessx-status/docs/hy ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e mate-applets-1.24.0.tar.xz" +sha512sums="d29e39a140310fef84cb0fe631568e0177ca5faaf2bf566211a23b32613fd6aabf06dd8ecd81a16e09553c659a7feda9ba372bb62a70504a235be58e07726ed2 mate-applets-1.24.1.tar.xz" diff --git a/user/mate-backgrounds/APKBUILD b/user/mate-backgrounds/APKBUILD index 7d781f313..6f392b8f4 100644 --- a/user/mate-backgrounds/APKBUILD +++ b/user/mate-backgrounds/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-backgrounds -pkgver=1.24.1 +pkgver=1.24.2 pkgrel=0 pkgdesc="Desktop wallpapers provided by the MATE desktop environment" url="https://mate-desktop.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6af6bd1be186da3c4c594687ece1f6b50c3b05fb0619dd0062955e9e09c8007efe76a7625826cba0e4716c8ed61eac4d372b0a3bf2b87f00b7f170bb97709f09 mate-backgrounds-1.24.1.tar.xz" +sha512sums="4d069258065e80d8e9d2e4d7c471178c07ea5cdd5e8a6224a1d1e8770211a3926a441f03d85acd17c66c261489cc68bcbb44e5e08d6ddd80240e07b0007873ed mate-backgrounds-1.24.2.tar.xz" diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD index b8c15fe4f..ab8189e5f 100644 --- a/user/mate-calc/APKBUILD +++ b/user/mate-calc/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-calc -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Calculator utility for the MATE desktop environment" url="https://mate-desktop.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebb18f07ded5577bb0987b2027e7b73abc823a567bfa00f9cc9bfaf75de498f150b6b4c2e13486c530a3cbb078f1b798c415b33d668d952e8650799dd05c99eb mate-calc-1.24.0.tar.xz" +sha512sums="164fc57ed6bcc69b96afd75fff8dd6248ce682d6f806e83ddb73a21bddce99b89c7bb697d189b56d88d5c8d9a0b99f50f3fdd15c7d56f9121ee1d16689b16595 mate-calc-1.24.1.tar.xz" diff --git a/user/mate-common/APKBUILD b/user/mate-common/APKBUILD index 2ddf24626..4670f0a1f 100644 --- a/user/mate-common/APKBUILD +++ b/user/mate-common/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-common -pkgver=1.24.1 +pkgver=1.24.2 pkgrel=0 pkgdesc="Additional development support for the MATE desktop environment" url="https://mate-desktop.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da3e670e5b4f566bf1893692b34b63d94cb5bd993ce94d0d8245a54c12b2cc2c6af7c29edd184b09ce5296566dbe34112bc318e740a8a7910e4767569e64d623 mate-common-1.24.1.tar.xz" +sha512sums="aae7cf6f4537b125d363e7be1f349cb4ba9515405d1e48704f87c647b2489647cfa14399f41b65a8c1b2a8851dfe8077ce47a3b618355767cc61a6e0037ba3d0 mate-common-1.24.2.tar.xz" diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD index 24062053e..81e7a2590 100644 --- a/user/mate-complete/APKBUILD +++ b/user/mate-complete/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-complete pkgver=1.22.0 -pkgrel=0 +pkgrel=1 pkgdesc="Complete MATE desktop environment" url="https://mate-desktop.org" arch="noarch" @@ -29,4 +29,4 @@ package() { } sha512sums="24fd0524d949a22b22e38c81667f31498bc524302c52128c10d8a5802315720543426ba82245f5e7510832c493389ff59f36be14433f1a6a6c68993f733f329c org.adelie-linux.about-mate.desktop -bb01b5fa7b30001ad06833d56b4ab5a6054ba09789b1beb3d6b9ed7b70ef4b304daf5a7e69dde58bef65d6ea82bd623d7576f2e1323e01ea29450cc06af8d78b mate.desktop" +e659289c901708167775c1203caf4412efe3fd7f1151aba55c2b9cb7bfc50cbb585ed3ee77f344859ae708339ee17026f1f346fe156c56b764d0a75e5f182225 mate.desktop" diff --git a/user/mate-complete/mate.desktop b/user/mate-complete/mate.desktop index f3c0adda5..b8f3224ed 100644 --- a/user/mate-complete/mate.desktop +++ b/user/mate-complete/mate.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=MATE Comment=This session logs you into MATE -Exec=ck-launch-session --sh-syntax mate-session +Exec=mate-session TryExec=mate-session Icon= Type=Application diff --git a/user/mate-control-center/APKBUILD b/user/mate-control-center/APKBUILD index 68be1f9b4..5499e8ae3 100644 --- a/user/mate-control-center/APKBUILD +++ b/user/mate-control-center/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-control-center -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Configuration utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce mate-control-center-1.24.0.tar.xz" +sha512sums="f0440bfa79099610eb1f9f03bda13347b57d9250264f27971b69a5900338cf750e6eeb14111d7069bf597f5d4c4ed66b0466b926a54e4719845da23de31665f4 mate-control-center-1.24.1.tar.xz" diff --git a/user/mate-desktop/APKBUILD b/user/mate-desktop/APKBUILD index e9b825680..d62a2bb9d 100644 --- a/user/mate-desktop/APKBUILD +++ b/user/mate-desktop/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-desktop -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Core library for the MATE desktop environment" url="https://mate-desktop.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ca60325e7f6167efd21bdd32ae40c2f2bf5ae9bef85f0a43afec05d50567fb650fc0426d94c510b3a42c625dc4b2d31d7559befa50cfbb6d9878635558a52323 mate-desktop-1.24.0.tar.xz" +sha512sums="0691dd613946d5d67596d98cd489536f5876cb97fb4c5290133b198479b4bfa3835ca52a16a2d0cc5e863d625aedda83ab01e85d67f58a09763673f0f18ebc5a mate-desktop-1.24.1.tar.xz" diff --git a/user/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD index eb5431a39..8a7e7a4bf 100644 --- a/user/mate-icon-theme/APKBUILD +++ b/user/mate-icon-theme/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-icon-theme pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-indicator-applet/APKBUILD b/user/mate-indicator-applet/APKBUILD index 1f16d683a..e717b48ec 100644 --- a/user/mate-indicator-applet/APKBUILD +++ b/user/mate-indicator-applet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-indicator-applet pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-media/APKBUILD b/user/mate-media/APKBUILD index 489705ecc..e1b71d207 100644 --- a/user/mate-media/APKBUILD +++ b/user/mate-media/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-media -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Media utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="82ee6a16a49d9f4d229539cfacb5803c150af09dff227fb5995bf78e2b83a1f5bddb307756648e569a138124e4485ca56f635184e47fbfd76dcedd17f2bf0425 mate-media-1.24.0.tar.xz" +sha512sums="88a8f1b8ee1684c6270ee65d17cd4d031830cd968069cae38a1844b0688cdcac25fc2e09c415d8e55c5b8564c4e0421e2c111cc44de9221bf37cf0e31dc572d3 mate-media-1.24.1.tar.xz" diff --git a/user/mate-menus/APKBUILD b/user/mate-menus/APKBUILD index f6ae74b46..bbe2af97f 100644 --- a/user/mate-menus/APKBUILD +++ b/user/mate-menus/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-menus -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Desktop menu implementation for the MATE desktop environment" url="https://mate-desktop.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27f8ba0666b08fbcfc3f02a42e4b9f3d3431e3d171be0fe9569f412b2f9ead370fff15833feb920b64d2a067e81354970df2ee1c465f10faa3dbd9c97af20406 mate-menus-1.24.0.tar.xz" +sha512sums="5235d3be31d30f8aeaf9b2da0f8fe8dc586e07ae0dcbc3da88a4f04181277a9dec9414dee9c255023b1ebd406f8b131197e3f526f9bac14eeb23d8014cfd22cb mate-menus-1.24.1.tar.xz" diff --git a/user/mate-netbook/APKBUILD b/user/mate-netbook/APKBUILD index d2ef4243c..cfd970b41 100644 --- a/user/mate-netbook/APKBUILD +++ b/user/mate-netbook/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-netbook pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-notification-daemon/APKBUILD b/user/mate-notification-daemon/APKBUILD index 76a0d9ed5..2f1981e3d 100644 --- a/user/mate-notification-daemon/APKBUILD +++ b/user/mate-notification-daemon/APKBUILD @@ -1,14 +1,15 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-notification-daemon -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Notification service for the MATE desktop environment" url="https://mate-desktop.org" arch="all" license="GPL-2.0+" depends="" -makedepends="gtk+3.0-dev intltool libcanberra-dev libnotify-dev libwnck-dev" +makedepends="gtk+3.0-dev intltool libcanberra-dev libnotify-dev libwnck-dev + libxml2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-notification-daemon-$pkgver.tar.xz" @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0fd2da98001c60672d4833e974ac74dd561f54ca6f3fd74f8d6620e3b28768add46dd891d7446b01426b6aed09d4966d902cbde45aac3498fdcbb837e531a147 mate-notification-daemon-1.24.0.tar.xz" +sha512sums="7c799e31229860cb34fa4a19421360a4a93d81826bc4381ed284e1ec280bae67d2f5bdf5d751f3dad6a1da424a5c598b2def60b7b24fd6ea41da5f126f456bac mate-notification-daemon-1.24.1.tar.xz" diff --git a/user/mate-panel/APKBUILD b/user/mate-panel/APKBUILD index 6578e1583..73d5ec980 100644 --- a/user/mate-panel/APKBUILD +++ b/user/mate-panel/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-panel -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Panel for the MATE desktop environment" url="https://mate-desktop.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="12a88534400603998b4d4d415940947dd6372914135aa8eb6052c75e134412739a96064ad654e8f2625dbb6fe853e8cb376c41e530c30234e08141a46634820b mate-panel-1.24.0.tar.xz" +sha512sums="1a1e62207d58472daa00d409ef2b04944929af7f9fe05592076adcc069e2d70012424b3386d30f8b9adccf05c328b8ab1662b8726e507465881a4ae26c26829f mate-panel-1.24.1.tar.xz" diff --git a/user/mate-polkit/APKBUILD b/user/mate-polkit/APKBUILD index c634bcd6a..817c0f12a 100644 --- a/user/mate-polkit/APKBUILD +++ b/user/mate-polkit/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-polkit pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-power-manager/APKBUILD b/user/mate-power-manager/APKBUILD index 5bc66d5aa..9401b77d9 100644 --- a/user/mate-power-manager/APKBUILD +++ b/user/mate-power-manager/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-power-manager -pkgver=1.24.1 +pkgver=1.24.2 pkgrel=0 pkgdesc="Power management utility for the MATE desktop environment" url="https://mate-desktop.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="57bae519bfa2894bc6923bf0932f823bcabe2dc0de06dc6676597708482b369a24f39bb94558163f0fdcc2d764702b87f58abc1793679a1c7fb7f53be074bae5 mate-power-manager-1.24.1.tar.xz" +sha512sums="edbad37f41e67219790dfe704936be6fcf1d727cdff3b51cb43234b0d48f53666361d0f048704a594a594b5e124d7d8ea9d626c560cbc23ba4de3dcaafbd55ff mate-power-manager-1.24.2.tar.xz" diff --git a/user/mate-screensaver/APKBUILD b/user/mate-screensaver/APKBUILD index 7f990b77e..f27fe8a28 100644 --- a/user/mate-screensaver/APKBUILD +++ b/user/mate-screensaver/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-screensaver -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Screensaver for the MATE desktop environment" url="https://mate-desktop.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0 mate-screensaver-1.24.0.tar.xz" +sha512sums="f7cab280da90623ad265beb84770e48431ae6685fbb1eabc7cd2ad07b0f8ed5da2426017243d83271b969d2e020b8afcc93a6135b4c8e42a29f454a4e826b277 mate-screensaver-1.24.1.tar.xz" diff --git a/user/mate-sensors-applet/APKBUILD b/user/mate-sensors-applet/APKBUILD index 66bdcf6fa..2fe06db71 100644 --- a/user/mate-sensors-applet/APKBUILD +++ b/user/mate-sensors-applet/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-sensors-applet -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="System monitoring applet for the MATE desktop environment" url="https://mate-desktop.org" @@ -33,5 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="039834b7cfe641e670e372e311da3d737254ab3cf13b27e71c6555888ac1165766fe2d940bcea44a5ceed5f0ddcd3390d01331d927121137c21a6647c68875c2 mate-sensors-applet-1.24.0.tar.xz +sha512sums="3bf21d501e067a2ce002c5149f42161cc6917609ceb2396b705e905987cb4d989725ca825c6de7bbe4e950f7a01e755c2cd5b45532d6f65aef690f394741489a mate-sensors-applet-1.24.1.tar.xz dd8d0c78ad16e26b6f9cad3283fcd45ce7f5bd4ea16a01ff26cfd060cb26206a07a71c42d90a16cc39fb2e53b890d08b0fc9690b20ff0662c5ff16eab3065265 locale-guards.patch" diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD index 2949030fa..1f2c4e890 100644 --- a/user/mate-session-manager/APKBUILD +++ b/user/mate-session-manager/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-session-manager -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Session manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -32,4 +32,4 @@ package() { rm -r "$pkgdir"/usr/share/xsessions } -sha512sums="ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37 mate-session-manager-1.24.0.tar.xz" +sha512sums="ca561e13080ef334a69f18b3aec0993532381ea5c178a0acf969bf2ed9cb5d484626404ab43d809727d8eef9b5eda29adc224168290f78a63da2621ac7ef79f5 mate-session-manager-1.24.1.tar.xz" diff --git a/user/mate-settings-daemon/APKBUILD b/user/mate-settings-daemon/APKBUILD index 5a57e8554..f2a472f59 100644 --- a/user/mate-settings-daemon/APKBUILD +++ b/user/mate-settings-daemon/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-settings-daemon -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Settings daemon for the MATE desktop environment" url="https://mate-desktop.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="897d3540930ac407d802c9ecd1995e9bfee14eafadbbfad64aab1e7d93c9830111ac991d8f0df37e34efaa3f7cae9d59ee4d786b15acf0b87b8ba5d299bc1cc1 mate-settings-daemon-1.24.0.tar.xz" +sha512sums="3a13a853bf2991f219f91398c31fda4aa3002fe5f5a4497c0e2097d2e8a812eb82bd1e4e1661d7b29061f185e74388f744bb37a0430d38bff63ddce6fe4d0bdd mate-settings-daemon-1.24.1.tar.xz" diff --git a/user/mate-system-monitor/APKBUILD b/user/mate-system-monitor/APKBUILD index f08d2ad77..71951024f 100644 --- a/user/mate-system-monitor/APKBUILD +++ b/user/mate-system-monitor/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-system-monitor -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="System monitor utilities for the MATE desktop environment" url="https://mate-desktop.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="430a2bf81f447143ba53cecb1c2659903cd957e313f6690adea363e9a8deccfd4ad64ebd8ce18dfb31a67fa7b51cbe087ffed7b5dcba5dd03b1010ec41b4d282 mate-system-monitor-1.24.0.tar.xz" +sha512sums="5fdf8ff52584f91fbe12270af2b5bb1c81d5c4d6001bdaad9c6001dbb6e6020254048e32aa6549eb686ad17998c1aa220e5463057502ba514c4a5b82953f2b05 mate-system-monitor-1.24.1.tar.xz" diff --git a/user/mate-terminal/APKBUILD b/user/mate-terminal/APKBUILD index a79d54187..afc127494 100644 --- a/user/mate-terminal/APKBUILD +++ b/user/mate-terminal/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-terminal -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Terminal emulator for the MATE desktop environment" url="https://mate-desktop.org" @@ -9,7 +9,7 @@ arch="all" license="GPL-3.0+ AND LGPL-3.0+" depends="" makedepends="dconf-dev gtk+3.0-dev intltool itstool libsm-dev libxml2-utils - vte-dev" + pcre2-dev vte-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-terminal-$pkgver.tar.xz" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ad25411a8e720d3ef43964dc9f80732e215b1b5154e904069d25e73910c0c8f0e1b100d21f85b9a1eec06f6b17f891791445f7830bb52fc44b67fa3f8cebf76 mate-terminal-1.24.0.tar.xz" +sha512sums="83090667f823605ef0681efeff66c30729df83e7335c100171017ee5f2e819ec0bb219fdc71ed54a27c4a846fcc8db01c4462ef5b9c1e3f31d9c5838427566dc mate-terminal-1.24.1.tar.xz" diff --git a/user/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD index c9ec36fe0..d0466f14f 100644 --- a/user/mate-user-guide/APKBUILD +++ b/user/mate-user-guide/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-user-guide pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-user-share/APKBUILD b/user/mate-user-share/APKBUILD index d20aae02f..915fc7e52 100644 --- a/user/mate-user-share/APKBUILD +++ b/user/mate-user-share/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-user-share pkgver=1.24.0 pkgrel=0 diff --git a/user/mate-utils/APKBUILD b/user/mate-utils/APKBUILD index 710cfd1bf..1ecd284a0 100644 --- a/user/mate-utils/APKBUILD +++ b/user/mate-utils/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mate-utils pkgver=1.24.0 pkgrel=0 diff --git a/user/mbuffer/APKBUILD b/user/mbuffer/APKBUILD new file mode 100644 index 000000000..fbcaeaeb9 --- /dev/null +++ b/user/mbuffer/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=mbuffer +pkgver=20200929 +pkgrel=0 +pkgdesc="mbuffer is a tool for buffering data streams." +url="http://www.maier-komor.de/mbuffer.html" +arch="all" +license="GPL-3.0-only" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="http://www.maier-komor.de/software/mbuffer/mbuffer-$pkgver.tgz + test-static-file-instead.patch" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996 mbuffer-20200929.tgz +28b7c7c7ee2b2130315cd6c4765d492e9d29376670a03ab0a1ab862a1ec5dea93e91e9de5e08604db69fe4139370eedb2a0754f16e5ebec3de9b48dc2a1dbea7 test-static-file-instead.patch" diff --git a/user/mbuffer/test-static-file-instead.patch b/user/mbuffer/test-static-file-instead.patch new file mode 100644 index 000000000..9c549bfaa --- /dev/null +++ b/user/mbuffer/test-static-file-instead.patch @@ -0,0 +1,11 @@ +--- mbuffer-20200929/Makefile.in.orig 2020-11-08 07:47:44.512670020 +0000 ++++ mbuffer-20200929/Makefile.in 2020-11-08 07:48:33.032115323 +0000 +@@ -101,7 +101,7 @@ + test.tar test.md5 mbuffer.md5 idev.so tapetest.so have-af + + test.tar: +- $(TAR) cf test.tar --ignore-failed-read $(TESTTREE) ++ truncate -s 10M test.tar + + test.md5: test.tar + openssl md5 < test.tar > test.md5 diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index d975e1460..5164bae64 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.52.1 +pkgver=0.55.3 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="https://mesonbuild.com/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="81e8c5897ba5311ccffc401fd514bd9a67d16caaea1f28a5c5432605766341ecd82b70c05661fbbe0c9a6006ff5ea892950bbaa548e70c3f87350438775ea6fd meson-0.52.1.tar.gz" +sha512sums="afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae meson-0.55.3.tar.gz" diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD index 68bc29b40..d98d6ddfd 100644 --- a/user/milou/APKBUILD +++ b/user/milou/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=milou -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Search and launch plasmoid" url="https://www.kde.org/" @@ -11,7 +11,7 @@ depends="" makedepends="cmake extra-cmake-modules python3 kcoreaddons-dev kdeclarative-dev ki18n-dev kitemmodels-dev krunner-dev kservice-dev plasma-framework-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/milou-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="812b1ac049c7af9cf625e1203cbb9ae0e36a99ac3b89781f4e007974dca460cbf9e866b3773a2117261bd845d4a7c65f70860b45e54b6b87124695c011a3e51e milou-5.18.4.1.tar.xz" +sha512sums="3c1d0b032e8f26a637aed8067d919d95bcbf033e0b494bc9a2a0295d000773ac3900903dca96eb32d3fc1b831884e3435ab91a26c9cd179548c3b2cd0377577d milou-5.18.5.tar.xz" diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD index 8913eecd8..843a382ee 100644 --- a/user/mimetic/APKBUILD +++ b/user/mimetic/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mimetic pkgver=0.9.8 pkgrel=0 diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index 193c03ed5..5ac0ca4db 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=minuet -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -12,7 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtsvg-dev kcoreaddons-dev ki18n-dev kcrash-dev kdoctools-dev fluidsynth-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz + missing-header.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5353e7c2461b5d53ed119d1ecdd27e2561068347ac244e17a9eda961d269fd0b4ce41a3c61ecdc0f8c48a8f7cca40f4bd3e0dcaa49fb800b598e8809d3c25073 minuet-20.04.3.tar.xz" +sha512sums="a64d912351697a7e7928ad1593432b2ccc9abe112be87cbee7649adced17e4e643ab05d3a3970d45b005683fd9bee7b81b9e1f21e27334545a7ddecbd452fdca minuet-20.08.1.tar.xz +5758385b1d18c0fc89335b9fbbfee0e7800ec03bdaaeea7a61bac4e0ed911e302b35697c54e4547a379dd3625a13214f8851d4eedfa3132ee5d9fd82e19cd241 missing-header.patch" diff --git a/user/minuet/missing-header.patch b/user/minuet/missing-header.patch new file mode 100644 index 000000000..a9aa00984 --- /dev/null +++ b/user/minuet/missing-header.patch @@ -0,0 +1,30 @@ +Compiler error: + +/usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp: In function ‘QStringList Utils::getXdgDataDirs()’: +/usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp:16:89: error: invalid use of incomplete type ‘class QVector<QStringRef>’ + const auto paths = xdgDataDirsEnv.splitRef(QLatin1Char(':'), QString::SkipEmptyParts); + ^ +In file included from /usr/include/QtCore/qglobal.h:1212, + from /usr/include/QtCore/qchar.h:43, + from /usr/include/QtCore/qstring.h:48, + from /usr/include/QtCore/qdir.h:43, + from /usr/include/QtCore/QDir:1, + from /usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp:1: +/usr/include/QtCore/qtypeinfo.h:193:1: note: declaration of ‘class QVector<QStringRef>’ + Q_DECLARE_MOVABLE_CONTAINER(QVector); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/src/packages/user/minuet/src/minuet-20.08.1/src/utils/xdgdatadirs.cpp:18:29: error: unable to deduce ‘auto&&’ from ‘paths’ + for (const auto &path : paths) { + ^~~~~ +make[2]: *** [src/utils/CMakeFiles/minuetutils.dir/build.make:76: src/utils/CMakeFiles/minuetutils.dir/xdgdatadirs.cpp.o] Error 1 + + +--- minuet-20.08.1/src/utils/xdgdatadirs.cpp.old 2020-08-31 18:34:27.000000000 +0000 ++++ minuet-20.08.1/src/utils/xdgdatadirs.cpp 2020-09-18 00:14:59.175663978 +0000 +@@ -1,5 +1,6 @@ + #include <QDir> + #include <QFile> ++#include <QVector> + + #include "xdgdatadirs.h" + diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD index 695fdc5c2..8c0e47752 100644 --- a/user/mksh/APKBUILD +++ b/user/mksh/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Marek Benc <dusxmt@gmx.com> # Maintainer: Marek Benc <dusxmt@gmx.com> pkgname=mksh -pkgver=59b +pkgver=59c pkgrel=0 pkgdesc="MirBSD Korn Shell, a free Korn Shell interpreter" url="http://mirbsd.de/mksh" arch="all" -license="MirOS OR ISC" +license="MirOS AND Unicode-DFS-2016" depends="" checkdepends="ed perl" makedepends="" @@ -24,6 +24,9 @@ build() { CFLAGS="$CFLAGS -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \ /bin/sh ./Build.sh -r -L mv test.sh test_lksh.sh + + # Build the HTML FAQ: + /bin/sh ./FAQ2HTML.sh } check() { @@ -45,6 +48,7 @@ package() { mkdir -p "$pkgdir"/usr/share/doc/mksh/examples/ install -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/examples/ + install -m 644 FAQ.htm "$pkgdir"/usr/share/doc/mksh/ } -sha512sums="4ae330a79a09d2dd989116b1a836ab7f179d920eb34c97ea5da7d1434361911a93ba77ca47c5e473e5a5ce1877f2a2e919a807bb6139ec6c89c87969054d021d mksh-R59b.tgz" +sha512sums="f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340 mksh-R59c.tgz" diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index dce0dca9f..db451478e 100644 --- a/user/mlt/APKBUILD +++ b/user/mlt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mlt -pkgver=6.20.0 +pkgver=6.22.1 pkgrel=0 pkgdesc="MLT multimedia framework" url="https://www.mltframework.org/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3 mlt-6.20.0.tar.gz +sha512sums="c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74 mlt-6.22.1.tar.gz d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch" diff --git a/user/modemmanager-qt/APKBUILD b/user/modemmanager-qt/APKBUILD index e47c0db32..1439060f2 100644 --- a/user/modemmanager-qt/APKBUILD +++ b/user/modemmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager-qt -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt framework for ModemManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9ec1985c5edc3fc08f1dfbe989c49f32e78dc19462a83991a67bc153f0416ad1e4e0680b528a6fb0d2d45cec1d138433b3d25761ef3fa1921cc002fff8f6e1d4 modemmanager-qt-5.72.0.tar.xz" +sha512sums="c8dfaeca27a81b5a779f774b0edb4e4c670d1f92fc52f9e4863bacf725ae42f7d4b9dd813e47f56996a3427f0d813fb21162c609615e3523467e4fae0c4b6c1a modemmanager-qt-5.74.0.tar.xz" diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index f7e87a35d..489ab5cfb 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mousepad pkgver=0.4.2 pkgrel=0 diff --git a/user/mozo/APKBUILD b/user/mozo/APKBUILD index 717eff0f5..d6001e1e9 100644 --- a/user/mozo/APKBUILD +++ b/user/mozo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mozo pkgver=1.24.0 pkgrel=0 diff --git a/user/mpg123/APKBUILD b/user/mpg123/APKBUILD index df47b061d..14324285a 100644 --- a/user/mpg123/APKBUILD +++ b/user/mpg123/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mpg123 -pkgver=1.26.2 +pkgver=1.26.3 pkgrel=0 pkgdesc="Real time MPEG Audio player for Layers 1, 2 and 3" url="https://www.mpg123.org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aa63fcb08b243a1e09f7701b3d84a19d7412a87253d54d49f014fdb9e75bbc81d152a41ed750fccde901453929b2a001585a7645351b41845ad205c17a73dcc9 mpg123-1.26.2.tar.bz2" +sha512sums="7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d mpg123-1.26.3.tar.bz2" diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD index 4324b3565..7da337408 100644 --- a/user/mplayer/APKBUILD +++ b/user/mplayer/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mplayer pkgver=1.4 pkgrel=2 diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD index 6f5c53558..ceb73d8a1 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=mpv -pkgver=0.32.0 +pkgver=0.33.1 pkgrel=0 pkgdesc="An improved fork of mplayer" url="https://mpv.io" @@ -42,4 +42,4 @@ package() { python3 ./waf install --destdir="$pkgdir" } -sha512sums="f6426c0254ec0bf2f120e2196904f1e15fe17032b06764abca1d5e074f0cabb452eaf1cd09f8fd9b25b591accee7b881bfc3b06c19d5c98980305c4712486bd6 mpv-0.32.0.tar.gz" +sha512sums="99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b mpv-0.33.1.tar.gz" diff --git a/user/mtr/APKBUILD b/user/mtr/APKBUILD index 59fc8a203..6ffdf8627 100644 --- a/user/mtr/APKBUILD +++ b/user/mtr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: John Keith Hohm <john@hohm.net> # Maintainer: pkgname=mtr -pkgver=0.93 +pkgver=0.94 pkgrel=0 pkgdesc="Full screen ncurses traceroute tool" url="https://www.bitwizard.nl/mtr/" @@ -56,6 +56,6 @@ gtk() { rm -r "$subpkgdir"/usr/share/man } -sha512sums="865c394d8dfa234c472832dc205ddc9ec3cf0552475f565782fd4f4e878251c03f1473e2d28d6799e59da4fcb33c5355049f1e6f02e8610c6bbf681ffb78f53e mtr-0.93.tar.gz +sha512sums="0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11 mtr-0.94.tar.gz 60c11b27c4d20a75010cadc31d5c1ac94094aaaee0c2f0ad14246b00b0d5301f581ef55eaefa48692d4449a8e7580e67abbb58ea3183fae8f449f7969242f1a9 handle-program-suffix.patch ecf7543e0125fad6d3f17c30f29f1fc8a3b1e2e477802fe8464e436c3cdfa30d0630b8543cc3f022c475228e94ac8f92981df4d8fb08fe01d004be3d78d6da77 mtr-gtk.desktop" diff --git a/user/mumble/APKBUILD b/user/mumble/APKBUILD new file mode 100644 index 000000000..5e64e6af5 --- /dev/null +++ b/user/mumble/APKBUILD @@ -0,0 +1,127 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=mumble +pkgver=1.3.3 +pkgrel=0 +pkgdesc="Low-latency, high-quality voice chat (client)" +url="https://www.mumble.info/" +arch="all" +license="BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-2.0+" +depends="qt5-qtbase-sqlite" +makedepends="alsa-lib-dev avahi-dev boost-dev cmd:which libcap-dev + libsndfile-dev libxi-dev opus-dev protobuf-dev pulseaudio-dev + qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev speech-dispatcher-dev + speex-dev speexdsp-dev" +subpackages="$pkgname-doc $pkgname-lang murmur murmur-openrc:openrc:noarch" +install="murmur.pre-install" +pkgusers="murmur" +pkggroups="murmur" +source="https://github.com/mumble-voip/mumble/releases/download/$pkgver/mumble-$pkgver.tar.gz + murmur.initd + default-config.patch + tests-networking.patch + " + +_qmake() { + qmake -recursive "$@" \ + CONFIG+="\ + bundled-celt \ + no-bundled-opus \ + no-bundled-speex \ + no-embed-qt-translations \ + no-g15 \ + no-ice \ + no-pch \ + no-rnnoise \ + no-update \ + " \ + DEFINES+="PLUGIN_PATH=/usr/lib/mumble" +} + +build() { + _qmake main.pro + make release +} + +check() { + cd src/tests + _qmake tests.pro + make check +} + +package() { + _ver=${pkgver%_rc*} + _maj="${_ver%%.*}" + _min="${_ver#*.}" + _min="${_min%%.*}" + + # Binaries + install -Dm755 release/mumble \ + "$pkgdir"/usr/bin/mumble + install -Dm755 release/murmurd \ + "$pkgdir"/usr/bin/murmurd + + # Libraries & plugins + install -Dm755 release/libmumble.so.$_ver \ + "$pkgdir"/usr/lib/mumble/libmumble.so.$_ver + for lib in libmumble.so libmumble.so.$_maj libmumble.so.$_maj.$_min; do + ln -s libmumble.so.$_ver \ + "$pkgdir"/usr/lib/mumble/$lib + done + install -Dm755 release/plugins/liblink.so \ + "$pkgdir"/usr/lib/mumble/liblink.so + install -Dm755 release/libcelt* \ + "$pkgdir"/usr/lib/mumble/ + + # Desktop files + install -Dm644 scripts/mumble.desktop \ + "$pkgdir"/usr/share/applications/mumble.desktop + install -Dm644 icons/mumble.svg \ + "$pkgdir"/usr/share/icons/hicolor/scalable/apps/mumble.svg + + # Man pages + install -Dm644 -t "$pkgdir"/usr/share/man/man1 \ + man/mumble.1 \ + man/murmurd.1 + + # Translations + install -Dm644 -t "$pkgdir"/usr/share/mumble/translations \ + src/mumble/*.qm + + # OpenRC + install -Dm755 "$srcdir"/murmur.initd \ + "$pkgdir"/etc/init.d/murmur +} + +lang() { + pkgdesc="Languages for package mumble" + install_if="$pkgname=$pkgver-r$pkgrel lang" + + cd "$builddir" + mkdir -p "$subpkgdir"/usr/share/mumble + mv "$pkgdir"/usr/share/mumble/translations \ + "$subpkgdir"/usr/share/mumble +} + +murmur() { + pkgdesc="Low latency, high-quality voice chat (server)" + + cd "$builddir" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/murmurd \ + "$subpkgdir"/usr/bin + install -o murmur -g murmur -dm750 \ + "$subpkgdir"/var/lib/murmur + install -g murmur -Dm640 scripts/murmur.ini \ + "$subpkgdir"/etc/murmur.ini +} + +openrc() { + default_openrc + install_if="openrc murmur=$pkgver-r$pkgrel" + pkgdesc="Low latency, high-quality voice chat (server OpenRC init scripts)" +} + +sha512sums="be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3 mumble-1.3.3.tar.gz +59283687466c9ab460017c2191c731e63203baaa6a4a3d30b42075eb8597bafeb2d3494367ab64c785ee37c7b916ea101daf22b68bdfa27844b97e18cb1d71c0 murmur.initd +68c4c81a55663305d1525eb5d43e0b456e54f007ee327d45bf63572c59282edd88650ede7931644a9762a40c2f7e730b338b4900ae5b4da11b944b3af01c5387 default-config.patch +e89c20b39fdb24982153b046ffe41688d6a854eee593205535155d55e49b7e534f6cec14325108a7ebd2550a6043479b01139d7bf900840bcf63188625bca304 tests-networking.patch" diff --git a/user/mumble/default-config.patch b/user/mumble/default-config.patch new file mode 100644 index 000000000..0c93c2225 --- /dev/null +++ b/user/mumble/default-config.patch @@ -0,0 +1,36 @@ +--- mumble-1.3.2/scripts/murmur.ini 2020-07-09 13:06:18.000000000 -0400 ++++ mumble-1.3.2/scripts/murmur.ini 2020-09-13 00:05:08.070133921 -0400 +@@ -13,7 +13,7 @@ + + ; Path to database. If blank, will search for + ; murmur.sqlite in default locations or create it if not found. +-database= ++database=/var/lib/murmur/murmur.sqlite + + ; Murmur defaults to using SQLite with its default rollback journal. + ; In some situations, using SQLite's write-ahead log (WAL) can be +@@ -93,13 +93,13 @@ icesecretwrite= + ; logs to the file 'murmur.log'. If you leave this field blank + ; on Unix-like systems, Murmur will force itself into foreground + ; mode which logs to the console. +-;logfile=murmur.log ++logfile=/var/log/murmur.log + + ; If set, Murmur will write its process ID to this file + ; when running in daemon mode (when the -fg flag is not + ; specified on the command line). Only available on + ; Unix-like systems. +-;pidfile= ++pidfile=/var/run/murmur.pid + + ; The below will be used as defaults for new configured servers. + ; If you're just running one server (the default), it's easier to +@@ -291,7 +291,7 @@ allowping=true + + ; If Murmur is started as root, which user should it switch to? + ; This option is ignored if Murmur isn't started with root privileges. +-;uname= ++uname=murmur + + ; By default, in log files and in the user status window for privileged users, + ; Mumble will show IP addresses - in some situations you may find this unwanted diff --git a/user/mumble/murmur.initd b/user/mumble/murmur.initd new file mode 100644 index 000000000..dfbc46821 --- /dev/null +++ b/user/mumble/murmur.initd @@ -0,0 +1,35 @@ +#!/sbin/openrc-run +description="Mumble VoIP server" +command="/usr/bin/murmurd" +: "${config:=/etc/murmur.ini}" +: "${command_args:=-ini $config}" + +extra_started_commands="reload" +description_reload="Reload TLS settings" + +# As of 1.3.2 murmur will make the PID file *after* it switches to the +# unprivileged user, which is bad. So make start-stop-daemon handle the +# PID file and user switching instead. +command_background=true +command_args="$command_args -fg" + +command_user="$(awk -F= '$1 == "uname" { print $2 }' "$config")" +: "${command_user:=murmur}" + +pidfile="$(awk -F= '$1 == "pidfile" { print $2 }' "$config")" +: "${pidfile:=/var/run/$RC_SVCNAME.pid}" + +# Ignores logfile when -fg is used. +logfile="$(awk -F= '$1 == "logfile" { print $2 }' "$config")" +: "${logfile:=/var/log/murmur.log}" +start_stop_daemon_args="--stdout $logfile --stderr $logfile" + +start_pre() { + checkpath -m 0640 -f -o "$command_user" "$logfile" +} + +reload() { + ebegin "Reloading $RC_SVCNAME TLS settings" + start-stop-daemon --signal USR1 --pidfile "$pidfile" + eend $? +} diff --git a/user/mumble/murmur.pre-install b/user/mumble/murmur.pre-install new file mode 100644 index 000000000..7baafe4d9 --- /dev/null +++ b/user/mumble/murmur.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -r murmur 2>/dev/null +useradd -c "Mumble daemon" -s /sbin/nologin -g murmur \ + -m -d /var/lib/murmur -r murmur 2>/dev/null + +exit 0 diff --git a/user/mumble/tests-networking.patch b/user/mumble/tests-networking.patch new file mode 100644 index 000000000..a1decd477 --- /dev/null +++ b/user/mumble/tests-networking.patch @@ -0,0 +1,33 @@ +--- mumble-1.3.2/src/tests/TestServerResolver/TestServerResolver.cpp 2020-07-09 17:06:18.000000000 +0000 ++++ mumble-1.3.2/src/tests/TestServerResolver/TestServerResolver.cpp 2020-09-20 06:15:32.741670504 +0000 +@@ -33,9 +33,7 @@ class TestServerResolver : public QObjec + }; + + void TestServerResolver::simpleSrv() { +-#ifdef USE_NO_SRV +- return; +-#endif ++ return; // network access required + + // Qt 5's SRV resolver does not work in Wine. + // For more info, see https://bugs.winehq.org/show_bug.cgi?id=44296 +@@ -86,9 +84,7 @@ void TestServerResolver::simpleSrv() { + } + + void TestServerResolver::srvCustomPort() { +-#ifdef USE_NO_SRV +- return; +-#endif ++ return; // network access required + + // Qt 5's SRV resolver does not work in Wine. + // For more info, see https://bugs.winehq.org/show_bug.cgi?id=44296 +@@ -139,6 +135,8 @@ void TestServerResolver::srvCustomPort() + + + void TestServerResolver::simpleCNAME() { ++ return; // network access required ++ + ServerResolver r; + QSignalSpy spy(&r, SIGNAL(resolved())); + diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index 5e5ebbd46..491855832 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=muparser pkgver=2.3.2 pkgrel=0 diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD index be726b5cf..e686defab 100644 --- a/user/mutt/APKBUILD +++ b/user/mutt/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mutt -pkgver=1.14.5 +pkgver=1.14.6 pkgrel=0 pkgdesc="Small but very powerful text-mode email client" url="http://www.mutt.org" # No HTTPS @@ -60,4 +60,4 @@ package() { "$pkgdir"/etc/Muttrc.gpg.dist } -sha512sums="950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9 mutt-1.14.5.tar.gz" +sha512sums="a442b3f6b8fc4c1a5ed9a870a321c883aeeb736ce58820d393ee6d9c646a607790ad8aeeb1efa4f5394586484f3181fa8cbb6c90d82bbf2a74a046b07d1467e6 mutt-1.14.6.tar.gz" diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD index 6f26ad851..c38933162 100644 --- a/user/nasm/APKBUILD +++ b/user/nasm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=nasm -pkgver=2.15.02 +pkgver=2.15.03 pkgrel=0 pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d5a3fd148f1a29af9ae46a543c05d420087eaae61ae4c3fa258ddd3b97a4f929f417234fc124e2c12f24e65aa9828e96a7cac1ffa54f8b8a3bcffc75074cbe10 nasm-2.15.02.tar.bz2" +sha512sums="afb41cf5d0dc12802531b8d977f57dd360cb7cc72f3a4224a610529fdfab95ae6042af04419728895d270cdf4baf25243d17a8d4e04e1843472d052a770a8e83 nasm-2.15.03.tar.bz2" diff --git a/user/net-snmp/APKBUILD b/user/net-snmp/APKBUILD index 8dea420b2..428f0b525 100644 --- a/user/net-snmp/APKBUILD +++ b/user/net-snmp/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=net-snmp -pkgver=5.8 -pkgrel=1 +pkgver=5.9 +pkgrel=0 pkgdesc="Simple Network Management Protocol" url="http://www.net-snmp.org/" arch="all" @@ -19,12 +19,16 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-agent-libs:alibs source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz netsnmp-swinst-crash.patch fix-includes.patch - snmpd.initd snmpd.confd snmptrapd.confd " +#secfixes: +# 5.9-r0: +# - CVE-2015-8100 +# - CVE-2019-20892 + prepare() { default_prepare update_config_sub @@ -132,7 +136,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 net-snmp-5.8.tar.gz +sha512sums="df3273f03065ea5cb7d63398308ada06bcd186e0bc48929e81ba647f392b646ab81ddc241aebcd75408ec29231377375af62edf2835e9c3eb01d0a6856b79434 net-snmp-5.9.tar.gz 4ad92f50b14d5e27ba86256cc532a2dd055502f4d5fbb1700434f9f01f881fd09bb1eadb94e727554e1470f036707558314c64a66d0376b54e71ab31d5e4baa3 netsnmp-swinst-crash.patch 87a552bd2e41684bba6e87fbcf6454a85ee912d7a339411fda24cebddf7661f0856729e076a917920a542cf84b687ffd90a091daa15f2c48f0ff64f3a53c0ddb fix-includes.patch 896ef65a6f420073746470cdbd0de8f356c5b936d35e131754905b3d4323c24dcd3a09e0cc8bd90b12e3402f01e478f927f0e4163cb85cb0cc03db3c2e0491f4 snmpd.initd diff --git a/user/netifrc/APKBUILD b/user/netifrc/APKBUILD index 6749f98c7..8b6b18cf5 100644 --- a/user/netifrc/APKBUILD +++ b/user/netifrc/APKBUILD @@ -1,17 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> +# Contrinutor: Lee Starnes <lee@canned-death.us> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=netifrc -pkgver=0.6.1 +pkgver=0.7.1 pkgrel=0 pkgdesc="User-friendly network interface management scripts for OpenRC" url="https://www.gentoo.org/proj/en/base/openrc/" arch="noarch" options="!check" # No test suite. license="BSD-2-Clause" -depends="eudev openrc" +depends="eudev openrc perl" makedepends="eudev-dev pkgconf" subpackages="$pkgname-doc $pkgname-openrc" -source="https://gitweb.gentoo.org/proj/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz" +source="https://gitweb.gentoo.org/proj/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz + switch-l2tp-gawk-to-perl.patch" build() { make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname PF="$pkgname-$pkgver" @@ -24,4 +26,5 @@ package() { done } -sha512sums="798a882f87f153c31b415d77a06a2beca94a958ea982aca20bbc2cf6a7d800aedbd99a577734ea41d6a75807b13d640dd7fa5a51aa5a27055e9c552634ac7bdb netifrc-0.6.1.tar.gz" +sha512sums="407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057 netifrc-0.7.1.tar.gz +21d5755d911446abaed75e19c86e6f090da4db6cbcac45d8473d01c2ce309da3debdbe84e538b559bda1a8c538c9be6d182c67c9253229f8d12e3d7b8257fb90 switch-l2tp-gawk-to-perl.patch" diff --git a/user/netifrc/switch-l2tp-gawk-to-perl.patch b/user/netifrc/switch-l2tp-gawk-to-perl.patch new file mode 100644 index 000000000..9c8bc7e0c --- /dev/null +++ b/user/netifrc/switch-l2tp-gawk-to-perl.patch @@ -0,0 +1,92 @@ +diff --git a/net/l2tp.sh b/net/l2tp.sh +index 9644e32..24b081c 100644 +--- a/net/l2tp.sh ++++ b/net/l2tp.sh +@@ -37,9 +37,20 @@ _is_l2tp() { + ip l2tp show session &>/dev/null + [ $? -ne 0 ] && return 1 + +- eval "$(ip l2tp show session | \ +- awk "match(\$0, /^Session ([0-9]+) in tunnel ([0-9]+)\$/, ret) {sid=ret[1]; tid=ret[2]} +- match(\$0, /^[ ]*interface name: ${IFACE}\$/) {print \"session_id=\"sid\";tunnel_id=\"tid; exit}")" ++ eval "$(ip l2tp show session | perl -E ' ++my $sid; ++my $tid; ++my $IFACE=$ARGV[0]; ++while (<STDIN>) { ++ if($_ =~ /^Session ([0-9]+) in tunnel ([0-9+])\$/) { ++ $sid = $1; ++ $tid = $2; ++ } ++ if ($_ =~ /^[ ]*interface name: $IFACE$/) { ++ say "session_id=" . $sid . ";" . "tunnel_id=" . $tid; ++ exit; ++ } ++}' $IFACE)" + test -n "$session_id" + } + +@@ -49,33 +60,36 @@ _is_l2tp() { + _l2tp_get_tunnel_info() { + local found + eval "$(ip l2tp show tunnel | \ +- awk -v id=$2 -v prefix=$1 ' +- match($0, /^Tunnel ([0-9]+), encap (IP|UDP)$/, ret) { +- if (found == "1") exit; +- if (ret[1] == id) { +- print "found=1;" +- print prefix "tunnel_id=" ret[1] ";" +- print prefix "encap=" ret[2] ";"; +- found="1" +- } +- } +- match($0, /^[ ]*From ([^ ]+) to ([^ ]+)$/, ret) { +- if (found == "1") { +- print prefix "local=" ret[1] ";"; +- print prefix "remote=" ret[2] ";"; +- } +- } +- match($0, /^[ ]*Peer tunnel ([0-9]+)$/, ret) { +- if (found == "1") { +- print prefix "peer_tunnel_id=" ret[1] ";"; +- } +- } +- match($0, /^[ ]*UDP source \/ dest ports: ([0-9]+)\/([0-9]+)$/, ret) { +- if (found == "1") { +- print prefix "udp_sport=" ret[1] ";"; +- print prefix "udp_dport=" ret[2] ";"; +- } +- }')" ++ perl -E ' ++my ($prefix, $id) = @ARGV; ++my $found = 0; ++while(<STDIN>) { ++ if ($_ =~ /^Tunnel ([0-9]+), encap (IP|UDP)$/) { ++ if ($found) { ++ exit; ++ } ++ elsif ($1 == $id) { ++ say "found=1;"; ++ say $prefix . "tunnel_id=" . $1 . ";"; ++ say $prefix . "encap=" . $2 . ";"; ++ $found = 1; ++ } ++ } ++ elsif ($found) { ++ if ($_ =~ /^[ ]*From ([^ ]+) to ([^ \n]+)$/) { ++ say $prefix . "local=" . $1 . ";"; ++ say $prefix . "remote=" . $2 . ";"; ++ } ++ elsif ($_ =~ /^[ ]*Peer tunnel ([0-9]+)$/) { ++ say $prefix . "peer_tunnel_id=" . $1 . ";"; ++ } ++ elsif ($_ =~ /^[ ]*UDP source \/ dest ports: ([0-9]+)\/([0-9]+)$/) { ++ say $prefix . "udp_sport=" . $1 . ";"; ++ say $prefix . "udp_dport=" . $2 . ";"; ++ } ++ } ++} ++ ' "$1" "$2")" + test -n "$found" + } + diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 8b95a338e..f2554aee4 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=netsurf pkgver=3.10 pkgrel=0 diff --git a/user/networkmanager-qt/APKBUILD b/user/networkmanager-qt/APKBUILD index d307db266..8cf8b98b5 100644 --- a/user/networkmanager-qt/APKBUILD +++ b/user/networkmanager-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager-qt -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt framework for NetworkManager" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b2763a89de911b2f1bc9704302e3d6874cd8f93fb8497743be33a66e0bd72aa1d140f595392617d952ff6c332f7b54c84c9f54b4c9bd0d8974e6dff81be34675 networkmanager-qt-5.72.0.tar.xz" +sha512sums="62953a2738cf15633733cd0ae9930c640abe90523495d1481893fc8bd3f2de7ace6f683e541c24f641731e014aff8b2f02520c2644dda4b25fa0460c57110cf3 networkmanager-qt-5.74.0.tar.xz" diff --git a/user/networkmanager/01-org.freedesktop.NetworkManager.rules b/user/networkmanager/01-org.freedesktop.NetworkManager.rules index d00b26853..a8aea44cb 100644 --- a/user/networkmanager/01-org.freedesktop.NetworkManager.rules +++ b/user/networkmanager/01-org.freedesktop.NetworkManager.rules @@ -1,7 +1,7 @@ -// Let users in plugdev group modify NetworkManager +// Let users in netdev group modify NetworkManager polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" && - subject.isInGroup("plugdev") && subject.active) { + if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && + subject.isInGroup("netdev") && subject.active) { return "yes"; } }); diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index 006e1a1e1..84ca876f8 100644 --- a/user/networkmanager/APKBUILD +++ b/user/networkmanager/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager pkgver=1.22.14 -pkgrel=1 +pkgrel=2 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" arch="all" @@ -97,7 +97,7 @@ b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc18 5142bf14ac5574a3ae4bc8753055c534702892871ca45a1bc4d48d4d5c07d11bd54e52861458a673c328d129cdd6f1f749a9546eba1c16fea5173f92840506de qsort_r.patch d81a962e32e696ca713dfcf1f8dbd9a146f94473c391f1977198ca67e11a6d427a265bacbe43197e42b442cfaa882e9fd2bba7548872586d53d3caca76263e79 random.patch 602859c1c7b63984b3b9d9597772e4bff496b3838eb0131ad1d707ae9226c5bdd703080683e48bc93b9c1a6572505dad0332d63c57e6320e63c011931877233a tests.patch -22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 01-org.freedesktop.NetworkManager.rules +5ae288073ddc818cc5a0103a9320ebcbd80bccbba9f823335c1c602c25e48e041990370e6d091d9796e543222a7a58625ce832022d450b9a9dd49df4ed6e1ed9 01-org.freedesktop.NetworkManager.rules 26f962cea0b6a75549d16c19a71e3559239b08b001927882702f5d9355a2cc95f7b13c581439f758a950d9a5bfb73b86ba61a5ffb22c9abe19f5b05fe5f5834a 10-openrc-status f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a nm.confd 9a5ab7d317797489a555b185d103d3c526cd6963c6586da2f5212b41e68a9bf5dedd52d1fe58718fb686379b6e2434924d06d7da8070a62a3ec3e5626ab90d14 nm.initd" diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD index 2d42c60ff..e36cee7ff 100644 --- a/user/nfs-utils/APKBUILD +++ b/user/nfs-utils/APKBUILD @@ -70,5 +70,5 @@ f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc69 d9d7eeebbe153d3c4784112ed6d50734b5619b3315bb1454f8163de2b78ed8f958029a0e1088de58e9b1b8069184aeab2c8f19af4b957b6be25e4f138960aeac rpc.gssd.initd f3e88038cb040ffcbca76166f4322d37e39da00d144bc0a17aed4467ab10c6e626fcde6c407d0911d135bfab55622ad2e38ed93788b11459c5882ce60577fb45 rpc.idmapd.initd 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b rpc.pipefs.initd -7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac rpc.statd.initd +a0fe91b4d7d288cb4793335c79e715b3726f573674ef29525bdab20c2053d1ae19e53a76852ef038aee0ad24fb18827a4ff333a0a179263b1ba47c9a6e2d337c rpc.statd.initd 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f rpc.svcgssd.initd" diff --git a/user/nfs-utils/rpc.statd.initd b/user/nfs-utils/rpc.statd.initd index ea78b9aef..bd0e9cb8f 100644 --- a/user/nfs-utils/rpc.statd.initd +++ b/user/nfs-utils/rpc.statd.initd @@ -4,7 +4,7 @@ [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs -rpc_bin=/sbin/rpc.statd +rpc_bin=/usr/sbin/rpc.statd rpc_pid=/var/run/rpc.statd.pid depend() { diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD index 40eaa5a7f..56a056dee 100644 --- a/user/nftables/APKBUILD +++ b/user/nftables/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=nftables pkgver=0.9.6 @@ -48,6 +48,6 @@ package() { } sha512sums="ca6524ff1cb1e79d636afeb96f54e4699773e1cbda8e9a3ec5728f4d5b764c0df16b195cdcc0e304ae5643c8761b6b5a6685c737965a7415aec07aeb9f3dc5df nftables-0.9.6.tar.bz2 -f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch +282434bf685647ef823db610660c96c15bcf9eb694ab7f3e7d9a05b9ed77c572562d0eed4adda5d5adc579378e625f92762b945ac5d0f93f81900c9472382583 asciidoctor.patch 4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd 58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd" diff --git a/user/nftables/asciidoctor.patch b/user/nftables/asciidoctor.patch index 11412a81b..d290f6530 100644 --- a/user/nftables/asciidoctor.patch +++ b/user/nftables/asciidoctor.patch @@ -1,5 +1,5 @@ From ee7aad965b044bb555dc9fe27991c0e05f14e7dc Mon Sep 17 00:00:00 2001 -From: Luis Ressel <aranea@aixah.de> +From: Mira Ressel <aranea@aixah.de> Date: Tue, 9 Jul 2019 18:02:57 +0200 Subject: [PATCH] We're using asciidoctor instead of a2x; adjust options accordingly diff --git a/user/ninja/APKBUILD b/user/ninja/APKBUILD index 2b82aef51..00f71f088 100644 --- a/user/ninja/APKBUILD +++ b/user/ninja/APKBUILD @@ -1,7 +1,7 @@ # Contributor: k0r10n <k0r10n.dev@gmail.com> # Maintainer: pkgname=ninja -pkgver=1.9.0 +pkgver=1.10.1 pkgrel=0 pkgdesc="Small build system with a focus on speed" url="https://ninja-build.org/" @@ -11,7 +11,6 @@ depends="" makedepends="asciidoctor gtest python3 re2c" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/martine/ninja/archive/v$pkgver.tar.gz - posix-fix.patch::https://github.com/ninja-build/ninja/pull/1513/commits/567815df38a2ff54ad7478a90bd75c91e434236a.patch " build() { @@ -35,5 +34,4 @@ package() { "$pkgdir/usr/share/bash-completion/completions/ninja" } -sha512sums="a8b5ad00b60bddbdb8439a6092c91a65d093f9bcd6241f69088eb35bea2847efe673c3107a130dc754c747c7712b839d8f88e88d8389520cf7143668ee053feb ninja-1.9.0.tar.gz -78b29a57ec3c4feedf2bcfe9370b30cecd5302f29e8e14c6a3bc01becb555be6330aafba12f9225625af0644ea1f534feba8396d32bb944253a9daa5dd0e98d8 posix-fix.patch" +sha512sums="9915767a6ffc7147903f346082b5c31fcaeb1e45742754cfaaa642e8ec4c1bd9ec26692a59eb4e2118c397336712a6548e6a16408e094001f8f0c173e67afcc2 ninja-1.10.1.tar.gz" diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD index a119fd0d4..a0d7b879b 100644 --- a/user/nsd/APKBUILD +++ b/user/nsd/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=nsd -pkgver=4.3.1 +pkgver=4.3.2 pkgrel=0 pkgdesc="An authoritative only name server" url="https://www.nlnetlabs.nl/projects/nsd/about/" @@ -51,6 +51,6 @@ openrc() { install -Dm644 "$srcdir/nsd.confd" "$subpkgdir/etc/conf.d/nsd" } -sha512sums="58b6e964795d6c796b547e1134cef954e5f4adf4e976db830ff7900892327154dab2a607ceadbb99072d6e5495d62c808c8fb8c94359ae93f636d11925c0d261 nsd-4.3.1.tar.gz +sha512sums="0423aeddc7f60e04718b6ee0954fbdc274576b6ef61472324256e5db696f41e47899b645cbc4d6d8cc2a7dd00190b72f3ef0476c4640dbb80d36ec39f1c9f5c8 nsd-4.3.2.tar.gz f0ef1d3427e92650239d9d91402810c045fc9223e3f42ce86986422bf2039a0bcc02dffdfe1153d54de5c76c8f2bdc3e34fe341c65b41f2d333b02c00b5b0eae nsd.confd 139e52dec98792173f06d298574db0d0e6966a06af8a0a3069487beb01fd570c09d22322569b54bacdc43232dbfb99a8c497d4417d2bbfee88bcdd9d1b4d22f7 nsd.initd" diff --git a/user/ntpsec/APKBUILD b/user/ntpsec/APKBUILD new file mode 100644 index 000000000..f95a7ed3d --- /dev/null +++ b/user/ntpsec/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ntpsec +pkgver=1.1.9 +pkgrel=0 +pkgdesc="Secure implementation of Network Time Protocol (NTP)" +url="https://www.ntpsec.org/" +arch="all" +options="!check" # No test suite. +license="NTP AND BSD-2-Clause AND BSD-3-Clause AND MIT" +depends="python3 py3-psutil" +makedepends="asciidoctor bison libbsd-dev libexecinfo-dev m4 openssl-dev + python3-dev" +subpackages="$pkgname-doc" +source="ftp://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz" + +build() { + python3 waf configure --prefix=/usr + python3 waf build +} + +package() { + python3 waf install --destdir="$pkgdir" +} + +sha512sums="e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b ntpsec-1.1.9.tar.gz" diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index 5c24d7987..a52ef44ff 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=obconf-qt pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index d7fc84030..be2c4a289 100644 --- a/user/okteta/APKBUILD +++ b/user/okteta/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okteta -pkgver=0.26.3 +pkgver=0.26.4 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6 okteta-0.26.3.tar.xz" +sha512sums="2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7 okteta-0.26.4.tar.xz" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 9c75fa6d2..ed77dc26c 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" @@ -48,5 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1d6a02590a4d1b7ab6dbf63b370f3cceb0e35c763310b54d5aeac3cc5122c2041f2cf0206a7e32ad18c494c7fd0caf51d50e457ae8ca54daa8494e4302110c01 okular-20.04.3.tar.xz +sha512sums="076e4e676f61625169ec8f12289978675001ab929cabaf9cb746e4487062c5223d562954c151b785b129185d74b680974b3093eb67ef547edf0e56f28791cb00 okular-20.08.1.tar.xz de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch" diff --git a/user/olm/APKBUILD b/user/olm/APKBUILD new file mode 100644 index 000000000..f38004886 --- /dev/null +++ b/user/olm/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=olm +pkgver=3.2.1 +pkgrel=0 +pkgdesc="Implementation of the olm and megolm cryptographic ratchets" +url="https://gitlab.matrix.org/matrix-org/olm/" +arch="all" +license="Apache-2.0" +depends="" +makedepends="cmake" +subpackages="$pkgname-dev" +source="https://gitlab.matrix.org/matrix-org/olm/-/archive/$pkgver/olm-$pkgver.tar.bz2" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="adb9cff6148d19df4b83a287723219d4da9efd162f7a2824bee63d824d22c20a10fd2c2d8ce74aff5ec006c6dc8828bd6851cc82be93bc6c4524cf7067080412 olm-3.2.1.tar.bz2" diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD index e34112fc3..60c5f77f1 100644 --- a/user/openvpn/APKBUILD +++ b/user/openvpn/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=openvpn -pkgver=2.4.9 +pkgver=2.4.11 pkgrel=0 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="https://openvpn.net/" @@ -20,6 +20,8 @@ source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz " # secfixes: +# 2.4.11-r0: +# - CVE-2020-15078 # 2.4.9-r0: # - CVE-2020-11810 @@ -63,7 +65,7 @@ pam() { "$subpkgdir"/usr/lib/openvpn/plugins/ } -sha512sums="a05cbd6c73809f26cd1b68bd491ceb8fb4ddf2cde0407f73f4c16d97477a4853722a1618e6dcf0b111283f73d9499b593b25107bb1441d9b38c80e76d6bcc69b openvpn-2.4.9.tar.gz +sha512sums="dc9500406b6f4d195d8039bce6ed39b091c2f46f8cdfd2cc8ca472cf609e70711269023cfff4ee91db27b3c194524bde79c14d39811687460702c0c76111c8a6 openvpn-2.4.11.tar.gz 3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9 openvpn.initd 6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e openvpn.confd cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up diff --git a/user/oprofile/APKBUILD b/user/oprofile/APKBUILD index 07a844c14..d1083c600 100644 --- a/user/oprofile/APKBUILD +++ b/user/oprofile/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oprofile -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=0 pkgdesc="System profiler for Linux" url="http://oprofile.sourceforge.net/news/" @@ -34,6 +34,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba oprofile-1.3.0.tar.gz +sha512sums="44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df oprofile-1.4.0.tar.gz 9ad0e25f2ab165e6613d8fbd65b652fb82b41beef28f9edca6b763001d50fb5f35e433454a7beeecaa1d0d3adc9c9f16adc6d4d9f20ae9d27cc3120c04906576 disable-regex-test.patch 831fd9b18df0daaa01682c50479f432e81da951550db6d0b11315232b728517493533b41b46fd64f3e74405b8d515fb86d7b4b96898cf45b262a7e790a131740 posixise.patch" diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD index 9681a20ae..2d14e41c3 100644 --- a/user/orage/APKBUILD +++ b/user/orage/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=orage pkgver=4.12.1 pkgrel=2 diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD index ffbf36df1..9c8b5a823 100644 --- a/user/otf-culmus/APKBUILD +++ b/user/otf-culmus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-culmus pkgver=0.133 pkgrel=0 diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD index c7ee2436a..4bde85eb7 100644 --- a/user/otf-exo/APKBUILD +++ b/user/otf-exo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-exo pkgver=2 pkgrel=0 diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD index 0f1ad30b2..d5f2cc7c2 100644 --- a/user/otf-office-code-pro/APKBUILD +++ b/user/otf-office-code-pro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-office-code-pro pkgver=1.004 pkgrel=0 diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD index 985c7f18e..618bad5d6 100644 --- a/user/otf-proggy-vector/APKBUILD +++ b/user/otf-proggy-vector/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-proggy-vector pkgver=1.1.5 pkgrel=0 diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD index 5e96c1717..e8347fcda 100644 --- a/user/otf-source-code-pro/APKBUILD +++ b/user/otf-source-code-pro/APKBUILD @@ -1,8 +1,9 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-source-code-pro -pkgver=2.030 -_pkgver=1.050 +pkgver=2.038 +_itver=1.058 +_varver=1.018 pkgrel=0 pkgdesc="Monospaced font family for user interfaces and programming" url="https://adobe-fonts.github.io/source-code-pro/" @@ -11,15 +12,14 @@ options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" -source="https://github.com/adobe-fonts/source-code-pro/archive/${pkgver}R-ro/${_pkgver}R-it.zip" -builddir="$srcdir/source-code-pro-${pkgver}R-ro-${_pkgver}R-it" +source="https://github.com/adobe-fonts/source-code-pro/releases/download/${pkgver}R-ro/${_itver}R-it/${_varver}R-VAR/OTF-source-code-pro-${pkgver}R-ro-${_itver}R-it.zip" +builddir="$srcdir" package() { - cd "$builddir"/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="b31d4a33482e7817adbe73919fdeeb0e3c0e4564e6dc1b86e7328ca405c5bb1b36338b665b124848ada2e94917b8ce36ee8cc03dd632648b44d1421486c27d02 1.050R-it.zip" +sha512sums="07566e6b2d5889323aa44040cab403b21a2341982f811a97039fd91a4b863732e35f3532af7b883ab751fa2f4db9080d897e403cf983e44e147a0d107c5b1838 OTF-source-code-pro-2.038R-ro-1.058R-it.zip" diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD index 1457b6ede..ef47f92e6 100644 --- a/user/otf-source-sans-pro/APKBUILD +++ b/user/otf-source-sans-pro/APKBUILD @@ -1,7 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-source-sans-pro -pkgver=3.006 +pkgver=3.028 +_pkgver=${pkgver%.*}v${pkgver#*.} pkgrel=0 pkgdesc="Sans serif font family for user interfaces" url="https://adobe-fonts.github.io/source-sans-pro" @@ -10,15 +11,15 @@ options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" makedepends="" -source="https://github.com/adobe-fonts/source-sans-pro/releases/download/${pkgver}R/source-sans-pro-${pkgver}R.zip" +source="https://github.com/adobe-fonts/source-sans-pro/releases/download/${pkgver}R/source-sans-${_pkgver}R.zip" builddir="$srcdir/source-sans-pro-${pkgver}R" 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="f6351e7b842204ff07bbbf0c6ea1e7767d5adc4e0102435c3efab5ee1f14f7c6a6efe8c475fa286e1c82399e13bad11d75430a10338f41e6ffb9b52939cb9d25 source-sans-pro-3.006R.zip" +sha512sums="4aa01b9b56b7449118f171ae57a43309fb6ff7bb8e9c40643dc15b1aa529d39ecf496e9e8be60ef0cdc16762cfaf5b28b6ddadf818ddaeb3cceb8bb5d55f1891 source-sans-3v028R.zip" diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD index e90f45cbd..bb92895c1 100644 --- a/user/otf-source-serif-pro/APKBUILD +++ b/user/otf-source-serif-pro/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=otf-source-serif-pro pkgver=3.001 pkgrel=0 diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD index a3338be79..d93ba605b 100644 --- a/user/oxygen-icons5/APKBUILD +++ b/user/oxygen-icons5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen-icons5 -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="The KDE Oxygen icon set" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bcc61669105dc03526bb20ea890c29de6c9caab88f588e96fcc01cb94c3404e0cd198ea4e3f828eebbcf6ddaa01ecef35d3d193a16ee9286db85016911bcaf70 oxygen-icons5-5.72.0.tar.xz" +sha512sums="bc00190778edd4b5b154f210ad3e3479f84d6f65b8114f0901966cebb4bfd0f6cabb7d68b1ac2759d7553360167fa620f258078c3c60437a04ef6fbe84243284 oxygen-icons5-5.74.0.tar.xz" diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD index b7ab67af6..66303d8f0 100644 --- a/user/oxygen/APKBUILD +++ b/user/oxygen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=oxygen -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="'Oxygen' theme for KDE" url="https://www.kde.org/" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev kdecoration-dev kguiaddons-dev ki18n-dev kservice-dev kwidgetsaddons-dev kwindowsystem-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/oxygen-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/oxygen-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b6804c0ff7b2234603c6e9d0e9957b8eb5b44b663aa427571a841b7ee421c7e95da2213afb4d956390c5a87828a530a13aecf7f86be63c0f56410259771c516d oxygen-5.18.4.1.tar.xz" +sha512sums="e965e8edbf94d2bd2241202030960615286c454c02bedfbca29670c9dacf55b5f34a8dda1ec3ef9f18f4bb864ff8721acaf559f14cfc1c22e7b5385865cec579 oxygen-5.18.5.tar.xz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 31bb41211..3b1d72b8f 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=palapeli -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1048ed8ad2b00170eb1079146b18549ac579804d9f7abcaf7f3479ce1bfa9fb4d406b93e3ea889084cd9aa936dc6b7db884992af379a382eb2a147f7f6010bd palapeli-20.04.3.tar.xz" +sha512sums="bec442e3a2b3390752bd89293f668e57844f641acc11d3a73f8aab62e1a6dc6c71837b62fba3f2e86cb0366b90c8bedad27e8f5502bcdd5b72ca1ae6ce6dd27a palapeli-20.08.1.tar.xz" diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD index ae190e40d..d7f6e4501 100644 --- a/user/pangomm/APKBUILD +++ b/user/pangomm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pangomm pkgver=2.42.1 pkgrel=0 diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD index cf55cd657..ad9967bfb 100644 --- a/user/parole/APKBUILD +++ b/user/parole/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=parole pkgver=1.0.5 pkgrel=0 diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD index 5b81f0c88..3dd65918d 100644 --- a/user/pavucontrol-qt/APKBUILD +++ b/user/pavucontrol-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pavucontrol-qt pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD index 5c98d4f57..2e60cf25b 100644 --- a/user/pavucontrol/APKBUILD +++ b/user/pavucontrol/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pavucontrol pkgver=4.0 pkgrel=0 diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index a72c1e6ea..e3fd3540f 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pcmanfm-qt pkgver=0.15.1 pkgrel=0 diff --git a/user/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD index 806d8b65d..4b2025181 100644 --- a/user/pcmanfm/APKBUILD +++ b/user/pcmanfm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pcmanfm pkgver=1.3.1 pkgrel=0 diff --git a/user/perl-app-licensecheck/APKBUILD b/user/perl-app-licensecheck/APKBUILD index f339331ce..88798a155 100644 --- a/user/perl-app-licensecheck/APKBUILD +++ b/user/perl-app-licensecheck/APKBUILD @@ -1,11 +1,11 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-app-licensecheck _pkgreal=App-Licensecheck _author=JONASS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=3.0.44 +pkgver=3.1.1 pkgrel=0 pkgdesc="Perl library and utility for checking source-file licensing" url="https://metacpan.org/release/App-Licensecheck" @@ -15,7 +15,7 @@ depends="perl perl-array-intspan perl-encode-locale perl-getopt-long-descriptive perl-list-someutils perl-log-any perl-log-any-adapter-screen perl-moo perl-moox-struct perl-namespace-clean perl-path-iterator-rule perl-path-tiny - perl-pod-constants perl-regexp-pattern>=0.2.12 perl-regexp-pattern-license>=3.1.102 + perl-pod-constants perl-regexp-pattern>=0.2.12 perl-regexp-pattern-license>=3.4.0 perl-re-engine-re2 perl-software-license perl-sort-key perl-strictures perl-string-copyright perl-string-escape perl-test-requires perl-test-script perl-try-tiny perl-universal-require" @@ -39,4 +39,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="3a1fa510c8e103f6ac7cc5507ab63258e59b01181ba5bbb38345526eb73eaa547cbca36e5b0c12a4a60186d133a31060b17a1aba84e0a82c05917a8793a512d3 App-Licensecheck-v3.0.44.tar.gz" +sha512sums="c84aebc08019128b3aa812ba6e4f93d6d8ec8d6b31a405490609b80f03692d0f95e2ea1f9cad5eea6efa706d7837dca0b8ab1227065e3c5abbfa46e909831ea8 App-Licensecheck-v3.1.1.tar.gz" diff --git a/user/perl-b-hooks-op-check/APKBUILD b/user/perl-b-hooks-op-check/APKBUILD index b5dae3817..7a79656b2 100644 --- a/user/perl-b-hooks-op-check/APKBUILD +++ b/user/perl-b-hooks-op-check/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-b-hooks-op-check _pkgreal=B-Hooks-OP-Check diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD index 7b67d3047..92c6b95be 100644 --- a/user/perl-bareword-filehandles/APKBUILD +++ b/user/perl-bareword-filehandles/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-bareword-filehandles _pkgreal=bareword-filehandles diff --git a/user/perl-cgi/APKBUILD b/user/perl-cgi/APKBUILD index 6ea8b71e1..a2a5d55f6 100644 --- a/user/perl-cgi/APKBUILD +++ b/user/perl-cgi/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=CGI _author=LEEJO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=4.46 +pkgver=4.50 pkgrel=0 pkgdesc="Handle CGI requests and responses in Perl" url="https://metacpan.org/release/CGI" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="11280537b828fc595ad8c3d18a8a0b148cfcaccf1c4d4e58288e581254781182f1f3c4b119880c4e793af3bb051973b52c08142e9f0179178e927c4bfe33a292 CGI-4.46.tar.gz" +sha512sums="c8f898404ef8fb341ea741229939748b82ca94b231591b67f29ca2f06cfbab363653753289a795a2eb0b0a145eafc8e8a303e92fd90795071b123e0fb8cb79c6 CGI-4.50.tar.gz" diff --git a/user/perl-class-tiny/APKBUILD b/user/perl-class-tiny/APKBUILD index ea2ad4615..b99f8c266 100644 --- a/user/perl-class-tiny/APKBUILD +++ b/user/perl-class-tiny/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Class-Tiny _author=DAGOLDEN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=1.006 +pkgver=1.008 pkgrel=0 pkgdesc="Minimalist class construction for Perl" url="https://metacpan.org/release/Class-Tiny" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0a6ca0b99bd10a39445bb582bcf89f3668747f05b13b1f7271e934a73781c855a0418ae19a41593c64288b74710f49c1dcda0005be4edf9965e8020139ca0c7e Class-Tiny-1.006.tar.gz" +sha512sums="908eb8547e01036ef361f0a8623d028b1e733ea003fc227788b9c18d0db544a70dbe47de18822f9699a19156f36eac73caeb4849d44eea14ada1128afdb7efbd Class-Tiny-1.008.tar.gz" diff --git a/user/perl-cpan-changes/APKBUILD b/user/perl-cpan-changes/APKBUILD index 0a1f4ddd4..9a0dc30fb 100644 --- a/user/perl-cpan-changes/APKBUILD +++ b/user/perl-cpan-changes/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpan-changes _pkgreal=CPAN-Changes diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD index 1ee807e32..6a6a10896 100644 --- a/user/perl-data-dump/APKBUILD +++ b/user/perl-data-dump/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-dump _pkgreal=Data-Dump diff --git a/user/perl-data-section/APKBUILD b/user/perl-data-section/APKBUILD index 48e7a8759..da9829a28 100644 --- a/user/perl-data-section/APKBUILD +++ b/user/perl-data-section/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-section _pkgreal=Data-Section diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD index 2c41fb4d3..e81937122 100644 --- a/user/perl-devel-hide/APKBUILD +++ b/user/perl-devel-hide/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-devel-hide _pkgreal=Devel-Hide diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD index df76050da..604ca22cb 100644 --- a/user/perl-gd/APKBUILD +++ b/user/perl-gd/APKBUILD @@ -5,8 +5,8 @@ _pkgreal=GD _author=RURBAN _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.71 -pkgrel=1 +pkgver=2.72 +pkgrel=0 pkgdesc="Perl module for GD graphics library" url="https://metacpan.org/release/GD" arch="all" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="3a1555f07e6ab36a7218f24853f4168914be45e8c19ab0fe971ab044725dc0d7efeca75be2e4408406e69601f07e047fd3ea157acc9b9d339c9917a1c3e1f74d GD-2.71.tar.gz" +sha512sums="93a42c2385673ce8133102adc125da966f8a8abcebe4a0a9d87ae3e77a84870138db81f532e393eb1c5be4b12c71b737bd5b85ed84cf4b8580f08a5296189103 GD-2.72.tar.gz" diff --git a/user/perl-http-entity-parser/APKBUILD b/user/perl-http-entity-parser/APKBUILD index ea37b802a..7373c46d0 100644 --- a/user/perl-http-entity-parser/APKBUILD +++ b/user/perl-http-entity-parser/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=HTTP-Entity-Parser _author=KAZEBURO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.22 +pkgver=0.23 pkgrel=0 pkgdesc="PSGI compliant HTTP entity parser for Perl" url="https://metacpan.org/release/HTTP-Entity-Parser" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="fc54b92af197ec4dbdb1069f5a7a8db0892483f80a3737f4914cb6d03dd0ec01b2b215bed96b6736474d2d484516071926774610ace475199cae44174cc2abd0 HTTP-Entity-Parser-0.22.tar.gz" +sha512sums="7ae384ae91b5519b9953f7186a898c8821d600c6ff2d2c659003dc23307cd01a5a241d3470509bafde72db6e611a74a56bb48b1ddc9d8c0bd12662e660febd25 HTTP-Entity-Parser-0.23.tar.gz" diff --git a/user/perl-importer/APKBUILD b/user/perl-importer/APKBUILD index 3aeb91912..789feb526 100644 --- a/user/perl-importer/APKBUILD +++ b/user/perl-importer/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-importer _pkgreal=Importer diff --git a/user/perl-indirect/APKBUILD b/user/perl-indirect/APKBUILD index d9fe7b5fa..0d7420f12 100644 --- a/user/perl-indirect/APKBUILD +++ b/user/perl-indirect/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-indirect _pkgreal=indirect diff --git a/user/perl-lwp-protocol-https/APKBUILD b/user/perl-lwp-protocol-https/APKBUILD index 6512088a6..303e8aee7 100644 --- a/user/perl-lwp-protocol-https/APKBUILD +++ b/user/perl-lwp-protocol-https/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=LWP-Protocol-https _author=OALDERS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=6.07 +pkgver=6.09 pkgrel=0 pkgdesc="HTTPS support for Perl LWP" url="https://metacpan.org/release/LWP-Protocol-https" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="4a07cd8a1c44e31781069a632a77f3af43747933420e831b4fd4a12faac7dc04f0c6b10ea773c3e14ecb66209a547b3587c0e3f481a55b9929db65f7b10343aa LWP-Protocol-https-6.07.tar.gz" +sha512sums="53e1ec7dec04988c3c7fa70a5f0ed60c38270bbbb9fe99a7cfeb84db0c40f5ff6f6f94aa4aa639498af6d0bc201dcb7e6e3491bae96411250ef50b010d32add1 LWP-Protocol-https-6.09.tar.gz" diff --git a/user/perl-moose/APKBUILD b/user/perl-moose/APKBUILD index b716f58fc..c819afe09 100644 --- a/user/perl-moose/APKBUILD +++ b/user/perl-moose/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Moose _author=ETHER _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.2012 +pkgver=2.2013 pkgrel=0 pkgdesc="A postmodern object system for Perl 5" url="https://metacpan.org/release/Moose" @@ -38,4 +38,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="195079c32ce0110ae5d76bc1753b9e5c9aa8b3132049912d85600b7d29470b3426e10ccac50a24acbadbb8e00b68c99a98ca975a001b12096b02f2fa1c1264f3 Moose-2.2012.tar.gz" +sha512sums="9e177019930d6bae4fdd90713e3c95b16e6bc91e229ab2aacc03e14a5efbedf6c944b93fefbbcc4586ffb18cc786f323c4102f76d84af949c8f328acf69a5ec3 Moose-2.2013.tar.gz" diff --git a/user/perl-multidimensional/APKBUILD b/user/perl-multidimensional/APKBUILD index 4d7e17f53..90e7b2ba1 100644 --- a/user/perl-multidimensional/APKBUILD +++ b/user/perl-multidimensional/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-multidimensional _pkgreal=multidimensional diff --git a/user/perl-net-dbus/APKBUILD b/user/perl-net-dbus/APKBUILD index 7291dbaa2..58b69ad43 100644 --- a/user/perl-net-dbus/APKBUILD +++ b/user/perl-net-dbus/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-dbus _pkgreal=Net-DBus diff --git a/user/perl-net-snmp/APKBUILD b/user/perl-net-snmp/APKBUILD index ab5d1483c..05178b9e4 100644 --- a/user/perl-net-snmp/APKBUILD +++ b/user/perl-net-snmp/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-snmp _pkgreal=Net-SNMP diff --git a/user/perl-number-range/APKBUILD b/user/perl-number-range/APKBUILD index dd99a6970..083eb2070 100644 --- a/user/perl-number-range/APKBUILD +++ b/user/perl-number-range/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-number-range _pkgreal=Number-Range diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD index fea0b4e57..2111c4d54 100644 --- a/user/perl-parallel-forkmanager/APKBUILD +++ b/user/perl-parallel-forkmanager/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-parallel-forkmanager _pkgreal=Parallel-ForkManager diff --git a/user/perl-path-iterator-rule/APKBUILD b/user/perl-path-iterator-rule/APKBUILD index 785d2ee3c..ac6584335 100644 --- a/user/perl-path-iterator-rule/APKBUILD +++ b/user/perl-path-iterator-rule/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-path-iterator-rule _pkgreal=Path-Iterator-Rule diff --git a/user/perl-pod-constants/APKBUILD b/user/perl-pod-constants/APKBUILD index 69a0129eb..7994f9f2f 100644 --- a/user/perl-pod-constants/APKBUILD +++ b/user/perl-pod-constants/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-pod-constants _pkgreal=Pod-Constants diff --git a/user/perl-posix-strftime-compiler/APKBUILD b/user/perl-posix-strftime-compiler/APKBUILD index 5d5e4181b..641a6ffcd 100644 --- a/user/perl-posix-strftime-compiler/APKBUILD +++ b/user/perl-posix-strftime-compiler/APKBUILD @@ -5,14 +5,14 @@ _pkgreal=POSIX-strftime-Compiler _author=KAZEBURO _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.42 +pkgver=0.43 pkgrel=0 pkgdesc="Perl strftime compiler" url="https://metacpan.org/release/POSIX-strftime-Compiler" arch="noarch" license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl" -makedepends="perl-dev perl-module-build" +makedepends="perl-dev perl-module-build-tiny" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="0c07f1b8589b067533c65a023dd634a29640cb8992aae8047aa1063affe6b30b95930479829982a30a13b87bc7c9ebf82ca4837726bd29658d85d718164e3c76 POSIX-strftime-Compiler-0.42.tar.gz" +sha512sums="3a0a118509a4da3b4af774d75be5cf05e65672c61df57117317d39f13a835c1d8cd27c9bebe4d81c20e8a628e69f698e8406b93610feb8900c1f225c9dbd4f9d POSIX-strftime-Compiler-0.43.tar.gz" diff --git a/user/perl-probe-perl/APKBUILD b/user/perl-probe-perl/APKBUILD index c495e0b8e..59e44b060 100644 --- a/user/perl-probe-perl/APKBUILD +++ b/user/perl-probe-perl/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-probe-perl _pkgreal=Probe-Perl diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD index 114d16c3c..f8deb67d6 100644 --- a/user/perl-regexp-common/APKBUILD +++ b/user/perl-regexp-common/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-common _pkgreal=Regexp-Common diff --git a/user/perl-regexp-pattern-license/APKBUILD b/user/perl-regexp-pattern-license/APKBUILD index 3453eea72..7c11a498b 100644 --- a/user/perl-regexp-pattern-license/APKBUILD +++ b/user/perl-regexp-pattern-license/APKBUILD @@ -1,11 +1,11 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-pattern-license _pkgreal=Regexp-Pattern-License _author=JONASS _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=3.1.102 +pkgver=3.4.0 pkgrel=0 pkgdesc="Perl module for regex-matching legal licenses" url="https://metacpan.org/pod/Regexp::Pattern::License" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="4f3f877eff3a3035d23d04b00ecc9e2448cf9efd5fced3d67f5babc8a60de9bc60312e59944329883508e31e70b52b2756e36955d912612eddd9d95db0738155 Regexp-Pattern-License-v3.1.102.tar.gz" +sha512sums="5524535f8eebe6cc2ce2065bae1f726b9a2717c34262df2ddd9106464dcfbaeb67eb310679bb636e728669f17041e4f101c7fb241a8e07a6cf3dc6fb3ae88e12 Regexp-Pattern-License-v3.4.0.tar.gz" diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD index 3c400e799..19c72e967 100644 --- a/user/perl-regexp-pattern/APKBUILD +++ b/user/perl-regexp-pattern/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-regexp-pattern _pkgreal=Regexp-Pattern diff --git a/user/perl-software-license/APKBUILD b/user/perl-software-license/APKBUILD index 0e28bc4a4..e8440c012 100644 --- a/user/perl-software-license/APKBUILD +++ b/user/perl-software-license/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-software-license _pkgreal=Software-License diff --git a/user/perl-sort-key/APKBUILD b/user/perl-sort-key/APKBUILD index c79e65b6c..e04e27823 100644 --- a/user/perl-sort-key/APKBUILD +++ b/user/perl-sort-key/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sort-key _pkgreal=Sort-Key diff --git a/user/perl-strictures/APKBUILD b/user/perl-strictures/APKBUILD index 4593d1b79..7b4781597 100644 --- a/user/perl-strictures/APKBUILD +++ b/user/perl-strictures/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-strictures _pkgreal=strictures diff --git a/user/perl-string-copyright/APKBUILD b/user/perl-string-copyright/APKBUILD index ce456a524..600079375 100644 --- a/user/perl-string-copyright/APKBUILD +++ b/user/perl-string-copyright/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-string-copyright _pkgreal=String-Copyright diff --git a/user/perl-string-escape/APKBUILD b/user/perl-string-escape/APKBUILD index ce9e32862..c213c2ba6 100644 --- a/user/perl-string-escape/APKBUILD +++ b/user/perl-string-escape/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-string-escape _pkgreal=String-Escape diff --git a/user/perl-sub-info/APKBUILD b/user/perl-sub-info/APKBUILD index ad01d3757..5a056a5c9 100644 --- a/user/perl-sub-info/APKBUILD +++ b/user/perl-sub-info/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sub-info _pkgreal=Sub-Info diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD index 8d055549d..43799221e 100644 --- a/user/perl-template-toolkit/APKBUILD +++ b/user/perl-template-toolkit/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Template-Toolkit _author=ATOOMIC _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=3.008 +pkgver=3.009 pkgrel=0 pkgdesc="Comprehensive template processing system" url="https://metacpan.org/release/Template-Toolkit" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="851becacca1b62fca4ee17912480f87d7059bd3c851e443128d3269331b0c876d6f888f33b99008f8c03e6b1edf9dad1318b736d567245d66fceacbf88c78023 Template-Toolkit-3.008.tar.gz" +sha512sums="940992d7e3059a64c273c2f0441a81e095560c35f4bb9ab75afb9eeeb58d043cc5ac9785e2eb79a6635480ade12771c75c632c755977124dbe7cbfae399f9972 Template-Toolkit-3.009.tar.gz" diff --git a/user/perl-term-readkey/APKBUILD b/user/perl-term-readkey/APKBUILD index ba6785f21..300707cd2 100644 --- a/user/perl-term-readkey/APKBUILD +++ b/user/perl-term-readkey/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-readkey _pkgreal=TermReadKey diff --git a/user/perl-term-size-any/APKBUILD b/user/perl-term-size-any/APKBUILD index 2cc51c4d1..6ac6fedfa 100644 --- a/user/perl-term-size-any/APKBUILD +++ b/user/perl-term-size-any/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-size-any _pkgreal=Term-Size-Any diff --git a/user/perl-term-size-perl/APKBUILD b/user/perl-term-size-perl/APKBUILD index 599757534..cd6a0c524 100644 --- a/user/perl-term-size-perl/APKBUILD +++ b/user/perl-term-size-perl/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-size-perl _pkgreal=Term-Size-Perl diff --git a/user/perl-term-table/APKBUILD b/user/perl-term-table/APKBUILD index 9faf22bf0..c88608e01 100644 --- a/user/perl-term-table/APKBUILD +++ b/user/perl-term-table/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-term-table _pkgreal=Term-Table diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD index a1027ddd4..dd7d6676b 100644 --- a/user/perl-test-command/APKBUILD +++ b/user/perl-test-command/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-command _pkgreal=Test-Command diff --git a/user/perl-test-failwarnings/APKBUILD b/user/perl-test-failwarnings/APKBUILD index 1067e2e07..ba9b0ebf1 100644 --- a/user/perl-test-failwarnings/APKBUILD +++ b/user/perl-test-failwarnings/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-failwarnings _pkgreal=Test-FailWarnings diff --git a/user/perl-test-filename/APKBUILD b/user/perl-test-filename/APKBUILD index 2bb1a9fb6..8af0ec7ac 100644 --- a/user/perl-test-filename/APKBUILD +++ b/user/perl-test-filename/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-filename _pkgreal=Test-Filename diff --git a/user/perl-test-more-utf8/APKBUILD b/user/perl-test-more-utf8/APKBUILD index 330107c88..252149271 100644 --- a/user/perl-test-more-utf8/APKBUILD +++ b/user/perl-test-more-utf8/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-more-utf8 _pkgreal=Test-More-UTF8 diff --git a/user/perl-test-script/APKBUILD b/user/perl-test-script/APKBUILD index 75ce72031..47a095d43 100644 --- a/user/perl-test-script/APKBUILD +++ b/user/perl-test-script/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-script _pkgreal=Test-Script diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD index 1230f2449..ce26ed312 100644 --- a/user/perl-test2-suite/APKBUILD +++ b/user/perl-test2-suite/APKBUILD @@ -1,18 +1,18 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test2-suite _pkgreal=Test2-Suite _author=EXODIST _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=0.000130 +pkgver=0.000135 pkgrel=0 pkgdesc="Collection of Perl modules in the Test2 namespace" url="https://metacpan.org/pod/Test2::Suite" arch="noarch" license="Artistic-1.0-Perl" depends="perl perl-importer perl-module-pluggable perl-scope-guard - perl-sub-info perl-term-table perl-test-simple + perl-sub-info perl-term-table perl-test-simple>=1.302176 perl-sub-name perl-term-readkey perl-term-size-any perl-unicode-linebreak" @@ -35,4 +35,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="fbfa6d708de5e5e0d55221b53e86409db034eea1b6d5279cbc5b3a20a8156c959efb5cecdea4057f38525fd451655314ea4048620d4c17ae2df138a39c2816e5 Test2-Suite-0.000130.tar.gz" +sha512sums="6178d6ae5f7981de70ef245143bf990587dd35423521feb0155d9294507ee78e070586fe205e8141f7a0c46d9928fdccc94601fd7a21cc508d2c13f7ff4f9871 Test2-Suite-0.000135.tar.gz" diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD index ff4bb9b8d..8c319a1cf 100644 --- a/user/perl-text-template/APKBUILD +++ b/user/perl-text-template/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-text-template _pkgreal=Text-Template diff --git a/user/perl-xml-namespacesupport/APKBUILD b/user/perl-xml-namespacesupport/APKBUILD index 4de6e775e..b65905d1e 100644 --- a/user/perl-xml-namespacesupport/APKBUILD +++ b/user/perl-xml-namespacesupport/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xml-namespacesupport _pkgreal=XML-NamespaceSupport diff --git a/user/perl-xml-simple/APKBUILD b/user/perl-xml-simple/APKBUILD index 62d543912..cc081098e 100644 --- a/user/perl-xml-simple/APKBUILD +++ b/user/perl-xml-simple/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-xml-simple _pkgreal=XML-Simple diff --git a/user/picmi/APKBUILD b/user/picmi/APKBUILD index 951b92ec4..b14e4bc82 100644 --- a/user/picmi/APKBUILD +++ b/user/picmi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=picmi -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Single-player logic/pattern game" url="https://kde.org/applications/games/org.kde.picmi" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="d64b73880fcee4ec7f98d70787e7418da9df30eb26f3f136da8773d75589a44e0508c4e5a26d33d7e59e8b56bf2502a44553d0872ce5797b01dcbb03049e7def picmi-20.04.3.tar.xz" +sha512sums="18aacb1a6089f2372077354cbe691a7d94efdedca2ef402c02106411df270ecdec8ed74015eaac8b4bc247a86992d19398dca194429385720e27a76bc2ac6c08 picmi-20.08.1.tar.xz" diff --git a/user/picocom/APKBUILD b/user/picocom/APKBUILD index 289d7d353..3e8588fb1 100644 --- a/user/picocom/APKBUILD +++ b/user/picocom/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=picocom pkgver=3.1 diff --git a/user/pimcommon/APKBUILD b/user/pimcommon/APKBUILD index abe9de1df..fd12cc9c4 100644 --- a/user/pimcommon/APKBUILD +++ b/user/pimcommon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pimcommon -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Common files for KDE PIM software" url="https://kontact.kde.org/" @@ -9,15 +9,18 @@ arch="all" license="LGPL-2.0+ AND GPL-2.0+" depends="" makedepends="qt5-qtbase-dev qt5-qttools-dev cmake extra-cmake-modules boost-dev - karchive-dev kauth-dev kbookmarks-dev kcodecs-dev kcompletion-dev - kconfig-dev kconfigwidgets-dev kcontacts-dev kcoreaddons-dev ki18n-dev - kimap-dev kio-dev kitemmodels-dev kitemviews-dev kjobwidgets-dev - kmime-dev knewstuff-dev kpimtextedit-dev kservice-dev ktextwidgets-dev - kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev libkdepim-dev - purpose-dev solid-dev sonnet-dev - akonadi-dev akonadi-contacts-dev attica-dev libxslt-dev" + karchive-dev kauth-dev kbookmarks-dev kcmutils-dev kcodecs-dev + kcompletion-dev kconfig-dev kconfigwidgets-dev kcontacts-dev + kcoreaddons-dev ki18n-dev kimap-dev kio-dev kitemmodels-dev + kitemviews-dev kjobwidgets-dev kldap-dev kmime-dev knewstuff-dev + kpimtextedit-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev + kwindowsystem-dev kxmlgui-dev libkdepim-dev purpose-dev solid-dev + akonadi-dev akonadi-contacts-dev akonadi-mime-dev akonadi-search-dev + attica-dev kcalendarcore-dev libxslt-dev sonnet-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/pimcommon-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/pimcommon-$pkgver.tar.xz + lts.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -43,4 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="63396ba86cbcd6a8e53981cac79f30ead57dbe06eb1772274a185726117b2bbcb52f8c8f0dc9a8d9534f147615d985ed0d6812e466989b6968944b775ca2dd31 pimcommon-20.04.3.tar.xz" +sha512sums="418c6d10bf789a4554c818d4a476b01e1a7bd21402ee0f4c9fbadced29b853ac9ef5d619ba7a448e4f7adde725e4b72d8c5ed5ed740dd654467e2d06f6e0e28d pimcommon-20.08.1.tar.xz +d231227e1188fdb976e223d0b3c2fe30ddb2a555b0498a4e49deeb519e44a75c5ab6afee0d68fd53c407e1b6bcebcfb8fa33378b92420952baef082ed4a55c39 lts.patch" diff --git a/user/pimcommon/lts.patch b/user/pimcommon/lts.patch new file mode 100644 index 000000000..e4696fd0e --- /dev/null +++ b/user/pimcommon/lts.patch @@ -0,0 +1,11 @@ +--- pimcommon-20.08.1/CMakeLists.txt.old 2020-09-01 06:39:57.000000000 +0000 ++++ pimcommon-20.08.1/CMakeLists.txt 2020-09-18 01:08:48.314962566 +0000 +@@ -30,7 +30,7 @@ + set(PIMCOMMON_LIB_VERSION ${PIM_VERSION}) + set(AKONADICONTACT_LIB_VERSION "5.15.1") + set(LIBKDEPIM_LIB_VERSION "5.15.1") +-set(QT_REQUIRED_VERSION "5.13.0") ++set(QT_REQUIRED_VERSION "5.12.9") + set(KMIME_LIB_VERSION "5.15.1") + set(KIMAP_LIB_VERSION "5.15.1") + set(KPIMTEXTEDIT_LIB_VERSION "5.15.1") diff --git a/user/plasma-browser-integration/APKBUILD b/user/plasma-browser-integration/APKBUILD index 833facbb8..2dc92fe5f 100644 --- a/user/plasma-browser-integration/APKBUILD +++ b/user/plasma-browser-integration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-browser-integration -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Integrate Web browsers into the KDE Plasma desktop" url="https://www.kde.org/" @@ -10,7 +10,7 @@ license="GPL-3.0+" depends="" makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev kcrash-dev kdbusaddons-dev kfilemetadata-dev ki18n-dev kio-dev knotifications-dev krunner-dev purpose-dev qt5-qtbase-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-browser-integration-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-browser-integration-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { rm -r "$pkgdir"/etc } -sha512sums="05fcc78f68a029862daaae816d2c95a14b7b3133c9ea00cfad7cac32337a6b1642b15f23313dec665686c928f0405d18cafa20b06d16afa1ae8ce752d74e9066 plasma-browser-integration-5.18.4.1.tar.xz" +sha512sums="096bfc0940fa3a40fe5145078fe801e2436779ac3333e953a68f7a68d3d592e3978606b70f1678c83a0748221e4d992ce14e0cb72c671f242d13db41390e8730 plasma-browser-integration-5.18.5.tar.xz" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index b65eaf0b5..da2d635d7 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-desktop -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" url="https://www.kde.org/plasma-desktop" @@ -28,7 +28,7 @@ makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev kirigami2-dev libksysguard-dev qt5-qtquickcontrols2-dev qqc2-desktop-style-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-desktop-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -54,4 +54,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4cac140ddca8ce57a6e27cfac2946824db40a0adf9f0a9b6fe6079f9b899f4b145941803d4a0f1c575a27a8c76d6a7e889c3218287a126efedd9e722fa9d7089 plasma-desktop-5.18.4.1.tar.xz" +sha512sums="14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029 plasma-desktop-5.18.5.tar.xz" diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index 0668873b2..cef83e72c 100644 --- a/user/plasma-framework/APKBUILD +++ b/user/plasma-framework/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-framework -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b120ff92f6adec4b08993004bda3eecb84afcb038155407850810d7c6b0bb33357730e4784525da3eb249368a97b893c1587e0411286c0455ab6b35caa116a7a plasma-framework-5.72.0.tar.xz" +sha512sums="7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46 plasma-framework-5.74.0.tar.xz" diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD index 0f599182e..1fa84aa23 100644 --- a/user/plasma-integration/APKBUILD +++ b/user/plasma-integration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-integration -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Qt platform theme plugin for Plasma" url="https://www.kde.org/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules python3 qt5-qtbase-dev libxcursor-dev kiconthemes-dev knotifications-dev kwayland-dev kwidgetsaddons-dev kwindowsystem-dev breeze-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-integration-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebc6080457d1958e2cccc7db25b30443e21759c95c29dc8f72538ec2945f99019ad0598369253ec552c4a77dc49979ef3e1a46da93362a34793c0af6209c5e3d plasma-integration-5.18.4.1.tar.xz" +sha512sums="d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48 plasma-integration-5.18.5.tar.xz" diff --git a/user/plasma-meta/APKBUILD b/user/plasma-meta/APKBUILD index 17bc50741..1c110865c 100644 --- a/user/plasma-meta/APKBUILD +++ b/user/plasma-meta/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-meta -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Metapackage for optional KDE Plasma dependencies" url="https://www.adelielinux.org/" @@ -9,7 +9,7 @@ arch="noarch" options="!check" # No tests, it's a metapackage. license="Public-Domain" depends="bluedevil breeze-grub drkonqi plasma-browser-integration plasma-pa - plasma-thunderbolt plasma-vault" + plasma-thunderbolt plasma-vault systemsettings" makedepends="" subpackages="" source="" diff --git a/user/plasma-nm/APKBUILD b/user/plasma-nm/APKBUILD index 5ddc6ca52..c4d807f2f 100644 --- a/user/plasma-nm/APKBUILD +++ b/user/plasma-nm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-nm -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="NetworkManager integration for KDE Plasma desktop" url="https://www.kde.org/" @@ -18,7 +18,7 @@ makedepends="cmake extra-cmake-modules kauth-dev kcodecs-dev kcompletion-dev subpackages="$pkgname-lang" # We don't want to pull NM into plasma-meta, so we do this as a workaround. install_if="plasma-desktop networkmanager" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-nm-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-nm-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7534267b7e9507b5963c5226eb375bfff426291761db4bfaa8a9c60e491d296d5aebb6cb2373e75dd10b321e706ccdcdce036f174cfb6c5fb12df218f112228b plasma-nm-5.18.4.1.tar.xz" +sha512sums="8f785f257f274fb9384bf2afbe4231a057c46706483e26dd2270a93a6fc97e6198916ff119d258a67d4f8bb73facb0ff67412f43e5fa66812962edb64331db4a plasma-nm-5.18.5.tar.xz" diff --git a/user/plasma-pa/APKBUILD b/user/plasma-pa/APKBUILD index 84ec701be..01e59bd5c 100644 --- a/user/plasma-pa/APKBUILD +++ b/user/plasma-pa/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-pa -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="PulseAudio integration for KDE Plasma desktop" url="https://www.kde.org/" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules glib-dev kcoreaddons-dev kdeclarative-dev libcanberra-dev plasma-framework-dev pulseaudio-dev qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-pa-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-pa-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="877a861b7f3811958f911a082f037916697f148969229ed6d96c2ef7238533726157637548798ca318b5b1ee89cd5ed8f9a66fad2e8cb3e9035a5ee311cae7e3 plasma-pa-5.18.4.1.tar.xz" +sha512sums="fff3049d4879e4f6fe428985dd14f91fa6bac8fe2e7c696ee1424d610038f61fd7eda2621bfd2c2643529956f7986b59c9eead1ceb79e1cfb1397fa52b470376 plasma-pa-5.18.5.tar.xz" diff --git a/user/plasma-thunderbolt/APKBUILD b/user/plasma-thunderbolt/APKBUILD index a537527de..70ca85f6f 100644 --- a/user/plasma-thunderbolt/APKBUILD +++ b/user/plasma-thunderbolt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-thunderbolt -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Thunderbolt device integration for KDE Plasma desktop" url="https://www.kde.org/" @@ -12,7 +12,7 @@ depends="bolt" makedepends="cmake extra-cmake-modules kcmutils-dev kcoreaddons-dev knotifications-dev qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-thunderbolt-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-thunderbolt-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ae5e65741717f38f343adf3e52de67db29d069b93147236cec6172f03ffcfb64bbbaaed5056987a747feb0c27ec01aaefa954274092f34f709c955f8099b35a plasma-thunderbolt-5.18.4.1.tar.xz" +sha512sums="4768a69abc474b9daa2c3f880ef12829ce4804a44b4502b31e083802a5ba4406ac52001fb397415958cd52d7f76aa7dc54f8945665957a8a5557ca93e345ff76 plasma-thunderbolt-5.18.5.tar.xz" diff --git a/user/plasma-vault/APKBUILD b/user/plasma-vault/APKBUILD index 1fdd39903..24c15321a 100644 --- a/user/plasma-vault/APKBUILD +++ b/user/plasma-vault/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-vault -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Secure storage plugin for KDE Plasma desktop" url="https://www.kde.org/" @@ -13,9 +13,7 @@ makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev kwidgetsaddons-dev libksysguard-dev plasma-framework-dev qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-vault-$pkgver.tar.xz - fix-crash.patch - " +source="https://download.kde.org/stable/plasma/$pkgver/plasma-vault-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="c06bb9129e25396c44a9a7155253ebb18eeefe7d44d3f288b79f3308964ae4dbca9375820c1a5c2f389b46e17f2f3a2cee35e73b5d4a0c23051dcad8dfcff6f0 plasma-vault-5.18.4.1.tar.xz -b093d6fa4e82a3342ec75dc0ef9318f38dbce413a38fef1aa08b6bb74d6b3a46c178e10d3551e88937907f9b3946565084726f158f86f97ea5436f072b2e05d7 fix-crash.patch" +sha512sums="66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8 plasma-vault-5.18.5.tar.xz" diff --git a/user/plasma-vault/fix-crash.patch b/user/plasma-vault/fix-crash.patch deleted file mode 100644 index 306b7dfe2..000000000 --- a/user/plasma-vault/fix-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f6a924b37880b7340e796846a6e5474413ca6533 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org> -Date: Tue, 17 Mar 2020 14:37:24 +0100 -Subject: Make sure we have saved network state before accessing it - -BUG:418262 ---- - kded/service.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kded/service.cpp b/kded/service.cpp -index 4b5f65a..ff67d43 100644 ---- a/kded/service.cpp -+++ b/kded/service.cpp -@@ -420,7 +420,7 @@ void PlasmaVaultService::openVaultInFileManager(const QString &device) - new KRun(QUrl::fromLocalFile((QString)vault->mountPoint().data()), nullptr); - }, - [this, vault] { -- if (vault->status() != VaultInfo::Opened) { -+ if (vault->status() != VaultInfo::Opened && d->savedNetworkingState) { - auto& devicesInhibittingNetworking = d->savedNetworkingState->devicesInhibittingNetworking; - devicesInhibittingNetworking.removeAll(vault->device().data()); - d->restoreNetworkingState(); --- -cgit v1.1 - diff --git a/user/plasma-wayland-protocols/APKBUILD b/user/plasma-wayland-protocols/APKBUILD new file mode 100644 index 000000000..7cbf24267 --- /dev/null +++ b/user/plasma-wayland-protocols/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-wayland-protocols +pkgver=1.1.1 +pkgrel=0 +pkgdesc="KDE accessories for X12" +url="https://www.kde.org/" +arch="noarch" +license="LGPL-2.1+" +depends="" +makedepends="cmake extra-cmake-modules" +subpackages="" +source="https://download.kde.org/stable/plasma-wayland-protocols/$pkgver/plasma-wayland-protocols-$pkgver.tar.xz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c plasma-wayland-protocols-1.1.1.tar.xz" diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD index c531e9954..e222316ff 100644 --- a/user/plasma-workspace-wallpapers/APKBUILD +++ b/user/plasma-workspace-wallpapers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace-wallpapers -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Default wallpapers from KDE" url="https://www.KDE.org/" @@ -10,7 +10,7 @@ license="LGPL-3.0-only" depends="" makedepends="cmake extra-cmake-modules" subpackages="" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-workspace-wallpapers-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e3fe98fd4e3265281bda7c223cb086fdc96031421d735df05fb52acca778dba0fa78110810b1c482706cb6e937bc40160130a525ab104b44ed801042ba6d71ca plasma-workspace-wallpapers-5.18.4.1.tar.xz" +sha512sums="75d5042fd955849cb67b1f7711b2e3e63d03ece7aacd4fc88bcd8c8652ca40a62351c1666b9c86275d1b495fa73d0089e8046dc1f65fc6fb23d9010ddc6f514e plasma-workspace-wallpapers-5.18.5.tar.xz" diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 9851b6de5..a6d05afb3 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" @@ -31,7 +31,7 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev plasma-framework-dev prison-dev kactivities-stats-dev kpeople-dev kirigami2-dev kuserfeedback-dev libkscreen-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-workspace-$pkgver.tar.xz +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz libkworkspace.patch " @@ -59,5 +59,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7 plasma-workspace-5.18.4.1.tar.xz +sha512sums="870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2 plasma-workspace-5.18.5.tar.xz f58b88928fd68518bc0524db35388cb0f0dbc2a55d85fc47e92ce7fcbaf9b155482736e282bd84104ceecc625406845840128c8d0fcd2a4d5a854673964cd94f libkworkspace.patch" diff --git a/user/pluma/APKBUILD b/user/pluma/APKBUILD index 0e61d02cb..ceb91b735 100644 --- a/user/pluma/APKBUILD +++ b/user/pluma/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=pluma -pkgver=1.24.0 +pkgver=1.24.1 pkgrel=0 pkgdesc="Text editor for the MATE desktop environment" url="https://mate-desktop.org" @@ -15,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/pluma-$pkgver.tar.xz" build() { + rm -r help/zh_CN ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be pluma-1.24.0.tar.xz" +sha512sums="0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3 pluma-1.24.1.tar.xz" diff --git a/user/polkit-kde-agent-1/APKBUILD b/user/polkit-kde-agent-1/APKBUILD index 3ae1768a8..19bce093a 100644 --- a/user/polkit-kde-agent-1/APKBUILD +++ b/user/polkit-kde-agent-1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit-kde-agent-1 -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="PolKit agent for KDE" url="https://www.kde.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules kcoreaddons-dev kcrash-dev kdbusaddons-dev ki18n-dev kiconthemes-dev kwidgetsaddons-dev kwindowsystem-dev polkit-qt-1-dev qt5-qtbase-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/polkit-kde-agent-1-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/polkit-kde-agent-1-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e83c762fce852fb3835e53db8f4940a8b02f06b505f4347027c23171ce6e4cad512b002a0154459c952305f922b8f881b3c0b51ca7b9553d16a78e668deadfe3 polkit-kde-agent-1-5.18.4.1.tar.xz" +sha512sums="d9441e2379b665aa28d79451e5390a22f7a06f946020fb8c498352b0202a7ecbf7ca2e8dfccc7ee390d51ad441aeb6d818610d0d2e6a753e63326e4c350aba30 polkit-kde-agent-1-5.18.5.tar.xz" diff --git a/user/polkit/APKBUILD b/user/polkit/APKBUILD index 26d66a893..c6d0cac92 100644 --- a/user/polkit/APKBUILD +++ b/user/polkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit pkgver=0.116 -pkgrel=0 +pkgrel=1 pkgdesc="Toolkit for controlling system-wide privileges" url="https://www.freedesktop.org/wiki/Software/polkit/" arch="all" @@ -10,7 +10,7 @@ options="!check suid" # Requires running ConsoleKit and PolKit for JS backend license="LGPL-2.0+" depends="" makedepends="glib-dev gobject-introspection-dev gtk-doc intltool linux-pam-dev - mozjs-dev autoconf automake libtool" + mozjs-dev autoconf automake libtool elogind-dev" pkgusers="polkitd" pkggroups="polkitd" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -19,6 +19,7 @@ source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar. 0001-make-netgroup-support-optional.patch fix-consolekit-db-stat.patch fix-test-fgetpwent.patch + polkit-0.115-elogind.patch " # secfixes: @@ -47,8 +48,7 @@ build() { --with-pam-include=base-auth \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ - --disable-libsystemd-login \ - --disable-libelogind + --enable-libelogind=yes make } @@ -64,4 +64,5 @@ package() { sha512sums="b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5 polkit-0.116.tar.gz f13a350a040a80b705d28e2ce3fac183409f593dc360879ce1bc9ec85faa7796cf0f4e054098b737fb816369de6c9d598449f6908316484aac99a44a68102ae6 0001-make-netgroup-support-optional.patch 95493ef842b46ce9e724933a5d86083589075fb452435057b8f629643cac7c7eff67a24fd188087987e98057f0130757fad546d0c090767da3d71ebaf8485a24 fix-consolekit-db-stat.patch -966825aded565432f4fda9e54113a773b514ebf7ee7faa83bcb8b97d218ae84a8707d6747bbc3cb8a828638d692fdef34c05038f150ad38e02a29f2c782aba5b fix-test-fgetpwent.patch" +966825aded565432f4fda9e54113a773b514ebf7ee7faa83bcb8b97d218ae84a8707d6747bbc3cb8a828638d692fdef34c05038f150ad38e02a29f2c782aba5b fix-test-fgetpwent.patch +06432fa56788699762c6978484640554f91728a1cb40679eb47b8514b3c7aa23aac5b9c26586eb4d7043a0af1b319bbe7f869d24844d9151317299b74a8e8f7f polkit-0.115-elogind.patch" diff --git a/user/polkit/polkit-0.115-elogind.patch b/user/polkit/polkit-0.115-elogind.patch new file mode 100644 index 000000000..93d672015 --- /dev/null +++ b/user/polkit/polkit-0.115-elogind.patch @@ -0,0 +1,28 @@ +From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen <cogitri@exherbo.org> +Date: Wed, 11 Apr 2018 13:14:14 +0200 +Subject: [PATCH] configure: fix elogind support + +HAVE_LIBSYSTEMD is used to determine which source files to use. +We have to check if either have_libsystemd or have_libelogind is +true, as both of these need the source files which are used when +HAVE_LIBSYSTEMD is true. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 36df239..da47ecb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ + + AC_SUBST(LIBSYSTEMD_CFLAGS) + AC_SUBST(LIBSYSTEMD_LIBS) +-AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd]) ++AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd]) + + dnl --------------------------------------------------------------------------- + dnl - systemd unit / service files +-- +2.17.0 diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD index be33f6c62..972cdb31f 100644 --- a/user/powerdevil/APKBUILD +++ b/user/powerdevil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=powerdevil -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE Plasma power management utilities" url="https://www.kde.org/" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev ki18n-dev kidletime-dev kio-dev knotifyconfig-dev kdelibs4support-dev kwayland-dev libkscreen-dev libkworkspace-dev solid-dev eudev-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/powerdevil-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/powerdevil-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b7985f30965cc445cd4426ca9978a721174a3b0c371d69e044cb36edee080a99b3993ad553461e9212158f13a730210a687be2bc1f205722591307cbe87f4c20 powerdevil-5.18.4.1.tar.xz" +sha512sums="b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3 powerdevil-5.18.5.tar.xz" diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 11fe97d84..0ff030e0c 100644 --- a/user/prison/APKBUILD +++ b/user/prison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=prison -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -44,4 +44,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="5f3021a23f4724de77bcbe942b023561dadcf39966d170ebb04885aced86fe6196b88bf5ed7f3cee1235d8fb5d2d1bef6c9e5b46eaa3e646ec44acd38a070f7d prison-5.72.0.tar.xz" +sha512sums="3d7ed0517a36e8cf3ff6956f61502ee02f9cf06876e842c3575e469701495b3ffaa05fb992d635573a43070ae6c7a5e7bad7c2073eb69c8d6bb6c2b5256c0b62 prison-5.74.0.tar.xz" diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index a60a1f472..98dfa248e 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=prosody -pkgver=0.11.5 +pkgver=0.11.9 pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" @@ -49,6 +49,6 @@ package() { install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" } -sha512sums="43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff prosody-0.11.5.tar.gz +sha512sums="fabbbbb1acb3de4ff01e3e8c6e9e4dc37cb161259f1649683a1f9d925ed9f1709e052bfc831cba3f1861a9cca599f2b725ee739bfcb57164d6f50ac07011b52a prosody-0.11.9.tar.gz a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch 11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347 prosody.initd" diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index 382f3cfa3..fcaba3da2 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf diff --git a/user/purpose/APKBUILD b/user/purpose/APKBUILD index a48d698cc..18698726e 100644 --- a/user/purpose/APKBUILD +++ b/user/purpose/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=purpose -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="KDE context menu framework" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64359268f82d35e0c4a79f9a3b3472ea06217b719f73f145263598fe8f4df3e0025bcec4baf28a3dd5a7f86e2bb9ed1f2f46027a12c1c55235de349e22cd1284 purpose-5.72.0.tar.xz" +sha512sums="dea52fd5d10cc0c34ecab742b691675076ddf1346e2b352cd5f74cd266576f85eb9d721bf68a29cea62f9879b826bf375b70580451c31bdd33509f57ae3cf23a purpose-5.74.0.tar.xz" diff --git a/user/pv/APKBUILD b/user/pv/APKBUILD new file mode 100644 index 000000000..b78efcd77 --- /dev/null +++ b/user/pv/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=pv +pkgver=1.6.6 +pkgrel=0 +pkgdesc="Pipe Viewer - a terminal-based tool for monitoring the progress of data through a pipeline." +url="https://www.ivarch.com/programs/pv.shtml" +arch="all" +license="Artistic-2.0" +depends="" +makedepends="" +subpackages="$pkgname-doc $pkgname-lang" +source="https://www.ivarch.com/programs/sources/pv-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26 pv-1.6.6.tar.bz2" diff --git a/user/py3-apkkit/APKBUILD b/user/py3-apkkit/APKBUILD new file mode 100644 index 000000000..a407ba767 --- /dev/null +++ b/user/py3-apkkit/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=py3-apkkit +_pkgname=${pkgname#py3-} +pkgver=0.6.0.1 +pkgrel=0 +pkgdesc="Python library for manipulating and verifying APK packages" +url="https://git.adelielinux.org/adelie/apkkit" +arch="noarch" +options="!check" # No test suite. +license="NCSA" +depends="python3" +makedepends="" +source="https://files.pythonhosted.org/packages/source/a/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" + rm "$pkgdir"/usr/README.rst +} + +sha512sums="ef33047ce765d86872e0b4eb9204ec8741e1bbf3c93257797b2c7a0720bb090a90b83380e5f3194b3788557b9693dd32392e6be8235f82ab2eaf118cba8166e2 apkkit-0.6.0.1.tar.gz" diff --git a/user/py3-bcrypt/APKBUILD b/user/py3-bcrypt/APKBUILD new file mode 100644 index 000000000..852f2275b --- /dev/null +++ b/user/py3-bcrypt/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-bcrypt +_pkgname=bcrypt +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=3.2.0 +pkgrel=0 +pkgdesc="bcrypt password hashing library for Python" +url="https://pypi.org/project/bcrypt/" +arch="all" +license="Apache-2.0" +depends="python3 py3-cffi" +checkdepends="py3-six py3-pytest" +makedepends="python3-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/bcrypt-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80 bcrypt-3.2.0.tar.gz" diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 56681055b..408ed4ab5 100644 --- a/user/py3-cffi/APKBUILD +++ b/user/py3-cffi/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-cffi _pkgname=cffi _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.14.0 +pkgver=1.14.1 pkgrel=0 pkgdesc="Interface for Python to call in to C code" url="https://cffi.readthedocs.io/" @@ -29,4 +29,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253 py3-cffi-1.14.0.tar.gz" +sha512sums="bf000904e3d1ece122f49b8c166636c67987e9bf2e34b613d8e013692ed319581f393cd9570d7f050e5c492a8bc1c4cb5bb56eb50c68f9feea973c1e56c951c0 py3-cffi-1.14.1.tar.gz" diff --git a/user/py3-cython/APKBUILD b/user/py3-cython/APKBUILD new file mode 100644 index 000000000..b5b682b46 --- /dev/null +++ b/user/py3-cython/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-cython +_pkgname=Cython +pkgver=0.29.21 +pkgrel=0 +pkgdesc="Compiler for writing C extensions for the Python language" +url="https://cython.org/" +arch="all" +options="net" # downloads numpy at least +license="Apache-2.0" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://pypi.io/packages/source/C/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 runtests.py --shard_count=${JOBS} +} + +package() { + mkdir -p "$pkgdir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="6216e63996e83b887cdcee6cd912d42e7da853640336b9190f5115d687848a902ee5a8edd6bfaef645c066b89e17dcd80ca1387688eb80a527ec23a0a4636e8f Cython-0.29.21.tar.gz" diff --git a/user/py3-decorator/APKBUILD b/user/py3-decorator/APKBUILD new file mode 100644 index 000000000..ac00bece2 --- /dev/null +++ b/user/py3-decorator/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-decorator +_pkgname=decorator +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=4.4.2 +pkgrel=0 +pkgdesc="Python decorators for humans" +url="https://pypi.org/project/decorator/" +arch="noarch" +license="BSD-2-Clause" +depends="python3" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/decorator-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1 decorator-4.4.2.tar.gz" diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD index 5c0807786..3ecdd376c 100644 --- a/user/py3-distutils-extra/APKBUILD +++ b/user/py3-distutils-extra/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-distutils-extra pkgver=2.45 pkgrel=0 diff --git a/user/py3-flup/APKBUILD b/user/py3-flup/APKBUILD new file mode 100644 index 000000000..c9b0013f7 --- /dev/null +++ b/user/py3-flup/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=py3-flup +_pkgname=${pkgname#py3-} +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Python WSGI module collection" +url="https://www.saddi.com/software/flup/" +arch="noarch" +options="!check" # No test suite. +license="BSD-2-Clause" +depends="python3" +makedepends="" +source="https://files.pythonhosted.org/packages/source/f/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="f165685b39a8539d29d48d0ad3c9c0495f428892b8935545a128730687c658a1e8b74a09c8084dd4a2490b1d26f1382b48c95ba43401171fd46876b068ba2f8e flup-1.0.3.tar.gz" diff --git a/user/py3-invoke/APKBUILD b/user/py3-invoke/APKBUILD new file mode 100644 index 000000000..df5373408 --- /dev/null +++ b/user/py3-invoke/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-invoke +_pkgname=invoke +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=1.4.1 +pkgrel=0 +pkgdesc="Pythonic task execution" +url="https://www.pyinvoke.org/" +arch="noarch" +options="!check" # Terribly broken. +license="Apache-2.0" +depends="python3" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/invoke-$pkgver" + +prepare() { + default_prepare + rm -r "$builddir"/invoke/vendor/yaml2 +} + +build() { + python3 setup.py build +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="9076a1e643e3496b180d486de48efe599eddafc3e8ac32ab5cfcb27c5aabfd4ea360c0e2e59f96aceb65f3453b5ff2c228bf7d76635fe62854fe092b1ebdf3b2 invoke-1.4.1.tar.gz" diff --git a/user/py3-monotonic/APKBUILD b/user/py3-monotonic/APKBUILD new file mode 100644 index 000000000..473c12f1e --- /dev/null +++ b/user/py3-monotonic/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-monotonic +_pkgname=monotonic +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=1.5 +pkgrel=0 +pkgdesc="Monotonic clock for Python" +url="https://pypi.org/project/monotonic/" +arch="noarch" +license="Apache-2.0" +depends="python3" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/monotonic-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970 monotonic-1.5.tar.gz" diff --git a/user/py3-ncclient/APKBUILD b/user/py3-ncclient/APKBUILD new file mode 100644 index 000000000..5131a4137 --- /dev/null +++ b/user/py3-ncclient/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-ncclient +_pkgname=ncclient +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=0.6.9 +pkgrel=0 +pkgdesc="Python library for NETCONF clients" +url="https://pypi.org/project/ncclient/" +arch="noarch" +license="Apache-2.0" +depends="python3 py3-lxml py3-paramiko" +checkdepends="py3-pytest py3-mock" +makedepends="libxml2-dev libxslt-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz + https://raw.githubusercontent.com/ncclient/ncclient/v${pkgver}/test/unit/transport/rpc-reply/get-software-information-rfc.xml + https://raw.githubusercontent.com/ncclient/ncclient/v${pkgver}/test/unit/transport/rpc-reply/get-software-information.xml + https://raw.githubusercontent.com/ncclient/ncclient/v${pkgver}/test/unit/ssh_config + " +builddir="$srcdir/ncclient-$pkgver" + +unpack() { + default_unpack + mkdir -p "$builddir"/test/unit/transport/rpc-reply + mv "$srcdir"/*.xml "$builddir"/test/unit/transport/rpc-reply/ + mv "$srcdir"/ssh_config "$builddir"/test/unit/ +} + +build() { + python3 setup.py build +} + +check() { + # Requires nose + rm "$builddir"/test/unit/test_xml_.py + + pytest +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="ea5abc0dae81c337dbb22b8a15a63b6af8a3d5fbae9b621137957cc33c4688c4930a941f568a02be10256bcead9047bbe4a3fd8b29639f6a7626bb28244358a9 ncclient-0.6.9.tar.gz +88cdb37bcc1991abdb09d71ee182754f881247ae580fdb866e16047d7ec0117daa2916405504ee92e9defb398794dc8fb8e5d2fb937498c5cfacae203b721979 get-software-information-rfc.xml +c89ef648818e0c7e815b96a923fb48f8a7f3f72ef4d3e4a1dc6d5d5a368327ff06a4a2870d81bd5076ad0f25e8849ae00faa5fbf74294c7ebada8a5a84aa9a1a get-software-information.xml +d94e0263c757647a14771fb5e12e843a4bcda1cc4f5ac0afa87d07f5abe8050c464867dc0a70f1f4c6503be844b2fb0701b449d1d89a358bc74139a543087be3 ssh_config" diff --git a/user/py3-netconf/APKBUILD b/user/py3-netconf/APKBUILD new file mode 100644 index 000000000..1108f9102 --- /dev/null +++ b/user/py3-netconf/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-netconf +_pkgname=netconf +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=2.1.0 +pkgrel=0 +pkgdesc="NETCONF library for Python" +url="https://pypi.org/project/netconf/" +arch="noarch" +license="Apache-2.0" +depends="python3 py3-lxml py3-monotonic py3-paramiko py3-sshutil" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/netconf-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="a641538a4ea55e66205a5568cc1df80ff704c8b5b53dff7f6809cfe7c532c66996892e3aeb3aaaadd224012b4ad8e2ba1b14c1d6b66fc3fd5079a1969d49a122 netconf-2.1.0.tar.gz" diff --git a/user/py3-netifaces/APKBUILD b/user/py3-netifaces/APKBUILD new file mode 100644 index 000000000..154b5e462 --- /dev/null +++ b/user/py3-netifaces/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-netifaces +_pkgname=netifaces +pkgver=0.10.9 +pkgrel=0 +pkgdesc="Portable network interface information" +url="https://pypi.org/project/netifaces/" +arch="all" +license="MIT" +depends="python3" +makedepends="python3-dev" +source="https://pypi.io/packages/source/n/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87 netifaces-0.10.9.tar.gz" diff --git a/user/py3-paramiko/APKBUILD b/user/py3-paramiko/APKBUILD new file mode 100644 index 000000000..45134063b --- /dev/null +++ b/user/py3-paramiko/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-paramiko +_pkgname=paramiko +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=2.7.1 +pkgrel=0 +pkgdesc="Python implementation of the SSHv2 protocol" +url="https://www.paramiko.org/" +arch="noarch" +license="LGPL-2.1+" +depends="python3 py3-cryptography py3-bcrypt py3-pynacl" +checkdepends="py3-mock py3-pytest py3-invoke py3-pytest-relaxed" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/paramiko-$pkgver" + +build() { + python3 setup.py build +} + +check() { + pytest -k "not TestMatch and not TestHostname and not TestComplexMatching and not TestSSHConfig" +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="80068c8f72ab8c98d84188caa074deecead9fb459b1a71cedb3cfa627736730928a2b9c6eb2b5a8b60acb9bccb0f68aefbef9d0d55554001c835b5cf897751ab paramiko-2.7.1.tar.gz" diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD index 234102cc4..45d40aaf7 100644 --- a/user/py3-pexpect/APKBUILD +++ b/user/py3-pexpect/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-pexpect _pkgname=${pkgname#*-} _p="${_pkgname#?}" diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD index 3b58a225f..082b0fd9e 100644 --- a/user/py3-psutil/APKBUILD +++ b/user/py3-psutil/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-psutil _pkgname=${pkgname#py3-} -pkgver=5.7.0 +pkgver=5.7.2 pkgrel=0 pkgdesc="Process and system utilities" url="https://pypi.org/project/psutil/" @@ -26,5 +26,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981 psutil-5.7.0.tar.gz +sha512sums="b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320 psutil-5.7.2.tar.gz 5b0eea07856afeb0eff3268dc78bd3daf3491022e8a08c422db3eaad1b5e0da71429fe9e2e4b23f3eabf9669e7e4fb5a187c96aedbfe994692bb3e5a98fe2fc2 utmpx.patch" diff --git a/user/py3-ptyprocess/APKBUILD b/user/py3-ptyprocess/APKBUILD index af121ab31..c9a5316a9 100644 --- a/user/py3-ptyprocess/APKBUILD +++ b/user/py3-ptyprocess/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-ptyprocess pkgver=0.6.0 pkgrel=0 diff --git a/user/py3-pyang/APKBUILD b/user/py3-pyang/APKBUILD new file mode 100644 index 000000000..6ac07ef7f --- /dev/null +++ b/user/py3-pyang/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-pyang +_pkgname=pyang +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=2.3.2 +pkgrel=0 +pkgdesc="YANG tooling for Python" +url="https://pypi.org/project/pyang/" +arch="noarch" +license="ISC" +depends="python3 py3-lxml" +makedepends="" +subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/pyang-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +bashcomp() { + pkgdesc="$pkgdesc (Bash completions)" + depends="py3-pyang" + install_if="$pkgname=$pkgver-r$pkgrel bash-completion" + + mkdir "$subpkgdir" + mv "$pkgdir"/usr/etc "$subpkgdir"/ +} + +sha512sums="11f4e0531bea85eab63bf20c4ee785e24c81988333abb90a9ab076704fde8617eaa12f8b3f6f162ddbb4f83ffc2d20b9941311a529b296c198cb2ecd665ad63f pyang-2.3.2.tar.gz" diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD index b316f74b7..a8012897e 100644 --- a/user/py3-pycairo/APKBUILD +++ b/user/py3-pycairo/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-pycairo pkgver=1.19.1 pkgrel=0 diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD index c72cef87c..4ecdab9d1 100644 --- a/user/py3-pygobject/APKBUILD +++ b/user/py3-pygobject/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=py3-pygobject -pkgver=3.36.1 +pkgver=3.38.0 pkgrel=0 pkgdesc="Python bindings for GObject libraries" url="https://wiki.gnome.org/Projects/PyGObject" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f pygobject-3.36.1.tar.xz" +sha512sums="d63313dea2c143cf8c08a4678f1aa8e5908d503ad29c596eeb9fa1070e1231de57cf934c33031f9c4920b85e391f3b4143b46491ffd16e04e8d48871cb05e5df pygobject-3.38.0.tar.xz" diff --git a/user/py3-pynacl/APKBUILD b/user/py3-pynacl/APKBUILD new file mode 100644 index 000000000..5374d7d58 --- /dev/null +++ b/user/py3-pynacl/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-pynacl +_pkgname=PyNaCl +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=1.4.0 +pkgrel=0 +pkgdesc="Python binding to the Networking and Cryptography library (NaCl)" +url="https://pypi.org/project/PyNaCl/" +arch="all" +license="Apache-2.0" +depends="python3 py3-cffi" +checkdepends="py3-six py3-hypothesis py3-pytest" +makedepends="python3-dev libsodium-dev" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/PyNaCl-$pkgver" + +build() { + SODIUM_INSTALL=system python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + SODIUM_INSTALL=system python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="355b974010f94d551f631a2dd5ae792da3d4d0abf8ed70b6decc78aad24a9f965636988aebd14947b137ea14cdcbb73531775f08b1b4d5a9d72b5df3dba0b022 PyNaCl-1.4.0.tar.gz" diff --git a/user/py3-pytest-relaxed/APKBUILD b/user/py3-pytest-relaxed/APKBUILD new file mode 100644 index 000000000..9f280b080 --- /dev/null +++ b/user/py3-pytest-relaxed/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-pytest-relaxed +_pkgname=pytest-relaxed +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=1.1.5 +pkgrel=0 +pkgdesc="Relaxed test discovery for pytest" +url="https://pytest-relaxed.readthedocs.io/en/latest/" +arch="noarch" +options="!check" # of course a test lib fails its own tests. +license="BSD-2-Clause" +depends="python3 py3-pytest py3-six py3-decorator" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/pytest-relaxed-$pkgver" + +build() { + python3 setup.py build +} + +check() { + PYTHONPATH=. pytest +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="c4eb981e8969ec9e85c5f390227b5ee2e1c88da6bb331ac4ce7b97b0e0fc435a388f592439281e60d41be9e2858601bee11b527f5c29e496445f7d072e14eaad pytest-relaxed-1.1.5.tar.gz" diff --git a/user/py3-roman/APKBUILD b/user/py3-roman/APKBUILD index 068e00963..899f7e622 100644 --- a/user/py3-roman/APKBUILD +++ b/user/py3-roman/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-roman _pkgname=roman -pkgver=3.2 +pkgver=3.3 pkgrel=0 pkgdesc="Python library to convert integers to Roman numerals" url="https://pypi.org/project/roman/" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="142904551745c8b7874d52c8d04f483b0c18b18ba8bc3d3a51fcf509e09b3a3f8a28d0b88bdd8282957bf3d698b1bab86de7fb4808cde9b0e5cfb910deca35ab py3-roman-3.2.tar.gz" +sha512sums="8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49 py3-roman-3.3.tar.gz" diff --git a/user/py3-sphinxcontrib-applehelp/APKBUILD b/user/py3-sphinxcontrib-applehelp/APKBUILD index eebdeb272..d22b3c48a 100644 --- a/user/py3-sphinxcontrib-applehelp/APKBUILD +++ b/user/py3-sphinxcontrib-applehelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-applehelp _pkgname=sphinxcontrib-applehelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="A Sphinx extension to output Apple help books" url="https://pypi.python.org/pypi/sphinxcontrib-applehelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603 py3-sphinxcontrib-applehelp-1.0.1.tar.gz" +sha512sums="1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da py3-sphinxcontrib-applehelp-1.0.2.tar.gz" diff --git a/user/py3-sphinxcontrib-devhelp/APKBUILD b/user/py3-sphinxcontrib-devhelp/APKBUILD index 474ec4928..aa36c4377 100644 --- a/user/py3-sphinxcontrib-devhelp/APKBUILD +++ b/user/py3-sphinxcontrib-devhelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-devhelp _pkgname=sphinxcontrib-devhelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="A sphinx extension to output Devhelp documents" url="https://pypi.python.org/pypi/sphinxcontrib-devhelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984 py3-sphinxcontrib-devhelp-1.0.1.tar.gz" +sha512sums="83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1 py3-sphinxcontrib-devhelp-1.0.2.tar.gz" diff --git a/user/py3-sphinxcontrib-htmlhelp/APKBUILD b/user/py3-sphinxcontrib-htmlhelp/APKBUILD index abfc54ec8..c7098fc01 100644 --- a/user/py3-sphinxcontrib-htmlhelp/APKBUILD +++ b/user/py3-sphinxcontrib-htmlhelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-htmlhelp _pkgname=sphinxcontrib-htmlhelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="A sphinx extension to output HtmlHelp" url="https://pypi.python.org/pypi/sphinxcontrib-htmlhelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de py3-sphinxcontrib-htmlhelp-1.0.2.tar.gz" +sha512sums="f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4 py3-sphinxcontrib-htmlhelp-1.0.3.tar.gz" diff --git a/user/py3-sphinxcontrib-qthelp/APKBUILD b/user/py3-sphinxcontrib-qthelp/APKBUILD index 3740f30ff..eb2953251 100644 --- a/user/py3-sphinxcontrib-qthelp/APKBUILD +++ b/user/py3-sphinxcontrib-qthelp/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-qthelp _pkgname=sphinxcontrib-qthelp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="A Sphinx extension to output QtHelp documents." url="https://pypi.python.org/pypi/sphinxcontrib-qthelp" @@ -30,4 +30,4 @@ package() { } -sha512sums="8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864 py3-sphinxcontrib-qthelp-1.0.2.tar.gz" +sha512sums="29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa py3-sphinxcontrib-qthelp-1.0.3.tar.gz" diff --git a/user/py3-sphinxcontrib-serializinghtml/APKBUILD b/user/py3-sphinxcontrib-serializinghtml/APKBUILD index 35b6bc979..fec38ab4e 100644 --- a/user/py3-sphinxcontrib-serializinghtml/APKBUILD +++ b/user/py3-sphinxcontrib-serializinghtml/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-sphinxcontrib-serializinghtml _pkgname=sphinxcontrib-serializinghtml _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="A Sphinx extension to output serialized HTML (json and pickle)" url="https://pypi.python.org/pypi/sphinxcontrib-serializinghtml" @@ -30,4 +30,4 @@ package() { } -sha512sums="984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55 py3-sphinxcontrib-serializinghtml-1.1.3.tar.gz" +sha512sums="d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0 py3-sphinxcontrib-serializinghtml-1.1.4.tar.gz" diff --git a/user/py3-sshutil/APKBUILD b/user/py3-sshutil/APKBUILD new file mode 100644 index 000000000..674b8b3b4 --- /dev/null +++ b/user/py3-sshutil/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-sshutil +_pkgname=sshutil +_p="${_pkgname#?}" +_p="${_pkgname%"$_p"}" +pkgver=1.5.0 +pkgrel=0 +pkgdesc="SSH utility functions for Python" +url="https://pypi.org/project/sshutil/" +arch="noarch" +license="Apache-2.0" +depends="python3 py3-paramiko" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/sshutil-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="14cc921e52e1f8f6c7b3031e57d6fc416d6e469c5b1b026ffc64078c51a8d05590579bf25515cda2e1224b7ca7d39e712738742a0cd9f05eb42639b25ecce27c sshutil-1.5.0.tar.gz" diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index 23b590532..a981d5655 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-urllib3 _pkgname=${pkgname#py3-} -pkgver=1.25.6 +pkgver=1.25.10 pkgrel=0 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more" url="https://github.com/shazow/urllib3" @@ -25,4 +25,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="02457492406fff3a61143d695df8304fc66a31f2646ca05ccacd9f2e5f86560e4c68a1f7f4702d6402b9d4d899145b15b125e56b3bc273012b0306ca4d0d7927 py3-urllib3-1.25.6.tar.gz" +sha512sums="7927e58de8ef24474179297e6ef7700bb3026a13d578e5bb01e32c6c4b6b5e70cc35980a815e3bcd976678e344250222d38fb86abe0f956e5023deb0f80bc1a1 py3-urllib3-1.25.10.tar.gz" diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD index 5f884fb45..44b3bd349 100644 --- a/user/qps/APKBUILD +++ b/user/qps/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qps pkgver=2.1.0 _lxqt_build=0.7.0 diff --git a/user/qqc2-desktop-style/APKBUILD b/user/qqc2-desktop-style/APKBUILD index 3045ff7a5..1c6034816 100644 --- a/user/qqc2-desktop-style/APKBUILD +++ b/user/qqc2-desktop-style/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qqc2-desktop-style -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="QtQuickControls 2 style that uses QWidget's QStyle for painting" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="641e7c1fb3a367eb17afb841fadf7c506ad4e7898d2cf595c2cdebffcac82672b9fd0ab9aafd7ab742b00d529b998b68e2621b6fbfcb0891dcf3701f8332ba23 qqc2-desktop-style-5.72.0.tar.xz" +sha512sums="88c91d5933bc2c0020a574be05a851aea54382b6c1dd5f459cba792e4ac784782bc88a36670c28f2df29188cf001bf2c9af98b3e9bc84dd59c110fd7bf936258 qqc2-desktop-style-5.74.0.tar.xz" diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 8e51ff124..b02a523ae 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtbase _pkgname=qtbase-everywhere-src -pkgver=5.12.6 -pkgrel=2 +pkgver=5.12.9 +pkgrel=0 pkgdesc="Cross-platform application and UI framework" url="https://www.qt.io/" arch="all" @@ -24,11 +24,11 @@ makedepends="$depends_dev subpackages="$pkgname-dev $pkgname-doc $_sub" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz big-endian-scroll-wheel.patch + forward-port-move.patch link-to-execinfo.patch qt-musl-iconv-no-bom.patch time64.patch - CVE-2020-0569.patch - CVE-2020-0570.patch + CVE-2020-17507.patch section-header.patch " @@ -42,6 +42,10 @@ source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodu # 5.12.6-r1: # - CVE-2020-0569 # - CVE-2020-0570 +# 5.12.9-r0: +# - CVE-2015-9541 +# - CVE-2020-13962 +# - CVE-2020-17507 _qt5_prefix=/usr/lib/qt5 _qt5_datadir=/usr/share/qt5 @@ -95,7 +99,7 @@ build() { -system-zlib \ -translationdir "$_qt5_datadir"/translations \ -no-reduce-relocations \ - -debug -optimize-debug -force-debug-info \ + -force-debug-info \ $ARCH_OPTS make } @@ -177,11 +181,11 @@ x11() { return 0 } -sha512sums="5fb82d903b0db95c23c55785047722dea7979e7f94ecaaf374e0c73b4787aabd768a1c79482a091b8b11f61d7bd4fb891675a6842b90cdc9caaa3b393a3187c6 qtbase-everywhere-src-5.12.6.tar.xz +sha512sums="40916f73e44dbcab2a3196063d491d5563ec3de583436dac25ecf219aea6e7eb55c46ce8b1c761980f90495b91c89bd5239bd081636054311fee6420750319b0 qtbase-everywhere-src-5.12.9.tar.xz d00dc607b71a93132f756b952871df9197cfd6d78cc3617544bfa11d7f0eea21ce5dd0d1aeb69dd2702a5694a63d3802accc76499dbf414c01eb56421698cb0c big-endian-scroll-wheel.patch +e8c542a7c203e7d449f06ac16784e13aefef55f6b8ef8619c49e4604e6e4f697baef027415d1b65f69e95770479c2ed0074dc0dfff9632317eccb30701ae1ed3 forward-port-move.patch ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b qt-musl-iconv-no-bom.patch 436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch -ddeb0a59cf0901b38669314fd2f14dffba63c6cbd06a3d864cd329081cc2b10323ec52053a6ffe7baf5ee8a1e137331acfe5d874c03596660630dd151828da56 CVE-2020-0569.patch -b5973799d6dc7c03124b7df5424e5fa84cb81ec3b997e039b84cca21852abaf4ff61780b99c47f1fd6ce64ae61f61b2458ca2929e068644f1973a6f1c53a4d64 CVE-2020-0570.patch +9ebf15139025d76ff103a1ae77973136b2f883a38dc54febfa44f08060f41ee13016668c96a29c62dcc458125516ba8bdb899b1ab5604dc976b4f72e513bb682 CVE-2020-17507.patch 47b2973561965e3ef906f03480b3877ad0018f32d31fecb4c410abe22c68ccad7d232cfe68804b70111616e15b979fb26642225b984d8fdbfc6cf6899ad63a0d section-header.patch" diff --git a/user/qt5-qtbase/CVE-2020-0569.patch b/user/qt5-qtbase/CVE-2020-0569.patch deleted file mode 100644 index fa0efdce3..000000000 --- a/user/qt5-qtbase/CVE-2020-0569.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart <ogoffart@woboq.com> -Date: Fri, 8 Nov 2019 11:30:40 +0100 -Subject: Do not load plugin from the $PWD - -I see no reason why this would make sense to look for plugins in the current -directory. And when there are plugins there, it may actually be wrong - -Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/corelib/plugin/qpluginloader.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index cadff4f32b..c2443dbdda 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName) - paths.append(fileName.left(slash)); // don't include the '/' - } else { - paths = QCoreApplication::libraryPaths(); -- paths.prepend(QStringLiteral(".")); // search in current dir first - } - - for (const QString &path : qAsConst(paths)) { --- -cgit v1.2.1 - diff --git a/user/qt5-qtbase/CVE-2020-0570.patch b/user/qt5-qtbase/CVE-2020-0570.patch deleted file mode 100644 index dcf507c0d..000000000 --- a/user/qt5-qtbase/CVE-2020-0570.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e6f1fde24f77f63fb16b2df239f82a89d2bf05dd Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Fri, 10 Jan 2020 09:26:27 -0800 -Subject: QLibrary/Unix: do not attempt to load a library relative to $PWD - -I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to -find libraries in a haswell/ subdir of the main path, but we only need -to do that transformation if the library is contains at least one -directory seprator. That is, if the user asks to load "lib/foo", then we -should try "lib/haswell/foo" (often, the path prefix will be absolute). - -When the library name the user requested has no directory separators, we -let dlopen() do the transformation for us. Testing on Linux confirms -glibc does so: - -$ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor - 1972475: find library=libXcursor.so.1 [0]; searching - 1972475: trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1 - 1972475: trying file=/usr/lib64/haswell/libXcursor.so.1 - 1972475: trying file=/usr/lib64/libXcursor.so.1 - 1972475: calling init: /usr/lib64/libXcursor.so.1 - 1972475: calling fini: /usr/lib64/libXcursor.so.1 [0] - -Fixes: QTBUG-81272 -Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/corelib/plugin/qlibrary_unix.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp -index f0de1010d7..135b82cd37 100644 ---- a/src/corelib/plugin/qlibrary_unix.cpp -+++ b/src/corelib/plugin/qlibrary_unix.cpp -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** - ** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2018 Intel Corporation -+** Copyright (C) 2020 Intel Corporation - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -218,6 +218,8 @@ bool QLibraryPrivate::load_sys() - for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) { - if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix))) - continue; -+ if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/'))) -+ continue; - if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix))) - continue; - if (loadHints & QLibrary::LoadArchiveMemberHint) { --- -cgit v1.2.1 - diff --git a/user/qt5-qtbase/CVE-2020-17507.patch b/user/qt5-qtbase/CVE-2020-17507.patch new file mode 100644 index 000000000..126b55c96 --- /dev/null +++ b/user/qt5-qtbase/CVE-2020-17507.patch @@ -0,0 +1,159 @@ +From 5b2f75388424995925a0e45654a0d509b290aaa0 Mon Sep 17 00:00:00 2001 +From: Robert Loehning <robert.loehning@qt.io> +Date: Thu, 9 Jul 2020 13:33:34 +0200 +Subject: [PATCH] Fix buffer overflow + +Fixes: oss-fuzz-23988 +Change-Id: I4efdbfc3c0a96917c0c8224642896088ade99f35 +Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> +(cherry picked from commit e80be8a43da78b9544f12fbac47e92c7f1f64366) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- + src/gui/image/qxpmhandler.cpp | 2 +- + tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm | 1 + + tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 8 ++++++++ + 3 files changed, 10 insertions(+), 1 deletion(-) + create mode 100644 tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm + +diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp +index 17272ffe69b..417dab7ce3f 100644 +--- a/src/gui/image/qxpmhandler.cpp ++++ b/src/gui/image/qxpmhandler.cpp +@@ -973,7 +973,7 @@ static bool read_xpm_body( + } else { + char b[16]; + b[cpp] = '\0'; +- for (x=0; x<w && d<end; x++) { ++ for (x=0; x<w && d+cpp<end; x++) { + memcpy(b, (char *)d, cpp); + *p++ = (uchar)colorMap[xpmHash(b)]; + d += cpp; +diff --git a/tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm b/tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm +new file mode 100644 +index 00000000000..7e6c1e4ca2e +--- /dev/null ++++ b/tests/auto/gui/image/qimagereader/images/oss-fuzz-23988.xpm +@@ -0,0 +1 @@ ++/* XPM "20 8 1 7"" ÿÿ c ÿ" " ÿÿÿÿÿÿÿ " +\ No newline at end of file +diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +index 1eee2f273ef..0135e48c7df 100644 +--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp ++++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +@@ -167,6 +167,8 @@ private slots: + void devicePixelRatio_data(); + void devicePixelRatio(); + ++ void xpmBufferOverflow(); ++ + private: + QString prefix; + QTemporaryDir m_temporaryDir; +@@ -2002,5 +2004,11 @@ void tst_QImageReader::devicePixelRatio() + QCOMPARE(img.devicePixelRatio(), dpr); + } + ++void tst_QImageReader::xpmBufferOverflow() ++{ ++ // Please note that the overflow only showed when Qt was configured with "-sanitize address". ++ QImageReader(":/images/oss-fuzz-23988.xpm").read(); ++} ++ + QTEST_MAIN(tst_QImageReader) + #include "tst_qimagereader.moc" +-- +2.16.3 + +From 35ecd0b69d58bcc8113afc5e449aef841c73e26c Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Thu, 23 Jul 2020 11:48:48 +0200 +Subject: [PATCH] Fix buffer overflow in XBM parser + +Avoid parsing over the buffer limit, or interpreting non-hex +as hex. + +This still leaves parsing of lines longer than 300 chars +unreliable + +Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb +Reviewed-by: Robert Loehning <robert.loehning@qt.io> +Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> +(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211) +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +--- + src/gui/image/qxbmhandler.cpp | 4 ++- + .../gui/image/qimagereader/tst_qimagereader.cpp | 37 ++++++++++++++++++++++ + 2 files changed, 40 insertions(+), 1 deletion(-) + +diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp +index 7ba44049b48..8c4be4f0eda 100644 +--- a/src/gui/image/qxbmhandler.cpp ++++ b/src/gui/image/qxbmhandler.cpp +@@ -158,7 +158,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage) + w = (w+7)/8; // byte width + + while (y < h) { // for all encoded bytes... +- if (p) { // p = "0x.." ++ if (p && p < (buf + readBytes - 3)) { // p = "0x.." ++ if (!isxdigit(p[2]) || !isxdigit(p[3])) ++ return false; + *b++ = hex2byte(p+2); + p += 2; + if (++x == w && ++y < h) { +diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +index 0135e48c7df..61b11a77794 100644 +--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp ++++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +@@ -168,6 +168,7 @@ private slots: + void devicePixelRatio(); + + void xpmBufferOverflow(); ++ void xbmBufferHandling(); + + private: + QString prefix; +@@ -2010,5 +2011,41 @@ void tst_QImageReader::xpmBufferOverflow() + QImageReader(":/images/oss-fuzz-23988.xpm").read(); + } + ++void tst_QImageReader::xbmBufferHandling() ++{ ++ uint8_t original_buffer[256]; ++ for (int i = 0; i < 256; ++i) ++ original_buffer[i] = i; ++ ++ QImage image(original_buffer, 256, 8, QImage::Format_MonoLSB); ++ image.setColorTable({0xff000000, 0xffffffff}); ++ ++ QByteArray buffer; ++ { ++ QBuffer buf(&buffer); ++ QImageWriter writer(&buf, "xbm"); ++ writer.write(image); ++ } ++ ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++ ++ auto i = buffer.indexOf(','); ++ buffer.insert(i + 1, " "); ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++ buffer.insert(i + 1, " "); ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++ buffer.insert(i + 1, " "); ++#if 0 // Lines longer than 300 chars not supported currently ++ QCOMPARE(QImage::fromData(buffer, "xbm"), image); ++#endif ++ ++ i = buffer.lastIndexOf("\n "); ++ buffer.truncate(i + 1); ++ buffer.append(QByteArray(297, ' ')); ++ buffer.append("0x"); ++ // Only check we get no buffer overflow ++ QImage::fromData(buffer, "xbm"); ++} ++ + QTEST_MAIN(tst_QImageReader) + #include "tst_qimagereader.moc" +-- +2.16.3 + diff --git a/user/qt5-qtbase/forward-port-move.patch b/user/qt5-qtbase/forward-port-move.patch new file mode 100644 index 000000000..cc30ea6e1 --- /dev/null +++ b/user/qt5-qtbase/forward-port-move.patch @@ -0,0 +1,20 @@ +At least Akonadi uses this from 5.13.0. We can use LTS Qt by backporting these +simple macros. + +--- qtbase-everywhere-src-5.12.9/src/corelib/global/qglobal.h.old 2020-06-03 10:51:20.000000000 +0000 ++++ qtbase-everywhere-src-5.12.9/src/corelib/global/qglobal.h 2020-09-17 16:01:53.181072159 +0000 +@@ -372,6 +372,14 @@ + Class(const Class &) Q_DECL_EQ_DELETE;\ + Class &operator=(const Class &) Q_DECL_EQ_DELETE; + ++#define Q_DISABLE_MOVE(Class) \ ++ Class(Class &&) = delete; \ ++ Class &operator=(Class &&) = delete; ++ ++#define Q_DISABLE_COPY_MOVE(Class) \ ++ Q_DISABLE_COPY(Class) \ ++ Q_DISABLE_MOVE(Class) ++ + /* + No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols + for Qt's internal unit tests. If you want slower loading times and more diff --git a/user/qt5-qtdeclarative/APKBUILD b/user/qt5-qtdeclarative/APKBUILD index 349bdfd84..27f526671 100644 --- a/user/qt5-qtdeclarative/APKBUILD +++ b/user/qt5-qtdeclarative/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtdeclarative _pkgname=${pkgname#qt5-}-everywhere-src -pkgver=5.12.6 -pkgrel=0 +pkgver=5.12.9 +pkgrel=1 pkgdesc="Qt Declarative and Qt Quick 2" url="https://www.qt.io/" arch="all" @@ -13,6 +13,7 @@ subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz add-execinfo.patch disable-jit-pmmx.patch + endian.patch python3.patch " @@ -36,7 +37,8 @@ package() { done } -sha512sums="b60537dd10bc2c91c7a40035248d898733fbf1486ae2e00f8d8de37af965dcb1ee48828f82704441370656f0821896b09acf7f06dd0a7c398a2a9497ce4f0250 qtdeclarative-everywhere-src-5.12.6.tar.xz +sha512sums="5357cdc56c0835c3c5d397839faf07ac61af4ed3067765edd32122aecd204849ce4b9a3b1eb5e631efdf832994c682851f43025796fb1bd56b32061a1c048bc8 qtdeclarative-everywhere-src-5.12.9.tar.xz 065ab2440fd0a81e76fe8873b0991929fad3d4189c8938e0205e94478a6cdce81ef710e3bad19cd5ca0b5ea0f8b3cd1b366969ddede51070496d1d02ace59220 add-execinfo.patch -d21aeba1167ebebcdfc54eca14f714efc3de7252513ea4fd096dcbcab2d509faa06d94a6b8978ee7ea15b1c9acb94bc23662debecc2f443a4a5258b90c872048 disable-jit-pmmx.patch +d21720d9d26fa323e769f5edb97f17b189e07d98ea825aad7d4d39dabd7293e49ce6a2d79a7997f4f0c825d3ac84ac148c68261d1f24629f5f4026a5cd733076 disable-jit-pmmx.patch +4830800e2440e7a69073115e0e0d3ed42bcc99bdf04d4ea662508ff44edf30346211988171972bb49676c2b6aaa4cef684e9ab97e97091b656d517bbb790a584 endian.patch bb39564f2d68e5635141f3de950ff7ec8174d2c972d066049153039268154de1cad7fcb82d191e325db0a0317ed90eb869431432e32494fa52584af1536f1990 python3.patch" diff --git a/user/qt5-qtdeclarative/disable-jit-pmmx.patch b/user/qt5-qtdeclarative/disable-jit-pmmx.patch index 971fd9f14..a13522a89 100644 --- a/user/qt5-qtdeclarative/disable-jit-pmmx.patch +++ b/user/qt5-qtdeclarative/disable-jit-pmmx.patch @@ -16,3 +16,20 @@ So we remove the JIT entirely on pmmx/x86. && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)) # define V4_ENABLE_JIT #elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4) \ +--- qtdeclarative-everywhere-src-5.12.6/src/qml/qml/v8/qv8engine.cpp.old 2019-11-07 11:01:48.000000000 +0000 ++++ qtdeclarative-everywhere-src-5.12.6/src/qml/qml/v8/qv8engine.cpp 2020-08-09 17:28:54.028331206 +0000 +@@ -138,14 +138,6 @@ + , m_xmlHttpRequestData(nullptr) + #endif + { +-#ifndef Q_OS_WASM // wasm does not have working simd QTBUG-63924 +-#ifdef Q_PROCESSOR_X86_32 +- if (!qCpuHasFeature(SSE2)) { +- qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); +- } +-#endif +-#endif +- + QML_MEMORY_SCOPE_STRING("QV8Engine::QV8Engine"); + qMetaTypeId<QJSValue>(); + qMetaTypeId<QList<int> >(); diff --git a/user/qt5-qtdeclarative/endian.patch b/user/qt5-qtdeclarative/endian.patch new file mode 100644 index 000000000..313e9ca5c --- /dev/null +++ b/user/qt5-qtdeclarative/endian.patch @@ -0,0 +1,31 @@ +From 15b3a8fc8635e04fa7ea1275b910772d8f2820a2 Mon Sep 17 00:00:00 2001 +From: q66 <daniel@octaforge.org> +Date: Sun, 10 May 2020 02:44:47 +0200 +Subject: [PATCH] always default to qtquick software backend on big endian + +the default backend is buggy and breaks rendering of various +components of KDE Plasma and LXQt, so just default to software +so the user doesn't have to specify QT_QUICK_BACKEND +--- + qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp +index 66add51..a0fdaa2 100644 +--- qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp ++++ qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp +@@ -139,7 +139,10 @@ QSGAdaptationBackendData *contextFactory() + // If this platform does not support OpenGL, and no backend has been set + // default to the software renderer + if (requestedBackend.isEmpty() +- && !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) { ++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN ++ && !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL) ++#endif ++ ) { + requestedBackend = QString::fromLocal8Bit("software"); + } + +-- +2.25.1 + diff --git a/user/qt5-qtgraphicaleffects/APKBUILD b/user/qt5-qtgraphicaleffects/APKBUILD index 57e85b5b0..6dbafa5c0 100644 --- a/user/qt5-qtgraphicaleffects/APKBUILD +++ b/user/qt5-qtgraphicaleffects/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtgraphicaleffects _pkgname=qtgraphicaleffects-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Pre-made visual effects for QML" url="https://www.qt.io/" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="54bd457e47aaff799eb92d91b7aab5692420556493ee39ff34dca496f8ab24dab84c8a638a71b74c201454db4e306b12dad4c8b300ce6c254cdc0c2d7b3a9c8a qtgraphicaleffects-everywhere-src-5.12.6.tar.xz" +sha512sums="ab20fd691dc4f3ffd2f7b167aa4189b8ee1f65167ce433ecb5e44b9d0db254c7626ae6e6bcc361ca45fb141ffa2bb575942bcdc531a2f7a433aacc30a41c068c qtgraphicaleffects-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtimageformats/APKBUILD b/user/qt5-qtimageformats/APKBUILD index 92ab99eb8..49c3feb3d 100644 --- a/user/qt5-qtimageformats/APKBUILD +++ b/user/qt5-qtimageformats/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtimageformats _pkgname=qtimageformats-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Image handling plugin for Qt" url="https://www.qt.io/" @@ -27,4 +27,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="0f8c481f647d6047b66564247b604a741f16c2758e96245abd0ef190ba50c937b6c713c7a466b911dd8e074174a7b30e6ad1ed0cd7ed915c4cda9dc4dccd8ab9 qtimageformats-everywhere-src-5.12.6.tar.xz" +sha512sums="5f4e694aa0ebe3cdebdae6807c062c0de749ea77e78339922d5cac62ac69066df38b2977e1a3cddfae48dc9486bb89384297efda1833c8886bf4d0462f59f00a qtimageformats-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtmultimedia/APKBUILD b/user/qt5-qtmultimedia/APKBUILD index 204a01047..262152418 100644 --- a/user/qt5-qtmultimedia/APKBUILD +++ b/user/qt5-qtmultimedia/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtmultimedia _pkgname=qtmultimedia-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Audio, video, radio, and camera libraries for Qt 5" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="e72768c9b392dcaaefafb63b26cdf1a44b554c545c3f42bd12b0817c251cd495291e06bda97fa303c522c2f34e0483db428684f4053db52753929c57fa257470 qtmultimedia-everywhere-src-5.12.6.tar.xz" +sha512sums="add2115e3bc69027778d4cc995c692f9c4b401a7852a2080151da36c149aee99e3032cc9823471e3e2296f16dcc7942c9348bb5a8c81b56445a7958266decabb qtmultimedia-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtnetworkauth/APKBUILD b/user/qt5-qtnetworkauth/APKBUILD index 59ace6b90..eab69c25c 100644 --- a/user/qt5-qtnetworkauth/APKBUILD +++ b/user/qt5-qtnetworkauth/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtnetworkauth _pkgname=qtnetworkauth-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Network authentication module for Qt" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="d66aac84310e8afa734613f8baf3bba830ed3562336f00f143cbb13dc831f58108da95a1a5c09ec5d26efb653c98ffedc83b62a2f0ec01ff14f6fc51b7c8f6ed qtnetworkauth-everywhere-src-5.12.6.tar.xz" +sha512sums="bce116d399ad19d76dbf2d0e110fb110f8dce29c9d0d3d83f74e22287fc2ebe76351e587d8e20b96add8f0fb5140e4d52d8494b6642a89c765227d4a5ce6c59a qtnetworkauth-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD index 47b957554..e5f595783 100644 --- a/user/qt5-qtpositioning/APKBUILD +++ b/user/qt5-qtpositioning/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtpositioning _pkgname=qtlocation-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Geolocation services for Qt 5" url="https://www.qt.io/" @@ -31,5 +31,5 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="89fa4ea878331423dba90dd3bad7340991b7b24b66b2b1947f53d3a7fe0bdc6465a5cd085d25c6fa0018be5d0931ddb5da021c0c3eb6b5f5eddd5499641b4b4b qtlocation-everywhere-src-5.12.6.tar.xz +sha512sums="060a35b27c0ea6f67f49bab18f967ac4df59a72a07b56709d367b5abd889729772c021728d31087954b9331b2f59693b9629194bd0de41cc2e7843c6bc31a10b qtlocation-everywhere-src-5.12.9.tar.xz 8590335ae90ade1c685ff99fb4319d1b7448d2ae15ba999e3dc9a29e62eda3db587d8ee366dc68fad6eb9e0872532d50f0bdc74f4689a554ca095ad24967418c no-getting-thread-names.patch" diff --git a/user/qt5-qtquickcontrols/APKBUILD b/user/qt5-qtquickcontrols/APKBUILD index 9468c6bf8..8825bc993 100644 --- a/user/qt5-qtquickcontrols/APKBUILD +++ b/user/qt5-qtquickcontrols/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols _pkgname=qtquickcontrols-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Controls for use with Qt Quick" url="https://www.qt.io/" @@ -25,4 +25,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="901bcf7c800406f2749ebc251a7b0419fdbab4599881475aae7f74ce4eac5347837f5e667f78774ad914a1c3fbf42e144606c9592bff3f34e899870709fb4c87 qtquickcontrols-everywhere-src-5.12.6.tar.xz" +sha512sums="8fd51fc3597b01fa792c0d75663b62c0dab6572ee6e5b112c0be8b1052fd444da87a2d8de51f36db3ac285b37cf63d37ec6f1d003ffcc62a8edad234e555613b qtquickcontrols-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtquickcontrols2/APKBUILD b/user/qt5-qtquickcontrols2/APKBUILD index 4a0593d05..90bffad28 100644 --- a/user/qt5-qtquickcontrols2/APKBUILD +++ b/user/qt5-qtquickcontrols2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtquickcontrols2 _pkgname=qtquickcontrols2-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt Quick Controls 2.0" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="89cd9dc3589367d6c5687426e347d8b51cc3f74777ff2538236d8cee8fbf255d7cbf0d7f0eef584e29750d3d7cb1a34325782112bd0d1a2a70973e3c5feefd25 qtquickcontrols2-everywhere-src-5.12.6.tar.xz" +sha512sums="1a56a7f11d4a0cb119633dd0eba332604799dbc4055e96f8f72f6acf1fe866319d6cb329780d39c31870b2546c4cf56c7161d1ee7e08ad88c2f5c3a96462a080 qtquickcontrols2-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtscript/APKBUILD b/user/qt5-qtscript/APKBUILD index 1b22dbc9c..e2b6cc3bc 100644 --- a/user/qt5-qtscript/APKBUILD +++ b/user/qt5-qtscript/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtscript _pkgname=qtscript-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Deprecated scripting framework for Qt applications" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="31fdcd008c68ab1b17d0a648441e97bba2186a93c8f0e13381e655125a1b1c282682f9db24428c4bb84b28ab5da0dfd7cbea63d326855580a206d81387a2fcc8 qtscript-everywhere-src-5.12.6.tar.xz" +sha512sums="65f6e70bf9cfae5441d53a7c547e32cfa0ef459edfab92a159e8fb04d07d07639fa0b706c7cb9ac73b6aef07eb3f40164e2dbe869cb3ce36df686ba1b519205d qtscript-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtsensors/APKBUILD b/user/qt5-qtsensors/APKBUILD index 1a4abe625..1f8952f4b 100644 --- a/user/qt5-qtsensors/APKBUILD +++ b/user/qt5-qtsensors/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsensors _pkgname=qtsensors-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Library for interfacing with sensors using Qt" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="82921de2fac2e0dcccd7b8ce2a0f5ce83d0e6d9a92a5294a59bc3d5a498de0fd644e284ba69f1ddf61c6f467627ef37bedfa0b8b6890b509cb7755109f444a49 qtsensors-everywhere-src-5.12.6.tar.xz" +sha512sums="344e8e5cf54c59c15065491c06782a5c9322eca49f6238bb4ee19f67c9e6d731273de9c5d03c1b0c6e0b45ee60aa1d9ec3fd20d4c659a19bac7d902809164a99 qtsensors-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtserialport/APKBUILD b/user/qt5-qtserialport/APKBUILD index c90c7eee9..22baa41e0 100644 --- a/user/qt5-qtserialport/APKBUILD +++ b/user/qt5-qtserialport/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtserialport _pkgname=qtserialport-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Connect Qt applications to serial ports" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="5994ddfafbe21438b5c79667ff32ff19bc9c4a09c798801698584baf5709968ad3e33aec5fac3064769270d94331ae99d223349220610f577ee8b00fcf950403 qtserialport-everywhere-src-5.12.6.tar.xz" +sha512sums="9deeff64110b27e4ea304d58a5fd8caaa94359b63be23687b5bf691098559e9b5b409a24a7e046ccbab7a1680c5a222c292f3b84388f00df803bac7fe7966679 qtserialport-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtspeech/APKBUILD b/user/qt5-qtspeech/APKBUILD index e6b368602..4b7588b8d 100644 --- a/user/qt5-qtspeech/APKBUILD +++ b/user/qt5-qtspeech/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtspeech _pkgname=qtspeech-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc=" Library for speech processing and Text-to-Speech (TTS) in Qt" url="https://www.qt.io/" @@ -26,5 +26,5 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="f2355de53e10d6ec9dcbc6371bfde73c2a69e5b3dbf1d97c840c665c9f38efd62d70aa2912f0000813efb072d15291037e4f8eb2edbeaa7549b0e2c348bd918a qtspeech-everywhere-src-5.12.6.tar.xz +sha512sums="14fcdb9ba798c846c53066c6913d174838dbeaf790600392c242d0b44a77038fd73d30b422087ad21d94555470e9043b5972e0614878bc1ee890df1198dcb10f qtspeech-everywhere-src-5.12.9.tar.xz 7bce4bd52aa0b60fbd0ec781fc18ac518a8fe76c99e61be03170f00d27747e989b1562a45435be78d0d166ab0fdf523055620ba7c63f49e328704e1cd6aa4718 fix-linking-order.patch" diff --git a/user/qt5-qtsvg/APKBUILD b/user/qt5-qtsvg/APKBUILD index ec6aaa074..4c95a8d2e 100644 --- a/user/qt5-qtsvg/APKBUILD +++ b/user/qt5-qtsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtsvg _pkgname=qtsvg-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt SVG rendering library" url="https://www.qt.io/" @@ -25,4 +25,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="a0200f38566ba526a9366c0b240d4e3e0ba0662209fa1225145d3c2f2f371c77ba804239f96a6d351f117413240adce17c53f16205285d6aed6978bc5435a942 qtsvg-everywhere-src-5.12.6.tar.xz" +sha512sums="30e32772d9be1f7cec7cef905686dd861bb974dc74230575f9b2cd4aa2b28da5af3083b67872573f54976c5560486c5469b3fa1acb5ef86fe439367453c368f0 qtsvg-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qttools/APKBUILD b/user/qt5-qttools/APKBUILD index 876fecd91..ec35142d5 100644 --- a/user/qt5-qttools/APKBUILD +++ b/user/qt5-qttools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qttools _pkgname=qttools-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Tools for Qt development" url="https://www.qt.io/" @@ -96,22 +96,27 @@ dev() { _assistant() { pkgdesc="Documentation browser for Qt 5" - # workaround for weird shell bug??? + _mv_files usr/bin/assist* \ $_qt5_prefix/bin/assist* \ - usr/share/applications/*assistant* \ - usr/share/icons/hicolor/{32x32,128x128}/apps/assistant* + usr/share/applications/*assistant* + for icon_size in 32x32 128x128; do + _mv_files usr/share/icons/hicolor/${icon_size}/apps/assistant* + done } _dbusviewer() { pkgdesc="Qt 5 D-Bus debugger and viewer" + _mv_files usr/bin/qdbusviewer* \ $_qt5_prefix/bin/qdbusviewer* \ - usr/share/applications/qdbusviewer* \ - usr/share/icons/hicolor/{32x32,128x128}/apps/qdbusviewer* + usr/share/applications/qdbusviewer* + for icon_size in 32x32 128x128; do + _mv_files usr/share/icons/hicolor/${icon_size}/apps/qdbusviewer* + done } -sha512sums="fd35a9dad9f797657121ce9daf916483f81fcc9dc2cd8ee30333d3614a17376579278f993ed2b96c578c64c7cdad0003151ed350c129263d377e0f1b0a34f787 qttools-everywhere-src-5.12.6.tar.xz +sha512sums="16ade87f053405a16d124a3a11ba04df028167729c0d731905630e78adbad472df586019e1e71af2fd06588d9495e5b6cb71eee7212870f9873c8d8e727626ce qttools-everywhere-src-5.12.9.tar.xz d566c5284854855541df7177b23f491d96f5064b571e899a44f1d4fcf8bbf1223590b05b1954278dc6f3f56341c917f5b846594c5bd2215b6a859224038d8ad2 assistant-qt5.desktop 72d9a2235a60c4ae05ba8395d473fe0b42c12e584da619dadb112eb67ba33a85fe0dab6c185d98112d7b25d3eeacaf02f7ef4731742e50c17eacc54c383661b3 designer-qt5.desktop b6d8a672d19eed39ab868ff6fc880f255da94acb9e1e84f5905c0f3b9b6055547e8a706492973692c06dc23d35ce77622fc13efc11adf21b62c3baf4ef5ab2ad linguist-qt5.desktop diff --git a/user/qt5-qtvirtualkeyboard/APKBUILD b/user/qt5-qtvirtualkeyboard/APKBUILD index 98c1a2abc..60dc9d2f6 100644 --- a/user/qt5-qtvirtualkeyboard/APKBUILD +++ b/user/qt5-qtvirtualkeyboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtvirtualkeyboard _pkgname=qtvirtualkeyboard-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="On-screen keyboard module for Qt 5" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="9ddac64a6a688333ac7250ce3be38e0909cab4c25ebc1574da30f472df557d9898674cc8b7ad408877b01e7635897c72e45f6b88002134e0e48cff378c066208 qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz" +sha512sums="3467ce16e4d1351e27f3b519a25d01939cbfb211a3e63deff1a2b0ea7497dd25cb41ee679672ebef7bba647f457fd46083036e9705637e7d8f36e09f92ec5e8a qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD index daea318a5..482cc18df 100644 --- a/user/qt5-qtwayland/APKBUILD +++ b/user/qt5-qtwayland/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwayland _pkgname=qtwayland-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Unstable Qt platform module for experimental Wayland display system" url="https://www.qt.io/" @@ -12,6 +12,7 @@ license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-ex depends="" makedepends="libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev" subpackages="$pkgname-dev $pkgname-client $pkgname-compositor $pkgname-tools" +install_if="qt5-qtbase~$pkgver wayland" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz" builddir="$srcdir"/$_pkgname-$pkgver @@ -42,4 +43,4 @@ tools() { mv "$pkgdir"/usr/lib/qt5/bin "$subpkgdir"/usr/lib/qt5/ } -sha512sums="6d066d2f65f2727b9a1c7e71b973c81f8a8d2e6210c4c998403fcbb9e4cca2543fa11160b573c0646967a3351d33504c9f44ed98b1bb282735bf17e82808a4f4 qtwayland-everywhere-src-5.12.6.tar.xz" +sha512sums="9a1b37736cc87da09123ce3b21709ea34d1171c35c27636b90c5c18e95bfa8a1ac2807c6b54e7672d967cd81cff90461f56de86aad8d5fa647434016f5fb7e12 qtwayland-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD index b1e793132..1ed8fd199 100644 --- a/user/qt5-qtwebchannel/APKBUILD +++ b/user/qt5-qtwebchannel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebchannel _pkgname=qtwebchannel-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Connect Qt applications to WebSockets" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="3f0a1732cd81506c2e5aa467e0233a909e6241943ed973ce12f6c8f1d1a8bf61b2a9bae7f5ea0655c071e6832f5a767554124ac27950597b146c36273e9e189e qtwebchannel-everywhere-src-5.12.6.tar.xz" +sha512sums="d906875bb1a164d7abfeb079b0efcdd321cf345b87e5dd1fbc3a2bc58bbfea43779cf844addb24036cf8bd2c24256aed835418038ad460e46f5b6be5b6d5e0e2 qtwebchannel-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD index 45f739573..d2962d50a 100644 --- a/user/qt5-qtwebkit/APKBUILD +++ b/user/qt5-qtwebkit/APKBUILD @@ -57,6 +57,7 @@ build() { -DENABLE_JIT=OFF \ -DENABLE_PRINT_SUPPORT=ON \ -DENABLE_QT_WEBCHANNEL=ON \ + -DENABLE_SAMPLING_PROFILER=OFF \ -DPORT=Qt \ -DUSE_SYSTEM_MALLOC=ON \ -DUSE_WOFF2=OFF \ diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD index d324d58e5..1b87062af 100644 --- a/user/qt5-qtwebsockets/APKBUILD +++ b/user/qt5-qtwebsockets/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebsockets _pkgname=qtwebsockets-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt implementation of WebSockets" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="1d7de6e642869eb0863bea219183ed66c94e172d67d7c6d5d607b43368ef1f4f47f994aad5a56df35294f6dcd541474e7fec04691da17cee16df59d799b64e40 qtwebsockets-everywhere-src-5.12.6.tar.xz" +sha512sums="4ee2f150ac89845231c8dce22eef72d1b1dbfe7bd48d8f7b6cf49d7f06d07319811502cfd86a338d4ad3747b4a377225a04593981d46412921906a343b8a2d8b qtwebsockets-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtx11extras/APKBUILD b/user/qt5-qtx11extras/APKBUILD index 259faa328..b7989d0db 100644 --- a/user/qt5-qtx11extras/APKBUILD +++ b/user/qt5-qtx11extras/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtx11extras _pkgname=qtx11extras-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt 5 libraries for X11 support" url="https://www.qt.io/" @@ -24,4 +24,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="b0ad7bf9d9fa9a30abc7bab16cb71a904e7c93d280fcb3306623b0edc56aef72d0ec9fe904571df381c76c6dd15eb8e043ce27957a370432fcf6e09c2f4e1ee5 qtx11extras-everywhere-src-5.12.6.tar.xz" +sha512sums="54f8c63b87cf91da8feb23ee4d5913dd678f5fa6a4232e776e2b9016c047960860997be9a63f04b5c9c4c753aca860b964d5e43c2b1d86c7695844ee98b19c1a qtx11extras-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5-qtxmlpatterns/APKBUILD b/user/qt5-qtxmlpatterns/APKBUILD index 90b79fc96..f7ab1aa30 100644 --- a/user/qt5-qtxmlpatterns/APKBUILD +++ b/user/qt5-qtxmlpatterns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtxmlpatterns _pkgname=qtxmlpatterns-everywhere-src -pkgver=5.12.6 +pkgver=5.12.9 pkgrel=0 pkgdesc="Qt support library for XPath, XQuery, XSLT, and XML schema validation" url="https://www.qt.io/" @@ -26,4 +26,4 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="ae59abcb01ddeeb521f0966df818c933e997a5a98b95d6254d3ea964eddcdb437ad497aa59b1b9cb70246026afd4973234bb3690d4f1cfbbc7e538cde968e5c0 qtxmlpatterns-everywhere-src-5.12.6.tar.xz" +sha512sums="8151f3aa91dd7d0d9ab1fe82696f065b3e7ae837dfcf4c021cd2975e63ccbdf9d6ca80af1b099e2b369c394db9bebfc395f2b2d77060277b04e227e15c2e2c9a qtxmlpatterns-everywhere-src-5.12.9.tar.xz" diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index 1aa673cea..184dd4344 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qt5ct -pkgver=1.0 +pkgver=1.1 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -21,4 +21,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2 qt5ct-1.0.tar.bz2" +sha512sums="0df00c0680aefb0eada1ddb70886fd63641c403ab42843f8d209413a56895dce0a88eb88a98d09d23a30df3b15ca1d595237592958769a1be86719f2a16cbdf7 qt5ct-1.1.tar.bz2" diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD index d9704ad7d..ef933d796 100644 --- a/user/qterminal/APKBUILD +++ b/user/qterminal/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qterminal pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD index 3af12cbca..27edbe5be 100644 --- a/user/qtermwidget/APKBUILD +++ b/user/qtermwidget/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qtermwidget pkgver=0.15.0 _lxqt_build=0.7.0 diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD index 369526668..659862db8 100644 --- a/user/qtkeychain/APKBUILD +++ b/user/qtkeychain/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=qtkeychain -pkgver=0.10.0 +pkgver=0.11.1 pkgrel=0 pkgdesc="Platform-independent Qt-based API for storing passwords securely" url="https://github.com/frankosterfeld/qtkeychain" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6 qtkeychain-0.10.0.tar.gz" +sha512sums="45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6 qtkeychain-0.11.1.tar.gz" diff --git a/user/re2c/APKBUILD b/user/re2c/APKBUILD index aad7b839e..3293c610d 100644 --- a/user/re2c/APKBUILD +++ b/user/re2c/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jeff Bilyk <jbilyk at gmail> # Maintainer: pkgname=re2c -pkgver=1.3 -pkgrel=1 +pkgver=2.0.3 +pkgrel=0 pkgdesc="Fast lexer generator for C and C++" url="http://re2c.org/" arch="all" @@ -12,13 +12,13 @@ checkdepends="bash" makedepends="" subpackages="$pkgname-doc" source="https://github.com/skvadrik/re2c/releases/download/$pkgver/$pkgname-$pkgver.tar.xz - CVE-2020-11958.patch " # secfixes: # 1.3-r1: # - CVE-2020-11958 + build() { ./configure \ --build=$CBUILD \ @@ -38,5 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e re2c-1.3.tar.xz -f4376b8e0724d500f665fa60dfd6fb35685a281af50c500d2ff90d781a829fb78f21e8c93c5745a4519acd55a62ec48a570dbfacf0a9ee977502e06f3e2e474a CVE-2020-11958.patch" +sha512sums="893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c re2c-2.0.3.tar.xz" diff --git a/user/re2c/CVE-2020-11958.patch b/user/re2c/CVE-2020-11958.patch deleted file mode 100644 index b982b87e6..000000000 --- a/user/re2c/CVE-2020-11958.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001 -From: Ulya Trofimovich <skvadrik@gmail.com> -Date: Fri, 17 Apr 2020 22:47:14 +0100 -Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo). - -The crash happened in a rare case of a very long lexeme that doen't fit -into the buffer, forcing buffer reallocation. - -The crash was caused by an incorrect calculation of the shift offset -(it was smaller than necessary). As a consequence, the data from buffer -start and up to the beginning of the current lexeme was not discarded -(as it should have been), resulting in less free space for new data than -expected. ---- - src/parse/scanner.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/parse/scanner.cc b/src/parse/scanner.cc -index 1d6e9efa..bd651314 100644 ---- a/src/parse/scanner.cc -+++ b/src/parse/scanner.cc -@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need) - if (!buf) fatal("out of memory"); - - memmove(buf, tok, copy); -- shift_ptrs_and_fpos(buf - bot); -+ shift_ptrs_and_fpos(buf - tok); - delete [] bot; - bot = buf; - - free = BSIZE - copy; - } - -+ DASSERT(lim + free <= bot + BSIZE); - if (!read(free)) { - eof = lim; - memset(lim, 0, YYMAXFILL); diff --git a/user/recode/APKBUILD b/user/recode/APKBUILD index 274706d9a..a1bf83b93 100644 --- a/user/recode/APKBUILD +++ b/user/recode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=recode -pkgver=3.7.6 +pkgver=3.7.7 pkgrel=0 pkgdesc="Character set conversion utilities" url=" " @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f recode-3.7.6.tar.gz" +sha512sums="2d07f86992ddc449d6895510cfc4b0abfc6f5052804a13eab91fa1b103352c2a801e0cc5113cfe519db53c0e328b7f2b9bc666fdbfd8e9ac6748aced7809179a recode-3.7.7.tar.gz" diff --git a/user/redshift/APKBUILD b/user/redshift/APKBUILD index 59bd659fd..8212ad1e9 100644 --- a/user/redshift/APKBUILD +++ b/user/redshift/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=redshift pkgver=1.12 diff --git a/user/rinutils/APKBUILD b/user/rinutils/APKBUILD index c09b392a6..5f0ab0047 100644 --- a/user/rinutils/APKBUILD +++ b/user/rinutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rinutils -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=0 pkgdesc="C11 utilities library" url=" " @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="96c0fc1e8164df8703910a8e14215e1a3fa52d5cc2fdf90af2f21dd064236e2b2b5f44485689553cd0df7cb99aa01f71241983166683934175d907e9f583edb5 rinutils-0.4.0.tar.xz" +sha512sums="e175e5ce6e32e85d4102ba788c5dec40bd09ecd4002e6de10e726843b7ac562a63b305898061cab623eb85d46983ae777ac6b57c46194a29d78f0fe498fa63e7 rinutils-0.4.1.tar.xz" diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD index 2beebf167..f324f365b 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ristretto pkgver=0.10.0 pkgrel=0 diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index f1c70ae01..1d33248c0 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rocs -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b561e8864a700c832d36ce8fb645d29c09c4c9dcf34a01649ad6448b9d00a25945134821753ebeef56a607c3c66424a59d8a2372ae5561185fd37691709bfd5d rocs-20.04.3.tar.xz" +sha512sums="f9bc679812caff5f1e1b299ab527cca6cab7f22ea57669bb17f58fe1c6ecb6275c7bb3444af82628ec5aae2ab43a426f51d3b5ca470e6440bd9b270755563e67 rocs-20.08.1.tar.xz" diff --git a/user/rofi/APKBUILD b/user/rofi/APKBUILD index c7b8c388d..a43d5c7c6 100644 --- a/user/rofi/APKBUILD +++ b/user/rofi/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=rofi -pkgver=1.5.4 +pkgver=1.6.1 pkgrel=0 pkgdesc="Powerful application switcher and launcher" url="https://github.com/davatorium/rofi" @@ -9,9 +9,9 @@ arch="all" license="MIT AND Expat AND GPL-3.0+" depends="" checkdepends="check-dev" -makedepends="flex bison pango-dev cairo-dev librsvg-dev libxcb-dev - libxinerama-dev libxrandr-dev xcb-util-wm-dev xcb-util-xrm-dev - startup-notification-dev libxkbcommon-dev" +makedepends="flex bison pango-dev cairo-dev libjpeg-turbo-dev librsvg-dev + libxcb-dev libxinerama-dev libxrandr-dev xcb-util-wm-dev + xcb-util-xrm-dev startup-notification-dev libxkbcommon-dev" provides="dmenu" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/davatorium/rofi/releases/download/$pkgver/rofi-$pkgver.tar.xz" @@ -37,4 +37,4 @@ package() { ln -s rofi dmenu } -sha512sums="03def57fcf919e6c4d8d07345ff37f103fb32aef0b718a6a021ae31cca23bfc962a847a0deb2ffca245d2b8ebac0b60264f00a7b1aa64bf7d313b82e417710ef rofi-1.5.4.tar.xz" +sha512sums="c9794a7e4921e58ecc5fc7096218203f548efe2a49ffa6971accc12e9172248bda856ad06f8c11ada9abb62b9a43c7fffce1c1be9a3fe1365c94561b170a8b73 rofi-1.6.1.tar.xz" diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD index a535b8c7a..383e98045 100644 --- a/user/rpcbind/APKBUILD +++ b/user/rpcbind/APKBUILD @@ -22,7 +22,7 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --bindir=/sbin \ + --sbindir=/sbin \ --enable-warmstarts \ --with-statedir=/var/lib/rpcbind \ --with-rpcuser=rpc \ diff --git a/user/rpm/APKBUILD b/user/rpm/APKBUILD new file mode 100644 index 000000000..f6b4d7a69 --- /dev/null +++ b/user/rpm/APKBUILD @@ -0,0 +1,57 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=rpm +pkgver=4.16.0 +pkgrel=0 +pkgdesc="Redhat Package Manager" +url="https://www.rpm.org" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+" +depends="" +makedepends="acl-dev autoconf automake binutils-dev bzip2-dev file-dev + graphviz libarchive-dev libcap-dev libgcrypt-dev + libtool popt-dev sqlite-dev xz-dev zlib-dev zstd-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="http://ftp.rpm.org/releases/$pkgname-${pkgver%.*}.x/$pkgname-$pkgver.tar.bz2 + musl.patch + include-fcntl.patch" + +prepare() { + # Use sqlite db + sed -ie "/_db_backend/ s/ bdb/ sqlite/g" macros.in + default_prepare + autoreconf -fi +} + +# Py dependencies isn't currently in repo, so disable for now +build() { + LIBS="$LIBS -lintl" \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --with-cap \ + --with-acl \ + --without-lua \ + --disable-python \ + --enable-zstd \ + --enable-sqlite=yes \ + --enable-bdb_ro=yes \ + --enable-bdb=no \ + --with-crypto=libgcrypt + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d rpm-4.16.0.tar.bz2 +212a4265abc8d002e16bed106b8b773cf65564f95e6074bc1378c4745420202a476373b49b660bdfe82cc2470c35fff4f184168a698abfa2a4bf30c8f91e64ad musl.patch +6424005c78aaebcd3565debbdc1ca14fb16ef8f4aa79748eca3403115a31c77afbb8929add1a8450afbd0496e303c915c6ad6d60cde41a89caf553a10256ace5 include-fcntl.patch" diff --git a/user/rpm/include-fcntl.patch b/user/rpm/include-fcntl.patch new file mode 100644 index 000000000..611b92935 --- /dev/null +++ b/user/rpm/include-fcntl.patch @@ -0,0 +1,15 @@ +Upstream: Yes, https://github.com/rpm-software-management/rpm/pull/1379 +Reason: Fixes compilation with musl + +diff --git a/lib/rpmdb.c b/lib/rpmdb.c +index 4c10156..7318763 100644 +--- a/lib/rpmdb.c ++++ b/lib/rpmdb.c +@@ -8,6 +8,7 @@ + #include <utime.h> + #include <errno.h> + #include <dirent.h> ++#include <fcntl.h> + + #ifndef DYING /* XXX already in "system.h" */ + #include <fnmatch.h> diff --git a/user/rpm/musl.patch b/user/rpm/musl.patch new file mode 100644 index 000000000..65f3a10aa --- /dev/null +++ b/user/rpm/musl.patch @@ -0,0 +1,33 @@ +Upstream: No +Reason: Fixes compilation with musl + +--- a/configure.ac ++++ b/configure.ac +@@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl]) + # Check for libelf library. Prefer external, otherwise none. + WITH_LIBELF_LIB= + AC_CHECK_HEADER([libelf.h]) ++AC_CHECK_HEADERS([error.h], [WITH_ERROR_H=yes]) + AC_CHECK_HEADERS([gelf.h], [ + AC_CHECK_LIB(elf, gelf_getvernaux, [ + AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) +@@ -237,7 +238,7 @@ AC_CHECK_HEADERS([gelf.h], [ + ]) + ]) + AC_SUBST(WITH_LIBELF_LIB) +-AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes]) ++AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes && test "$WITH_ERROR_H" = yes]) + + AC_CHECK_HEADERS([dwarf.h], [ + WITH_LIBDWARF=yes +--- a/rpmio/digest_nss.c ++++ b/rpmio/digest_nss.c +@@ -6,6 +6,7 @@ + #include <keyhi.h> + #include <cryptohi.h> + #include <blapit.h> ++#include <signal.h> + + #include <rpm/rpmlog.h> + #include "rpmio/digest.h" + diff --git a/user/rspamd/10-conf-split-workers.patch b/user/rspamd/10-conf-split-workers.patch new file mode 100644 index 000000000..505d2c72e --- /dev/null +++ b/user/rspamd/10-conf-split-workers.patch @@ -0,0 +1,88 @@ +Since we split workers into subpackages, we have to split the main config +that defines workers to be loaded. + +NOTE: This is intentionally done in patch file instead of modifying the config +with sed and generating the worker configs to avoid silent breakages when +upgrading the aport! + +--- a/conf/rspamd.conf ++++ b/conf/rspamd.conf +@@ -35,33 +35,4 @@ + .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" + } + +-worker "normal" { +- bind_socket = "localhost:11333"; +- .include "$CONFDIR/worker-normal.inc" +- .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc" +- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc" +-} +- +-worker "controller" { +- bind_socket = "localhost:11334"; +- .include "$CONFDIR/worker-controller.inc" +- .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc" +- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc" +-} +- +-worker "rspamd_proxy" { +- bind_socket = "localhost:11332"; +- .include "$CONFDIR/worker-proxy.inc" +- .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-proxy.inc" +- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-proxy.inc" +-} +- +-# Local fuzzy storage is disabled by default +- +-worker "fuzzy" { +- bind_socket = "localhost:11335"; +- count = -1; # Disable by default +- .include "$CONFDIR/worker-fuzzy.inc" +- .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc" +- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc" +-} ++.include(glob=true) "$CONFDIR/worker-*.conf" +--- /dev/null ++++ b/conf/worker-normal.conf +@@ -0,0 +1,8 @@ ++# Included from top-level .conf file ++ ++worker "normal" { ++ bind_socket = "localhost:11333"; ++ .include "$CONFDIR/worker-normal.inc" ++ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc" ++ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc" ++} +--- /dev/null ++++ b/conf/worker-controller.conf +@@ -0,0 +1,8 @@ ++# Included from top-level .conf file ++ ++worker "controller" { ++ bind_socket = "localhost:11334"; ++ .include "$CONFDIR/worker-controller.inc" ++ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc" ++ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc" ++} +--- /dev/null ++++ b/conf/worker-proxy.conf +@@ -0,0 +1,8 @@ ++# Included from top-level .conf file ++ ++worker "rspamd_proxy" { ++ bind_socket = "localhost:11332"; ++ .include "$CONFDIR/worker-proxy.inc" ++ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-proxy.inc" ++ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-proxy.inc" ++} +--- /dev/null ++++ b/conf/worker-fuzzy.conf +@@ -0,0 +1,8 @@ ++# Included from top-level .conf file ++ ++worker "fuzzy" { ++ bind_socket = "localhost:11335"; ++ .include "$CONFDIR/worker-fuzzy.inc" ++ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc" ++ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc" ++} diff --git a/user/rspamd/20-lua-cmake.patch b/user/rspamd/20-lua-cmake.patch new file mode 100644 index 000000000..cfd3926d6 --- /dev/null +++ b/user/rspamd/20-lua-cmake.patch @@ -0,0 +1,39 @@ +rspamd's FindLua macro fails to find our lua libs and includes, but it also +always undefines LUA_LIBRARY and LUA_INCLUDE_DIR. + +--- a/CMakeLists.txt 2020-04-01 13:57:55.000000000 +0000 ++++ b/CMakeLists.txt 2020-08-16 05:12:50.850000000 +0000 +@@ -121,31 +121,8 @@ + + # Now find libraries and headers + LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "m") +-IF(ENABLE_LUAJIT MATCHES "ON") +- #ProcessPackage(LUAJIT luajit) +- SET(WITH_LUA 1) +- FindLua(VERSION_MAJOR "5" VERSION_MINOR "1" ROOT "${LUA_ROOT}") +- IF(NOT LUA_FOUND) +- MESSAGE(FATAL_ERROR "Lua not found, lua support is required") +- ELSE(NOT LUA_FOUND) +- SET(WITH_LUA 1) +- INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}") +- ENDIF(NOT LUA_FOUND) +-ELSE(ENABLE_LUAJIT MATCHES "ON") +- FindLua(VERSION_MAJOR "5" VERSION_MINOR "3" ROOT "${LUA_ROOT}") +- IF(NOT LUA_FOUND) +- FindLua(VERSION_MAJOR "5" VERSION_MINOR "2" ROOT "${LUA_ROOT}") +- IF(NOT LUA_FOUND) +- FindLua(VERSION_MAJOR "5" VERSION_MINOR "1" ROOT "${LUA_ROOT}") +- ENDIF(NOT LUA_FOUND) +- ENDIF(NOT LUA_FOUND) +- IF(NOT LUA_FOUND) +- MESSAGE(FATAL_ERROR "Lua not found, lua support is required") +- ELSE(NOT LUA_FOUND) +- SET(WITH_LUA 1) +- INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}") +- ENDIF(NOT LUA_FOUND) +-ENDIF(ENABLE_LUAJIT MATCHES "ON") ++ ++INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}") + + IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE) + ProcessPackage(JEMALLOC LIBRARY jemalloc_pic jemalloc INCLUDE jemalloc.h INCLUDE_SUFFIXES include/jemalloc diff --git a/user/rspamd/APKBUILD b/user/rspamd/APKBUILD new file mode 100644 index 000000000..71dbcb2ac --- /dev/null +++ b/user/rspamd/APKBUILD @@ -0,0 +1,175 @@ +# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Contributor: Nathan Angelacos <nangel@alpinelinux.org> +# Contributor: TBK <alpine@jjtc.eu> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Contributor: Duncan Bellamy <dunk@denkimushi.com> +# Maintainer: Lee Starnes <lee@canned-death.us> +pkgname=rspamd +pkgver=2.5 +pkgrel=0 +pkgdesc="Fast, free and open-source spam filtering system" +url="https://rspamd.com/" +arch="all" +license="Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND LGPL-2.1+ AND LGPL-3.0-only AND MIT AND Zlib" +pkgusers="rspamd" +pkggroups="rspamd" +depends="" +checkdepends="" +makedepends=" + cmake + curl-dev + file-dev + glib-dev + icu-dev + libevent-dev + libgd-dev + libsodium-dev + lua5.3 + lua5.3-dev + openssl-dev + pcre2-dev + perl + ragel + sqlite-dev + " +checkdepends="luarocks" +install="$pkgname.pre-install" +subpackages=" + $pkgname-doc + $pkgname-client + $pkgname-libs + $pkgname-utils::noarch + $pkgname-controller::noarch + $pkgname-fuzzy::noarch + $pkgname-proxy::noarch + $pkgname-openrc + $pkgname-dbg + " +source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgver.tar.gz + $pkgname.logrotated + $pkgname.initd + $pkgname.confd + 10-conf-split-workers.patch + 20-lua-cmake.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake -B build \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCONFDIR=/etc/$pkgname \ + -DRUNDIR=/run/$pkgname \ + -DRSPAMD_USER=$pkgusers \ + -DRSPAMD_GROUP=$pkggroups \ + -DENABLE_LUAJIT=OFF \ + -DLUA_INCLUDE_DIR=/usr/include/lua5.3 \ + -DLUA_LIBRARY=/usr/lib/lua5.3/liblua.so \ + -DENABLE_REDIRECTOR=ON \ + -DENABLE_URL_INCLUDE=ON \ + -DENABLE_PCRE2=ON \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + "$CMAKE_CROSSOPTS" . + make -C build +} + +check() { + make -C build rspamd-test +} + +package() { + make -C build DESTDIR="$pkgdir" install + + cd "$pkgdir" + local path=usr/bin + for b in rspamd rspamc rspamadm; + do + rm "$path"/$b + mv "$path"/$b-$pkgver "$path"/$b + done + + mv "$path"/rspamd_stats "$path"/rspamd-stats + mkdir -p ./usr/sbin + mv usr/bin/rspamd usr/sbin/ + + mkdir -p usr/share/doc/$pkgname + mv usr/share/$pkgname/www/README.md \ + usr/share/doc/$pkgname/ + + install -Dm 644 "$srcdir"/$pkgname.logrotated etc/logrotate.d/$pkgname + install -Dm 755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname + install -Dm 644 "$srcdir"/$pkgname.confd etc/conf.d/$pkgname + + mkdir -p etc/$pkgname/local.d \ + etc/$pkgname/override.d + + install -dm 750 -o rspamd -g rspamd \ + var/lib/$pkgname + install -dm 750 -o rspamd -g rspamd \ + var/log/$pkgname + install -dm 755 -o rspamd -g rspamd \ + etc/$pkgname/local.d/maps.d +} + +client() { + pkgdesc="$pkgdesc (console client)" + + mkdir -p "$subpkgdir/usr/bin" + mv "$pkgdir/usr/bin/rspamc" "$subpkgdir/usr/bin/rspamc" +} + +libs() { + pkgdesc="$pkgdesc (libraries)" + + mkdir -p "$subpkgdir/usr/lib/$subpkgname" + mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$subpkgname/" +} + +utils() { + pkgdesc="$pkgdesc (utilities)" + depends="perl" + + mkdir -p "$subpkgdir/usr/bin" + mv "$pkgdir/usr/bin/${pkgname}-stats" "$subpkgdir/usr/bin/" + mv "$pkgdir/usr/bin/${pkgname}-redirector" "$subpkgdir/usr/bin/" +} + +fuzzy() { + pkgdesc="$pkgdesc (local fuzzy storage)" + license="Apache-2.0" + depends="$pkgname" + + mkdir -p "$subpkgdir/etc/$pkgname/modules.d" + mv "$pkgdir/etc/$pkgname"/worker-fuzzy.* "$subpkgdir/etc/$pkgname/" + mv "$pkgdir/etc/$pkgname"/modules.d/fuzzy_* "$subpkgdir/etc/$pkgname/modules.d/" +} + +controller() { + pkgdesc="$pkgdesc (controller web interface)" + license="MIT" + depends="$pkgname" + + mkdir -p "$subpkgdir/usr/share/$pkgname" + mv "$pkgdir/usr/share/$pkgname/www" "$subpkgdir/usr/share/$pkgname/www" + mkdir -p "$subpkgdir/etc/$pkgname" + mv "$pkgdir/etc/$pkgname"/worker-controller.* "$subpkgdir/etc/$pkgname/" +} + +proxy() { + pkgdesc="$pkgdesc (milter support)" + license="Apache-2.0" + depends="$pkgname" + + mkdir -p "$subpkgdir/etc/$pkgname" + mv "$pkgdir/etc/$pkgname"/worker-proxy.* "$subpkgdir/etc/$pkgname/" +} + +sha512sums="6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540 rspamd-2.5.tar.gz +2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated +782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3 rspamd.initd +a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd +a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e 10-conf-split-workers.patch +4c124eb0e5edcdb77ae0430de193da25c418f0265251d017efaaba86d419ba3db2a10dc5205fc3ae375bf005bbeaa102fb45415c05136004b4056950e1d737b6 20-lua-cmake.patch" diff --git a/user/rspamd/rspamd.confd b/user/rspamd/rspamd.confd new file mode 100644 index 000000000..620eecb94 --- /dev/null +++ b/user/rspamd/rspamd.confd @@ -0,0 +1,13 @@ +# Configuration for /etc/init.d/rspamd + +# User and group to run rspamd workers. +#command_user="rspamd:rspamd" + +# Path of the main configuration file. +#cfgfile="/etc/rspamd/rspamd.conf" + +# Where to log startup configuration checking: +# - /dev/null - silent if check pass (default) +# - /dev/stdout - always print output on the curent terminal +# - /path/filename - append output to the specified logfile +#startuplog="/var/log/rspamd/startup.log" diff --git a/user/rspamd/rspamd.initd b/user/rspamd/rspamd.initd new file mode 100644 index 000000000..aaa40428b --- /dev/null +++ b/user/rspamd/rspamd.initd @@ -0,0 +1,51 @@ +#!/sbin/openrc-run + +extra_commands="checkconfig" +extra_started_commands="reload reopen" + +description="Rapid spam filtering system" +description_checkconfig="Check configuration" +description_reload="Reload configuration" +description_reopen="Reopen log files" + +# Uppercase variables are here for backward compatibility only. +: ${command_user:="${RSPAMD_USER:-rspamd}:${RSPAMD_GROUP:-rspamd}"} +: ${cfgfile:=${RSPAMD_CONFIG:-/etc/rspamd/rspamd.conf}} +: ${startuplog:=${RSPAMD_STARTUPLOG:-/dev/null}} + +command="/usr/sbin/rspamd" +command_args="--config $cfgfile --no-fork ${command_args:-}" +command_background="yes" +pidfile="/run/rspamd/$RC_SVCNAME.pid" + +required_files="$cfgfile" + +depend() { + need localmount net + before mta + after redis +} + +start_pre() { + checkpath -d -m 755 -o "$command_user" ${pidfile%/*} + checkconfig >/dev/null 2>>"$startuplog" || checkconfig +} + +checkconfig() { + ebegin "Checking $name configuration" + + rspamadm configtest + eend $? +} + +reload() { + ebegin "Reloading $name configuration" + start_pre && start-stop-daemon --signal HUP --pidfile $pidfile + eend $? +} + +reopen() { + ebegin "Reopening $name log files" + start-stop-daemon --signal USR1 --pidfile $pidfile + eend $? +} diff --git a/user/rspamd/rspamd.logrotated b/user/rspamd/rspamd.logrotated new file mode 100644 index 000000000..2a443f2de --- /dev/null +++ b/user/rspamd/rspamd.logrotated @@ -0,0 +1,11 @@ +/var/log/rspamd/*log { + daily + rotate 10 + missingok + notifempty + compress + sharedscripts + postrotate + /etc/init.d/rspamd --ifstarted --quiet reopen + endscript +} diff --git a/user/rspamd/rspamd.pre-install b/user/rspamd/rspamd.pre-install new file mode 100644 index 000000000..b2f35bdd8 --- /dev/null +++ b/user/rspamd/rspamd.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +groupadd -r rspamd 2>/dev/null +useradd -r -d /var/lib/rspamd -s /sbin/nologin -G rspamd -g rspamd rspamd 2>/dev/null + +exit 0 diff --git a/user/rubberband/APKBUILD b/user/rubberband/APKBUILD index 0a5c2d851..054a90b11 100644 --- a/user/rubberband/APKBUILD +++ b/user/rubberband/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=rubberband -pkgver=1.8.2 +pkgver=1.9.0 pkgrel=0 pkgdesc="Library for audio time-stretching and pitch-shifting" url="https://www.breakfastquay.com/rubberband/" @@ -11,9 +11,7 @@ license="BSD-4-Clause AND BSD-3-Clause AND GPL-2.0+" depends="" makedepends="libsamplerate-dev libsndfile-dev fftw-dev vamp-sdk-dev ladspa-dev" subpackages="$pkgname-dev" -source="https://breakfastquay.com/files/releases/rubberband-$pkgver.tar.bz2 - no-jni.patch - " +source="https://breakfastquay.com/files/releases/rubberband-$pkgver.tar.bz2" build() { ./configure \ @@ -30,5 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6 rubberband-1.8.2.tar.bz2 -6c64a6220e68865dece4efe93131f7b5c99ae6a4ce094d7e8cf4805f64c3012edbf35bd5c2bdbb07240d68036728baa9619dd8faa21f01393dc6b35bdfa4f152 no-jni.patch" +sha512sums="2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8 rubberband-1.9.0.tar.bz2" diff --git a/user/rubberband/no-jni.patch b/user/rubberband/no-jni.patch deleted file mode 100644 index 82e08c970..000000000 --- a/user/rubberband/no-jni.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nurd rubberband-1.8.2/Makefile.in rubberband-1.8.2.new/Makefile.in ---- rubberband-1.8.2/Makefile.in 2018-05-15 12:43:39.000000000 -0500 -+++ rubberband-1.8.2.new/Makefile.in 2018-08-03 00:50:46.435326979 -0500 -@@ -179,11 +179,9 @@ - cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR) - rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION) - rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION) -- rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) - cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) - ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION) - ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION) -- cp -f $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) - cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) - cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) - cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD index eb5431649..7a1781581 100644 --- a/user/ruby-rake-compiler/APKBUILD +++ b/user/ruby-rake-compiler/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rake-compiler _gemname=${pkgname#ruby-} -pkgver=1.1.0 -pkgrel=1 +pkgver=1.1.1 +pkgrel=0 pkgdesc="Provide a standard and simplified way to build and package Ruby extensions" url="https://github.com/rake-compiler/rake-compiler" arch="noarch" @@ -39,5 +39,5 @@ package() { rm -r cache build_info doc } -sha512sums="77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60 ruby-rake-compiler-1.1.0.tar.gz +sha512sums="e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d ruby-rake-compiler-1.1.1.tar.gz 21feda7887b7fe0978f906d407ecd44d7f25e334e7ee8ff27f73e71d494bd10af4174d7373652b29b1a8eaf95f53f2c8581879088f343e7f045fc265eecf7eac gemfile-remove-unwanted-files.patch" diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index ef366ef0f..2adad7910 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.3.2.0 +pkgver=2.3.5.0 pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10.0.0 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -59,4 +59,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="c4b833a944e6c99f52283d7c27c4a4937995b99afb1e9a9d601bb20efec7b23e05fb8500b1653c3a1c045811087acd0bc800cebfdd2fb60c6eba2fd85cfd580d s6-dns-2.3.2.0.tar.gz" +sha512sums="994a786b8d725cc98640be102e05a25f033624fbf8762fc53361555f4a721f5be819e282b907ceedaa0c1adbd670c80e1819096dc2ff7e2a2e476098bded3ade s6-dns-2.3.5.0.tar.gz" diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index 62103295d..2a4e8e8d6 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-utils -pkgver=2.5.1.2 +pkgver=2.5.1.4 pkgrel=0 pkgdesc="skarnet.org's Linux-specific miscellaneous utilities" url="https://skarnet.org/software/s6-linux-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -34,4 +34,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="4557148c3e739471a8846d3e0425da826d77ab3b7fc8d6c777d110152343596d17fde37fddcb099b107663138a5447866c3ff00a05f59d034379d26b1e147331 s6-linux-utils-2.5.1.2.tar.gz" +sha512sums="e88ba46b63fc2823e4721c2d87bca128df5a7d44769c09fee19b5cc25bb9be334241262aba13c421c3211dc4dc47ec919f504af81a6f3ccfb80efa357b8b7549 s6-linux-utils-2.5.1.4.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 89ef875b6..6683aecdd 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.3.1.2 +pkgver=2.4.1.0 pkgrel=0 pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities." url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10.0.0 depends="execline" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -62,4 +62,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="292bba150fcf4567073690411caebb66b407dbac20dfcc07f8a79d55962ef07f1fcfcf25bac21734605bc171e22805812788b0c12ec01e79f320eef782479d1c s6-networking-2.3.1.2.tar.gz" +sha512sums="4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22 s6-networking-2.4.1.0.tar.gz" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index 01a984414..6ee77bb99 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.2.2.4 +pkgver=2.2.3.1 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9 +_skalibs_version=2.10 depends="" makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -33,4 +33,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="678398a2c902c28f3d5c2e3be832bb956bd6c5a72727b83c218b1966ac52d56be430126e8c768355f47a1c70f6f445afa76099882d3c9040931ada4f4ed19afc s6-portable-utils-2.2.2.4.tar.gz" +sha512sums="76c464b90b5c67f87bec053cadb5dac1b5928df7f373b7a0b6700e8ab684fb8c5354788720e216f1fb9e332a0a5dec92618aee3e0f6ff578c8aa42f2aa787549 s6-portable-utils-2.2.3.1.tar.gz" diff --git a/user/samurai/APKBUILD b/user/samurai/APKBUILD index e9de6bfd4..caf9f9fc4 100644 --- a/user/samurai/APKBUILD +++ b/user/samurai/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=samurai pkgver=1.1 pkgrel=0 diff --git a/user/sane-airscan/APKBUILD b/user/sane-airscan/APKBUILD index c106204f8..1694d3d0f 100644 --- a/user/sane-airscan/APKBUILD +++ b/user/sane-airscan/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sane-airscan -pkgver=0.99.8 -pkgrel=1 +pkgver=0.99.10 +pkgrel=0 pkgdesc="Universal scanner driver for AirScan (eSCL) scanners" url=" " arch="all" @@ -11,9 +11,7 @@ depends="" makedepends="avahi-dev glib-dev libjpeg-turbo-dev libpng-dev libsoup-dev libxml2-dev meson ninja sane-dev" subpackages="$pkgname-doc" -source="sane-airscan-$pkgver.tar.gz::https://github.com/alexpevzner/sane-airscan/archive/$pkgver.tar.gz - git.patch - " +source="sane-airscan-$pkgver.tar.gz::https://github.com/alexpevzner/sane-airscan/archive/$pkgver.tar.gz" build() { meson \ @@ -36,5 +34,4 @@ package() { rm "$pkgdir"/etc/sane.d/dll.conf } -sha512sums="2828deeea31297c64b9927bb2b2b982f16a16cbb446cf2ca685b13f79cb264e94c017b8930fe04004636a6e1122f1882bd58252a3302c0a13b3fc60566072155 sane-airscan-0.99.8.tar.gz -a195c23edaf399b6fc1ba7693afd34fa87504c9c8ff10d1d793b97c1b592bff90214cd18af764451a3af9860884509fa7701037322a551226a0bcd29473ca1cc git.patch" +sha512sums="7a3d98e01ad883856eb79c522aff50243b399717a6ba2db07eec66e49a83d365ad4db6d3f87718592f3b85832a2098e86ae094d9f06ed951ebc23887cddb75b7 sane-airscan-0.99.10.tar.gz" diff --git a/user/sane-airscan/git.patch b/user/sane-airscan/git.patch deleted file mode 100644 index 818580553..000000000 --- a/user/sane-airscan/git.patch +++ /dev/null @@ -1,1212 +0,0 @@ -diff --git a/COPYING b/COPYING -index 60549be..d159169 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,12 @@ -- GNU GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - -- Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by --the GNU Library General Public License instead.) You can apply it to -+the GNU Lesser General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not -@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. -- -- GNU GENERAL PUBLIC LICENSE -+ -+ GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -- -+ - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, - and can be reasonably considered independent and separate works in -@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent - access to copy the source code from the same place counts as - distribution of the source code, even though third parties are not - compelled to copy the source along with the object code. -- -+ - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense or distribute the Program is -@@ -225,7 +225,7 @@ impose that choice. - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. -- -+ - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License -@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals - of preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -- END OF TERMS AND CONDITIONS -- -- How to Apply These Terms to Your New Programs -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it -@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least - the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> -- Copyright (C) 19yy <name of author> -+ Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - -- Gnomovision version 69, Copyright (C) 19yy name of author -+ Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. -@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: - This General Public License does not permit incorporating your program into - proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the --library. If this is what you want to do, use the GNU Library General -+library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. -diff --git a/LICENSE b/LICENSE -index fe71f02..db02cb9 100644 ---- a/LICENSE -+++ b/LICENSE -@@ -16,8 +16,8 @@ General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software --Foundation, Inc., 59 Temple Place - Suite 330, Boston, --MA 02111-1307, USA. -+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+MA 02110-1301 USA. - - As a special exception, the authors of sane-airscan give permission for - additional uses of the libraries contained in this release of sane-airscan. -diff --git a/Makefile b/Makefile -index 9d4e082..70555a8 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,7 @@ - - CC = gcc - COMPRESS = gzip --CFLAGS = -O2 -g -W -Wall -Werror -+CFLAGS += -O2 -g -W -Wall -Werror $(CPPFLAGS) - MANDIR = /usr/share/man/ - PKG_CONFIG = /usr/bin/pkg-config - STRIP = -s -@@ -82,7 +82,7 @@ $(BACKEND): $(OBJDIR)airscan.o $(LIBAIRSCAN) airscan.sym - $(CC) -o $(BACKEND) -shared $(OBJDIR)/airscan.o $(LIBAIRSCAN) $(airscan_LDFLAGS) - - $(DISCOVER): $(OBJDIR)discover.o $(LIBAIRSCAN) -- $(CC) -o $(DISCOVER) discover.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(airscan_LIBS) -fPIE -+ $(CC) -o $(DISCOVER) discover.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(airscan_LIBS) $(LDFLAGS) -fPIE - - $(LIBAIRSCAN): $(OBJ) Makefile - ar cru $(LIBAIRSCAN) $(OBJ) -@@ -105,6 +105,13 @@ clean: - rm -f test $(BACKEND) tags - rm -rf $(OBJDIR) - -+uninstall: -+ rm -f $(DESTDIR)$(PREFIX)$(BINDIR)/$(DISCOVER) -+ rm -f $(DESTDIR)$(PREFIX)$(CONFDIR)/dll.d/airscan -+ rm -f $(DESTDIR)$(PREFIX)$(LIBDIR)/sane/$(BACKEND) -+ rm -f $(DESTDIR)$(PREFIX)$(MANDIR)/man1/$(MAN_DISCOVER)* -+ rm -f $(DESTDIR)$(PREFIX)$(MANDIR)/man5/$(MAN_BACKEND)* -+ - man: $(MAN_DISCOVER) $(MAN_BACKEND) - - $(MAN_DISCOVER): $(MAN_DISCOVER).md -@@ -114,7 +121,7 @@ $(MAN_BACKEND): $(MAN_BACKEND).md - ronn --roff --manual=$(MAN_BACKEND_TITLE) $(MAN_BACKEND).md - - test: $(BACKEND) test.c -- $(CC) -o test test.c $(BACKEND) -Wl,-rpath . ${airscan_CFLAGS} -+ $(CC) -o test test.c $(BACKEND) -Wl,-rpath . $(LDFLAGS) ${airscan_CFLAGS} - - test-decode: test-decode.c $(LIBAIRSCAN) -- $(CC) -o test-decode test-decode.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(airscan_LIBS) -+ $(CC) -o test-decode test-decode.c $(CPPFLAGS) $(airscan_CFLAGS) $(LIBAIRSCAN) $(LDFLAGS) $(airscan_LIBS) -diff --git a/README.md b/README.md -index 469a2cd..f05f4d0 100644 ---- a/README.md -+++ b/README.md -@@ -51,10 +51,13 @@ Legend: - | Canon D570 | Yes | | - | Canon ImageCLASS MF743cdw | Yes<sup>[1](#note1)</sup> | | - | Canon imageRUNNER ADVANCE 4545/4551| Yes | Yes | -+| Canon imageRUNNER C3120L | Yes | Yes | - | Canon i-SENSYS MF641C | No | Yes | --| Canon Lide 400 | Yes | | -+| Canon Lide 400 | Yes<sup>[2](#note1)</sup> | | - | Canon MF745C/746C | Yes | Yes | -+| Canon PIXMA MG5500 Series | No | Yes | - | Canon PIXMA MG7700 Series | Yes | | -+| Canon PIXMA TS5000 Series | Yes | | - | Canon PIXMA TS 9550 Series | Yes | | - | Canon TR4529 (PIXMA TR4500 Series) | Yes | | - | Canon TR7500 Series | No | Yes | -@@ -89,10 +92,10 @@ Legend: - | HP OfficeJet Pro 8730 | Yes | Yes | - | HP OfficeJet Pro 9010 series | Yes | | - | HP Smart Tank Plus 550 series | Yes | | --| Kyocera ECOSYS M2040dn | Yes | Yes<sup>[2](#note2)</sup> | --| Lexmark CX317dn | Yes<sup>[3](#note3)</sup> | Yes<sup>[3](#note3)</sup> | -+| Kyocera ECOSYS M2040dn | Yes | Yes<sup>[3](#note2)</sup> | -+| Lexmark CX317dn | Yes<sup>[4](#note3)</sup> | Yes<sup>[4](#note3)</sup> | - | Lexmark MC2535adwe | Yes | | --| Ricoh MP C3003 | No | Yes<sup>[4](#note3)</sup> | -+| Ricoh MP C3003 | No | Yes<sup>[5](#note3)</sup> | - | Samsung M288x Series | No | Yes | - | Xerox VersaLink B405 | Yes | | - | TODO | | | -@@ -102,15 +105,21 @@ Legend: - scanning on its web console: Home->Menu->Preferences->Network->TCP/IP - Settings->Network Link Scan Settings->On. - --<a name="note2"><sup>[2]</sup></a>: this device requires manual action on its front -+<a name="note3"><sup>[2]</sup></a>: this USB device supports IPP over USB protocol, which -+allows it to be used with network protocols like eSCL. To enable IPP over USB, you need -+to install additional program: either [ippusbxd](https://github.com/OpenPrinting/ippusbxd), which -+comes with some distros, or [ipp-usb](https://github.com/OpenPrinting/ipp-usb). 'ipp-usb` -+works better, binary packages available for many popular distros. -+ -+<a name="note3"><sup>[3]</sup></a>: this device requires manual action on its front - panel to initiate WSD scan: Send->WSD Scan->From Computer - --<a name="note3"><sup>[3]</sup></a>: when low in memory, this device may scan at 400 DPI -+<a name="note4"><sup>[4]</sup></a>: when low in memory, this device may scan at 400 DPI - instead of requested 600 DPI. As sane-airscan reports image parameters to SANE before actual - image is received, and then adjust actual image to reported parameters, image will - be scaled down by the factor 2/3 at this case. Lower resolutions works well. - --<a name="note3"><sup>[4]</sup></a>: by default, WSD scan command is disabled on this -+<a name="note5"><sup>[5]</sup></a>: by default, WSD scan command is disabled on this - device and needs to be enabled before use: Click [Configuration], click [Initial Settings] - under [Scanner], and then set [Prohibit WSD Scan Command] to [Do not Prohibit] (from - http://support.ricoh.com/bb_v1oi/pub_e/oi_view/0001047/0001047003/view/scanner/int/0095.htm) -diff --git a/airscan-device.c b/airscan-device.c -index f76fa23..82e267a 100644 ---- a/airscan-device.c -+++ b/airscan-device.c -@@ -119,7 +119,6 @@ struct device { - SANE_Int read_line_end; /* If read_line_num>read_line_end - no more lines left in image */ - SANE_Int read_line_off; /* Current offset in the line */ -- SANE_Int read_skip_lines; /* How many lines to skip */ - SANE_Int read_skip_bytes; /* How many bytes to skip at line - beginning */ - }; -@@ -487,6 +486,8 @@ static void - device_probe_endpoint (device *dev, zeroconf_endpoint *endpoint) - { - /* Switch endpoint */ -+ log_assert(dev->log, endpoint->proto != ID_PROTO_UNKNOWN); -+ - if (dev->endpoint_current == NULL || - dev->endpoint_current->proto != endpoint->proto) { - device_proto_set(dev, endpoint->proto); -@@ -851,8 +852,8 @@ device_geom; - * First of all, we use 3 different units to deal with geometrical - * parameters: - * 1) we communicate with frontend in millimeters -- * 2) we communicate with scanner in pixels, assuming protoc-specific DPI -- * (defined by devcaps::units) -+ * 2) we communicate with scanner in pixels, assuming -+ * protocol-specific DPI (defined by devcaps::units) - * 3) when we deal with image, sizes are in pixels in real resolution - * - * Second, scanner returns minimal and maximal window size, but -@@ -1289,6 +1290,7 @@ device_read_next (device *dev) - SANE_Parameters params; - image_decoder *decoder = dev->decoders[dev->proto_ctx.params.format]; - int wid, hei; -+ int skip_lines = 0; - - log_assert(dev->log, decoder != NULL); - -@@ -1330,7 +1332,7 @@ device_read_next (device *dev) - /* Setup image clipping */ - if (dev->job_skip_x >= wid || dev->job_skip_y >= hei) { - /* Trivial case - just skip everything */ -- dev->read_skip_lines = hei; -+ dev->read_line_end = 0; - dev->read_skip_bytes = 0; - line_capacity = dev->opt.params.bytes_per_line; - } else { -@@ -1352,12 +1354,12 @@ device_read_next (device *dev) - dev->read_skip_bytes = bpp * (dev->job_skip_x - win.x_off); - } - -- dev->read_skip_lines = 0; - if (win.y_off != dev->job_skip_y) { -- dev->read_skip_lines = dev->job_skip_y - win.y_off; -+ skip_lines = dev->job_skip_y - win.y_off; - } - - line_capacity = math_max(dev->opt.params.bytes_per_line, wid * bpp); -+ line_capacity += dev->read_skip_bytes; - } - - /* Initialize image decoding */ -@@ -1366,7 +1368,14 @@ device_read_next (device *dev) - - dev->read_line_num = 0; - dev->read_line_off = dev->opt.params.bytes_per_line; -- dev->read_line_end = hei - dev->read_skip_lines; -+ dev->read_line_end = hei - skip_lines; -+ -+ for (;skip_lines > 0; skip_lines --) { -+ err = image_decoder_read_line(decoder, dev->read_line_buf); -+ if (err != NULL) { -+ goto DONE; -+ } -+ } - - /* Wake up reader */ - pollable_signal(dev->read_pollable); -@@ -1408,8 +1417,9 @@ device_read_decode_line (device *dev) - return SANE_STATUS_EOF; - } - -- if (n < dev->read_skip_lines || n >= dev->read_line_end) { -- memset(dev->read_line_buf, 0xff, dev->opt.params.bytes_per_line); -+ if (n >= dev->read_line_end) { -+ memset(dev->read_line_buf + dev->read_skip_bytes, 0xff, -+ dev->opt.params.bytes_per_line); - } else { - error err = image_decoder_read_line(decoder, dev->read_line_buf); - -@@ -1419,7 +1429,7 @@ device_read_decode_line (device *dev) - } - } - -- dev->read_line_off = dev->read_skip_bytes; -+ dev->read_line_off = 0; - dev->read_line_num ++; - - return SANE_STATUS_GOOD; -@@ -1482,12 +1492,14 @@ device_read (device *dev, SANE_Byte *data, SANE_Int max_len, SANE_Int *len_out) - /* Read line by line */ - for (len = 0; status == SANE_STATUS_GOOD && len < max_len; ) { - if (dev->read_line_off == dev->opt.params.bytes_per_line) { -- status = device_read_decode_line (dev); -+ status = device_read_decode_line(dev); - } else { - SANE_Int sz = math_min(max_len - len, - dev->opt.params.bytes_per_line - dev->read_line_off); - -- memcpy(data, dev->read_line_buf + dev->read_line_off, sz); -+ memcpy(data, dev->read_line_buf + dev->read_skip_bytes + -+ dev->read_line_off, sz); -+ - data += sz; - dev->read_line_off += sz; - len += sz; -diff --git a/airscan-escl.c b/airscan-escl.c -index dbaa370..163bdd1 100644 ---- a/airscan-escl.c -+++ b/airscan-escl.c -@@ -335,16 +335,16 @@ escl_devcaps_source_parse (xml_rd *xml, devcaps_source **out) - goto DONE; - } - -- if (src->max_wid_px != 0 && src->max_hei_px != 0 ) -+ if (src->max_wid_px != 0 && src->max_hei_px != 0) - { - /* Validate window size */ -- if (src->min_wid_px >= src->max_wid_px ) -+ if (src->min_wid_px > src->max_wid_px) - { - err = ERROR("Invalid scan:MinWidth or scan:MaxWidth"); - goto DONE; - } - -- if (src->min_hei_px >= src->max_hei_px) -+ if (src->min_hei_px > src->max_hei_px) - { - err = ERROR("Invalid scan:MinHeight or scan:MaxHeight"); - goto DONE; -diff --git a/airscan-http.c b/airscan-http.c -index 6758368..ca6f8b0 100644 ---- a/airscan-http.c -+++ b/airscan-http.c -@@ -114,6 +114,7 @@ http_uri_new_relative (const http_uri *base, const char *path, - - /* Free the URI - */ -+#ifndef __clang_analyzer__ - void - http_uri_free (http_uri *uri) - { -@@ -123,6 +124,7 @@ http_uri_free (http_uri *uri) - g_free(uri); - } - } -+#endif - - /* Get URI string - */ -@@ -689,9 +691,21 @@ http_client_onerror (http_client *client, - void - http_client_cancel (http_client *client) - { -- while (client->pending->len != 0) { -- http_query_cancel(client->pending->pdata[0]); -+ size_t i, len = client->pending->len; -+ size_t sz = len * sizeof(http_query*); -+ http_query **qlist = g_alloca(len); -+ -+ /* Note, without this stupid copying of client->pending->pdata, -+ * clang analyzer doesn't understand that http_query_cancel() -+ * has a side effect of removing http_query pointer from the -+ * array and erroneously claims that memory used after free -+ */ -+ memcpy(qlist, client->pending->pdata, sz); -+ for (i = 0; i < len; i ++) { -+ http_query_cancel(qlist[i]); - } -+ -+ log_assert(client->log, client->pending->len == 0); - } - - /* Cancel all pending queries with matching address family and uintptr -@@ -988,12 +1002,13 @@ http_query_cancel (http_query *q) - g_object_ref(q->msg); - soup_session_cancel_message(http_session, q->msg, SOUP_STATUS_CANCELLED); - soup_message_set_status(q->msg, SOUP_STATUS_CANCELLED); -- g_object_unref(q->msg); - - log_debug(q->client->log, "HTTP %s %s: %s", q->msg->method, - http_uri_str(q->uri), - soup_status_get_phrase(SOUP_STATUS_CANCELLED)); - -+ g_object_unref(q->msg); -+ - http_query_free(q); - } - -@@ -1225,6 +1240,8 @@ http_start_stop (bool start) - g_object_set_property(G_OBJECT(http_session), - SOUP_SESSION_SSL_STRICT, &val); - } else { -+ ll_node *node; -+ - soup_session_abort(http_session); - g_object_unref(http_session); - http_session = NULL; -@@ -1232,10 +1249,8 @@ http_start_stop (bool start) - /* Note, soup_session_abort() may leave some requests - * pending, so we must free them here explicitly - */ -- while (!ll_empty(&http_query_list)) { -- ll_node *node = ll_first(&http_query_list); -+ while ((node = ll_pop_beg(&http_query_list)) != NULL) { - http_query *q = OUTER_STRUCT(node, http_query, list_node); -- - http_query_free(q); - } - } -diff --git a/airscan-math.c b/airscan-math.c -index d801304..ee7f301 100644 ---- a/airscan-math.c -+++ b/airscan-math.c -@@ -99,7 +99,6 @@ math_range_merge (SANE_Range *out, const SANE_Range *r1, const SANE_Range *r2) - SANE_Word quant = math_lcm(r1->quant, r2->quant); - SANE_Word min, max, bounds_min, bounds_max; - -- min = math_min(r1->min, r2->min); - bounds_min = math_max(r1->min, r2->min); - bounds_max = math_min(r1->max, r2->max); - -diff --git a/airscan-netif.c b/airscan-netif.c -index a762377..a086792 100644 ---- a/airscan-netif.c -+++ b/airscan-netif.c -@@ -92,6 +92,41 @@ netif_distance_get (const struct sockaddr *addr) - return distance; - } - -+/* Check that interface has non-link-local address -+ * of particular address family -+ */ -+bool -+netif_has_non_link_local_addr (int af, int ifindex) -+{ -+ struct ifaddrs *ifa; -+ -+ for (ifa = netif_ifaddrs; ifa != NULL; ifa = ifa->ifa_next) { -+ struct sockaddr *addr; -+ -+ /* Skip interface without address */ -+ if ((addr = ifa->ifa_addr) == NULL) { -+ continue; -+ } -+ -+ /* Check address family against requested */ -+ if (addr->sa_family != af) { -+ continue; -+ } -+ -+ /* Skip link-local addresses */ -+ if (ip_sockaddr_is_linklocal(addr)) { -+ continue; -+ } -+ -+ /* Check interface index */ -+ if (ifindex == (int) if_nametoindex(ifa->ifa_name)) { -+ return true; -+ } -+ } -+ -+ return false; -+} -+ - /* Get list of network interfaces addresses - */ - netif_addr* -diff --git a/airscan-wsdd.c b/airscan-wsdd.c -index 15bf02a..c53105b 100644 ---- a/airscan-wsdd.c -+++ b/airscan-wsdd.c -@@ -26,6 +26,12 @@ - #define WSDD_RETRANSMIT_MAX 250 /* Max retransmit time */ - #define WSDD_DISCOVERY_TIME 2500 /* Overall discovery time */ - -+/* This delay is taken, if we have discovered, say, device's IPv6 -+ * addresses and have a strong suspicion that device has not yet -+ * discovered IPv4 addresses as well -+ */ -+#define WSDD_PUBLISH_DELAY 1000 -+ - /* WS-Discovery stable endpoint path - */ - #define WSDD_STABLE_ENDPOINT \ -@@ -49,12 +55,13 @@ typedef struct { - * device discovery - */ - typedef struct { -- zeroconf_finding finding; /* Base class */ -- const char *address; /* Device "address" in WS-SD sense */ -- ll_head xaddrs; /* List of wsdd_xaddr */ -- http_client *http_client; /* HTTP client */ -- ll_node list_node; /* In wsdd_finding_list */ -- bool published; /* This finding is published */ -+ zeroconf_finding finding; /* Base class */ -+ const char *address; /* Device "address" in WS-SD sense */ -+ ll_head xaddrs; /* List of wsdd_xaddr */ -+ http_client *http_client; /* HTTP client */ -+ ll_node list_node; /* In wsdd_finding_list */ -+ eloop_timer *publish_timer; /* WSDD_PUBLISH_DELAY timer */ -+ bool published; /* This finding is published */ - } wsdd_finding; - - /* wsdd_xaddr represents device transport address -@@ -207,9 +214,8 @@ wsdd_xaddr_list_purge (ll_head *list) - { - ll_node *node; - -- while ((node = ll_first(list)) != NULL) { -+ while ((node = ll_pop_beg(list)) != NULL) { - wsdd_xaddr *xaddr = OUTER_STRUCT(node, wsdd_xaddr, list_node); -- ll_del(&xaddr->list_node); - wsdd_xaddr_free(xaddr); - } - } -@@ -269,6 +275,10 @@ wsdd_finding_free (wsdd_finding *wsdd) - http_client_cancel(wsdd->http_client); - http_client_free(wsdd->http_client); - -+ if (wsdd->publish_timer != NULL) { -+ eloop_timer_cancel(wsdd->publish_timer); -+ } -+ - zeroconf_endpoint_list_free(wsdd->finding.endpoints); - g_free((char*) wsdd->address); - wsdd_xaddr_list_purge(&wsdd->xaddrs); -@@ -282,17 +292,100 @@ wsdd_finding_free (wsdd_finding *wsdd) - static void - wsdd_finding_publish (wsdd_finding *wsdd) - { -- if (!wsdd->published) { -- wsdd->published = true; -- zeroconf_finding_publish(&wsdd->finding); -+ if (wsdd->published) { -+ return; -+ } -+ -+ wsdd->published = true; -+ wsdd->finding.endpoints = zeroconf_endpoint_list_sort_dedup( -+ wsdd->finding.endpoints); -+ -+ if (wsdd->publish_timer != NULL) { -+ log_debug(wsdd_log, "\"%s\": publish-delay timer canceled", -+ wsdd->finding.model); -+ -+ eloop_timer_cancel(wsdd->publish_timer); -+ wsdd->publish_timer = NULL; -+ } -+ -+ zeroconf_finding_publish(&wsdd->finding); -+} -+ -+/* WSDD_PUBLISH_DELAY timer callback -+ */ -+static void -+wsdd_finding_publish_delay_timer_callback (void *data) -+{ -+ wsdd_finding *wsdd = data; -+ -+ wsdd->publish_timer = NULL; -+ log_debug(wsdd_log, "\"%s\": publish-delay timer expired", -+ wsdd->finding.model); -+ -+ wsdd_finding_publish(wsdd); -+} -+ -+/* Publish wsdd_finding with optional delay -+ */ -+static void -+wsdd_finding_publish_delay (wsdd_finding *wsdd) -+{ -+ bool delay = false; -+ -+ if (wsdd->published) { -+ return; -+ } -+ -+ /* Continue discovery, if interface has IPv4/IPv6 address, -+ * and we have not yet discovered address of the same address -+ * family of device -+ * -+ * Some devices doesn't return their IPv4 endpoints, if -+ * metadata is queried via IPv6, and visa versa. This is -+ * possible that we will finish discovery of the particular -+ * address family, before we'll ever know that the device -+ * may have address of another address family, so part -+ * of addresses will be never discovered (see #44 for details). -+ * -+ * To prevent this situation, we continue discovery with -+ * some reasonable delay, if network interface has IPv4/IPv6 -+ * address, but device is not yet. -+ */ -+ -+ if (netif_has_non_link_local_addr(AF_INET, wsdd->finding.ifindex) && -+ !zeroconf_endpoint_list_has_non_link_local_addr(AF_INET, -+ wsdd->finding.endpoints)) { -+ log_debug(wsdd_log, -+ "\"%s\": IPv4 address expected but not yet discovered", -+ wsdd->finding.model); -+ delay = true; -+ } -+ -+ if (netif_has_non_link_local_addr(AF_INET6, wsdd->finding.ifindex) && -+ !zeroconf_endpoint_list_has_non_link_local_addr(AF_INET6, -+ wsdd->finding.endpoints)) { -+ log_debug(wsdd_log, -+ "\"%s\": IPv6 address expected but not yet discovered", -+ wsdd->finding.model); -+ delay = true; -+ } -+ -+ if (delay) { -+ if (wsdd->publish_timer == NULL) { -+ wsdd->publish_timer = eloop_timer_new(WSDD_PUBLISH_DELAY, -+ wsdd_finding_publish_delay_timer_callback, wsdd); -+ } -+ -+ return; - } -+ -+ wsdd_finding_publish(wsdd); - } - --/* Add wsdd_finding to the wsdd_finding_list. -- * If finding already present, does nothing and returns NULL -+/* Get existent finding or add a new one - */ - static wsdd_finding* --wsdd_finding_add (int ifindex, const char *address) -+wsdd_finding_get (int ifindex, const char *address) - { - ll_node *node; - wsdd_finding *wsdd; -@@ -302,7 +395,7 @@ wsdd_finding_add (int ifindex, const char *address) - wsdd = OUTER_STRUCT(node, wsdd_finding, list_node); - if (wsdd->finding.ifindex == ifindex && - !strcmp(wsdd->address, address)) { -- return NULL; -+ return wsdd; - } - } - -@@ -343,6 +436,25 @@ wsdd_finding_by_address (ip_addr addr) - return NULL; - } - -+/* Check if finding already has particular xaddr -+ */ -+static bool -+wsdd_finding_has_xaddr (wsdd_finding *wsdd, const wsdd_xaddr *xaddr) -+{ -+ ll_node *node; -+ wsdd_xaddr *xaddr2; -+ -+ for (LL_FOR_EACH(node, &wsdd->xaddrs)) { -+ xaddr2 = OUTER_STRUCT(node, wsdd_xaddr, list_node); -+ -+ if (http_uri_equal(xaddr->uri, xaddr2->uri)) { -+ return true; -+ } -+ } -+ -+ return false; -+} -+ - /* Delete wsdd_finding from the wsdd_finding_list - */ - static void -@@ -532,24 +644,7 @@ DONE: - g_free(manufacturer); - - if (http_client_num_pending(wsdd->http_client) == 0) { -- zeroconf_endpoint *endpoint; -- -- wsdd->finding.endpoints = zeroconf_endpoint_list_sort_dedup( -- wsdd->finding.endpoints); -- -- log_debug(wsdd_log, "\"%s\": address: %s", -- wsdd->finding.model, wsdd->address); -- log_debug(wsdd_log, "\"%s\": uuid: %s", -- wsdd->finding.model, wsdd->finding.uuid.text); -- log_debug(wsdd_log, "\"%s\": discovered endpoints:", -- wsdd->finding.model); -- -- for (endpoint = wsdd->finding.endpoints; endpoint != NULL; -- endpoint = endpoint->next) { -- log_debug(wsdd_log, " %s", http_uri_str(endpoint->uri)); -- } -- -- wsdd_finding_publish(wsdd); -+ wsdd_finding_publish_delay(wsdd); - } - } - -@@ -738,28 +833,42 @@ wsdd_resolver_message_dispatch (wsdd_resolver *resolver, - goto DONE; - } - -- /* Add a finding. Do nothing if device already exist */ -- wsdd = wsdd_finding_add(resolver->ifindex, msg->address); -- if (wsdd == NULL) { -- goto DONE; -- } -+ /* Add a finding or get existent one */ -+ wsdd = wsdd_finding_get(resolver->ifindex, msg->address); - -- /* If device is not scanner or (which is very unlikely) -- * has no xaddrs, just publish it without endpoints, -- * so zeroconf stuff will know that there is no need to -- * wait anymore for a device with this UUID, and we -- * are done -+ /* Import newly discovered xaddrs and initiate metadata -+ * query - */ -- if (!msg->is_scanner || ll_empty(&msg->xaddrs)) { -- wsdd_finding_publish(wsdd); -- goto DONE; -+ while ((node = ll_pop_beg(&msg->xaddrs)) != NULL) { -+ xaddr = OUTER_STRUCT(node, wsdd_xaddr, list_node); -+ -+ if (wsdd_finding_has_xaddr(wsdd, xaddr)) { -+ wsdd_xaddr_free(xaddr); -+ continue; -+ } -+ -+ ll_push_end(&wsdd->xaddrs, &xaddr->list_node); -+ if (msg->is_scanner) { -+ wsdd_finding_get_metadata(wsdd, resolver->ifindex, xaddr); -+ } - } - -- /* Initiate metadata query */ -- ll_cat(&wsdd->xaddrs, &msg->xaddrs); -- for (LL_FOR_EACH(node, &wsdd->xaddrs)) { -- xaddr = OUTER_STRUCT(node, wsdd_xaddr, list_node); -- wsdd_finding_get_metadata(wsdd, resolver->ifindex, xaddr); -+ /* If there is no pending metadata queries, it may mean -+ * one of the following: -+ * 1) device is not scanner, metadata won't be requested -+ * 2) there is no xaddrs (which is very unlikely, but -+ * just in case...) -+ * 3) device already known and all metadata queries -+ * already finished -+ * -+ * At this case we can publish device now -+ */ -+ if (http_client_num_pending(wsdd->http_client) == 0) { -+ if (msg->is_scanner) { -+ wsdd_finding_publish_delay(wsdd); -+ } else { -+ wsdd_finding_publish(wsdd); -+ } - } - break; - -@@ -774,6 +883,7 @@ wsdd_resolver_message_dispatch (wsdd_resolver *resolver, - /* Cleanup and exit */ - DONE: - wsdd_message_free(msg); -+ log_trace(wsdd_log, ""); - } - - -diff --git a/airscan-zeroconf.c b/airscan-zeroconf.c -index dfff5b8..293a05d 100644 ---- a/airscan-zeroconf.c -+++ b/airscan-zeroconf.c -@@ -129,11 +129,8 @@ zeroconf_device_add (zeroconf_finding *finding) - } - - ll_init(&device->findings); -- -- device->ifaces_cap = ZEROCONF_DEVICE_IFACES_INITIAL_LEN; -- device->ifaces = g_malloc(device->ifaces_cap * sizeof(*device->ifaces)); -- - ll_push_end(&zeroconf_device_list, &device->node_list); -+ - return device; - } - -@@ -233,7 +230,12 @@ zeroconf_device_ifaces_add (zeroconf_device *device, int ifindex) - { - if (!zeroconf_device_ifaces_lookup(device, ifindex)) { - if (device->ifaces_len == device->ifaces_cap) { -- device->ifaces_cap *= 2; -+ if (device->ifaces_cap == 0) { -+ device->ifaces_cap = ZEROCONF_DEVICE_IFACES_INITIAL_LEN; -+ } else { -+ device->ifaces_cap *= 2; -+ } -+ - device->ifaces = g_realloc(device->ifaces, - device->ifaces_cap * sizeof(*device->ifaces)); - } -@@ -260,7 +262,7 @@ zeroconf_device_rebuild_sets (zeroconf_device *device) - finding = OUTER_STRUCT(node, zeroconf_finding, list_node); - proto = zeroconf_method_to_proto(finding->method); - -- zeroconf_device_ifaces_add(device, finding->ifindex ); -+ zeroconf_device_ifaces_add(device, finding->ifindex); - if (proto != ID_PROTO_UNKNOWN) { - device->protocols |= 1 << proto; - } -@@ -316,19 +318,26 @@ static void - zeroconf_device_borrow_findings (zeroconf_device *device, - int ifindex, ll_head *output) - { -- ll_node *node, *next; -- zeroconf_finding *finding; -+ ll_node *node; -+ ll_head leftover; - -- for (node = ll_first(&device->findings); node != NULL; node = next) { -- next = ll_next(&device->findings, node); -+ ll_init(&leftover); -+ -+ while ((node = ll_pop_beg(&device->findings)) != NULL) { -+ zeroconf_finding *finding; - - finding = OUTER_STRUCT(node, zeroconf_finding, list_node); -+ - if (finding->ifindex == ifindex) { - finding->device = NULL; - ll_push_end(output, node); -+ } else { -+ ll_push_end(&leftover, node); - } - } - -+ ll_cat(&device->findings, &leftover); -+ - if (ll_empty(&device->findings)) { - zeroconf_device_del(device); - return; -@@ -556,7 +565,7 @@ zeroconf_ident_split (const char *ident, unsigned int *devid, ID_PROTO *proto) - - /* Decode proto and devid */ - *proto = zeroconf_ident_proto_decode(*ident); -- if (*proto == NUM_ID_PROTO) { -+ if (*proto == ID_PROTO_UNKNOWN) { - return NULL; - } - -@@ -774,6 +783,25 @@ zeroconf_endpoint_list_sort_dedup (zeroconf_endpoint *list) - return list; - } - -+/* Check if endpoints list contains a non-link-local address -+ * of the specified address family -+ */ -+bool -+zeroconf_endpoint_list_has_non_link_local_addr (int af, -+ const zeroconf_endpoint *list) -+{ -+ for (;list != NULL; list = list->next) { -+ const struct sockaddr *addr = http_uri_addr(list->uri); -+ if (addr != NULL && addr->sa_family == af) { -+ if (!ip_sockaddr_is_linklocal(addr)) { -+ return true; -+ } -+ } -+ } -+ -+ return false; -+} -+ - /******************** Static configuration *********************/ - /* Look for device's static configuration by device name - */ -@@ -850,7 +878,7 @@ zeroconf_finding_publish (zeroconf_finding *finding) - */ - device = zeroconf_device_find_by_uuid(finding->uuid); - if (device != NULL && finding->name != NULL) { -- if (device->ifaces_len == 1 && device->ifaces[0] == finding->ifindex ){ -+ if (device->ifaces_len == 1 && device->ifaces[0] == finding->ifindex){ - /* Case 2: all findings belongs to the same network - * interface; upgrade anonymous device to named - */ -@@ -1055,6 +1083,41 @@ zeroconf_device_list_qsort_cmp (const void *p1, const void *p2) - return cmp; - } - -+/* Format list of protocols, for zeroconf_device_list_log -+ */ -+static void -+zeroconf_device_list_fmt_protocols (char *buf, size_t buflen, unsigned int protocols) -+{ -+ ID_PROTO proto; -+ size_t off = 0; -+ -+ buf[0] = '\0'; -+ for (proto = 0; proto < NUM_ID_PROTO; proto ++) { -+ if ((protocols & (1 << proto)) != 0) { -+ off += snprintf(buf + off, buflen - off, " %s", -+ id_proto_name(proto)); -+ } -+ } -+ -+ if (buf[0] == '\0') { -+ strcpy(buf, " none"); -+ } -+} -+ -+/* Log device information in a context of zeroconf_device_list_get -+ */ -+static void -+zeroconf_device_list_log (zeroconf_device *device, const char *name, unsigned int protocols) -+{ -+ char buf[64]; -+ -+ zeroconf_device_list_fmt_protocols(buf, sizeof(buf), device->protocols); -+ log_debug(zeroconf_log, "%s: supported protocols:%s", name, buf); -+ -+ zeroconf_device_list_fmt_protocols(buf, sizeof(buf), protocols); -+ log_debug(zeroconf_log, "%s: chosen protocols:%s", name, buf); -+} -+ - /* Get list of devices, in SANE format - */ - const SANE_Device** -@@ -1065,10 +1128,14 @@ zeroconf_device_list_get (void) - const SANE_Device **dev_list = sane_device_array_new(); - ll_node *node; - -+ log_debug(zeroconf_log, "zeroconf_device_list_get: requested"); -+ - /* Wait until device table is ready */ - zeroconf_initscan_wait(); - - /* Build list of devices */ -+ log_debug(zeroconf_log, "zeroconf_device_list_get: building list of devices"); -+ - dev_count = 0; - - for (dev_conf = conf.devices; dev_conf != NULL; dev_conf = dev_conf->next) { -@@ -1097,8 +1164,18 @@ zeroconf_device_list_get (void) - zeroconf_device_name_model(device, &name, &model); - protocols = zeroconf_device_protocols(device); - -+ zeroconf_device_list_log(device, name, protocols); -+ - if (zeroconf_find_static_by_name(name) != NULL) { - /* Static configuration overrides discovery */ -+ log_debug(zeroconf_log, -+ "%s: skipping, device clashes statically configured", name); -+ continue; -+ } -+ -+ if (protocols == 0) { -+ log_debug(zeroconf_log, -+ "%s: skipping, no of supported protocols discovered", name); - continue; - } - -@@ -1327,6 +1404,8 @@ zeroconf_init (void) - log_trace(zeroconf_log, " protocol = %s", s); - - s = "?"; -+ (void) s; /* Silence CLANG analyzer warning */ -+ - switch (conf.wsdd_mode) { - case WSDD_FAST: s = "fast"; break; - case WSDD_FULL: s = "full"; break; -diff --git a/airscan.h b/airscan.h -index 3aca207..2a36333 100644 ---- a/airscan.h -+++ b/airscan.h -@@ -130,8 +130,10 @@ ll_push_beg (ll_head *head, ll_node *node) - static inline void - ll_del (ll_node *node) - { -- node->ll_prev->ll_next = node->ll_next; -- node->ll_next->ll_prev = node->ll_prev; -+ ll_node *p = node->ll_prev, *n = node->ll_next; -+ -+ p->ll_next = n; -+ n->ll_prev = p; - - /* Make double-delete safe */ - node->ll_next = node->ll_prev = node; -@@ -143,14 +145,19 @@ ll_del (ll_node *node) - static inline ll_node* - ll_pop_beg (ll_head *head) - { -- ll_node *node; -+ ll_node *node, *next; - -- if (ll_empty(head)) { -- return NULL; -+ node = head->node.ll_next; -+ if (node == &head->node) { -+ return NULL; /* List is empty if it is looped to itself */ - } - -- node = head->node.ll_next; -- ll_del(node); -+ next = node->ll_next; -+ next->ll_prev = &head->node; -+ head->node.ll_next = next; -+ -+ /* Make double-delete safe */ -+ node->ll_next = node->ll_prev = node; - - return node; - } -@@ -161,14 +168,19 @@ ll_pop_beg (ll_head *head) - static inline ll_node* - ll_pop_end (ll_head *head) - { -- ll_node *node; -+ ll_node *node, *prev; - -- if (ll_empty(head)) { -- return NULL; -+ node = head->node.ll_prev; -+ if (node == &head->node) { -+ return NULL; /* List is empty if it is looped to itself */ - } - -- node = head->node.ll_prev; -- ll_del(node); -+ prev = node->ll_prev; -+ prev->ll_next = &head->node; -+ head->node.ll_prev = prev; -+ -+ /* Make double-delete safe */ -+ node->ll_next = node->ll_prev = node; - - return node; - } -@@ -702,6 +714,12 @@ typedef enum { - NETIF_DISTANCE - netif_distance_get (const struct sockaddr *addr); - -+/* Check that interface has non-link-local address -+ * of particular address family -+ */ -+bool -+netif_has_non_link_local_addr (int af, int ifindex); -+ - /* Compare addresses by distance. Returns: - * <0, if addr1 is closer that addr2 - * >0, if addr2 is farther that addr2 -@@ -2055,6 +2073,13 @@ zeroconf_endpoint_list_sort (zeroconf_endpoint *list); - zeroconf_endpoint* - zeroconf_endpoint_list_sort_dedup (zeroconf_endpoint *list); - -+/* Check if endpoints list contains a non-link-local address -+ * of the specified address family -+ */ -+bool -+zeroconf_endpoint_list_has_non_link_local_addr (int af, -+ const zeroconf_endpoint *list); -+ - /******************** MDNS Discovery ********************/ - /* Called by zeroconf to notify MDNS about initial scan timer expiration - */ -@@ -2594,6 +2619,7 @@ log_panic (log_ctx *log, const char *fmt, ...); - if (!(expr)) { \ - log_panic(log,"file %s: line %d (%s): assertion failed: (%s)",\ - __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr); \ -+ __builtin_unreachable(); \ - } \ - } while (0) - -@@ -2603,6 +2629,7 @@ log_panic (log_ctx *log, const char *fmt, ...); - do { \ - log_panic(log,"file %s: line %d (%s): internal error", \ - __FILE__, __LINE__, __PRETTY_FUNCTION__); \ -+ __builtin_unreachable(); \ - } while (0) - - #endif -diff --git a/sane-airscan.5 b/sane-airscan.5 -index 84ed929..32656e1 100644 ---- a/sane-airscan.5 -+++ b/sane-airscan.5 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "SANE\-AIRSCAN" "5" "May 2020" "" "AirScan (eSCL) and WSD SANE backend" -+.TH "SANE\-AIRSCAN" "5" "July 2020" "" "AirScan (eSCL) and WSD SANE backend" - . - .SH "NAME" - \fBsane\-airscan\fR \- SANE backend for AirScan (eSCL) and WSD scanners and MFP -@@ -82,7 +82,7 @@ To manually configure a device, add the following section to the configuration f - [devices] - "Kyocera eSCL" = http://192\.168\.1\.102:9095/eSCL, eSCL - "Kyocera WSD" = http://192\.168\.1\.102:5358/WSDScanner, WSD --"Device I don\'t want to see" = disable -+"Device I do not want to see" = disable - . - .fi - . -@@ -146,8 +146,8 @@ Debuggung facilities can be controlled using the \fB[debug]\fR section of the co - enable = false | true - - ; Enable protocol trace and configure output directory --; for trace files\. To specify path relative to user\'s --; home directory, start it with tilda character, followed -+; for trace files\. Like in shell, to specify path relative to -+; the home directory, start it with tilda character, followed - ; by slash, i\.e\., "~/airscan/trace"\. The directory will - ; be created automatically\. - trace = path -diff --git a/sane-airscan.5.md b/sane-airscan.5.md -index 4461900..6c6ec10 100644 ---- a/sane-airscan.5.md -+++ b/sane-airscan.5.md -@@ -46,7 +46,7 @@ file: - [devices] - "Kyocera eSCL" = http://192.168.1.102:9095/eSCL, eSCL - "Kyocera WSD" = http://192.168.1.102:5358/WSDScanner, WSD -- "Device I don't want to see" = disable -+ "Device I do not want to see" = disable - - The `[devices]` section contains all manually configured devices, one line per - device, and each line contains a device name on a left side of equation and -@@ -109,8 +109,8 @@ of the configuration file: - enable = false | true - - ; Enable protocol trace and configure output directory -- ; for trace files. To specify path relative to user's -- ; home directory, start it with tilda character, followed -+ ; for trace files. Like in shell, to specify path relative to -+ ; the home directory, start it with tilda character, followed - ; by slash, i.e., "~/airscan/trace". The directory will - ; be created automatically. - trace = path -diff --git a/test-decode.c b/test-decode.c -index 5b2879e..af774a5 100644 ---- a/test-decode.c -+++ b/test-decode.c -@@ -26,7 +26,7 @@ typedef struct { - - /* Print error message and exit - */ --void -+void __attribute__((noreturn)) - die (const char *format, ...) - { - va_list ap; -@@ -218,6 +218,7 @@ main (int argc, char **argv) - save_write(save, line); - } - -+ g_free(line); - save_close(save); - - return 0; diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD index ab52075ea..60f520f1e 100644 --- a/user/screengrab/APKBUILD +++ b/user/screengrab/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=screengrab pkgver=2.0.1 pkgrel=0 diff --git a/user/scrot/0001-remove-ax-forbid.patch b/user/scrot/0001-remove-ax-forbid.patch new file mode 100644 index 000000000..60894d04b --- /dev/null +++ b/user/scrot/0001-remove-ax-forbid.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 000000000..9bb69ee27 --- /dev/null +++ b/user/scrot/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=scrot +pkgver=1.4 +pkgrel=0 +pkgdesc="Simple command-line screenshot utility for X" +options="!check" # No testsuite +url="https://github.com/resurrecting-open-source-projects/scrot" +arch="all" +license="MIT" +depends="" +makedepends="giblib-dev imlib2-dev libx11-dev libxfixes-dev libxcomposite-dev + automake libtool autoconf autoconf-archive 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" + +prepare() { + default_prepare + autoreconf -fiv +} + +build() { + sed -ie '2531d' configure + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --mandir=/usr/share/man + cp $srcdir/config.h src/scrot_config.h + make +} + +package() { + make DESTDIR="$pkgdir" docsdir=/usr/share/doc/scrot install +} + +sha512sums="8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11 scrot-1.4.tar.gz +ca7a40345b031c84ccc083202184dbff2418feb97472aca9fd441ba21501608562bdda061283db7793ad07a6d80e302c8f15a2819ac20dff8b741c6c539cbcd2 0001-remove-ax-forbid.patch +95429feb7c107c5adeadf33b5a3e3ff9dc4fb95f0d58f92c6a8de27d776a07256fa9f1825896d569eb32beb77300f46995dcafd1359f305d22861eb5748de84a config.h" diff --git a/user/scrot/config.h b/user/scrot/config.h new file mode 100644 index 000000000..e048745b5 --- /dev/null +++ b/user/scrot/config.h @@ -0,0 +1,29 @@ +/* src/config.h. Generated from config.h.in by configure. */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ + +/* Name of package */ +#define SCROT_PACKAGE "scrot" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://github.com/resurrecting-open-source-projects/scrot/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "scrot" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "scrot 1.4" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "scrot" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.4" + +/* Version number of package */ +#define SCROT_VERSION "1.4" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD index edbb2078b..938c66721 100644 --- a/user/scummvm/APKBUILD +++ b/user/scummvm/APKBUILD @@ -18,9 +18,13 @@ source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2 " build() { + _extra_conf="" + [ $CTARGET_ARCH = "pmmx" ] && _extra_conf="--disable-nasm" + ./configure \ --prefix=/usr \ - --disable-readline + --disable-readline \ + ${_extra_conf} make } diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD index 35b89755f..ace758d71 100644 --- a/user/sddm-kcm/APKBUILD +++ b/user/sddm-kcm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=sddm-kcm -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE configuration applet for SDDM" url="https://www.kde.org/" @@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev knewstuff-dev" install_if="systemsettings sddm" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/sddm-kcm-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6500b3a721e4f8798fe1e79647beac11ae6d22bb5df1f5c35d815956535e74aadc9c4ffaee72afd99c2f5ea7acefca040185fe1fc106f3e0a7d62f862c8cfdf0 sddm-kcm-5.18.4.1.tar.xz" +sha512sums="614cb8780549592ffc8f4f310aca7bcdb68b04b847118d77308b039711c81aee7a9c04726d0e2002b3c00a06c09465752a8886374a286574dfb7aeaa0919089c sddm-kcm-5.18.5.tar.xz" diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index 9aaa10397..78ca0f8d5 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -34,6 +34,8 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_JOURNALD=OFF \ + -DNO_SYSTEMD=ON \ + -DUSE_ELOGIND=ON \ -DUID_MIN=500 \ -DUID_MAX=65000 \ ${CMAKE_CROSSOPTS} . diff --git a/user/sddm/sddm.post-install b/user/sddm/sddm.post-install index 3e3850cde..7078e3be2 100644 --- a/user/sddm/sddm.post-install +++ b/user/sddm/sddm.post-install @@ -1,3 +1,3 @@ #!/bin/sh -useradd -G video -c "Display manager user" -d /var/lib/sddm -m -r -s /sbin/nologin -U sddm +useradd -G video -c "Display manager user" -d /var/lib/sddm -m -r -s /sbin/nologin -U sddm || exit 0 diff --git a/user/skanlite/APKBUILD b/user/skanlite/APKBUILD index b639bc7a8..3aef76bc0 100644 --- a/user/skanlite/APKBUILD +++ b/user/skanlite/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=skanlite -pkgver=2.1.0.1 +pkgver=2.2.0 pkgrel=0 pkgdesc="Simple image scanning application" url="https://www.kde.org/applications/graphics/skanlite/" @@ -12,8 +12,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libksane-dev kio-dev kcoreaddons-dev ki18n-dev kxmlgui-dev kdoctools-dev libpng-dev zlib-dev ktextwidgets-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/skanlite/2.1/skanlite-$pkgver.tar.xz - fix-version.patch +source="https://download.kde.org/stable/skanlite/2.2/skanlite-$pkgver.tar.xz + build.patch " build() { @@ -39,5 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658 skanlite-2.1.0.1.tar.xz -91ce7a1f9a2796be511f20978fdea9e19c9eb6415ae5d407fbc855675d2e6809ddc85546b4e018ca0d72262d86104292c81e490613ae9045d10257e646da8732 fix-version.patch" +sha512sums="cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20 skanlite-2.2.0.tar.xz +38c2bd0f30af6a553840394fc341fff05d83af16db8b2c6385417d0b0759dd4fdacbe20d191b4bc3f65605e3c2e4101589c647986baabf2455ec33689289e5f2 build.patch" diff --git a/user/skanlite/build.patch b/user/skanlite/build.patch new file mode 100644 index 000000000..21d0e73bf --- /dev/null +++ b/user/skanlite/build.patch @@ -0,0 +1,27 @@ +From b110846fadeb4f8fab48e0f488a335de7e16a7be Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer <wbauer@tmo.at> +Date: Wed, 15 Jul 2020 09:11:43 +0000 +Subject: [PATCH] Fix compilation with Qt before 5.14 + +This line has been forgotten to be changed in commit 823abcd2, resulting +in a compiler error when e.g. building with Qt 5.12 LTS. +--- + src/SaveLocation.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/SaveLocation.cpp b/src/SaveLocation.cpp +index 9709d49..d210be8 100644 +--- a/src/SaveLocation.cpp ++++ b/src/SaveLocation.cpp +@@ -42,7 +42,7 @@ SaveLocation::SaveLocation(QWidget *parent) + connect(m_ui->u_urlRequester, &KUrlRequester::textChanged, this, &SaveLocation::updateGui); + connect(m_ui->u_imgPrefix, &QLineEdit::textChanged, this, &SaveLocation::updateGui); + #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) +- connect(u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), this, &SaveLocation::updateGui); ++ connect(m_ui->u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated), this, &SaveLocation::updateGui); + #else + connect(m_ui->u_imgFormat, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::textActivated), this, &SaveLocation::updateGui); + #endif +-- +GitLab + diff --git a/user/skanlite/fix-version.patch b/user/skanlite/fix-version.patch deleted file mode 100644 index e5afa0be2..000000000 --- a/user/skanlite/fix-version.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- skanlite-2.0.1/CMakeLists.txt.old 2016-10-26 12:00:57.000000000 -0500 -+++ skanlite-2.0.1/CMakeLists.txt 2018-03-13 17:08:17.378028117 -0500 -@@ -43,7 +43,8 @@ - - set(SKANLITE_VERSION_STRING "2.0.1") - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) -+configure_file("${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h" "${CMAKE_CURRENT_BINARY_DIR}/src/version.h" COPYONLY) -+#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) - - find_package(KF5 ${KF5_VERSION} REQUIRED - COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED) ---- skanlite-2.0.1/src/main.cpp.old 2016-10-26 17:00:34.000000000 +0000 -+++ skanlite-2.0.1/src/main.cpp 2018-03-13 22:59:18.898057063 +0000 -@@ -44,7 +44,7 @@ - - KAboutData aboutData(QLatin1String("Skanlite"), // componentName, k4: appName - i18n("Skanlite"), // displayName, k4: programName -- QLatin1String(skanlite_version), // version -+ QLatin1String(SKANLITE_VERSION_STRING), // version - i18n("Scanning application by KDE based on libksane."), // shortDescription - KAboutLicense::GPL, // licenseType - i18n("(C) 2008-2016 Kåre Särs"), // copyrightStatement diff --git a/user/sntpd/APKBUILD b/user/sntpd/APKBUILD index d15fbff92..5171813e7 100644 --- a/user/sntpd/APKBUILD +++ b/user/sntpd/APKBUILD @@ -1,24 +1,17 @@ # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=sntpd -pkgver=3.0_git20190119 -_commit=7e372536855687f0af3c7ddde5fcb965b93d5d1e +pkgver=3.0 pkgrel=0 pkgdesc="A small SNTP client for UNIX systems, implementing RFC 1305 and RFC 4330" url="https://github.com/troglobit/sntpd" arch="all" license="GPL-2.0-only" depends="" -makedepends="autoconf automake" +makedepends="" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/troglobit/sntpd/archive/$_commit.tar.gz +source="https://github.com/troglobit/sntpd/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz select.patch " -builddir="$srcdir/$pkgname-$_commit" - -prepare() { - default_prepare - autoreconf -vif -} build() { ./configure \ @@ -31,6 +24,8 @@ build() { --localstatedir=/var \ --disable-debug \ --enable-replay \ + --with-adjtimex \ + --with-ntpclient \ --without-systemd make } @@ -43,5 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="49a9d16c2aef82c3d009f3e5678763d440764c67e4d7b27b07deac71ae9cb6d3b64a0991d3a79904b397441d9ce480287bb022d5e466fc99bbc393dc9d79b2a5 sntpd-3.0_git20190119.tar.gz -09ddc920bdbb00480859a8e9cd7b06bcfe73a6d51d070dde6bf78038bae11092fff9c72a401e1a3d7e3e6f6dcd1bdb6cec3b025ccc07608a8feb0ddaa854c678 select.patch" +sha512sums="664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea sntpd-3.0.tar.gz +966ae71a41f31b37b0be8dc361471f72d085ca06161deeedc37cc82d6b80852ca79b37bfc8f9948988bedaeba6a77a0b4edf19848a12e8107ec13ab86524c5dd select.patch" diff --git a/user/sntpd/select.patch b/user/sntpd/select.patch index 00121d80b..f0e25055a 100644 --- a/user/sntpd/select.patch +++ b/user/sntpd/select.patch @@ -1,10 +1,10 @@ select(3) does not modify its timeout in musl, as permitted by POSIX ---- sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c -+++ sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c -@@ -686,7 +686,7 @@ static void primary_loop(int usd, struct ntp_control *ntpc) - ERR(errno, "Failed select()"); +--- sntpd-3.0/src/sntpd.c ++++ sntpd-3.0/src/sntpd.c +@@ -663,7 +663,7 @@ static void loop(struct ntp_control *ntpc) continue; } + - if (to.tv_sec == 0) { + if (1) { if (probes_sent >= ntpc->probe_count && ntpc->probe_count != 0) diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD index dd7aeb4b8..f70823845 100644 --- a/user/socat/APKBUILD +++ b/user/socat/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=socat pkgver=1.7.3.4 pkgrel=0 diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index cf8661073..35f373463 100644 --- a/user/solid/APKBUILD +++ b/user/solid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=solid -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f6474541e90af822353f15093ee11eafda1e135059e35219284e8a2ab7a5a606bd9df31ccb491d72c9dacd40ffb0ad87a697aaa47108a94c57c955734f4b3df0 solid-5.72.0.tar.xz" +sha512sums="cc0190327552c63bca8627b96d9f59ec9fb4e4c1842d36c42455e8a458f97f972274765a94b70f311a4105d33f0abbd921b10a2db2b1e7f4c492e92268ca68b1 solid-5.74.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index 6b41e300f..1423cc853 100644 --- a/user/sonnet/APKBUILD +++ b/user/sonnet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sonnet -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -47,4 +47,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="8c5f552d9676d9be3cef0c69e986fbdd8b523d343e2a71e866a745ff555e5bb83829ab7a0ef7c1460104f91395ac912308c14c8c29da79e5d021d0401ce211d4 sonnet-5.72.0.tar.xz" +sha512sums="80f19d6f7c168f6daed208769c5abe1c664b48cd5d8f3ddd75f3992f917859d14281ed12b819b5bc9f501849243de639388a8e47dc60e0d3bda0e5b8426a54e6 sonnet-5.74.0.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 95170e3cc..4b47b78e3 100644 --- a/user/spectacle/APKBUILD +++ b/user/spectacle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spectacle -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ba2fdcf4c57efe213e79638a0b81c3061e2df432a4702b2d4830dfb3ed9c2f10cd6573b678b153a95414fee4807320345001f416db348a2b6633afbc5b93c546 spectacle-20.04.3.tar.xz -4bade3af7f06a1b2eb9568eee2905db04d8aa8647fa9414ba1da32cc2ea5e7029b9db2ad121381a04754b1abea36508b82e68a326db726759943aac5206fb455 no-wayland.patch" +sha512sums="83adc382c66173c3733dc603a7e7b957856b735af7764c66624158f39ba8bc8ce08e12d46d12781d5a21c2e09ba17ebb651f62dcf06ad032c409aae68f1b42a0 spectacle-20.08.1.tar.xz +a138cc146e998648d2d99b21c935ab648751c6d66d7be6030e25829a3c001384811066099e3da3f0d4c546c62fbcac243a6a2c54aac8367bcc07bd89c683f7df no-wayland.patch" diff --git a/user/spectacle/no-wayland.patch b/user/spectacle/no-wayland.patch index 50c7cc8b7..300c50b8d 100644 --- a/user/spectacle/no-wayland.patch +++ b/user/spectacle/no-wayland.patch @@ -119,17 +119,16 @@ index 7024750..40417bb 100644 #include <KWindowSystem> #include <QApplication> -@@ -54,8 +51,7 @@ SpectacleCore::SpectacleCore(StartMode theStartMode, - mPlatform(loadPlatform()), +@@ -46,7 +46,6 @@ + QObject(parent), mMainWindow(nullptr), - mIsGuiInited(false), -- mCopyToClipboard(theCopyToClipboard), +- mIsGuiInited(false), - mWaylandPlasmashell(nullptr) -+ mCopyToClipboard(theCopyToClipboard) ++ mIsGuiInited(false) { - auto lConfig = KSharedConfig::openConfig(QStringLiteral("spectaclerc")); - KConfigGroup lGuiConfig(lConfig, "GuiConfig"); -@@ -92,24 +88,6 @@ SpectacleCore::SpectacleCore(StartMode theStartMode, + } + +@@ -66,23 +65,6 @@ connect(lExportManager, &ExportManager::forceNotify, this, &SpectacleCore::doNotify); connect(mPlatform.get(), &Platform::windowTitleChanged, lExportManager, &ExportManager::setWindowTitle); @@ -150,10 +149,9 @@ index 7024750..40417bb 100644 - registry->setup(); - connection->roundtrip(); - } -- - switch (theStartMode) { - case StartMode::DBus: - break; + setUpShortcuts(); + } + @@ -245,7 +223,7 @@ void SpectacleCore::screenshotUpdated(const QPixmap &thePixmap) if (lExportManager->captureMode() == Spectacle::CaptureMode::RectangularRegion) { diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index e52d25653..98204837d 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=spectrwm pkgver=3.4.1 _pkgver=$(printf '%s' "$pkgver" | tr . _) diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 76b564d60..d9073a26d 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1df12a6994a0f3e62bff837fc8e0ff8fc9b4afb651f51ee1e14e4cdc80905fc21d7a9af540433e0f97a7040e2ed4968d9a81a4f868bb46b07c0c7ad1efb21f96 step-20.04.3.tar.xz" +sha512sums="91b28b5758bb43a28c7cc891c48edef3f8efe7821cf37cc501907c373d05ab40080d4e66199b436efc16c117063ab7d6951e9b3b3855d832e304935d6e7be4b7 step-20.08.1.tar.xz" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 735783ba0..a941f9417 100644 --- a/user/syntax-highlighting/APKBUILD +++ b/user/syntax-highlighting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=syntax-highlighting -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cbeb375a0c5af7646848f6d2df112f5ded5cb8614ab8054fae4133ff5420624879bb3db57928d5528731f100497ccb30b348555444eded5a87b95be49e747c23 syntax-highlighting-5.72.0.tar.xz" +sha512sums="6dfc9540ca4ec2c76c9b96a864a24bba6923529d72605dcd36136809250be12c366f52bf3dda02564169744729172eec2f0d3f69137d374d81af826ec97bc3b7 syntax-highlighting-5.74.0.tar.xz" diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD index 87c2c6793..06451dc01 100644 --- a/user/systemsettings/APKBUILD +++ b/user/systemsettings/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=systemsettings -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="KDE system settings configuration utility" url="https://www.kde.org/" @@ -15,7 +15,7 @@ makedepends="$depends_dev cmake extra-cmake-modules kactivities-stats-dev kiconthemes-dev kitemmodels-dev kio-dev kirigami2-dev kwindowsystem-dev kxmlgui-dev libkworkspace-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/systemsettings-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/systemsettings-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="07e3658affdf4b65967722a92906a3a017b9217ee7443e57e07d9a7a22753fdbd27840e10dfc3716bf193c155ca2fc0d916fb6320852a352b0d0dcfc07be6ae2 systemsettings-5.18.4.1.tar.xz" +sha512sums="b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a systemsettings-5.18.5.tar.xz" diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index a683848a4..677dd6007 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -19,6 +19,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxml2-dev libxslt-dev subpackages="$pkgname-doc $pkgname-lang" source="http://tellico-project.org/files/tellico-$pkgver.tar.xz btparse-strcasecmp.patch + modern-taglib.patch " build() { @@ -41,7 +42,7 @@ check() { # htmlexporter: needs plasma desktop # filelisting: needs dbus # tellicoread: needs network - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|pdf|tellicoread)test' + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(cite|csv|filelisting|imagejob|htmlexporter|pdf|tellicoread|comparison)test' } package() { @@ -49,4 +50,5 @@ package() { } sha512sums="12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74 tellico-3.3.1.tar.xz -4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" +4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch +1d2b7825249167868b4127e424b3763551d9c361c500bb251b2e22e6e0b938e3015454092ec9e4724b2fd7a3bc1b059f9ead52cf75b7c85ca3a66d0fc3fe57e5 modern-taglib.patch" diff --git a/user/tellico/modern-taglib.patch b/user/tellico/modern-taglib.patch new file mode 100644 index 000000000..194914da8 --- /dev/null +++ b/user/tellico/modern-taglib.patch @@ -0,0 +1,13 @@ +Fix build with Taglib's built-in CMake module. +--- tellico-3.3.1/CMakeLists.txt.old 2020-06-01 00:57:12.000000000 +0000 ++++ tellico-3.3.1/CMakeLists.txt 2021-01-28 04:48:08.457839033 +0000 +@@ -128,7 +128,8 @@ + TYPE OPTIONAL) + if(TAGLIB_FOUND) + add_definitions(${TAGLIB_CFLAGS}) +- include_directories(${TAGLIB_INCLUDES}) ++ include_directories(${Taglib_INCLUDE_DIRS}) ++ set(TAGLIB_LIBRARIES ${Taglib_LIBRARIES}) + endif(TAGLIB_FOUND) + + find_package(Yaz 2.0) diff --git a/user/testdisk/APKBUILD b/user/testdisk/APKBUILD new file mode 100644 index 000000000..8dfe19a0a --- /dev/null +++ b/user/testdisk/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: CyberLeo <cyberleo@cyberleo.net> +# Maintainer: CyberLeo <cyberleo@cyberleo.net> +pkgname=testdisk +pkgver=7.1 +pkgrel=0 +pkgdesc="A data recovery suite" +url="https://www.cgsecurity.org/wiki/TestDisk" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="e2fsprogs-dev ntfs-3g-dev ncurses-dev zlib-dev libjpeg-turbo-dev" +subpackages="$pkgname-doc" +source="https://www.cgsecurity.org/testdisk-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5 testdisk-7.1.tar.bz2" diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD index fe0609d9c..35f164eec 100644 --- a/user/tf/APKBUILD +++ b/user/tf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=tf pkgver=5.0b8 _pkgver=${pkgver%.*}${pkgver#*.} diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index 46bf456ac..c49e64447 100644 --- a/user/threadweaver/APKBUILD +++ b/user/threadweaver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=threadweaver -pkgver=5.72.0 +pkgver=5.74.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="83f3e1893bc7273ad70dc300bde77247b6fcde6b63c478b12fd150b0dc5e514acca2448cd7a3a9f42eaa7d95a8243ce5ece1e55a4176c1069cd62b7466cb195a threadweaver-5.72.0.tar.xz" +sha512sums="b419a80eb13366d3a71cd2d894a57f7834a9afb8472f88603fb9b24d678fa546da9fc96ff3a0af5e4db14f5bbbb52e2eb00f7ef2429a94b3b413a0026b69d899 threadweaver-5.74.0.tar.xz" diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index bfbc5a1ce..60dc36691 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=thunar-volman pkgver=0.9.5 pkgrel=0 diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 664fbef09..8bfa1164f 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=thunar pkgver=1.8.15 pkgrel=0 diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD index c55e5453c..a78279253 100644 --- a/user/trojita/APKBUILD +++ b/user/trojita/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=trojita pkgver=0.7 -pkgrel=0 +pkgrel=1 pkgdesc="Qt-based IMAP email client" url="http://trojita.flaska.net/" arch="all" @@ -15,7 +15,15 @@ makedepends="cmake extra-cmake-modules zlib-dev qt5-qtbase-dev qt5-qtwebkit-dev qtkeychain-dev" source="https://sourceforge.net/projects/trojita/files/src/trojita-$pkgver.tar.xz use-qgpgme.patch - fix-gpg.patch" + fix-gpg.patch + CVE-2019-10734.patch + CVE-2020-15047.patch + " + +# secfixes: +# 0.7-r1: +# - CVE-2019-10734 +# - CVE-2020-15047 build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -34,7 +42,8 @@ build() { } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # test_Html_formatting: requires X11 + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E test_Html_formatting } package() { @@ -43,4 +52,6 @@ package() { sha512sums="fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 trojita-0.7.tar.xz 740c2410d7236d722482f05dd1d2c681e35543620823cb7c1396710081f9de4f6ae530c5b5442ecf5d08a8e552f0697f3a35bf51e07a3b4336dec7021b665706 use-qgpgme.patch -9d0fbf7c0b0f6975990a7705f9d43043e5807401cee179d7a07f9514856332d6bb1aa8448e84d0083003c34a3bb181080b973e8c1f77d1b5a8930d07d57702da fix-gpg.patch" +9d0fbf7c0b0f6975990a7705f9d43043e5807401cee179d7a07f9514856332d6bb1aa8448e84d0083003c34a3bb181080b973e8c1f77d1b5a8930d07d57702da fix-gpg.patch +db96a566924b5d7b80787ab624af3726d5dd3459653192436a377d6482ab73801a7dcca1df1b1d937cf0d0798b827e04f8ef2c1124f91dc9da3e8036ef61e28a CVE-2019-10734.patch +2477612aca1e558fa3ba2b434a701cc255c573ac7e2001e7b5921c9b991f7c95720f53b70b49824e36bafb53ab53477950cb8d436e637fda4d59c7ec5883ce5f CVE-2020-15047.patch" diff --git a/user/trojita/CVE-2019-10734.patch b/user/trojita/CVE-2019-10734.patch new file mode 100644 index 000000000..d52edb042 --- /dev/null +++ b/user/trojita/CVE-2019-10734.patch @@ -0,0 +1,104 @@ +From 8db7f450d52539b4c72ee968384911b6813ad1e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> +Date: Thu, 25 Jun 2020 21:39:34 +0200 +Subject: [PATCH] Prevent a possible decryption oracle attack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Jens Mueller (Ruhr-Uni Bochum and FH Münster) for reporting +this. The gist is that an attacker can embed arbitrary ciphertext into +their messages. Trojita decrypts that, and when we hit reply, the +original *cleartext* gets quoted and put into a reply for the attacker +to see. + +Fix this by not quoting any plaintext which originated in an encrypted +message. That's pretty draconian, but hey, it works and we never came up +with any better patch. Also, given that Trojita does not encrypt +outgoing messages yet, this is probably also a conservative thing to do. + +Change-Id: I84c45b9e707eb7c99eb7183c6ef59ef41cd62c43 +CVE: CVE-2019-10734 +BUG: 404697 +--- + src/Cryptography/GpgMe++.cpp | 2 ++ + src/Gui/MessageView.cpp | 9 ++++++++- + src/Gui/PartWidget.cpp | 8 ++++++++ + src/Imap/Model/ItemRoles.h | 2 +- + 4 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/src/Cryptography/GpgMe++.cpp b/src/Cryptography/GpgMe++.cpp +index e012f603..716b8aff 100644 +--- a/src/Cryptography/GpgMe++.cpp ++++ b/src/Cryptography/GpgMe++.cpp +@@ -267,6 +267,8 @@ QVariant GpgMePart::data(int role) const + switch (role) { + case Imap::Mailbox::RolePartSignatureVerifySupported: + return m_wasSigned; ++ case RolePartDecryptionSupported: ++ return m_isAllegedlyEncrypted; + case RolePartCryptoNotFinishedYet: + return m_waitingForData || + (m_crypto.valid() && +diff --git a/src/Gui/MessageView.cpp b/src/Gui/MessageView.cpp +index 7d649308..c95e0878 100644 +--- a/src/Gui/MessageView.cpp ++++ b/src/Gui/MessageView.cpp +@@ -354,7 +354,6 @@ bool MessageView::eventFilter(QObject *object, QEvent *event) + QString MessageView::quoteText() const + { + if (auto w = bodyWidget()) { +- QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n'))); + const Imap::Message::Envelope &e = message.data(Imap::Mailbox::RoleMessageEnvelope).value<Imap::Message::Envelope>(); + QString sender; + if (!e.from.isEmpty()) +@@ -362,6 +361,14 @@ QString MessageView::quoteText() const + if (e.from.isEmpty()) + sender = tr("you"); + ++ if (messageModel->index(0, 0) /* fake message root */.child(0, 0) /* first MIME part */.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) { ++ // This is just an UX improvement shortcut: real filtering for CVE-2019-10734 is in ++ // MultipartSignedEncryptedWidget::quoteMe(). ++ // That is required because the encrypted part might not be the root part of the message. ++ return tr("On %1, %2 sent an encrypted message:\n> ...\n\n").arg(e.date.toLocalTime().toString(Qt::SystemLocaleLongDate), sender); ++ } ++ ++ QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n'))); + // One extra newline at the end of the quoted text to separate the response + quote << QString(); + +diff --git a/src/Gui/PartWidget.cpp b/src/Gui/PartWidget.cpp +index bb27604d..96eff338 100644 +--- a/src/Gui/PartWidget.cpp ++++ b/src/Gui/PartWidget.cpp +@@ -378,6 +378,14 @@ void MultipartSignedEncryptedWidget::updateStatusIndicator() + + QString MultipartSignedEncryptedWidget::quoteMe() const + { ++ if (m_partIndex.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) { ++ // See CVE-2019-10734, the point is not to leak cleartext from encrypted content. Even when Trojita starts supporting ++ // encryption of outgoing mail, we will have to check whether the encrypted cleartext is from the same sender, whether ++ // it matches the list of recipients (which is dynamic and can be set later on), etc etc. ++ // TL;DR, this is a can of worms. ++ return tr("[Encrypted message]"); ++ } ++ + return quoteMeHelper(children()); + } + +diff --git a/src/Imap/Model/ItemRoles.h b/src/Imap/Model/ItemRoles.h +index 4588d4d0..00adb3bb 100644 +--- a/src/Imap/Model/ItemRoles.h ++++ b/src/Imap/Model/ItemRoles.h +@@ -193,7 +193,7 @@ enum { + RolePartSignatureVerifySupported, + /** @short Is the format of this particular multipart/encrypted supported and recognized? + +- See RolePartSignatureVerifySupported, this is an equivalent. ++ If true, this message part represents content of an encrypted message that Trojita can attempt to decrypt. + */ + RolePartDecryptionSupported, + /** @short Is there any point in waiting longer? +-- +GitLab + diff --git a/user/trojita/CVE-2020-15047.patch b/user/trojita/CVE-2020-15047.patch new file mode 100644 index 000000000..6199c01fd --- /dev/null +++ b/user/trojita/CVE-2020-15047.patch @@ -0,0 +1,88 @@ +From 77ddd5d44f2bf4155d0c9b6f7d05f01713b32d5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> +Date: Thu, 25 Jun 2020 11:30:51 +0200 +Subject: [PATCH] SMTP: Do not ignore TLS errors + +This fixes a CVE-2020-15047 (category: CWE-295). Since commit 0083eea5ed +which added initial, experimental support for SMTP message submission, +we have apparently never implemented proper SSL/TLS error handling, and +the code has ever since just kept silently ignoring any certificate +verification errors. As a result, Trojita was susceptible to a MITM +attack when sending e-mails. The information leaked include user's +authentication details, including the password, and the content of sent +messages. + +Sorry for this :(. + +Now, this patch re-enabes proper TLS error handling. It was not possible +to directly re-use our code for TLS key pinning which we are using for +IMAP connections. In the Qt TLS code, the decision to accept or not +accept a TLS connection is a blocking one, so the IMAP code relies upon +the protocol state machine (i.e., another layer) for deciding whether to +use or not to use the just-established TLS connection. Implementing an +equivalent code in the SMTP library would be nice, but this hot-fix has +a priority. As a result, SMTP connections to hosts with, e.g., +self-signed TLS certs, are no longer possible. Let's hope that this is +not a practical problem with Lets Encrypt anymore. + +Thanks to Damian Poddebniak for reporting this bug. + +Change-Id: Icd6bbb2b0fb3e45159fc9699ebd07ab84262fe37 +CVE: CVE-2020-15047 +BUG: 423453 +--- + src/MSA/SMTP.cpp | 11 +++++++++-- + src/MSA/SMTP.h | 1 + + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/MSA/SMTP.cpp b/src/MSA/SMTP.cpp +index 3a054516..ac1eefc5 100644 +--- a/src/MSA/SMTP.cpp ++++ b/src/MSA/SMTP.cpp +@@ -21,6 +21,7 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "SMTP.h" ++#include "UiUtils/Formatting.h" + + namespace MSA + { +@@ -32,8 +33,8 @@ SMTP::SMTP(QObject *parent, const QString &host, quint16 port, bool encryptedCon + user(user), failed(false), isWaitingForPassword(false), sendingMode(MODE_SMTP_INVALID) + { + qwwSmtp = new QwwSmtpClient(this); +- // FIXME: handle SSL errors properly +- connect(qwwSmtp, &QwwSmtpClient::sslErrors, qwwSmtp, &QwwSmtpClient::ignoreSslErrors); ++ // FIXME: handle SSL errors in the same way as we handle IMAP TLS errors, with key pinning, etc. ++ connect(qwwSmtp, &QwwSmtpClient::sslErrors, this, &SMTP::handleSslErrors); + connect(qwwSmtp, &QwwSmtpClient::connected, this, &AbstractMSA::sending); + connect(qwwSmtp, &QwwSmtpClient::done, this, &SMTP::handleDone); + connect(qwwSmtp, &QwwSmtpClient::socketError, this, &SMTP::handleError); +@@ -78,6 +79,12 @@ void SMTP::handleError(QAbstractSocket::SocketError err, const QString &msg) + emit error(msg); + } + ++void SMTP::handleSslErrors(const QList<QSslError>& errors) ++{ ++ auto msg = UiUtils::Formatting::sslErrorsToHtml(errors); ++ emit error(tr("<p>Cannot send message due to an SSL/TLS error</p>\n%1").arg(msg)); ++} ++ + void SMTP::setPassword(const QString &password) + { + pass = password; +diff --git a/src/MSA/SMTP.h b/src/MSA/SMTP.h +index 453407d3..913bb873 100644 +--- a/src/MSA/SMTP.h ++++ b/src/MSA/SMTP.h +@@ -43,6 +43,7 @@ public slots: + virtual void setPassword(const QString &password); + void handleDone(bool ok); + void handleError(QAbstractSocket::SocketError err, const QString &msg); ++ void handleSslErrors(const QList<QSslError>& errors); + private: + QwwSmtpClient *qwwSmtp; + QString host; +-- +GitLab + diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 9d5b07819..2061b3e23 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-sudo/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ttf-sudo -pkgver=0.42 +pkgver=0.50 pkgrel=0 pkgdesc="Monospaced font family for programming and console users" url="https://www.kutilek.de/sudo-font/" @@ -9,9 +9,9 @@ arch="noarch" options="!check" # No test suite. license="OFL-1.1" depends="fontconfig" -makedepends="" -source="https://github.com/jenskutilek/sudo-font/releases/download/v$pkgver/sudo.zip" -builddir="$srcdir/sudo" +makedepends="unzip" +source="$pkgname-$pkgver.tar.gz::https://github.com/jenskutilek/sudo-font/archive/v${pkgver}.tar.gz" +builddir="$srcdir/sudo-font-$pkgver/sudo" package() { mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-} @@ -20,4 +20,4 @@ package() { done } -sha512sums="e48016ed1a4f6cc29f7301667a7e6a4cb7c09c85a2410c8eea3cfadb0b89ed29495834c5ac007f05b3fa25d63f3597118ac468fba4c2913282810cc23dd755e0 sudo.zip" +sha512sums="d48020d5261f9b968ad2fc92f88ce4b1482e3b752b33b50452875951b09cd7472d520b60380321af49404de7986b06d6e653017a07e6a8687792f333a96e8532 ttf-sudo-0.50.tar.gz" diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD index fd1543413..0db340268 100644 --- a/user/ttf-terminus/APKBUILD +++ b/user/ttf-terminus/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=ttf-terminus pkgver=4.47.0 pkgrel=0 diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 723a1b2ff..78b406db1 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=tumbler -pkgver=0.2.8 +pkgver=0.3.0 pkgrel=0 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" @@ -12,7 +12,7 @@ makedepends="intltool dbus-glib-dev gdk-pixbuf-dev curl-dev freetype-dev libjpeg-turbo-dev libgsf-dev poppler-dev ffmpegthumbnailer-dev libopenraw-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/tumbler/${pkgver%.*}/tumbler-$pkgver.tar.bz2" build() { LIBS="-lintl" ./configure \ @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb tumbler-0.2.8.tar.bz2" +sha512sums="e216a9c8c659457c6e6dbb40d95cd9a34d64d204fea9523d0a66f1c331108f6e01fb83d668b99eed73ed26579ae3a717cd3215ddceaebfff888d942ecb18469b tumbler-0.3.0.tar.bz2" diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD index c25bc1baf..6e3c9b234 100644 --- a/user/uchardet/APKBUILD +++ b/user/uchardet/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=uchardet pkgver=0.0.7 pkgrel=0 diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index e5660e0ab..8488e0672 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=umbrello -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="dd85330578a8c9a9568ce40758d76848fee76fa4ac16a44faeeb064480910038d734876ef9e2475e01e75a13f3d0b8d444fbf78542c9648ee6a8f59b4dc9b83c umbrello-20.04.3.tar.xz +sha512sums="42ddc364bcccee88cd210183148e0a246c0efd2ebe2c5bca0a77260e772738ef0d74d8745133d45daa94e839cf3fe6ac46e65fced23cd8382cc7218689259710 umbrello-20.08.1.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/unbound/APKBUILD b/user/unbound/APKBUILD index 9883dce69..846ce8131 100644 --- a/user/unbound/APKBUILD +++ b/user/unbound/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=unbound pkgver=1.9.6 diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD index 42ec0b956..cc2aedf7e 100644 --- a/user/unicode-data/APKBUILD +++ b/user/unicode-data/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=unicode-data pkgver=13.0.0 pkgrel=0 diff --git a/user/unixodbc/APKBUILD b/user/unixodbc/APKBUILD index 03f3c78cc..592feea9b 100644 --- a/user/unixodbc/APKBUILD +++ b/user/unixodbc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=unixodbc -pkgver=2.3.7 +pkgver=2.3.9 pkgrel=0 pkgdesc="Unix ODBC driver manager and database drivers" url="http://www.unixodbc.org/" @@ -30,4 +30,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70 unixODBC-2.3.7.tar.gz" +sha512sums="6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb unixODBC-2.3.9.tar.gz" diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD index 22e1b57c6..bb63fac47 100644 --- a/user/uptimed/APKBUILD +++ b/user/uptimed/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=uptimed -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=0 pkgdesc="System uptime record daemon" arch="all" @@ -35,5 +35,5 @@ package() { "$pkgdir"/etc/init.d/uptimed } -sha512sums="a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f uptimed-0.4.2.tar.gz +sha512sums="f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260 uptimed-0.4.3.tar.gz 0884e9f5ace5a69b8eea4401c7f3b84f0a434f0ceb2b920919e83f318eb9e54182932de174cf1666ddddbab84c146781f3dd78571e80cc274963a72bf4f53a6b uptimed.init" diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD index f8b5b947c..710169b62 100644 --- a/user/user-manager/APKBUILD +++ b/user/user-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=user-manager -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Manage user accounts from KDE" url="https://www.KDE.org/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kauth-dev kcmutils-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kiconthemes-dev kio-dev kwidgetsaddons-dev libpwquality-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/user-manager-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/$pkgver/user-manager-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc05602587bfcd8df80bd7bd96de8160e60389aa9e829ad4666706ca5a61ae4f9e282de4fdc42f5245e51ae2ed877053379c6047f7cab7590c56cb02bcde836d user-manager-5.18.4.1.tar.xz" +sha512sums="fd3f26f1f95782e4e2ca04e92adc38953d026db9e840f823be38f66f9c790a9e154255dd821358f62c624194be8b4867354292df25289092ceaf87ce590cc9a8 user-manager-5.18.5.tar.xz" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index f578de6a4..902d561d4 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=vala -pkgver=0.48.7 +pkgver=0.50.0 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882 vala-0.48.7.tar.xz" +sha512sums="e749eceeec0f19f41bb08fd20ee677f910ed5f1aee79e64a2cd948dd382df39a5bc8292c9f09c44042ab2516a2155d6db36512a7b98800066c607d8c83a67dc1 vala-0.50.0.tar.xz" diff --git a/user/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD index bfeee2132..130775916 100644 --- a/user/vamp-sdk/APKBUILD +++ b/user/vamp-sdk/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=vamp-sdk pkgver=2.7.1 pkgrel=0 diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 13fefc76c..fb508f43b 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.11 +pkgver=3.0.11.1 pkgrel=0 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" @@ -205,7 +205,7 @@ libs() { default_libs } -sha512sums="8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444 vlc-3.0.11.tar.xz +sha512sums="8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b vlc-3.0.11.1.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch diff --git a/user/volume_key/APKBUILD b/user/volume_key/APKBUILD index 54fa07ad4..d44652732 100644 --- a/user/volume_key/APKBUILD +++ b/user/volume_key/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=volume_key pkgver=0.3.12 -pkgrel=0 +pkgrel=1 pkgdesc="Storage volume encryption key management library" url="https://pagure.io/volume_key" arch="all" diff --git a/user/vorbis-tools/APKBUILD b/user/vorbis-tools/APKBUILD new file mode 100644 index 000000000..eaf358c07 --- /dev/null +++ b/user/vorbis-tools/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=vorbis-tools +pkgver=1.4.0 +pkgrel=1 +pkgdesc="Tools for Ogg-Vorbis" +url="https://www.xiph.org/vorbis" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="curl-dev flac-dev libvorbis-dev + libao-dev speex-dev" +subpackages="$pkgname-lang $pkgname-doc" +source="http://downloads.xiph.org/releases/vorbis/vorbis-tools-$pkgver.tar.gz + CVE-2014-9638-and-9639.patch + CVE-2014-9640.patch + CVE-2015-6749.patch + " + +prepare() { + update_config_guess + default_prepare +} + +build() { + ./configure \ + --prefix=/usr \ + --enable-vcut + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99 vorbis-tools-1.4.0.tar.gz +fbe006c1de1b5d03dd84a3213d840468658129bc83f1fad9bcb738d53fd0f76b5f2ebc17b95c456d8b73456b313282bad5e08703649ba8b506371e6c8b466557 CVE-2014-9638-and-9639.patch +9cb9ca5a7cc648e75a4b0027f29f59edd81156578864c46cc2ff773435175a35ea2f31da480e983d05c23d1285d59f0f8a0ec97dd57ba8c11ee5786b619fbaa2 CVE-2014-9640.patch +bf49f572e023678a12d764e459d518f067499a07bd9fe6c037e00730349e066d96174a52043f61dff44fd788b336018c68ae4d26ebe279dc6bf0a07852048ff0 CVE-2015-6749.patch" diff --git a/user/vorbis-tools/CVE-2014-9638-and-9639.patch b/user/vorbis-tools/CVE-2014-9638-and-9639.patch new file mode 100644 index 000000000..2585b47be --- /dev/null +++ b/user/vorbis-tools/CVE-2014-9638-and-9639.patch @@ -0,0 +1,87 @@ +From 3bbabc06c4b35c84f6747ed850213161aca568c7 Mon Sep 17 00:00:00 2001 +From: Petter Reinholdtsen <pere@debian.org> +Date: Tue, 22 Sep 2015 15:14:06 +0200 +Subject: [PATCH] oggenc: validate count of channels in the header + (CVE-2014-9638 & CVE-2014-9639) + +Author: Kamil Dudka <kdudka@redhat.com> +Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html +Bug: https://trac.xiph.org/ticket/2136 +Bug: https://trac.xiph.org/ticket/2137 +Bug-Debian: https://bugs.debian.org/776086 +Forwarded: not-needed +Reviewed-By: Petter Reinholdtsen <pere@hungry.com> +Last-Update: 2015-09-22 +--- + oggenc/audio.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/oggenc/audio.c b/oggenc/audio.c +index 4921fb9..535a704 100644 +--- a/oggenc/audio.c ++++ b/oggenc/audio.c +@@ -13,6 +13,7 @@ + #include <config.h> + #endif + ++#include <limits.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + aiff_fmt format; + aifffile *aiff = malloc(sizeof(aifffile)); + int i; ++ long channels; + + if(buf[11]=='C') + aifc=1; +@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + return 0; + } + +- format.channels = READ_U16_BE(buffer); ++ format.channels = channels = READ_U16_BE(buffer); + format.totalframes = READ_U32_BE(buffer+2); + format.samplesize = READ_U16_BE(buffer+6); + format.rate = (int)read_IEEE80(buffer+8); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); ++ return 0; ++ } + aiff->bigendian = 1; + + if(aifc) +@@ -416,6 +423,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + wav_fmt format; + wavfile *wav = malloc(sizeof(wavfile)); + int i; ++ long channels; + + /* Ok. At this point, we know we have a WAV file. Now we have to detect + * whether we support the subtype, and we have to find the actual data +@@ -453,12 +461,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + } + + format.format = READ_U16_LE(buf); +- format.channels = READ_U16_LE(buf+2); ++ format.channels = channels = READ_U16_LE(buf+2); + format.samplerate = READ_U32_LE(buf+4); + format.bytespersec = READ_U32_LE(buf+8); + format.align = READ_U16_LE(buf+12); + format.samplesize = READ_U16_LE(buf+14); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); ++ return 0; ++ } ++ + if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ + { + if(len<40) +-- +GitLab + diff --git a/user/vorbis-tools/CVE-2014-9640.patch b/user/vorbis-tools/CVE-2014-9640.patch new file mode 100644 index 000000000..f21994b58 --- /dev/null +++ b/user/vorbis-tools/CVE-2014-9640.patch @@ -0,0 +1,51 @@ +From 514116d7bea89dad9f1deb7617b2277b5e9115cd Mon Sep 17 00:00:00 2001 +From: Gregory Maxwell <greg@xiph.org> +Date: Wed, 16 Apr 2014 23:55:10 +0000 +Subject: [PATCH] oggenc: fix crash on raw file close, reported by Hanno in + issue #2009. pointer to a non-static struct was escaping its scope. Also fix + a C99-ism. + +svn path=/trunk/vorbis-tools/; revision=19117 +--- + oggenc/oggenc.c | 4 ++-- + oggenc/skeleton.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c +index 4a120f3..e7de0bb 100644 +--- a/oggenc/oggenc.c ++++ b/oggenc/oggenc.c +@@ -97,6 +97,8 @@ int main(int argc, char **argv) + .3,-1, + 0,0,0.f, + 0, 0, 0, 0, 0}; ++ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", ++ N_("RAW file reader")}; + + int i; + +@@ -239,8 +241,6 @@ int main(int argc, char **argv) + + if(opt.rawmode) + { +- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", +- N_("RAW file reader")}; + + enc_opts.rate=opt.raw_samplerate; + enc_opts.channels=opt.raw_channels; +diff --git a/oggenc/skeleton.h b/oggenc/skeleton.h +index cf87dc2..168b8b6 100644 +--- a/oggenc/skeleton.h ++++ b/oggenc/skeleton.h +@@ -41,7 +41,7 @@ typedef struct { + ogg_int64_t granule_rate_d; /* granule rate denominator */ + ogg_int64_t start_granule; /* start granule value */ + ogg_uint32_t preroll; /* preroll */ +- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ ++ unsigned char granule_shift; /* 1 byte value holding the granule shift */ + char *message_header_fields; /* holds all the message header fields */ + /* current total size of the message header fields, for realloc purpose, initially zero */ + ogg_uint32_t current_header_size; +-- +GitLab + diff --git a/user/vorbis-tools/CVE-2015-6749.patch b/user/vorbis-tools/CVE-2015-6749.patch new file mode 100644 index 000000000..b83f70cc2 --- /dev/null +++ b/user/vorbis-tools/CVE-2015-6749.patch @@ -0,0 +1,46 @@ +From c1059cd1e5c9278fe73a044d0e0792cac75f44b3 Mon Sep 17 00:00:00 2001 +From: Petter Reinholdtsen <pere@debian.org> +Date: Tue, 22 Sep 2015 14:56:58 +0200 +Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input (CVE-2015-6749). + +Author: Mark Harris <mark.hsj@gmail.com> +Origin: https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch +Bug-Debian: https://bugs.debian.org/797461 +Forwarded: https://trac.xiph.org/ticket/2212 +Reviewed-By: Petter Reinholdtsen <pere@hungry.com> +Last-Update: 2015-09-22 +--- + oggenc/audio.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/oggenc/audio.c b/oggenc/audio.c +index 477da8c..4921fb9 100644 +--- a/oggenc/audio.c ++++ b/oggenc/audio.c +@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = + int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + { + int aifc; /* AIFC or AIFF? */ +- unsigned int len; +- unsigned char *buffer; ++ unsigned int len, readlen; ++ unsigned char buffer[22]; + unsigned char buf2[8]; + aiff_fmt format; + aifffile *aiff = malloc(sizeof(aifffile)); +@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + return 0; /* Weird common chunk */ + } + +- buffer = alloca(len); +- +- if(fread(buffer,1,len,in) < len) ++ readlen = len < sizeof(buffer) ? len : sizeof(buffer); ++ if(fread(buffer,1,readlen,in) < readlen || ++ (len > readlen && !seek_forward(in, len-readlen))) + { + fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); + return 0; +-- +GitLab + diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index 88a7cfb4b..c95e0dfda 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=vte -pkgver=0.60.3 +pkgver=0.62.0 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -27,5 +27,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18 vte-0.60.3.tar.xz +sha512sums="8942809d20ff845142dce8cf48b4eb6f9e4f333dc2647cceb0538112d5e10096ff836f24da1f0c34cc4bbee4f6c585c3feab33934c257887a82d6c67bce11402 vte-0.62.0.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/wavpack/APKBUILD b/user/wavpack/APKBUILD index 43aefeb03..f0c45a722 100644 --- a/user/wavpack/APKBUILD +++ b/user/wavpack/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter # Maintainer: pkgname=wavpack -pkgver=5.2.0 -pkgrel=1 +pkgver=5.3.0 +pkgrel=0 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" url="http://www.wavpack.com/" arch="all" @@ -59,4 +59,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="456da78fb5d01b33a8ed71b43cb6809a25ca0d54e53858b93bbb3eb26923bfa6de4c6a3c01caca947c0852aea74d1b14667205dae344148a01619e67eb2c7e71 wavpack-5.2.0.tar.bz2" +sha512sums="2c5038abfbe7ab3b51fb30b3fc8b636117e9afe1821c40832fbdfb960d1153e0cb4a68dd84a89b205c3cdc10030d3aa7a7340b296d9c148e8847471c2e7c0cd1 wavpack-5.3.0.tar.bz2" diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD index 4addb5f3f..4b1d41ea4 100644 --- a/user/wayland-protocols/APKBUILD +++ b/user/wayland-protocols/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=wayland-protocols -pkgver=1.18 +pkgver=1.20 pkgrel=0 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol" url="https://wayland.freedesktop.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="166be44f370a99281da442e7e2c2fc2f3169b61eeaa69263611b4e33847e93d1071f3cc89537597e1252d48d03993ce39c7d65f43b66a23c9b1551f47959e483 wayland-protocols-1.18.tar.xz" +sha512sums="d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977 wayland-protocols-1.20.tar.xz" diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD index 6dd1f52ff..4036d6b96 100644 --- a/user/wayland/APKBUILD +++ b/user/wayland/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: pkgname=wayland -pkgver=1.17.0 +pkgver=1.18.0 pkgrel=0 pkgdesc="A computer display server protocol" url="https://wayland.freedesktop.org" @@ -44,4 +44,4 @@ dev() { default_dev } -sha512sums="c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz" +sha512sums="e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index 357476211..085916ad2 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Contributor: zlg <zlg+adelie@zlg.space> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=weechat -pkgver=2.8 +pkgver=2.9 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" @@ -61,4 +61,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="3071fc6c5d88d4e388fc22f23242cf264b9533b389668914fc25e71e9939b739ba63a4e182445222ed0a7470dc0b1d958828b56d2c82ac47e9dfce6513c70d80 weechat-2.8.tar.gz" +sha512sums="975f5b7b6ed44be1ccd5b9b157c38ce5a3ce7319e873d7913b80b23d619351fd8edb35a29e6d488e31ae67b5ad70c1933dcea1dfd914ab8c1a10b7810723bd78 weechat-2.9.tar.gz" diff --git a/user/wget/APKBUILD b/user/wget/APKBUILD new file mode 100644 index 000000000..967995609 --- /dev/null +++ b/user/wget/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Nathan <ndowens@artixlinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=wget +pkgver=1.20.3 +pkgrel=0 +pkgdesc="Network utility to retrieve files from the Web" +url="https://www.gnu.org/software/wget/wget.html" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="libidn2-dev openssl-dev perl" +checkdepends="perl-http-daemon" +subpackages="$pkgname-doc $pkgname-lang" +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --with-libidn \ + --with-ssl=openssl + make +} + +check() { + make -C tests check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c wget-1.20.3.tar.gz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index 3ac5683cf..60df4133b 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> -_kver="5.4.5-mc0" -pkgver=1.0.20200506 +_kver="5.4.66-mc1" +pkgver=1.0.20210424 pkgrel=0 _pkgname="wireguard-module" pkgname="$_pkgname-$_kver" @@ -38,5 +38,4 @@ _patch() { mkdir -p "$subpkgdir/usr/share/wireguard" "$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" } - -sha512sums="39a27a515919933dbed71624be3f8f3f512073b522e1e16248c9eda749dd72a3db5a02d85d29855160eb182415f489a4c02c1659ef9589507c99dbfe74ea3074 wireguard-linux-compat-1.0.20200506.tar.xz" +sha512sums="f3485978fdd5a1cccdd8ee269c223e805bc533b79189765324a383142934b12f4f6bf476147a09703fa674da4a1eaca13fe400553b27843dbf8da133ce19207b wireguard-linux-compat-1.0.20210424.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index 219a91836..ece7397aa 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=wireguard-tools -pkgver=1.0.20200513 +pkgver=1.0.20210424 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -29,4 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c wireguard-tools-1.0.20200513.tar.xz" +sha512sums="b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59 wireguard-tools-1.0.20210424.tar.xz" diff --git a/user/wireless-regdb/APKBUILD b/user/wireless-regdb/APKBUILD index 43e059bd3..7096fddf8 100644 --- a/user/wireless-regdb/APKBUILD +++ b/user/wireless-regdb/APKBUILD @@ -1,4 +1,4 @@ -# Contributor: Luis Ressel <aranea@aixah.de> +# Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: pkgname=wireless-regdb pkgver=2020.04.29 diff --git a/user/wlroots/APKBUILD b/user/wlroots/APKBUILD new file mode 100644 index 000000000..8af0de066 --- /dev/null +++ b/user/wlroots/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=wlroots +pkgver=0.12.0 +pkgrel=0 +pkgdesc="Library for building Wayland compositors" +url="https://swaywm.org/" +arch="all" +license="MIT" +depends="wayland>=1.18.0" +makedepends="cmake elogind-dev eudev-dev ffmpeg-dev libinput-dev + libxkbcommon-dev mesa-dev meson ninja pixman-dev wayland-dev>=1.18.0 + wayland-protocols>=1.17.0 xcb-util-errors-dev xcb-util-wm-dev" +subpackages="$pkgname-dev" +source="https://github.com/swaywm/wlroots/releases/download/$pkgver/wlroots-$pkgver.tar.gz" + +build() { + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + -Dlogind-provider=elogind \ + . output + ninja -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415 wlroots-0.12.0.tar.gz" diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD index 25f20db92..254d32057 100644 --- a/user/wxwidgets/APKBUILD +++ b/user/wxwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wxwidgets -pkgver=3.1.3 +pkgver=3.1.4 pkgrel=0 pkgdesc="C++ library for creating applications" url="https://www.wxwidgets.org/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d19305c96f1a382ec74549f69d6a7c61ecd0abac383623c308c45f0168c670c15262efc4fb64c14fa9d1fdb3579f19abdb5c8247ead72dc926342e586d7b4532 wxWidgets-3.1.3.tar.bz2" +sha512sums="aabb257fa222eb819f1e16086977b0ecfd3eb3406d695e0e642ffdb8b4dc586a9721404916be4756a2d92a1a8dc41b661b54717a64e03850a8a92d32d45ece14 wxWidgets-3.1.4.tar.bz2" diff --git a/user/x264/APKBUILD b/user/x264/APKBUILD index c7c18cb67..2ae88e2eb 100644 --- a/user/x264/APKBUILD +++ b/user/x264/APKBUILD @@ -10,7 +10,7 @@ license="GPL-2.0+" depends="" makedepends="bash coreutils libx11-dev perl" case $CTARGET_ARCH in - x86_64) makedepends="$makedepends yasm";; + x86_64) makedepends="$makedepends nasm";; esac subpackages="$pkgname-dev $pkgname-libs" source="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2" diff --git a/user/xabacus/APKBUILD b/user/xabacus/APKBUILD index 6ab2e4f8b..fed80b979 100644 --- a/user/xabacus/APKBUILD +++ b/user/xabacus/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Horst Burkhardt <horst@adelielinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=xabacus -pkgver=8.2.4 +pkgver=8.2.8 pkgrel=0 pkgdesc="Simple X11 abacus widget" url="http://www.sillycycle.com/abacus.html" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install install-png install-xpm } -sha512sums="6a65e36c678cbb39d95932da265d40c61afb21eccc87264e07e80fb98b75c4e4a4777ee2bce458eb2e811b720656732e7c780e61e436287f91df83015c7e58c0 xabacus-8.2.4.tar.bz2" +sha512sums="83f758df19a2b28af27ef6eeceb4e3f879a43cf96017b13e22138f86707d61e9f569abced907b7ae9d1478811e11f362cb45d76c860ae76d149f378c584d8a2d xabacus-8.2.8.tar.bz2" diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index a7c352fa3..85f8f8f89 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=xapian-core -pkgver=1.4.16 +pkgver=1.4.17 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" @@ -46,5 +46,5 @@ libxapian() { mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6 xapian-core-1.4.16.tar.xz +sha512sums="3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 xapian-core-1.4.17.tar.xz 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" diff --git a/user/xcb-util-errors/APKBUILD b/user/xcb-util-errors/APKBUILD new file mode 100644 index 000000000..f9643b5b4 --- /dev/null +++ b/user/xcb-util-errors/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: +# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +pkgname=xcb-util-errors +pkgver=1.0 +pkgrel=0 +pkgdesc="XCB utility library for readable X errors" +url="https://xcb.freedesktop.org/" +arch="all" +license="MIT" +depends="" +makedepends="automake autoconf xcb-util-dev" +subpackages="$pkgname-dev" +source="https://xcb.freedesktop.org/dist/xcb-util-errors-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="479b731b7056313955db9471d37416c4c9ab8c4574214fe20b3c0bcc1f57812fc343af6b0196814caaa6cc848dd120c70fab2f142902125cba63a8386d32179d xcb-util-errors-1.0.tar.bz2" diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD index 241e80519..12b8d9268 100644 --- a/user/xdg-user-dirs/APKBUILD +++ b/user/xdg-user-dirs/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xdg-user-dirs pkgver=0.17 pkgrel=0 diff --git a/user/xev/APKBUILD b/user/xev/APKBUILD index ba8aafedd..e7fbf8ba2 100644 --- a/user/xev/APKBUILD +++ b/user/xev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xev -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="X11 input event monitor" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2" +sha512sums="383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca xev-1.2.4.tar.bz2" diff --git a/user/xf86-video-openchrome/APKBUILD b/user/xf86-video-openchrome/APKBUILD index 1b71f0b87..3d32b7dff 100644 --- a/user/xf86-video-openchrome/APKBUILD +++ b/user/xf86-video-openchrome/APKBUILD @@ -8,7 +8,7 @@ url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="libxvmc-dev xorgproto-dev xorg-server-dev" +makedepends="libxv-dev libxvmc-dev xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-video-openchrome-$pkgver.tar.bz2" diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD index 1a5adc93a..c1fb3994b 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfburn pkgver=0.6.2 pkgrel=0 diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD index 035c79a18..a9b998f33 100644 --- a/user/xfce-desktop/APKBUILD +++ b/user/xfce-desktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce-desktop pkgver=4.13 pkgrel=0 diff --git a/user/xfce-plugins/APKBUILD b/user/xfce-plugins/APKBUILD index 5e4d92920..303c71a16 100644 --- a/user/xfce-plugins/APKBUILD +++ b/user/xfce-plugins/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce-plugins pkgver=0.1 pkgrel=0 diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 187e18781..8c980ffc7 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-appfinder pkgver=4.14.0 pkgrel=0 diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 90aea20eb..66af35833 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-battery-plugin pkgver=1.1.3 pkgrel=0 diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD index 45c7b33fd..ee219ed8e 100644 --- a/user/xfce4-clipman-plugin/APKBUILD +++ b/user/xfce4-clipman-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-clipman-plugin pkgver=1.6.1 pkgrel=0 diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 5a235a42e..4cf5f24d8 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-cpugraph-plugin pkgver=1.1.0 pkgrel=0 diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD index cb9291532..91b9fccb1 100644 --- a/user/xfce4-dict/APKBUILD +++ b/user/xfce4-dict/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-dict pkgver=0.8.3 pkgrel=0 diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD index cc66c040c..66aab4d85 100644 --- a/user/xfce4-diskperf-plugin/APKBUILD +++ b/user/xfce4-diskperf-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-diskperf-plugin pkgver=2.6.2 pkgrel=0 diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD index a8e5f5f97..0c69f688f 100644 --- a/user/xfce4-indicator-plugin/APKBUILD +++ b/user/xfce4-indicator-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-indicator-plugin pkgver=2.3.4 pkgrel=1 diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD index 2101b528a..be6a000b5 100644 --- a/user/xfce4-netload-plugin/APKBUILD +++ b/user/xfce4-netload-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-netload-plugin pkgver=1.3.2 pkgrel=0 diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 9025a7fa0..6b29d1db1 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-notifyd -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=0 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d48752cd4e02e515e4c5d147b7bce678a56f47f0bd336e3b9db4e14fc2b0355e0582816957fc43c313a5779b5495c836ee5da4f0cb83616a0164d692a169415f xfce4-notifyd-0.6.1.tar.bz2" +sha512sums="13fdbcd5031ad44a89327eb65356a4d2c45315e0c8c507e457eee4cc95898794679163de9603a2059d9aaf20d62df317f8a09e0353f6adb526970a21d580b325 xfce4-notifyd-0.6.2.tar.bz2" diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD index 777ace868..ecb1b73e5 100644 --- a/user/xfce4-panel-profiles/APKBUILD +++ b/user/xfce4-panel-profiles/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-panel-profiles pkgver=1.0.10 pkgrel=0 diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 09b83244e..700482001 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-panel -pkgver=4.14.3 +pkgver=4.14.4 pkgrel=0 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c317741df1196a9f8d675c87732155f973022d1cb30a8815393980747d1569e8348c386253fc9056068c35fbdc13faefb4a0bef6678d072d51461c4aae909940 xfce4-panel-4.14.3.tar.bz2" +sha512sums="5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85 xfce4-panel-4.14.4.tar.bz2" diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index 0592f060e..0b37c5ae2 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-power-manager pkgver=1.6.6 pkgrel=0 diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index e5382749e..be47ca09b 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-pulseaudio-plugin pkgver=0.4.3 pkgrel=0 diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD index e3ad324dd..c8bc21481 100644 --- a/user/xfce4-screenshooter/APKBUILD +++ b/user/xfce4-screenshooter/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-screenshooter pkgver=1.9.7 pkgrel=0 diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD index eef3b208f..36041abed 100644 --- a/user/xfce4-sensors-plugin/APKBUILD +++ b/user/xfce4-sensors-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-sensors-plugin pkgver=1.3.92 pkgrel=0 diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index 487b737f7..f869781d7 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-session pkgver=4.14.2 pkgrel=0 diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index b429b9c43..d9a8672fe 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-settings -pkgver=4.14.2 +pkgver=4.14.3 pkgrel=0 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5882e96504e2ad869504e7c8e6e62d1d04f61beef524ba85a3ed962ca689d6e72a4ed717173f9e2645c078c2c8757caed1f3395dd185a3b0b5dc8b27a1a3d2d1 xfce4-settings-4.14.2.tar.bz2" +sha512sums="fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5 xfce4-settings-4.14.3.tar.bz2" diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD index 7600d411e..d1c78c479 100644 --- a/user/xfce4-systemload-plugin/APKBUILD +++ b/user/xfce4-systemload-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-systemload-plugin pkgver=1.2.3 pkgrel=0 diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index 35644eab4..4fdcce72f 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-taskmanager pkgver=1.2.3 pkgrel=0 diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD index 4abf09aa7..f0e3fa277 100644 --- a/user/xfce4-terminal/APKBUILD +++ b/user/xfce4-terminal/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-terminal pkgver=0.8.9.2 pkgrel=0 diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 7af85df23..df654f539 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-time-out-plugin pkgver=1.1.1 pkgrel=0 diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index eb420718a..fc64b01b6 100644 --- a/user/xfce4-timer-plugin/APKBUILD +++ b/user/xfce4-timer-plugin/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-timer-plugin -pkgver=1.7.0 -pkgrel=1 +pkgver=1.7.1 +pkgrel=0 pkgdesc="Timer plugin for the XFCE panel" url="https://xfce.org" arch="all" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b4d00396f5be37d009cdb50baea8804c4b06a6f0b821d66751fd07ca21e186c01bafeec5170209b5de69559803e0ac54d9b56266f193b65ac056cdd52bf5228e xfce4-timer-plugin-1.7.0.tar.bz2" +sha512sums="4887dc2c524a8b749a20449dd491dc8f12f8babb26c64cecf33ae56b45d2446128cb65c25f11d534278ad39a2adf7ab718714e1bfa613fd39713e44642030c16 xfce4-timer-plugin-1.7.1.tar.bz2" diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD index 432c5cff9..f38ea7695 100644 --- a/user/xfce4-verve-plugin/APKBUILD +++ b/user/xfce4-verve-plugin/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-verve-plugin pkgver=2.0.0 pkgrel=1 diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD index 55a0ff0d3..3451a69ed 100644 --- a/user/xfce4-volumed-pulse/APKBUILD +++ b/user/xfce4-volumed-pulse/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-volumed-pulse pkgver=0.2.3 pkgrel=0 diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 5fea02e5a..4f34961d5 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfce4-whiskermenu-plugin -pkgver=2.4.4 +pkgver=2.4.6 _pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Whisker menu plugin for the XFCE panel" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2fe27567d301f66de4648f1c3104a2ecb90c3b25672d5babcde69507559628a3a74b14d1526ff70dd75d64f7d056c8baae645f5a9291bf8c5e30a1a8258721ba xfce4-whiskermenu-plugin-2.4.4.tar.bz2" +sha512sums="9e947b73735549d81110323bfd7d6f29c91653b12e1aa616b9ca6f0ff99c8a7948ca383422d7b2aa0ac35297488fda6edc699ae4f72883539d6311672818b62c xfce4-whiskermenu-plugin-2.4.6.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index f5b5b681b..0cc2b2eca 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfconf pkgver=4.14.3 pkgrel=0 diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD index db7744791..8d46cf6a9 100644 --- a/user/xfdashboard/APKBUILD +++ b/user/xfdashboard/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfdashboard -pkgver=0.7.7 +pkgver=0.7.8 pkgrel=0 pkgdesc="Gnome dashboard clone for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="561badb0b752dabb095881134050046f98eb4374c8e3c647a4ba7226c1efce650790ef3630b53a30cd48dab190afba31de2faef8991c13af64f7eb980b099989 xfdashboard-0.7.7.tar.bz2" +sha512sums="b08cd6cab3b1fca3e9a47a1d3a6f2aefdf0cf96dec9ddb7e9170d17b387d7ab4c421a36b83cc5de0515f7df929acb0e5cda163ade165a32698e7b1a7460746e0 xfdashboard-0.7.8.tar.bz2" diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index a9c3c3d9d..c93f915b8 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfdesktop pkgver=4.14.2 pkgrel=0 diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD index c6f9975a0..0dcebc1da 100644 --- a/user/xfmpc/APKBUILD +++ b/user/xfmpc/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfmpc pkgver=0.3.0 pkgrel=1 diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 2657ca4d6..f0087d9cc 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xfwm4 -pkgver=4.14.2 +pkgver=4.14.5 pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9e28f7782ce6c1734f9a50efec75d4c03a193bf078fd29f42c11770cef134c4516c256cb9c4b92a71bbbbfca81f37ba0ce19477831bb1da858c839135005b8f2 xfwm4-4.14.2.tar.bz2" +sha512sums="d2b5b198f3ffa91b0b07d5258f5f14f45e431fd7d992143bf9fc381f647ea0ee47ae447122ef8c7a40606c08955f83975fcff94b6f7ceb331a0a8681b57050fd xfwm4-4.14.5.tar.bz2" diff --git a/user/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD index 1dee09b1e..9de0be3c3 100644 --- a/user/xorg-gtest/APKBUILD +++ b/user/xorg-gtest/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xorg-gtest pkgver=0.7.1 pkgrel=0 diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 96e5a53bb..ceae73a98 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=1.20.8 +pkgver=1.20.9 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" @@ -29,6 +29,12 @@ source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 " # secfixes: +# 1.20.9-r0: +# - CVE-2020-14345 +# - CVE-2020-14346 +# - CVE-2020-14347 +# - CVE-2020-14361 +# - CVE-2020-14362 # 1.20.3-r0: # - CVE-2018-14665 # 1.19.5-r0: @@ -134,6 +140,6 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 xorg-server-1.20.8.tar.bz2 +sha512sums="d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 xorg-server-1.20.9.tar.bz2 d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch a5f910e72ff9abd4e4a0c6806cdbe48d1b0b6cc0586f36568da5864a8dedc46a3112fe86d7a1969033f4d5b0def4dc6e5c11b656fbcc964732b417e6c9577f22 fix-musl-arm.patch" diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD index 4eaad7171..214437813 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xscreensaver -pkgver=5.44 +pkgver=5.45 pkgrel=0 pkgdesc="X Screensaver suite" url="https://www.jwz.org/xscreensaver/" @@ -30,4 +30,4 @@ package() { make install_prefix="$pkgdir" install } -sha512sums="9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae xscreensaver-5.44.tar.gz" +sha512sums="1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14 xscreensaver-5.45.tar.gz" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 018ab875b..17dda70e9 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=xterm -pkgver=357 +pkgver=360 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a4e3998496fe202835e97fef50eb608cbb0345d8f503dd4d629a1d313664b2c536e97e7eafdf9d346df87e31822f5cf6f78dc66833b0fe01b6d79dd7c58dc751 xterm-357.tgz +sha512sums="ffca51e21584e4b84b271a555bead45df1759a9e353d776fd7d8736fb001b71cfa14dc85336c01c304b4fc98297523b1a943792da73b453e1810b890671bb607 xterm-360.tgz 6811cd67ffe21dc23c9ad6a439291bb0b3c3d347f4d5e2cd65de9f790fde2bf7323fe9f1b309d95ac98a3ffaae5989bc73a2c5fe08aa9f6a2c6cbc3b9adcf8d9 posix-ptmx.patch" diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD index a2e5a84ef..29d852fe8 100644 --- a/user/yakuake/APKBUILD +++ b/user/yakuake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yakuake -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Drop-down KDE terminal emulator" url="https://www.kde.org/applications/system/yakuake/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a5b9b42b8fb47fe94c06cbdfc54683ae33ce9a84da3942efba1fee52e6103bd8ab60ef4bf46316793577813940250909fe74e722db77f57157e650612e592658 yakuake-20.04.3.tar.xz" +sha512sums="6644bfd728929eefa2ce488f1e31729c89229f09b6b00ac2317974da6ebfe95b5db9fe5a2987e530fadb4cc0cb9a90142e016df2c9623c7ab3d0599c0d5202b9 yakuake-20.08.1.tar.xz" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index aee2f895a..343603636 100644 --- a/user/youtube-dl/APKBUILD +++ b/user/youtube-dl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=youtube-dl -pkgver=2020.06.16.1 +pkgver=2020.07.28 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -66,5 +66,5 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="2f0c01cd1a52293afd8c4fddc20b6f7baca94903fbe852769ad1d25740bd87e38d42ee4a275c2e3d611c639c432f6245d27f361471c6b566da03677384a04e54 youtube-dl-2020.06.16.1.tar.gz +sha512sums="be18cd53577a1e750a9610d481225b5683414ee4a095aa90b1a9ef150e9009bec4c2188f19f13505c88ac0179872751a07f5fb4b591beca3cefd11ccf071132d youtube-dl-2020.07.28.tar.gz 5760d06e6bbc1eee2c6be2d1f580f86b3cfa5f4bc44a62fb8145ce1cd41352ecf2f65d65d79a2d7f1ec129a34c28a7ec3d0d328c907e743bfcea54c65c71285d tumblr.patch" diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD index 5409c8b37..88a3ae7b7 100644 --- a/user/yubico-c/APKBUILD +++ b/user/yubico-c/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=yubico-c pkgver=1.13 pkgrel=2 diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD index 1db97be94..f1102bd9a 100644 --- a/user/yubikey-personalization/APKBUILD +++ b/user/yubikey-personalization/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=yubikey-personalization pkgver=1.20.0 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform library & tools for personalizing YubiKey devices" url="https://developers.yubico.com/yubikey-personalization/" arch="all" @@ -13,6 +13,7 @@ makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor subpackages="$pkgname-dev $pkgname-doc" source="yubikey-personalization-$pkgver.tar.gz::https://github.com/Yubico/yubikey-personalization/archive/v$pkgver.tar.gz use-asciidoctor.patch + json_c.patch " prepare() { @@ -40,4 +41,5 @@ package() { } sha512sums="a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823 yubikey-personalization-1.20.0.tar.gz -d6777a43e5e57430268bb50ab704641465a7314b15fc821d8bfa7f0c6510829d0118ced426cd5f8730589efe6264df6b82fc70e8bfe3d8b7d735e51339a25af2 use-asciidoctor.patch" +d6777a43e5e57430268bb50ab704641465a7314b15fc821d8bfa7f0c6510829d0118ced426cd5f8730589efe6264df6b82fc70e8bfe3d8b7d735e51339a25af2 use-asciidoctor.patch +a8bc7ae71d0a05476688abfaea070ca7dc2eaa68e033524d4a1b2b6240eec2932d867e9eeaa248874a04f254618cd79bf9ebaa17421938b0c2e62502bf90c055 json_c.patch" diff --git a/user/yubikey-personalization/json_c.patch b/user/yubikey-personalization/json_c.patch new file mode 100644 index 000000000..ca5a918d2 --- /dev/null +++ b/user/yubikey-personalization/json_c.patch @@ -0,0 +1,83 @@ +From 0aa2e2cae2e1777863993a10c809bb50f4cde7f8 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Sat, 25 Apr 2020 20:55:28 +0200 +Subject: [PATCH] fix boolean value with json-c 0.14 + +Upstream removed the TRUE and FALSE defines in commit +0992aac61f8b087efd7094e9ac2b84fa9c040fcd. +--- + ykpers-json.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/ykpers-json.c b/ykpers-json.c +index a62e907..15ad380 100644 +--- a/ykpers-json.c ++++ b/ykpers-json.c +@@ -40,7 +40,7 @@ + #define yk_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value) + #else + typedef int json_bool; +-#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE ++#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1 + #endif + + static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) { +@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP + if(p->mode && (mode & p->mode) == mode) { + json_object *joption; + json_bool ret = yk_json_object_object_get(options, p->json_text, joption); +- if(ret == TRUE && json_object_get_type(joption) == json_type_boolean) { ++ if(ret == 1 && json_object_get_type(joption) == json_type_boolean) { + int value = json_object_get_boolean(joption); + if(value == 1) { + p->setter(cfg, true); +@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == FALSE) { ++ if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "mode", jmode) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "mode", jmode) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } +- if(yk_json_object_object_get(yprod_json, "options", options) == FALSE) { ++ if(yk_json_object_object_get(yprod_json, "options", options) == 0) { + ykp_errno = YKP_EINVAL; + goto out; + } + +- if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == TRUE) { ++ if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == 1) { + int target_config = json_object_get_int(jtarget); + int command; + if(target_config == 1) { +@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + if(mode == MODE_OATH_HOTP) { + json_object *jdigits, *jrandom; + ykp_set_tktflag_OATH_HOTP(cfg, true); +- if(yk_json_object_object_get(options, "oathDigits", jdigits) == TRUE) { ++ if(yk_json_object_object_get(options, "oathDigits", jdigits) == 1) { + int digits = json_object_get_int(jdigits); + if(digits == 8) { + ykp_set_cfgflag_OATH_HOTP8(cfg, true); + } + } +- if(yk_json_object_object_get(options, "randomSeed", jrandom) == TRUE) { ++ if(yk_json_object_object_get(options, "randomSeed", jrandom) == 1) { + int random = json_object_get_boolean(jrandom); + int seed = 0; + if(random == 1) { +@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { + goto out; + } else { + json_object *jseed; +- if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == TRUE) { ++ if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == 1) { + seed = json_object_get_int(jseed); + } + } diff --git a/user/zenity/APKBUILD b/user/zenity/APKBUILD index 87343a192..c12793018 100644 --- a/user/zenity/APKBUILD +++ b/user/zenity/APKBUILD @@ -1,5 +1,5 @@ -# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house> -# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house> +# Contributor: Sheila Aman <sheila@vulpine.house> +# Maintainer: Sheila Aman <sheila@vulpine.house> pkgname=zenity pkgver=3.32.0 pkgrel=0 |