From 354625974c8840891c92e5edc4e704cf8a6a35d7 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 24 May 2024 19:31:17 +0200 Subject: [PATCH] merge upstream --- common/shlibs | 15 ------- srcpkgs/baloo5-devel | 1 - srcpkgs/baloo5/template | 35 --------------- srcpkgs/baloo5/update | 1 - srcpkgs/bluez-qt5-devel | 1 - srcpkgs/bluez-qt5/files/README.voidlinux | 1 - srcpkgs/bluez-qt5/patches/musl.patch | 10 ----- srcpkgs/bluez-qt5/template | 36 ---------------- srcpkgs/bluez-qt5/update | 1 - srcpkgs/kcalendarcore-devel | 1 - srcpkgs/kcalendarcore/template | 47 --------------------- srcpkgs/kdesu-devel | 1 - srcpkgs/kdesu/template | 25 ----------- srcpkgs/kdnssd-devel | 1 - srcpkgs/kdnssd/template | 24 ----------- srcpkgs/kimageformats/template | 21 --------- srcpkgs/kjsembed/template | 28 ------------ srcpkgs/kmediaplayer-devel | 1 - srcpkgs/kmediaplayer/template | 28 ------------ srcpkgs/kpty/template | 25 ----------- srcpkgs/kquickcharts/template | 20 --------- srcpkgs/kxmlrpcclient-devel | 1 - srcpkgs/kxmlrpcclient/template | 29 ------------- srcpkgs/libepc-devel | 1 - srcpkgs/libepc/template | 25 ----------- srcpkgs/libkscreen-devel | 1 - srcpkgs/libkscreen/template | 35 --------------- srcpkgs/modemmanager-qt5-devel | 1 - srcpkgs/modemmanager-qt5/template | 30 ------------- srcpkgs/modemmanager-qt5/update | 1 - srcpkgs/pandoc/patches/fix-musl-build.patch | 43 +++++++++++++++++++ srcpkgs/pandoc/template | 42 ++++++------------ srcpkgs/plasma-integration/template | 18 +++----- srcpkgs/prison-devel | 1 - srcpkgs/prison/template | 37 ---------------- srcpkgs/python3-nanobind/template | 4 +- srcpkgs/python3-scipy/template | 4 +- srcpkgs/python3-tifffile/template | 4 +- srcpkgs/qqc2-desktop-style-devel | 1 - srcpkgs/qqc2-desktop-style/template | 21 --------- srcpkgs/removed-packages/template | 16 +++++++ srcpkgs/xpra/template | 4 +- 42 files changed, 86 insertions(+), 556 deletions(-) delete mode 120000 srcpkgs/baloo5-devel delete mode 100644 srcpkgs/baloo5/template delete mode 100644 srcpkgs/baloo5/update delete mode 120000 srcpkgs/bluez-qt5-devel delete mode 100644 srcpkgs/bluez-qt5/files/README.voidlinux delete mode 100644 srcpkgs/bluez-qt5/patches/musl.patch delete mode 100644 srcpkgs/bluez-qt5/template delete mode 100644 srcpkgs/bluez-qt5/update delete mode 120000 srcpkgs/kcalendarcore-devel delete mode 100644 srcpkgs/kcalendarcore/template delete mode 120000 srcpkgs/kdesu-devel delete mode 100644 srcpkgs/kdesu/template delete mode 120000 srcpkgs/kdnssd-devel delete mode 100644 srcpkgs/kdnssd/template delete mode 100644 srcpkgs/kimageformats/template delete mode 100644 srcpkgs/kjsembed/template delete mode 120000 srcpkgs/kmediaplayer-devel delete mode 100644 srcpkgs/kmediaplayer/template delete mode 100644 srcpkgs/kpty/template delete mode 100644 srcpkgs/kquickcharts/template delete mode 120000 srcpkgs/kxmlrpcclient-devel delete mode 100644 srcpkgs/kxmlrpcclient/template delete mode 120000 srcpkgs/libepc-devel delete mode 100644 srcpkgs/libepc/template delete mode 120000 srcpkgs/libkscreen-devel delete mode 100644 srcpkgs/libkscreen/template delete mode 120000 srcpkgs/modemmanager-qt5-devel delete mode 100644 srcpkgs/modemmanager-qt5/template delete mode 100644 srcpkgs/modemmanager-qt5/update create mode 100644 srcpkgs/pandoc/patches/fix-musl-build.patch delete mode 120000 srcpkgs/prison-devel delete mode 100644 srcpkgs/prison/template delete mode 120000 srcpkgs/qqc2-desktop-style-devel delete mode 100644 srcpkgs/qqc2-desktop-style/template diff --git a/common/shlibs b/common/shlibs index ff14234e60c..645e96e38d1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -480,7 +480,6 @@ libKPim6GrantleeTheme.so.6 kf6-grantleetheme-24.02.2_1 libKPim6IMAP.so.6 kimap-24.02.0_1 libKPim6LdapCore.so.6 kldap-24.02.0_1 libKPim6LdapWidgets.so.6 kldap-24.02.0_1 -libKF5CalendarCore.so.5 kcalendarcore-5.63.0_1 libKPim6AkonadiSearchDebug.so.6 akonadi-search-24.02.0_1 libKPim6AkonadiSearchCore.so.6 akonadi-search-24.02.0_1 libKPim6AkonadiSearchPIM.so.6 akonadi-search-24.02.0_1 @@ -894,8 +893,6 @@ libgrilo-0.3.so.0 grilo-0.3.2_1 libgrlnet-0.3.so.0 grilo-0.3.2_1 libgrlpls-0.3.so.0 grilo-0.3.2_1 libquvi.so.7 libquvi-0.4.0_1 -libepc-1.0.so.3 libepc-0.4.1_1 -libepc-ui-1.0.so.3 libepc-0.4.1_1 libgupnp-dlna-2.0.so.4 gupnp-dlna-0.12.0_1 libgupnp-dlna-gst-2.0.so.4 gupnp-dlna-0.12.0_1 libfm.so.4 libfm-1.2.3_3 @@ -1563,7 +1560,6 @@ libdovecot-storage.so.0 dovecot-2.3.13_3 libdovecot-lda.so.0 dovecot-2.3.13_3 libKPim6AkonadiContactCore.so.6 akonadi-contacts-24.02.0_1 libKPim6AkonadiContactWidgets.so.6 akonadi-contacts-24.02.0_1 -libKF5Prison.so.5 prison-5.43.0_1 libKPim6AkonadiMime.so.6 akonadi-mime-24.02.0_1 libKPim5Mime.so.5 kmime-23.04.0_1 libKPim6Mime.so.6 kmime6-24.02.0_1 @@ -2593,8 +2589,6 @@ libosgUtil.so.161 osg-3.6.5_1 libosgVolume.so.161 osg-3.6.5_1 libosgGA.so.161 osg-3.6.5_1 libosgPresentation.so.161 osg-3.6.5_1 -libKF5Screen.so.8 libkscreen-5.26.90_1 -libKF5ScreenDpms.so.8 libkscreen-5.26.90_1 libKF6Screen.so.8 libkf6screen-6.0.0_1 libKF6ScreenDpms.so.8 libkf6screen-6.0.0_1 libdbusmenu-qt5.so.2 libdbusmenu-qt5-0.9.3.0_1 @@ -2800,7 +2794,6 @@ libbabeltrace-ctf-metadata.so.1 babeltrace-1.5.3_1 libbabeltrace-dummy.so.1 babeltrace-1.5.3_1 libbabeltrace-lttng-live.so.1 babeltrace-1.5.3_1 liblttng-ctl.so.0 lttng-tools-2.10.1_1 -libKF5DNSSD.so.5 kdnssd-5.26.0_1 libtwaindsm.so.2 twaindsm-2.3.0_1 libspnav.so.0 libspnav-0.2.3_1 libsimage.so.20 simage-1.7.0_1 @@ -2888,7 +2881,6 @@ libKF5Service.so.5 kservice-5.26.0_1 libKF5GlobalAccel.so.5 kglobalaccel-5.26.0_1 libKF5GlobalAccelPrivate.so.5 kglobalaccel-5.26.0_1 libKF5Package.so.5 kpackage-5.26.0_1 -libKF5Su.so.5 kdesu-5.26.0_1 libKF5Emoticons.so.5 kemoticons-5.26.0_1 libKF5IconThemes.so.5 kiconthemes-5.26.0_1 libKF5JobWidgets.so.5 kjobwidgets-5.26.0_1 @@ -2921,22 +2913,16 @@ libKF5WebKit.so.5 kdewebkit-5.26.0_1 libKF5TextEditor.so.5 ktexteditor-5.26.0_1 libKF5Plasma.so.5 plasma-framework-5.26.0_1 libKF5PlasmaQuick.so.5 plasma-framework-5.26.0_1 -libKF5ModemManagerQt.so.6 modemmanager-qt5-5.26.0_1 libKF5People.so.5 kpeople-5.26.0_1 libKF5PeopleBackend.so.5 kpeople-5.36.0_1 libKF5PeopleWidgets.so.5 kpeople-5.36.0_1 -libKF5XmlRpcClient.so.5 kxmlrpcclient-5.26.0_1 -libKF5BluezQt.so.6 bluez-qt5-5.26.0_1 libKF5FileMetaData.so.3 kfilemetadata5-5.26.0_1 -libKF5Baloo.so.5 baloo5-5.26.0_1 -libKF5BalooEngine.so.5 baloo5-5.26.0_1 libKF5ActivitiesStats.so.1 kactivities5-stats-5.26.0_1 libKF5Runner.so.5 krunner-5.26.0_1 libKF5JS.so.5 kjs-5.26.0_1 libKF5JSApi.so.5 kjs-5.36.0_1 libKF5KDELibs4Support.so.5 kdelibs4support-5.26.0_1 libKF5KHtml.so.5 khtml-5.26.0_1 -libKF5JsEmbed.so.5 kjsembed-5.26.0_1 libKF5KrossCore.so.5 kross-5.26.0_1 libKF5KrossUi.so.5 kross-5.36.0_1 libKGlobalAccelD.so.0 kglobalacceld-6.0.0_1 @@ -3142,7 +3128,6 @@ liboggz.so.2 liboggz-1.1.1_1 libfishsound.so.1 libfishsound-1.0.0_1 libxqilla.so.2 XQilla-2.3.4_1 libKF5DocTools.so.5 kdoctools-5.36.0_1 -libKF5MediaPlayer.so.5 kmediaplayer-5.36.0_1 libxo.so.0 libxo-0.9.0_1 libbrotlicommon.so.1 brotli-1.0.2_1 libbrotlidec.so.1 brotli-1.0.2_1 diff --git a/srcpkgs/baloo5-devel b/srcpkgs/baloo5-devel deleted file mode 120000 index cd9ae316060..00000000000 --- a/srcpkgs/baloo5-devel +++ /dev/null @@ -1 +0,0 @@ -baloo5 \ No newline at end of file diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template deleted file mode 100644 index 40c2653704b..00000000000 --- a/srcpkgs/baloo5/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'baloo5' -pkgname=baloo5 -version=5.115.0 -revision=2 -build_style=cmake -configure_args=" - -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson - -DBUILD_INDEXER_SERVICE=OFF" -hostmakedepends="kcoreaddons extra-cmake-modules gettext - kconfig qt5-host-tools qt5-qmake python3 kcoreaddons" -makedepends="kfilemetadata5-devel kidletime-devel kio-devel ksolid-devel lmdb-devel" -depends="hicolor-icon-theme kf6-baloo" -short_desc="Framework for searching and managing metadata" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://community.kde.org/Baloo" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=95cb2038efc4b32f3a17d5592bf247815ea6d02fb8707e04b65bdd80d851c108 - -do_check() { - cd build - ctest -E 'filemonitortest' -} - -baloo5-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/qt5/mkspecs - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/baloo5/update b/srcpkgs/baloo5/update deleted file mode 100644 index 04f7336c75a..00000000000 --- a/srcpkgs/baloo5/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=${pkgname%5} diff --git a/srcpkgs/bluez-qt5-devel b/srcpkgs/bluez-qt5-devel deleted file mode 120000 index 6f8c3e7cee9..00000000000 --- a/srcpkgs/bluez-qt5-devel +++ /dev/null @@ -1 +0,0 @@ -bluez-qt5 \ No newline at end of file diff --git a/srcpkgs/bluez-qt5/files/README.voidlinux b/srcpkgs/bluez-qt5/files/README.voidlinux deleted file mode 100644 index d253e9cf502..00000000000 --- a/srcpkgs/bluez-qt5/files/README.voidlinux +++ /dev/null @@ -1 +0,0 @@ -You need to be in the bluetooth group to be able to modify the bluetooth state! diff --git a/srcpkgs/bluez-qt5/patches/musl.patch b/srcpkgs/bluez-qt5/patches/musl.patch deleted file mode 100644 index 4b573069a54..00000000000 --- a/srcpkgs/bluez-qt5/patches/musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/a2dp-codecs.h 2022-07-02 16:28:19.000000000 +0200 -+++ - 2022-07-24 13:05:00.602912484 +0200 -@@ -11,6 +11,7 @@ - #define BLUEZQT_A2DPCODECS_H - - #include -+#include - - // clang-format off - diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template deleted file mode 100644 index d0381756633..00000000000 --- a/srcpkgs/bluez-qt5/template +++ /dev/null @@ -1,36 +0,0 @@ -# Template file for 'bluez-qt5' -pkgname=bluez-qt5 -version=5.115.0 -revision=1 -build_style=cmake -configure_args=" -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d" -hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-qmake" -makedepends="qt5-declarative-devel" -depends="bluez" -checkdepends="dbus" -short_desc="Qt wrapper for BlueZ 5 DBus API" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://invent.kde.org/frameworks/bluez-qt" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=bd7fd3144175be0c679428f449cbdca57223d101177da67cabcba5fca4bc64a1 - -do_check() { - cd build - dbus-run-session ctest -} - -post_install() { - vdoc "${FILESDIR}/README.voidlinux" -} - -bluez-qt5-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/bluez-qt5/update b/srcpkgs/bluez-qt5/update deleted file mode 100644 index 04f7336c75a..00000000000 --- a/srcpkgs/bluez-qt5/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=${pkgname%5} diff --git a/srcpkgs/kcalendarcore-devel b/srcpkgs/kcalendarcore-devel deleted file mode 120000 index a2e99fc8941..00000000000 --- a/srcpkgs/kcalendarcore-devel +++ /dev/null @@ -1 +0,0 @@ -kcalendarcore \ No newline at end of file diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template deleted file mode 100644 index b53d2466c54..00000000000 --- a/srcpkgs/kcalendarcore/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'kcalendarcore' -pkgname=kcalendarcore -reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1" -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" -makedepends="qt5-devel libical-devel" -checkdepends="perl" -short_desc="KDE calendar access library" -maintainer="John " -license="LGPL-2.0-or-later" -homepage="https://invent.kde.org/frameworks/kcalendarcore" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=59d8872c471b1bc4433d6643d2d28755772dc3e0019fac9451cbea8e9e3f54a3 -replaces="kcalcore>=0" - -do_check() { - : #recorson deadlocks - # Fun with timezones - #cd build - #ctest -E "test(recurtodo|readrecurrenceid|icaltimezones|memorycalendar|timesininterval)" -} - -kcalendarcore-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - replaces="kcalcore-devel>=0" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/qt5/mkspecs/modules - vmove "usr/lib/*.so" - } -} - -kcalcore_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - (transitional meta package)" - build_style=meta -} - -kcalcore-devel_package() { - depends="${sourcepkg}-devel>=${version}_${revision}" - short_desc+=" - (transitional meta package)" - build_style=meta -} diff --git a/srcpkgs/kdesu-devel b/srcpkgs/kdesu-devel deleted file mode 120000 index d5ea7a0da20..00000000000 --- a/srcpkgs/kdesu-devel +++ /dev/null @@ -1 +0,0 @@ -kdesu \ No newline at end of file diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template deleted file mode 100644 index f7ec2809fa1..00000000000 --- a/srcpkgs/kdesu/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'kdesu' -pkgname=kdesu -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules gettext - qt5-host-tools qt5-qmake python3" -makedepends="kservice-devel kpty-devel" -short_desc="KDE User interface for running shell commands with root privileges" -maintainer="John " -license="LGPL-2.0-only" -homepage="https://invent.kde.org/frameworks/kdesu" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=03e2b7963bc02492639193d20c76723430d5f530b6dee60d61b8dd64f0698b62 - -kdesu-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/kdnssd-devel b/srcpkgs/kdnssd-devel deleted file mode 120000 index e3180288859..00000000000 --- a/srcpkgs/kdnssd-devel +++ /dev/null @@ -1 +0,0 @@ -kdnssd \ No newline at end of file diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template deleted file mode 100644 index c378cc54f3f..00000000000 --- a/srcpkgs/kdnssd/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'kdnssd' -pkgname=kdnssd -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" -makedepends="qt5-devel qt5-tools-devel avahi-libs-devel" -short_desc="Network service discovery using Zeroconf" -maintainer="John " -license="LGPL-2.0-or-later" -homepage="https://invent.kde.org/frameworks/kdnssd" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b2e361c233d9c38a14d83c36b9cf0290311d0e5f77c629a04b597065fbce52df - -kdnssd-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template deleted file mode 100644 index 1bacb24161b..00000000000 --- a/srcpkgs/kimageformats/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'kimageformats' -pkgname=kimageformats -version=5.115.0 -revision=2 -build_style=cmake -configure_args="-DKIMAGEFORMATS_HEIF=ON" -hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools - pkg-config" -makedepends="karchive-devel libopenexr-devel libheif-devel libraw-devel libavif-devel - libjxl-devel" -short_desc="KDE Plugins to allow QImage to support extra file formats" -maintainer="John " -license="LGPL-2.0-or-later" -homepage="https://invent.kde.org/frameworks/kimageformats" -distfiles="${KDE_SITE}/frameworks/${version%.*}/kimageformats-${version}.tar.xz" -checksum=9f61020d66f86b8b10bce14e42a39c5e8fd8e40ec9e6ca8b9e9b5ce3e1aa7283 - -# FIXME: some tests fail on i686. -# FIXME: 1 test fails on all archs, solved by -# https://invent.kde.org/frameworks/kimageformats/-/commit/41f0411b62d10d602a4def0c0d12975e77a16028 -make_check=no diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template deleted file mode 100644 index 4f4dcbbd2b7..00000000000 --- a/srcpkgs/kjsembed/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'kjsembed' -pkgname=kjsembed -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="gettext kcoreaddons extra-cmake-modules" -makedepends="qt5-devel qt5-tools-devel qt5-svg-devel kjs-devel ki18n-devel kdoctools-devel" -short_desc="KDE Binding Javascript object to QObjects" -maintainer="John " -license="LGPL-2.0-or-later" -homepage="https://invent.kde.org/frameworks/kjsembed" -distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=f6aeac1dcc7e1ce4219ef3a0a8a22c5eb2ab377a9587d5d9fa94b625653e3151 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" -fi - -kjsembed-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/kmediaplayer-devel b/srcpkgs/kmediaplayer-devel deleted file mode 120000 index 111ad4fa30f..00000000000 --- a/srcpkgs/kmediaplayer-devel +++ /dev/null @@ -1 +0,0 @@ -kmediaplayer \ No newline at end of file diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template deleted file mode 100644 index bfa40609cb6..00000000000 --- a/srcpkgs/kmediaplayer/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'kmediaplayer' -pkgname=kmediaplayer -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules - qt5-host-tools qt5-qmake python3 gettext" -makedepends="kparts-devel" -short_desc="KDE Interface for media player KParts" -maintainer="John " -license="X11" -homepage="https://invent.kde.org/frameworks/kmediaplayer" -distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=95d274982d03ffb592cde5513cf6b4470caef599501f56eaec127611746daaf9 - -post_install() { - vlicense LICENSE -} - -kmediaplayer-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template deleted file mode 100644 index d87794688a6..00000000000 --- a/srcpkgs/kpty/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'kpty' -pkgname=kpty -version=5.115.0 -revision=1 -build_style=cmake -configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter" -hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel" -makedepends="kcoreaddons-devel ki18n-devel libutempter-devel" -short_desc="KDE Interfacing with pseudo terminal devices" -maintainer="John " -license="LGPL-2.0-or-later, LGPL-2.1-or-later" -homepage="https://invent.kde.org/frameworks/kpty" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=844c03068b266fa0805a015af2752923b42d55e8d9d4d65b3e600a19a2805419 - -kpty-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template deleted file mode 100644 index 44c2c94f1d4..00000000000 --- a/srcpkgs/kquickcharts/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'kquickcharts' -pkgname=kquickcharts -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" -makedepends="qt5-declarative-devel qt5-quickcontrols2-devel" -checkdepends="glslang which" -short_desc="QtQuick plugin providing high-performance charts" -maintainer="John " -license="LGPL-2.1-only, LGPL-3.0-only" -homepage="https://community.kde.org/Frameworks" -distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz" -checksum=aa78d81ce4af03671803b50f4a7ee8ffb8e6c687749de1706359176d502566bb - -do_check() { - cd build - # QML tests require OpenGL - ctest -E ".*\.qml" -} diff --git a/srcpkgs/kxmlrpcclient-devel b/srcpkgs/kxmlrpcclient-devel deleted file mode 120000 index b141f3dbbd6..00000000000 --- a/srcpkgs/kxmlrpcclient-devel +++ /dev/null @@ -1 +0,0 @@ -kxmlrpcclient \ No newline at end of file diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template deleted file mode 100644 index 0a94f500ca9..00000000000 --- a/srcpkgs/kxmlrpcclient/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'kxmlrpcclient' -pkgname=kxmlrpcclient -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules gettext - qt5-host-tools qt5-qmake python3" -makedepends="kio-devel" -short_desc="KDE XML-RPC client" -maintainer="John " -license="LGPL-2.1-or-later, BSD-2-Clause" -homepage="https://invent.kde.org/frameworks/kxmlrpcclient" -distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=8074fd5c167119500d2a83981aeccfb533752c830d718c6160547c619a283208 - -post_install() { - vlicense LICENSES/BSD-2-Clause.txt -} - -kxmlrpcclient-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/libepc-devel b/srcpkgs/libepc-devel deleted file mode 120000 index c5dfd55105b..00000000000 --- a/srcpkgs/libepc-devel +++ /dev/null @@ -1 +0,0 @@ -libepc \ No newline at end of file diff --git a/srcpkgs/libepc/template b/srcpkgs/libepc/template deleted file mode 100644 index 819e46c26bd..00000000000 --- a/srcpkgs/libepc/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'libepc' -pkgname=libepc -version=0.4.6 -revision=1 -build_style=gnu-configure -hostmakedepends="pkg-config intltool glib-devel" -makedepends="gtk+3-devel libsoup-devel avahi-glib-libs-devel - avahi-ui-libs-devel gnutls-devel libuuid-devel" -short_desc="Easy Publish and Consume Library" -maintainer="Orphaned " -license="LGPL-2.1" -homepage="http://live.gnome.org/libepc" -distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz" -checksum=215990847a8526c85774cb74fbcaea4c46866df58281b21dce5a62aac5da7ae8 - -libepc-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/share/gtk-doc - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/libkscreen-devel b/srcpkgs/libkscreen-devel deleted file mode 120000 index 29f843cfac4..00000000000 --- a/srcpkgs/libkscreen-devel +++ /dev/null @@ -1 +0,0 @@ -libkscreen \ No newline at end of file diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template deleted file mode 100644 index d1c5947a232..00000000000 --- a/srcpkgs/libkscreen/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'libkscreen' -pkgname=libkscreen -version=5.27.11 -revision=3 -build_style=cmake -configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel - plasma-wayland-protocols qt5-wayland wayland-devel" -makedepends="qt5-tools-devel qt5-x11extras-devel libXrandr-devel kwayland-devel - kconfig-devel" -short_desc="KDE screen management software" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://invent.kde.org/plasma/libkscreen" -distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=0d11f41d489f32303988e5a2eee8cef7f4eb18faea5614e65bf202007ea21dd5 - -post_install() { - rm -rf "${DESTDIR}/usr/bin" - rm -rf "${DESTDIR}/usr/lib/systemd" - rm -rf "${DESTDIR}/usr/share/dbus-1" - rm -rf "${DESTDIR}/usr/share/zsh" -} - -libkscreen-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/qt5/mkspecs - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/modemmanager-qt5-devel b/srcpkgs/modemmanager-qt5-devel deleted file mode 120000 index fada1a2b72f..00000000000 --- a/srcpkgs/modemmanager-qt5-devel +++ /dev/null @@ -1 +0,0 @@ -modemmanager-qt5 \ No newline at end of file diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template deleted file mode 100644 index b626ed81734..00000000000 --- a/srcpkgs/modemmanager-qt5/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'modemmanager-qt5' -pkgname=modemmanager-qt5 -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules pkg-config - qt5-host-tools qt5-qmake" -makedepends="qt5-devel ModemManager-devel" -checkdepends="dbus" -short_desc="Qt wrapper for ModemManager DBus API" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://invent.kde.org/frameworks/modemmanager-qt" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=a04b75ed05fe6b7021073e3c518c328a0d059065cc75c6d384ad1fbbc5fd5091 - -do_check() { - cd build - dbus-run-session ctest -} - -modemmanager-qt5-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/modemmanager-qt5/update b/srcpkgs/modemmanager-qt5/update deleted file mode 100644 index 04f7336c75a..00000000000 --- a/srcpkgs/modemmanager-qt5/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=${pkgname%5} diff --git a/srcpkgs/pandoc/patches/fix-musl-build.patch b/srcpkgs/pandoc/patches/fix-musl-build.patch new file mode 100644 index 00000000000..79e439f0f65 --- /dev/null +++ b/srcpkgs/pandoc/patches/fix-musl-build.patch @@ -0,0 +1,43 @@ +# See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586 + +--- a/pandoc-crossref-0.3.17.0/pandoc-crossref.cabal 2001-09-08 22:46:40.000000000 -0300 ++++ b/pandoc-crossref-0.3.17.0/pandoc-crossref.cabal 2024-03-26 17:16:02.918173738 -0300 +@@ -127,20 +127,6 @@ + library + exposed-modules: + Text.Pandoc.CrossRef +- hs-source-dirs: +- lib +- ghc-options: -Wall +- build-depends: +- base >=4.11 && <5 +- , mtl >=1.1 && <2.4 +- , pandoc >=3.1.8 && <3.2 +- , pandoc-crossref-internal +- , pandoc-types ==1.23.* +- , text >=1.2.2 && <2.1 +- default-language: Haskell2010 +- +-library pandoc-crossref-internal +- exposed-modules: + Text.Numeral.Roman + Text.Pandoc.CrossRef.References + Text.Pandoc.CrossRef.References.Blocks +@@ -165,7 +151,9 @@ + Text.Pandoc.CrossRef.Util.Template + Text.Pandoc.CrossRef.Util.Util + hs-source-dirs: ++ lib + lib-internal ++ ghc-options: -Wall + build-depends: + base >=4.11 && <5 + , containers >=0.1 && <0.7 +@@ -247,7 +235,6 @@ + , mtl >=1.1 && <2.4 + , pandoc >=3.1.8 && <3.2 + , pandoc-crossref +- , pandoc-crossref-internal + , pandoc-types ==1.23.* + , text >=1.2.2 && <2.1 + if flag(enable_flaky_tests) diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index 2c3c74e3501..cbc10d274e1 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -1,52 +1,38 @@ # Template file for 'pandoc' pkgname=pandoc # Keep in sync with http://www.stackage.org/lts -version=2.17.1.1 +version=3.1.11.1 revision=1 -_sidenote_version=0.22.1.0 -_monad_gen_version=0.3.0.1 -_crossref_version=0.3.12.2 -_roman_numerals_version=0.5.1.5 +_sidenote_version=0.23.0.0 +_crossref_version=0.3.17.0 create_wrksrc=yes build_style=haskell-stack -stackage="lts-19.0" +stackage="lts-22.13" make_build_args=" --flag pandoc:embed_data_files --flag=lua:pkg-config" hostmakedepends="pkg-config unzip wget" -makedepends="zlib-devel lua53-devel tar" +makedepends="zlib-devel lua54-devel tar" short_desc="Universal converter between markup formats" maintainer="Orphaned " license="GPL-2.0-or-later, BSD-3-Clause" homepage="http://johnmacfarlane.net/pandoc/" -distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz - https://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz - https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz - https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz - https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz" -checksum="649ec528d1413130c5ce304b826ff473b3696269eea8834d908589e775bd1ad1 - c39dd7343b9cb4dc5b1c91c9e47c3d357874e9e1a30b8d377bbea0b1d50323b2 - be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465 - 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4 - b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81" -subpackages=" - pandoc-sidenote - pandoc-crossref" +distfiles="https://hackage.haskell.org/package/pandoc-${version}/pandoc-${version}.tar.gz + https://hackage.haskell.org/package/pandoc-cli-${version}/pandoc-cli-${version}.tar.gz + https://hackage.haskell.org/package/pandoc-sidenote-${_sidenote_version}/pandoc-sidenote-${_sidenote_version}.tar.gz + https://hackage.haskell.org/package/pandoc-crossref-${_crossref_version}/pandoc-crossref-${_crossref_version}.tar.gz" +checksum="ef968d654000e5b21943573039fee92b132b547790fb1471f363abeb09dbcf79 + b7c8200012e22059410c70c1dab522eed151ca276c0a0d50c825c06df8d0c249 + 2722ca9cf7bed62658f669a3ec2026de0e0e80941b499a25e660adcf977eec2d + 8eb1fab686654cbbb7d2aa651d08b194a9634c3645df1d8d081a7e463db76f9a" nocross=yes nopie_files=" /usr/bin/pandoc /usr/bin/pandoc-sidenote /usr/bin/pandoc-crossref" -post_extract() { - sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal - sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal - # See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586 - cp "${FILESDIR}/pandoc-crossref.cabal" pandoc-crossref-${_crossref_version} -} - post_install() { - vman pandoc-${version}/man/pandoc.1 + vman pandoc-cli-${version}/man/pandoc.1 vlicense pandoc-${version}/COPYRIGHT LICENSE } diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template index 3c90e8ae3c2..0c900aae22a 100644 --- a/srcpkgs/plasma-integration/template +++ b/srcpkgs/plasma-integration/template @@ -1,28 +1,20 @@ # Template file for 'plasma-integration' -# TODO remove Qt5 bits or split once we moved everything to KDE6 pkgname=plasma-integration version=6.0.4 revision=1 build_style=cmake build_helper=qemu -configure_args="-DBUILD_TESTING=OFF - -DKF6_HOST_TOOLING=/usr/lib/cmake" +configure_args="-DBUILD_TESTING=OFF -DBUILD_QT5=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools gettext - qt5-qmake qt5-host-tools qt5-wayland kconfig kcoreaddons wayland-devel - qt6-wayland-tools kf6-kconfig" + wayland-devel qt6-wayland-tools kf6-kconfig" makedepends="kf6-kio-devel kf6-kxmlgui-devel kf6-kstatusnotifieritem-devel kf6-kwayland-devel libXcursor-devel breeze qt6-wayland-devel - wayland-devel kio-devel kwayland-devel qt5-quickcontrols2-devel" -depends="noto-fonts-ttf font-hack-ttf breeze kf6-qqc2-desktop-style - qqc2-desktop-style" + wayland-devel" +depends="noto-fonts-ttf font-hack-ttf breeze kf6-qqc2-desktop-style" short_desc="Theme integration plugins for the Plasma workspaces" maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=eef5c21ee43eefa1034126a45d2b34da967af81cf921a9c2a4314a4fb2738913 - -post_patch() { - sed -i '1i set(KDE_INSTALL_QTPLUGINDIR lib/qt6/plugins)' \ - qt6/CMakeLists.txt -} diff --git a/srcpkgs/prison-devel b/srcpkgs/prison-devel deleted file mode 120000 index 9714e6b96db..00000000000 --- a/srcpkgs/prison-devel +++ /dev/null @@ -1 +0,0 @@ -prison \ No newline at end of file diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template deleted file mode 100644 index d371ade0518..00000000000 --- a/srcpkgs/prison/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'prison' -pkgname=prison -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen - qt5-declarative-devel qt5-qmake qt5-host-tools" -makedepends="qt5-devel libdmtx-devel qrencode-devel ecm-devel qt5-plugin-sqlite - zxing-cpp-devel qt5-declarative-devel" -short_desc="Barcode API to produce QRCode barcodes and DataMatrix barcodes" -maintainer="John " -license="MIT" -homepage="https://community.kde.org/Frameworks" -distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz" -checksum=8964fc90ba2b3643d62cee9d01c46f4824670ed8c1bcd12ac3b129cebe4273de - -if [ "$XBPS_CHECK_PKGS" ]; then - configure_args="-DBUILD_TESTING=ON" -else - configure_args="-DBUILD_TESTING=OFF" -fi - -post_install() { - vlicense LICENSES/BSD-3-Clause.txt - vlicense LICENSES/MIT.txt -} - -prison-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${makedepends}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/qt5/mkspecs - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/python3-nanobind/template b/srcpkgs/python3-nanobind/template index ee5e7703fd0..16c83773876 100644 --- a/srcpkgs/python3-nanobind/template +++ b/srcpkgs/python3-nanobind/template @@ -1,6 +1,6 @@ # Template file for 'python3-nanobind' pkgname=python3-nanobind -version=1.9.2 +version=2.0.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,7 +14,7 @@ _robin_map_hash="188c45569cc2a5dd768077c193830b51d33a5020" distfiles="${homepage}/archive/v${version}.tar.gz https://github.com/Tessil/robin-map/archive/${_robin_map_hash}.tar.gz " -checksum="149a3da40b0a988513d8cf5e71db3037373823505a3c92f87b988c92d7e0ab34 +checksum="2e70727484edb7a8645d26f6a9f67352a668657c34de7a603bf9c68e5cbf8ff9 2f4be670fa4f53c3261ed7af392b414a00e75591f87da0a8dd525de376430747" skip_extraction="${_robin_map_hash}.tar.gz" diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index 5e16fb22671..6abeaeb8bad 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,6 +1,6 @@ # Template file for 'python3-scipy' pkgname=python3-scipy -version=1.13.0 +version=1.13.1 revision=1 build_style=python3-pep517 build_helper="meson numpy" @@ -20,7 +20,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://scipy.org/" distfiles="${PYPI_SITE}/s/scipy/scipy-${version}.tar.gz" -checksum=58569af537ea29d3f78e5abd18398459f195546bb3be23d16677fb26616cc11e +checksum=095a87a0312b08dfd6a6155cbbd310a8c51800fc931b8c0b84003014b874ed3c # must be tested from site dir of installed version (see dev.py:739) make_check_pre='eval env -C "${testdir}/${py3_sitelib}"' diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template index 32e2fd97f5d..a12c48f45d8 100644 --- a/srcpkgs/python3-tifffile/template +++ b/srcpkgs/python3-tifffile/template @@ -1,6 +1,6 @@ # Template file for 'python3-tifffile' pkgname=python3-tifffile -version=2024.5.10 +version=2024.5.22 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="https://github.com/cgohlke/tifffile" changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1cf2d44b2fa26c9e067b4fbb935edd83a13200b739bbdfc25cb340c9810bee55 +checksum=708f603445bcfbcee1de5d808270a18cc1771e7c534c78712118f2ba22757ebf # Tests require unpackaged fsspec make_check=no diff --git a/srcpkgs/qqc2-desktop-style-devel b/srcpkgs/qqc2-desktop-style-devel deleted file mode 120000 index 7e1e16c264f..00000000000 --- a/srcpkgs/qqc2-desktop-style-devel +++ /dev/null @@ -1 +0,0 @@ -qqc2-desktop-style \ No newline at end of file diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template deleted file mode 100644 index 12d34460ca8..00000000000 --- a/srcpkgs/qqc2-desktop-style/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'qqc2-desktop-style' -pkgname=qqc2-desktop-style -version=5.115.0 -revision=1 -build_style=cmake -hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules" -makedepends="kirigami2-devel kiconthemes-devel" -short_desc="Style for Qt Quick Controls 2 to make it follow your desktop theme" -maintainer="John " -license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later" -homepage="https://invent.kde.org/frameworks/qqc2-desktop-style" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5847654e1a1c576c92ed55e43d2d4f369cfb42d8cb920b021c07960ad9b73700 - -qqc2-desktop-style-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/lib/cmake - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index fc36d934e0d..2a9c2323327 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -41,10 +41,12 @@ replaces=" atom<=1.44.0_1 avogadro-devel<=1.2.0_8 avogadro<=1.2.0_9 + baloo5<=5.115.0_2 beignet<=1.3.2_10 bgc<=1.0.1_1 bismuth<=3.1.4_1 bitcoin<=22.0_5 + bluez-qt5<=5.115.0_1 bokken<=1.8_3 bomi<=0.9.11_17 burp-client<=1.4.40_13 @@ -300,11 +302,20 @@ replaces=" jwm-settings-manager<=2.1.5_1 k3s<=1.0.0_1 kadu<=4.3_6 + kcalendarcore<=5.115.0_1 kdecoration<=5.27.11_2 + kdesu<=5.115.0_1 + kdnssd<=5.115.0_1 keepassx2<=2.0.3_2 keepassx<=0.4.4_2 key-mon<=1.17_5 khotkeys<=5.27.11_1 + kimageformats<=5.115.0_1 + kjsembed<=5.115.0_1 + kmediaplayer<=5.115.0_1 + kpty<=5.115.0_1 + kquickcharts<=5.115.0_1 + kxmlrpcclient<5.115.0_1 ladish-devel<=1_11 ladish<=1_11 laditools<=1.1.0_3 @@ -345,6 +356,7 @@ replaces=" libdbusmenu-qt<=0.9.2_4 libechonest-qt5-devel<=2.3.1_2 libechonest-qt5<=2.3.1_2 + libepc<=0.4.6_1 libfcitx-qt-devel<=4.2.9.8_1 libfcitx-qt<=4.2.9.8_1 libgksu<=2.0.12_5 @@ -357,6 +369,7 @@ replaces=" libgnome-keyring<=3.12.0_5 libgroff<=1.22.4_3 libgtkhtml<=4.10.0_1 + libkscreen<=5.27.11_3 libllvm10<=10.0.0_8 libllvm11<=11.0.0_2 libllvm6.0<=6.0.1_8 @@ -440,6 +453,7 @@ replaces=" mimms<=3.2.1_4 miro-video-converter<=3.0.2_3 mirrorbits<=0.5.1_1 + modemmanager-qt5<=5.115.0_1 monero-devel<=0.18.1.2_4 monero-gui<=0.18.1.2_4 monero<=0.18.1.2_4 @@ -518,6 +532,7 @@ replaces=" plex-media-server<=1.15.3.876_4 polkit-qt<=0.112.0_5 printrun<=1.6.0_4 + prison<=5.115.0_1 pritunl-client<=1.0.1865.25_2 profile-sync-daemon<=5.75_4 profont<=1.0_2 @@ -644,6 +659,7 @@ replaces=" python3-stormssh<=0.7.0_7 python3-txacme<=0.9.3_3 qimageblitz<=0.0.6_4 + qqc2-desktop-style<=5.115.0_1 qt-designer-devel<=4.8.7_29 qt-designer-libs<=4.8.7_29 qt-designer<=4.8.7_29 diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 7b3031780f2..a5bd87040d0 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,6 +1,6 @@ # Template file for 'xpra' pkgname=xpra -version=6.0 +version=6.0.1 revision=1 build_style=python3-module make_build_args="--without-cuda_kernels --without-cuda_rebuild" @@ -19,7 +19,7 @@ license="GPL-2.0-or-later" homepage="https://xpra.org/" changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md" distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz" -checksum=ad5a422aa6df517e1ad10dd8a863a9e03b446c5e746991180e8530c25e4c543e +checksum=2ce121e51ef72a79f0d0a2933ece6e2159da0f3ed1d3e280fb0ce10525c5c7b3 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*" # Tests don't run properly without package installed make_check=no