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

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

[Andreas Sturmlechner]

commit:     792ea26a97613a0a621da04a29258ed07b878153
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 21:41:23 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 21:45:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792ea26a

media-gfx/pencil: Drop old

Closes: https://bugs.gentoo.org/602042
Package-Manager: Portage-2.3.26, Repoman-2.3.7

 media-gfx/pencil/Manifest                          |  1 -
 .../pencil/files/pencil-0.4.4_beta-gcc461.patch    | 14 --------
 media-gfx/pencil/pencil-0.4.4_beta.ebuild          | 41 ----------------------
 3 files changed, 56 deletions(-)

diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index fe844490824..cc00bcda0f1 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,2 +1 @@
-DIST pencil-0.4.4b-src.zip 1147003 BLAKE2B 178f25c716b392505862ed4f56c5683428a7c36cf99d5e1c959be4e2c0fa1d4262ef50234d83c8a4591eaaa4ebaebaa62fcce8484ba4bf45a87ec74784401c25 SHA512 5ed5bad3d2a1ac993539c2c510bcc5a1df3e33f37187c069d21f3c784eb8a290c69cfccbba8645ebab58b0feafb3c229d882dcade72fca3110846c7b1629331b
 DIST pencil-0.6.1_rc1.tar.gz 2515450 BLAKE2B 7852368397f51cf8f6d51d8a16aafa148ab5f7d3286d593ae9f610322379a84e0b5473ccdb065b2c0d175fb5faf04b908cb129feafeff75f756858b8cf8f6e48 SHA512 242a226d5ef9cdb5c886ff5e452f0aab22689ad787bbb6ce649b5ad4939959dc5245d3fdf50402438b8f62598f59e166f739af4b37f6092e7a10e26b4e02febb

diff --git a/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch b/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
deleted file mode 100644
index d0aa8936b8f..00000000000
--- a/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/graphics/vector/beziercurve.cpp	2007-07-14 21:41:33.000000000 +0200
-+++ src/graphics/vector/beziercurve.cpp	2011-08-29 16:19:08.930675072 +0200
-@@ -700,9 +700,9 @@ 
- 	R1.setTopLeft(P1); R1.setBottomRight(Q1);
- 	R2.setTopLeft(P2); R2.setBottomRight(Q2);
- 	
--	//QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
-+	QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
- 	//QPointF* intersection = &intersectionPoint;
--	QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point
-+	QPointF* cubicIntersection = &intersectionPoint; // bogus point
- 	if( R1.intersects(R2) || L2.intersect(L1, cubicIntersection) == QLineF::BoundedIntersection ) {
- 	//if(L2.intersect(L1, intersection) == QLineF::BoundedIntersection) {
- 		//qDebug() << "                   FOUND rectangle intersection ";

diff --git a/media-gfx/pencil/pencil-0.4.4_beta.ebuild b/media-gfx/pencil/pencil-0.4.4_beta.ebuild
deleted file mode 100644
index 700f6494d1c..00000000000
--- a/media-gfx/pencil/pencil-0.4.4_beta.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils qt4-r2
-
-MY_P=${P/_beta/b}
-
-DESCRIPTION="A Qt4 based animation and drawing program"
-HOMEPAGE="http://www.pencil-animation.org/"
-SRC_URI="mirror://sourceforge/pencil-planner/${MY_P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	>=media-libs/ming-0.4.3"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}-source
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc461.patch
-	sed -i s:SWFSprite:SWFMovieClip:g src/external/flash/flash.{cpp,h} || die
-}
-
-src_install() {
-	# install target not yet provided
-	#emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	newbin Pencil ${PN} || die "dobin failed"
-
-	dodoc README TODO || die
-
-	mv "${S}"/icons/icon.png "${S}"/icons/${PN}.png
-	doicon "${S}"/icons/${PN}.png || die "doicon failed"
-	make_desktop_entry ${PN} Pencil ${PN} Graphics
-}

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

[Ben Kohler]

commit:     02b8b29f059386fe67063003b214032824b42722
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 23:15:19 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 23:19:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b8b29f

media-gfx/pencil: revbump for qt-5.15.0 fix

Closes: https://bugs.gentoo.org/726954
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../files/pencil-0.6.4-fixes-for-qt-5.15.0.patch   | 30 ++++++++++
 media-gfx/pencil/pencil-0.6.4-r1.ebuild            | 65 ++++++++++++++++++++++
 2 files changed, 95 insertions(+)

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
new file mode 100644
index 00000000000..cbbaf2b2065
--- /dev/null
+++ b/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
@@ -0,0 +1,30 @@
+--- 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 <QDebug>
+ #include <QtMath>
+ #include <QFile>
++#include <QPainterPath>
+ #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 <cmath>
+ #include <QList>
++#include <QPainterPath>
+ #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 <QPainterPath>
+ #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
new file mode 100644
index 00000000000..e5623d01001
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.4-r1.ebuild
@@ -0,0 +1,65 @@
+# 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
+}