pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove featherpad, feathernotes, arqiver. Imported
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Thu Feb 13 10:52:38 2020 +0100
Changeset: 49e8ee83886e6572ef78ed8fd8513eb12268b90d
Modified Files:
Makefile
Removed Files:
arqiver/DESCR
arqiver/Makefile
arqiver/PLIST
arqiver/distinfo
feathernotes/DESCR
feathernotes/Makefile
feathernotes/PLIST
feathernotes/distinfo
feathernotes/patches/patch-feathernotes_fn.cpp
feathernotes/patches/patch-feathernotes_x11.cpp
feathernotes/patches/patch-feathernotes_x11.h
featherpad/DESCR
featherpad/Makefile
featherpad/PLIST
featherpad/distinfo
featherpad/patches/patch-featherpad_singleton.cpp
featherpad/patches/patch-featherpad_x11.cpp
featherpad/patches/patch-featherpad_x11.h
Log Message:
Remove featherpad, feathernotes, arqiver. Imported
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=49e8ee83886e6572ef78ed8fd8513eb12268b90d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 3 --
arqiver/DESCR | 11 -----
arqiver/Makefile | 30 -------------
arqiver/PLIST | 7 ----
arqiver/distinfo | 6 ---
feathernotes/DESCR | 18 --------
feathernotes/Makefile | 33 ---------------
feathernotes/PLIST | 24 -----------
feathernotes/distinfo | 9 ----
feathernotes/patches/patch-feathernotes_fn.cpp | 24 -----------
feathernotes/patches/patch-feathernotes_x11.cpp | 42 -------------------
feathernotes/patches/patch-feathernotes_x11.h | 22 ----------
featherpad/DESCR | 18 --------
featherpad/Makefile | 34 ---------------
featherpad/PLIST | 30 -------------
featherpad/distinfo | 9 ----
featherpad/patches/patch-featherpad_singleton.cpp | 39 -----------------
featherpad/patches/patch-featherpad_x11.cpp | 51 -----------------------
featherpad/patches/patch-featherpad_x11.h | 15 -------
19 files changed, 425 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index be7396b6fb..e188a21e2b 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,6 @@ SUBDIR+= arora
SUBDIR+= arpdig
SUBDIR+= arphic-ukai-ttf
SUBDIR+= arphic-uming-ttf
-SUBDIR+= arqiver
SUBDIR+= artemis
SUBDIR+= ascii2binary
SUBDIR+= aspell-dictionaries
@@ -792,8 +791,6 @@ SUBDIR+= fbpanel
SUBDIR+= fbsd2pkg
SUBDIR+= fceux
SUBDIR+= feathercoin
-SUBDIR+= feathernotes
-SUBDIR+= featherpad
SUBDIR+= felt
SUBDIR+= festvox-awb
SUBDIR+= festvox-bdl
diff --git a/arqiver/DESCR b/arqiver/DESCR
deleted file mode 100644
index 18ade63f78..0000000000
--- a/arqiver/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Arqiver is a simple Qt5 archive manager as a front-end for libarchive
-(bsdtar), gzip and 7z.
-
- *Arqiver can extract, create and edit archives that are supported by its
- back-ends.
- *It can open archives by drag-and-drop. Its listed items can be viewed
- separately or dragged and dropped into appropriate applications.
- With 7z, it also supports password protection.
-
-Arqiver was started from lumina-archiver, belonging to Lumina
-(<https://github.com/lumina-desktop/lumina>).
diff --git a/arqiver/Makefile b/arqiver/Makefile
deleted file mode 100644
index bf26c62abe..0000000000
--- a/arqiver/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME= Arqiver-V0.3.2
-PKGNAME= arqiver-0.3.2
-CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_GITHUB:=tsujan/}
-GITHUB_TAG= V${PKGVERSION_NOREV}
-
-MAINTAINER= voidpin%protonmail.com@localhost
-HOMEPAGE= https://github.com/tsujan/Arqiver/
-COMMENT= Simple Qt5 archive manager
-LICENSE= gnu-gpl-v3
-
-WRKSRC= ${WRKDIR}/Arqiver-0.3.2
-USE_LANGUAGES= c++
-USE_TOOLS= pkg-config
-
-INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
-
-do-configure:
- cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} \
- ${QTDIR}/bin/qmake -o Makefile PREFIX=${PREFIX}
-
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/arqiver/PLIST b/arqiver/PLIST
deleted file mode 100644
index 772c21175f..0000000000
--- a/arqiver/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD$
-bin/arqiver
-share/applications/arqiver.desktop
-share/arqiver/translations/arqiver_eo.qm
-share/arqiver/translations/arqiver_nl.qm
-share/arqiver/translations/arqiver_pl.qm
-share/arqiver/translations/arqiver_pt_BR.qm
diff --git a/arqiver/distinfo b/arqiver/distinfo
deleted file mode 100644
index 5c0f475648..0000000000
--- a/arqiver/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (Arqiver-V0.3.2.tar.gz) = 01ede799c05b637301f18a1323c04316a877d6db
-RMD160 (Arqiver-V0.3.2.tar.gz) = ac03e0c2d86a534612e00c141c2c01e92d680445
-SHA512 (Arqiver-V0.3.2.tar.gz) = d00400ed783cc15c106b33d1054aebbca7ed77ebee5d536612df84ee9088f2067ca5ff73275e90e50c7e50702e97cd887c94d6e1b64d4cadeacdd63f50442ef7
-Size (Arqiver-V0.3.2.tar.gz) = 113479 bytes
diff --git a/feathernotes/DESCR b/feathernotes/DESCR
deleted file mode 100644
index b740eb7ebb..0000000000
--- a/feathernotes/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-FeatherNotes is a lightweight Qt5 hierarchical notes-manager for Linux.
-It is independent of any desktop environment and has:
-
- * Support for rich text formatting, image embedding and inserting
- editable tables;
- * Drag-and-drop capability for moving nodes and also for embedding images;
- * A tray icon for quick access on any desktop;
- * Correct position/size saving and restoring with most window managers;
- * Compact but complete search and replacement widgets;
- * The ability to include searchable tags (hidden info on each node);
- * Support for optional node icons;
- * Support for local and remote hyperlinks (bookmarks);
- * Text zooming;
- * Printing and exporting to HTML and PDF;
- * Password protection;
- * Auto-saving;
- * macOS support and other features that can be found in its settings,
- on its menus or when it is actually used.
diff --git a/feathernotes/Makefile b/feathernotes/Makefile
deleted file mode 100644
index b39fbcd2db..0000000000
--- a/feathernotes/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD$
-
-DISTNAME= FeatherNotes-V0.5.1
-PKGNAME= feathernotes-0.5.1
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GITHUB:=tsujan/}
-GITHUB_TAG= V${PKGVERSION_NOREV}
-
-MAINTAINER= voidpin%protonmail.com@localhost
-HOMEPAGE= https://github.com/tsujan/FeatherNotes/
-COMMENT= Lightweight Qt5 hierarchical notes-manager
-LICENSE= gnu-gpl-v3
-
-WRKSRC= ${WRKDIR}/FeatherNotes-0.5.1
-USE_LANGUAGES= c++
-USE_TOOLS= pkg-config
-
-INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
-
-do-configure:
- cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} \
- ${QTDIR}/bin/qmake -o Makefile PREFIX=${PREFIX}
-
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/feathernotes/PLIST b/feathernotes/PLIST
deleted file mode 100644
index 9656f3b01d..0000000000
--- a/feathernotes/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD$
-bin/feathernotes
-share/applications/feathernotes.desktop
-share/feathernotes/translations/feathernotes_cs.qm
-share/feathernotes/translations/feathernotes_cy.qm
-share/feathernotes/translations/feathernotes_de.qm
-share/feathernotes/translations/feathernotes_eo.qm
-share/feathernotes/translations/feathernotes_es.qm
-share/feathernotes/translations/feathernotes_fr.qm
-share/feathernotes/translations/feathernotes_he.qm
-share/feathernotes/translations/feathernotes_id.qm
-share/feathernotes/translations/feathernotes_ja.qm
-share/feathernotes/translations/feathernotes_lt.qm
-share/feathernotes/translations/feathernotes_nb_NO.qm
-share/feathernotes/translations/feathernotes_nl.qm
-share/feathernotes/translations/feathernotes_pl.qm
-share/feathernotes/translations/feathernotes_pt_BR.qm
-share/feathernotes/translations/feathernotes_pt_PT.qm
-share/feathernotes/translations/feathernotes_ru.qm
-share/feathernotes/translations/feathernotes_sk_SK.qm
-share/feathernotes/translations/feathernotes_zh_HANT.qm
-share/icons/hicolor/scalable/apps/feathernotes.svg
-share/icons/hicolor/scalable/mimetypes/text-feathernotes-fnx.svg
-share/mime/packages/feathernotes.xml
diff --git a/feathernotes/distinfo b/feathernotes/distinfo
deleted file mode 100644
index 806b3f3cdb..0000000000
--- a/feathernotes/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-SHA1 (FeatherNotes-V0.5.1.tar.gz) = 37994687bce772b46d9f363f7aa38dcd3e6583aa
-RMD160 (FeatherNotes-V0.5.1.tar.gz) = 3091679de78c76d3f61db00ff92cbc331d92a153
-SHA512 (FeatherNotes-V0.5.1.tar.gz) = ee52b2069e000cdf1b1971c9b6e94c4b2fabf93505081f485c2f777d6f002cb0621ca49be58c66a520db801c389bfad9502651eebc42d38d0ece2bec4f6c9e9a
-Size (FeatherNotes-V0.5.1.tar.gz) = 335890 bytes
-SHA1 (patch-feathernotes_fn.cpp) = e9e74350d542b75a5bffc46a35f09a0b591fab6a
-SHA1 (patch-feathernotes_x11.cpp) = e1d131d1b85fbe1dc23dde4426fb83415c1fb906
-SHA1 (patch-feathernotes_x11.h) = 748c3a71e596a1d53412bc2d8b4b94cb3d14b159
diff --git a/feathernotes/patches/patch-feathernotes_fn.cpp b/feathernotes/patches/patch-feathernotes_fn.cpp
deleted file mode 100644
index 8d0f8ec170..0000000000
--- a/feathernotes/patches/patch-feathernotes_fn.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Define NetBSD
-
---- feathernotes/fn.cpp.orig 2020-01-06 06:05:04.000000000 +0000
-+++ feathernotes/fn.cpp
-@@ -48,7 +48,7 @@
- #include <QMimeDatabase>
-
- #ifdef HAS_X11
--#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_HURD
-+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
- #include <QX11Info>
- #endif
- #include "x11.h"
-@@ -65,7 +65,7 @@ FN::FN (const QString& message, QWidget
- {
- #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;
diff --git a/feathernotes/patches/patch-feathernotes_x11.cpp b/feathernotes/patches/patch-feathernotes_x11.cpp
deleted file mode 100644
index 0adc6f5a24..0000000000
--- a/feathernotes/patches/patch-feathernotes_x11.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-Define NetBSD
-
---- feathernotes/x11.cpp.orig 2020-01-06 06:05:04.000000000 +0000
-+++ feathernotes/x11.cpp
-@@ -18,7 +18,7 @@
- #include <QString>
- #include "x11.h"
-
--#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_HURD
-+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
- #include <X11/Xatom.h>
- #include <QX11Info>
- #endif
-@@ -35,7 +35,7 @@ long fromDesktop()
- {
- long res = -1;
-
--#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_HURD
-+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
- Display *disp = QX11Info::display();
- if (!disp) return res;
-
-@@ -70,7 +70,7 @@ long onWhichDesktop (Window w)
- {
- long res = -1;
-
--#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_HURD
-+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
- Display *disp = QX11Info::display();
- if (!disp) return res;
-
-@@ -102,7 +102,7 @@ long onWhichDesktop (Window w)
- // which was defined in gdkwindow-x11.c.
- void moveToCurrentDesktop (Window w)
- {
--#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_HURD
-+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
- Display *disp = QX11Info::display();
- if (!disp) return;
-
diff --git a/feathernotes/patches/patch-feathernotes_x11.h b/feathernotes/patches/patch-feathernotes_x11.h
deleted file mode 100644
index 31404c3457..0000000000
--- a/feathernotes/patches/patch-feathernotes_x11.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Define NetBSD
-
---- feathernotes/x11.h.orig 2020-01-06 06:05:04.000000000 +0000
-+++ feathernotes/x11.h
-@@ -18,13 +18,13 @@
- #ifndef X11_H
- #define X11_H
-
--#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_HURD
-+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
- #include <X11/Xlib.h>
- #endif
-
- namespace FeatherNotes {
-
--#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_HURD
-+#if defined Q_WS_X11 || defined Q_OS_LINUX || defined Q_OS_OPENBSD || defined Q_OS_NETBSD || defined Q_OS_HURD
- long fromDesktop();
- #endif
-
diff --git a/featherpad/DESCR b/featherpad/DESCR
deleted file mode 100644
index 498c3c372b..0000000000
--- a/featherpad/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-FeatherPad is a lightweight Qt5 plain-text editor for Linux.
-It is independent of any desktop environment and has:
- * Drag-and-drop support, including tab detachment and attachment;
- * X11 virtual desktop awareness;
- * An optionally permanent search-bar;
- * Instant highlighting of found matches when searching;
- * A docked window for text replacement;
- * Support for line numbers and jumping to a specific line;
- * Automatic detection of text encoding;
- * Syntax highlighting for common programming languages;
- * Ability to open URLs with appropriate applications;
- * Session management;
- * Side-pane mode;
- * Auto-saving;
- * Spell checking with Hunspell;
- * Printing;
- * Text zooming;
- * Haiku OS and macOS support.
diff --git a/featherpad/Makefile b/featherpad/Makefile
deleted file mode 100644
index f1c776119a..0000000000
--- a/featherpad/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD$
-
-DISTNAME= FeatherPad-V0.12.0
-PKGNAME= featherpad-0.12.0
-CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_GITHUB:=tsujan/}
-GITHUB_TAG= V${PKGVERSION_NOREV}
-
-MAINTAINER= voidpin%protonmail.com@localhost
-HOMEPAGE= https://github.com/tsujan/FeatherPad/
-COMMENT= Lightweight Qt5 plain-text editor for Linux
-LICENSE= gnu-gpl-v3
-
-WRKSRC= ${WRKDIR}/FeatherPad-0.12.0
-USE_CMAKE= yes
-USE_TOOLS+= pkg-config
-USE_LANGUAGES= c c++
-
-CONFIGURE_DIRS= build
-CMAKE_ARG_PATH= ..
-
-pre-configure:
- ${MKDIR} -p ${WRKSRC}/build
-
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../textproc/hunspell/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/featherpad/PLIST b/featherpad/PLIST
deleted file mode 100644
index f32b84eb94..0000000000
--- a/featherpad/PLIST
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $NetBSD$
-bin/featherpad
-bin/fpad
-share/applications/featherpad.desktop
-share/featherpad/help
-share/featherpad/help_ja_JP
-share/featherpad/translations/featherpad_ar_DZ.qm
-share/featherpad/translations/featherpad_cs.qm
-share/featherpad/translations/featherpad_cy.qm
-share/featherpad/translations/featherpad_da.qm
-share/featherpad/translations/featherpad_de.qm
-share/featherpad/translations/featherpad_eo.qm
-share/featherpad/translations/featherpad_es.qm
-share/featherpad/translations/featherpad_fa.qm
-share/featherpad/translations/featherpad_fr.qm
-share/featherpad/translations/featherpad_id.qm
-share/featherpad/translations/featherpad_it.qm
-share/featherpad/translations/featherpad_ja_JP.qm
-share/featherpad/translations/featherpad_lt.qm
-share/featherpad/translations/featherpad_nb_NO.qm
-share/featherpad/translations/featherpad_nl.qm
-share/featherpad/translations/featherpad_pl.qm
-share/featherpad/translations/featherpad_pt_BR.qm
-share/featherpad/translations/featherpad_pt_PT.qm
-share/featherpad/translations/featherpad_ru.qm
-share/featherpad/translations/featherpad_sk_SK.qm
-share/featherpad/translations/featherpad_tr.qm
-share/featherpad/translations/featherpad_zh_CN.qm
-share/featherpad/translations/featherpad_zh_TW.qm
-share/icons/hicolor/scalable/apps/featherpad.svg
diff --git a/featherpad/distinfo b/featherpad/distinfo
deleted file mode 100644
index 44069eb48d..0000000000
--- a/featherpad/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-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_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
deleted file mode 100644
index c53d91764a..0000000000
--- a/featherpad/patches/patch-featherpad_singleton.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-$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
deleted file mode 100644
index ff6227a30e..0000000000
--- a/featherpad/patches/patch-featherpad_x11.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-$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
deleted file mode 100644
index a770320cd0..0000000000
--- a/featherpad/patches/patch-featherpad_x11.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Allow building on NetBSD
-
---- featherpad/x11.h.orig 2019-12-26 23:10:16.000000000 +0000
-+++ featherpad/x11.h
-@@ -20,7 +20,7 @@
- #ifndef X11_H
- #define 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/Xlib.h>
- #endif
-
Home |
Main Index |
Thread Index |
Old Index