diff options
Diffstat (limited to 'user')
-rw-r--r-- | user/bolt/APKBUILD | 10 | ||||
-rw-r--r-- | user/gdk-pixbuf/APKBUILD | 1 | ||||
-rw-r--r-- | user/glib/APKBUILD | 2 | ||||
-rw-r--r-- | user/kdelibs4support/APKBUILD | 1 | ||||
-rw-r--r-- | user/kdevelop-pg-qt/APKBUILD | 4 | ||||
-rw-r--r-- | user/kiconthemes/APKBUILD | 1 | ||||
-rw-r--r-- | user/kio/APKBUILD | 10 | ||||
-rw-r--r-- | user/kio/favicon-url.patch | 14 | ||||
-rw-r--r-- | user/kio/unmounted-root.patch | 37 | ||||
-rw-r--r-- | user/kwayland/APKBUILD | 2 | ||||
-rw-r--r-- | user/kwidgetsaddons/APKBUILD | 3 | ||||
-rw-r--r-- | user/kxmlgui/APKBUILD | 3 | ||||
-rw-r--r-- | user/libkscreen/APKBUILD | 5 | ||||
-rw-r--r-- | user/plasma-wayland-protocols/APKBUILD | 2 | ||||
-rw-r--r-- | user/postgresql/APKBUILD | 4 | ||||
-rw-r--r-- | user/syntax-highlighting/APKBUILD | 5 |
16 files changed, 86 insertions, 18 deletions
diff --git a/user/bolt/APKBUILD b/user/bolt/APKBUILD index b9b75ff19..a081a0ad3 100644 --- a/user/bolt/APKBUILD +++ b/user/bolt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bolt -pkgver=0.9 +pkgver=0.9.10 pkgrel=0 pkgdesc="Thunderbolt 3 device manager" url=" " @@ -19,15 +19,15 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ . output - ninja -C output + meson compile -C output } check() { - ninja -C output test + meson test -C output } package() { - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" meson install -C output } -sha512sums="427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78 bolt-0.9.tar.gz" +sha512sums="a0707ec57b1b048906ac8f803acfa313e37bc31eb0acb77978f28a3200d026c019ce30157681ff39f1e0076dc9d828361fcd46cc058db7ac5ad9c890b64a88a0 bolt-0.9.10.tar.gz" diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD index cd1ac322d..6541fc966 100644 --- a/user/gdk-pixbuf/APKBUILD +++ b/user/gdk-pixbuf/APKBUILD @@ -27,6 +27,7 @@ build() { meson setup \ -Dprefix=/usr \ -Dinstalled_tests=false \ + -Dothers=enabled \ build meson compile -C build } diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 1de391541..76e0782f7 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="LGPL-2.1+" depends="dbus" depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" -checkdepends="dbus-x11 tzdata shared-mime-info" +checkdepends="dbus-x11 tzdata" makedepends="$depends_dev dbus-dev meson pcre2-dev py3-docutils xmlto zlib-dev" triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules" subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 9b6d08563..68ea1e63b 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -16,6 +16,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev kcompletion-dev kinit-dev" checkdepends="kconfigwidgets-lang" # for en_US/kf5_entry.desktop, for KLocale checkdepends="$checkdepends tzdata" # for Europe/Paris, for KTimeZones +checkdepends="$checkdepends shared-mime-info" # for KMimeTypeTest makedepends="$depends_dev cmake extra-cmake-modules networkmanager-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kdelibs4support-$pkgver.tar.xz diff --git a/user/kdevelop-pg-qt/APKBUILD b/user/kdevelop-pg-qt/APKBUILD index 6de09c288..f2b179be6 100644 --- a/user/kdevelop-pg-qt/APKBUILD +++ b/user/kdevelop-pg-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdevelop-pg-qt -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=0 pkgdesc="Parser generator for using QMake with KDevelop" url="https://kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9 kdevelop-pg-qt-2.2.1.tar.xz" +sha512sums="e82f2fa2aafa2c9f949e298989de70a0455c30f6bef4a40e38977c23ad645ee49a0a8c57b5c45d0ddfef13ee7b7e4efd2dc2ed3003a456f24108161415700369 kdevelop-pg-qt-2.2.2.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index 1776e6a86..5b12c3580 100644 --- a/user/kiconthemes/APKBUILD +++ b/user/kiconthemes/APKBUILD @@ -11,6 +11,7 @@ license="LGPL-2.1-only" depends="" depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev ki18n-dev kcoreaddons-dev kconfigwidgets-dev kitemviews-dev" +checkdepends="shared-mime-info" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 40a4c2591..89eca1dc4 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -12,6 +12,7 @@ depends="kded" depends_dev="qt5-qtbase-dev attica-dev kbookmarks-dev kcompletion-dev kconfig-dev kcoreaddons-dev kiconthemes-dev kitemviews-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev solid-dev" +checkdepends="udisks2" docdepends="kcoreaddons-doc kservice-doc kcompletion-doc kwidgetsaddons-doc kjobwidgets-doc kbookmarks-doc kitemviews-doc kxmlgui-doc solid-doc kwindowsystem-doc kconfig-doc kconfigwidgets-doc kcodecs-doc kauth-doc" @@ -19,7 +20,10 @@ makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev python3 chelf qt5-qttools-dev doxygen graphviz karchive-dev kdbusaddons-dev ki18n-dev knotifications-dev kwallet-dev acl-dev kded-dev krb5-dev $docdepends" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz + favicon-url.patch + unmounted-root.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -59,4 +63,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376 kio-5.116.0.tar.xz" +sha512sums="a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376 kio-5.116.0.tar.xz +9dc784fe35a09b145ff3dd1e1f3b02242891c0f39b087b31fcc11ca7fc98ed900f63b91213d33affd9ef0b9982e11fd16f50cc7dd274b78f187c20ac3f08dba0 favicon-url.patch +35e2e4525ee1b8779d9e42d5e280f0ca84ee5932d633392c483d069bc9d7f52240ee1d7111cc1751f11bf6e92e344e8254d29e589ef27a30622e44a970798705 unmounted-root.patch" diff --git a/user/kio/favicon-url.patch b/user/kio/favicon-url.patch new file mode 100644 index 000000000..bcf4d432a --- /dev/null +++ b/user/kio/favicon-url.patch @@ -0,0 +1,14 @@ +Set the URL to one we control that is >65KB. + +Some KDE mirrors have dropped KCalc 4.x, which makes this test flaky. +--- kio-5.116.0/autotests/favicontest.cpp.old 2024-05-04 11:40:29.000000000 +0000 ++++ kio-5.116.0/autotests/favicontest.cpp 2025-08-10 05:32:25.751427228 +0000 +@@ -216,7 +216,7 @@ + + // Set icon URL to a >65KB file + KIO::FavIconRequestJob *job = new KIO::FavIconRequestJob(url); +- job->setIconUrl(QUrl("http://download.kde.org/Attic/4.13.2/src/kcalc-4.13.2.tar.xz")); ++ job->setIconUrl(QUrl("http://distfiles.adelielinux.org/source/adelie-kde-theme-1.0.tar.xz")); + QVERIFY(willDownload(job)); + QVERIFY(!job->exec()); + QCOMPARE(job->error(), int(KIO::ERR_WORKER_DEFINED)); diff --git a/user/kio/unmounted-root.patch b/user/kio/unmounted-root.patch new file mode 100644 index 000000000..520703d1f --- /dev/null +++ b/user/kio/unmounted-root.patch @@ -0,0 +1,37 @@ +These tests fail if / (root) is not a mountpoint. + +Upstream-URL: https://invent.kde.org/frameworks/kio/-/issues/43 + +--- kio-5.116.0/autotests/jobtest.cpp.old 2024-05-04 11:40:29.000000000 +0000 ++++ kio-5.116.0/autotests/jobtest.cpp 2025-08-10 05:18:18.789195125 +0000 +@@ -60,8 +60,7 @@ + { + KMountPoint::Ptr srcMountPoint = KMountPoint::currentMountPoints().findByPath(homeTmpDir()); + KMountPoint::Ptr destMountPoint = KMountPoint::currentMountPoints().findByPath(otherTmpDir()); +- Q_ASSERT(srcMountPoint); +- Q_ASSERT(destMountPoint); ++ if (srcMountPoint == nullptr || destMountPoint == nullptr) return true; + return srcMountPoint->mountedFrom() == destMountPoint->mountedFrom(); + } + +--- kio-5.116.0/autotests/kmountpointtest.cpp.old 2024-05-04 11:40:29.000000000 +0000 ++++ kio-5.116.0/autotests/kmountpointtest.cpp 2025-08-10 05:26:09.210428498 +0000 +@@ -56,9 +56,15 @@ + // Check findByPath + #ifdef Q_OS_UNIX + const KMountPoint::Ptr rootMountPoint = mountPoints.findByPath(QStringLiteral("/")); +- QVERIFY(rootMountPoint); +- QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/")); +- QVERIFY(!rootMountPoint->probablySlow()); ++ if (!rootMountPoint) { ++ // This happens on Linux systems running inside chroot jails. ++ QSKIP("Couldn't find a root mountpoint, skipping those tests"); ++ return; ++ } else { ++ QVERIFY(rootMountPoint); ++ QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/")); ++ QVERIFY(!rootMountPoint->probablySlow()); ++ } + + QT_STATBUF rootStatBuff; + QCOMPARE(QT_STAT("/", &rootStatBuff), 0); diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index 29bf3f1f8..cef5aab9b 100644 --- a/user/kwayland/APKBUILD +++ b/user/kwayland/APKBUILD @@ -12,7 +12,7 @@ depends="" depends_dev="wayland-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz qt5-qttools-dev qt5-qtwayland qt5-qtwayland-dev qt5-qtwayland-tools - wayland-protocols plasma-wayland-protocols" + wayland-protocols plasma-wayland-protocols libxkbcommon-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwayland-$pkgver.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index 2974c52a9..5e0a84f16 100644 --- a/user/kwidgetsaddons/APKBUILD +++ b/user/kwidgetsaddons/APKBUILD @@ -38,9 +38,10 @@ check() { # 24 - ktwofingertaptest # 25 - ktwofingerswipetest # We use Openbox because it's already used in the KWindowSystem run. + # ksqueezedtextlabelautotest requires GLX visuals not available on 32-bit BE. openbox & - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E ksqueezedtextlabelautotest openbox --exit } diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index 99ca78746..49bded2a6 100644 --- a/user/kxmlgui/APKBUILD +++ b/user/kxmlgui/APKBUILD @@ -37,7 +37,8 @@ build() { check() { openbox & - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Skip test that requires visuals unavailable on 32-bit BE platforms. + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E ktooltiphelper_unittest openbox --exit } diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index 6121921a9..58032b59b 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -10,9 +10,10 @@ options="checkx11" license="LGPL-2.1+ AND GPL-2.0+ AND (GPL-2.0-only OR GPL-3.0-only)" depends="" depends_dev="qt5-qtbase-dev" +checkdepends="hwdata" # TestEDID makedepends="$depends_dev cmake doxygen extra-cmake-modules qt5-qtx11extras-dev qt5-qttools-dev qt5-qtwayland-dev qt5-qtwayland-tools kwayland-dev - wayland-dev plasma-wayland-protocols libxcb-dev" + wayland-dev plasma-wayland-protocols libxcb-dev kconfig-dev" subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd $pkgname-wayland" source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz @@ -37,7 +38,7 @@ build() { check() { # Both tests time out trying to connect to the Wayland display. - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'testkwayland(backend|config)' + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'testkwayland(backend|config|dpms)' } package() { diff --git a/user/plasma-wayland-protocols/APKBUILD b/user/plasma-wayland-protocols/APKBUILD index 563a11ace..adb9682e4 100644 --- a/user/plasma-wayland-protocols/APKBUILD +++ b/user/plasma-wayland-protocols/APKBUILD @@ -8,7 +8,7 @@ url="https://www.kde.org/" arch="noarch" license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules" +makedepends="cmake extra-cmake-modules wayland-dev" subpackages="" source="https://download.kde.org/stable/plasma-wayland-protocols/plasma-wayland-protocols-$pkgver.tar.xz" diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index b5f40acbb..85fd62553 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=postgresql -pkgver=14.15 +pkgver=14.18 pkgrel=0 pkgdesc="Featureful object-relational database system (RDBMS)" url="https://www.postgresql.org/" @@ -249,7 +249,7 @@ _submv() { done } -sha512sums="227f9551167ee62e5185d6f6777e100ecc09f497b9ee1b5a8e659de8d4c237b0f9a97005706bbf64c3e839271e2630f6a417ba98dfce47bcb4c27e8641a7c6ef postgresql-14.15.tar.bz2 +sha512sums="fe40ba9fcc001f8c7eb3557c6248fa42af82b487ea4f31b8b20f5fa7ab930246659a4c8cf0bfa9a52f5143c766c0660d36b092474d2909020114ea3a1810adfd postgresql-14.18.tar.bz2 5772c54378f885fd2924be431f577bcbc134481d17a1331afd42ebeea2995e52364601ca2e2839d3c1dd78c51e4483424d1ed8ef8cdf43889a5a209861396efc perl-rpath.patch 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch 323ea2f3b6d71b858153d1f8ae62a98548ce8b2d1e0d9214dd32e858e4ad9bd0194b8b2f6e9540ce6324e394a08f496b2822004c1c3fef11184f267fa401a087 disable-broken-tests.patch diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 6f90e9587..e406af874 100644 --- a/user/syntax-highlighting/APKBUILD +++ b/user/syntax-highlighting/APKBUILD @@ -19,6 +19,11 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + + case $CTARGET_ARCH in + ppc|espresso) LDFLAGS="$LDFLAGS -Wl,--no-as-needed -latomic -Wl,--as-needed";; + esac + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ |