diff options
28 files changed, 87 insertions, 518 deletions
diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index 1be4e8974..7d637bd53 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=18.12.3 -pkgrel=1 +pkgver=19.12.0 +pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" arch="all" @@ -14,10 +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/applications/$pkgver/src/akonadi-contacts-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="dba40ec470d8b34b38d69470128708580a0581dcf1a88191da1b6bfedb426a13c964117eea1d266d1cb2224006a4b26f1f8ccc39e79eac67653aa808c5d81fb0 akonadi-contacts-18.12.3.tar.xz" +sha512sums="ebf93cb3e40da1115be36455fd89ab3204648e98c917bb817bbe36ece4fd9c983e2552a8dbb8005ef6adef645898b012d8f34806ebabd5d3e03c2ef7d59cddcf akonadi-contacts-19.12.0.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 6ff117f02..50e3735a2 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,22 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=18.12.3 -pkgrel=1 +pkgver=19.12.0 +pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" arch="all" -options="!check" # regression? license="LGPL-2.1+" depends="" 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/applications/$pkgver/src/akonadi-mime-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-mime-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -27,18 +25,21 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # The mailserializerplugintest test requires kdepim-runtime to be + # present on the system. Otherwise, Akonadi does not know how to + # convert a QByteArray of message/rfc822 to KMime::Message. This + # is a circular dependency, because kdepim-runtime requires amime + # so we must skip this test. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'mailserializerplugintest' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ecda52f1d41c7b7925b9e71f55f2dca14f38308185a9bdd528f53b109758f79a653b52a2bbb91c138dfc432c798fa9d83307c8652b14269e5d6969a38130ee13 akonadi-mime-18.12.3.tar.xz" +sha512sums="27c66e8c6069fbca2d82fccd1c2dbf77c3dfcda97e5f16353db5efd4928b361a719da964397fb04322f32b2a147d25b3310f7101886ec94c959c71ebe62c6a23 akonadi-mime-19.12.0.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 349967d5a..f05a480ec 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=18.12.3 -pkgrel=1 +pkgver=19.12.0 +pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" arch="all" @@ -16,13 +16,11 @@ makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev kdesignerplugin-dev ki18n-dev kiconthemes-dev kitemviews-dev kio-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-$pkgver.tar.xz +source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz akonadiserverrc - attributes.patch " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,17 +31,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/usr/share/config/akonadi @@ -51,6 +47,5 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="f97e716be612001a8176f20afbe80a1cf4c78c6d348d92e542307ea951e1ff74189d2f0847675ed44ad65845b52a5180346b3866f5a8d82b55ed613d107ac346 akonadi-18.12.3.tar.xz -b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc -63a26cf5c20583a372146d11050f5003242997743fe9470fb2b7556d5aebb58c06dfeefc0c14c86a435f7172126dac0d52b1701c6bd872f10531bf1d99625e93 attributes.patch" +sha512sums="1c3d770dfccae7b596dd45af65aa05652a96f2c81fbd6094a089d7fa610b55b30339eb2b2cecb798ed8a40f389f896fcbd381ea8a8bb6f05951a7f8b7dc5fed3 akonadi-19.12.0.tar.xz +b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" diff --git a/user/akonadi/attributes.patch b/user/akonadi/attributes.patch deleted file mode 100644 index a49db7f37..000000000 --- a/user/akonadi/attributes.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 1d8851495bcfa6ff5d3fa35882b68fdf68b21a7f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org> -Date: Thu, 21 Mar 2019 13:22:58 +0100 -Subject: Fix a regression when updating attributes - -This fixes a regression introduced in 3a062e6a and 6054e42d where some -attributes were not sent to the Akonadi server in update job even though -they were modified. This was due to a bad API design which returns a -non-const pointer to an attribute from a const method, so callers sometimes -modify the returned attribute on a const object. Since the method itself -is const though, it did not mark the attribute as modified. - -Proper fix is to introduce a purely const and non-const overloads for -the attribute accessors, unfortunatelly this requires fixing a lot of our code -in many places first to not abuse the non-constness of the returned -attribute. - -Note that since the code is in an inlined method, all clients should be -recompiled. - -CCMAIL: faure@kde.org ---- - src/core/collection.h | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/core/collection.h b/src/core/collection.h -index 50c0926..b5a496c 100644 ---- a/src/core/collection.h -+++ b/src/core/collection.h -@@ -584,14 +584,19 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) - template <typename T> - inline T *Akonadi::Collection::attribute() const - { -- const T dummy; -- if (hasAttribute(dummy.type())) { -- T *attr = dynamic_cast<T *>(attribute(dummy.type())); -+ const QByteArray type = T().type(); -+ if (hasAttribute(type)) { -+ T *attr = dynamic_cast<T *>(attribute(type)); - if (attr) { -+ // FIXME: This method returns a non-const pointer, so callers may still modify the -+ // attribute. Unfortunately, just making this function return a const pointer and -+ // creating a non-const overload does not work, as many users of this function abuse the -+ // non-const pointer and modify the attribute even on a const object. -+ const_cast<Collection*>(this)->markAttributesChanged(); - return attr; - } - //reuse 5250 -- qWarning() << "Found attribute of unknown type" << dummy.type() -+ qWarning() << "Found attribute of unknown type" << type - << ". Did you forget to call AttributeFactory::registerAttribute()?"; - } - --- -cgit v1.1 - -From 53ad3b6d73d92ea289cf0183c10e2b8a35c8127a Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Thu, 21 Mar 2019 23:37:36 +0100 -Subject: Fix collection detaching at the wrong time in attribute() - -Summary: -Found in FatCRM where changes to collection attributes were not stored -anymore. - -Test Plan: -New unittest to ensure that we get the attribute from the -detached collection, not from the original one. - -Reviewers: dvratil - -Reviewed By: dvratil - -Subscribers: kde-pim - -Tags: #kde_pim - -Differential Revision: https://phabricator.kde.org/D19741 ---- - autotests/libs/collectionattributetest.cpp | 15 +++++++++++++++ - autotests/libs/collectionattributetest.h | 1 + - src/core/collection.h | 8 ++------ - 3 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/autotests/libs/collectionattributetest.cpp b/autotests/libs/collectionattributetest.cpp -index e264a37..9c46561 100644 ---- a/autotests/libs/collectionattributetest.cpp -+++ b/autotests/libs/collectionattributetest.cpp -@@ -240,3 +240,18 @@ void CollectionAttributeTest::testCollectionIdentificationAttribute() - QCOMPARE(parsed.identifier(), id); - QCOMPARE(parsed.collectionNamespace(), ns); - } -+ -+void CollectionAttributeTest::testDetach() -+{ -+ // GIVEN a collection with an attribute -+ Collection col; -+ col.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing); -+ Collection col2 = col; // and a copy, so that non-const access detaches -+ -+ // WHEN -+ TestAttribute *attr = col2.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing); -+ TestAttribute *attr2 = col2.attribute<TestAttribute>(); -+ -+ // THEN -+ QCOMPARE(attr, attr2); -+} -diff --git a/autotests/libs/collectionattributetest.h b/autotests/libs/collectionattributetest.h -index 420df78..2afa9eb 100644 ---- a/autotests/libs/collectionattributetest.h -+++ b/autotests/libs/collectionattributetest.h -@@ -32,6 +32,7 @@ private Q_SLOTS: - void testDefaultAttributes(); - void testCollectionRightsAttribute(); - void testCollectionIdentificationAttribute(); -+ void testDetach(); - }; - - #endif -diff --git a/src/core/collection.h b/src/core/collection.h -index b5a496c..9c19cc9 100644 ---- a/src/core/collection.h -+++ b/src/core/collection.h -@@ -565,10 +565,10 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option) - Q_UNUSED(option); - - const T dummy; -+ markAttributesChanged(); - if (hasAttribute(dummy.type())) { - T *attr = dynamic_cast<T *>(attribute(dummy.type())); - if (attr) { -- markAttributesChanged(); - return attr; - } - //Reuse 5250 -@@ -585,14 +585,10 @@ template <typename T> - inline T *Akonadi::Collection::attribute() const - { - const QByteArray type = T().type(); -+ const_cast<Collection*>(this)->markAttributesChanged(); - if (hasAttribute(type)) { - T *attr = dynamic_cast<T *>(attribute(type)); - if (attr) { -- // FIXME: This method returns a non-const pointer, so callers may still modify the -- // attribute. Unfortunately, just making this function return a const pointer and -- // creating a non-const overload does not work, as many users of this function abuse the -- // non-const pointer and modify the attribute even on a const object. -- const_cast<Collection*>(this)->markAttributesChanged(); - return attr; - } - //reuse 5250 --- -cgit v1.1 diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index dc31e30d4..d455cddbe 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -12,12 +12,11 @@ depends="lzop shared-mime-info unzip zip" makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev kitemmodels-dev kio-dev kservice-dev kparts-dev kpty-dev libarchive-dev - kwidgetsaddons-dev xz-dev" + kwidgetsaddons-dev libzip-dev xz-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ark-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ark-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,18 +27,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c4ae42a68a9f00238de4dcfef066c3e20f9a896fe00473b4db4ca4aadc8db1f63c876a98833799c533962283fe3f64be36e563e5624e0dae1978452438392788 ark-19.08.2.tar.xz" +sha512sums="ac4f0379cc7927bada4416a5569c96ace173ec1b85e46e95682f46e254da094d9cfc6049ba8f49c6dcd6bc0d3ee6e08a00150f9f6088ff2325bd1a1179d7184f ark-19.12.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 84e79c8d3..270399b86 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -16,10 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev python3 plasma-framework-dev" subpackages="kwrite kwrite-doc:kwrite_doc kwrite-lang:kwrite_lang $pkgname-doc $pkgname-lang $pkgname-project" -source="https://download.kde.org/stable/applications/$pkgver/src/kate-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kate-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,17 +29,15 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -66,8 +63,6 @@ kwrite() { } kwrite_doc() { - local _langpath - pkgdesc="Simple GUI text editor (documentation)" install_if="docs kwrite=$pkgver-r$pkgrel" for _langpath in "$pkgdir"/usr/share/doc/HTML/*; do @@ -80,8 +75,6 @@ kwrite_doc() { } kwrite_lang() { - local _langpath - pkgdesc="Simple GUI text editor (translations)" for _langpath in "$pkgdir"/usr/share/locale/*/LC_MESSAGES; do local _sublangpath="$subpkgdir/${_langpath#"$pkgdir"}" @@ -92,4 +85,4 @@ kwrite_lang() { done } -sha512sums="3e1608843a749af75f12011e929bec0cd18e28b73e6b531b885855b07aec343007deb3def2de1215ff134f84052ecf956d834029267d790cc99ddd76d36a212a kate-19.08.2.tar.xz" +sha512sums="37106b3db09c302d69922cb81a425b2a74bc7bac8cc7d767d6efa59d60b5e80b4f1d2e20dc1e87a2cc57b534fdaefd58b40ce463894f58b56d8ec9a229487db8 kate-19.12.0.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index df2832969..20b6db7d8 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev ki18n-dev kconfigwidgets-dev kdoctools-dev kguiaddons-dev kinit-dev kxmlgui-dev knotifications-dev gmp-dev mpfr-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kcalc-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kcalc-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="966e1239c11f77c162d5698708e96e8172bc99bc195df0ceff9b5867b7fd9f452091cc4d39286b8bf2febf9a75ee119d3f5282090d6bf8b02783ff8d0ed75424 kcalc-19.08.2.tar.xz" +sha512sums="148424327d86b691e16ac4cf2a9842ae1003d212ba399ba0dad8e0c33c91f89326cdf2b1646bcb3a3c9a4fe9bdab74205770d93ff620a14fe0f92836aeab54b0 kcalc-19.12.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 3334acea7..9612b6828 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev kcrash-dev kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kcharselect-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kcharselect-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4d618a691d1153952b04ad172dc8bd1d87b56f530f05c88c91af3844eacf24ccd0123aec8978bc623009f68dc84b56d917dc4766376ae78115de73b3bff66b92 kcharselect-19.08.2.tar.xz" +sha512sums="c9b1e0a57d48b354824041c91039f0d9e9275707687804e6608a12d8f449dfac9609b4b625a4aa32565327844bd5210889ea49bf49e3628eca8719a3e5ad5041 kcharselect-19.12.0.tar.xz" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index a30c4f7a2..e04866c30 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index d32ebcd9f..20be7abd9 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdelibs4support-dev karchive-dev kdoctools-dev kfilemetadata-dev kwidgetsaddons-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kfind-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kfind-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="36cc81a744e4bf81015e5611c6811034a1c236ce8603ed3c3fa2e0d8acf6cb38e86a0e92a55a726a96043805be91dc4e10e7c12be960a22b97f43928a089fa70 kfind-19.08.2.tar.xz" +sha512sums="7b5a65582d553c4789699c1b53bc2521ca839db3ad3485de10b9d9417f7cead2b2027e93b948689f3913d4994673c90744fa11344a3fe5368d8199f8354c5cf4 kfind-19.12.0.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index f487c3871..49b36dc21 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kcoreaddons-dev kcompletion-dev kdoctools-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kfloppy-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kfloppy-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3da10bcc6b47fd846e20f300b63a114e2742294f9031463bdbcd0d6bae0cef8469bfa477d0e04f3719c639ead81bc97c7617456d8b6b4753b0a508ef55ab2536 kfloppy-19.08.2.tar.xz" +sha512sums="c252fdd33e58c621f2cf63c54b5f81451603c301841b1498aadba6fee205a164d4a647a73fd199a0877f6408a0a4445bf36e0b32a557d953ce06b206660c486c kfloppy-19.12.0.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 82fa032b7..5b43e1873 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -15,10 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kcodecs-dev ktextwidgets-dev kxmlgui-dev kwidgetsaddons-dev kwindowsystem-dev akonadi-contacts-dev kcontacts-dev gpgme-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kgpg-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kgpg-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,18 +28,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c6dd268fc3e007d4e4fb93317b64606e2b87299352a460f9c2889f61d9828dda93c6c2767e4a1b787fb62fd3b0288eccb466f0e08fb89af6fae845d2bff38654 kgpg-19.08.2.tar.xz" +sha512sums="0cf6fc8516ddbf92a1ab1967940a0a26cb9661986cdd96a878450a64e1ee47745cede5f3b4963bd896ca697d5ebcc52c1ff8105e5ea1057f3eee9fcf3c4195d0 kgpg-19.12.0.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index f8ed88504..50d368ea4 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -12,12 +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/applications/$pkgver/src/kleopatra-$pkgver.tar.xz - qt5.9.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kleopatra-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,19 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d2eb5a02e937a93a1c8c20e418203e580f37548e4dcc2ba9519dec244a04f355a32e9daa9acecfc51e6b63f7f1274882a7eb4ac23e6c73f67d5c292d05a50027 kleopatra-19.08.2.tar.xz -4f1330881b582d3b730ee8001eedd6cd18ba14d21d7e80056c8bec1052691f580fd055fa762565449e2c820dbdcd133077ab61f98de8215f88459e32afd609bd qt5.9.patch" +sha512sums="4f5710a5fd15ec8205156f45efba824da3a8c4dfa075f55367eff42a8ccb1e07ed519bbc8af2cc1df1ea058b67318cc40171134cfa4db3dd338a067c33af6035 kleopatra-19.12.0.tar.xz" diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch deleted file mode 100644 index b6f182029..000000000 --- a/user/kleopatra/qt5.9.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e3a467d6221d15015ccd5166d6dc53335482c5c8 Mon Sep 17 00:00:00 2001 -Date: Mon, 17 Dec 2018 08:12:46 +0100 -Subject: Revert "Remove QT_CHECK" - ---- - src/commands/certifycertificatecommand.cpp | 4 ++++ - src/commands/importcertificatescommand.cpp | 4 ++++ - src/dialogs/certificateselectiondialog.cpp | 4 ++++ - 3 files changed, 12 additions(+) - -diff --git a/src/commands/certifycertificatecommand.cpp b/src/commands/certifycertificatecommand.cpp -index 524b5a6..5577f2f 100644 ---- a/src/commands/certifycertificatecommand.cpp -+++ b/src/commands/certifycertificatecommand.cpp -@@ -215,7 +215,11 @@ void CertifyCertificateCommand::doStart() - cmd->setParentWidget(d->parentWidgetOrView()); - cmd->setProtocol(GpgME::OpenPGP); - loop.connect(cmd, SIGNAL(finished()), SLOT(quit())); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(cmd, &Commands::NewCertificateCommand::start, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection); -+#endif - loop.exec(); - } else { - Q_EMIT(canceled()); -diff --git a/src/commands/importcertificatescommand.cpp b/src/commands/importcertificatescommand.cpp -index 49294b6..89542cc 100644 ---- a/src/commands/importcertificatescommand.cpp -+++ b/src/commands/importcertificatescommand.cpp -@@ -392,7 +392,11 @@ bool ImportCertificatesCommand::Private::showPleaseCertify(const GpgME::Import & - auto cmd = new Commands::CertifyCertificateCommand(key); - cmd->setParentWidget(parentWidgetOrView()); - loop.connect(cmd, SIGNAL(finished()), SLOT(quit())); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(cmd, &Commands::CertifyCertificateCommand::start, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection); -+#endif - loop.exec(); - } - return true; -diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp -index 003872e..020310d 100644 ---- a/src/dialogs/certificateselectiondialog.cpp -+++ b/src/dialogs/certificateselectiondialog.cpp -@@ -384,7 +384,11 @@ void CertificateSelectionDialog::Private::slotDoubleClicked(const QModelIndex &i - QItemSelectionModel *const sm = view->selectionModel(); - Q_ASSERT(sm); - sm->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(q, [this]() {q->accept();}, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(q, "accept", Qt::QueuedConnection); -+#endif - } - - void CertificateSelectionDialog::accept() --- -cgit v1.1 - ---- kleopatra-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:10.000000000 +0000 -+++ kleopatra-19.04.0/CMakeLists.txt 2019-04-19 06:34:58.511578506 +0000 -@@ -11,10 +11,10 @@ - option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF) - - # Standalone build. Find / include everything necessary. --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - set(KMIME_VERSION "5.12.1") - set(LIBKLEO_VERSION "5.12.1") --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - set(GPGME_REQUIRED_VERSION "1.8.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) ---- kleopatra-19.08.0/CMakeLists.txt.old 2019-08-15 15:07:20.717152888 +0000 -+++ kleopatra-19.08.0/CMakeLists.txt 2019-08-15 15:09:48.141370261 +0000 -@@ -143,7 +143,7 @@ - add_subdirectory(tests) - add_subdirectory(autotests) - endif() --install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -+#install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - - if(KF5DocTools_FOUND) - add_subdirectory(doc) diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index c98936950..e66ba1355 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev kio-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmag-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmag-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cb3c7b41244af293f2aa81998e234008e30a20d7182fe235cb5e8bf09f080f1369b0fb1ea9dd6c803caa1c0b6a7bf269eed0cd8587d0fc858d5dc5e03344d9fa kmag-19.08.2.tar.xz" +sha512sums="991b376115abcb30c766d4821b83fdcac41087ce7b6c9cc27d864a3aa4690f39057654524ae33a1dbd1070054716e1429d65d2d21706ea81fa27a1633b30e411 kmag-19.12.0.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index cdb6ce528..e2eaa8e06 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -12,12 +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/applications/$pkgver/src/kmime-$pkgver.tar.xz - egregious-versions.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kmime-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -28,20 +25,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" # https://bugs.kde.org/show_bug.cgi?id=385479 CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(headertest|messagetest|dateformattertest)' } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2c7b4332197c7fec915cedde4faf2726abd5ca1c0ae9c57642b35807cd9e75f1ef549802a71a6fc22515ab914759f3b01bc88ff964591aceb3c50b39de7b6157 kmime-19.08.2.tar.xz -ae8e5836cefbf19f2aa5c775e3189a24b558840799c93fefc4d3863567d152bd14a2597241fcf0967d134cefedcf2c258f75f3c3bda4ec2cd2623f81a9c37c9f egregious-versions.patch" +sha512sums="a6f7b6ccb0171068c2c74532423f4ca0d98f60fa33014fbb39c54ea8b595a383e02bcb707f0049a6817676be87f902e237de148ff125f87bf010b78305b30f87 kmime-19.12.0.tar.xz" diff --git a/user/kmime/egregious-versions.patch b/user/kmime/egregious-versions.patch deleted file mode 100644 index 49b8f8024..000000000 --- a/user/kmime/egregious-versions.patch +++ /dev/null @@ -1,24 +0,0 @@ -There is absolutely NO REQUIREMENT on these newer versions by KMime. - -This is only done to keep in sync with the rest of KDE PIM. - ---- kmime-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:19.000000000 +0000 -+++ kmime-19.04.0/CMakeLists.txt 2019-04-19 06:18:49.665558623 +0000 -@@ -4,7 +4,7 @@ - project(KMime VERSION ${PIM_VERSION}) - - # ECM setup --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) -@@ -22,7 +22,7 @@ - - - set(KMIME_LIB_VERSION ${PIM_VERSION}) --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) - - ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index 38d9f4cf8..c744666eb 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev kdoctools-dev kiconthemes-dev knotifications-dev kxmlgui-dev phonon-dev libxtst-dev libxt-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmousetool-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/kmousetool-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -26,18 +25,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a77de3d5a5e5601db7a276e4f14d11ac9d4a63a19231606fafcb959db34ce1d8232b3699dba6749fcf6f7f559f008b43e44e1cecf7746a7764695ec1b482f8ad kmousetool-19.08.2.tar.xz" +sha512sums="40b93453104394764ad6ed86a0db6e3fee627c4d5d398ee34ee79a94b51c576dfa69a46fcdbf572da7715e4f5210c77c63a57491ad5dfd2a7052f8c5fdbe1c7f kmousetool-19.12.0.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index 686b891b4..f96f924cd 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -16,12 +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/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz - qt5.9.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/kpimtextedit-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,19 +29,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ef28ec4732fa1322143ded1f4efa27f15111cef2d038d38454b9cd22d32219f63398d764cf1a7cbd29635e9885c2d16463a5b345c22be3b2ea2937727fbff061 kpimtextedit-19.08.2.tar.xz -3cf800dfc537029588a4701faa2dd1fceb9e0b851c7d7675d468414d45dc2c07aadd4eb687a6b8cfeea4068e1e81b2fe2ad3de7c3c183650d43ab13cf20f4645 qt5.9.patch" +sha512sums="ddb7ef413ddb17b14b4c44f67304689dca9afbf2aa2002e2267930c5fe7d5eab2b0bef99ca2fea26f6d8c638bbae7b21bc7399dace318a1adba202501470cafd kpimtextedit-19.12.0.tar.xz" diff --git a/user/kpimtextedit/qt5.9.patch b/user/kpimtextedit/qt5.9.patch deleted file mode 100644 index 6ae06c8a0..000000000 --- a/user/kpimtextedit/qt5.9.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6961b54d1c814f2e7aafd7db8256f82688f014a3 Mon Sep 17 00:00:00 2001 -Date: Mon, 17 Dec 2018 07:23:52 +0100 -Subject: Revert "Remove QT_CHECK" - ---- - .../plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp -index 8ce0fe9..c07699c 100644 ---- a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp -+++ b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp -@@ -144,9 +144,13 @@ void PlainTextSyntaxSpellCheckingHighlighter::highlightBlock(const QString &text - - const auto nextBlock = currentBlock().next(); - if (nextBlock.isValid()) { -+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) - QMetaObject::invokeMethod(this, [this, nextBlock] { - rehighlightBlock(nextBlock); - }, Qt::QueuedConnection); -+#else -+ QMetaObject::invokeMethod(this, "rehighlightBlock", Qt::QueuedConnection, Q_ARG(QTextBlock, nextBlock)); -+#endif - } - } - --- -cgit v1.1 - ---- kpimtextedit-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:22.000000000 +0000 -+++ kpimtextedit-19.04.0/CMakeLists.txt 2019-04-19 06:21:56.055556133 +0000 -@@ -4,7 +4,7 @@ - project(KPimTextEdit VERSION ${PIM_VERSION}) - - # ECM setup --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -@@ -36,7 +36,7 @@ - SOVERSION 5 - ) - --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets) - find_package(Grantlee5 "5.1" CONFIG REQUIRED) - set_package_properties(Grantlee5 PROPERTIES ---- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:58:32.623688389 +0000 -+++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 14:59:20.798530990 +0000 -@@ -114,7 +114,7 @@ - COMPONENT Devel - ) - --install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -+#install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - - - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ---- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:59:35.306977776 +0000 -+++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 15:00:30.421077488 +0000 -@@ -68,7 +68,6 @@ - add_definitions(-DTRANSLATION_DOMAIN=\"libkpimtextedit\") - - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) --add_definitions(-DQT_NO_FOREACH) - - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech) - diff --git a/user/kronometer/APKBUILD b/user/kronometer/APKBUILD index 37905401a..e06dcb3e8 100644 --- a/user/kronometer/APKBUILD +++ b/user/kronometer/APKBUILD @@ -25,7 +25,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD index d518e2996..6ca2b9d4b 100644 --- a/user/krusader/APKBUILD +++ b/user/krusader/APKBUILD @@ -28,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } @@ -41,4 +41,4 @@ package() { } sha512sums="8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b krusader-2.7.2.tar.xz -6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59 posix-headers.patch" +2114547837002e76fea1ed68bd47c8db216a7ba292817b2448497c45e8693441750a5e06ce24de188d0f04dc9c765c2cb5b83b04488a0a5247a481084f6091c0 posix-headers.patch" diff --git a/user/krusader/posix-headers.patch b/user/krusader/posix-headers.patch index c52d63656..898c514e7 100644 --- a/user/krusader/posix-headers.patch +++ b/user/krusader/posix-headers.patch @@ -1,6 +1,6 @@ --- krusader-2.6.0/krusader/FileSystem/krpermhandler.h.old 2017-04-11 12:32:08.000000000 -0500 +++ krusader-2.6.0/krusader/FileSystem/krpermhandler.h 2017-10-12 18:55:51.447922274 -0500 -@@ -39,6 +39,7 @@ +@@ -30,6 +30,7 @@ #include <KIO/Global> @@ -10,7 +10,7 @@ #include <unistd.h> --- krusader-2.6.0/krusader/DiskUsage/filelightParts/fileTree.h.old 2017-04-11 12:32:08.000000000 -0500 +++ krusader-2.6.0/krusader/DiskUsage/filelightParts/fileTree.h 2017-10-12 18:56:22.954502133 -0500 -@@ -23,6 +23,7 @@ +@@ -25,6 +25,7 @@ #include <KIO/Global> diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 0ab9de2a3..7009a6e14 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -11,10 +11,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev kwidgetsaddons-dev kio-dev kdbusaddons-dev knotifications-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ktimer-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/ktimer-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -25,18 +24,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="60e2c16b9fa44bbd9e7cca3a487d9a78d572c1cd20e09782735fc30c586b82691736be2a30c21e07a893856b1c9a02f432bcce00a123219bd857e988bc477ea7 ktimer-19.08.2.tar.xz" +sha512sums="5861751ed9b344ece5fc9dceef7a3407edd16880518c1445cc3d5138b7155fbe999856fa6a9bf9d8a1a88cc9cf42121c66947a54a0ceedf70b5732859fab64db ktimer-19.12.0.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 51b9470f8..c68c75bef 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=19.08.2 +pkgver=19.12.0 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -13,12 +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/applications/$pkgver/src/libkleo-$pkgver.tar.xz - egregious-versions.patch - " +source="https://download.kde.org/stable/release-service/$pkgver/src/libkleo-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,19 +26,16 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2b68d7d6b154bb16638bb5b533f1239cbbcd610eca14b8e346f14d75c3277f5566e4773797612966abd6dc94fd4f20918c581fded790431e572ba51e59ea1e5e libkleo-19.08.2.tar.xz -5a10a4de59fc4e89295488c88f6f21f88f58f47679c666e0909bbd7bb6b3b867091292d807c2786da4864043d22c84e4f7cd7757fc47c9e046bedb8289c3c7b6 egregious-versions.patch" +sha512sums="35df26dccf805b5fc28956e25a9251f7b17e1c62a981ef474c8b34ff45176768c3317f227cb2280d5dc1187d188777e04f85721e7188a3627f4d0970a4b36ba8 libkleo-19.12.0.tar.xz" diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch deleted file mode 100644 index 27822b608..000000000 --- a/user/libkleo/egregious-versions.patch +++ /dev/null @@ -1,32 +0,0 @@ -libKleo uses no new APIs. - ---- libkleo-19.04.0/CMakeLists.txt.old 2019-04-12 00:16:32.000000000 +0000 -+++ libkleo-19.04.0/CMakeLists.txt 2019-04-19 06:31:09.576149789 +0000 -@@ -3,7 +3,7 @@ - - project(libkleo VERSION ${PIM_VERSION}) - --set(KF5_MIN_VERSION "5.60.0") -+set(KF5_MIN_VERSION "5.54.0") - - find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -@@ -26,7 +26,7 @@ - - - set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) --set(QT_REQUIRED_VERSION "5.11.0") -+set(QT_REQUIRED_VERSION "5.9.0") - set(KDEPIMTEXTEDIT_VERSION "5.12.1") - - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) ---- libkleo-19.08.0/CMakeLists.txt.old 2019-08-15 15:03:03.464693272 +0000 -+++ libkleo-19.08.0/CMakeLists.txt 2019-08-15 15:05:18.800204812 +0000 -@@ -92,6 +92,6 @@ - - - add_subdirectory(src) --install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -+#install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - ki18n_install(po) diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index 8eb2a7167..c96d22022 100644 --- a/user/okteta/APKBUILD +++ b/user/okteta/APKBUILD @@ -27,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD index fd3864d48..d07cd72eb 100644 --- a/user/rsibreak/APKBUILD +++ b/user/rsibreak/APKBUILD @@ -27,7 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } |