public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/
Date: Tue, 22 Aug 2023 07:24:14 +0000 (UTC)	[thread overview]
Message-ID: <1692686995.ad4d831484211ce970eb3028a8b4a3dc8e05044b.juippis@gentoo> (raw)

commit:     ad4d831484211ce970eb3028a8b4a3dc8e05044b
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Jul 22 09:24:48 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 06:49:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4d8314

media-libs/exempi: Fix no template named binary_function in namespace

Closes: https://bugs.gentoo.org/910494
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31997
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-libs/exempi/exempi-2.6.3-r1.ebuild           | 68 ++++++++++++++++++++++
 .../exempi-2.6.3-clang16-binary_function.patch     | 33 +++++++++++
 2 files changed, 101 insertions(+)

diff --git a/media-libs/exempi/exempi-2.6.3-r1.ebuild b/media-libs/exempi/exempi-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..e5669843463f
--- /dev/null
+++ b/media-libs/exempi/exempi-2.6.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
+HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
+SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="2/8"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/expat-2:=
+	sys-libs/zlib
+	virtual/libiconv
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/boost )
+"
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
+	"${FILESDIR}"/${PN}-2.6.3-clang16-binary_function.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for autoconf 2.71
+	config_rpath_update .
+	eautoreconf
+}
+
+src_configure() {
+	# - --enable-static as --disable-static breaks build
+	# - Valgrind detection is "disabled" due to bug #295875
+	econf \
+		--enable-static \
+		$(use_enable test unittest) \
+		VALGRIND=""
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		emake -C samples/source distclean
+		rm samples/{,source,testfiles}/Makefile* || die
+		docinto examples
+		dodoc -r samples/.
+	fi
+
+	# --disable-static breaks tests
+	rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die
+
+	find "${ED}" -name '*.la' -delete || die
+}

diff --git a/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch b/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch
new file mode 100644
index 000000000000..bbe535ed1380
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch
@@ -0,0 +1,33 @@
+Bug: https://bugs.gentoo.org/910494
+--- a/XMPFiles/source/PluginHandler/XMPAtoms.h
++++ b/XMPFiles/source/PluginHandler/XMPAtoms.h
+@@ -83,8 +83,12 @@ enum
+ 
+ #define XMPAtomNull emptyStr_K
+ 
+-struct StringCompare : std::binary_function<const std::string &, const std::string &, bool>
++struct StringCompare
+ {
++	public:
++		using first_argument_type = const std::string &;
++		using second_argument_type = const std::string &;
++		using result_type = bool;
+ 	bool operator() (const std::string & a, const std::string & b) const
+ 	{
+ 		return ( a.compare(b) < 0 );
+--- a/XMPFilesPlugins/api/source/PluginRegistry.h
++++ b/XMPFilesPlugins/api/source/PluginRegistry.h
+@@ -68,8 +68,12 @@ public:
+ 	
+ private:
+ 
+-	struct StringCompare : std::binary_function< const std::string &, const std::string &, bool >
++	struct StringCompare
+ 	{
++		public:
++			using first_argument_type = const std::string &;
++			using second_argument_type = const std::string &;
++			using result_type = bool;
+ 		bool operator()( const std::string & a, const std::string & b ) const
+ 		{
+ 			return ( a.compare(b) < 0 );


             reply	other threads:[~2023-08-22  7:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-22  7:24 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-02-07 20:09 [gentoo-commits] repo/gentoo:master commit in: media-libs/exempi/, media-libs/exempi/files/ Andreas Sturmlechner
2021-04-29 17:38 David Seifert
2018-09-30 16:48 Andreas Sturmlechner
2017-04-16 18:25 Gilles Dartiguelongue

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1692686995.ad4d831484211ce970eb3028a8b4a3dc8e05044b.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox