diff options
Diffstat (limited to 'user/kdelibs4support')
| -rw-r--r-- | user/kdelibs4support/APKBUILD | 17 | ||||
| -rw-r--r-- | user/kdelibs4support/ensure-wordsize-defined.patch | 17 | ||||
| -rw-r--r-- | user/kdelibs4support/use-real-paris.patch | 15 |
3 files changed, 44 insertions, 5 deletions
diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 9829503aa..9b6d08563 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdelibs4support -pkgver=5.94.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" arch="all" -options="!check suid" # Test requires running X11 session. +options="checkx11 suid" license="LGPL-2.1+ AND MIT AND LGPL-2.1-only AND LGPL-2.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) AND (LGPL-2.0-only OR LGPL-3.0-only)" depends="" depends_dev="qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev kcompletion-dev @@ -14,9 +14,14 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev kcompletion-dev kemoticons-dev kparts-dev kunitconversion-dev kinit kded kded-dev kitemmodels-dev knotifications-dev sonnet-dev threadweaver-dev kinit-dev" +checkdepends="kconfigwidgets-lang" # for en_US/kf5_entry.desktop, for KLocale +checkdepends="$checkdepends tzdata" # for Europe/Paris, for KTimeZones 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" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kdelibs4support-$pkgver.tar.xz + ensure-wordsize-defined.patch + use-real-paris.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -26,7 +31,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} . @@ -41,4 +46,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8b48b7d67201bc6e0fb67fa00b75dbaf8e35e21f7527b4bc79939c2b689c027bfa75eb60b13686bd8bce710a61682a27cac85481edd6e321063aefb186cdd2f2 kdelibs4support-5.94.0.tar.xz" +sha512sums="87cdc59da0fcaccc48012cf3c34ab3707c2eb159effd17e76b7c24a81feebebef3a27aa1d25dadfb0d5ee7efbc39b2fa7cafc6090476f5ec4cb8e9be616050be kdelibs4support-5.116.0.tar.xz +a06a1c50d47a581db8c9f515702f9c2be9f8baf33231a1398594210ddd10830c56f24b3521179d27989e630aa9295edd0f4bed67477102fbf9ff5d4b57db2fdc ensure-wordsize-defined.patch +ffd6643813c69f9e3f6079638680d05eff356eb96ad1eb0702da5e9671de8eb0b6095e218fa0e4f7b40488227e0aaf185841c8fa300ac2e5aa37e87267c895e0 use-real-paris.patch" diff --git a/user/kdelibs4support/ensure-wordsize-defined.patch b/user/kdelibs4support/ensure-wordsize-defined.patch new file mode 100644 index 000000000..03b8eafb1 --- /dev/null +++ b/user/kdelibs4support/ensure-wordsize-defined.patch @@ -0,0 +1,17 @@ +This is needed since we aren't glibc. + +src/kdelibs4support-5.116.0/autotests/klocaletest.cpp:1205:6: error: "__WORDSIZE" is not defined, evaluates to 0 [-Werror=undef] + 1205 | #if (__WORDSIZE == 64) || defined (_LP64) || defined(__LP64__) || defined(__ILP64__) + | ^~~~~~~~~~ + +--- kdelibs4support-5.116.0/autotests/klocaletest.cpp.old 2024-05-04 06:38:54.000000000 -0500 ++++ kdelibs4support-5.116.0/autotests/klocaletest.cpp 2025-07-01 03:29:19.738313843 -0500 +@@ -1202,7 +1202,7 @@ + QCOMPARE(locale.formatByteSize(5000000), QString("4.8 MiB")); + QCOMPARE(locale.formatByteSize(50000000), QString("47.7 MiB")); + QCOMPARE(locale.formatByteSize(500000000), QString("476.8 MiB")); +-#if (__WORDSIZE == 64) || defined (_LP64) || defined(__LP64__) || defined(__ILP64__) ++#if (defined(__WORDSIZE) && (__WORDSIZE == 64)) || defined (_LP64) || defined(__LP64__) || defined(__ILP64__) + QCOMPARE(locale.formatByteSize(5000000000), QString("4.7 GiB")); + QCOMPARE(locale.formatByteSize(50000000000), QString("46.6 GiB")); + QCOMPARE(locale.formatByteSize(500000000000), QString("465.7 GiB")); diff --git a/user/kdelibs4support/use-real-paris.patch b/user/kdelibs4support/use-real-paris.patch new file mode 100644 index 000000000..fe8b72445 --- /dev/null +++ b/user/kdelibs4support/use-real-paris.patch @@ -0,0 +1,15 @@ +musl (correctly) does not like being fed weird Qt paths from TZ. + +Just use the normal Europe/Paris file already installed by tzdata. + +--- kdelibs4support-5.116.0/autotests/ktimezonestest.cpp.old 2024-05-04 06:38:54.000000000 -0500 ++++ kdelibs4support-5.116.0/autotests/ktimezonestest.cpp 2025-07-01 03:49:46.268079721 -0500 +@@ -295,7 +295,7 @@ + + void KTimeZonesTest::currentOffset() + { +- QString tzfile = ':' + mDataDir + "/Europe/Paris"; ++ QString tzfile = "Europe/Paris"; + QByteArray originalZone = qgetenv("TZ"); // save the original local time zone + qputenv("TZ", tzfile.toLatin1()); + ::tzset(); |