Fix FTBFS wrt std::byte <=> Exiv2::byte confusion, perhaps exposed by glibc 2.33.9000

i9cf
Mamoru TASAKA 4 years ago
parent d299fcb369
commit 92accba229

@ -0,0 +1,11 @@
--- gnome-commander-1.10.3/src/tags/gnome-cmd-tags-exiv2.cc.debug 2020-04-15 22:16:27.000000000 +0900
+++ gnome-commander-1.10.3/src/tags/gnome-cmd-tags-exiv2.cc 2021-02-23 22:09:11.236969469 +0900
@@ -74,7 +74,7 @@
case TAG_EXIF_FLASHPIXVERSION:
case TAG_EXIF_INTEROPERABILITYVERSION:
{
- vector<byte> buff(i->value().size()+1);
+ vector<Exiv2::byte> buff(i->value().size()+1);
i->value().copy(&buff[0],invalidByteOrder);
metadata->add(tag,(char *) &buff[0]);

@ -31,7 +31,7 @@
%global use_autotool 0 %global use_autotool 0
%global update_po 0 %global update_po 0
%global if_pre 0 %global if_pre 0
%global main_release 2 %global main_release 3
#%%global extratag %{git_pull_JST}git%{shorthash} #%%global extratag %{git_pull_JST}git%{shorthash}
%undefine extratag %undefine extratag
%global mimeedit_rev 1958 %global mimeedit_rev 1958
@ -71,6 +71,8 @@ Patch1: gnome-commander-1.6.0-path-fedora-specific.patch
# https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/96 # https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/96
# https://gitlab.gnome.org/GNOME/gnome-commander/-/commit/aa40e0ee762dce8f33af945a002bab52257486ad # https://gitlab.gnome.org/GNOME/gnome-commander/-/commit/aa40e0ee762dce8f33af945a002bab52257486ad
Patch101: gnome-commander-1.10.3-open-property-keypress-bz96.patch Patch101: gnome-commander-1.10.3-open-property-keypress-bz96.patch
# Need report to the upstream
Patch102: gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -140,6 +142,7 @@ ansluta till FTP-servrar och SMB-nätverk.
%patch1 -p1 -b .path %patch1 -p1 -b .path
%patch101 -p1 -b .upst101 %patch101 -p1 -b .upst101
%patch102 -p1 -b .byte_confusion
%if 0%{use_autotool} > 0 %if 0%{use_autotool} > 0
( export NOCONFIGURE=1 ; sh autogen.sh ) ( export NOCONFIGURE=1 ; sh autogen.sh )
@ -264,6 +267,9 @@ desktop-file-install \
%{_datadir}/pixmaps/%{name}/ %{_datadir}/pixmaps/%{name}/
%changelog %changelog
* Tue Feb 23 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.10.3-3
- Fix FTBFS wrt std::byte <=> Exiv2::byte confusion, perhaps exposed by glibc 2.33.9000
* Tue Feb 23 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.10.3-2 * Tue Feb 23 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.10.3-2
- Backport upstream patch for opening properties popup by keypress issue - Backport upstream patch for opening properties popup by keypress issue
(upstream bug 96) (upstream bug 96)

Loading…
Cancel
Save