featherpad-0.12.0, updated

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: featherpad-0.12.0, updated
From: pin <voidpin%protonmail.com@localhost>
Date: Thu, 23 Jan 2020 13:45:04 +0000
Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Jan 23 14:45:04 2020 +0100
Changeset:	6347d81a9ea52b9ffaefdb1ded209d7126deb8bb

Modified Files:
	featherpad/distinfo
	featherpad/patches/patch-featherpad_x11.h
Added Files:
	featherpad/patches/patch-featherpad_singleton.cpp
	featherpad/patches/patch-featherpad_x11.cpp

Log Message:
featherpad-0.12.0, updated

Needed patches are submitted to upstream FeatherPad.
Upstream willing to merge.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6347d81a9ea52b9ffaefdb1ded209d7126deb8bb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 featherpad/distinfo                               |  4 +-
 featherpad/patches/patch-featherpad_singleton.cpp | 39 +++++++++++++++++
 featherpad/patches/patch-featherpad_x11.cpp       | 51 +++++++++++++++++++++++
 featherpad/patches/patch-featherpad_x11.h         |  2 +-
 4 files changed, 94 insertions(+), 2 deletions(-)

diffs:
diff --git a/featherpad/distinfo b/featherpad/distinfo
index 086298df49..44069eb48d 100644
--- a/featherpad/distinfo
+++ b/featherpad/distinfo
@@ -4,4 +4,6 @@ SHA1 (FeatherPad-V0.12.0.tar.gz) = b0bd8ba27ae7a8111b0a848c782f3d5c1d875d3e
 RMD160 (FeatherPad-V0.12.0.tar.gz) = 80c8454a0766f502b8fb4778b452dc9ab8304c9a
 SHA512 (FeatherPad-V0.12.0.tar.gz) = ce02a75e62723bb7d8bec345c352fae18b917bcce39c667b870f70f025740c428e8b34387c00710cb4979238930575f87809d54d70ef30ce131801526fcb998d
 Size (FeatherPad-V0.12.0.tar.gz) = 774318 bytes
-SHA1 (patch-featherpad_x11.h) = 137904f26e6c0ec8711a369a3f6d141374232bd4
+SHA1 (patch-featherpad_singleton.cpp) = 2a975b01d35af58f48942f6dc29bb94aeb41ab13
+SHA1 (patch-featherpad_x11.cpp) = 9c7605159a914b67166e1e253bd0f843cf2a92d6
+SHA1 (patch-featherpad_x11.h) = d1c16d999a5eca0332c13b4240d72f2680706c66
diff --git a/featherpad/patches/patch-featherpad_singleton.cpp b/featherpad/patches/patch-featherpad_singleton.cpp
new file mode 100644
index 0000000000..c53d91764a
--- /dev/null
+++ b/featherpad/patches/patch-featherpad_singleton.cpp
@@ -0,0 +1,39 @@
+$NetBSD$
+
+Allow building on NetBSD
+
+--- featherpad/singleton.cpp.orig	2019-12-26 23:10:16.000000000 +0000
++++ featherpad/singleton.cpp
+@@ -24,12 +24,12 @@
+ #include <QCryptographicHash>
+ #include <QThread>
+ 
+-#if defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+ #include <unistd.h> // for geteuid()
+ #endif
+ 
+ #ifdef HAS_X11
+-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+ #include <QX11Info>
+ #endif
+ #endif
+@@ -46,7 +46,7 @@ FPsingleton::FPsingleton (int &argc, cha
+ {
+ #ifdef HAS_X11
+     // For now, the lack of x11 is seen as wayland.
+-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+     isX11_ = QX11Info::isPlatformX11();
+ #else
+     isX11_ = false;
+@@ -278,7 +278,7 @@ FPwin* FPsingleton::newWin (const QStrin
+     fp->show();
+     if (socketFailure_)
+         fp->showCrashWarning();
+-#if defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+     else if (geteuid() == 0)
+         fp->showRootWarning();
+ #endif
diff --git a/featherpad/patches/patch-featherpad_x11.cpp b/featherpad/patches/patch-featherpad_x11.cpp
new file mode 100644
index 0000000000..ff6227a30e
--- /dev/null
+++ b/featherpad/patches/patch-featherpad_x11.cpp
@@ -0,0 +1,51 @@
+$NetBSD$
+
+Allow building on NetBSD
+
+--- featherpad/x11.cpp.orig	2019-12-26 23:10:16.000000000 +0000
++++ featherpad/x11.cpp
+@@ -20,7 +20,7 @@
+ #include <QString>
+ #include "x11.h"
+ 
+-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+ #include <X11/Xatom.h>
+ #include <QX11Info>
+ #endif
+@@ -37,7 +37,7 @@ long fromDesktop()
+ {
+     long res = -1;
+ 
+-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+     Display  *disp = QX11Info::display();
+     if (!disp) return res;
+ 
+@@ -72,7 +72,7 @@ long onWhichDesktop (Window window)
+ {
+     long res = -1;
+ 
+-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+     Display *disp = QX11Info::display();
+     if (!disp) return res;
+ 
+@@ -107,7 +107,7 @@ long onWhichDesktop (Window window)
+ 
+ bool isWindowShaded (Window window)
+ {
+-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+     Display *disp = QX11Info::display();
+     if (!disp) return false;
+ 
+@@ -142,7 +142,7 @@ bool isWindowShaded (Window window)
+ /*************************/
+ void unshadeWindow (Window window)
+ {
+-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_HURD
++#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
+     Display *disp = QX11Info::display();
+     if (!disp) return;
+ 
diff --git a/featherpad/patches/patch-featherpad_x11.h b/featherpad/patches/patch-featherpad_x11.h
index 9ee6145113..a770320cd0 100644
--- a/featherpad/patches/patch-featherpad_x11.h
+++ b/featherpad/patches/patch-featherpad_x11.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Include NetBSD xlib.h
+Allow building on NetBSD
 
 --- featherpad/x11.h.orig	2019-12-26 23:10:16.000000000 +0000
 +++ featherpad/x11.h
Prev by Date: opencl-headers: Import opencl-headers-2.2.0.20200123 as wip/opencl-headers
Next by Date: opencl-clhpp: Import opencl-clhpp-2.2.0.20200123 as wip/opencl-clhpp
Previous by Thread: opencl-headers: Import opencl-headers-2.2.0.20200123 as wip/opencl-headers
Next by Thread: opencl-clhpp: Import opencl-clhpp-2.2.0.20200123 as wip/opencl-clhpp
Indexes:
Home | Main Index | Thread Index | Old Index