UPDATE: graphics/ksnip

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: graphics/ksnip

Rafael Sadowski
Update ksnip and dependency to the last version. This update drops a lot
of upstreamed patches.

Tests and feedback welcome.

RS

Index: graphics/kimageannotator/Makefile
===================================================================
RCS file: /cvs/ports/graphics/kimageannotator/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- graphics/kimageannotator/Makefile 28 Jan 2021 19:59:02 -0000 1.1.1.1
+++ graphics/kimageannotator/Makefile 15 Feb 2021 06:02:03 -0000
@@ -2,14 +2,14 @@
 
 COMMENT = tool for annotating images
 
-V = 0.4.0
+V = 0.4.1
 PKGNAME = kimageannotator-${V}
 
 GH_ACCOUNT = ksnip
 GH_PROJECT = kImageAnnotator
 GH_TAGNAME = v${V}
 
-SHARED_LIBS = kImageAnnotator 0.0 # 0.4.0
+SHARED_LIBS = kImageAnnotator 1.0 # 0.4.1
 
 CATEGORIES = graphics
 
Index: graphics/kimageannotator/distinfo
===================================================================
RCS file: /cvs/ports/graphics/kimageannotator/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- graphics/kimageannotator/distinfo 28 Jan 2021 19:59:02 -0000 1.1.1.1
+++ graphics/kimageannotator/distinfo 15 Feb 2021 06:02:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (kImageAnnotator-0.4.0.tar.gz) = TOi5hT58Vc/9XrX+QsqJ6tVdtfQyvhtxXm8oBPfoKH0=
-SIZE (kImageAnnotator-0.4.0.tar.gz) = 164030
+SHA256 (kImageAnnotator-0.4.1.tar.gz) = ZOYvc3mgdB9nVRXlfCExHrvGVE2oyKADpaHsSWSQKsg=
+SIZE (kImageAnnotator-0.4.1.tar.gz) = 165976
Index: graphics/kimageannotator/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/kimageannotator/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- graphics/kimageannotator/pkg/PLIST 28 Jan 2021 19:59:02 -0000 1.1.1.1
+++ graphics/kimageannotator/pkg/PLIST 15 Feb 2021 06:02:03 -0000
@@ -27,6 +27,7 @@ share/kImageAnnotator/translations/kImag
 share/kImageAnnotator/translations/kImageAnnotator_no.qm
 share/kImageAnnotator/translations/kImageAnnotator_pl.qm
 share/kImageAnnotator/translations/kImageAnnotator_pt.qm
+share/kImageAnnotator/translations/kImageAnnotator_pt_BR.qm
 share/kImageAnnotator/translations/kImageAnnotator_ru.qm
 share/kImageAnnotator/translations/kImageAnnotator_sv.qm
 share/kImageAnnotator/translations/kImageAnnotator_tr.qm
Index: graphics/ksnip/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ksnip/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- graphics/ksnip/Makefile 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ graphics/ksnip/Makefile 15 Feb 2021 06:02:03 -0000
@@ -4,7 +4,7 @@ COMMENT = screenshot tool with annotatio
 
 GH_ACCOUNT = ksnip
 GH_PROJECT = ksnip
-GH_TAGNAME = v1.8.0
+GH_TAGNAME = v1.8.1
 
 CATEGORIES = graphics
 
@@ -24,7 +24,7 @@ RUN_DEPENDS = devel/desktop-file-utils
  x11/gtk+3,-guic
 
 LIB_DEPENDS = graphics/kcolorpicker \
- graphics/kimageannotator \
+ graphics/kimageannotator>=0.4.1 \
  x11/qt5/qtx11extras
 
 CONFIGURE_ARGS += -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include"
