diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
| commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
| tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /media-gfx/fotowall | |
| parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) | |
gentoo resync : 30.05.2020
Diffstat (limited to 'media-gfx/fotowall')
| -rw-r--r-- | media-gfx/fotowall/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch | 2 | ||||
| -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 | 11 |
4 files changed, 35 insertions, 7 deletions
diff --git a/media-gfx/fotowall/Manifest b/media-gfx/fotowall/Manifest index c75baad5cfb1..a2f3c2a05107 100644 --- a/media-gfx/fotowall/Manifest +++ b/media-gfx/fotowall/Manifest @@ -1,4 +1,5 @@ -AUX fotowall-1.0-qt-5.11.patch 585 BLAKE2B a630a7bc8b152eb342e96e94febb980852f4f29dfb4465b5fd7e21ab9eaed08cf0d96fca309e732dec09e3e76a69ffabd98bd376f7bd82ac51fcd1fc0d0471ba SHA512 10c7e9a842b5318dd8e0708f5c876b5494ed273d5509dfcfcb428c0c42c5483d82c3239c1c4cbdd60ee5e6cb5d391079fc684f0c4df992511992d20c02fecdd6 +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 1039 BLAKE2B 2394a70ad4bf910e6551972a8f17e584931f62c1004dac270951f1715a61a013e66a0d126308eb7985abbe0fa88f8b892a15724bad51f56bc7c0492629e40ff8 SHA512 b1300687fb639ba2f6b2549016967a5f01d609a2d70294df29beb47d4880a3a13e78d7d0d3c409b17cb1001ccb010df701cddd95140567d09db3c93deed52f7f +EBUILD fotowall-1.0.ebuild 1078 BLAKE2B 18c3c9f6b35a1cdb04c4a565727622a4a813fc99f0a8ead47b6f90e2aabd83f42c2381abd8c4598c3a8e9052d3c29003d0a519827b5dec3ff39f3fb6776fd0cd SHA512 8baa918219763e1e1c9f20938425fbadff618743ca018d690f54850a7b112edd3ed9ecee02ab2709a8f0c7f9fe5ea997655e77a6af46645c368a96913212e479 MISC metadata.xml 396 BLAKE2B 0f50c7426ba992e6bf94bbc42cf99ea9f0daf7f4791d46cfea0ad57754692fa9e5d8462984a6357f4897e99b73553c248a1fa2f8048cccdc19083bce2d36c661 SHA512 538a67809974677e2c8f51b7ae7999047fffac2fa25677f0af5590afc061b5bd76f9908718bf8f66a6f9d4eaad4e4d2fa2e12837f5e15750035e879d79f93f59 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 index db619771b476..b3ce481cbf49 100644 --- a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch +++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch @@ -2,7 +2,7 @@ Fix build with Qt 5.11. Bug: https://bugs.gentoo.org/661596 ---- a/App/tmp/CanvasAppliance.h +--- a/App/CanvasAppliance.h +++ b/App/CanvasAppliance.h @@ -17,6 +17,9 @@ 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 new file mode 100644 index 000000000000..12f0e988ee23 --- /dev/null +++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch @@ -0,0 +1,24 @@ +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 index 660c5442ca6f..2433ced68ec4 100644 --- a/media-gfx/fotowall/fotowall-1.0.ebuild +++ b/media-gfx/fotowall/fotowall-1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit qmake-utils @@ -28,11 +28,14 @@ DEPEND="${RDEPEND} webcam? ( media-libs/libv4l ) " +PATCHES=( + "${FILESDIR}/${P}-qt-5.11.patch" + "${FILESDIR}/${P}-qt-5.15.patch" +) + src_prepare() { default - eapply "${FILESDIR}/${P}-qt-5.11.patch" - sed -i -e "s|linux/videodev.h|libv4l1-videodev.h|" \ 3rdparty/videocapture/VideoDevice.h || die |