From a99aea2229312e1e4d8d4ba20919d86b395d97e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 24 Jul 2024 19:21:34 +0200 Subject: [PATCH 1/5] kdnssd: restore to 5.115.0 This reverts commit 6bd03d7f647a7d5fc7095ba8d1336778b8e68607. --- common/shlibs | 1 + srcpkgs/kdnssd-devel | 1 + srcpkgs/kdnssd/template | 24 ++++++++++++++++++++++++ srcpkgs/removed-packages/template | 1 - 4 files changed, 26 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/kdnssd-devel create mode 100644 srcpkgs/kdnssd/template diff --git a/common/shlibs b/common/shlibs index 3ecdd7910e720c..6f635d1584fbf9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2817,6 +2817,7 @@ 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 diff --git a/srcpkgs/kdnssd-devel b/srcpkgs/kdnssd-devel new file mode 120000 index 00000000000000..e3180288859921 --- /dev/null +++ b/srcpkgs/kdnssd-devel @@ -0,0 +1 @@ +kdnssd \ No newline at end of file diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template new file mode 100644 index 00000000000000..3fb2431450c84e --- /dev/null +++ b/srcpkgs/kdnssd/template @@ -0,0 +1,24 @@ +# Template file for 'kdnssd' +pkgname=kdnssd +version=5.115.0 +revision=2 +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="Piotr Wójcik " +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/removed-packages/template b/srcpkgs/removed-packages/template index bc7edb77a764ed..038633a77d666a 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -306,7 +306,6 @@ replaces=" 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 From ada695eb690ff2359596ed41450151b4a5b3248d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 24 Jul 2024 19:34:31 +0200 Subject: [PATCH 2/5] New package: KDSoap-qt5-1.10.0 --- common/shlibs | 1 + srcpkgs/KDSoap-qt5-devel | 1 + srcpkgs/KDSoap-qt5/template | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 120000 srcpkgs/KDSoap-qt5-devel create mode 100644 srcpkgs/KDSoap-qt5/template diff --git a/common/shlibs b/common/shlibs index 6f635d1584fbf9..a23852980745df 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4018,6 +4018,7 @@ libhidrd_item.so.0 hidrd-0.2.0_1 libhidrd_opt.so.0 hidrd-0.2.0_1 libhidrd_strm.so.0 hidrd-0.2.0_1 libhidrd_fmt.so.0 hidrd-0.2.0_1 +libkdsoap.so.1 KDSoap-qt5-1.9.1_1 libjcat.so.1 libjcat-0.1.14_1 libmatio.so.11 matio-1.5.23_1 libportal.so.1 libportal-0.6_1 diff --git a/srcpkgs/KDSoap-qt5-devel b/srcpkgs/KDSoap-qt5-devel new file mode 120000 index 00000000000000..ee53f7b3d43102 --- /dev/null +++ b/srcpkgs/KDSoap-qt5-devel @@ -0,0 +1 @@ +KDSoap-qt5 \ No newline at end of file diff --git a/srcpkgs/KDSoap-qt5/template b/srcpkgs/KDSoap-qt5/template new file mode 100644 index 00000000000000..e19368914ba98f --- /dev/null +++ b/srcpkgs/KDSoap-qt5/template @@ -0,0 +1,29 @@ +# Template file for 'KDSoap-qt5' +pkgname=KDSoap-qt5 +version=1.10.0 +revision=1 +build_style=cmake +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-devel" +short_desc="Qt-based client-side and server-side SOAP component" +maintainer="Piotr Wójcik " +license="GPL-3.0-or-later" +homepage="https://www.kdab.com/development-resources/qt-tools/kd-soap/" +distfiles="https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz" +checksum=0c606ecc434466dbadb2829820ca163af60cc7ca226f553b5d4032196737338f + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" KDSoap-qt5-devel" +fi + +KDSoap-qt5-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/bin/kdwsdl2cpp + vmove "usr/lib/*.so" + vmove usr/share/mkspecs + } +} From d3df1f161b4a3a0360f00b32fe867d0107091395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 24 Jul 2024 19:39:37 +0200 Subject: [PATCH 3/5] kio-extras: downgrade to 23.08.5, qt5 --- srcpkgs/kio-extras/template | 46 +++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template index 136d8fd1e02dc4..33a7f9c4d7770c 100644 --- a/srcpkgs/kio-extras/template +++ b/srcpkgs/kio-extras/template @@ -1,24 +1,36 @@ # Template file for 'kio-extras' pkgname=kio-extras -version=24.05.1 -revision=1 +reverts="24.05.1_1 24.02.2_1" +version=23.08.5 +revision=2 build_style=cmake -configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake - -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" -hostmakedepends="extra-cmake-modules pkg-config gperf qt6-base qt6-tools - kf6-kdoctools kf6-kcoreaddons kf6-kio gettext KDSoap kf6-kcmutils" -makedepends="qcoro-qt6-devel kf6-karchive-devel kf6-kconfig-devel - kf6-kconfigwidgets-devel kf6-kcoreaddons-devel kf6-kdbusaddons-devel - kf6-kdoctools-devel kf6-kdnssd-devel kf6-ki18n-devel kf6-kio-devel - kf6-solid-devel kf6-kguiaddons-devel kf6-syntax-highlighting-devel - kf6-kcmutils-devel kf6-ktextwidgets-devel plasma-activities-devel - plasma-activities-stats-devel phonon-devel samba-devel libssh-devel - libmtp-devel libimobiledevice-devel libplist-devel KDSoap-devel - libtirpc-devel libopenexr-devel taglib-devel libkexiv2-devel libnfs-devel - kdsoap-ws-discovery-client-devel" +configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp" +hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools + KDSoap-qt5-devel kdoctools kcoreaddons kio gettext" +makedepends="kdesignerplugin-devel kactivities5-devel kdelibs4support-devel + kdnssd-devel khtml-devel kpty-devel exiv2-devel libmtp-devel libssh-devel + syntax-highlighting-devel libopenexr-devel samba-devel taglib-devel + libkexiv25-devel KDSoap-qt5-devel ksolid-devel" +depends="kf6-kio-extras" short_desc="Additional KIO components" -maintainer="Orphaned " +maintainer="Piotr Wójcik " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://invent.kde.org/network/kio-extras" distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz" -checksum=57389382201124a671dede37481f6f94161cb975dbd2471692abd3189703bc98 +checksum=1ae0ec1cc7239fd4fa46d8cb2629ceb364d4a70e7e56075d2ebfef68eb1b263f + +post_install() { + # kf6-kio-extras + rm ${DESTDIR}/usr/share/config.kcfg/jpegcreatorsettings5.kcfg + rm ${DESTDIR}/usr/share/dbus-1/services/org.kde.kmtpd5.service + rm ${DESTDIR}/usr/share/kio_info/kde-info2html + rm ${DESTDIR}/usr/share/kio_info/kde-info2html.conf + rm ${DESTDIR}/usr/share/konqueror/dirtree/remote/mtp-network.desktop + rm ${DESTDIR}/usr/share/konqueror/dirtree/remote/smb-network.desktop + rm ${DESTDIR}/usr/share/mime/packages/org.kde.kio.smb.xml + rm ${DESTDIR}/usr/share/remoteview/mtp-network.desktop + rm ${DESTDIR}/usr/share/remoteview/smb-network.desktop + rm ${DESTDIR}/usr/share/solid/actions/solid_mtp.desktop + # konqueror + rm ${DESTDIR}/usr/share/kio_bookmarks/kio_bookmarks.css +} From c008c889834a77f6ace52101d8f6499ebbc40844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 24 Jul 2024 19:42:57 +0200 Subject: [PATCH 4/5] New package: kf6-kio-extras-24.05.1 --- srcpkgs/kf6-kio-extras/template | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/kf6-kio-extras/template diff --git a/srcpkgs/kf6-kio-extras/template b/srcpkgs/kf6-kio-extras/template new file mode 100644 index 00000000000000..a4d37f2f2ca599 --- /dev/null +++ b/srcpkgs/kf6-kio-extras/template @@ -0,0 +1,24 @@ +# Template file for 'kf6-kio-extras' +pkgname=kf6-kio-extras +version=24.05.1 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" +hostmakedepends="extra-cmake-modules pkg-config gperf qt6-base qt6-tools + kf6-kdoctools kf6-kcoreaddons kf6-kio gettext KDSoap kf6-kcmutils" +makedepends="qcoro-qt6-devel kf6-karchive-devel kf6-kconfig-devel + kf6-kconfigwidgets-devel kf6-kcoreaddons-devel kf6-kdbusaddons-devel + kf6-kdoctools-devel kf6-kdnssd-devel kf6-ki18n-devel kf6-kio-devel + kf6-solid-devel kf6-kguiaddons-devel kf6-syntax-highlighting-devel + kf6-kcmutils-devel kf6-ktextwidgets-devel plasma-activities-devel + plasma-activities-stats-devel phonon-devel samba-devel libssh-devel + libmtp-devel libimobiledevice-devel libplist-devel KDSoap-devel + libtirpc-devel libopenexr-devel taglib-devel libkexiv2-devel libnfs-devel + kdsoap-ws-discovery-client-devel" +short_desc="Additional KIO components" +maintainer="Orphaned " +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="https://invent.kde.org/network/kio-extras" +distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz" +checksum=57389382201124a671dede37481f6f94161cb975dbd2471692abd3189703bc98 From a0c94845ce269c266d5e1bbdaeba1a2c158048d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 25 Jul 2024 21:04:46 +0200 Subject: [PATCH 5/5] krusader: update to 2.8.1. --- srcpkgs/krusader/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krusader/template b/srcpkgs/krusader/template index 72c89a938851cf..0b1a273e69740d 100644 --- a/srcpkgs/krusader/template +++ b/srcpkgs/krusader/template @@ -1,6 +1,6 @@ # Template file for 'krusader' pkgname=krusader -version=2.8.0 +version=2.8.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext pkg-config kdoctools @@ -11,4 +11,4 @@ maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://www.krusader.org/" distfiles="${KDE_SITE}/krusader/${version}/krusader-${version}.tar.xz" -checksum=8e4cf05a9318b0bc1b0941811b988b2f2bb0c04a0d1e37998212a9190cf2c29a +checksum=37bf204519d0ab1ba40964af02741bc228f11e97f28c4c518ca05d358df18283