svn commit: r565303 - in head/graphics: kimageannotator kimageannotator/files ksnip ksnip/files

Mon Feb 15 12:25:14 UTC 2021

Author: adridg
Date: Mon Feb 15 12:25:12 2021
New Revision: 565303
URL: https://svnweb.freebsd.org/changeset/ports/565303

Log:
  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

Added:
  head/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp   (contents, props changed)
  head/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h   (contents, props changed)
Deleted:
  head/graphics/kimageannotator/files/
  head/graphics/ksnip/files/patch-CMakeLists.txt
  head/graphics/ksnip/files/patch-src_CMakeLists.txt
  head/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.cpp
  head/graphics/ksnip/files/patch-src_backend_config_KsnipConfigProvider.h
  head/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.cpp
  head/graphics/ksnip/files/patch-src_backend_imageGrabber_ImageGrabberFactory.h
  head/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.cpp
  head/graphics/ksnip/files/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory.h
  head/graphics/ksnip/files/patch-src_common_helper_FileUrlHelper.cpp
  head/graphics/ksnip/files/patch-src_common_platform_HdpiScaler.cpp
  head/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.cpp
  head/graphics/ksnip/files/patch-src_gui_globalHotKeys_KeyHandlerFactory.h
  head/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.cpp
  head/graphics/ksnip/files/patch-src_gui_widgetHider_WidgetHiderFactory.h
Modified:
  head/graphics/kimageannotator/Makefile
  head/graphics/kimageannotator/distinfo
  head/graphics/kimageannotator/pkg-plist
  head/graphics/ksnip/Makefile
  head/graphics/ksnip/distinfo
  head/graphics/ksnip/pkg-plist

Modified: head/graphics/kimageannotator/Makefile
==============================================================================

--- head/graphics/kimageannotator/Makefile	Mon Feb 15 11:53:54 2021	(r565302)
+++ head/graphics/kimageannotator/Makefile	Mon Feb 15 12:25:12 2021	(r565303)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kImageAnnotator
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
+DISTVERSION=	0.4.1
 CATEGORIES=	graphics kde
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/graphics/kimageannotator/distinfo
==============================================================================
--- head/graphics/kimageannotator/distinfo	Mon Feb 15 11:53:54 2021	(r565302)
+++ head/graphics/kimageannotator/distinfo	Mon Feb 15 12:25:12 2021	(r565303)
@@ -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

Modified: head/graphics/kimageannotator/pkg-plist
==============================================================================
--- head/graphics/kimageannotator/pkg-plist	Mon Feb 15 11:53:54 2021	(r565302)
+++ head/graphics/kimageannotator/pkg-plist	Mon Feb 15 12:25:12 2021	(r565303)
@@ -5,6 +5,7 @@ lib/cmake/kImageAnnotator/kImageAnnotator-targets.cmak
 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

Modified: head/graphics/ksnip/Makefile
==============================================================================
--- head/graphics/ksnip/Makefile	Mon Feb 15 11:53:54 2021	(r565302)
+++ head/graphics/ksnip/Makefile	Mon Feb 15 12:25:12 2021	(r565303)
@@ -2,8 +2,7 @@
 
 PORTNAME=	ksnip
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.3
-PORTREVISION=	1
+DISTVERSION=	1.8.1
 CATEGORIES=	graphics kde
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/graphics/ksnip/distinfo
==============================================================================
--- head/graphics/ksnip/distinfo	Mon Feb 15 11:53:54 2021	(r565302)
+++ head/graphics/ksnip/distinfo	Mon Feb 15 12:25:12 2021	(r565303)
@@ -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

Added: head/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.cpp	Mon Feb 15 12:25:12 2021	(r565303)
@@ -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();

Added: head/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ksnip/files/patch-src_common_provider_ScaledSizeProvider.h	Mon Feb 15 12:25:12 2021	(r565303)
@@ -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

Modified: head/graphics/ksnip/pkg-plist
==============================================================================
--- head/graphics/ksnip/pkg-plist	Mon Feb 15 11:53:54 2021	(r565302)
+++ head/graphics/ksnip/pkg-plist	Mon Feb 15 12:25:12 2021	(r565303)
@@ -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
