diff --git a/c++utilities/default/0001-Enable-tidy-tests-only-by-default-via-ENABLE_DEVEL_D.patch b/c++utilities/default/0001-Enable-tidy-tests-only-by-default-via-ENABLE_DEVEL_D.patch deleted file mode 100644 index 7464a0b4..00000000 --- a/c++utilities/default/0001-Enable-tidy-tests-only-by-default-via-ENABLE_DEVEL_D.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a1bed55eda18b127750c7bff97f97474cd5c3ce9 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Wed, 22 Nov 2023 12:56:30 +0100 -Subject: [PATCH 1/2] Enable tidy tests only by default via - `ENABLE_DEVEL_DEFAULTS` - -This test is only relevant for development. Additionally, the behavior of -clang-format differs slightly between versions so this can really cause -needlessly failures. ---- - cmake/modules/BasicConfig.cmake | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake -index 6a9d65a..dc9a696 100644 ---- a/cmake/modules/BasicConfig.cmake -+++ b/cmake/modules/BasicConfig.cmake -@@ -403,8 +403,14 @@ if (NOT META_NO_TIDY) - if (CMAKE_FORMAT_BIN) - set(CMAKE_FORMAT_ENABLED_DEFAULT ON) - endif () -+ set(TIDY_TESTS_ENABLED_DEFAULT OFF) -+ if (ENABLE_DEVEL_DEFAULTS AND CLANG_FORMAT_ENABLED_DEFAULT) -+ set(TIDY_TESTS_ENABLED_DEFAULT ON) -+ endif () - option(CLANG_FORMAT_ENABLED "enables creation of tidy target using clang-format" "${CLANG_FORMAT_ENABLED_DEFAULT}") - option(CMAKE_FORMAT_ENABLED "enables creation of tidy target using cmake-format" "${CMAKE_FORMAT_ENABLED_DEFAULT}") -+ option(TIDY_TESTS_ENABLED "enables tests for checking whether code is well-formatted using clang-format" -+ "${TIDY_TESTS_ENABLED_DEFAULT}") - endif () - - # add target for tidying with clang-format -@@ -427,14 +433,16 @@ if (NOT META_NO_TIDY - add_dependencies(tidy "${META_TARGET_NAME}_tidy") - - # also add a test to verify whether sources are tidy -- add_test( -- NAME "${META_TARGET_NAME}_tidy_test" -- COMMAND "${CLANG_FORMAT_BIN}" -output-replacements-xml -style=file ${FORMATABLE_FILES} -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") -- list(APPEND CHECK_TARGET_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format") -- set_tests_properties( -- "${META_TARGET_NAME}_tidy_test" PROPERTIES FAIL_REGULAR_EXPRESSION ".*" REQUIRED_FILES -- "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format") -+ if (TIDY_TESTS_ENABLED) -+ add_test( -+ NAME "${META_TARGET_NAME}_tidy_test" -+ COMMAND "${CLANG_FORMAT_BIN}" -output-replacements-xml -style=file ${FORMATABLE_FILES} -+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") -+ list(APPEND CHECK_TARGET_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format") -+ set_tests_properties( -+ "${META_TARGET_NAME}_tidy_test" PROPERTIES FAIL_REGULAR_EXPRESSION ".*" -+ REQUIRED_FILES "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format") -+ endif () - endif () - - # add target for tidying with cmake-format --- -2.42.1 - diff --git a/c++utilities/default/0001-Fix-enabling-AppStream-tests.patch b/c++utilities/default/0001-Fix-enabling-AppStream-tests.patch deleted file mode 100644 index 76ee40ce..00000000 --- a/c++utilities/default/0001-Fix-enabling-AppStream-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 35f56d486c7f6c4b110a27476e9114f3e19c0fae Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 30 Nov 2023 19:44:08 +0100 -Subject: [PATCH] Fix enabling AppStream tests - ---- - cmake/modules/AppUtilities.cmake | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/cmake/modules/AppUtilities.cmake b/cmake/modules/AppUtilities.cmake -index 2272431..bd93d92 100644 ---- a/cmake/modules/AppUtilities.cmake -+++ b/cmake/modules/AppUtilities.cmake -@@ -86,10 +86,12 @@ function (add_appstream_file) - set(APPSTREAM_TESTS_ENABLED_DEFAULT ON) - endif () - option(APPSTREAM_TESTS_ENABLED "enables tests for checking whether AppStream files" "${APPSTREAM_TESTS_ENABLED_DEFAULT}") -- if (NOT APPSTREAMCLI_BIN) -- message(FATAL_ERROR "Unable to validate appstreamcli files; appstreamcli not found") -- else () -- add_test(NAME "${META_TARGET_NAME}_appstream_validation" COMMAND "${APPSTREAMCLI_BIN}" validate "${APPSTREAM_FILE}") -+ if (APPSTREAM_TESTS_ENABLED) -+ if (NOT APPSTREAMCLI_BIN) -+ message(FATAL_ERROR "Unable to validate appstreamcli files; appstreamcli not found") -+ else () -+ add_test(NAME "${META_TARGET_NAME}_appstream_validation" COMMAND "${APPSTREAMCLI_BIN}" validate "${APPSTREAM_FILE}") -+ endif () - endif () - endfunction () - --- -2.43.0 - diff --git a/c++utilities/default/0002-Enable-AppStream-tests-only-by-default-via-ENABLE_DE.patch b/c++utilities/default/0002-Enable-AppStream-tests-only-by-default-via-ENABLE_DE.patch deleted file mode 100644 index be676b3d..00000000 --- a/c++utilities/default/0002-Enable-AppStream-tests-only-by-default-via-ENABLE_DE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8fb7de6fe0ce506d1521f586ab841266b2783ef8 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Wed, 22 Nov 2023 12:59:20 +0100 -Subject: [PATCH 2/2] Enable AppStream tests only by default via - `ENABLE_DEVEL_DEFAULTS` - -This test already fails on deprecations so it is likely not a good idea to -run it in general as it would cause needless failures. ---- - cmake/modules/AppUtilities.cmake | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/AppUtilities.cmake b/cmake/modules/AppUtilities.cmake -index 9a46b48..2272431 100644 ---- a/cmake/modules/AppUtilities.cmake -+++ b/cmake/modules/AppUtilities.cmake -@@ -80,9 +80,14 @@ function (add_appstream_file) - COMPONENT appimage) - - # add test -+ set(APPSTREAM_TESTS_ENABLED_DEFAULT OFF) - find_program(APPSTREAMCLI_BIN "appstreamcli") -+ if (ENABLE_DEVEL_DEFAULTS AND APPSTREAMCLI_BIN) -+ set(APPSTREAM_TESTS_ENABLED_DEFAULT ON) -+ endif () -+ option(APPSTREAM_TESTS_ENABLED "enables tests for checking whether AppStream files" "${APPSTREAM_TESTS_ENABLED_DEFAULT}") - if (NOT APPSTREAMCLI_BIN) -- message(STATUS "Could not find appstreamcli; won't add test/target to validate appstream files") -+ message(FATAL_ERROR "Unable to validate appstreamcli files; appstreamcli not found") - else () - add_test(NAME "${META_TARGET_NAME}_appstream_validation" COMMAND "${APPSTREAMCLI_BIN}" validate "${APPSTREAM_FILE}") - endif () --- -2.42.1 - diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD index a1788821..4299a7c0 100644 --- a/c++utilities/default/PKGBUILD +++ b/c++utilities/default/PKGBUILD @@ -5,8 +5,8 @@ _reponame=cpp-utilities pkgname=c++utilities -pkgver=5.24.2 -pkgrel=3 +pkgver=5.24.3 +pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities' license=('GPL') @@ -16,19 +16,8 @@ makedepends=('cmake' 'ninja') checkdepends=('cppunit') provides=(libc++utilities.so) url="https://github.com/Martchus/${_reponame}" -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz" - 0001-Enable-tidy-tests-only-by-default-via-ENABLE_DEVEL_D.patch - 0002-Enable-AppStream-tests-only-by-default-via-ENABLE_DE.patch - 0001-Fix-enabling-AppStream-tests.patch) -sha256sums=('46e79313900a8cbb7a3c0211fcc0cd07c2c8a6c2bcaeb11aec7fc706dc5914b1' - SKIP SKIP SKIP) - -prepare() { - cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - patch -p1 -i ../0001-Enable-tidy-tests-only-by-default-via-ENABLE_DEVEL_D.patch - patch -p1 -i ../0002-Enable-AppStream-tests-only-by-default-via-ENABLE_DE.patch - patch -p1 -i ../0001-Fix-enabling-AppStream-tests.patch -} +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") +sha256sums=('a4a32f7fefad6754d400078a8078eb7a712bea7cf31f3bcb743dc962920d49b1') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/c++utilities/doc/PKGBUILD b/c++utilities/doc/PKGBUILD index 55197f9e..3ae7949d 100644 --- a/c++utilities/doc/PKGBUILD +++ b/c++utilities/doc/PKGBUILD @@ -6,7 +6,7 @@ _name=c++utilities _reponame=cpp-utilities pkgname=$_name-doc -pkgver=5.24.2 +pkgver=5.24.3 pkgrel=1 arch=('any') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (API documentation)' @@ -14,7 +14,7 @@ license=('GPL') makedepends=('cmake' 'ninja' 'doxygen' 'graphviz') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('46e79313900a8cbb7a3c0211fcc0cd07c2c8a6c2bcaeb11aec7fc706dc5914b1') +sha256sums=('a4a32f7fefad6754d400078a8078eb7a712bea7cf31f3bcb743dc962920d49b1') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD index b54a6089..4f4f6ad3 100644 --- a/c++utilities/mingw-w64/PKGBUILD +++ b/c++utilities/mingw-w64/PKGBUILD @@ -6,7 +6,7 @@ _reponame=cpp-utilities pkgname=mingw-w64-c++utilities _name=${pkgname#mingw-w64-} -pkgver=5.24.2 +pkgver=5.24.3 pkgrel=1 arch=('any') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)' @@ -17,7 +17,7 @@ checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine') makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('46e79313900a8cbb7a3c0211fcc0cd07c2c8a6c2bcaeb11aec7fc706dc5914b1') +sha256sums=('a4a32f7fefad6754d400078a8078eb7a712bea7cf31f3bcb743dc962920d49b1') options=(!buildflags staticlibs !strip !emptydirs) _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32') diff --git a/c++utilities/static-compat/PKGBUILD b/c++utilities/static-compat/PKGBUILD index 06a61af0..3629e238 100644 --- a/c++utilities/static-compat/PKGBUILD +++ b/c++utilities/static-compat/PKGBUILD @@ -6,7 +6,7 @@ _reponame=cpp-utilities pkgname=static-compat-c++utilities _name=${pkgname#static-compat-} -pkgver=5.24.2 +pkgver=5.24.3 pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities' @@ -17,7 +17,7 @@ makedepends=('ninja' 'static-compat-cmake') checkdepends=('static-compat-cppunit') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('46e79313900a8cbb7a3c0211fcc0cd07c2c8a6c2bcaeb11aec7fc706dc5914b1') +sha256sums=('a4a32f7fefad6754d400078a8078eb7a712bea7cf31f3bcb743dc962920d49b1') prepare() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/devel/versions.sh b/devel/versions.sh index bb2c6212..277ad90a 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -1,7 +1,7 @@ #!/bin/bash declare -A versions=( - [syncthingtray]=1.4.9 - [c++utilities]=5.24.2 + [syncthingtray]=1.4.10 + [c++utilities]=5.24.3 [qtutilities]=6.13.3 [qtforkawesome]=0.1.0 [tagparser]=12.1.0 diff --git a/syncthingtray/default/PKGBUILD b/syncthingtray/default/PKGBUILD index 7d3967e1..1948c2e7 100644 --- a/syncthingtray/default/PKGBUILD +++ b/syncthingtray/default/PKGBUILD @@ -24,7 +24,7 @@ _enable_plasmoid=${SYNCTHING_TRAY_ENABLE_PLASMOID:-1} _reponame=syncthingtray pkgname=syncthingtray -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Tray application for Syncthing' @@ -44,7 +44,7 @@ checkdepends=('cppunit' 'syncthing' 'iproute2') [[ $_enable_plasmoid ]] && makedepends+=('plasma-framework5' 'extra-cmake-modules') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('f9003bbe185d355f9cac18862077fa2cc4e809f7f416d9b1dd5ef6474c926742') +sha256sums=('b22445eda35deb8889749ee576bb657906c59d158f8fd1fbf79bbb027ac84533') ephemeral_port() { comm -23 <(seq 49152 65535) <(ss -tan | awk '{print $4}' | cut -d':' -f2 | grep "[0-9]\{1,5\}" | sort | uniq) | shuf | head -n 1 diff --git a/syncthingtray/mingw-w64-qt6/PKGBUILD b/syncthingtray/mingw-w64-qt6/PKGBUILD index 5d9b73c6..1f0e13e2 100644 --- a/syncthingtray/mingw-w64-qt6/PKGBUILD +++ b/syncthingtray/mingw-w64-qt6/PKGBUILD @@ -16,7 +16,7 @@ _reponame=syncthingtray pkgname=mingw-w64-syncthingtray-qt6 _name=${pkgname#mingw-w64-} _name=${_name%-qt6} -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 arch=('any') pkgdesc='Tray application for Syncthing (mingw-w64)' @@ -32,7 +32,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt6-tools' 'qt6-tools' url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") [[ $_enable_libsyncthing == ON ]] && source+=("syncthing::git+https://github.com/Martchus/syncthing.git#branch=libsyncthing-latest") -sha256sums=('f9003bbe185d355f9cac18862077fa2cc4e809f7f416d9b1dd5ef6474c926742' +sha256sums=('b22445eda35deb8889749ee576bb657906c59d158f8fd1fbf79bbb027ac84533' 'SKIP') options=(!buildflags staticlibs !strip !emptydirs) diff --git a/syncthingtray/mingw-w64/PKGBUILD b/syncthingtray/mingw-w64/PKGBUILD index 24885a62..3437d479 100644 --- a/syncthingtray/mingw-w64/PKGBUILD +++ b/syncthingtray/mingw-w64/PKGBUILD @@ -15,7 +15,7 @@ _enable_libsyncthing=${MINGW_W64_SYNCTHING_TRAY_ENABLE_LIBSYNCTHING:-ON} _reponame=syncthingtray pkgname=mingw-w64-syncthingtray _name=${pkgname#mingw-w64-} -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 arch=('any') pkgdesc='Tray application for Syncthing (mingw-w64)' @@ -31,7 +31,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg' 'n url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") [[ $_enable_libsyncthing == ON ]] && source+=("syncthing::git+https://github.com/Martchus/syncthing.git#branch=libsyncthing-latest") -sha256sums=('f9003bbe185d355f9cac18862077fa2cc4e809f7f416d9b1dd5ef6474c926742' +sha256sums=('b22445eda35deb8889749ee576bb657906c59d158f8fd1fbf79bbb027ac84533' 'SKIP') options=(!buildflags staticlibs !strip !emptydirs) diff --git a/syncthingtray/qt6/0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch b/syncthingtray/qt6/0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch deleted file mode 100644 index ed856247..00000000 --- a/syncthingtray/qt6/0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ddbd6f309b3a353c9c40c71cd0877f6db6b680c6 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 30 Nov 2023 19:55:32 +0100 -Subject: [PATCH] Fix building Plasmoid after Plasma 6 beta release - ---- - plasmoid/CMakeLists.txt | 2 +- - plasmoid/lib/CMakeLists.txt | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt -index e1eeaa4..18196ed 100644 ---- a/plasmoid/CMakeLists.txt -+++ b/plasmoid/CMakeLists.txt -@@ -12,7 +12,7 @@ set(META_QT5_VERSION 5.8) - set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector") - - # find Plasma and its dependencies (which are not pulled-in automatically as of Plasma 6) --find_package(${KF_PACKAGE_PREFIX}Plasma REQUIRED) -+find_package(Plasma REQUIRED) - if (KF_MAJOR_VERSION GREATER_EQUAL 6) - find_package(${QT_PACKAGE_PREFIX}Qml REQUIRED) - find_package(${KF_PACKAGE_PREFIX}Config REQUIRED) -diff --git a/plasmoid/lib/CMakeLists.txt b/plasmoid/lib/CMakeLists.txt -index 1c6654a..a757cc4 100644 ---- a/plasmoid/lib/CMakeLists.txt -+++ b/plasmoid/lib/CMakeLists.txt -@@ -40,8 +40,10 @@ list(APPEND ADDITIONAL_QT_MODULES Network Qml) - if (KF_MAJOR_VERSION GREATER_EQUAL 6) - set(Config_MODULE_TARGETS ${KF_PACKAGE_PREFIX}::ConfigCore) - list(APPEND ADDITIONAL_KF_MODULES Config) -+ use_package(TARGET_NAME Plasma::Plasma PACKAGE_NAME Plasma PACKAGE_ARGS REQUIRED) -+else () -+ list(APPEND ADDITIONAL_KF_MODULES Plasma) - endif () --list(APPEND ADDITIONAL_KF_MODULES Plasma) - - include(BasicConfig) - include(QtGuiConfig) --- -2.43.0 - diff --git a/syncthingtray/qt6/0001-Fix-install-path-of-KIO-plugin.patch b/syncthingtray/qt6/0001-Fix-install-path-of-KIO-plugin.patch deleted file mode 100644 index f9ef3832..00000000 --- a/syncthingtray/qt6/0001-Fix-install-path-of-KIO-plugin.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d1a1c80ed5e2f5ab6a822b07ef3e9e4fd79a5a7d Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Wed, 22 Nov 2023 00:39:46 +0100 -Subject: [PATCH] Fix install path of KIO plugin - ---- - fileitemactionplugin/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt -index a154430..60af659 100644 ---- a/fileitemactionplugin/CMakeLists.txt -+++ b/fileitemactionplugin/CMakeLists.txt -@@ -38,7 +38,7 @@ set(KIO_MODULE_TARGETS "${KF_PACKAGE_PREFIX}::KIOCore" "${KF_PACKAGE_PREFIX}::KI - "${KF_PACKAGE_PREFIX}::KIOWidgets") - if (KF_MAJOR_VERSION GREATER_EQUAL 6) - list(APPEND KIO_MODULE_TARGETS) -- set(META_PLUGIN_CATEGORY kf${KF_VERSION}/kfileitemaction) -+ set(META_PLUGIN_CATEGORY kf${KF_MAJOR_VERSION}/kfileitemaction) - else () - list(APPEND KIO_MODULE_TARGETS "${KF_PACKAGE_PREFIX}::KIONTLM") - endif () --- -2.43.0 - diff --git a/syncthingtray/qt6/0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch b/syncthingtray/qt6/0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch deleted file mode 100644 index 9fb0ce77..00000000 --- a/syncthingtray/qt6/0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eaf8d6d1647a55fea2f76185544799b891aa16a5 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Sun, 26 Nov 2023 17:06:06 +0100 -Subject: [PATCH] Mention PLASMA_ENABLE_QML_DEBUG in the Plasmoid testing docs - -This variable might be useful and now seems to be supported by -`plasmawindowed`, see -https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/3237. ---- - plasmoid/testing.md | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/plasmoid/testing.md b/plasmoid/testing.md -index f80aa66..361e31d 100644 ---- a/plasmoid/testing.md -+++ b/plasmoid/testing.md -@@ -48,6 +48,9 @@ It works quite well within a Plasma session when both shells are placed on diffe - edges. - - ## Enable QML debugging -+It is not clear whether the following instructions are still valid for Plasma 6. -+It seems that QML debugging can be enabled under Plasma 6 by setting the environment variable -+`PLASMA_ENABLE_QML_DEBUG` but this has not been tested yet. - - To enable QML debugging, it is required to rebuild `plasmoidviewer` with QML debugging - enabled. --- -2.43.0 - diff --git a/syncthingtray/qt6/PKGBUILD b/syncthingtray/qt6/PKGBUILD index 65212509..25dc221d 100644 --- a/syncthingtray/qt6/PKGBUILD +++ b/syncthingtray/qt6/PKGBUILD @@ -26,8 +26,8 @@ _reponame=syncthingtray _cfg=qt6 pkgname=syncthingtray-$_cfg _name=${pkgname%-$_cfg} -pkgver=1.4.9 -pkgrel=3 +pkgver=1.4.10 +pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Tray application for Syncthing (using Qt 6)' license=('GPL') @@ -45,24 +45,13 @@ checkdepends=('cppunit' 'syncthing' 'iproute2') [[ $_enable_kio_plugin ]] && makedepends+=('kio') [[ $_enable_plasmoid ]] && makedepends+=('libplasma' 'extra-cmake-modules') url="https://github.com/Martchus/${_reponame}" -source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz" - 0001-Fix-install-path-of-KIO-plugin.patch - 0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch - 0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch) -sha256sums=('f9003bbe185d355f9cac18862077fa2cc4e809f7f416d9b1dd5ef6474c926742' - SKIP SKIP SKIP) +source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") +sha256sums=('b22445eda35deb8889749ee576bb657906c59d158f8fd1fbf79bbb027ac84533') ephemeral_port() { comm -23 <(seq 49152 65535) <(ss -tan | awk '{print $4}' | cut -d':' -f2 | grep "[0-9]\{1,5\}" | sort | uniq) | shuf | head -n 1 } -prepare() { - cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - patch -p1 -i ../0001-Fix-install-path-of-KIO-plugin.patch - patch -p1 -i ../0001-Mention-PLASMA_ENABLE_QML_DEBUG-in-the-Plasmoid-test.patch - patch -p1 -i ../0001-Fix-building-Plasmoid-after-Plasma-6-beta-release.patch -} - build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/syncthingtray/static-compat/PKGBUILD b/syncthingtray/static-compat/PKGBUILD index 4c69f52c..0804cda2 100644 --- a/syncthingtray/static-compat/PKGBUILD +++ b/syncthingtray/static-compat/PKGBUILD @@ -28,7 +28,7 @@ _enable_libsyncthing=${SYNCTHING_TRAY_ENABLE_LIBSYNCTHING:-ON} _reponame=syncthingtray pkgname=static-compat-syncthingtray _name=${pkgname#static-compat-} -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Tray application for Syncthing' @@ -49,7 +49,7 @@ checkdepends=('static-compat-cppunit' 'syncthing' 'iproute2') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") [[ $_enable_libsyncthing == ON ]] && source+=("syncthing::git+https://github.com/Martchus/syncthing.git#branch=libsyncthing-latest") -sha256sums=('f9003bbe185d355f9cac18862077fa2cc4e809f7f416d9b1dd5ef6474c926742' +sha256sums=('b22445eda35deb8889749ee576bb657906c59d158f8fd1fbf79bbb027ac84533' 'SKIP') [[ $_enable_libsyncthing == ON ]] && _disable_libsyncthing=OFF || _disable_libsyncthing=ON