[gentoo-commits] repo/gentoo:master commit in: x11-misc/fraqtive/, x11-misc/fraqtive/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fraqtive/, x11-misc/fraqtive/files/

[Michael Palimaka]

commit:     dc1a1d3f206ac6ce9c54acd7648f1c0311d4f110
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 06:12:59 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 06:13:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1a1d3f

x11-misc/fraqtive: fix build failure by adding patch with missing Qt includes

Closes: https://bugs.gentoo.org/563574
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../files/fraqtive-0.4.8-qt-includes.patch         | 24 ++++++++++++++++++++++
 x11-misc/fraqtive/fraqtive-0.4.8.ebuild            |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch
new file mode 100644
index 00000000000..de31d9c37ec
--- /dev/null
+++ b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch
@@ -0,0 +1,24 @@
+Add missing Qt includes.
+
+Bug: https://bugs.gentoo.org/563574
+
+--- a/src/configurationdata.cpp
++++ b/src/configurationdata.cpp
+@@ -25,6 +25,7 @@
+ #include <shlobj.h>
+ #endif
+ 
++#include <QDataStream>
+ #include <QDir>
+ #include <cstdlib>
+ 
+--- a/src/fractalgenerator.h
++++ b/src/fractalgenerator.h
+@@ -21,6 +21,7 @@
+ 
+ #include <QEvent>
+ #include <QMutex>
++#include <QObject>
+ #include <QWaitCondition>
+ 
+ #include "abstractjobprovider.h"

diff --git a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
index 8d3effac98f..5c0a787ab56 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,6 +32,8 @@ DEPEND="
 "
 
 src_configure() {
+	epatch "${FILESDIR}/${P}-qt-includes.patch"
+
 	tc-export PKG_CONFIG
 	sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die
 	local conf="release"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fraqtive/, x11-misc/fraqtive/files/

[Petr Vaněk]

commit:     8adf3555fd2c2e1f3b71f43f50240291ac297fe8
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 11:16:57 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 11:16:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8adf3555

x11-misc/fraqtive: drop 0.4.8-r2

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 x11-misc/fraqtive/Manifest                         |  1 -
 .../fraqtive/files/fraqtive-0.4.8-qt-5.15.patch    | 39 ---------------
 .../files/fraqtive-0.4.8-qt-includes.patch         | 24 ----------
 x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild         | 55 ----------------------
 4 files changed, 119 deletions(-)

diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index ae656c25fbcf..c9fd887003ba 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,2 +1 @@
 DIST fraqtive-0.4.8.1.tar.gz 291381 BLAKE2B a5f93d42767c35ff7e27c87e89133a1c9d045acbb8b59c87799c5b838361aaba47af6ef001914f29eb27e2830ec3bdebe36111c1ae65e1f18a219367d168397c SHA512 d08659305dcc698a1fd0a81a833e4ffb8bc6496f7a95d7908d9f64ba1b51f9585be9b51ff44a15ca3a051d478ba0e04803f16cfd9abc56f426c8aa2f3e094c80
-DIST fraqtive-0.4.8.tar.bz2 260484 BLAKE2B 0bbbd983af324c38fb73db043e808de6cbf8e3e39073163b748215a2a3a374e53e4118b7fb0993685d3eef4ef6b65afcc51c5a7d23f4ab91ffc2dfd41305171d SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942

diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
deleted file mode 100644
index 63c281757096..000000000000
--- a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-5.15.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 34963f986f64d98b6ef82757ca07159a6a059763 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 21 Jun 2020 13:21:15 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/datafunctions.cpp | 2 ++
- src/shadewidget.cpp   | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/datafunctions.cpp b/src/datafunctions.cpp
-index 3ec1af9..9369299 100644
---- a/src/datafunctions.cpp
-+++ b/src/datafunctions.cpp
-@@ -19,6 +19,8 @@
- #include "datafunctions.h"
- #include "fractaldata.h"
- 
-+#include <QPainterPath>
-+
- namespace DataFunctions
- {
- 
-diff --git a/src/shadewidget.cpp b/src/shadewidget.cpp
-index 1494b37..3da5c05 100644
---- a/src/shadewidget.cpp
-+++ b/src/shadewidget.cpp
-@@ -19,6 +19,7 @@
- #include "shadewidget.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QToolTip>
- 
--- 
-2.27.0
-

diff --git a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch b/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch
deleted file mode 100644
index de31d9c37ec2..000000000000
--- a/x11-misc/fraqtive/files/fraqtive-0.4.8-qt-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Add missing Qt includes.
-
-Bug: https://bugs.gentoo.org/563574
-
---- a/src/configurationdata.cpp
-+++ b/src/configurationdata.cpp
-@@ -25,6 +25,7 @@
- #include <shlobj.h>
- #endif
- 
-+#include <QDataStream>
- #include <QDir>
- #include <cstdlib>
- 
---- a/src/fractalgenerator.h
-+++ b/src/fractalgenerator.h
-@@ -21,6 +21,7 @@
- 
- #include <QEvent>
- #include <QMutex>
-+#include <QObject>
- #include <QWaitCondition>
- 
- #include "abstractjobprovider.h"

diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
deleted file mode 100644
index afb5f4538267..000000000000
--- a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals"
-HOMEPAGE="https://fraqtive.mimec.org/ https://github.com/mimecorg/fraqtive"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtxml:5
-	virtual/glu
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-includes.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_configure() {
-	tc-export PKG_CONFIG
-	sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die
-	local conf="release"
-
-	if use cpu_flags_x86_sse2; then
-		conf="$conf sse2"
-	else
-		conf="$conf no-sse2"
-	fi
-
-	echo "CONFIG += $conf" > config.pri
-	echo "PREFIX = ${EPREFIX}/usr" >> config.pri
-	# Don't strip wrt #252096
-	echo "QMAKE_STRIP =" >> config.pri
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}