Index: graphics/ksnip/distinfo
===================================================================
RCS file: /cvs/ports/graphics/ksnip/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- graphics/ksnip/distinfo 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ graphics/ksnip/distinfo 15 Feb 2021 06:02:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (ksnip-1.8.0.tar.gz) = JfhYklxpKGbtq9P8X0sgxVyzqmG4wMo5Gq+/gVOCcfE=
-SIZE (ksnip-1.8.0.tar.gz) = 427497
+SHA256 (ksnip-1.8.1.tar.gz) = GEJijMRE2DvBYXAoXjE7dAIZqi1KCtO2MKkabOo53lk=
+SIZE (ksnip-1.8.1.tar.gz) = 443044
Index: graphics/ksnip/patches/patch-src_CMakeLists_txt
===================================================================
RCS file: graphics/ksnip/patches/patch-src_CMakeLists_txt
diff -N graphics/ksnip/patches/patch-src_CMakeLists_txt
--- graphics/ksnip/patches/patch-src_CMakeLists_txt 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/CMakeLists.txt
---- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -197,6 +197,12 @@ elseif (UNIX)
- XCB::XFIXES
-             X11
-             )
-+    # This is the "UNIX AND NOT APPLE" case, which is the Free Desktop
-+    # world: Linux and the BSDs and Illumos. To simplify #ifdefs in
-+    # the source, add a UNIX_X11 defined to be used instead of __linux__ etc.
-+    # While the "X11" part of the define isn't necessarily accurate,
-+    # it is easy to spot.
-+    target_compile_definitions(ksnip PRIVATE UNIX_X11)
- elseif(WIN32)
- target_link_libraries(ksnip
-             Qt5::WinExtras
Index: graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_cpp
diff -N graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_cpp
--- graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_backend_config_KsnipConfigProvider_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/backend/config/KsnipConfigProvider.cpp
---- src/backend/config/KsnipConfigProvider.cpp.orig
-+++ src/backend/config/KsnipConfigProvider.cpp
-@@ -26,7 +26,7 @@ KsnipConfig* KsnipConfigProvider::instance()
- return &instance;
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- if (PlatformChecker::instance()->isWayland()) {
- static KsnipWaylandConfig instance;
- return &instance;
Index: graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_h
===================================================================
RCS file: graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_h
diff -N graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_h
--- graphics/ksnip/patches/patch-src_backend_config_KsnipConfigProvider_h 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_backend_config_KsnipConfigProvider_h,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/backend/config/KsnipConfigProvider.h
---- src/backend/config/KsnipConfigProvider.h.orig
-+++ src/backend/config/KsnipConfigProvider.h
-@@ -26,7 +26,7 @@
- #include "KsnipMacConfig.h"
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- #include "KsnipWaylandConfig.h"
- #include "src/common/platform/PlatformChecker.h"
- #endif
Index: graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_cpp
diff -N graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_cpp
--- graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_backend_imageGrabber_ImageGrabberFactory_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/backend/imageGrabber/ImageGrabberFactory.cpp
---- src/backend/imageGrabber/ImageGrabberFactory.cpp.orig
-+++ src/backend/imageGrabber/ImageGrabberFactory.cpp
-@@ -25,7 +25,7 @@ AbstractImageGrabber* ImageGrabberFactory::createImage
-     return new MacImageGrabber();
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
-     if (PlatformChecker::instance()->isX11()) {
-         return new X11ImageGrabber();
-     } else if (PlatformChecker::instance()->isWayland()) {
Index: graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_h
===================================================================
RCS file: graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_h
diff -N graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_h
--- graphics/ksnip/patches/patch-src_backend_imageGrabber_ImageGrabberFactory_h 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_backend_imageGrabber_ImageGrabberFactory_h,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/backend/imageGrabber/ImageGrabberFactory.h
---- src/backend/imageGrabber/ImageGrabberFactory.h.orig
-+++ src/backend/imageGrabber/ImageGrabberFactory.h
-@@ -24,7 +24,7 @@
- #include "MacImageGrabber.h"
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- #include "X11ImageGrabber.h"
- #include "KdeWaylandImageGrabber.h"
- #include "GnomeWaylandImageGrabber.h"
Index: graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_cpp
diff -N graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_cpp
--- graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/common/adapter/fileDialog/FileDialogAdapterFactory.cpp
---- src/common/adapter/fileDialog/FileDialogAdapterFactory.cpp.orig
-+++ src/common/adapter/fileDialog/FileDialogAdapterFactory.cpp
-@@ -21,7 +21,7 @@
-
- IFileDialogAdapter *FileDialogAdapterFactory::create()
- {
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- if (PlatformChecker::instance()->isSnap()) {
- return new SnapFileDialogAdapter;
- } else {
Index: graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_h
===================================================================
RCS file: graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_h
diff -N graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_h
--- graphics/ksnip/patches/patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_h 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_common_adapter_fileDialog_FileDialogAdapterFactory_h,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/common/adapter/fileDialog/FileDialogAdapterFactory.h
---- src/common/adapter/fileDialog/FileDialogAdapterFactory.h.orig
-+++ src/common/adapter/fileDialog/FileDialogAdapterFactory.h
-@@ -23,7 +23,7 @@
- #include "FileDialogAdapter.h"
- #include "SnapFileDialogAdapter.h"
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- #include "src/common/platform/PlatformChecker.h"
- #endif
-
Index: graphics/ksnip/patches/patch-src_common_helper_FileUrlHelper_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_common_helper_FileUrlHelper_cpp
diff -N graphics/ksnip/patches/patch-src_common_helper_FileUrlHelper_cpp
--- graphics/ksnip/patches/patch-src_common_helper_FileUrlHelper_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_common_helper_FileUrlHelper_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/common/helper/FileUrlHelper.cpp
---- src/common/helper/FileUrlHelper.cpp.orig
-+++ 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(UNIX_X11)
- return url.remove(QStringLiteral("file://"));
- #endif
-
Index: graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_cpp
diff -N graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_cpp
--- graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_common_platform_HdpiScaler_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/common/platform/HdpiScaler.cpp
---- src/common/platform/HdpiScaler.cpp.orig
-+++ src/common/platform/HdpiScaler.cpp
-@@ -44,15 +44,15 @@ QRect HdpiScaler::scale(const QRect &rect) const
- qreal HdpiScaler::scaleFactor() const
- {
- auto desktopWidget = QApplication::desktop();
--
-+
- #if defined(__APPLE__)
-     auto myWindow = QGuiApplication::topLevelWindows().first();
-     qDebug("QWindow devicePixelRatio: %s", qPrintable(QString::number(myWindow->devicePixelRatio())));
-
- return myWindow->devicePixelRatio();
- #endif
--
--#if defined(__linux__) || defined(_WIN32)
-+
-+#if defined(UNIX_X11) || defined(_WIN32)
-     return desktopWidget->devicePixelRatioF();
- #endif
- }
Index: graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_mm
===================================================================
RCS file: graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_mm
diff -N graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_mm
--- graphics/ksnip/patches/patch-src_common_platform_HdpiScaler_mm 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_common_platform_HdpiScaler_mm,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/common/platform/HdpiScaler.mm
---- src/common/platform/HdpiScaler.mm.orig
-+++ src/common/platform/HdpiScaler.mm
-@@ -48,7 +48,7 @@ QRect HdpiScaler::scale(const QRect &rect) const
- qreal HdpiScaler::scaleFactor() const
- {
- auto desktopWidget = QApplication::desktop();
--
-+
- #if defined(__APPLE__)
-     auto myWindow = QGuiApplication::topLevelWindows().first();
-     qDebug("QWindow devicePixelRatio: %s", qPrintable(QString::number(myWindow->devicePixelRatio())));
-@@ -67,8 +67,8 @@ qreal HdpiScaler::scaleFactor() const
- return [[NSScreen mainScreen] backingScaleFactor];
-
- #endif
--
--#if defined(__linux__) || defined(_WIN32)
-+
-+#if defined(UNIX_X11) || defined(_WIN32)
- return desktopWidget->devicePixelRatioF();
- #endif
- }
Index: graphics/ksnip/patches/patch-src_common_provider_ScaledSizeProvider_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_common_provider_ScaledSizeProvider_cpp
diff -N graphics/ksnip/patches/patch-src_common_provider_ScaledSizeProvider_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/ksnip/patches/patch-src_common_provider_ScaledSizeProvider_cpp 15 Feb 2021 06:02:03 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+https://github.com/ksnip/ksnip/pull/581
+
+Index: src/common/provider/ScaledSizeProvider.cpp
+--- src/common/provider/ScaledSizeProvider.cpp.orig
++++ 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();
Index: graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_cpp
diff -N graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_cpp
--- graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gui_desktopService_DesktopServiceAdapter_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/gui/desktopService/DesktopServiceAdapter.cpp
---- src/gui/desktopService/DesktopServiceAdapter.cpp.orig
-+++ src/gui/desktopService/DesktopServiceAdapter.cpp
-@@ -22,7 +22,7 @@
- void DesktopServiceAdapter::openFile(const QString &path)
- {
- // Workaround for issue #432, Qt unable to open file path in snap
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- if(PlatformChecker::instance()->isSnap()) {
- mXdgOpenProcess.start(QLatin1Literal("xdg-open"), QStringList{ path });
- return;
Index: graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_h
===================================================================
RCS file: graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_h
diff -N graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_h
--- graphics/ksnip/patches/patch-src_gui_desktopService_DesktopServiceAdapter_h 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_gui_desktopService_DesktopServiceAdapter_h,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/gui/desktopService/DesktopServiceAdapter.h
---- src/gui/desktopService/DesktopServiceAdapter.h.orig
-+++ src/gui/desktopService/DesktopServiceAdapter.h
-@@ -23,7 +23,7 @@
- #include <QDesktopServices>
- #include <QUrl>
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- #include <QProcess>
-
- #include "src/common/platform/PlatformChecker.h"
-@@ -38,7 +38,7 @@ class DesktopServiceAdapter : public IDesktopService (
- ~DesktopServiceAdapter() override = default;
- void openFile(const QString &path) override;
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- private:
- QProcess mXdgOpenProcess;
- #endif
Index: graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_cpp
diff -N graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_cpp
--- graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_gui_globalHotKeys_KeyHandlerFactory_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/gui/globalHotKeys/KeyHandlerFactory.cpp
---- src/gui/globalHotKeys/KeyHandlerFactory.cpp.orig
-+++ src/gui/globalHotKeys/KeyHandlerFactory.cpp
-@@ -25,7 +25,7 @@ AbstractKeyHandler* KeyHandlerFactory::create()
-     return new DummyKeyHandler;
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
-     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
-+}
Index: graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_h
===================================================================
RCS file: graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_h
diff -N graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_h
--- graphics/ksnip/patches/patch-src_gui_globalHotKeys_KeyHandlerFactory_h 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gui_globalHotKeys_KeyHandlerFactory_h,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/gui/globalHotKeys/KeyHandlerFactory.h
---- src/gui/globalHotKeys/KeyHandlerFactory.h.orig
-+++ src/gui/globalHotKeys/KeyHandlerFactory.h
-@@ -24,7 +24,7 @@
- #include "DummyKeyHandler.h"
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- #include "X11KeyHandler.h"
- #include "DummyKeyHandler.h"
- #include "src/common/platform/PlatformChecker.h"
Index: graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_cpp
===================================================================
RCS file: graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_cpp
diff -N graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_cpp
--- graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_cpp 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_cpp,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/gui/widgetVisibilityHandler/WidgetVisibilityHandlerFactory.cpp
---- src/gui/widgetVisibilityHandler/WidgetVisibilityHandlerFactory.cpp.orig
-+++ src/gui/widgetVisibilityHandler/WidgetVisibilityHandlerFactory.cpp
-@@ -25,7 +25,7 @@ WidgetVisibilityHandler *WidgetVisibilityHandlerFactor
- return new WidgetVisibilityHandler(widget, config);
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- auto platformChecker = PlatformChecker::instance();
- if (platformChecker->isWayland() && platformChecker->isGnome()) {
- return new GnomeWaylandWidgetVisibilityHandler(widget, config);
Index: graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_h
===================================================================
RCS file: graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_h
diff -N graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_h
--- graphics/ksnip/patches/patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_h 28 Jan 2021 20:00:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gui_widgetVisibilityHandler_WidgetVisibilityHandlerFactory_h,v 1.1.1.1 2021/01/28 20:00:19 rsadowski Exp $
-
-backporting commit
-https://github.com/ksnip/ksnip/commit/aa3ef9087100574d1f32022eac2e6e46043afa5c
-
-Index: src/gui/widgetVisibilityHandler/WidgetVisibilityHandlerFactory.h
---- src/gui/widgetVisibilityHandler/WidgetVisibilityHandlerFactory.h.orig
-+++ src/gui/widgetVisibilityHandler/WidgetVisibilityHandlerFactory.h
-@@ -24,7 +24,7 @@
- #include "WidgetVisibilityHandler.h"
- #endif
-
--#if defined(__linux__)
-+#if defined(UNIX_X11)
- #include "GnomeWaylandWidgetVisibilityHandler.h"
- #include "src/common/platform/PlatformChecker.h"
- #endif

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: graphics/ksnip

Omar Polo-3

Rafael Sadowski <[hidden email]> writes:

> Update ksnip and dependency to the last version. This update drops a lot
> of upstreamed patches.
>
> Tests and feedback welcome.

Builds and works fine here.

Thanks for the update :)