From 3df6560a2fc0c73b6cb144b6e1b383602033e17e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Feb 2021 12:25:12 +0000 Subject: Update graphics/{kimageannotator,ksnip} to latest upstream release These two go together, so they update together. Upstream has merged all the build-fixes from the previous ports version, and the one new fix is already reported and merged upstream thanks to OpenBSD. Release notes are at https://github.com/ksnip/ksnip/releases/tag/v1.8.1 with notable changes - Allow changing adorner color for rect area selection. (#519) - Default font for numbering tool change to Arial. (#200) - kImageAnnotator: Horizontally align text inside spin box. (#203) - kImageAnnotator: Change zoom with mouse wheel to CTRL+Wheel. (#210) Reported by: portscout --- graphics/ksnip/Makefile | 3 +-- graphics/ksnip/distinfo | 6 +++--- graphics/ksnip/files/patch-CMakeLists.txt | 19 ------------------- graphics/ksnip/files/patch-src_CMakeLists.txt | 22 ---------------------- ...atch-src_backend_config_KsnipConfigProvider.cpp | 11 ----------- .../patch-src_backend_config_KsnipConfigProvider.h | 11 ----------- ...rc_backend_imageGrabber_ImageGrabberFactory.cpp | 11 ----------- ...-src_backend_imageGrabber_ImageGrabberFactory.h | 11 ----------- ...adapter_fileDialog_FileDialogAdapterFactory.cpp | 11 ----------- ...n_adapter_fileDialog_FileDialogAdapterFactory.h | 11 ----------- .../patch-src_common_helper_FileUrlHelper.cpp | 11 ----------- .../files/patch-src_common_platform_HdpiScaler.cpp | 11 ----------- ...atch-src_common_provider_ScaledSizeProvider.cpp | 14 ++++++++++++++ .../patch-src_common_provider_ScaledSizeProvider.h | 14 ++++++++++++++ ...tch-src_gui_globalHotKeys_KeyHandlerFactory.cpp | 18 ------------------ ...patch-src_gui_globalHotKeys_KeyHandlerFactory.h | 11 ----------- ...atch-src_gui_widgetHider_WidgetHiderFactory.cpp | 11 ----------- .../patch-src_gui_widgetHider_WidgetHiderFactory.h | 11 ----------- graphics/ksnip/pkg-plist | 4 +++- 19 files changed, 35 insertions(+), 186 deletions(-) delete mode 100644 graphics/ksnip/files/patch-CMakeLists.txt delete mode 100644 graphics/ksnip/files/patch-src_CMakeLists.txt delete mode 100644 graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.cpp delete mode 100644 graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.h delete mode 100644 graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.cpp delete mode 100644 graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.h delete mode 100644 graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.cpp delete mode 100644 graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.h delete mode 100644 graphics/ksnip/files/patch-src_common_helper_FileUrlHelper.cpp delete mode 100644 graphics/ksnip/files/patch-src_common_platform_HdpiScaler.cpp create mode 100644 graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp create mode 100644 graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h delete mode 100644 graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.cpp delete mode 100644 graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.h delete mode 100644 graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.cpp delete mode 100644 graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.h (limited to 'graphics/ksnip') diff --git a/graphics/ksnip/Makefile b/graphics/ksnip/Makefile index 6deef2f513c8..55c428753925 100644 --- a/graphics/ksnip/Makefile +++ b/graphics/ksnip/Makefile @@ -2,8 +2,7 @@ PORTNAME= ksnip DISTVERSIONPREFIX= v -DISTVERSION= 1.7.3 -PORTREVISION= 1 +DISTVERSION= 1.8.1 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org diff --git a/graphics/ksnip/distinfo b/graphics/ksnip/distinfo index 45d2bd3c5eaa..d133fb2f8348 100644 --- a/graphics/ksnip/distinfo +++ b/graphics/ksnip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597313348 -SHA256 (ksnip-ksnip-v1.7.3_GH0.tar.gz) = 013494b4f35d98f2aeae60aca531efbfe9ac8690af7c140d71a2070ad68bf3da -SIZE (ksnip-ksnip-v1.7.3_GH0.tar.gz) = 350441 +TIMESTAMP = 1613389718 +SHA256 (ksnip-ksnip-v1.8.1_GH0.tar.gz) = 1842628cc444d83bc16170285e313b740219aa2d4a0ad3b630a91a6cea39de59 +SIZE (ksnip-ksnip-v1.8.1_GH0.tar.gz) = 443044 diff --git a/graphics/ksnip/files/patch-CMakeLists.txt b/graphics/ksnip/files/patch-CMakeLists.txt deleted file mode 100644 index f564a3b1d737..000000000000 --- a/graphics/ksnip/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2020-07-30 20:09:16 UTC -+++ CMakeLists.txt -@@ -32,7 +32,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) - - set(QT_MIN_VERSION "5.9.4") - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED Widgets Network Xml PrintSupport DBus Svg) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED Concurrent Widgets Network Xml PrintSupport DBus Svg) - - if (WIN32) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED WinExtras) -@@ -49,6 +49,7 @@ endif () - - set(KIMAGEANNOTATOR_MIN_VERSION "0.3.2") - find_package(kImageAnnotator ${KIMAGEANNOTATOR_MIN_VERSION} REQUIRED) -+find_package(kColorPicker REQUIRED) - - set(BASEPATH "${CMAKE_SOURCE_DIR}") - include_directories("${BASEPATH}") diff --git a/graphics/ksnip/files/patch-src_CMakeLists.txt b/graphics/ksnip/files/patch-src_CMakeLists.txt deleted file mode 100644 index 2385d5b4422b..000000000000 --- a/graphics/ksnip/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- src/CMakeLists.txt.orig 2020-07-30 20:09:16 UTC -+++ src/CMakeLists.txt -@@ -163,8 +163,8 @@ target_link_libraries(ksnip - Qt5::Xml - Qt5::PrintSupport - Qt5::DBus -- kImageAnnotator -- kColorPicker -+ kImageAnnotator::kImageAnnotator -+ kColorPicker::kColorPicker - Qt5::Svg - ) - -@@ -174,7 +174,7 @@ elseif (UNIX) - target_link_libraries(ksnip - Qt5::X11Extras - XCB::XFIXES -- X11 -+ X11::X11 - ) - elseif(WIN32) - target_link_libraries(ksnip diff --git a/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.cpp b/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.cpp deleted file mode 100644 index 542f61a888c1..000000000000 --- a/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/backend/config/KsnipConfigProvider.cpp.orig 2020-06-24 10:56:34 UTC -+++ src/backend/config/KsnipConfigProvider.cpp -@@ -26,7 +26,7 @@ KsnipConfig* KsnipConfigProvider::instance() - return &instance; - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - if (PlatformChecker::instance()->isWayland()) { - static KsnipWaylandConfig instance; - return &instance; diff --git a/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.h b/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.h deleted file mode 100644 index be16d97df48e..000000000000 --- a/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/backend/config/KsnipConfigProvider.h.orig 2020-06-24 10:56:19 UTC -+++ src/backend/config/KsnipConfigProvider.h -@@ -26,7 +26,7 @@ - #include "KsnipMacConfig.h" - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #include "KsnipWaylandConfig.h" - #include "src/common/platform/PlatformChecker.h" - #endif diff --git a/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.cpp b/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.cpp deleted file mode 100644 index de5bbc8d73f1..000000000000 --- a/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/backend/imageGrabber/ImageGrabberFactory.cpp.orig 2020-06-24 10:56:45 UTC -+++ src/backend/imageGrabber/ImageGrabberFactory.cpp -@@ -25,7 +25,7 @@ AbstractImageGrabber* ImageGrabberFactory::createImage - return new MacImageGrabber(); - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - if (PlatformChecker::instance()->isX11()) { - return new X11ImageGrabber(); - } else if (PlatformChecker::instance()->isWayland() && PlatformChecker::instance()->isKde()) { diff --git a/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.h b/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.h deleted file mode 100644 index a3db2efa3b0b..000000000000 --- a/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/backend/imageGrabber/ImageGrabberFactory.h.orig 2020-06-24 10:32:45 UTC -+++ src/backend/imageGrabber/ImageGrabberFactory.h -@@ -24,7 +24,7 @@ - #include "MacImageGrabber.h" - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #include "X11ImageGrabber.h" - #include "KdeWaylandImageGrabber.h" - #include "GnomeWaylandImageGrabber.h" diff --git a/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.cpp b/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.cpp deleted file mode 100644 index c919a55c4711..000000000000 --- a/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/adapter/fileDialog/FileDialogAdapterFactory.cpp.orig 2020-12-30 20:58:35 UTC -+++ src/common/adapter/fileDialog/FileDialogAdapterFactory.cpp -@@ -21,7 +21,7 @@ - - IFileDialogAdapter *FileDialogAdapterFactory::create() - { --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - CommandRunner commandRunner; - auto isSnap = commandRunner.isEnvironmentVariableSet(QStringLiteral("SNAP")); - if (isSnap) { diff --git a/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.h b/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.h deleted file mode 100644 index 4d3e4393b56a..000000000000 --- a/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/adapter/fileDialog/FileDialogAdapterFactory.h.orig 2020-12-30 20:58:35 UTC -+++ src/common/adapter/fileDialog/FileDialogAdapterFactory.h -@@ -23,7 +23,7 @@ - #include "FileDialogAdapter.h" - #include "SnapFileDialogAdapter.h" - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #include "src/common/platform/CommandRunner.h" - #endif - diff --git a/graphics/ksnip/files/patch-src_common_helper_FileUrlHelper.cpp b/graphics/ksnip/files/patch-src_common_helper_FileUrlHelper.cpp deleted file mode 100644 index 75b406a4bfd8..000000000000 --- a/graphics/ksnip/files/patch-src_common_helper_FileUrlHelper.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/helper/FileUrlHelper.cpp.orig 2020-06-24 10:57:05 UTC -+++ src/common/helper/FileUrlHelper.cpp -@@ -26,7 +26,7 @@ QString FileUrlHelper::parse(const QString &text) - return url.remove(QStringLiteral("file://")); - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - return url.remove(QStringLiteral("file://")); - #endif - diff --git a/graphics/ksnip/files/patch-src_common_platform_HdpiScaler.cpp b/graphics/ksnip/files/patch-src_common_platform_HdpiScaler.cpp deleted file mode 100644 index 5120cbc24a88..000000000000 --- a/graphics/ksnip/files/patch-src_common_platform_HdpiScaler.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/platform/HdpiScaler.cpp.orig 2020-12-30 20:58:35 UTC -+++ src/common/platform/HdpiScaler.cpp -@@ -74,7 +74,7 @@ qreal HdpiScaler::scaleFactor() const - - #endif - --#if defined(__linux__) || defined(_WIN32) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(_WIN32) - return desktopWidget->devicePixelRatioF(); - #endif - } diff --git a/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp b/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp new file mode 100644 index 000000000000..504855399061 --- /dev/null +++ b/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp @@ -0,0 +1,14 @@ +--- src/common/provider/ScaledSizeProvider.cpp.orig 2021-02-15 12:17:15 UTC ++++ src/common/provider/ScaledSizeProvider.cpp +@@ -19,6 +19,11 @@ + + #include "ScaledSizeProvider.h" + ++#if defined(UNIX_X11) ++#include ++#include ++#endif ++ + QSize ScaledSizeProvider::scaledSize(const QSize &size) + { + return size * scaleFactor(); diff --git a/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h b/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h new file mode 100644 index 000000000000..bf59d588cb14 --- /dev/null +++ b/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h @@ -0,0 +1,14 @@ +--- src/common/provider/ScaledSizeProvider.h.orig 2021-02-15 12:17:05 UTC ++++ src/common/provider/ScaledSizeProvider.h +@@ -22,11 +22,6 @@ + + #include + +-#if defined(__linux__) +-#include +-#include +-#endif +- + #include "src/common/platform/PlatformChecker.h" + + class ScaledSizeProvider diff --git a/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.cpp b/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.cpp deleted file mode 100644 index 574a88d806c9..000000000000 --- a/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- src/gui/globalHotKeys/KeyHandlerFactory.cpp.orig 2020-06-24 10:56:55 UTC -+++ src/gui/globalHotKeys/KeyHandlerFactory.cpp -@@ -25,7 +25,7 @@ AbstractKeyHandler* KeyHandlerFactory::create() - return new DummyKeyHandler; - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - if(PlatformChecker::instance()->isWayland()) { - return new DummyKeyHandler; - } else { -@@ -36,4 +36,4 @@ AbstractKeyHandler* KeyHandlerFactory::create() - #if defined(_WIN32) - return new WinKeyHandler; - #endif --} -\ No newline at end of file -+} diff --git a/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.h b/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.h deleted file mode 100644 index 41f337fd0352..000000000000 --- a/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gui/globalHotKeys/KeyHandlerFactory.h.orig 2020-06-24 10:31:35 UTC -+++ src/gui/globalHotKeys/KeyHandlerFactory.h -@@ -24,7 +24,7 @@ - #include "DummyKeyHandler.h" - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #include "X11KeyHandler.h" - #include "DummyKeyHandler.h" - #include "src/common/platform/PlatformChecker.h" diff --git a/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.cpp b/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.cpp deleted file mode 100644 index caa3e0ce061f..000000000000 --- a/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gui/widgetHider/WidgetHiderFactory.cpp.orig 2020-12-30 20:52:24 UTC -+++ src/gui/widgetHider/WidgetHiderFactory.cpp -@@ -25,7 +25,7 @@ WidgetHider *WidgetHiderFactory::create(QWidget *widge - return new WidgetHider(widget); - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - auto platformChecker = PlatformChecker::instance(); - if (platformChecker->isWayland() && platformChecker->isGnome()) { - return new GnomeWaylandWidgetHider(widget); diff --git a/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.h b/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.h deleted file mode 100644 index abac0e50d572..000000000000 --- a/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gui/widgetHider/WidgetHiderFactory.h.orig 2020-08-13 10:25:42 UTC -+++ src/gui/widgetHider/WidgetHiderFactory.h -@@ -24,7 +24,7 @@ - #include "WidgetHider.h" - #endif - --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #include "GnomeWaylandWidgetHider.h" - #include "src/common/platform/PlatformChecker.h" - #endif diff --git a/graphics/ksnip/pkg-plist b/graphics/ksnip/pkg-plist index 51e2ce48781c..8f056e379ce5 100644 --- a/graphics/ksnip/pkg-plist +++ b/graphics/ksnip/pkg-plist @@ -19,10 +19,12 @@ share/applications/org.ksnip.ksnip.desktop %%DATADIR%%/translations/ksnip_no.qm %%DATADIR%%/translations/ksnip_pl.qm %%DATADIR%%/translations/ksnip_pt.qm +%%DATADIR%%/translations/ksnip_pt_BR.qm %%DATADIR%%/translations/ksnip_ru.qm +%%DATADIR%%/translations/ksnip_si.qm %%DATADIR%%/translations/ksnip_sv.qm %%DATADIR%%/translations/ksnip_tr.qm %%DATADIR%%/translations/ksnip_uk.qm -%%DATADIR%%/translations/ksnip_zh_Hans.qm +%%DATADIR%%/translations/ksnip_zh_CN.qm share/icons/hicolor/scalable/apps/ksnip.svg share/metainfo/org.ksnip.ksnip.appdata.xml -- cgit v1.2.3