diff options
author | 2020-09-02 01:21:58 -0400 | |
---|---|---|
committer | 2020-09-02 01:55:36 -0400 | |
commit | 120bd952507979ea2623b697032de11493e1c006 (patch) | |
tree | 352bd24354fe06fdc42ad9c54a23848ce5b57d7d /media-gfx | |
parent | app-arch/engrampa: Sync with ::gentoo (diff) | |
download | gentoo-mate-120bd952507979ea2623b697032de11493e1c006.tar.gz gentoo-mate-120bd952507979ea2623b697032de11493e1c006.tar.bz2 gentoo-mate-120bd952507979ea2623b697032de11493e1c006.zip |
media-gfx/eom: Sync with ::gentoo
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/eom/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/eom/eom-1.22.0.ebuild | 62 | ||||
-rw-r--r-- | media-gfx/eom/eom-1.22.1.ebuild | 62 | ||||
-rw-r--r-- | media-gfx/eom/eom-1.22.2.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/eom/eom-1.24.0-r2.ebuild (renamed from media-gfx/eom/eom-1.24.0.ebuild) | 6 | ||||
-rw-r--r-- | media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch | 29 |
6 files changed, 34 insertions, 129 deletions
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest index 6d59d34..8c61051 100644 --- a/media-gfx/eom/Manifest +++ b/media-gfx/eom/Manifest @@ -1,4 +1,2 @@ -DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0 -DIST eom-1.22.1.tar.xz 2142132 BLAKE2B c68f6d6ee4284de7dea3f3d9761f4b67a2edc0a169b3c3ac04ac6efd13e9f1044cf0be023e36891672b31ff73815d7ce765d8db656bbeb69f324e0ee412eb231 SHA512 f510de62b9b6f11d02df067128042d6905484e0509a939b7919405d0c1dd03fe4b6735dcd8ccf780d36c5713f4585b50b2727645a454da148307a74cf542be87 DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild deleted file mode 100644 index 9e84c4e..0000000 --- a/media-gfx/eom/eom-1.22.0.ebuild +++ /dev/null @@ -1,62 +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 +introspection jpeg lcms svg tiff xmp" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50: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.30:2[introspection?,jpeg?,tiff?] - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - >=x11-misc/shared-mime-info-0.20 - virtual/libintl - exif? ( - >=media-libs/libexif-0.6.14 - virtual/jpeg:0 - ) - 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 ) - !!media-gfx/mate-image-viewer" - -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - mate_src_configure \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_with X x) \ - $(use_with exif libexif) \ - $(use_with jpeg libjpeg) \ - $(use_with lcms cms) \ - $(use_with svg librsvg) \ - $(use_with xmp) -} diff --git a/media-gfx/eom/eom-1.22.1.ebuild b/media-gfx/eom/eom-1.22.1.ebuild deleted file mode 100644 index 9732879..0000000 --- a/media-gfx/eom/eom-1.22.1.ebuild +++ /dev/null @@ -1,62 +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 +introspection jpeg lcms svg tiff xmp" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50: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.30:2[introspection?,jpeg?,tiff?] - >=x11-libs/gtk+-3.22:3[introspection?] - x11-libs/libX11 - >=x11-misc/shared-mime-info-0.20 - virtual/libintl - exif? ( - >=media-libs/libexif-0.6.14 - virtual/jpeg:0 - ) - 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 ) - !!media-gfx/mate-image-viewer" - -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - mate_src_configure \ - $(use_enable debug) \ - $(use_enable introspection) \ - $(use_with X x) \ - $(use_with exif libexif) \ - $(use_with jpeg libjpeg) \ - $(use_with lcms cms) \ - $(use_with svg librsvg) \ - $(use_with xmp) -} diff --git a/media-gfx/eom/eom-1.22.2.ebuild b/media-gfx/eom/eom-1.22.2.ebuild index cd0a1d6..42ba95e 100644 --- a/media-gfx/eom/eom-1.22.2.ebuild +++ b/media-gfx/eom/eom-1.22.2.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="The MATE image viewer" diff --git a/media-gfx/eom/eom-1.24.0.ebuild b/media-gfx/eom/eom-1.24.0-r2.ebuild index c1052d3..0eaa262 100644 --- a/media-gfx/eom/eom-1.24.0.ebuild +++ b/media-gfx/eom/eom-1.24.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="The MATE image viewer" @@ -54,6 +54,8 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " +PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" ) + src_configure() { mate_src_configure \ --enable-thumbnailer \ @@ -63,7 +65,7 @@ src_configure() { $(use_with exif libexif) \ $(usex imagemagick \ --without-gdk-pixbuf-thumbnailer \ - --with-gdk-pixbuf-thumbnail \ + --with-gdk-pixbuf-thumbnailer \ ) \ $(use_with jpeg libjpeg) \ $(use_with lcms cms) \ 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 0000000..ced5dbc --- /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 <np.hardass@gmail.com> +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 <config.h> + #endif + ++#include <gdk/gdk.h> ++ + #include "eom-metadata-reader.h" + #include "eom-metadata-reader-jpg.h" + #include "eom-metadata-reader-png.h" +-- +2.26.2 + |