From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-gfx/eom/Manifest | 3 +- media-gfx/eom/eom-1.24.0-r2.ebuild | 74 ++++++++++++++++++++++ media-gfx/eom/eom-1.24.0.ebuild | 72 --------------------- .../eom/files/eom-1.24.0-add-gdk-includes.patch | 29 +++++++++ 4 files changed, 105 insertions(+), 73 deletions(-) create mode 100644 media-gfx/eom/eom-1.24.0-r2.ebuild delete mode 100644 media-gfx/eom/eom-1.24.0.ebuild create mode 100644 media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch (limited to 'media-gfx/eom') diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest index d2dc07a4b110..8427f864890d 100644 --- a/media-gfx/eom/Manifest +++ b/media-gfx/eom/Manifest @@ -1,5 +1,6 @@ +AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2 DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab EBUILD eom-1.22.2.ebuild 1390 BLAKE2B f9feb1b56216987a705e5b39eecb886bd5cace7ef66b00540a66d06c65a4d9d93e4dc0b013db05b04826835c310ab2c71023757a74f14d7ef10f29763d025125 SHA512 e93fae7450900205833fcfc45b046d536fc119684f992503b99e08709d54a04b81074ff373c49ce00ef7645c7f81edf69a6f82c10f4f7d1cae120f85e9735f14 -EBUILD eom-1.24.0.ebuild 1605 BLAKE2B d3b052ef8c91f55a20a087b5c233b30891c6637e1c9000f3c0a168ed192370dc55f921b553186c3b03d1993dffdde145a9395593529e2b3e66ca3499ce4c79cc SHA512 00860a79f7a18c077306e72534d7f290a902e6c9ad60b96de8b990b0811c6e9dc21e00c87c41d62f31034250a623e593ef592115fcf5d83618cc7bee4b68a0f9 +EBUILD eom-1.24.0-r2.ebuild 1666 BLAKE2B 7c8b1982b350e085321620d4e155526336e3e05b0c662e4c1547e335883f2919e4192c5836ea5b0121dc8fb64e471c3b1c26493e8cc82526b16092e71029bd5e SHA512 a88659a60d9382a6d3db22ffdb7dcf633bece393ab7d56905ef11f071487933cef476ea6af36fd1d79ed61007520e6fce38837105708f791baec892144f6a2b9 MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854 diff --git a/media-gfx/eom/eom-1.24.0-r2.ebuild b/media-gfx/eom/eom-1.24.0-r2.ebuild new file mode 100644 index 000000000000..0eaa2620b201 --- /dev/null +++ b/media-gfx/eom/eom-1.24.0-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~arm ~arm64 x86" +fi + +DESCRIPTION="The MATE image viewer" +LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" +SLOT="0" + +IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp" + +COMMON_DEPEND=" + dev-libs/atk + >=dev-libs/glib-2.52:2 + >=dev-libs/libpeas-1.8.0[gtk] + >=dev-libs/libxml2-2:2 + gnome-base/dconf + >=mate-base/mate-desktop-1.17.0 + sys-libs/zlib + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] + >=x11-libs/gtk+-3.22:3[introspection?] + x11-libs/libX11 + >=x11-misc/shared-mime-info-0.20 + exif? ( + >=media-libs/libexif-0.6.14 + virtual/jpeg:0 + ) + imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + svg? ( >=gnome-base/librsvg-2.36.2:2 ) + xmp? ( >=media-libs/exempi-1.99.5:2 ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl + !!media-gfx/mate-image-viewer +" + +DEPEND="${COMMON_DEPEND} + app-text/yelp-tools + dev-util/glib-utils + dev-util/gtk-doc + dev-util/gtk-doc-am + >=sys-devel/gettext-0.19.8:* + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" ) + +src_configure() { + mate_src_configure \ + --enable-thumbnailer \ + $(use_enable debug) \ + $(use_enable introspection) \ + $(use_with X x) \ + $(use_with exif libexif) \ + $(usex imagemagick \ + --without-gdk-pixbuf-thumbnailer \ + --with-gdk-pixbuf-thumbnailer \ + ) \ + $(use_with jpeg libjpeg) \ + $(use_with lcms cms) \ + $(use_with svg librsvg) \ + $(use_with xmp) +} diff --git a/media-gfx/eom/eom-1.24.0.ebuild b/media-gfx/eom/eom-1.24.0.ebuild deleted file mode 100644 index c1052d39a53b..000000000000 --- a/media-gfx/eom/eom-1.24.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="The MATE image viewer" -LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" -SLOT="0" - -IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp" - -COMMON_DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.52:2 - >=dev-libs/libpeas-1.8.0[gtk] - >=dev-libs/libxml2-2:2 - gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 - sys-libs/zlib - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - >=x11-misc/shared-mime-info-0.20 - exif? ( - >=media-libs/libexif-0.6.14 - virtual/jpeg:0 - ) - imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - svg? ( >=gnome-base/librsvg-2.36.2:2 ) - xmp? ( >=media-libs/exempi-1.99.5:2 ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/libintl - !!media-gfx/mate-image-viewer -" - -DEPEND="${COMMON_DEPEND} - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=sys-devel/gettext-0.19.8:* - virtual/pkgconfig -" - -src_configure() { - mate_src_configure \ - --enable-thumbnailer \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_with X x) \ - $(use_with exif libexif) \ - $(usex imagemagick \ - --without-gdk-pixbuf-thumbnailer \ - --with-gdk-pixbuf-thumbnail \ - ) \ - $(use_with jpeg libjpeg) \ - $(use_with lcms cms) \ - $(use_with svg librsvg) \ - $(use_with xmp) -} diff --git a/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch b/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch new file mode 100644 index 000000000000..ced5dbcdd9fa --- /dev/null +++ b/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch @@ -0,0 +1,29 @@ +From 3b76a9f57ea65a7ebd22395eb5d3fda9cc929e8c Mon Sep 17 00:00:00 2001 +From: NP-Hardass +Date: Tue, 4 Aug 2020 19:35:28 -0400 +Subject: [PATCH] eom-metadata-reader: add gdk/gdk.h include to resolve #258 + +be4fa2808c4e1a36c2c9b58c1267a54cdda6e495, enable wayland support + +added "defined(GDK_WINDOWING_x11)" macros without the accompanying gdk +headers +--- + src/eom-metadata-reader.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/eom-metadata-reader.c b/src/eom-metadata-reader.c +index cd796f0..2c93a14 100644 +--- a/src/eom-metadata-reader.c ++++ b/src/eom-metadata-reader.c +@@ -23,6 +23,8 @@ + #include + #endif + ++#include ++ + #include "eom-metadata-reader.h" + #include "eom-metadata-reader-jpg.h" + #include "eom-metadata-reader-png.h" +-- +2.26.2 + -- cgit v1.2.3