Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 892800 - app-office/libreoffice-7.4.4.2 fails when applying vulkan patch
Summary: app-office/libreoffice-7.4.4.2 fails when applying vulkan patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Office Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-02-01 10:40 UTC by Vincent de Phily
Modified: 2023-02-01 13:22 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
build log (build.log.gz,150.29 KB, application/gzip)
2023-02-01 10:43 UTC, Vincent de Phily
Details
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.rej (vk_mem_alloc.h.rej,325 bytes, text/x-reject)
2023-02-01 10:45 UTC, Vincent de Phily
Details
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h (vk_mem_alloc.h,734.83 KB, text/x-chdr)
2023-02-01 10:46 UTC, Vincent de Phily
Details
external/skia/missing-include.patch.0 (missing-include.patch.0,575 bytes, patch)
2023-02-01 10:47 UTC, Vincent de Phily
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Vincent de Phily 2023-02-01 10:40:36 UTC
Libreoffice build fails during patching of vulkan header:

    1 out of 1 hunk FAILED -- saving rejects to file third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.rej
    Patch FAILED: /var/tmp/portage/app-office/libreoffice-7.4.4.2/work/libreoffice-7.4.4.2/external/skia/missing-include.patch.0
    make[1]: *** [/var/tmp/portage/app-office/libreoffice-7.4.4.2/work/libreoffice-7.4.4.2/solenv/gbuild/UnpackedTarball.mk:175: /var/tmp/portage/app-office/libreoffice-7.4.4.2/work/libreoffice-7.4.4.2/workdir/UnpackedTarball/skia.done] Er>

The patch looks fine to me: just adds a header at an expected location, and applies fine to the first file.

Reproducible: Always




