commit: 663bb096f946951a7f5f1c39fac2d27a6f2ef6ab Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Nov 25 05:55:53 2024 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Nov 25 05:58:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663bb096
media-libs/libgphoto2: finish removing `gpi_gphoto_port_type_map` `gpi_gphoto_port_type_map` was removed upstream however it was still in use in several locations within the codebase. This caused build failures with Clang, or GCC with `-Wl,--no-undefined-version`. Closes: https://bugs.gentoo.org/919838 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> ...o2-2.5.31-remove-gpi_gphoto_port_type_map.patch | 31 ++++++++++++++++++++++ media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch new file mode 100644 index 000000000000..d5f2068abff4 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch @@ -0,0 +1,31 @@ +https://github.com/gphoto/libgphoto2/commit/8ddcae4ed2bd052318b0849617e22bf92a98dd17 +https://github.com/gphoto/libgphoto2/commit/3cf7a1d04dcffa52907026c4c2d35ee8273f3147 +From: Matt Jolly <[email protected]> +Date: Mon, 25 Nov 2024 15:50:22 +1000 +Subject: [PATCH] consolidate removal of `gpi_gphoto_port_type_map` + +This was several upstream commits + +--- a/libgphoto2_port/gphoto2/gphoto2-port-info-list.h ++++ b/libgphoto2_port/gphoto2/gphoto2-port-info-list.h +@@ -62,7 +62,6 @@ extern "C" { + + #ifdef _GPHOTO2_INTERNAL_CODE + #include <gphoto2/gphoto2-port-log.h> +-extern const StringFlagItem gpi_gphoto_port_type_map[]; + #endif + + int gp_port_info_new (GPPortInfo *info); +--- a/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver ++++ b/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver +@@ -71,7 +71,6 @@ LIBGPHOTO2_5_0 { + + # These are only supposed to be used by libgphoto2 internally. + LIBGPHOTO2_INTERNAL { +- gpi_gphoto_port_type_map; + gpi_enum_to_string; + gpi_string_to_enum; + gpi_string_to_flag; +-- +2.47.0 + diff --git a/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild index afb3be44733a..cfaa872eaf3b 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild @@ -77,7 +77,8 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( - "${FILESDIR}"/${PN}-2.5.31-c99.patch + "${FILESDIR}"/${P}-c99.patch + "${FILESDIR}"/${P}-remove-gpi_gphoto_port_type_map.patch ) src_prepare() {
