* [gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/, media-gfx/eom/files/
@ 2016-02-09 2:49 NP Hardass
0 siblings, 0 replies; 5+ messages in thread
From: NP Hardass @ 2016-02-09 2:49 UTC (permalink / raw
To: gentoo-commits
commit: 084246f45e2be61c62267bfad7f382ea0b9b46ec
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 01:32:30 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 02:46:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084246f4
media-gfx/eom: Import 1.10.x from Project:MATE repo
Package-Manager: portage-2.2.26
media-gfx/eom/Manifest | 1 +
media-gfx/eom/eom-1.10.5-r1.ebuild | 84 ++++++++++
.../eom/files/eom-1.10-fix-introspection.patch | 169 +++++++++++++++++++++
3 files changed, 254 insertions(+)
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 143b9e0..dbd0f2b 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,2 +1,3 @@
+DIST eom-1.10.5.tar.xz 2207424 SHA256 19b484dba1c2adf1450153815e4edb05ba7ab7bdf4eb8b4f2071766e48e72d14 SHA512 f58f2c4c1d211afe66c2a112b75ee6b325590294da51df3a56d1dca0fb813cea1abd9e9dc7a4a3f26c111f1c11aba20e8177e36913f04bae664f4ddad6f98c0c WHIRLPOOL 1ce95839628e51060f2c77e8a701046754817870f998a6388aa620e12470b2e690e11edd5e7770303da33103f0077a3726eba01bd537a2cc3729bbd29dbc92d0
DIST eom-1.8.0.tar.xz 2190980 SHA256 ec8450bf2ebef13c2e376b1674f0f7402f87669a71eb9e2e4d1161a2784aaf9e SHA512 cc9d82ec164043653eae2f73a0b7896c0d09b2eb466a5c919b0e1df732dd18fff58fa978d01a9bbb2bb7b8427c11328affb3f4e6aeb18a77a18585f39a1f3f5a WHIRLPOOL 26c091d74a8a052a4ce1e0295e41d75bb14ed1d93024367f63214139624d61b74fdd74fc66ee02a472f7d7494cbcfa9aac4e1762f1057432f7afd5db1cf0e515
DIST eom-1.8.1.tar.xz 2192220 SHA256 d8c97de2aab548dce910cdfd98a11b671c943e9b195d38b043e482e2323ac6d8 SHA512 e054286eebdc88390dd8855d6b43704d4bc5d0b7d69f0dc73108d26e75882ee13bfaec01a30dbc42cee14e10ca42eeb9a6f576fe8435055ba289fe2292f97837 WHIRLPOOL 10856132756b1ea7ab9be23547d94968fcce3183528cb0d656c9cd307108fe8623a70a7ee53c85db6ef74a333691ffcf1210f8c9885db4a31b63713d8924c0d9
diff --git a/media-gfx/eom/eom-1.10.5-r1.ebuild b/media-gfx/eom/eom-1.10.5-r1.ebuild
new file mode 100644
index 0000000..731c3b3
--- /dev/null
+++ b/media-gfx/eom/eom-1.10.5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 autotools python-single-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE image viewer"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X dbus exif +introspection jpeg lcms python svg tiff xmp"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/atk:0
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/libxml2-2:2
+ gnome-base/dconf:0
+ >=mate-base/mate-desktop-1.10:0
+ sys-libs/zlib:0
+ x11-libs/cairo:0
+ >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-2.18:2[introspection?]
+ x11-libs/libX11:0
+ >=x11-misc/shared-mime-info-0.20:0
+ >=x11-themes/mate-icon-theme-1.10:0
+ virtual/libintl:0
+ dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+ exif? (
+ >=media-libs/libexif-0.6.14:0
+ virtual/jpeg:0 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}] )
+ 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:0
+ >=dev-util/intltool-0.40:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/eom-1.10-fix-introspection.patch"
+ eautoreconf
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ $(use_enable python) \
+ $(use_with jpeg libjpeg) \
+ $(use_with exif libexif) \
+ $(use_with dbus) \
+ $(use_with lcms cms) \
+ $(use_with xmp) \
+ $(use_with svg librsvg) \
+ $(use_with X x) \
+ --without-cms
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
diff --git a/media-gfx/eom/files/eom-1.10-fix-introspection.patch b/media-gfx/eom/files/eom-1.10-fix-introspection.patch
new file mode 100644
index 0000000..71e20ea
--- /dev/null
+++ b/media-gfx/eom/files/eom-1.10-fix-introspection.patch
@@ -0,0 +1,169 @@
+From 3d34cc10a5e62686f661a6653d43e2c42e6a26a2 Mon Sep 17 00:00:00 2001
+From: Sorokin Alexei <sor.alexei@meowr.ru>
+Date: Sat, 12 Dec 2015 16:49:22 +0300
+Subject: [PATCH] Fix compilation with enabled GObject Introspection
+
+---
+ configure.ac | 2 ++
+ src/main.c | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b829d0..b3d398f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,6 +142,8 @@ else
+ have_introspection=no
+ fi
+
++AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$have_introspection" = xyes)
++
+ # ***************
+ # ZLIB (required)
+ # ***************
+diff --git a/src/main.c b/src/main.c
+index cc999e2..f1b92f7 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -30,7 +30,7 @@
+ #include <dbus/dbus-glib-bindings.h>
+ #include <gdk/gdkx.h>
+ #endif
+-#ifdef HAVE_INSTROSPECTION
++#ifdef HAVE_INTROSPECTION
+ #include <girepository.h>
+ #endif
+
+From d6f68de8ed0722fdfecca9f81d68f2a0ff9b82bd Mon Sep 17 00:00:00 2001
+From: Wolfgang Ulbrich <chat-to-me@raveit.de>
+Date: Sun, 6 Dec 2015 23:58:24 +0100
+Subject: [PATCH] fix some gobject-introspection build warnings
+
+---
+ src/uta.c | 30 ++++++++++++++----------------
+ 1 file changed, 14 insertions(+), 16 deletions(-)
+
+diff --git a/src/uta.c b/src/uta.c
+index 8df97bc..c44834d 100644
+--- a/src/uta.c
++++ b/src/uta.c
+@@ -38,9 +38,7 @@
+ be variables. They can also be pstruct->el lvalues. */
+ #define eom_expand(p, type, max) do { if(max) { p = eom_renew (p, type, max <<= 1); } else { max = 1; p = g_new(type, 1); } } while (0)
+
+-\f
+-
+-/**
++/*
+ * eom_uta_new: Allocate a new uta.
+ * @x0: Left coordinate of uta.
+ * @y0: Top coordinate of uta.
+@@ -51,7 +49,7 @@
+ * tiles, not pixels.
+ *
+ * Returns: the newly allocated #EomUta.
+- **/
++ */
+ static EomUta *
+ eom_uta_new (int x0, int y0, int x1, int y1)
+ {
+@@ -68,13 +66,13 @@ eom_uta_new (int x0, int y0, int x1, int y1)
+ return uta;
+ }
+
+-/**
++/*
+ * eom_uta_free: Free a uta.
+ * @uta: The uta to free.
+ *
+ * Frees the microtile array structure, including the actual microtile
+ * data.
+- **/
++ */
+ void
+ eom_uta_free (EomUta *uta)
+ {
+@@ -82,14 +80,14 @@ eom_uta_free (EomUta *uta)
+ g_free (uta);
+ }
+
+-/**
++/*
+ * eom_irect_intersect: Find intersection of two integer rectangles.
+ * @dest: Where the result is stored.
+ * @src1: A source rectangle.
+ * @src2: Another source rectangle.
+ *
+ * Finds the intersection of @src1 and @src2.
+- **/
++ */
+ void
+ eom_irect_intersect (EomIRect *dest, const EomIRect *src1, const EomIRect *src2) {
+ dest->x0 = MAX (src1->x0, src2->x0);
+@@ -98,18 +96,18 @@ eom_irect_intersect (EomIRect *dest, const EomIRect *src1, const EomIRect *src2)
+ dest->y1 = MIN (src1->y1, src2->y1);
+ }
+
+-/**
++/*
+ * eom_irect_empty: Determine whether integer rectangle is empty.
+ * @src: The source rectangle.
+ *
+ * Return value: TRUE if @src is an empty rectangle, FALSE otherwise.
+- **/
++ */
+ int
+ eom_irect_empty (const EomIRect *src) {
+ return (src->x1 <= src->x0 || src->y1 <= src->y0);
+ }
+
+-/**
++/*
+ * eom_uta_from_irect: Generate uta covering a rectangle.
+ * @bbox: The source rectangle.
+ *
+@@ -117,7 +115,7 @@ eom_irect_empty (const EomIRect *src) {
+ * function with a @bbox with zero height or width.
+ *
+ * Return value: the new uta.
+- **/
++ */
+ static EomUta *
+ eom_uta_from_irect (EomIRect *bbox)
+ {
+@@ -217,7 +215,7 @@ eom_uta_from_irect (EomIRect *bbox)
+ * big enough to fit the specified microtile coordinates, or a new array if
+ * it needed to be grown. In the second case, the original @uta will be
+ * freed automatically.
+- **/
++ */
+ EomUta *
+ uta_ensure_size (EomUta *uta, int x1, int y1, int x2, int y2)
+ {
+@@ -284,7 +282,7 @@ uta_ensure_size (EomUta *uta, int x1, int y1, int x2, int y2)
+ * Return value: The original @uta, or a new microtile array if the original one
+ * needed to be grown to fit the specified rectangle. In the second case, the
+ * original @uta will be freed automatically.
+- **/
++ */
+ EomUta *
+ uta_add_rect (EomUta *uta, int x1, int y1, int x2, int y2)
+ {
+@@ -552,7 +550,7 @@ uta_add_rect (EomUta *uta, int x1, int y1, int x2, int y2)
+ * Removes a rectangular region from the specified microtile array. Due to the
+ * way microtile arrays represent regions, the tiles at the edge of the
+ * rectangle may not be clipped exactly.
+- **/
++ */
+ void
+ uta_remove_rect (EomUta *uta, int x1, int y1, int x2, int y2)
+ {
+@@ -1047,7 +1045,7 @@ copy_tile (EomUta *uta, int x, int y, int xofs, int yofs)
+ * expanded if the destination area does not fit within it; rather only the area
+ * that fits will be copied. The source rectangle must be completely contained
+ * within the microtile array.
+- **/
++ */
+ void
+ uta_copy_area (EomUta *uta, int src_x, int src_y, int dest_x, int dest_y, int width, int height)
+ {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/, media-gfx/eom/files/
@ 2016-05-10 22:32 NP Hardass
0 siblings, 0 replies; 5+ messages in thread
From: NP Hardass @ 2016-05-10 22:32 UTC (permalink / raw
To: gentoo-commits
commit: 78f56defd00d1056babb584f8fec806b1c60c329
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 22:31:51 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue May 10 22:32:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f56def
media-gfx/eom: Revbump to 1.10.5-r2, resolves #574376
Package-Manager: portage-2.2.26
.../{eom-1.10.5-r1.ebuild => eom-1.10.5-r2.ebuild} | 1 +
media-gfx/eom/files/eom-cve-2013-7447.patch | 28 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/media-gfx/eom/eom-1.10.5-r1.ebuild b/media-gfx/eom/eom-1.10.5-r2.ebuild
similarity index 97%
rename from media-gfx/eom/eom-1.10.5-r1.ebuild
rename to media-gfx/eom/eom-1.10.5-r2.ebuild
index 731c3b3..67144a8 100644
--- a/media-gfx/eom/eom-1.10.5-r1.ebuild
+++ b/media-gfx/eom/eom-1.10.5-r2.ebuild
@@ -64,6 +64,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/eom-1.10-fix-introspection.patch"
+ epatch "${FILESDIR}/eom-cve-2013-7447.patch"
eautoreconf
}
diff --git a/media-gfx/eom/files/eom-cve-2013-7447.patch b/media-gfx/eom/files/eom-cve-2013-7447.patch
new file mode 100644
index 0000000..410b433
--- /dev/null
+++ b/media-gfx/eom/files/eom-cve-2013-7447.patch
@@ -0,0 +1,28 @@
+From b7849cc5b6e7fd741ef04e334f586266a444ef8a Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Wed, 10 Feb 2016 14:52:54 +0300
+Subject: [PATCH] avoid integer overflow when allocating a large block of
+ memory
+
+it's the same issue as in gdk_cairo_set_source_pixbuf since the code
+is apparently copied from there.
+
+fix is taken from
+https://git.gnome.org/browse/gtk+/commit?id=894b1ae76a32720f4bb3d39cf460402e3ce331d6
+---
+ src/eom-print-preview.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/eom-print-preview.c b/src/eom-print-preview.c
+index f9f005f..7dc2a8a 100644
+--- a/src/eom-print-preview.c
++++ b/src/eom-print-preview.c
+@@ -732,7 +732,7 @@ create_surface_from_pixbuf (GdkPixbuf *pixbuf)
+ format = CAIRO_FORMAT_ARGB32;
+
+ cairo_stride = cairo_format_stride_for_width (format, width);
+- cairo_pixels = g_malloc (height * cairo_stride);
++ cairo_pixels = g_malloc_n (height, cairo_stride);
+ surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
+ format,
+ width, height, cairo_stride);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/, media-gfx/eom/files/
@ 2018-10-06 20:25 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2018-10-06 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 2b04f39e5b01cb58ac4506b3ccc25e65e5820875
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 6 20:09:56 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct 6 20:22:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b04f39e
media-gfx/eom: remove old
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
media-gfx/eom/Manifest | 3 -
media-gfx/eom/eom-1.12.2-r3.ebuild | 83 ---------------------------
media-gfx/eom/eom-1.14.2.ebuild | 83 ---------------------------
media-gfx/eom/eom-1.16.1.ebuild | 83 ---------------------------
media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch | 33 -----------
media-gfx/eom/metadata.xml | 3 -
6 files changed, 288 deletions(-)
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index f93abab2a46..eb794c9c54b 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,4 +1 @@
-DIST eom-1.12.2.tar.xz 2213260 BLAKE2B f05264c5b0a5185d1bda8a27e140910e8a1bcf23104a20ff9af78052b9b0a513da50e797ac90da7973dab7d868d10f72098c3ac13f22d369b4c2561a981def69 SHA512 03283cb1cae817c7c21219913fe2f3ab64e0fa6662a63193d4fa012bd0b5c286cbd25131a5bd5e52c1d9304b4b10ae8c37d38a88ea985215c5b277303d7b8cc4
-DIST eom-1.14.2.tar.xz 2254180 BLAKE2B 4ee974fa38fb10ae6984bf32bdbe428e6eefd6b9871fb7bc93df809659d3faaff76ef8afe9c0581bb8f34da64a2b58fdbf4a12d520524fde6c94e6387d3e4e06 SHA512 87d7c5e62249d598474324f24bac1f5f3388bb11517fc54531792fc0291ef42199f3339e492dfc1a1caafed575cf3b21e36ea91f15d0a03b8e912a3d16e5f3b7
-DIST eom-1.16.1.tar.xz 2215676 BLAKE2B 78ac0049c36008ae56fe4d59b908728b49925a1e678ad6b61dcc4dcf450633bc56279bc04d9f64c2631f9a78c957a0f51ab385cdb770b48d3c5dad6ab38f2e01 SHA512 6154f8423eb825fea3cba975e15ac46bd9c46c139966c02365c1fe5d0a0144c4a4bffc80801eddd41506ae0ef86909ca8acb1591f39260aedb6cbb0db9335b4f
DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239 SHA512 64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
diff --git a/media-gfx/eom/eom-1.12.2-r3.ebuild b/media-gfx/eom/eom-1.12.2-r3.ebuild
deleted file mode 100644
index fb8419a9fd3..00000000000
--- a/media-gfx/eom/eom-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )
- "
-
-RDEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.9.1[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
- gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- )
- 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:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${P}-gtk3-svg.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_with X x) \
- $(use_with dbus) \
- $(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.14.2.ebuild b/media-gfx/eom/eom-1.14.2.ebuild
deleted file mode 100644
index 293481bdcc7..00000000000
--- a/media-gfx/eom/eom-1.14.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )
- "
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.9.1[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
- gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_with X x) \
- $(use_with dbus) \
- $(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.16.1.ebuild b/media-gfx/eom/eom-1.16.1.ebuild
deleted file mode 100644
index 1bf8859a097..00000000000
--- a/media-gfx/eom/eom-1.16.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )
- "
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.9.1[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
- gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_with X x) \
- $(use_with dbus) \
- $(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/files/eom-1.12.2-gtk3-svg.patch b/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
deleted file mode 100644
index ccff8ae923a..00000000000
--- a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 038530ed2e9b844f75e2af24e44e0421ad1ccdc8 Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Wed, 24 Feb 2016 16:47:08 +0300
-Subject: [PATCH] fix svg rendering that's broken with GTK+3
-
-from
-https://git.gnome.org/browse/eog/commit/?id=a33950c14d7b8da8e1c6289709022affb910be2a
----
- src/eom-scroll-view.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
-index 6385f29..6d1b290 100644
---- a/src/eom-scroll-view.c
-+++ b/src/eom-scroll-view.c
-@@ -1306,7 +1306,7 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
-
- #ifdef HAVE_RSVG
- if (eom_image_is_svg (view->priv->image)) {
-- cairo_matrix_t matrix, translate, scale;
-+ cairo_matrix_t matrix, translate, scale, original;
- EomTransform *transform = eom_image_get_transform (priv->image);
- cairo_matrix_init_identity (&matrix);
- if (transform) {
-@@ -1343,6 +1343,8 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
- cairo_matrix_init_translate (&translate, xofs, yofs);
- cairo_matrix_multiply (&matrix, &matrix, &translate);
-
-+ cairo_get_matrix (cr, &original);
-+ cairo_matrix_multiply (&matrix, &matrix, &original);
- cairo_set_matrix (cr, &matrix);
-
- rsvg_handle_render_cairo (eom_image_get_svg (priv->image), cr);
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
index 90e9ee97331..10a0fa99248 100644
--- a/media-gfx/eom/metadata.xml
+++ b/media-gfx/eom/metadata.xml
@@ -5,9 +5,6 @@
<email>mate@gentoo.org</email>
<name>Gentoo MATE Desktop</name>
</maintainer>
- <use>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
- </use>
<upstream>
<remote-id type="github">mate-desktop/eom</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/, media-gfx/eom/files/
@ 2020-08-07 3:18 Adam Feldman
0 siblings, 0 replies; 5+ messages in thread
From: Adam Feldman @ 2020-08-07 3:18 UTC (permalink / raw
To: gentoo-commits
commit: 2799b82a00ebdd4c0439de5075c4276fd679b29a
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 6 16:01:51 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 03:17:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2799b82a
media-gfx/eom: Fix compilation with USE="-exif lcms"
Closes: https://bugs.gentoo.org/722888
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
.../{eom-1.24.0.ebuild => eom-1.24.0-r1.ebuild} | 2 ++
.../eom/files/eom-1.24.0-add-gdk-includes.patch | 29 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/media-gfx/eom/eom-1.24.0.ebuild b/media-gfx/eom/eom-1.24.0-r1.ebuild
similarity index 96%
rename from media-gfx/eom/eom-1.24.0.ebuild
rename to media-gfx/eom/eom-1.24.0-r1.ebuild
index c1052d39a53..b5693d8c3b2 100644
--- a/media-gfx/eom/eom-1.24.0.ebuild
+++ b/media-gfx/eom/eom-1.24.0-r1.ebuild
@@ -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 \
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 00000000000..ced5dbcdd9f
--- /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
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/, media-gfx/eom/files/
@ 2024-01-16 3:19 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-01-16 3:19 UTC (permalink / raw
To: gentoo-commits
commit: 6da5517c4dfabbad40a15a3672cb041eea71a3f5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 03:17:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:17:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da5517c
media-gfx/eom: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/917514
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/eom/eom-1.26.1-r1.ebuild | 6 +++-
media-gfx/eom/eom-1.27.1.ebuild | 6 +++-
media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch | 38 +++++++++++++++++++++++
3 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/media-gfx/eom/eom-1.26.1-r1.ebuild b/media-gfx/eom/eom-1.26.1-r1.ebuild
index 688d923acc4f..935da0066c79 100644
--- a/media-gfx/eom/eom-1.26.1-r1.ebuild
+++ b/media-gfx/eom/eom-1.26.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -53,6 +53,10 @@ BDEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.26.1-libxml2-2.12.patch
+)
+
src_configure() {
mate_src_configure \
--enable-thumbnailer \
diff --git a/media-gfx/eom/eom-1.27.1.ebuild b/media-gfx/eom/eom-1.27.1.ebuild
index 3241e8b9bcec..7f1136a3b71c 100644
--- a/media-gfx/eom/eom-1.27.1.ebuild
+++ b/media-gfx/eom/eom-1.27.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -56,6 +56,10 @@ BDEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.26.1-libxml2-2.12.patch
+)
+
src_configure() {
mate_src_configure \
--enable-thumbnailer \
diff --git a/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch b/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch
new file mode 100644
index 000000000000..7bf2c65154ca
--- /dev/null
+++ b/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/917514
+https://github.com/mate-desktop/eom/commit/ace46747000807d975b58101353302f34c75ef49
+https://github.com/mate-desktop/eom/commit/d00fc0b68e9419ccdefbf2831ad2537bed8f35f4
+
+From ace46747000807d975b58101353302f34c75ef49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tomasz=20K=C5=82oczko?=
+ <31284574+kloczek@users.noreply.github.com>
+Date: Sat, 25 Nov 2023 20:25:29 +0000
+Subject: [PATCH] fix building with new libxml 2.12.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Added include <libxml/xmlsave.h> to allow build with libxml 2.12.0.
+
+Signed-off-by: Tomasz Kłoczko <kloczek@github.com>
+
+* fix building with libxml 2.12.0
+
+Co-authored-by: Colomban Wendling <hypra@ban.netlib.re>
+
+---------
+
+Signed-off-by: Tomasz Kłoczko <kloczek@github.com>
+Co-authored-by: raveit65 <mate@raveit.de>
+Co-authored-by: Colomban Wendling <hypra@ban.netlib.re>
+--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c
++++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
+@@ -27,6 +27,8 @@
+
+ #include <unistd.h>
+ #include <string.h>
++#include <libxml/globals.h>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include <gdk/gdk.h>
+
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-16 3:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-16 3:19 [gentoo-commits] repo/gentoo:master commit in: media-gfx/eom/, media-gfx/eom/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-08-07 3:18 Adam Feldman
2018-10-06 20:25 Mart Raudsepp
2016-05-10 22:32 NP Hardass
2016-02-09 2:49 NP Hardass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox