diff options
Diffstat (limited to 'media-gfx/fotowall')
| -rw-r--r-- | media-gfx/fotowall/Manifest | 7 | ||||
| -rw-r--r-- | media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch | 28 | ||||
| -rw-r--r-- | media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch | 24 | ||||
| -rw-r--r-- | media-gfx/fotowall/fotowall-1.0.ebuild | 58 | ||||
| -rw-r--r-- | media-gfx/fotowall/fotowall-1.0_p20241107.ebuild | 50 |
5 files changed, 53 insertions, 114 deletions
diff --git a/media-gfx/fotowall/Manifest b/media-gfx/fotowall/Manifest index 7b323028209d..698621d9d48a 100644 --- a/media-gfx/fotowall/Manifest +++ b/media-gfx/fotowall/Manifest @@ -1,5 +1,4 @@ -AUX fotowall-1.0-qt-5.11.patch 581 BLAKE2B ce9ca9c40b3f7723c61359af516b848b9967bc6b6c8acc849f3019dfe31f398abac4fe11c1ddbd43264802545a2bdc6eb964af7d210087229a31aaff907b7410 SHA512 3c9f2e416d1c0ce95ae7dd0da9fab818173289eb39374ac943059e035e6fc608b45eb075088686b658b3a2db309c618deb6298b30c52e26a55a53745a9a37b19 -AUX fotowall-1.0-qt-5.15.patch 698 BLAKE2B f81d762c9cdb6c9513ac2c9fa30e444aef099ed9001dbdb6054fa342c7700d13f01294666047e3e3f751d9258082f8c420ae29562585d89cc2b3c3b5c5b35e8a SHA512 f630d182a9e255b65e7190c0cba4fb6b9dc910a335b25353cdc17092998af358bc5cb0afef54a27058fbc9fdc50c0c356354222c03917f0cf7497e1ff9d8a504 -DIST fotowall-1.0.tar.gz 1672398 BLAKE2B 8665f30b11c2fe1e6661e7655dd4de35c3b8bc1d29926d9155958ce5e8875f16281b150e710e4b94e82279e86c510c9933389df32d3255416b6ccdd53fd9c656 SHA512 ae2d887affd28d21b9caabbb3508d8ebd64058d81f84d3b3d67a205341a9cf5b528ca3a02793a4927e2e6b3ddfd73e7698c3df4bad3a7bb4d37fc9fbb226c94c -EBUILD fotowall-1.0.ebuild 1078 BLAKE2B 18c3c9f6b35a1cdb04c4a565727622a4a813fc99f0a8ead47b6f90e2aabd83f42c2381abd8c4598c3a8e9052d3c29003d0a519827b5dec3ff39f3fb6776fd0cd SHA512 8baa918219763e1e1c9f20938425fbadff618743ca018d690f54850a7b112edd3ed9ecee02ab2709a8f0c7f9fe5ea997655e77a6af46645c368a96913212e479 +DIST fotowall-1.0_p20241107-d31d3960.tar.gz 1803966 BLAKE2B e0bf3875037891c2a73006f7542fc1c9e96452e541c30c5cb7fe350a62a7a7488f7965b12436ea8df4c9fb1f42caca45779ccd4780b839de9982de3e3d97cad9 SHA512 35093f90aaef3d8a401969d3bd1c7441ea16f7ce60b3a86c4ef98dbf6dfc4a9a9019bd30e836adcdb92eedaf881fea972cdcea4f87ee40be7ac7f51a154a308d +DIST fotowall-1.0_p20241107-patchset.tar.xz 5788 BLAKE2B fb09fc69e7585af6940d4a858e2d91db1008ff22ed393a853ef0d5cb0e66995cb6ac65e11862805d6a75dd1e792d2c97efb6c22bbb044e8c9d024987db7de70e SHA512 705672e1ad67f721ead0d3295c8e97b2c245934cb5067d36ab48c91cb275f4a7cb10ab5ccf8a985f8c6726df65cbb3bda04ce5cc4791e1c98b8ac5aa4d882db9 +EBUILD fotowall-1.0_p20241107.ebuild 1122 BLAKE2B 663a5b989505e7cc5f0c4d5d1443f09a663b5316fc1c5e09f22a77876c8126a7d20e9df0800cad94c562d39ec9ba1c96503ed907d0bc2afe24c28250e0cf490c SHA512 75c781b85be8fb12e92c7a67e0ad18a75c1e46c3c38120d61f3d7222af90db0e64ed72ff01042be052319f4b3d82f534d2ca9b68265ce4e9c577ab0740d70c67 MISC metadata.xml 317 BLAKE2B 2e698a08ae52aab83309a7b33fcc209b19b8e9e05e211fbbbcffb75a3c29d2b6e974301ce03eaa32f7781a06dc55beebaae95e19bd11cd37243a7f7e0207ce37 SHA512 d876a060371d29c3f24e565d492402a0e3b25477d99bae2d0b4d6740c65fa8e594d8caa545b2def6565a84397a94fc496e89ec2bd570affc4a1a155c1e521be1 diff --git a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch deleted file mode 100644 index b3ce481cbf49..000000000000 --- a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix build with Qt 5.11. - -Bug: https://bugs.gentoo.org/661596 - ---- a/App/CanvasAppliance.h -+++ b/App/CanvasAppliance.h -@@ -17,6 +17,9 @@ - - #include "Shared/PlugGui/AbstractAppliance.h" - #include "ui_CanvasAppliance.h" -+ -+#include <QActionGroup> -+ - class QMenu; - class AbstractContent; - class Canvas; - ---- a/3rdparty/likebackfrontend/LikeBackDialog.cpp -+++ b/3rdparty/likebackfrontend/LikeBackDialog.cpp -@@ -37,6 +37,7 @@ - #include "LikeBackDialog.h" - - #include <QApplication> -+#include <QButtonGroup> - #include <QLocale> - #include <QMessageBox> - #include <QNetworkAccessManager> - diff --git a/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch b/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch deleted file mode 100644 index 12f0e988ee23..000000000000 --- a/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 72f7a502cb2397b0ef459e6e8f429db1d3482be6 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 21 May 2020 02:33:38 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) - ---- - 3rdparty/posterazor/paintcanvas.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/3rdparty/posterazor/paintcanvas.cpp b/3rdparty/posterazor/paintcanvas.cpp -index df33b8a..fd0f319 100644 ---- a/3rdparty/posterazor/paintcanvas.cpp -+++ b/3rdparty/posterazor/paintcanvas.cpp -@@ -23,6 +23,7 @@ - #include "paintcanvas.h" - #include <QImage> - #include <QPainter> -+#include <QPainterPath> - - PaintCanvas::PaintCanvas(QWidget *parent) - : QWidget(parent) --- -2.26.2 - diff --git a/media-gfx/fotowall/fotowall-1.0.ebuild b/media-gfx/fotowall/fotowall-1.0.ebuild deleted file mode 100644 index 2433ced68ec4..000000000000 --- a/media-gfx/fotowall/fotowall-1.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="Qt5 tool for creating wallpapers" -HOMEPAGE="https://www.enricoros.com/opensource/fotowall/" -SRC_URI="https://github.com/enricoros/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="opengl webcam" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - opengl? ( dev-qt/qtopengl:5 ) -" -DEPEND="${RDEPEND} - webcam? ( media-libs/libv4l ) -" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-qt-5.15.patch" -) - -src_prepare() { - default - - sed -i -e "s|linux/videodev.h|libv4l1-videodev.h|" \ - 3rdparty/videocapture/VideoDevice.h || die - - if ! use opengl; then - sed -i "/QT += opengl/d" ${PN}.pro || die - fi -} - -src_configure() { - if ! use webcam; then - eqmake5 ${PN}.pro "CONFIG+=no-webcam" - else - eqmake5 - fi -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.markdown -} diff --git a/media-gfx/fotowall/fotowall-1.0_p20241107.ebuild b/media-gfx/fotowall/fotowall-1.0_p20241107.ebuild new file mode 100644 index 000000000000..7971202335ea --- /dev/null +++ b/media-gfx/fotowall/fotowall-1.0_p20241107.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +COMMIT="d31d3960b2a8a721e274300c1150de48ca219897" +inherit qmake-utils + +DESCRIPTION="Qt tool for creating wallpapers" +HOMEPAGE="https://www.enricoros.com/opensource/fotowall/" +SRC_URI="https://github.com/enricoros/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="webcam" + +RDEPEND=" + dev-qt/qtbase:6[gui,network,opengl,widgets,xml] + dev-qt/qtsvg:6 +" +DEPEND="${RDEPEND} + webcam? ( media-libs/libv4l ) +" + +# Extracted Qt6-only changes (and ported to qmake) from: +# https://github.com/fotowall/fotowall/pull/43 +PATCHES=( "${WORKDIR}"/${P}-patchset ) + +src_prepare() { + default + + sed -i -e "s|linux/videodev.h|libv4l1-videodev.h|" \ + 3rdparty/videocapture/VideoDevice.h || die +} + +src_configure() { + if ! use webcam; then + eqmake6 ${PN}.pro "CONFIG+=no-webcam" + else + eqmake6 + fi +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +} |