diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD index 15180974..b951e8a1 100644 --- a/c++utilities/default/PKGBUILD +++ b/c++utilities/default/PKGBUILD @@ -5,7 +5,7 @@ _reponame=cpp-utilities pkgname=c++utilities -pkgver=5.24.4 +pkgver=5.24.5 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 @@ 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") -sha256sums=('f27be37d67fd97d934d70d4a9a5dc3368313dae6be219f388f7214511eb61f3b') +sha256sums=('28cfbfe4e91eb37d9c0224f39def16b4aab41d09d7762a120c83382cf2fb3cbc') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/c++utilities/doc/PKGBUILD b/c++utilities/doc/PKGBUILD index 26ba1423..fa39ad0d 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.4 +pkgver=5.24.5 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=('f27be37d67fd97d934d70d4a9a5dc3368313dae6be219f388f7214511eb61f3b') +sha256sums=('28cfbfe4e91eb37d9c0224f39def16b4aab41d09d7762a120c83382cf2fb3cbc') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD index 060a777f..94c300d3 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.4 +pkgver=5.24.5 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=('f27be37d67fd97d934d70d4a9a5dc3368313dae6be219f388f7214511eb61f3b') +sha256sums=('28cfbfe4e91eb37d9c0224f39def16b4aab41d09d7762a120c83382cf2fb3cbc') 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 86b73fd4..62b9c868 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.4 +pkgver=5.24.5 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=('f27be37d67fd97d934d70d4a9a5dc3368313dae6be219f388f7214511eb61f3b') +sha256sums=('28cfbfe4e91eb37d9c0224f39def16b4aab41d09d7762a120c83382cf2fb3cbc') prepare() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/devel/versions.sh b/devel/versions.sh index 6f544e08..41d49969 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -1,8 +1,8 @@ #!/bin/bash declare -A versions=( - [syncthingtray]=1.4.11 - [c++utilities]=5.24.4 - [qtutilities]=6.13.3 + [syncthingtray]=1.4.12 + [c++utilities]=5.24.5 + [qtutilities]=6.13.4 [qtforkawesome]=0.1.0 [tagparser]=12.1.0 [tageditor]=3.9.0 diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD index 32ef16b3..018363ca 100644 --- a/qtutilities/default/PKGBUILD +++ b/qtutilities/default/PKGBUILD @@ -5,7 +5,7 @@ _reponame=qtutilities pkgname=qtutilities -pkgver=6.13.3 +pkgver=6.13.4 pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models' @@ -16,7 +16,7 @@ optdepends=("$pkgname-doc: API documentation") provides=(libqtutilities.so) url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('bb94491b973df3a07e9bf49e092da42dcd846e24e44109809255e8cfdc4e16bd') +sha256sums=('547d9e122d399ed3a86ec0b5fe078e0b54ab3e9a3e613efdaac4f6bb63fb5007') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/qtutilities/doc/PKGBUILD b/qtutilities/doc/PKGBUILD index 2a69900c..ae4aa7c0 100644 --- a/qtutilities/doc/PKGBUILD +++ b/qtutilities/doc/PKGBUILD @@ -6,7 +6,7 @@ _name=qtutilities _reponame=$_name pkgname=$_name-doc -pkgver=6.13.3 +pkgver=6.13.4 pkgrel=1 arch=('any') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (API documentation)' @@ -14,7 +14,7 @@ license=('GPL') makedepends=('cmake' 'ninja' 'doxygen' 'graphviz' 'c++utilities' 'qt5-tools') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('bb94491b973df3a07e9bf49e092da42dcd846e24e44109809255e8cfdc4e16bd') +sha256sums=('547d9e122d399ed3a86ec0b5fe078e0b54ab3e9a3e613efdaac4f6bb63fb5007') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/qtutilities/mingw-w64-qt6/PKGBUILD b/qtutilities/mingw-w64-qt6/PKGBUILD index 449507ea..0cc33ac9 100644 --- a/qtutilities/mingw-w64-qt6/PKGBUILD +++ b/qtutilities/mingw-w64-qt6/PKGBUILD @@ -7,7 +7,7 @@ _reponame=qtutilities pkgname=mingw-w64-qtutilities-qt6 _name=${pkgname#mingw-w64-} _name=${_name%-qt6} -pkgver=6.13.3 +pkgver=6.13.4 pkgrel=1 arch=('any') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (mingw-w64)' @@ -18,7 +18,7 @@ checkdepends=('mingw-w64-wine') makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt6-tools' 'qt6-base' 'qt6-tools' 'qt6-declarative' 'clang' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('bb94491b973df3a07e9bf49e092da42dcd846e24e44109809255e8cfdc4e16bd') +sha256sums=('547d9e122d399ed3a86ec0b5fe078e0b54ab3e9a3e613efdaac4f6bb63fb5007') options=(!buildflags staticlibs !strip !emptydirs) _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32') diff --git a/qtutilities/mingw-w64/PKGBUILD b/qtutilities/mingw-w64/PKGBUILD index 49facd67..166da585 100644 --- a/qtutilities/mingw-w64/PKGBUILD +++ b/qtutilities/mingw-w64/PKGBUILD @@ -6,7 +6,7 @@ _reponame=qtutilities pkgname=mingw-w64-qtutilities _name=${pkgname#mingw-w64-} -pkgver=6.13.3 +pkgver=6.13.4 pkgrel=1 arch=('any') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (mingw-w64)' @@ -17,7 +17,7 @@ checkdepends=('mingw-w64-wine') makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ninja') url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('bb94491b973df3a07e9bf49e092da42dcd846e24e44109809255e8cfdc4e16bd') +sha256sums=('547d9e122d399ed3a86ec0b5fe078e0b54ab3e9a3e613efdaac4f6bb63fb5007') options=(!buildflags staticlibs !strip !emptydirs) _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32') diff --git a/qtutilities/qt6/PKGBUILD b/qtutilities/qt6/PKGBUILD index 4b072b08..e2b6d7ee 100644 --- a/qtutilities/qt6/PKGBUILD +++ b/qtutilities/qt6/PKGBUILD @@ -7,7 +7,7 @@ _reponame=qtutilities _cfg=qt6 pkgname=qtutilities-$_cfg _name=${pkgname%-$_cfg} -pkgver=6.13.3 +pkgver=6.13.4 pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (using Qt 6)' @@ -18,7 +18,7 @@ optdepends=("$_name-doc: API documentation") provides=(libqtutilities-qt6.so) url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('bb94491b973df3a07e9bf49e092da42dcd846e24e44109809255e8cfdc4e16bd') +sha256sums=('547d9e122d399ed3a86ec0b5fe078e0b54ab3e9a3e613efdaac4f6bb63fb5007') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/qtutilities/static-compat/PKGBUILD b/qtutilities/static-compat/PKGBUILD index dfc20c12..72aa1592 100644 --- a/qtutilities/static-compat/PKGBUILD +++ b/qtutilities/static-compat/PKGBUILD @@ -6,7 +6,7 @@ _reponame=qtutilities pkgname=static-compat-qtutilities _name=${pkgname#static-compat-} -pkgver=6.13.3 +pkgver=6.13.4 pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models' @@ -16,7 +16,7 @@ makedepends=('static-compat-cmake' 'ninja' 'static-compat-qt6-tools' 'clang') optdepends=("$_name-doc: API documentation") url="https://github.com/Martchus/${_reponame}" source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('bb94491b973df3a07e9bf49e092da42dcd846e24e44109809255e8cfdc4e16bd') +sha256sums=('547d9e122d399ed3a86ec0b5fe078e0b54ab3e9a3e613efdaac4f6bb63fb5007') build() { check_buildoption ccache y && ccache_args=' diff --git a/syncthingtray/default/0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch b/syncthingtray/default/0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch deleted file mode 100644 index 11fcac72..00000000 --- a/syncthingtray/default/0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 549be45b55e401d2d22a07c87c85ccc9d1e4bbd8 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Fri, 22 Dec 2023 17:33:21 +0100 -Subject: [PATCH] Mock setting the autostart path in the wizard test - -This test would keep the autostart disabled but override an existing -autostart entry (see https://github.com/Martchus/syncthingtray/issues/221). -With this change it will no longer override an existing entry. Reading and -writing the autostart entry is now mocked and properly checked. ---- - syncthingwidgets/settings/settingsdialog.cpp | 7 ++++++ - syncthingwidgets/tests/wizard.cpp | 26 ++++++++++++++++++-- - 2 files changed, 31 insertions(+), 2 deletions(-) - -diff --git a/syncthingwidgets/settings/settingsdialog.cpp b/syncthingwidgets/settings/settingsdialog.cpp -index bf3f778..c1ebdb0 100644 ---- a/syncthingwidgets/settings/settingsdialog.cpp -+++ b/syncthingwidgets/settings/settingsdialog.cpp -@@ -818,6 +818,10 @@ QWidget *AutostartOptionPage::setupWidget() - */ - std::optional configuredAutostartPath() - { -+ if (qEnvironmentVariableIsSet(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK")) { -+ auto mockedPath = qEnvironmentVariable(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK"); -+ return mockedPath.isEmpty() ? std::nullopt : std::make_optional(mockedPath); -+ } - #if defined(PLATFORM_LINUX) && !defined(Q_OS_ANDROID) - auto desktopFile = QFile(QStandardPaths::locate(QStandardPaths::ConfigLocation, QStringLiteral("autostart/" PROJECT_NAME ".desktop"))); - // check whether the file can be opened and whether it is enabled but prevent reading large files -@@ -873,6 +877,9 @@ QString supposedAutostartPath() - */ - bool setAutostartPath(const QString &path) - { -+ if (qEnvironmentVariableIsSet(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK")) { -+ return qputenv(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK", path.toLocal8Bit()); -+ } - #if defined(PLATFORM_LINUX) && !defined(Q_OS_ANDROID) - const auto configPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); - if (configPath.isEmpty()) { -diff --git a/syncthingwidgets/tests/wizard.cpp b/syncthingwidgets/tests/wizard.cpp -index 8fc00d7..8e6eb09 100644 ---- a/syncthingwidgets/tests/wizard.cpp -+++ b/syncthingwidgets/tests/wizard.cpp -@@ -6,9 +6,12 @@ - // use meta-data of syncthingtray application here - #include "resources/../../tray/resources/config.h" - -+#include -+ - #include - - #include -+#include - #include - #include - #include -@@ -148,6 +151,9 @@ void WizardTests::testShowingSettings() - */ - void WizardTests::testConfiguringLauncher() - { -+ // mock the autostart path; it is supposed to be preserved -+ QVERIFY(qputenv(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK", "fake-autostart-path")); -+ - // pretend libsyncthing / systemd is already enabled - // note: Should be unset as we're selecting to use an external binary. - auto &settings = Settings::values(); -@@ -188,6 +194,9 @@ void WizardTests::testConfiguringLauncher() - auto *const mainConfigPage = qobject_cast(wizardDlg.currentPage()); - QVERIFY(mainConfigPage != nullptr); - auto &setupDetection = wizardDlg.setupDetection(); -+ const auto &configuredAutostartPath = setupDetection.autostartConfiguredPath; -+ QVERIFY(configuredAutostartPath.has_value()); -+ QCOMPARE(configuredAutostartPath.value(), QStringLiteral("fake-autostart-path")); - QVERIFY(!setupDetection.hasConfig()); - // -> print debug output in certain launcher error cases to get the full picture if any of the subsequent checks fail - if (setupDetection.launcherError.has_value()) { -@@ -223,6 +232,10 @@ void WizardTests::testConfiguringLauncher() - // keep autostart setting as-is - auto *const autostartPage = qobject_cast(wizardDlg.currentPage()); - QVERIFY(autostartPage != nullptr); -+ auto *const keepExistingCheckBox = autostartPage->findChild(QStringLiteral("keepExistingCheckBox")); -+ QVERIFY(keepExistingCheckBox != nullptr); -+ QVERIFY(keepExistingCheckBox->isVisible()); -+ keepExistingCheckBox->setChecked(true); - wizardDlg.next(); - - // apply settings -@@ -233,7 +246,7 @@ void WizardTests::testConfiguringLauncher() - const auto summary = summaryTextBrowser->toPlainText(); - QVERIFY(summary.contains(QStringLiteral("Start Syncthing via Syncthing Tray's launcher"))); - QVERIFY(summary.contains(QStringLiteral("executable from PATH as separate process"))); -- QVERIFY(summary.contains(QStringLiteral("Keep autostart"))); -+ QVERIFY(summary.contains(QStringLiteral("Keep autostart disabled")) || summary.contains(QStringLiteral("Preserve existing autostart entry"))); - wizardDlg.next(); - - // check results -@@ -343,6 +356,7 @@ void WizardTests::testConfiguringLauncher() - QVERIFY(!settings.connection.primary.syncthingUrl.isEmpty()); - QVERIFY(!settings.connection.primary.apiKey.isEmpty()); - QCOMPARE(settings.connection.secondary.size(), 0); -+ QCOMPARE(qEnvironmentVariable(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK"), QStringLiteral("fake-autostart-path")); - } - - /*! -@@ -351,6 +365,9 @@ void WizardTests::testConfiguringLauncher() - */ - void WizardTests::testConfiguringCurrentlyRunningSyncthing() - { -+ // mock the autostart path; it is supposed to be changed -+ QVERIFY(qputenv(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK", "fake-autostart-path")); -+ - // change port in config file - auto wizardDlg = Wizard(); - auto &setupDetection = wizardDlg.setupDetection(); -@@ -427,9 +444,13 @@ void WizardTests::testConfiguringCurrentlyRunningSyncthing() - QVERIFY(!cfgNoneRadioButton->isChecked()); - wizardDlg.next(); - -- // keep autostart setting as-is -+ // override existing autostart setting - auto *const autostartPage = qobject_cast(wizardDlg.currentPage()); - QVERIFY(autostartPage != nullptr); -+ auto *const keepExistingCheckBox = autostartPage->findChild(QStringLiteral("keepExistingCheckBox")); -+ QVERIFY(keepExistingCheckBox != nullptr); -+ QVERIFY(keepExistingCheckBox->isVisible()); -+ keepExistingCheckBox->setChecked(false); - wizardDlg.next(); - configureSyncthingArgs(setupDetection); - -@@ -483,6 +504,7 @@ void WizardTests::testConfiguringCurrentlyRunningSyncthing() - QVERIFY(!settings.connection.primary.apiKey.isEmpty()); - QCOMPARE(settings.connection.secondary.size(), 1); - QCOMPARE(settings.connection.secondary[0].label, QStringLiteral("Backup of testconfig (created by wizard)")); -+ QCOMPARE(qEnvironmentVariable(PROJECT_VARNAME_UPPER "_AUTOSTART_PATH_MOCK"), setupDetection.autostartSupposedPath); - } - - bool WizardTests::confirmMessageBox() --- -2.43.0 - diff --git a/syncthingtray/default/PKGBUILD b/syncthingtray/default/PKGBUILD index 0e155c49..ab23abdf 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.11 +pkgver=1.4.12 pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Tray application for Syncthing' @@ -43,20 +43,13 @@ checkdepends=('cppunit' 'syncthing' 'iproute2') [[ $_enable_kio_plugin ]] && makedepends+=('kio5') [[ $_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" - 0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch) -sha256sums=('0c48da193eb29338590bb297052a1274284d9c596a5078541c4d7cdf6b6eba6f' - SKIP) +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") +sha256sums=('569d50ac1fd5799fda86d948b3e15934b14ac469d3055738415f359452e3290f') 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-Mock-setting-the-autostart-path-in-the-wizard-test.patch -} - build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/syncthingtray/mingw-w64-qt6/PKGBUILD b/syncthingtray/mingw-w64-qt6/PKGBUILD index 67365190..ca389ff5 100644 --- a/syncthingtray/mingw-w64-qt6/PKGBUILD +++ b/syncthingtray/mingw-w64-qt6/PKGBUILD @@ -16,8 +16,8 @@ _reponame=syncthingtray pkgname=mingw-w64-syncthingtray-qt6 _name=${pkgname#mingw-w64-} _name=${_name%-qt6} -pkgver=1.4.11 -pkgrel=2 +pkgver=1.4.12 +pkgrel=1 arch=('any') pkgdesc='Tray application for Syncthing (mingw-w64)' license=('GPL') @@ -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=('0c48da193eb29338590bb297052a1274284d9c596a5078541c4d7cdf6b6eba6f' +sha256sums=('569d50ac1fd5799fda86d948b3e15934b14ac469d3055738415f359452e3290f' 'SKIP') options=(!buildflags staticlibs !strip !emptydirs) diff --git a/syncthingtray/mingw-w64/PKGBUILD b/syncthingtray/mingw-w64/PKGBUILD index f957f7fe..b23003ea 100644 --- a/syncthingtray/mingw-w64/PKGBUILD +++ b/syncthingtray/mingw-w64/PKGBUILD @@ -15,8 +15,8 @@ _enable_libsyncthing=${MINGW_W64_SYNCTHING_TRAY_ENABLE_LIBSYNCTHING:-ON} _reponame=syncthingtray pkgname=mingw-w64-syncthingtray _name=${pkgname#mingw-w64-} -pkgver=1.4.11 -pkgrel=2 +pkgver=1.4.12 +pkgrel=1 arch=('any') pkgdesc='Tray application for Syncthing (mingw-w64)' license=('GPL') @@ -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=('0c48da193eb29338590bb297052a1274284d9c596a5078541c4d7cdf6b6eba6f' +sha256sums=('569d50ac1fd5799fda86d948b3e15934b14ac469d3055738415f359452e3290f' 'SKIP') options=(!buildflags staticlibs !strip !emptydirs) diff --git a/syncthingtray/qt6/0001-Fix-compilation-with-Qt-6.7.0beta1.patch b/syncthingtray/qt6/0001-Fix-compilation-with-Qt-6.7.0beta1.patch deleted file mode 100644 index ee722038..00000000 --- a/syncthingtray/qt6/0001-Fix-compilation-with-Qt-6.7.0beta1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 51e266fbacff04708b7a8ff401ea78fe74a6d87d Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 21 Dec 2023 18:24:50 +0100 -Subject: [PATCH 1/2] Fix compilation with Qt 6.7.0beta1 - -Fix the wrong placement of the `-->`; not sure why this was not detected as -invalid XML before. ---- - syncthingconnector/org.freedesktop.systemd1.Unit.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/syncthingconnector/org.freedesktop.systemd1.Unit.xml b/syncthingconnector/org.freedesktop.systemd1.Unit.xml -index 035118e..a070755 100644 ---- a/syncthingconnector/org.freedesktop.systemd1.Unit.xml -+++ b/syncthingconnector/org.freedesktop.systemd1.Unit.xml -@@ -206,12 +206,12 @@ - -+ - - - - -- -+ --> - - - --- -2.43.0 - diff --git a/syncthingtray/qt6/0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch b/syncthingtray/qt6/0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch deleted file mode 120000 index 3b669e63..00000000 --- a/syncthingtray/qt6/0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch +++ /dev/null @@ -1 +0,0 @@ -../default/0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch \ No newline at end of file diff --git a/syncthingtray/qt6/0002-Fix-rendering-issues-with-Syncthing-icon-with-Qt-6.7.patch b/syncthingtray/qt6/0002-Fix-rendering-issues-with-Syncthing-icon-with-Qt-6.7.patch deleted file mode 100644 index 488ed59d..00000000 --- a/syncthingtray/qt6/0002-Fix-rendering-issues-with-Syncthing-icon-with-Qt-6.7.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e2c1f4ebe4a1f520cdbe24844d2fef750b85b8ec Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 21 Dec 2023 18:50:30 +0100 -Subject: [PATCH 2/2] Fix rendering issues with Syncthing icon with Qt - 6.7.0beta1 - -It looks like Qt Svg supports masking as of 6.7 which revealed a bug in the -code for making Syncthing icons. The mask for the emblem area was also -accidentally applied in case no emblem is shown. This change adds the mask -only when an emblem is shown. ---- - syncthingmodel/syncthingicons.cpp | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/syncthingmodel/syncthingicons.cpp b/syncthingmodel/syncthingicons.cpp -index 3f27cde..b2aab59 100644 ---- a/syncthingmodel/syncthingicons.cpp -+++ b/syncthingmodel/syncthingicons.cpp -@@ -93,9 +93,20 @@ QByteArray makeSyncthingIcon(const StatusIconColorSet &colors, StatusEmblem stat - "" - ), - }; -+ static const auto emblemAreaMaskAttribute = QStringLiteral(" mask=\"url(#bitemask)\""); -+ static const auto emblemAreaMask = QStringLiteral( -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ ); - static const auto normalStrokeWidth = QStringLiteral("0.81771719"), thickStrokeWidth = QStringLiteral("1.22"); - static const auto normalCircleRadius = QStringLiteral("1.22"), largeCircleRadius = QStringLiteral("1.5"); - const auto &emblemData = emblems[static_cast(statusEmblem)]; -+ const auto &emblemAreaMaskAttributeData = statusEmblem != StatusEmblem::None ? emblemAreaMaskAttribute : emblems[0]; -+ const auto &emblemAreaMaskData = statusEmblem != StatusEmblem::None ? emblemAreaMask : emblems[0]; - const auto &strokeWidthF = strokeWidth == StatusIconStrokeWidth::Normal ? normalStrokeWidth : thickStrokeWidth; - const auto &circleRadius = strokeWidth == StatusIconStrokeWidth::Normal ? normalCircleRadius : largeCircleRadius; - return (QStringLiteral( -@@ -105,15 +116,9 @@ QByteArray makeSyncthingIcon(const StatusIconColorSet &colors, StatusEmblem stat - "" - "" - "" -- "" -- "" -- "" -- "" -- "" -- "" -- "" -+ "") % emblemAreaMaskData % QStringLiteral( - "" -- "" -+ "" - "" - "" - "" --- -2.43.0 - diff --git a/syncthingtray/qt6/PKGBUILD b/syncthingtray/qt6/PKGBUILD index d662f988..f1eac736 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.11 -pkgrel=2 +pkgver=1.4.12 +pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='Tray application for Syncthing (using Qt 6)' license=('GPL') @@ -45,12 +45,8 @@ 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-compilation-with-Qt-6.7.0beta1.patch - 0002-Fix-rendering-issues-with-Syncthing-icon-with-Qt-6.7.patch - 0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch) -sha256sums=('0c48da193eb29338590bb297052a1274284d9c596a5078541c4d7cdf6b6eba6f' - SKIP SKIP) +source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") +sha256sums=('569d50ac1fd5799fda86d948b3e15934b14ac469d3055738415f359452e3290f') 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 @@ -58,9 +54,6 @@ ephemeral_port() { prepare() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" - patch -p1 -i ../0001-Fix-compilation-with-Qt-6.7.0beta1.patch - patch -p1 -i ../0002-Fix-rendering-issues-with-Syncthing-icon-with-Qt-6.7.patch - patch -p1 -i ../0001-Mock-setting-the-autostart-path-in-the-wizard-test.patch } build() { diff --git a/syncthingtray/static-compat/PKGBUILD b/syncthingtray/static-compat/PKGBUILD index 8b0d84eb..19cd98f8 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.11 +pkgver=1.4.12 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=('0c48da193eb29338590bb297052a1274284d9c596a5078541c4d7cdf6b6eba6f' +sha256sums=('569d50ac1fd5799fda86d948b3e15934b14ac469d3055738415f359452e3290f' 'SKIP') [[ $_enable_libsyncthing == ON ]] && _disable_libsyncthing=OFF || _disable_libsyncthing=ON