[gentoo-commits] repo/gentoo:master commit in: media-gfx/pencil/, media-gfx/pencil/files/
commit: e86739ed5f62ae3c8543725523161175d819c640
Author: Ben Kohler gentoo org>
AuthorDate: Mon Dec 28 19:00:10 2020 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Dec 28 19:00:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86739ed
media-gfx/pencil: drop old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler gentoo.org>
media-gfx/pencil/Manifest | 1 -
.../files/pencil-0.6.4-fixes-for-qt-5.15.0.patch | 30 --
media-gfx/pencil/pencil-0.6.4-r1.ebuild| 65 --
media-gfx/pencil/pencil-0.6.4.ebuild | 63 -
4 files changed, 159 deletions(-)
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 6bf8522b33e..f25b8666527 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,2 +1 @@
-DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B
cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de
SHA512
da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
DIST pencil-0.6.5.tar.gz 3714951 BLAKE2B
0b3ba5165f4a6778588eed3141c6260a29470ccf277e42612e68e8b4daf5b9cf32f6a4343c038d6014ceb1e99f7ce8c2a398130ea55e7ef16e2d006de3661625
SHA512
6d95dc4157ea0f5da829f40cdf99c682e560ca74af6964693d221321e7b3e923893957fc30475a725f09c18dc4667968ec6cd92e5ffb56999ea70a927266b637
diff --git a/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
b/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
deleted file mode 100644
index cbbaf2b2065..000
--- a/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
a/core_lib/src/graphics/bitmap/bitmapimage.cpp
-+++ b/core_lib/src/graphics/bitmap/bitmapimage.cpp
-@@ -20,6 +20,7 @@ GNU General Public License for more details.
- #include
- #include
- #include
-+#include
- #include "util.h"
-
- BitmapImage::BitmapImage()
a/core_lib/src/graphics/vector/beziercurve.cpp
-+++ b/core_lib/src/graphics/vector/beziercurve.cpp
-@@ -22,6 +22,7 @@ GNU General Public License for more details.
-
- #include
- #include
-+#include
- #include "object.h"
- #include "pencilerror.h"
-
a/core_lib/src/managers/viewmanager.cpp
-+++ b/core_lib/src/managers/viewmanager.cpp
-@@ -15,6 +15,7 @@ GNU General Public License for more details.
-
- */
-
-+#include
- #include "viewmanager.h"
- #include "editor.h"
- #include "object.h"
diff --git a/media-gfx/pencil/pencil-0.6.4-r1.ebuild
b/media-gfx/pencil/pencil-0.6.4-r1.ebuild
deleted file mode 100644
index e5623d01001..000
--- a/media-gfx/pencil/pencil-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/;
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/pencil-0.6.4-fixes-for-qt-5.15.0.patch )
-
-src_prepare() {
- default
- sed -e "/^QT/s/xmlpatterns //" \
- -i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- einstalldocs
-
- # install target not yet provided
- # emake INSTALL_ROOT="${D}" install
- newbin bin/pencil2d ${PN}
-
- newicon app/data/icons/icon.png ${PN}.png
- make_desktop_entry ${PN} pencil2d ${PN} Graphics
-
- insinto /usr/share/mime/packages/
- doins app/data/pencil2d.xml
-
- # TODO: Install l10n files
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/pencil/pencil-0.6.4.ebuild
b/media-gfx/pencil/pencil-0.6.4.ebuild
deleted file mode 100644
index 7a7001dd26d..000
--- a/media-gfx/pencil/pencil-0.6.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/;
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/pencil/, media-gfx/pencil/files/
commit: 52cd4be180d6752ead4e842aaa89356266a0c6a0
Author: Ben Kohler gentoo org>
AuthorDate: Mon Oct 12 12:38:08 2020 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Oct 12 12:38:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52cd4be1
media-gfx/pencil: add upstream patch to skip building tests
Closes: https://bugs.gentoo.org/747877
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Ben Kohler gentoo.org>
.../files/pencil-0.6.5-skip-building-tests.patch | 53 ++
media-gfx/pencil/pencil-0.6.5.ebuild | 3 +-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch
b/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch
new file mode 100644
index 000..dd7c80f2893
--- /dev/null
+++ b/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch
@@ -0,0 +1,53 @@
+From f949445894fa6da9eaa9f26f54bac5922011 Mon Sep 17 00:00:00 2001
+From: Matt Chang
+Date: Wed, 5 Aug 2020 15:06:29 +1000
+Subject: [PATCH] qmake CONFIG+=NO_TESTS to skip building tests
+
+---
+ pencil2d.pro | 24
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/pencil2d.pro b/pencil2d.pro
+index f9fbca5a2..e1bc4a179 100644
+--- a/pencil2d.pro
b/pencil2d.pro
+@@ -4,22 +4,23 @@
+
+ TEMPLATE = subdirs
+
+-SUBDIRS = \ # sub-project names
+-core_lib \
+-app \
+-tests
+-
+ # build the project sequentially as listed in SUBDIRS !
+ CONFIG += ordered
+
+-# where to find the sub projects - give the folders
++SUBDIRS += core_lib
+ core_lib.subdir = core_lib
+-app.subdir = app
+-tests.subdir= tests
+
+-# what subproject depends on others
+-app.depends = core_lib
+-tests.depends= core_lib
++SUBDIRS += app
++app.subdir = app
++app.depends = core_lib
++
++SUBDIRS += tests
++tests.subdir = tests
++tests.depends = core_lib
++
++NO_TESTS {
++ SUBDIRS -= tests
++}
+
+ TRANSLATIONS += translations/pencil.ts \
+ translations/pencil_ar.ts \
+@@ -48,4 +49,3 @@ TRANSLATIONS += translations/pencil.ts \
+ translations/pencil_zh_CN.ts \
+ translations/pencil_zh_TW.ts
+
+-macx: LIBS += -framework AppKit
diff --git a/media-gfx/pencil/pencil-0.6.5.ebuild
b/media-gfx/pencil/pencil-0.6.5.ebuild
index ecd137f12e3..e4872b8d9df 100644
--- a/media-gfx/pencil/pencil-0.6.5.ebuild
+++ b/media-gfx/pencil/pencil-0.6.5.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
"
S="${WORKDIR}/${P/_/-}"
+PATCHES="${FILESDIR}/${P}-skip-building-tests.patch"
src_prepare() {
default
@@ -38,7 +39,7 @@ src_prepare() {
}
src_configure() {
- eqmake5 PREFIX=/usr
+ eqmake5 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
}
src_install() {
