From 171d62a95e172ee34fec5a45d5067b52b28b0397 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 21 Feb 2020 21:21:29 +0100 Subject: [PATCH] dev-python/python-poppler: Remove last-rited pkg MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/706030 Signed-off-by: Michał Górny --- dev-python/python-poppler/Manifest | 1 - .../files/python-poppler-0.12.1-75_74.diff | 73 ------------------- .../files/python-poppler-0.12.1-79_78.diff | 52 ------------- ...er-0.12.1-poppler-0.18.0-minimal-fix.patch | 65 ----------------- ...oppler-0.12.1-poppler-0.39.0-changes.patch | 19 ----- ...poppler-0.12.1-poppler0.15.0-changes.patch | 66 ----------------- dev-python/python-poppler/metadata.xml | 11 --- .../python-poppler-0.12.1-r4.ebuild | 59 --------------- profiles/package.mask | 5 -- 9 files changed, 351 deletions(-) delete mode 100644 dev-python/python-poppler/Manifest delete mode 100644 dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff delete mode 100644 dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff delete mode 100644 dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch delete mode 100644 dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch delete mode 100644 dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch delete mode 100644 dev-python/python-poppler/metadata.xml delete mode 100644 dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild diff --git a/dev-python/python-poppler/Manifest b/dev-python/python-poppler/Manifest deleted file mode 100644 index 895f6812976a..000000000000 --- a/dev-python/python-poppler/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pypoppler-0.12.1.tar.gz 318142 BLAKE2B 4279ed148cb07269620f7faf117e8c03e3a6b781d727c726c97dc1f48f4332749b267e48aedbfc1935205954e2267228a490661b9c0adbcd299e18fc723101cb SHA512 04055411adc19f6af499a7cba0d6c5abb51e0802dd28962f833da3da1caf6ff274ff67d082f9c47548dac7a4ceb1bccf9860cda71fe48b8b7df74c0132498d20 diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff b/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff deleted file mode 100644 index 47b7a678e3df..000000000000 --- a/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff +++ /dev/null @@ -1,73 +0,0 @@ ---- poppler.defs -+++ poppler.defs -@@ -1642,6 +1642,7 @@ - (of-object "PopplerPage") - (c-name "poppler_page_render_to_pixbuf") - (return-type "none") -+ (unblock-threads #t) - (parameters - '("int" "src_x") - '("int" "src_y") -@@ -1657,6 +1658,7 @@ - (of-object "PopplerPage") - (c-name "poppler_page_render_to_pixbuf_for_printing") - (return-type "none") -+ (unblock-threads #t) - (parameters - '("int" "src_x") - '("int" "src_y") -@@ -1672,12 +1674,14 @@ - (of-object "PopplerPage") - (c-name "poppler_page_get_thumbnail_pixbuf") - (return-type "GdkPixbuf*") -+ (unblock-threads #t) - ) - - (define-method render_selection_to_pixbuf - (of-object "PopplerPage") - (c-name "poppler_page_render_selection_to_pixbuf") - (return-type "none") -+ (unblock-threads #t) - (parameters - '("gdouble" "scale") - '("int" "rotation") -@@ -1694,6 +1698,7 @@ - (of-object "PopplerPage") - (c-name "poppler_page_render") - (return-type "none") -+ (unblock-threads #t) - (parameters - '("cairo_t*" "cairo") - ) -@@ -1703,6 +1708,7 @@ - (of-object "PopplerPage") - (c-name "poppler_page_render_for_printing") - (return-type "none") -+ (unblock-threads #t) - (parameters - '("cairo_t*" "cairo") - ) -@@ -1712,12 +1718,14 @@ - (of-object "PopplerPage") - (c-name "poppler_page_get_thumbnail") - (return-type "cairo_surface_t*") -+ (unblock-threads #t) - ) - - (define-method render_selection - (of-object "PopplerPage") - (c-name "poppler_page_render_selection") - (return-type "none") -+ (unblock-threads #t) - (parameters - '("cairo_t*" "cairo") - '("PopplerRectangle*" "selection") -@@ -1779,6 +1787,7 @@ - (of-object "PopplerPage") - (c-name "poppler_page_render_to_ps") - (return-type "none") -+ (unblock-threads #t) - (parameters - '("PopplerPSFile*" "ps_file") - ) - diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff b/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff deleted file mode 100644 index 161ec588e178..000000000000 --- a/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff +++ /dev/null @@ -1,52 +0,0 @@ ---- poppler.override -+++ poppler.override -@@ -266,6 +266,12 @@ - import gobject.GObject as PyGObject_Type - import gtk.gdk.Pixbuf as PyGdkPixbuf_Type - %% -+ignore -+poppler_page_free_link_mapping -+poppler_page_free_image_mapping -+poppler_page_free_form_field_mapping -+poppler_page_free_annot_mapping -+%% - ignore-glob - *_get_type - _* -@@ -359,7 +365,7 @@ - - item_list = poppler_page_get_link_mapping(POPPLER_PAGE(self->obj)); - ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_LINK_MAPPING); -- g_list_free(item_list); -+ poppler_page_free_link_mapping(item_list); - return ret; - } - %% -@@ -372,7 +378,7 @@ - - item_list = poppler_page_get_image_mapping(POPPLER_PAGE(self->obj)); - ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_IMAGE_MAPPING); -- g_list_free(item_list); -+ poppler_page_free_image_mapping(item_list); - return ret; - } - %% -@@ -385,7 +391,7 @@ - - item_list = poppler_page_get_form_field_mapping(POPPLER_PAGE(self->obj)); - ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_FORM_FIELD_MAPPING); -- g_list_free(item_list); -+ poppler_page_free_form_field_mapping(item_list); - return ret; - } - %% -@@ -398,7 +404,7 @@ - - item_list = poppler_page_get_annot_mapping(POPPLER_PAGE(self->obj)); - ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_ANNOT_MAPPING); -- g_list_free(item_list); -+ poppler_page_free_annot_mapping(item_list); - return ret; - } - %% - diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch deleted file mode 100644 index 2099e0af11f8..000000000000 --- a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- pypoppler-0.12.1/poppler.defs 2011-10-24 11:57:35.000000000 +0200 -+++ pypoppler-0.12.1/poppler.defs 2011-10-24 12:01:28.000000000 +0200 -@@ -1646,62 +1646,6 @@ - (return-type "GType") - ) - --(define-method render_to_pixbuf -- (of-object "PopplerPage") -- (c-name "poppler_page_render_to_pixbuf") -- (return-type "none") -- (unblock-threads #t) -- (parameters -- '("int" "src_x") -- '("int" "src_y") -- '("int" "src_width") -- '("int" "src_height") -- '("double" "scale") -- '("int" "rotation") -- '("GdkPixbuf*" "pixbuf") -- ) --) -- --(define-method render_to_pixbuf_for_printing -- (of-object "PopplerPage") -- (c-name "poppler_page_render_to_pixbuf_for_printing") -- (return-type "none") -- (unblock-threads #t) -- (parameters -- '("int" "src_x") -- '("int" "src_y") -- '("int" "src_width") -- '("int" "src_height") -- '("double" "scale") -- '("int" "rotation") -- '("GdkPixbuf*" "pixbuf") -- ) --) -- --(define-method get_thumbnail_pixbuf -- (of-object "PopplerPage") -- (c-name "poppler_page_get_thumbnail_pixbuf") -- (return-type "GdkPixbuf*") -- (unblock-threads #t) --) -- --(define-method render_selection_to_pixbuf -- (of-object "PopplerPage") -- (c-name "poppler_page_render_selection_to_pixbuf") -- (return-type "none") -- (unblock-threads #t) -- (parameters -- '("gdouble" "scale") -- '("int" "rotation") -- '("GdkPixbuf*" "pixbuf") -- '("PopplerRectangle*" "selection") -- '("PopplerRectangle*" "old_selection") -- '("PopplerSelectionStyle" "style") -- '("GdkColor*" "glyph_color") -- '("GdkColor*" "background_color") -- ) --) -- - (define-method render - (of-object "PopplerPage") - (c-name "poppler_page_render") diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch deleted file mode 100644 index dd3ee52ad46d..000000000000 --- a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- poppler.defs 2009-09-27 16:07:59.000000000 +0700 -+++ poppler.defs 2015-12-22 16:36:14.000000000 +0600 -@@ -579,16 +579,4 @@ - ) - --(define-enum Orientation -- (in-module "Poppler") -- (c-name "PopplerOrientation") -- (gtype-id "POPPLER_TYPE_ORIENTATION") -- (values -- '("portrait" "POPPLER_ORIENTATION_PORTRAIT") -- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE") -- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN") -- '("seascape" "POPPLER_ORIENTATION_SEASCAPE") -- ) --) -- - (define-enum PageTransitionType - (in-module "Poppler") diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch deleted file mode 100644 index a480cfa437a8..000000000000 --- a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- poppler.defs -+++ poppler.defs -@@ -1760,6 +1760,12 @@ - (return-type "int") - ) - -+(define-method get_label -+ (of-object "PopplerPage") -+ (c-name "poppler_page_get_label") -+ (return-type "gchar*") -+) -+ - (define-method get_duration - (of-object "PopplerPage") - (c-name "poppler_page_get_duration") -@@ -1805,9 +1811,15 @@ - (of-object "PopplerPage") - (c-name "poppler_page_get_text") - (return-type "char*") -+) -+ -+(define-method get_selected_text -+ (of-object "PopplerPage") -+ (c-name "poppler_page_get_selected_text") -+ (return-type "char*") - (parameters - '("PopplerSelectionStyle" "style") -- '("PopplerRectangle*" "rect") -+ '("PopplerRectangle*" "selection") - ) - ) - -@@ -1895,6 +1907,16 @@ - ) - ) - -+(define-function poppler_page_add_annot -+ (of-object "PopplerPage") -+ (c-name "poppler_page_add_annot") -+ (return-type "none") -+ (parameters -+ '("PopplerAnnot*" "annot") -+ '("GList*" "list") -+ ) -+) -+ - (define-method get_crop_box - (of-object "PopplerPage") - (c-name "poppler_page_get_crop_box") -@@ -1904,6 +1926,16 @@ - ) - ) - -+(define-method get_text_layout -+ (of-object "PopplerPage") -+ (c-name "poppler_page_get_text_layout") -+ (return-type "gboolean") -+ (parameters -+ '("PopplerRectangle**" "rectangles") -+ '("guint*" "n_rectangles") -+ ) -+) -+ - (define-function poppler_rectangle_get_type - (c-name "poppler_rectangle_get_type") - (return-type "GType") diff --git a/dev-python/python-poppler/metadata.xml b/dev-python/python-poppler/metadata.xml deleted file mode 100644 index b062753424c8..000000000000 --- a/dev-python/python-poppler/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - python@gentoo.org - Python - - - poppler-python - - diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild deleted file mode 100644 index 1584fde7bbe8..000000000000 --- a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools-utils eutils ltprune python-r1 - -DESCRIPTION="Python bindings to the Poppler PDF library" -HOMEPAGE="https://launchpad.net/poppler-python" -SRC_URI="https://launchpad.net/poppler-python/trunk/development/+download/pypoppler-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="examples" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S=${WORKDIR}/pypoppler-${PV} - -RDEPEND="${PYTHON_DEPS} - >=app-text/poppler-0.15.0[cairo] - >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] - dev-python/pygobject:2[${PYTHON_USEDEP}] - dev-python/pygtk:2[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -# http://pkgs.fedoraproject.org/gitweb/?p=pypoppler.git;a=tree -PATCHES=( - "${FILESDIR}"/${P}-75_74.diff - "${FILESDIR}"/${P}-79_78.diff - "${FILESDIR}"/${P}-poppler0.15.0-changes.patch - "${FILESDIR}"/${P}-poppler-0.18.0-minimal-fix.patch - "${FILESDIR}"/${P}-poppler-0.39.0-changes.patch -) - -src_configure() { - python_foreach_impl autotools-utils_src_configure -} - -src_compile() { - python_foreach_impl autotools-utils_src_compile -} - -src_test() { - python_foreach_impl autotools-utils_src_test -} - -src_install() { - python_foreach_impl autotools-utils_src_install - prune_libtool_files --modules - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - insinto /usr/share/doc/${PF}/examples - doins demo/demo-poppler.py - fi -} diff --git a/profiles/package.mask b/profiles/package.mask index 04d0401b2682..ac84e78c48e2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -601,11 +601,6 @@ sci-physics/lightspeed # No revdeps, Removal in 30 days. sci-visualization/gfsview -# David Seifert (2020-01-21) -# No sign of py3 port, depends on EOL pygtk. No revdeps. -# Bug #706030. Removal in 30 days. -dev-python/python-poppler - # Michał Górny (2020-01-16) # The new version loses Python 2 support but does not introduce any real # changes. Let's mask it to reduce the noise, and hopefully try to get -- 2.26.2