From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] exempi: update to 2.6.2
Date: Mon, 22 Aug 2022 02:18:15 +0200 [thread overview]
Message-ID: <20220822001815.R1i200FfyRMBErRCGVNS34zOazi0TmKaBuWd2wubKSg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38820@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages exempi
https://github.com/void-linux/void-packages/pull/38820
exempi: update to 2.6.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Fixes build with gcc12:
```
/usr/include/c++/12.1/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const
770 | is_invocable_v<const _Compare&, const _Key&, const _Key&>,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/c++/12.1/bits/stl_tree.h:770:15: note: 'std::is_invocable_v<const P2SpannedClip_Order&, P2_Clip* const&, P2_Clip* const&>' evaluates to false
```
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38820.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-exempi-38820.patch --]
[-- Type: text/x-diff, Size: 4694 bytes --]
From 9fe499eb357dd96870cac18582e5ef4025a2b8ae Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 17:00:18 -0700
Subject: [PATCH] exempi: update to 2.6.2
---
...f034705fd2d032c81383eee8208fd4eee0ac.patch | 43 -------------------
.../patches/exempi-e23c213-typeinfos.patch | 29 +++++++++++++
srcpkgs/exempi/template | 4 +-
3 files changed, 31 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch
create mode 100644 srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch
diff --git a/srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch b/srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch
deleted file mode 100644
index 2696793cec09..000000000000
--- a/srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
-From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Date: Sat, 18 Aug 2018 13:54:55 +0000
-Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The WEBP::GetLE32 function in
-XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
-NULL pointer dereference.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=106981
-https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
-
-Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Signed-off-by: Hubert Figuière <hub@figuiere.net>
----
- XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-index ffaf220..4fe705b 100644
---- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
- }
- void VP8XChunk::xmp(bool hasXMP)
- {
-- XMP_Uns32 flags = GetLE32(&this->data[0]);
-- flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
-- PutLE32(&this->data[0], flags);
-+ if (&this->data[0] != NULL) {
-+ XMP_Uns32 flags = GetLE32(&this->data[0]);
-+ flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
-+ PutLE32(&this->data[0], flags);
-+ }
- }
-
- Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
---
-2.18.0
-
diff --git a/srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch b/srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch
new file mode 100644
index 000000000000..2b45451010de
--- /dev/null
+++ b/srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch
@@ -0,0 +1,29 @@
+Source: https://src.fedoraproject.org/rpms/exempi/blob/rawhide/f/exempi-e23c213-typeinfos.patch
+
+From d45c06270576493e1537080fa43c1af667c4337a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Tue, 12 Oct 2021 14:15:17 +0200
+Subject: [PATCH] Avoid multiple definitions of typeinfos
+
+---
+ XMPFiles/source/XMPFiles_Impl.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp
+index 2f918ac..ff45040 100644
+--- a/XMPFiles/source/XMPFiles_Impl.cpp
++++ b/XMPFiles/source/XMPFiles_Impl.cpp
+@@ -47,7 +47,9 @@ using namespace std;
+ /// This file ...
+ ///
+ // =================================================================================================
+-#include "public/include/XMP.incl_cpp"
++#if ! XMP_StaticBuild
++ #include "public/include/XMP.incl_cpp"
++#endif
+
+ #if XMP_WinBuild
+ #pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+--
+2.33.0
+
diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template
index 14753617953a..d664f7dc4d80 100644
--- a/srcpkgs/exempi/template
+++ b/srcpkgs/exempi/template
@@ -1,6 +1,6 @@
# Template file for 'exempi'
pkgname=exempi
-version=2.5.0
+version=2.6.2
revision=1
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --disable-static --disable-unittest"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://libopenraw.freedesktop.org/wiki/Exempi"
distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.bz2"
-checksum=dc82fc24c0540a44a63fa4ad21775d24e00e63f1dedd3e2ae6f7aa27583b711b
+checksum=4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d
post_install() {
vlicense COPYING
next prev parent reply other threads:[~2022-08-22 0:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-22 0:04 [PR PATCH] " oreo639
2022-08-22 0:18 ` oreo639 [this message]
2022-08-22 2:21 ` [PR PATCH] [Updated] " oreo639
2022-08-28 22:15 ` [PR PATCH] [Merged]: " Duncaen
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=20220822001815.R1i200FfyRMBErRCGVNS34zOazi0TmKaBuWd2wubKSg@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).