Attachment 197634 Details for Bug 231823 – Lightscreen.patch

[patch] Lightscreen.patch

Lightscreen.patch (text/plain), 24.73 KB, created by Kai Knoblich on 2018-09-30 14:13:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2018-09-30 14:13:46 UTC

Size: 24.73 KB

patch

obsolete

>Index: deskutils/Lightscreen/Makefile
>===================================================================
>--- deskutils/Lightscreen/Makefile	(nonexistent)
>+++ deskutils/Lightscreen/Makefile	(working copy)
>@@ -0,0 +1,31 @@
>+# $FreeBSD$
>+
>+PORTNAME=	Lightscreen
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.4
>+CATEGORIES=	deskutils
>+
>+MAINTAINER=	freebsd_ports@k-worx.org
>+COMMENT=	Simple and easy to use screenshot tool
>+
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
>+
>+USES=		dos2unix qmake:outsource qt:5
>+USE_GL=		gl
>+USE_QT=		buildtools_build core gui multimedia network sql widgets x11extras
>+USE_XORG=	x11 xcb
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	ckaiser
>+GH_TUPLE=	ckaiser:SingleApplication:c6378ee:SingleApplication/tools/SingleApplication \
>+		ckaiser:UGlobalHotkey:231b101:UGlobalHotkey/tools/UGlobalHotkey
>+DOS2UNIX_GLOB=	*.h *.cpp
>+
>+PLIST_FILES=	bin/lightscreen
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/lightscreen ${STAGEDIR}${PREFIX}/bin
>+
>+.include <bsd.port.mk>
>
>Property changes on: deskutils/Lightscreen/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/distinfo
>===================================================================
>--- deskutils/Lightscreen/distinfo	(nonexistent)
>+++ deskutils/Lightscreen/distinfo	(working copy)
>@@ -0,0 +1,7 @@
>+TIMESTAMP = 1535185444
>+SHA256 (ckaiser-Lightscreen-v2.4_GH0.tar.gz) = 51687c29c13500e340c3a8762c884d9e05598083983345546903b82583ccf939
>+SIZE (ckaiser-Lightscreen-v2.4_GH0.tar.gz) = 144370
>+SHA256 (ckaiser-SingleApplication-c6378ee_GH0.tar.gz) = 1626c62e92576bf39fb23e1e8d502f0a46bd0e20359bdff1e09eb2369c6a2ef5
>+SIZE (ckaiser-SingleApplication-c6378ee_GH0.tar.gz) = 4833
>+SHA256 (ckaiser-UGlobalHotkey-231b101_GH0.tar.gz) = 81f546e52debb12deb935a370faf11b9b651be0f4589ad0984c7df342f2063f9
>+SIZE (ckaiser-UGlobalHotkey-231b101_GH0.tar.gz) = 6446
>
>Property changes on: deskutils/Lightscreen/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-dialogs_optionsdialog.cpp
>===================================================================
>--- deskutils/Lightscreen/files/patch-dialogs_optionsdialog.cpp	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-dialogs_optionsdialog.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- dialogs/optionsdialog.cpp.orig	2018-08-26 13:37:19 UTC
>++++ dialogs/optionsdialog.cpp
>+@@ -52,7 +52,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
>+     ui.setupUi(this);
>+     setModal(true);
>+ 
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     // KDE-specific style tweaks.
>+     if (qApp->style()->objectName() == "oxygen") {
>+         ui.browsePushButton->setMaximumWidth(30);
>+@@ -218,7 +218,7 @@ void OptionsDialog::loadSettings()
>+         ui.optiPngCheckBox->setEnabled(false);
>+         ui.optiPngLabel->setText("optipng.exe not found");
>+     }
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     if (!QProcess::startDetached("optipng")) {
>+         ui.optiPngCheckBox->setChecked(false);
>+         ui.optiPngCheckBox->setEnabled(false);
>
>Property changes on: deskutils/Lightscreen/files/patch-dialogs_optionsdialog.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-lightscreenwindow.cpp
>===================================================================
>--- deskutils/Lightscreen/files/patch-lightscreenwindow.cpp	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-lightscreenwindow.cpp	(working copy)
>@@ -0,0 +1,56 @@
>+--- lightscreenwindow.cpp.orig	2018-08-26 13:37:19 UTC
>++++ lightscreenwindow.cpp
>+@@ -177,7 +177,7 @@ void LightscreenWindow::cleanup(Screenshot::Options &o
>+ {
>+     // Reversing settings
>+     if (settings()->value("options/hide").toBool()) {
>+-#ifndef Q_OS_LINUX // X is not quick enough and the notification ends up everywhere but in the icon
>++#if !defined(Q_OS_LINUX) && !defined(Q_OS_FREEBSD)  // X is not quick enough and the notification ends up everywhere but in the icon
>+         if (settings()->value("options/tray").toBool() && mTrayIcon) {
>+             mTrayIcon->show();
>+         }
>+@@ -206,7 +206,7 @@ void LightscreenWindow::cleanup(Screenshot::Options &o
>+     }
>+ 
>+     if (settings()->value("options/playSound", false).toBool()) {
>+-        if (options.result == Screenshot::Success) {
>++        if (options.result == Screenshot::SuccessLS) {
>+             QSound::play("sounds/ls.screenshot.wav");
>+         } else {
>+ #ifdef Q_OS_WIN
>+@@ -220,7 +220,7 @@ void LightscreenWindow::cleanup(Screenshot::Options &o
>+ 
>+     updateStatus();
>+ 
>+-    if (options.result != Screenshot::Success) {
>++    if (options.result != Screenshot::SuccessLS) {
>+         return;
>+     }
>+ 
>+@@ -377,7 +377,7 @@ void LightscreenWindow::executeArguments(const QString
>+ void LightscreenWindow::notify(const Screenshot::Result &result)
>+ {
>+     switch (result) {
>+-    case Screenshot::Success:
>++    case Screenshot::SuccessLS:
>+         mTrayIcon->setIcon(QIcon(":/icons/lightscreen.yes"));
>+ 
>+         if (mHasTaskbarButton) {
>+@@ -479,7 +479,7 @@ void LightscreenWindow::screenshotAction(Screenshot::M
>+     if (optionsHide) {
>+         hide();
>+ 
>+-#ifndef Q_OS_LINUX // X is not quick enough and the notification ends up everywhere but in the icon
>++#if !defined(Q_OS_LINUX) && !defined(Q_OS_FREEBSD) // X is not quick enough and the notification ends up everywhere but in the icon
>+         if (mTrayIcon) {
>+             mTrayIcon->hide();
>+         }
>+@@ -645,7 +645,7 @@ void LightscreenWindow::showScreenshotMessage(const Sc
>+     QString title;
>+     QString message;
>+ 
>+-    if (result == Screenshot::Success) {
>++    if (result == Screenshot::SuccessLS) {
>+         title = QFileInfo(fileName).fileName();
>+ 
>+         if (settings()->value("file/target").toString().isEmpty()) {
>
>Property changes on: deskutils/Lightscreen/files/patch-lightscreenwindow.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_hotkeymap.h
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_hotkeymap.h	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_hotkeymap.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- tools/UGlobalHotkey/hotkeymap.h.orig	2018-08-26 13:37:19 UTC
>++++ tools/UGlobalHotkey/hotkeymap.h
>+@@ -122,7 +122,7 @@ inline size_t QtKeyToWin(Qt::Key key)
>+ 
>+     return key;
>+ }
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ 
>+ #include "ukeysequence.h"
>+ #include <unordered_map>
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_hotkeymap.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-libs.pri
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-libs.pri	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-libs.pri	(working copy)
>@@ -0,0 +1,9 @@
>+--- tools/UGlobalHotkey/uglobalhotkey-libs.pri.orig	2018-08-26 13:37:19 UTC
>++++ tools/UGlobalHotkey/uglobalhotkey-libs.pri
>+@@ -1,5 +1,6 @@
>+ # Linking options for different platforms
>+ 
>++freebsd: LIBS += -lxcb -lxcb-keysyms
>+ linux: LIBS += -lxcb -lxcb-keysyms
>+ mac: LIBS += -framework Carbon
>+ 
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-libs.pri
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-sources.pri
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-sources.pri	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-sources.pri	(working copy)
>@@ -0,0 +1,12 @@
>+--- tools/UGlobalHotkey/uglobalhotkey-sources.pri.orig	2018-08-26 13:37:19 UTC
>++++ tools/UGlobalHotkey/uglobalhotkey-sources.pri
>+@@ -1,5 +1,9 @@
>+ INCLUDEPATH += $$PWD/
>+ 
>++freebsd {
>++    QT += gui-private
>++}
>++
>+ linux {
>+     QT += gui-private
>+ }
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkey-sources.pri
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.cpp
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.cpp	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.cpp	(working copy)
>@@ -0,0 +1,84 @@
>+--- tools/UGlobalHotkey/uglobalhotkeys.cpp.orig	2018-08-26 13:37:19 UTC
>++++ tools/UGlobalHotkey/uglobalhotkeys.cpp
>+@@ -1,7 +1,7 @@
>+ #include <QtCore>
>+ #if defined(Q_OS_WIN)
>+ #include <windows.h>
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ #include <QWindow>
>+ #include <qpa/qplatformnativeinterface.h>
>+ #include <QApplication>
>+@@ -15,7 +15,7 @@
>+ UGlobalHotkeys::UGlobalHotkeys(QWidget *parent)
>+     : QWidget(parent)
>+ {
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     qApp->installNativeEventFilter(this);
>+     QWindow wndw;
>+     void *v = qApp->platformNativeInterface()->nativeResourceForWindow("connection", &wndw);
>+@@ -50,7 +50,7 @@ bool UGlobalHotkeys::registerHotkey(const UKeySequence
>+     if (keySeq.size() == 0) {
>+         return false;
>+     }
>+-#if defined(Q_OS_WIN) || defined(Q_OS_LINUX)
>++#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     if (Registered.find(id) != Registered.end()) {
>+         unregisterHotkey(id);
>+     }
>+@@ -78,7 +78,7 @@ bool UGlobalHotkeys::registerHotkey(const UKeySequence
>+     } else {
>+         Registered.insert(id);
>+     }
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     regLinuxHotkey(keySeq, id);
>+ #endif
>+ #if defined(Q_OS_MAC)
>+@@ -108,15 +108,15 @@ bool UGlobalHotkeys::registerHotkey(const UKeySequence
>+ 
>+ void UGlobalHotkeys::unregisterHotkey(size_t id)
>+ {
>+-#if defined(Q_OS_WIN) || defined(Q_OS_LINUX)
>++#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     Q_ASSERT(Registered.find(id) != Registered.end() && "Unregistered hotkey");
>+ #endif
>+ #if defined(Q_OS_WIN)
>+     UnregisterHotKey((HWND)winId(), id);
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     unregLinuxHotkey(id);
>+ #endif
>+-#if defined(Q_OS_WIN) || defined(Q_OS_LINUX)
>++#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     Registered.remove(id);
>+ #endif
>+ #if defined(Q_OS_MAC)
>+@@ -132,7 +132,7 @@ void UGlobalHotkeys::unregisterAllHotkeys()
>+     foreach (const size_t id, Registered) {
>+         this->unregisterHotkey(id);
>+     }
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     foreach (const size_t id, Registered.keys()) {
>+         this->unregisterHotkey(id);
>+     }
>+@@ -145,7 +145,7 @@ UGlobalHotkeys::~UGlobalHotkeys()
>+     for (QSet<size_t>::iterator i = Registered.begin(); i != Registered.end(); ++i) {
>+         UnregisterHotKey((HWND)winId(), *i);
>+     }
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     xcb_key_symbols_free(X11KeySymbs);
>+ #endif
>+ }
>+@@ -176,7 +176,7 @@ bool UGlobalHotkeys::nativeEvent(const QByteArray &eve
>+     return winEvent((MSG *)message, result);
>+ }
>+ 
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ 
>+ bool UGlobalHotkeys::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
>+ {
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.h
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.h	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.h	(working copy)
>@@ -0,0 +1,47 @@
>+--- tools/UGlobalHotkey/uglobalhotkeys.h.orig	2018-08-26 13:37:19 UTC
>++++ tools/UGlobalHotkey/uglobalhotkeys.h
>+@@ -4,7 +4,7 @@
>+ #include <QAbstractNativeEventFilter>
>+ #include <QSet>
>+ 
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ #include "xcb/xcb.h"
>+ #include "xcb/xcb_keysyms.h"
>+ #elif defined(Q_OS_MAC)
>+@@ -14,7 +14,7 @@
>+ #include "ukeysequence.h"
>+ #include "uglobal.h"
>+ 
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ struct UHotkeyData {
>+     xcb_keycode_t keyCode;
>+     int mods;
>+@@ -26,7 +26,7 @@ struct UHotkeyData {
>+ #endif
>+ 
>+ class UGLOBALHOTKEY_EXPORT UGlobalHotkeys : public QWidget
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     , public QAbstractNativeEventFilter
>+ #endif
>+ {
>+@@ -44,7 +44,7 @@ class UGLOBALHOTKEY_EXPORT UGlobalHotkeys : public QWi
>+ #if defined(Q_OS_WIN)
>+     bool winEvent(MSG *message, long *result);
>+     bool nativeEvent(const QByteArray &eventType, void *message, long *result);
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
>+     bool linuxEvent(xcb_generic_event_t *message);
>+     void regLinuxHotkey(const UKeySequence &keySeq, size_t id);
>+@@ -61,7 +61,7 @@ signals:
>+ private:
>+ #if defined(Q_OS_WIN)
>+     QSet<size_t> Registered;
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     QHash<size_t, UHotkeyData> Registered;
>+     xcb_connection_t *X11Connection;
>+     xcb_window_t X11Wid;
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_UGlobalHotkey_uglobalhotkeys.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_os.cpp
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_os.cpp	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_os.cpp	(working copy)
>@@ -0,0 +1,29 @@
>+--- tools/os.cpp.orig	2018-08-26 13:37:19 UTC
>++++ tools/os.cpp
>+@@ -49,7 +49,7 @@
>+     #ifndef SM_CXPADDEDBORDER
>+     #define SM_CXPADDEDBORDER 92
>+     #endif
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     #include <QX11Info>
>+     #include <X11/X.h>
>+     #include <X11/Xlib.h>
>+@@ -273,7 +273,7 @@ void os::setStartup(bool startup, bool hide)
>+     init.endGroup();
>+ #endif
>+ 
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     QFile desktopFile(QDir::homePath() + "/.config/autostart/lightscreen.desktop");
>+ 
>+     desktopFile.remove();
>+@@ -308,7 +308,7 @@ QIcon os::icon(const QString &name, QColor backgroundC
>+     }
>+ }
>+ 
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+ // Taken from KSnapshot. Oh KDE, what would I do without you :D
>+ Window os::findRealWindow(Window w, int depth)
>+ {
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_os.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_os.h
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_os.h	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_os.h	(working copy)
>@@ -0,0 +1,20 @@
>+--- tools/os.h.orig	2018-08-26 13:37:19 UTC
>++++ tools/os.h
>+@@ -28,7 +28,7 @@ class QUrl;
>+ class QGraphicsEffect;
>+ class QIcon;
>+ 
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     typedef unsigned long XID;
>+     typedef XID Window;
>+ #endif
>+@@ -59,7 +59,7 @@ QGraphicsEffect *shadow(const QColor &color = Qt::blac
>+ QIcon icon(const QString &name, QColor backgroundColor = QColor());
>+ 
>+ // X11-specific functions for the Window Picker
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     Window findRealWindow(Window w, int depth = 0);
>+     Window windowUnderCursor(bool includeDecorations = true);
>+ #endif
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_os.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_screenshot.cpp
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_screenshot.cpp	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_screenshot.cpp	(working copy)
>@@ -0,0 +1,41 @@
>+--- tools/screenshot.cpp.orig	2018-08-26 13:37:19 UTC
>++++ tools/screenshot.cpp
>+@@ -39,7 +39,7 @@
>+     #include <windows.h>
>+ #endif
>+ 
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     #include <QX11Info>
>+     #include <X11/X.h>
>+     #include <X11/Xlib.h>
>+@@ -244,7 +244,7 @@ void Screenshot::save()
>+         QApplication::clipboard()->setPixmap(mPixmap, QClipboard::Clipboard);
>+ 
>+         if (!mOptions.file) {
>+-            result = Screenshot::Success;
>++            result = Screenshot::SuccessLS;
>+         }
>+     }
>+ 
>+@@ -254,9 +254,9 @@ void Screenshot::save()
>+         if (name.isEmpty()) {
>+             result = Screenshot::Cancel;
>+         } else if (mUnloaded) {
>+-            result = (QFile::rename(mUnloadFilename, fileName)) ? Screenshot::Success : Screenshot::Failure;
>++            result = (QFile::rename(mUnloadFilename, fileName)) ? Screenshot::SuccessLS : Screenshot::Failure;
>+         } else if (mPixmap.save(fileName, 0, mOptions.quality)) {
>+-            result = Screenshot::Success;
>++            result = Screenshot::SuccessLS;
>+         } else {
>+             result = Screenshot::Failure;
>+         }
>+@@ -366,7 +366,7 @@ void Screenshot::activeWindow()
>+     mPixmap = os::grabWindow((WId)GetForegroundWindow());
>+ #endif
>+ 
>+-#if defined(Q_OS_LINUX)
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     Window focus;
>+     int revert;
>+ 
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_screenshot.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_screenshot.h
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_screenshot.h	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_screenshot.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- tools/screenshot.h.orig	2018-08-26 13:37:19 UTC
>++++ tools/screenshot.h
>+@@ -55,7 +55,7 @@ class Screenshot : public QObject (public)
>+ 
>+     enum Result {
>+         Failure = 0,
>+-        Success = 1,
>++        SuccessLS = 1,
>+         Cancel = 2
>+     };
>+     Q_ENUM(Result)
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_screenshot.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/files/patch-tools_windowpicker.cpp
>===================================================================
>--- deskutils/Lightscreen/files/patch-tools_windowpicker.cpp	(nonexistent)
>+++ deskutils/Lightscreen/files/patch-tools_windowpicker.cpp	(working copy)
>@@ -0,0 +1,47 @@
>+--- tools/windowpicker.cpp.orig	2018-08-26 13:37:19 UTC
>++++ tools/windowpicker.cpp
>+@@ -38,7 +38,7 @@
>+         #define GCL_HICONSM GCLP_HICONSM
>+     #endif
>+ 
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     #include <QX11Info>
>+     #include <X11/X.h>
>+     #include <X11/Xlib.h>
>+@@ -50,7 +50,7 @@ WindowPicker::WindowPicker() : QWidget(0), mCrosshair(
>+ {
>+ #if defined(Q_OS_WIN)
>+     setWindowFlags(Qt::SplashScreen | Qt::WindowStaysOnTopHint);
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     setWindowFlags(Qt::WindowStaysOnTopHint);
>+ #endif
>+ 
>+@@ -172,7 +172,7 @@ void WindowPicker::mouseMoveEvent(QMouseEvent *event)
>+     } else {
>+         mWindowIcon->setPixmap(QPixmap());
>+     }
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+     Window cWindow = os::windowUnderCursor(false);
>+ 
>+     if (cWindow == mCurrentWindow) {
>+@@ -276,7 +276,7 @@ void WindowPicker::mouseReleaseEvent(QMouseEvent *even
>+         mousePos.y = event->globalY();
>+ 
>+         HWND nativeWindow = GetAncestor(WindowFromPoint(mousePos), GA_ROOT);
>+-#elif defined(Q_OS_LINUX)
>++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+         Window nativeWindow = os::windowUnderCursor(false);
>+ #endif
>+ 
>+@@ -290,7 +290,7 @@ void WindowPicker::mouseReleaseEvent(QMouseEvent *even
>+         setWindowFlags(windowFlags() ^ Qt::WindowStaysOnTopHint);
>+         close();
>+ 
>+-#ifdef Q_OS_LINUX
>++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
>+         emit pixmap(QPixmap::grabWindow(mCurrentWindow));
>+ #else
>+         emit pixmap(os::grabWindow((WId)nativeWindow));
>
>Property changes on: deskutils/Lightscreen/files/patch-tools_windowpicker.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/Lightscreen/pkg-descr
>===================================================================
>--- deskutils/Lightscreen/pkg-descr	(nonexistent)
>+++ deskutils/Lightscreen/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+Lightscreen is a simple tool to automate the tedious process of saving and
>+cataloging screenshots, it operates as a hidden background process that is
>+invoked with one (or multiple) hotkeys and then saves a screenshot file to disk
>+according to the user's preferences.
>+
>+WWW: https://github.com/ckaiser/Lightscreen
>
>Property changes on: deskutils/Lightscreen/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231823: 197634