commit: 0cbe5bfb23b084887b0e26dad973ad6e21753be3 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Sep 25 08:55:27 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Sep 25 10:19:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbe5bfb
media-libs/libmypaint: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-libs/libmypaint/Manifest | 1 - ...t-generation-script-to-be-runnable-in-Py3.patch | 31 ------- ...int-1.4.0-drop-libmypaint-gegl-versioning.patch | 58 ------------- ...0-drop-python2-requirement-recommendation.patch | 34 -------- .../files/libmypaint-1.4.0-gegl-0.4.14.patch | 99 ---------------------- media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild | 71 ---------------- 6 files changed, 294 deletions(-) diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest index 76c272aae52..871a6dabf05 100644 --- a/media-libs/libmypaint/Manifest +++ b/media-libs/libmypaint/Manifest @@ -1,2 +1 @@ -DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608 diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch deleted file mode 100644 index 8f4b713b3af..00000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 748e735e7fffd2524bb3552fd79b2a2c13f60711 Mon Sep 17 00:00:00 2001 -From: Jesper Lloyd <[email protected]> -Date: Wed, 11 Dec 2019 18:02:35 +0100 -Subject: [PATCH] Adjust generation script to be runnable in Py3 - ---- - generate.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/generate.py b/generate.py -index 6ab3dd0e..1e0b4ee9 100644 ---- a/generate.py -+++ b/generate.py -@@ -26,6 +26,7 @@ - import json - from collections import namedtuple - -+PY3 = sys.version_info >= (3,) - - _SETTINGS = [] # brushsettings.settings - _SETTING_ORDER = [ -@@ -82,7 +83,8 @@ def validate(self): - - def _init_globals_from_json(filename): - """Populate global variables above from the canonical JSON definition.""" -- with open(filename, "rb") as fp: -+ flag = "r" if PY3 else "rb" -+ with open(filename, flag) as fp: - defs = json.load(fp) - for input_def in defs["inputs"]: - input = _BrushInput(**input_def) diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch deleted file mode 100644 index d41079c4b31..00000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1b41e786dc0772528b873b6f5bcee64147bfec04 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Thu, 17 Oct 2019 14:44:34 +0200 -Subject: [PATCH] Revert "Not all of libmypaint-gegl was versionned." - -This reverts commit 5e0290c5fb8a175a9f0dd4c6897ff234361c321f. - -See https://github.com/mypaint/libmypaint/issues/144 ---- - gegl/Makefile.am | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gegl/Makefile.am b/gegl/Makefile.am -index 79f66fa..b45707d 100644 ---- a/gegl/Makefile.am -+++ b/gegl/Makefile.am -@@ -37,10 +37,10 @@ introspection_sources = \ - ../glib/mypaint-gegl-glib.c \ - mypaint-gegl-surface.c - --MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@[email protected]: libmypaint-gegl-@[email protected] Makefile -+MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@[email protected]: libmypaint-gegl.la Makefile - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I.. --MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl-@[email protected] ../libmypaint-@[email protected] -+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources) - INTROSPECTION_GIRS += MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@[email protected] - -@@ -56,10 +56,10 @@ endif # HAVE_INTROSPECTION - - ## pkg-config file ## - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = libmypaint-gegl-@[email protected] -+pkgconfig_DATA = libmypaint-gegl.pc - - ## libmypaint-gegl ## --lib_LTLIBRARIES = libmypaint-gegl-@[email protected] -+lib_LTLIBRARIES = libmypaint-gegl.la - - libmypaint_gegl_publicdir = $(includedir)/libmypaint-gegl - -@@ -70,9 +70,9 @@ LIBMYPAINT_GEGL_SOURCES = \ - ../glib/mypaint-gegl-glib.c \ - mypaint-gegl-surface.c - --libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES) -+libmypaint_gegl_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES) - --libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS) --libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_LIBADD = $(top_builddir)/libmypaint-@[email protected] $(GEGL_LIBS) -+libmypaint_gegl_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS) -+libmypaint_gegl_la_LIBADD = $(top_builddir)/libmypaint.la $(GEGL_LIBS) - - endif # enable_gegl --- -2.23.0 - diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch deleted file mode 100644 index 1413868094d..00000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 68e2c33add0aec09f1898aa80ef4f822bed67b87 Mon Sep 17 00:00:00 2001 -From: Jesper Lloyd <[email protected]> -Date: Tue, 17 Dec 2019 17:36:22 +0100 -Subject: [PATCH] Drop python2 requirement/recommendation - ---- - README.md | 2 +- - autogen.sh | 2 +- - generate.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/README.md b/README.md -index 96c748da..fae90566 100644 ---- a/README.md -+++ b/README.md -@@ -35,7 +35,7 @@ to get started with a standard configuration: - - When building from git: - -- $ sudo apt install -y python2.7 autotools-dev intltool gettext libtool -+ $ sudo apt install -y python autotools-dev intltool gettext libtool - - ### Install dependencies (Red Hat and derivatives) - -diff --git a/generate.py b/generate.py -index b613f91d..cd7e99e8 100644 ---- a/generate.py -+++ b/generate.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python - # libmypaint - The MyPaint Brush Library - # Copyright (C) 2007-2012 Martin Renold <[email protected]> - # Copyright (C) 2012-2016 by the MyPaint Development Team. diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch deleted file mode 100644 index 6855d80e545..00000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 9e091ea6f3d818748898a9c7a3d6660f5c807027 Mon Sep 17 00:00:00 2001 -From: rezso <[email protected]> -Date: Thu, 17 Oct 2019 14:32:46 +0200 -Subject: [PATCH] Require gegl >=0.4.14 rather than 0.3.x - ---- - configure.ac | 4 ++-- - gegl/Makefile.am | 4 ++-- - gegl/libmypaint-gegl.pc.in | 2 +- - gegl/mypaint-gegl-surface.c | 8 ++++++++ - 4 files changed, 13 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a17c0a0..22c2e3e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full], - [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])]) - - # Dependencies. --m4_define([gegl_required_version], [0.3]) -+m4_define([gegl_required_version], [0.4.14]) - m4_define([introspection_required_version], [1.32.0]) - - AC_INIT([libmypaint], -@@ -249,7 +249,7 @@ AC_ARG_ENABLE(gegl, - ) - - if eval "test x$enable_gegl = xyes"; then -- PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) -+ PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version) - fi - AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes") - -diff --git a/gegl/Makefile.am b/gegl/Makefile.am -index b45707d..5ef22c1 100644 ---- a/gegl/Makefile.am -+++ b/gegl/Makefile.am -@@ -11,7 +11,7 @@ AM_CPPFLAGS = \ - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = \ - --warn-all \ -- --pkg="gegl-0.3" \ -+ --pkg="gegl-0.4" \ - --pkg="glib-2.0" \ - --namespace="MyPaintGegl" \ - --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \ -@@ -38,7 +38,7 @@ introspection_sources = \ - mypaint-gegl-surface.c - - MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@[email protected]: libmypaint-gegl.la Makefile --MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3 -+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I.. - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources) -diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in -index 75aa729..9184980 100644 ---- a/gegl/libmypaint-gegl.pc.in -+++ b/gegl/libmypaint-gegl.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libmypaint - Description: MyPaint brush engine library, with GEGL integration. - Version: @LIBMYPAINT_VERSION@ --Requires: gegl-0.3 libmypaint -+Requires: gegl-0.4 libmypaint - Cflags: -I${includedir}/libmypaint-gegl - Libs: -L${libdir} -lmypaint-gegl -diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c -index 5c86d3c..d58ccc9 100644 ---- a/gegl/mypaint-gegl-surface.c -+++ b/gegl/mypaint-gegl-surface.c -@@ -78,7 +78,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque - - if (buffer_is_native(self)) { - GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format, -+#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14 -+ read_write_flags, GEGL_ABYSS_NONE, 8); -+#else - read_write_flags, GEGL_ABYSS_NONE); -+#endif - - // Read out - gboolean completed = gegl_buffer_iterator_next(iterator); -@@ -88,7 +92,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque - g_critical("Unable to get tile aligned access to GeglBuffer"); - request->buffer = NULL; - } else { -+#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14 -+ request->buffer = (uint16_t *)(iterator->items[0].data); -+#else - request->buffer = (uint16_t *)(iterator->data[0]); -+#endif - } - - // So we can finish the iterator in tile_request_end() --- -2.23.0 - diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild deleted file mode 100644 index 47f1fccbd44..00000000000 --- a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools python-any-r1 xdg-utils toolchain-funcs - -MY_PV=${PV/_beta/-beta.} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Library for making brushstrokes" -HOMEPAGE="https://github.com/mypaint/libmypaint"; -SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"; - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" # https://github.com/mypaint/libmypaint/wiki/Versioning -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86" -IUSE="gegl introspection nls openmp" - -CDEPEND=" - dev-libs/glib:2 - dev-libs/json-c:= - gegl? ( - media-libs/babl - >=media-libs/gegl-0.4.14:0.4[introspection?] - ) - introspection? ( >=dev-libs/gobject-introspection-1.32 ) - openmp? ( >sys-devel/gcc-5:*[openmp] ) - nls? ( sys-devel/gettext ) - " -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - nls? ( dev-util/intltool ) - " -RDEPEND="${CDEPEND} - !<media-gfx/mypaint-1.2.1 - " - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.0-drop-libmypaint-gegl-versioning.patch - "${FILESDIR}"/${PN}-1.4.0-gegl-0.4.14.patch - "${FILESDIR}"/${PN}-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch - "${FILESDIR}"/${PN}-1.4.0-drop-python2-requirement-recommendation.patch -) - -src_prepare() { - xdg_environment_reset - default - eautoreconf -} - -src_configure() { - tc-ld-disable-gold # bug 589266 - econf \ - --disable-debug \ - --disable-docs \ - $(use_enable gegl) \ - --disable-gperftools \ - $(use_enable nls i18n) \ - $(use_enable introspection) \ - $(use_enable openmp) \ - --disable-profiling -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -}
