* [gentoo-commits] repo/gentoo:master commit in: app-editors/notepadqq/files/, app-editors/notepadqq/
@ 2018-10-11 12:28 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2018-10-11 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 7a6bb58976a8f5a656b708a24397feac7927dae8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 12:28:09 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 12:28:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6bb589
app-editors/notepadqq: fix build with Qt 5.11
Close: https://bugs.gentoo.org/665286
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
.../notepadqq/files/notepadqq-1.4.8-qt-5.11.patch | 26 ++++++++++++++++++++++
app-editors/notepadqq/notepadqq-1.4.8.ebuild | 4 +++-
app-editors/notepadqq/notepadqq-9999.ebuild | 4 +++-
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
new file mode 100644
index 00000000000..d656bd92094
--- /dev/null
+++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/665286
+
+From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:23:08 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/ui/EditorNS/languageservice.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
+index bbe03dc..9a0f212 100644
+--- a/src/ui/EditorNS/languageservice.cpp
++++ b/src/ui/EditorNS/languageservice.cpp
+@@ -6,6 +6,7 @@
+ #include <QJsonDocument>
+ #include <QJsonObject>
+ #include <QJsonValue>
++#include <QTextStream>
+
+ namespace EditorNS {
+
+--
+2.18.1
+
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
index d85db1653d7..0ce0b7273f5 100644
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,6 +32,8 @@ DEPEND="
dev-qt/qtsvg:5
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_prepare() {
default
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 9db258a3956..18d0df4c803 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,6 +33,8 @@ DEPEND="
dev-qt/qtsvg:5
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/notepadqq/files/, app-editors/notepadqq/
@ 2020-03-12 9:58 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2020-03-12 9:58 UTC (permalink / raw
To: gentoo-commits
commit: b28e53e19de4286b49f2ef7d0d5c3133d3522d97
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 09:57:42 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 09:57:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28e53e1
app-editors/notepadqq: Removed old
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-editors/notepadqq/Manifest | 2 -
.../files/notepadqq-1.4.8-qt-5.11-QDateTime.patch | 25 ---------
.../notepadqq/files/notepadqq-1.4.8-qt-5.11.patch | 26 ---------
app-editors/notepadqq/notepadqq-1.2.0.ebuild | 55 -------------------
app-editors/notepadqq/notepadqq-1.4.8.ebuild | 61 ----------------------
5 files changed, 169 deletions(-)
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index ff3f5a9577c..a401586ab2e 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,3 +1 @@
-DIST notepadqq-1.2.0.tar.gz 2082931 BLAKE2B 41f81be45b5e36d58c2632fc9d03c6802b1a99f5ff9603682f3e1c6907143767f57034f053677d8edffae68a098ddf56d2b90e57fd9884442d80749a670f9d4a SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717
-DIST notepadqq-1.4.8.tar.gz 4418925 BLAKE2B 91d993fd952609a7255c6541e97580b5dd01e6902cb6a84b77da7fbf8bc52a9a07ba85845d33e5801d539d8c560804b69947df965550dfb981e228330ea46ffd SHA512 fa1937b75a378fb81486a871a5b736f6ba216cd4b71f99e342e457de65ea034c2ee4d2c9f42754c4737671ccb1083fb1e6c946240ab2094042125430578141fa
DIST notepadqq-2.0.0_beta.tar.gz 4516680 BLAKE2B 9a16ab64134ab0d33a68cc528db6a50b8860c391130667a9213e3aa941e115b1e3acae5833ce4b8b52fc81aa8997c5389f5920cde86171cf5d960a7f58dbea99 SHA512 b2ae3493da1512f5f2e42ffc90529f3acfe81d75b7dd6e476f41b94e9b39e02c6fe355ea5ad40460d644ed76bca695d451721e19738c251c8ecb8acc0c0fb061
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
deleted file mode 100644
index d0158c33527..00000000000
--- a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d5dc3dfb279f8420457fbc04a3ff6fb5f3f8a21 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 26 Feb 2019 00:47:26 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (add missing QDateTime include)
-
-Downstream report: https://bugs.gentoo.org/668392
----
- src/ui/stats.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ui/stats.cpp b/src/ui/stats.cpp
-index 59837c9..e0f3cbd 100644
---- a/src/ui/stats.cpp
-+++ b/src/ui/stats.cpp
-@@ -3,6 +3,7 @@
- #include <QNetworkAccessManager>
- #include <QJsonDocument>
- #include <QNetworkRequest>
-+#include <QDateTime>
- #include <QNetworkReply>
- #include <QSysInfo>
- #include <QTimer>
---
-2.21.0
-
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
deleted file mode 100644
index d656bd92094..00000000000
--- a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/665286
-
-From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 23:23:08 +1100
-Subject: [PATCH] Add missing include.
-
----
- src/ui/EditorNS/languageservice.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
-index bbe03dc..9a0f212 100644
---- a/src/ui/EditorNS/languageservice.cpp
-+++ b/src/ui/EditorNS/languageservice.cpp
-@@ -6,6 +6,7 @@
- #include <QJsonDocument>
- #include <QJsonObject>
- #include <QJsonValue>
-+#include <QTextStream>
-
- namespace EditorNS {
-
---
-2.18.1
-
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
deleted file mode 100644
index fbdfbecdd1d..00000000000
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
-"
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtsvg:5
- dev-qt/qttest:5
-"
-
-src_prepare() {
- default
-
- # Silence a QA warning
- sed '/^OnlyShowIn/d' \
- -i support_files/shortcuts/notepadqq.desktop \
- || die
-}
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
deleted file mode 100644
index 804533a3e34..00000000000
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
-if [[ "${PV}" == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtsvg:5
- dev-qt/qttest:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
-
-src_prepare() {
- default
-
- # Silence a QA warning
- sed '/^OnlyShowIn/d' \
- -i support_files/shortcuts/notepadqq.desktop \
- || die
-}
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-12 9:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-12 9:58 [gentoo-commits] repo/gentoo:master commit in: app-editors/notepadqq/files/, app-editors/notepadqq/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2018-10-11 12:28 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox