diff options
Diffstat (limited to 'user')
210 files changed, 1789 insertions, 402 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/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/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/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 0134ef28b..f432627b1 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -42,16 +42,17 @@ 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="e044b3d0aa924154e32d2a7a66c6de0c4a8b572d3357d5c2600e9a64ae3e32751ea5953a37bbb8a0bde939732b1298486ccceaa64a84400f6179e44cd360ec5f baloo-5.74.0.tar.xz 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/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/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/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/cloc/APKBUILD b/user/cloc/APKBUILD index 328305587..5018779fc 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> 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/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/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/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/enchant/APKBUILD b/user/enchant/APKBUILD index f1aba2563..be7554637 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=enchant -pkgver=2.2.8 +pkgver=2.2.11 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="7d9014f6d3798120eddcfe58dd5efdb04d8b10046ecd66526e75342fe33d4c8cb55ab12d377a8ff2d817374161ce36f39fdb1584b711dd61d61491f8082fa91f enchant-2.2.11.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/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/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/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/gcompat/APKBUILD b/user/gcompat/APKBUILD index 5dc8d6c74..b515cb6ef 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -1,6 +1,6 @@ # 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" @@ -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/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/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/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/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 2b87ed367..bbe467b5d 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.23 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -48,4 +48,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="97ed88e69d9002279869044772e5aebc1ac4ed6f4a8afc1586a349710a1d414fc735e1257d5f34f6300914a0ca7c7ede073bd9429ee16077aa83f3594784c60e gtk+-3.24.21.tar.xz" +sha512sums="fe3d677f4922b4568ef406c318ac71e26aac22b808d8d42b516d0e142d38dc12bc97d8a903dfe3e819adf491b9437a49f34213bc67219bee92692e40c6ef564e gtk+-3.24.23.tar.xz" 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/horizon/APKBUILD b/user/horizon/APKBUILD index 4fb711bbb..b17cf786e 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.4 +pkgver=0.9.5 pkgrel=0 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" @@ -156,4 +156,4 @@ GLOBALS "$subpkgdir"/usr/share/xsessions/horizon.desktop } -sha512sums="202830a4e1313d0761484aeb65bef1e2a109917d4bec8f963672f4017a5fda2dac1383be6dfe2ed9aa3daa913cc62f816e88d2e760824957dbc18070ca901f76 horizon-0.9.4.tar.xz" +sha512sums="373cbf87aa468d0ea41abad07f61cdaa6088cfdcba13c0beff245dbd8e270aa42c3e301a22913299d148e829114bd0b5aa746541c4b4b0c7286da35015c54d88 horizon-0.9.5.tar.xz" diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD index a3b265ee5..f238a7e13 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/" @@ -45,7 +45,7 @@ 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" diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD index d573789c6..04cee761a 100644 --- a/user/isync/APKBUILD +++ b/user/isync/APKBUILD @@ -1,7 +1,7 @@ # 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/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/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/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/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/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/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/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/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-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 fe04cd486..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/" 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/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/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index 22fcf1c1b..5df4dd36d 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive -pkgver=20.04.3 +pkgver=20.08.1 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -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/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/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/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/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/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/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/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/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 2a291b0bc..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.74.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="f7bcc25bf131debb67c7ae1787d17280c6e4f7098a6c807a657f9313d1f72607e35ebb71d1ae3789253d5298d7a7546a7bc5c7af6095a7c2e886360dd9b64f92 kio-5.74.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/mach64-drm/APKBUILD b/user/mach64-drm/APKBUILD index 26d84ce56..96fe34b04 100644 --- a/user/mach64-drm/APKBUILD +++ b/user/mach64-drm/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> -_kver="5.4.5-mc0" +_kver="5.4.66-mc1" pkgname=mach64-drm pkgver=5.6 pkgrel=0 pkgdesc="Kernel driver for Mach64 GPUs" url=" " -arch="pmmx ppc x86_64" +arch="pmmx ppc" options="!check !dbg !strip" # No test suite. license="MIT" depends="easy-kernel-modules-$_kver" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 1d895ffdd..2f32e4c3f 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/" @@ -36,4 +36,4 @@ 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/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/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/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/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/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-meta/APKBUILD b/user/plasma-meta/APKBUILD index ddd6a2f21..1c110865c 100644 --- a/user/plasma-meta/APKBUILD +++ b/user/plasma-meta/APKBUILD @@ -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/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 3f5bc413b..b02a523ae 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -24,6 +24,7 @@ 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 @@ -182,6 +183,7 @@ x11() { 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 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/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/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/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/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/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/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/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/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/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/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" |