# emerge --info libreoffice
Portage 3.0.44 (python 3.11.1-final-0, default/linux/amd64/17.1/desktop/plasma/systemd, gcc-12, glibc-2.36-r5, 6.1.8-gentoo-molto x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-6.1.8-gentoo-molto-x86_64-AMD_Ryzen_7_4700U_with_Radeon_Graphics-with-glibc2.36
KiB Mem:    32233096 total,   9771656 free
KiB Swap:    8388604 total,   8388604 free
Timestamp of repository gentoo: Wed, 01 Feb 2023 10:02:02 +0000
Head commit of repository gentoo: 14d3e3ee3f77cae4ea4572503cd678f1ae2b7aa6

Timestamp of repository guru: Tue, 31 Jan 2023 11:17:02 +0000
Head commit of repository guru: 0c537dc5ddb0c9f24b6779343eba438fd475951b

sh bash 5.1_p16-r2
ld GNU ld (Gentoo 2.39 p5) 2.39.0
app-misc/pax-utils:        1.3.5::gentoo
app-shells/bash:           5.1_p16-r2::gentoo
dev-java/java-config:      2.3.1::gentoo
dev-lang/perl:             5.36.0-r1::gentoo
dev-lang/python:           3.10.9-r1::gentoo, 3.11.1-r1::gentoo
dev-lang/rust:             1.67.0::gentoo
dev-util/cmake:            3.24.3::gentoo
dev-util/meson:            0.64.1::gentoo
sys-apps/baselayout:       2.9::gentoo
sys-apps/sandbox:          2.29::gentoo
sys-apps/systemd:          252.4-r1::gentoo
sys-devel/autoconf:        2.13-r7::gentoo, 2.71-r5::gentoo
sys-devel/automake:        1.16.5::gentoo
sys-devel/binutils:        2.39-r4::gentoo
sys-devel/binutils-config: 5.4.1::gentoo
sys-devel/clang:           15.0.7-r1::gentoo
sys-devel/gcc:             12.2.1_p20230121-r1::gentoo
sys-devel/gcc-config:      2.8::gentoo
sys-devel/libtool:         2.4.7-r1::gentoo
sys-devel/lld:             15.0.7::gentoo
sys-devel/llvm:            15.0.7::gentoo
sys-devel/make:            4.3::gentoo
sys-kernel/linux-headers:  6.1::gentoo (virtual/os-headers)
sys-libs/glibc:            2.36-r5::gentoo
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/gentoo.git
    priority: -1000
    volatile: True
    sync-git-verify-commit-signature: yes

guru
    location: /var/db/repos/guru
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/guru.git
    masters: gentoo
    volatile: True

moltonel
    location: /home/work/c/ebuilds
    masters: gentoo
    volatile: True

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="@FREE @FREE linux-fw-redistributable no-source-code JSON ipw2200-fw no-source-code ipw2100-fw FDL-1.3 OAL-1.0.1 MirOS FDL-1.3+ Free-Art-1.2 Free-Art-1.3 FDL-1.1+ ODC-By-1.0 FDL-1.1 FDL-1.2+ CC-BY-SA-1.0 CC0-1.0 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC-BY-2.0 CC-BY-SA-2.5 CC-BY-2.5 FDL-1.2 GPL-2 OFL-1.1 Free-Art-1.3 GPL-3+ FDL-1.1+ CC-BY-2.0 CC-BY-2.5 GPL-1 GPL-1+ FDL-1.3 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-4.0 CC-BY-SA-2.5 FDL-1.2+ OFL FDL-1.3+ GPL-3 CC-BY-SA-2.0 CC-BY-SA-3.0 FDL-1.1 Free-Art-1.2 Arphic GPL-2+ IPAfont OPL FDL-1.2 CC-BY-SA-1.0 man-pages-posix-2013 Texinfo-manual wxWinFDL-3 UbuntuFontLicense-1.0 CC-PD BAEKMUK MaxMind2 BitstreamVera LDP-1 quake1-textures vlgothic CC-SA-1.0 mplus-fonts LDP-1a man-pages myspell-en_CA-KevinAtkinson JOVE symlinks Toyoda xtrs libpng tablelist tcp_wrappers_license NCSA-AMD BSD-2-with-patent iASL FVWM Princeton NEWLIB URT psutils alternate VTK DES File-MMagic Interbase-1.0 IDPL inner-net xbatt Sendmail MIT-with-advertising otter Time-modules SMAIL coldspringharbor BEER-WARE ipadic PCRE Xdebug rdisc libtiff freetts CPL-0.5 sdlsasteroids noweb ngrep Sendmail-Open-Source bufexplorer.vim JDOM libmng lsof scanlogd gsm TeX TextMate-bundle flexmock tcltk CDDL-Schily CRACKLIB tm-align RSA sunpro par LPPL-1.3 BSD-with-disclosure mpich2 w3m Info-ZIP regexp-UofT imagemagick PHP-2.02 SSLeay xboing ZSH LLGPL-2.1 sash Snd Emacs BSD-1 photopc Sympow-BSD feh TeX-other-free Time-Format the-Click-license CAOSL docbook dom4j pngcrush FastCGI Khronos-CLHPP icu AOM Openwall rc LambdaMOO trio BZIP2 Crypt-IDEA CMake FLEX Ispell UCAR-Unidata torque-2.5 buddy Old-MIT ElementTree libpng2 netcat matplotlib gd repoze CDDL-1.1 boehm-gc wm2 HTML-Tidy BSD-with-attribution mm LIBGLOSS Unicode_Fonts_for_Ancient_Scripts totd AIFFWriter.m DUMB-0.9.3 ErlPL-1.1 NCSA-HDF openafs-krb5-a perforce powell AMPAS Flashpix XC Mini-XML FLTK curl canfep Allegro RtMidi minpack NPSL-0.95 rwpng pngnq Artistic APSL-2 GPL-2 LGPL-2.1 Sleepycat MPL-2.0 OFL-1.1 0BSD CPL-1.0 wxWinLL-3 GPL-3+ ZLIB OSL-2.1 EPL-1.0 PHP-3 AGPL-3+ GPL-1+ HPND EPL-2.0 MPL-1.1 MirOS MIT-0 AGPL-3 CDDL BSD MPL-1.0 Unicode-DFS-2016 UoI-NCSA Apache-2.0 Apache-1.1 LGPL-3 LPPL-1.3c PHP-3.01 Boost-1.0 GPL-3 CNRI IBM LGPL-2.1+ nethack NOSA QPL-1.0 PSF-2 W3C LGPL-2+ Watcom-1.0 MIT LGPL-3+ CPAL-1.0 POSTGRESQL AFL-3.0 BSD-2 ZPL Artistic-2 GPL-2+ ECL-2.0 EUPL-1.1 IPAfont Ms-PL ISC APL-1.0 EUPL-1.2 APSL-2 CPL-1.0 CeCILL-B OSL-2.1 EPL-1.0 gnuplot EPL-2.0 MPL-1.1 Zend-2.0 MPL-1.0 CDDL NPL-1.1 Apache-1.1 FraunhoferFDK Apache-1.0 PHP-3.01 AFL-2.1 IBM CNRI LPPL-1.2 QPL-1.0 OSL-1.1 BSD-4 openssl CPAL-1.0 OSL-2.0 AFL-3.0 EUPL-1.1 Ms-PL CeCILL-C CC0-1.0 GPL-3+-with-autoconf-exception GPL-2-with-exceptions gcc-runtime-library-exception-3.1 GPL-2 LGPL-2.1 metapackage MPL-2.0 LGPL-3-with-linking-exception Sleepycat wxWinLL-3.1 GPL-2+-with-Pyinstaller-Bootloader-exception GPL-3+ ZLIB AGPL-3+ LGPL-2 FTL Clear-BSD GPL-1 GPL-1+ GPL-2-with-MySQL-FLOSS-exception HPND libstdc++ UPX-exception AGPL-3 BSD FSFAP tanuki-community UoI-NCSA WTFPL-2 Apache-2.0 Nokia-Qt-LGPL-Exception-1.1 vim GPL-2-with-font-exception public-domain GPL-2-with-classpath-exception GPL-2-with-linking-exception PYTHON PSF-2.4 libgcc GPL-3-with-openssl-exception Transmission-OpenSSL-exception LGPL-2.1-with-linking-exception LGPL-3 Unlicense Boost-1.0 GPL-3 LGPL-2.1+ qwt Ruby SGI-B-2.0 PSF-2.2 W3C PSF-2 LGPL-2+ GPL-2+-with-openssl-exception GPL-3+-with-font-exception MIT LGPL-3+ LGPL-2-with-linking-exception OPENLDAP BSD-2 IJG ZPL Artistic-2 GPL-2+ ECL-2.0 unicode Apache-2.0-with-LLVM-exceptions Ruby-BSD ISC CeCILL-2 GPL-3-with-font-exception Clarified-Artistic EUPL-1.2 Amazon qlogic-fibre-channel-firmware Broadcom NVIDIA-r1 unRAR AVASYS shmux LSI-tw_cli Atmel NVIDIA-r2 bonnie MicroChip-SDCC PGP-2 freedist ISSL bh-luxi ipw3945 linux-fw-redistributable RSAREF Mellanox-AS-IS intel-ucode"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O3 -pipe -march=native"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O3 -pipe -march=native"
DISTDIR="/var/cache/distfiles"
EMERGE_DEFAULT_OPTS="--quiet-build=y"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GDK_PIXBUF_MODULE_FILE GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR XDG_STATE_HOME"
FCFLAGS="-O3 -pipe -march=native"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg-live config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O3 -pipe -march=native"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="en_US.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LEX="flex"
MAKEOPTS="-j8"
PKGDIR="/var/cache/binpkgs"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
SHELL="/bin/bash"
USE="X a52 aac acl acpi activities alsa amd64 bash-completion bluetooth branding btrfs bzip2 cairo cdda cdr clang cli crypt cups dbus declarative default-lld dri dts dvdr encode exif flac fortran gdbm gif gpm gtk gui iconv icu ipv6 iwd jit jpeg kde kwallet lapack lcms libglvnd libnotify libtirpc lto mad mng mp3 mp4 mpeg multilib ncurses networkmanager nginx nls nptl ogg opengl openmp opus pam pango pcre pdf pgo pipewire plasma png policykit ppds print pulseaudio qml qrcode qt5 readline rust rust-src screencast sdl seccomp semantic-desktop sound spell split-usr ssl startup-notification svg systemd test-rust threads tiff truetype udev udisks unicode upower usb vaapi vdpau verify-sig vorbis vulkan wasm wayland webp widgets wifi x264 xattr xcb xft xml xv xvid zlib zstd" ABI_X86="64" ADA_TARGET="gnat_2021" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2 aes avx avx2 f16c fma3 pclmul popcnt rdrand sha sse3 sse4_1 sse4_2 sse4a ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="AArch64 ARM AMDGPU BPF WebAssembly X86" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-4 php8-0" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_11" PYTHON_TARGETS="python3_10 python3_11" RUBY_TARGETS="ruby27 ruby30" USERLAND="GNU" VIDEO_CARDS="amdgpu radeon radeonsi" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS

=================================================================
                        Package Settings
=================================================================

app-office/libreoffice-7.4.4.2::gentoo was built with the following:
USE="bluetooth branding clang cups dbus gtk kde mariadb vulkan -accessibility (-base) (-coinmp) -custom-cflags -debug -eds (-firebird) -googledrive -gstreamer -java -ldap -odk -pdfimport -postgres -test" ABI_X86="(64)" LIBREOFFICE_EXTENSIONS="-nlpsolver -scripting-beanshell -scripting-javascript -wiki-publisher" PYTHON_SINGLE_TARGET="python3_10 -python3_11 -python3_9"
CFLAGS="-pipe -march=native -O2"
CXXFLAGS="-pipe -march=native -O2"
FEATURES="assume-digests usersandbox xattr binpkg-logs ipc-sandbox unmerge-orphans network-sandbox preserve-libs unmerge-logs fixlafiles sandbox usersync distlocks binpkg-dostrip merge-sync news protect-owned multilib-strict pid-sandbox parallel-fetch strict userfetch ebuild-locks userpriv qa-unresolved-soname-deps unknown-features-warn buildpkg-live sfperms binpkg-docompress config-protect-if-modified"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -fuse-ld=lld"
Comment 1 Vincent de Phily 2023-02-01 10:43:11 UTC
Created attachment 849610 [details]
build log
Comment 2 Vincent de Phily 2023-02-01 10:45:48 UTC
Created attachment 849612 [details]
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.rej
Comment 3 Vincent de Phily 2023-02-01 10:46:12 UTC
Created attachment 849614 [details]
workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
Comment 4 Vincent de Phily 2023-02-01 10:47:31 UTC
Created attachment 849616 [details, diff]
external/skia/missing-include.patch.0
Comment 5 Vincent de Phily 2023-02-01 11:59:22 UTC
As a workaround, the build succeeds with "USE=-vulkan".
Comment 6 Larry the Git Cow gentoo-dev 2023-02-01 13:22:27 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd22f8abf0603ff08e6ce2d8fc1b97d16236d6fe

commit fd22f8abf0603ff08e6ce2d8fc1b97d16236d6fe
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-02-01 13:21:01 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-02-01 13:22:19 +0000

    app-office/libreoffice: Revert "fix build w/ gcc 13"
    
    Apparently breaks build with USE=vulkan.
    
    This reverts commit 3fae1aff9ce351bf561bb18cd9332b200d76b7d6.
    
    Bug: https://bugs.gentoo.org/892523
    Closes: https://bugs.gentoo.org/892800
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../files/libreoffice-7.4.4.2-gcc-13.patch         | 82 ----------------------
 app-office/libreoffice/libreoffice-7.4.4.2.ebuild  |  1 -
 2 files changed, 83 deletions(-)