* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
@ 2017-02-07 23:42 Mike Gilbert
0 siblings, 0 replies; 7+ messages in thread
From: Mike Gilbert @ 2017-02-07 23:42 UTC (permalink / raw
To: gentoo-commits
commit: 19135773fd630905ca754cc186471579c797307c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 23:41:02 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 23:42:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19135773
media-libs/gexiv2: backport fix for typelibdir
Bug: https://bugs.gentoo.org/603002
Package-Manager: Portage-2.3.3_p49, Repoman-2.3.1_p42
media-libs/gexiv2/files/0.10.4-typelibdir.patch | 26 ++++++++++++++++++++++
...exiv2-0.10.4.ebuild => gexiv2-0.10.4-r1.ebuild} | 9 ++++++--
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/media-libs/gexiv2/files/0.10.4-typelibdir.patch b/media-libs/gexiv2/files/0.10.4-typelibdir.patch
new file mode 100644
index 00000000..7988bd4
--- /dev/null
+++ b/media-libs/gexiv2/files/0.10.4-typelibdir.patch
@@ -0,0 +1,26 @@
+From 7c47e3907c4888190138c3301232e198206217fb Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Wed, 17 Aug 2016 13:11:18 +0200
+Subject: Fix typelib install directory
+
+Signed-off-by: Jens Georg <mail@jensge.org>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7b5862f..bfc46d2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ pkgconfigdir = $(libdir)/pkgconfig
+ GEXIV2_publicdir = $(includedir)/gexiv2
+ girdir = $(datadir)/gir-1.0
+-typelibdir = $(datadir)/gir-1.0
++typelibdir = $(libdir)/girepository-1.0
+ py2gidir = $(PYTHON2_GIDIR)
+ py3gidir = $(PYTHON3_GIDIR)
+ vapidir = $(datadir)/vala/vapi
+--
+cgit v0.12
+
diff --git a/media-libs/gexiv2/gexiv2-0.10.4.ebuild b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
similarity index 85%
rename from media-libs/gexiv2/gexiv2-0.10.4.ebuild
rename to media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
index e538816..c8e2edf 100644
--- a/media-libs/gexiv2/gexiv2-0.10.4.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
+inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
MY_PV=$(get_version_component_range 1-2)
@@ -28,10 +28,15 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/0.10.4-typelibdir.patch
+)
+
src_prepare() {
xdg_environment_reset
tc-export CXX
default
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
@ 2017-03-29 22:44 Sebastian Pipping
0 siblings, 0 replies; 7+ messages in thread
From: Sebastian Pipping @ 2017-03-29 22:44 UTC (permalink / raw
To: gentoo-commits
commit: f485f2efa7e7c461da643f59b98295d1f02b916f
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 22:43:28 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 22:44:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f485f2ef
media-libs/gexiv2: Fix compilation (bug #613778)
Thanks to Markus Moll for the patch!
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../gexiv2/files/gexiv2-0.10.5-stdexcept.patch | 11 ++++
media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild | 60 ++++++++++++++++++++++
2 files changed, 71 insertions(+)
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch b/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch
new file mode 100644
index 00000000000..dc9c5825b90
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch
@@ -0,0 +1,11 @@
+diff -Naur gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp
+--- gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp 2017-03-19 18:00:55.000000000 +0100
++++ gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp 2017-03-26 09:45:44.638692802 +0200
+@@ -12,6 +12,7 @@
+ #include "gexiv2-metadata-private.h"
+ #include <string>
+ #include <cmath>
++#include <stdexcept>
+ #include <stdio.h>
+ #include <glib-object.h>
+ #include <exiv2/exif.hpp>
diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
new file mode 100644
index 00000000000..8ba9a36dfba
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="introspection python static-libs test"
+
+REQUIRED_USE="
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ test? ( python )
+"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.26.1:2
+ >=media-gfx/exiv2-0.21:0=
+ introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.10.5-stdexcept.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+ tc-export CXX
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable introspection) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIB="$(get_libdir)" install
+ dodoc AUTHORS NEWS README THANKS
+
+ if use python ; then
+ python_moduleinto gi/overrides/
+ python_foreach_impl python_domodule GExiv2.py
+ fi
+
+ use static-libs || prune_libtool_files --modules
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
@ 2017-05-18 14:33 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2017-05-18 14:33 UTC (permalink / raw
To: gentoo-commits
commit: f8e19a6f7c5bde90e08a343446576ad169ea67a6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 14:33:32 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 18 14:33:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e19a6f
media-libs/gexiv2: Removed old.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-libs/gexiv2/Manifest | 1 -
media-libs/gexiv2/files/0.10.4-typelibdir.patch | 26 -----------
media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild | 57 -------------------------
media-libs/gexiv2/gexiv2-0.10.5.ebuild | 56 ------------------------
4 files changed, 140 deletions(-)
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index fb9e8928e38..292acf22c5c 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,4 +1,3 @@
DIST gexiv2-0.10.3.tar.xz 244816 SHA256 390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988 SHA512 a258a95e3e9dddc6636430d8a2bc222b6605e5d0d122ea1b951f97568cecd04b2d3cbc522625918faf3b5a3e670b01db81a45c2c5c5d65e6eb4b4f4a2ac69e8f WHIRLPOOL e50401f642a2252cad664716004038fdd364e9a42b93c7b9748e0f93b652cad31432f7f58571dd0ff67c8dcb1deca590eaaf42ad287d8d27110d0626a352154b
-DIST gexiv2-0.10.4.tar.xz 267800 SHA256 ad8d31afdc0a1932cc44c4cfcea449497c0d0b445c0ad2f9735707b306e71ca4 SHA512 90f864f47ff6c1580579c3497580b398bb8d4ab9b56488017ae92d778a931bceddb8eb6fdc6dc7451d6205187c734b87e2bf395b86cddfb9022f6423b3390d8f WHIRLPOOL 3f78ddf56e2b9eb96e903051a4f36ac030181686767eb3dc89dd22296855d92c0a799fb174d7b82ec89e083afcb24cc3904ee0db9dbd66436a5f12b8242fb897
DIST gexiv2-0.10.5.tar.xz 591752 SHA256 318fe068cd414c0af91759a87c29fd577cd5d42bf7a6f50caff27535c02ac7f3 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06 WHIRLPOOL 8177d284941d72346e87b8b463cd84e86aafe84d63fc9f4b01e5c9c3e7bd01999c7eace5b4179918033a2cc72cd2d14b07104413f59fda86bbb3a5bdc1839e4b
DIST gexiv2-0.10.6.tar.xz 629872 SHA256 132788919667254b42c026ab39ab3c3a5be59be8575c05fa4b371ca8aed55825 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca WHIRLPOOL 94a618f1eedf51cae6ea9cbb9754fa6bcc7fe6d100928711f588446e6d179d358e687858ac3681aab845e79021f20a13c6baf1f356874f35bcc1e782b90b6f4b
diff --git a/media-libs/gexiv2/files/0.10.4-typelibdir.patch b/media-libs/gexiv2/files/0.10.4-typelibdir.patch
deleted file mode 100644
index 7988bd4002a..00000000000
--- a/media-libs/gexiv2/files/0.10.4-typelibdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c47e3907c4888190138c3301232e198206217fb Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Wed, 17 Aug 2016 13:11:18 +0200
-Subject: Fix typelib install directory
-
-Signed-off-by: Jens Georg <mail@jensge.org>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7b5862f..bfc46d2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- pkgconfigdir = $(libdir)/pkgconfig
- GEXIV2_publicdir = $(includedir)/gexiv2
- girdir = $(datadir)/gir-1.0
--typelibdir = $(datadir)/gir-1.0
-+typelibdir = $(libdir)/girepository-1.0
- py2gidir = $(PYTHON2_GIDIR)
- py3gidir = $(PYTHON3_GIDIR)
- vapidir = $(datadir)/vala/vapi
---
-cgit v0.12
-
diff --git a/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
deleted file mode 100644
index 2f6d5662199..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="introspection python static-libs"
-
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.26.1:2
- >=media-gfx/exiv2-0.21:0=
- introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/0.10.4-typelibdir.patch
-)
-
-src_prepare() {
- xdg_environment_reset
- tc-export CXX
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable introspection) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" LIB="$(get_libdir)" install
- dodoc AUTHORS NEWS README THANKS
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-
- use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.5.ebuild b/media-libs/gexiv2/gexiv2-0.10.5.ebuild
deleted file mode 100644
index 73d79469fb5..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="introspection python static-libs test"
-
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python )
-"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.26.1:2
- >=media-gfx/exiv2-0.21:0=
- introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- xdg_environment_reset
- tc-export CXX
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable introspection) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" LIB="$(get_libdir)" install
- dodoc AUTHORS NEWS README THANKS
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-
- use static-libs || prune_libtool_files --modules
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
@ 2017-11-06 22:41 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-11-06 22:41 UTC (permalink / raw
To: gentoo-commits
commit: 302c4780e18256bf4a5e33f58665a7d6081f940a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 6 22:40:48 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 22:41:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302c4780
media-libs/gexiv2: Fix build w/ >=media-gfx/exiv2-0.26
Closes: https://bugs.gentoo.org/636700
Package-Manager: Portage-2.3.13, Repoman-2.3.4
.../gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch | 53 ++++++++++++++++++++++
media-libs/gexiv2/gexiv2-0.10.3.ebuild | 1 +
media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild | 1 +
3 files changed, 55 insertions(+)
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
new file mode 100644
index 00000000000..c3fd932e2a2
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
@@ -0,0 +1,53 @@
+From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Fri, 12 May 2017 19:50:58 +0200
+Subject: iostream: Adapt to new Exiv2 API in 0.26
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782449
+---
+ gexiv2/gexiv2-stream-io.cpp | 4 ++--
+ gexiv2/gexiv2-stream-io.h | 8 +++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
+index 0ae3324..abfb843 100644
+--- a/gexiv2/gexiv2-stream-io.cpp
++++ b/gexiv2/gexiv2-stream-io.cpp
+@@ -142,7 +142,7 @@ long StreamIo::tell () const {
+ return cb->Position (cb->handle);
+ }
+
+-long StreamIo::size () const {
++StreamIo::size_type StreamIo::size () const {
+ return cb->Length (cb->handle);
+ }
+
+diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
+index 76621a9..a26f4e6 100644
+--- a/gexiv2/gexiv2-stream-io.h
++++ b/gexiv2/gexiv2-stream-io.h
+@@ -25,6 +25,12 @@ public:
+
+ StreamIo (ManagedStreamCallbacks* cb);
+
++#if EXIV2_TEST_VERSION(0,26,0)
++ typedef size_t size_type;
++#else
++ typedef long size_type;
++#endif
++
+ virtual ~StreamIo ();
+ virtual int open ();
+ virtual int close ();
+@@ -39,7 +45,7 @@ public:
+ virtual Exiv2::byte* mmap (bool isWriteable = false);
+ virtual int munmap ();
+ virtual long tell () const;
+- virtual long size () const;
++ virtual size_type size () const;
+ virtual bool isopen () const;
+ virtual int error () const;
+ virtual bool eof () const;
+--
+cgit v0.12
+
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
index 6941e825179..4efc11740ce 100644
--- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
src_prepare() {
xdg_environment_reset
tc-export CXX
+ epatch "${FILESDIR}/${P}-exiv-0.26.patch"
}
src_configure() {
diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
index 8ba9a36dfba..888a67d1ee9 100644
--- a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.10.5-stdexcept.patch
+ "${FILESDIR}"/${PN}-0.10.3-exiv-0.26.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
@ 2018-06-26 19:04 Pacho Ramos
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos @ 2018-06-26 19:04 UTC (permalink / raw
To: gentoo-commits
commit: aa850d00e39b33eb6a46ef0ccc44a6ba5f0eebed
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 18:57:32 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 19:04:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa850d00
media-libs/gexiv2: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/gexiv2/Manifest | 3 --
.../gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch | 53 -------------------
.../gexiv2/files/gexiv2-0.10.5-stdexcept.patch | 11 ----
media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild | 53 -------------------
media-libs/gexiv2/gexiv2-0.10.3.ebuild | 52 ------------------
media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild | 61 ----------------------
media-libs/gexiv2/gexiv2-0.10.6.ebuild | 57 --------------------
7 files changed, 290 deletions(-)
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 18d52e04814..826c429aa40 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,4 +1 @@
-DIST gexiv2-0.10.3.tar.xz 244816 BLAKE2B 79177a679c0d10c90a266c023930e27318f2e784e599b8f84a7356534045695e4ca44890b87eb0da4c16673e6e58c3ad77c80e404df2e76662f5a9250fc58e85 SHA512 a258a95e3e9dddc6636430d8a2bc222b6605e5d0d122ea1b951f97568cecd04b2d3cbc522625918faf3b5a3e670b01db81a45c2c5c5d65e6eb4b4f4a2ac69e8f
-DIST gexiv2-0.10.5.tar.xz 591752 BLAKE2B 2fe5beaec7a6c2c9c55e8669c1cd8077cb5636f9b188b1ae64212582a23b514ece68108dbd3d4369417af6901579a28b69beb1a44013b51a3517f7fcf4f3e409 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06
-DIST gexiv2-0.10.6.tar.xz 629872 BLAKE2B 9a0f0b98eb1f19d4642cd0fb692b8ec539d3aa98f5c47f04317466877c404955d86c7fb4b2399fee30191555340fbc7701e19132d707f57d123cb16771507570 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca
DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
deleted file mode 100644
index c3fd932e2a2..00000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Fri, 12 May 2017 19:50:58 +0200
-Subject: iostream: Adapt to new Exiv2 API in 0.26
-
-https://bugzilla.gnome.org/show_bug.cgi?id=782449
----
- gexiv2/gexiv2-stream-io.cpp | 4 ++--
- gexiv2/gexiv2-stream-io.h | 8 +++++++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
-index 0ae3324..abfb843 100644
---- a/gexiv2/gexiv2-stream-io.cpp
-+++ b/gexiv2/gexiv2-stream-io.cpp
-@@ -142,7 +142,7 @@ long StreamIo::tell () const {
- return cb->Position (cb->handle);
- }
-
--long StreamIo::size () const {
-+StreamIo::size_type StreamIo::size () const {
- return cb->Length (cb->handle);
- }
-
-diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
-index 76621a9..a26f4e6 100644
---- a/gexiv2/gexiv2-stream-io.h
-+++ b/gexiv2/gexiv2-stream-io.h
-@@ -25,6 +25,12 @@ public:
-
- StreamIo (ManagedStreamCallbacks* cb);
-
-+#if EXIV2_TEST_VERSION(0,26,0)
-+ typedef size_t size_type;
-+#else
-+ typedef long size_type;
-+#endif
-+
- virtual ~StreamIo ();
- virtual int open ();
- virtual int close ();
-@@ -39,7 +45,7 @@ public:
- virtual Exiv2::byte* mmap (bool isWriteable = false);
- virtual int munmap ();
- virtual long tell () const;
-- virtual long size () const;
-+ virtual size_type size () const;
- virtual bool isopen () const;
- virtual int error () const;
- virtual bool eof () const;
---
-cgit v0.12
-
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch b/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch
deleted file mode 100644
index dc9c5825b90..00000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp
---- gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp 2017-03-19 18:00:55.000000000 +0100
-+++ gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp 2017-03-26 09:45:44.638692802 +0200
-@@ -12,6 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <cmath>
-+#include <stdexcept>
- #include <stdio.h>
- #include <glib-object.h>
- #include <exiv2/exif.hpp>
diff --git a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
deleted file mode 100644
index 59f6c592a3c..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="introspection python static-libs"
-
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.26.1:2
- >=media-gfx/exiv2-0.21:0=
- introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
- dev-libs/gobject-introspection-common
- virtual/pkgconfig"
-
-src_prepare() {
- xdg_environment_reset
- tc-export CXX
- epatch "${FILESDIR}/${P}-exiv-0.26.patch"
-}
-
-src_configure() {
- econf \
- $(use_enable introspection) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" LIB="$(get_libdir)" install
- dodoc AUTHORS NEWS README THANKS
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-
- use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
deleted file mode 100644
index 5c8ce7cbeaf..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="introspection python static-libs"
-
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.26.1:2
- >=media-gfx/exiv2-0.21:0=
- introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- xdg_environment_reset
- tc-export CXX
- epatch "${FILESDIR}/${P}-exiv-0.26.patch"
-}
-
-src_configure() {
- econf \
- $(use_enable introspection) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" LIB="$(get_libdir)" install
- dodoc AUTHORS NEWS README THANKS
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-
- use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
deleted file mode 100644
index 72e3559bf0f..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="introspection python static-libs test"
-
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python )
-"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.26.1:2
- >=media-gfx/exiv2-0.21:0=
- introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.10.5-stdexcept.patch
- "${FILESDIR}"/${PN}-0.10.3-exiv-0.26.patch
-)
-
-src_prepare() {
- xdg_environment_reset
- tc-export CXX
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable introspection) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" LIB="$(get_libdir)" install
- dodoc AUTHORS NEWS README THANKS
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-
- use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.6.ebuild b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
deleted file mode 100644
index e1130127c85..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="introspection python static-libs test"
-
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python )
-"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.26.1:2
- >=media-gfx/exiv2-0.21:0=
- introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
- dev-libs/gobject-introspection-common
- virtual/pkgconfig"
-
-src_prepare() {
- xdg_environment_reset
- tc-export CXX
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable introspection) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" LIB="$(get_libdir)" install
- dodoc AUTHORS NEWS README THANKS
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-
- use static-libs || prune_libtool_files --modules
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
@ 2022-03-27 18:58 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2022-03-27 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 21bf129424d68a2315450390c633a6f9ff938bb8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 18:22:30 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 18:28:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bf1294
media-libs/gexiv2: Version bump to 0.14.0
Closes: https://bugs.gentoo.org/811810
Closes: https://bugs.gentoo.org/835781
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/gexiv2/Manifest | 1 +
.../files/0.14.0-clean-up-python-support.patch | 175 +++++++++++++++++++++
media-libs/gexiv2/gexiv2-0.14.0.ebuild | 82 ++++++++++
3 files changed, 258 insertions(+)
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 96ab6312326a..2e89005c9c5a 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,2 +1,3 @@
DIST gexiv2-0.12.2.tar.xz 378428 BLAKE2B bb3fd6310cdb76f3e88bb31e018d78013bb626559b9e95bf59688601388cff10739c20c431fa9539c1d24c9045d2b3590a0f783a994d3b8966c4df12e9127f4e SHA512 850bf41f6180b0fdd050ab08da6e3bbd8d25ffc25a1f48e17a1d7a65771893cc79fba9cbd6718bf1754251ac4a4754983f0ab8f006a05f8c4a15085846d001a5
DIST gexiv2-0.13.0.tar.xz 387188 BLAKE2B 25550fd0b711e1363da1f6144af482709b52b0334e326a211919fcc97ccaef1832978a31d8d7ec111caf3f3b9b4db3537d818d35199da2e0b6250098c6d99d01 SHA512 dcd94a8e8ab7e3764bf652514222c3cce4537bf2658905405a25d1dd18878e67343060f5b1cf9fd8b11acf4dd2b727a9d49a0d8f379838c60c92de69f0bed2c5
+DIST gexiv2-0.14.0.tar.xz 387288 BLAKE2B bdbb4547486a248cd9c6559276ebac20d3af5211474b86eb6ebfb3a8c76670ff7c2d162435e0cbcb270f96c64f5bc1eedc2d63c021b65f57e1ad9ec8cf9a4bf8 SHA512 d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50
diff --git a/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch b/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
new file mode 100644
index 000000000000..0e2fbaa33fe8
--- /dev/null
+++ b/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
@@ -0,0 +1,175 @@
+https://gitlab.gnome.org/GNOME/gexiv2/-/merge_requests/64
+
+From 7e36a7dfeadfff134beabf502ca4d551f505fd8e Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Fri, 24 Sep 2021 11:48:34 -0400
+Subject: [PATCH] clean up python support
+
+- fix always failing gexiv2 test due to missing import gi
+- actually use override during testing
+- fix totally ignoring gexiv2 test status
+- fix broken build with -Dpython3=false
+- remove unnecessary configure_file
+- remove misleading explanation of -Dpython3=false (it also disables
+ installing GExiv2.py)
+- remove unnecessary python3_girdir
+---
+ meson.build | 21 +++++--------------
+ meson_options.txt | 1 -
+ test/meson.build | 13 +++---------
+ test/python/{gexiv2.py.in => gexiv2.py} | 3 ++-
+ test/python/meson.build | 10 ---------
+ .../{test_metadata.py.in => test_metadata.py} | 4 ++--
+ test/python3-test.in | 4 ----
+ 7 files changed, 12 insertions(+), 44 deletions(-)
+ rename test/python/{gexiv2.py.in => gexiv2.py} (94%)
+ rename test/python/{test_metadata.py.in => test_metadata.py} (99%)
+ delete mode 100755 test/python3-test.in
+
+diff --git a/meson.build b/meson.build
+index 42f70cb..3f9426f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,6 @@ gio = dependency('gio-2.0', version : '>= 2.46.0')
+ cc = meson.get_compiler('c')
+ cpp = meson.get_compiler('cpp')
+ math = cc.find_library('m', required : false)
+-python3 = import('python').find_installation('python3', modules: 'gi', required: get_option('python3'))
+
+ bmff_test = '''#include <exiv2/exiv2.hpp>
+ #ifndef EXV_ENABLE_BMFF
+@@ -48,24 +47,14 @@ if get_option('gtk_doc')
+ subdir('docs')
+ endif
+
+-if get_option('python3') == false
+- warning('\'python3\' is disabled, any Python tests will not be run.')
+-else
++if get_option('python3')
+ if get_option('introspection') == false
+ error('Build option \'python3\' requires \'introspection\' to be enabled.')
+ endif
+-
+- girdir = get_option('python3_girdir')
+- if girdir == 'auto'
+- python3_output = run_command(python3, ['-c', 'import gi; print(gi._overridesdir)'])
+- if python3_output.returncode() != 0
+- error('Finding the Python 3 gi/override path: ' + python3_output.stderr())
+- endif
+- girdir = python3_output.stdout().strip()
+- endif
+-
+- message('Installing \'GExiv2.py\' into \'' + girdir + '\'')
+- python3.install_sources('GExiv2.py', subdir : girdir)
++ python3 = import('python').find_installation('python3', modules: 'gi')
++ python3.install_sources('GExiv2.py', subdir: 'gi/overrides')
++else
++ python3 = disabler()
+ endif
+
+ subdir('test')
+diff --git a/meson_options.txt b/meson_options.txt
+index 5e76789..edb3cfd 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,5 +2,4 @@ option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable
+ option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
+ option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
+ option('tools', type: 'boolean', value: true, description: 'Enable or disable building the commandline tools')
+-option('python3_girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto)')
+ option('python3', type: 'boolean', value : true, description : 'Enable or disable using Python 3 (and PyGObject module)')
+diff --git a/test/meson.build b/test/meson.build
+index c4f287d..0ae50ed 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -1,12 +1,11 @@
+ test_sample_path = join_paths(meson.current_source_dir(), 'data')
+-python_module_path = join_paths(meson.current_build_dir(), 'python')
+
+ test_env = environment()
+ test_env.set('G_SLICE', 'always-malloc')
+ test_env.set('TEST_DATA_DIR', test_sample_path)
+ test_env.prepend('GI_TYPELIB_PATH', typelib_path)
+ test_env.prepend('LD_LIBRARY_PATH', typelib_path)
+-test_env.prepend('PYTHONPATH', python_module_path)
++test_env.prepend('PYTHONPATH', join_paths(meson.current_source_dir(), 'python'))
+
+ regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
+ dependencies : [gobject, gio, math],
+@@ -19,11 +18,5 @@ regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
+
+ test('regression', regression_test, env : test_env)
+
+-subdir('python')
+-
+-python3_test_conf = configuration_data()
+-python3_test_conf.set('PYTHON3_PATH', python3.path())
+-python3_test = configure_file(input: 'python3-test.in',
+- output : 'python3-test',
+- configuration: python3_test_conf)
+-test('python3', find_program(python3_test), env : test_env)
++test('python3-gexiv2', python3, args: ['-m', 'unittest', 'gexiv2'], env: test_env)
++test('python3-metadata', python3, args: ['-m', 'unittest', 'test_metadata'], env: test_env)
+diff --git a/test/python/gexiv2.py.in b/test/python/gexiv2.py
+similarity index 94%
+rename from test/python/gexiv2.py.in
+rename to test/python/gexiv2.py
+index 4e01ff5..503815c 100644
+--- a/test/python/gexiv2.py.in
++++ b/test/python/gexiv2.py
+@@ -22,7 +22,8 @@
+ import unittest
+ import os
+
+-gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
++import gi.overrides
++gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+ from gi.repository import GExiv2
+
+
+diff --git a/test/python/meson.build b/test/python/meson.build
+index 783ba0b..e69de29 100644
+--- a/test/python/meson.build
++++ b/test/python/meson.build
+@@ -1,10 +0,0 @@
+-python_conf = configuration_data()
+-python_conf.set('PROJECT_API_VERSION', project_api_version)
+-
+-gexiv2_py_file = configure_file(input: 'gexiv2.py.in',
+- output : 'gexiv2.py',
+- configuration: python_conf)
+-
+-test_metadata_py_file = configure_file(input: 'test_metadata.py.in',
+- output : 'test_metadata.py',
+- configuration: python_conf)
+diff --git a/test/python/test_metadata.py.in b/test/python/test_metadata.py
+similarity index 99%
+rename from test/python/test_metadata.py.in
+rename to test/python/test_metadata.py
+index 45d9d45..8d4296c 100644
+--- a/test/python/test_metadata.py.in
++++ b/test/python/test_metadata.py
+@@ -30,8 +30,8 @@ import tempfile
+
+ PY3K = sys.version_info[0] == 3
+
+-import gi
+-gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
++import gi.overrides
++gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+ from gi.repository import GExiv2, GLib
+ from fractions import Fraction
+
+diff --git a/test/python3-test.in b/test/python3-test.in
+deleted file mode 100755
+index 6fb3bf8..0000000
+--- a/test/python3-test.in
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#!/bin/sh
+-
+-'@PYTHON3_PATH@' -m unittest gexiv2
+-'@PYTHON3_PATH@' -m unittest test_metadata
+--
+2.34.1
+
diff --git a/media-libs/gexiv2/gexiv2-0.14.0.ebuild b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
new file mode 100644
index 000000000000..2de5eadc27cc
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-r1 vala
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test +vala"
+REQUIRED_USE="
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ test? ( python introspection )
+ vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=media-gfx/exiv2-0.26:=
+ >=dev-libs/glib-2.46.0:2
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.3
+ )
+ test? ( media-gfx/exiv2[xmp] )
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-clean-up-python-support.patch
+)
+
+src_prepare() {
+ default
+ use vala && vala_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ $(meson_use vala vapi)
+ -Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
+ # Prevents installation of python modules (uses install_data from meson
+ # which does not optimize the modules)
+ -Dpython3=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if use python ; then
+ python_moduleinto gi/overrides/
+ python_foreach_impl python_domodule GExiv2.py
+ python_foreach_impl python_optimize
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
@ 2023-06-24 5:28 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-06-24 5:28 UTC (permalink / raw
To: gentoo-commits
commit: e6517eb54f88c2cb030ecd59d430670970a465a9
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Jun 24 05:26:08 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 05:28:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6517eb5
media-libs/gexiv2: Fix no template named 'auto_ptr' w/ llvm profile
[sam: gexiv2-0.14.1 switches to C++17 but exiv-0.27* doesn't support it yet,
and exiv-0.28* is masked. Do a workaround for now.]
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31587
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/0.14.1-revert-default-cpp_stdto17.patch | 18 ++++++++++++++++++
media-libs/gexiv2/gexiv2-0.14.1.ebuild | 7 ++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/media-libs/gexiv2/files/0.14.1-revert-default-cpp_stdto17.patch b/media-libs/gexiv2/files/0.14.1-revert-default-cpp_stdto17.patch
new file mode 100644
index 000000000000..9697e4455ba0
--- /dev/null
+++ b/media-libs/gexiv2/files/0.14.1-revert-default-cpp_stdto17.patch
@@ -0,0 +1,18 @@
+With clang 16 and libcxx this is causig build error such as:
+/usr/include/exiv2/value.hpp:54:17: error: no template named 'auto_ptr' in namespace 'std'; did you mean simply 'auto_ptr'?
+ typedef std::auto_ptr<Value> AutoPtr;
+Reverting upstream commit https://gitlab.gnome.org/GNOME/gexiv2/-/commit/2eb5c2c9ac1d36bee7089117e1f4825162a9409d
+helps solve them for now.
+
+There is on going work for exiv2-0.28
+--- a/meson.build
++++ b/meson.build
+@@ -5,7 +5,7 @@ project(
+ license: 'GPL-2.0-or-later',
+ meson_version : '>=0.51',
+ default_options : [
+- 'cpp_std=c++17'
++ 'cpp_std=c++11'
+ ]
+ )
+
diff --git a/media-libs/gexiv2/gexiv2-0.14.1.ebuild b/media-libs/gexiv2/gexiv2-0.14.1.ebuild
index 86688f8cdbd0..b9f339964fc9 100644
--- a/media-libs/gexiv2/gexiv2-0.14.1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.14.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit gnome.org meson python-r1 vala
@@ -47,6 +47,11 @@ BDEPEND="
virtual/pkgconfig
vala? ( $(vala_depend) )
"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-revert-default-cpp_stdto17.patch"
+)
+
src_prepare() {
default
use vala && vala_setup
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-06-24 5:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-06 22:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-06-24 5:28 Sam James
2022-03-27 18:58 Matt Turner
2018-06-26 19:04 Pacho Ramos
2017-05-18 14:33 Lars Wendler
2017-03-29 22:44 Sebastian Pipping
2017-02-07 23:42 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox