[gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/, media-gfx/engauge/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/, media-gfx/engauge/files/

[Michael Palimaka]

commit:     eee92fc66783faa17112955812d026d205310001
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 13:00:34 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 13:00:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee92fc6

media-gfx/engauge: fix build with Qt 5.11

Closes: https://bugs.gentoo.org/662476
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 media-gfx/engauge/engauge-10.6.ebuild              |  4 +++-
 media-gfx/engauge/files/engauge-10.6-qt-5.11.patch | 26 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index ea7530fd0b5..7d8aba7d2cc 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.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 @@ S=$WORKDIR/engauge-digitizer-$PV
 src_prepare() {
 	eapply_user
 
+	eapply "${FILESDIR}/${P}-qt-5.11.patch"
+
 	# Make sure the documentation is looked for in the proper directory
 	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
 		-i src/Help/HelpWindow.cpp || die

diff --git a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
new file mode 100644
index 00000000000..9070f522393
--- /dev/null
+++ b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/662476
+
+From 5eab86bf84dd1e52fc52b427a8f3508780811976 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:51:15 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/Load/LoadImageFromUrl.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Load/LoadImageFromUrl.cpp b/src/Load/LoadImageFromUrl.cpp
+index 684629bd..1150dad0 100644
+--- a/src/Load/LoadImageFromUrl.cpp
++++ b/src/Load/LoadImageFromUrl.cpp
+@@ -10,6 +10,7 @@
+ #include <QFileInfo>
+ #include <QMessageBox>
+ #include <QtNetwork/QNetworkReply>
++#include <QTextStream>
+ #include <QUrl>
+ #include "Version.h"
+ 
+-- 
+2.18.1
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/, media-gfx/engauge/files/

[Andreas Sturmlechner]

commit:     300e5d6fa343e2d107474700887e29b184883e0f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 17:53:49 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 18:48:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300e5d6f

media-gfx/engauge: drop 10.6

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/engauge/Manifest                         |  1 -
 media-gfx/engauge/engauge-10.6.ebuild              | 79 ----------------------
 media-gfx/engauge/files/engauge-10.6-qt-5.11.patch | 26 -------
 3 files changed, 106 deletions(-)

diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index fc493b850489..4ecc11162ad1 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,2 +1 @@
-DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
 DIST engauge-digitizer-12.1.tar.gz 72358942 BLAKE2B c7581734f3c5591ee5c17e16f2e68d8f75fa083d4b53933d16ea15d36890664f375ac53b5e37872eb0d2ffb5980946fe920412ee56d8a1aa16b0a81e66fcb115 SHA512 54ae573eb1e82ec3a81403c3c64af43207e139a2d97eb633993ffe31e03fedb1c1a5fe63157011851ad4a89822a3109b87a2c90a71f77865b3629a517a353a61

diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
deleted file mode 100644
index 7edd5d1d42c9..000000000000
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="Convert an image file showing a graph or map into numbers"
-HOMEPAGE="https://markummitchell.github.io/engauge-digitizer/"
-SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v${PV}.tar.gz -> engauge-digitizer-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc examples jpeg2k pdf"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-libs/log4cpp
-	sci-libs/fftw:3.0
-	jpeg2k? ( media-libs/openjpeg:2 )
-	pdf? ( app-text/poppler[qt5] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/engauge-digitizer-${PV}
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_prepare() {
-	default
-
-	# Make sure the documentation is looked for in the proper directory
-	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
-		-i src/Help/HelpWindow.cpp || die
-
-	# This otherwise overrides user CFLAGS
-	sed -e '/QMAKE_CXXFLAGS_WARN_ON/s/-O1//' \
-		-i engauge.pro || die
-
-	# Neuter the non-pkg-config hackery
-	sed -e '/error.*OPENJPEG_/d' \
-		-e '/LIBS.*OPENJPEG_LIB/d' \
-		-e '/QMAKE_POST_LINK.*OPENJPEG_LIB/d' \
-		-e '/error.*POPPLER_/d' \
-		-e '/LIBS.*POPPLER_LIB/d' \
-		-i engauge.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=link_pkgconfig \
-		$(usex jpeg2k "CONFIG+=jpeg2000 PKGCONFIG+=libopenjp2" "") \
-		$(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt5" "") \
-		engauge.pro
-	pushd help >/dev/null || die
-	./build || die
-	popd >/dev/null || die
-}
-
-src_install() {
-	dobin bin/engauge
-	doicon src/img/engauge-digitizer.svg
-	make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
-
-	# Install qt help files
-	dodoc bin/documentation/engauge.{qch,qhc}
-	docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.{qch,qhc}
-
-	use doc && dodoc -r doc/.
-	if use examples; then
-		dodoc -r samples
-		docompress -x "${EPREFIX}"/usr/share/doc/${PF}/samples
-	fi
-}

diff --git a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
deleted file mode 100644
index 9070f5223939..000000000000
--- a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/662476
-
-From 5eab86bf84dd1e52fc52b427a8f3508780811976 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 23:51:15 +1100
-Subject: [PATCH] Add missing include.
-
----
- src/Load/LoadImageFromUrl.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Load/LoadImageFromUrl.cpp b/src/Load/LoadImageFromUrl.cpp
-index 684629bd..1150dad0 100644
---- a/src/Load/LoadImageFromUrl.cpp
-+++ b/src/Load/LoadImageFromUrl.cpp
-@@ -10,6 +10,7 @@
- #include <QFileInfo>
- #include <QMessageBox>
- #include <QtNetwork/QNetworkReply>
-+#include <QTextStream>
- #include <QUrl>
- #include "Version.h"
- 
--- 
-2.18.1
-