Update to featherpad-0.9.3

Changelog: https://github.com/tsujan/FeatherPad/releases/tag/V0.9.3
This commit is contained in:
bcallah 2019-02-06 02:32:01 +00:00
parent b58ee0a959
commit 2e70d005b4
6 changed files with 16 additions and 73 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2018/12/11 15:47:13 bcallah Exp $
# $OpenBSD: Makefile,v 1.3 2019/02/06 02:32:01 bcallah Exp $
COMMENT = lightweight Qt5 plain-text editor
PKGNAME = featherpad-${GH_TAGNAME:S/^V//}
@ -6,7 +6,7 @@ CATEGORIES = editors x11
GH_ACCOUNT = tsujan
GH_PROJECT = FeatherPad
GH_TAGNAME = V0.9.2
GH_TAGNAME = V0.9.3
MAINTAINER = Brian Callahan <bcallah@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (FeatherPad-V0.9.2.tar.gz) = 8+0LwXsWeehJjT5FMgkFUnSp+Jsf7AGhIBOJNl1H5nw=
SIZE (FeatherPad-V0.9.2.tar.gz) = 618953
SHA256 (FeatherPad-V0.9.3.tar.gz) = Oo96++RcX7aQrrahbeLcboDVyWBhh6lCiztxCc+MKi8=
SIZE (FeatherPad-V0.9.3.tar.gz) = 632454

View File

@ -1,23 +1,14 @@
$OpenBSD: patch-featherpad_singleton_cpp,v 1.1.1.1 2018/11/06 23:55:20 bcallah Exp $
$OpenBSD: patch-featherpad_singleton_cpp,v 1.2 2019/02/06 02:32:01 bcallah Exp $
Index: featherpad/singleton.cpp
--- featherpad/singleton.cpp.orig
+++ featherpad/singleton.cpp
@@ -24,7 +24,7 @@
@@ -23,7 +23,7 @@
#include <QStandardPaths>
#include <QCryptographicHash>
#ifdef HAS_X11
-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
#include <QX11Info>
-#if defined Q_OS_LINUX
+#if defined Q_OS_LINUX || defined Q_OS_OPENBSD
#include <unistd.h> // for geteuid()
#endif
#endif
@@ -41,7 +41,7 @@ FPsingleton::FPsingleton (int &argc, char **argv) : QA
{
#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
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
#if QT_VERSION < 0x050200
isX11_ = true;
#else

View File

@ -1,50 +0,0 @@
$OpenBSD: patch-featherpad_x11_cpp,v 1.1.1.1 2018/11/06 23:55:20 bcallah Exp $
Index: featherpad/x11.cpp
--- featherpad/x11.cpp.orig
+++ 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
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
#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
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
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
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
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
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
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
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
Display *disp = QX11Info::display();
if (!disp) return;

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-featherpad_x11_h,v 1.1.1.1 2018/11/06 23:55:20 bcallah Exp $
$OpenBSD: patch-featherpad_x11_h,v 1.2 2019/02/06 02:32:01 bcallah Exp $
Index: featherpad/x11.h
--- featherpad/x11.h.orig
@ -7,7 +7,7 @@ Index: featherpad/x11.h
#ifndef X11_H
#define X11_H
-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD
-#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || Q_OS_OPENBSD
+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_FREEBSD || defined Q_OS_OPENBSD
#include <X11/Xlib.h>
#endif

View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2018/12/11 15:47:13 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.3 2019/02/06 02:32:01 bcallah Exp $
@bin bin/featherpad
@bin bin/fpad
share/applications/featherpad.desktop
share/featherpad/
share/featherpad/help
share/featherpad/help_ja_JP
share/featherpad/translations/
share/featherpad/translations/featherpad_cy.qm
share/featherpad/translations/featherpad_da.qm
@ -11,6 +12,7 @@ share/featherpad/translations/featherpad_de.qm
share/featherpad/translations/featherpad_eo.qm
share/featherpad/translations/featherpad_es.qm
share/featherpad/translations/featherpad_fr.qm
share/featherpad/translations/featherpad_ja_JP.qm
share/featherpad/translations/featherpad_lt.qm
share/featherpad/translations/featherpad_nl.qm
share/featherpad/translations/featherpad_pl.qm