mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-17 08:01:36 +00:00
Code Issues Releases Activity

Update graphics/{kimageannotator,ksnip} to latest upstream release

Browse Source 
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
This commit is contained in:
Adriaan de Groot 2021-02-15 12:25:12 +00:00
parent 28da29717e
commit 3df6560a2f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=565303
23 changed files with 41 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/kimageannotator/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= kImageAnnotator
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.0
DISTVERSION= 0.4.1
CATEGORIES= graphics kde
MAINTAINER= kde@FreeBSD.org

6
graphics/kimageannotator/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1607352051
SHA256 (ksnip-kImageAnnotator-v0.4.0_GH0.tar.gz) = 4ce8b9853e7c55cffd5eb5fe42ca89ead55db5f432be1b715e6f2804f7e8287d
SIZE (ksnip-kImageAnnotator-v0.4.0_GH0.tar.gz) = 164030
TIMESTAMP = 1613389712
SHA256 (ksnip-kImageAnnotator-v0.4.1_GH0.tar.gz) = 64e62f7379a0741f675515e57c21311ebbc6544da8c8a003a5a1ec4964902ac8
SIZE (ksnip-kImageAnnotator-v0.4.1_GH0.tar.gz) = 165976

11
graphics/kimageannotator/files/patch-CMakeLists.txt
View File

@ -1,11 +0,0 @@
--- CMakeLists.txt.orig 2020-12-06 21:01:08 UTC
+++ CMakeLists.txt
@@ -70,7 +70,7 @@ target_include_directories(kImageAnnotator
target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets Qt5::Svg PRIVATE kColorPicker::kColorPicker)
if (UNIX AND NOT APPLE)
- target_link_libraries(kImageAnnotator PRIVATE X11)
+ target_link_libraries(kImageAnnotator PRIVATE X11::X11)
endif ()
target_compile_definitions(kImageAnnotator PRIVATE KIMAGEANNOTATOR_LIB)

2
graphics/kimageannotator/pkg-plist
View File

@ -5,6 +5,7 @@ lib/cmake/kImageAnnotator/kImageAnnotator-targets.cmake
lib/cmake/kImageAnnotator/kImageAnnotatorConfig-version.cmake
lib/cmake/kImageAnnotator/kImageAnnotatorConfig.cmake
lib/libkImageAnnotator.so
lib/libkImageAnnotator.so.0
lib/libkImageAnnotator.so.%%SHLIB_VER%%
%%DATADIR%%/translations/kImageAnnotator_cs.qm
%%DATADIR%%/translations/kImageAnnotator_da.qm
@ -23,6 +24,7 @@ lib/libkImageAnnotator.so.%%SHLIB_VER%%
%%DATADIR%%/translations/kImageAnnotator_no.qm
%%DATADIR%%/translations/kImageAnnotator_pl.qm
%%DATADIR%%/translations/kImageAnnotator_pt.qm
%%DATADIR%%/translations/kImageAnnotator_pt_BR.qm
%%DATADIR%%/translations/kImageAnnotator_ru.qm
%%DATADIR%%/translations/kImageAnnotator_sv.qm
%%DATADIR%%/translations/kImageAnnotator_tr.qm

3
graphics/ksnip/Makefile
View File

@ -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

6
graphics/ksnip/distinfo
View File

@ -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

19
graphics/ksnip/files/patch-CMakeLists.txt
View File

@ -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}")

22
graphics/ksnip/files/patch-src_CMakeLists.txt
View File

@ -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

11
graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.cpp
View File

@ -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;

11
graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.h
View File

@ -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

11
graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.cpp
View File

@ -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()) {

11
graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.h
View File

@ -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"

11
graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.cpp
View File

@ -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) {

11
graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.h
View File

@ -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

11
graphics/ksnip/files/patch-src_common_helper_FileUrlHelper.cpp
View File

@ -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

11
graphics/ksnip/files/patch-src_common_platform_HdpiScaler.cpp
View File

@ -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
}

14
graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp Normal file
View File

@ -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 <QApplication>
+#include <QScreen>
+#endif
+
QSize ScaledSizeProvider::scaledSize(const QSize &size)
{
return size * scaleFactor();

14
graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h Normal file
View File

@ -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 <QSize>
-#if defined(__linux__)
-#include <QApplication>
-#include <QScreen>
-#endif
-
#include "src/common/platform/PlatformChecker.h"
class ScaledSizeProvider

18
graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.cpp
View File

@ -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
+}

11
graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.h
View File

@ -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"

11
graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.cpp
View File

@ -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);

11
graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.h
View File

@ -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

4
graphics/ksnip/pkg-plist
View File

@ -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