diff options
Diffstat (limited to 'user/kconfig')
| -rw-r--r-- | user/kconfig/APKBUILD | 13 | ||||
| -rw-r--r-- | user/kconfig/deflake.patch | 15 |
2 files changed, 23 insertions, 5 deletions
diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index 1a05bdfd5..12059c742 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,19 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.94.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" arch="all" -options="!check" # Tests require running D-Bus. +options="checkx11" license="LGPL-2.0+" depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen qt5-qtdeclarative-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfig-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfig-$pkgver.tar.xz + deflake.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -23,7 +25,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" \ -DBUILD_QCH:BOOL=ON \ @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59d7d957313e421a332fb0a83eef6be68455c3de50cee0cd0d1b6b22f2b97ad9fdfddac282f03c4cedc5f364d4b3321c3f3fdadd7824e0523c5260446dc31ac9 kconfig-5.94.0.tar.xz" +sha512sums="a84f02462f2e7d75488dab6dfb0f438792762f2031cabe8cf7ef143f285e9da8de5e555165d3eb4bc24ae8e3528bc24dde1a6505a55933d98386351493a845d4 kconfig-5.116.0.tar.xz +bfbd633196d463704bf17ffd1b0f90cb74e5d584ed02472e7a835f437faa2fc84f8614ac0c4368b1197590e66f25df694fd67e29b690fc7cffbb520a37df1c2a deflake.patch" diff --git a/user/kconfig/deflake.patch b/user/kconfig/deflake.patch new file mode 100644 index 000000000..338d66a65 --- /dev/null +++ b/user/kconfig/deflake.patch @@ -0,0 +1,15 @@ +Silence a single test that races kdeglobals + +This is a known flaky test upstream. There is a good RCA at +https://invent.kde.org/frameworks/kconfig/-/merge_requests/219 but the +long and the short of it is that the test is flaky as-is. +--- kconfig-5.116.0/autotests/kconfigtest.cpp.old 2024-05-04 06:38:05.000000000 -0500 ++++ kconfig-5.116.0/autotests/kconfigtest.cpp 2025-06-30 04:04:40.523164120 -0500 +@@ -1785,7 +1785,6 @@ + KConfig mainConfig(s_kconfig_test_subdir); + KConfigGroup mainGroup(&mainConfig, "OwnTestGroup"); + QCOMPARE(mainGroup.readEntry("GlobalKey", "Default"), QStringLiteral("Default")); // key is gone +- QCOMPARE(mainGroup.keyList(), expectedKeys); + } + } + |