Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 942831 - app-office/libreoffice-9999 patch -p1 failed with files/libreoffice-24.8-unused-qt5network.patch
Summary: app-office/libreoffice-9999 patch -p1 failed with files/libreoffice-24.8-unu...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: AMD64 Linux
: Normal normal
Assignee: Gentoo Office Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-11-03 16:24 UTC by nbvjatq
Modified: 2025-02-22 22:26 UTC (History)
1 user (show)

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


Attachments
libreoffice-25.2-unused-qt5network.patch (libreoffice-25.2-unused-qt5network.patch,2.52 KB, patch)
2024-11-17 20:25 UTC, jospezial
Details | Diff
libreoffice-25.2-unused-qt6network.patch (libreoffice-25.2-unused-qt6network.patch,1.81 KB, patch)
2024-11-17 20:27 UTC, jospezial
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nbvjatq 2024-11-03 16:24:13 UTC
>>> Preparing source in /var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999 ...
 * Applying libreoffice-6.1-nomancompress.patch ...                                                                                                                                               [ ok ]
 * Applying libreoffice-24.2-qtdetect.patch ...                                                                                                                                                   [ ok ]
 * Applying libreoffice-24.8-unused-qt5network.patch ...
patching file configure.ac
Hunk #1 succeeded at 13611 (offset 398 lines).
Hunk #2 succeeded at 13851 (offset 409 lines).
Hunk #3 FAILED at 13453.
Hunk #4 succeeded at 13870 with fuzz 2 (offset 409 lines).
1 out of 4 hunks FAILED -- saving rejects to file configure.ac.rej                                                                                                                                [ !! ]
 * ERROR: app-office/libreoffice-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-24.8-unused-qt5network.patch
 * 
 * Call stack:
 *               ebuild.sh, line  136:  Called src_prepare
 *             environment, line 5764:  Called default
 *      phase-functions.sh, line  874:  Called default_src_prepare
 *      phase-functions.sh, line  950:  Called __eapi8_src_prepare
 *             environment, line  394:  Called eapply '--' '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-6.1-nomancompress.patch' '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-24.2-qtdetect.patch' '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-24.8-unused-qt5network.patch' '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-24.8-unused-qt6network.patch'
 *             environment, line 2069:  Called _eapply_patch '/var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-24.8-unused-qt5network.patch'
 *             environment, line 2007:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/app-office/libreoffice-9999/files/libreoffice-24.8-unused-qt5network.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"




GENTOO_VM=openjdk-23  CLASSPATH="" JAVA_HOME="/usr/lib64/openjdk-23"
JAVACFLAGS="-source 11 -target 11" COMPILER=""
Comment 1 nbvjatq 2024-11-06 12:18:01 UTC
Gentoo ~ # emerge --info
Portage 3.0.66.1 (python 3.12.7-final-0, default/linux/amd64/23.0, gcc-14, glibc-2.40-r5, 6.12.0-rc3-x86_64 x86_64)
=================================================================
System uname: Linux-6.12.0-rc3-x86_64-x86_64-AMD_FX-tm-4300_Quad-Core_Processor-with-glibc2.40
KiB Mem:     4017608 total,    362692 free
KiB Swap:   12582908 total,  12582908 free
Timestamp of repository gentoo: Wed, 06 Nov 2024 11:48:36 +0000
Head commit of repository gentoo: d842cad6d9e28c6dd6823fca4d03a8bc374127b3

Timestamp of repository guru: Wed, 06 Nov 2024 11:33:27 +0000
Head commit of repository guru: 59ac22e5be6c7c662417590f957e9a0cb0fb005f

Timestamp of repository kde: Tue, 05 Nov 2024 22:33:14 +0000
Head commit of repository kde: 7463b268fb56d2d38d3f352585ef5ee224b0113f

sh bash 5.2_p37
ld GNU ld (Gentoo 2.43 p2) 2.43.1
app-misc/pax-utils:        1.3.8::gentoo
app-shells/bash:           5.2_p37::gentoo
dev-build/autoconf:        2.13-r8::gentoo, 2.72-r1::gentoo
dev-build/automake:        1.17-r1::gentoo
dev-build/cmake:           3.30.5::gentoo
dev-build/libtool:         2.5.3::gentoo
dev-build/make:            4.4.1-r100::gentoo
dev-build/meson:           1.6.0::gentoo
dev-java/java-config:      2.3.4::gentoo
dev-lang/perl:             5.40.0::gentoo
dev-lang/python:           3.12.7_p1::gentoo, 3.13.0::gentoo
dev-lang/rust:             1.82.0::gentoo
sys-apps/baselayout:       2.15::gentoo
sys-apps/openrc:           0.55.1::gentoo
sys-apps/sandbox:          2.39::gentoo
sys-devel/binutils:        2.43-r1::gentoo
sys-devel/binutils-config: 5.5.2::gentoo
sys-devel/clang:           18.1.8::gentoo
sys-devel/gcc:             14.2.1_p20240921::gentoo
sys-devel/gcc-config:      2.11::gentoo
sys-devel/llvm:            18.1.8-r4::gentoo, 19.1.1::gentoo
sys-kernel/linux-headers:  6.11::gentoo (virtual/os-headers)
sys-libs/glibc:            2.40-r5::gentoo
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/gentoo.git
    priority: -1000
    volatile: False

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

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

Binary Repositories:

gentoobinhost
    priority: 1
    sync-uri: https://distfiles.gentoo.org/releases/amd64/binpackages/23.0/x86-64

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -march=bdver1 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d"
CXXFLAGS="-O2 -march=bdver1 -pipe"
DISTDIR="/var/cache/distfiles"
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="-O2 -march=bdver1 -pipe"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance buildpkg-live config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync merge-wait multilib-strict network-sandbox news parallel-fetch pid-sandbox pkgdir-index-trusted preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -march=bdver1 -pipe"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="ru_RU.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs"
LEX="flex"
LINGUAS="ru ru_RU"
MAKEOPTS="-j2"
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 acl amd64 bzip2 cet crypt gdbm iconv ipv6 libtirpc multilib ncurses nls openmp pam pcre pulseaudio readline seccomp ssl test-rust unicode wayland xattr zlib" ABI_X86="64" ADA_TARGET="gcc_12" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_anon authn_dbm authn_file authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir env expires ext_filter file_cache filter headers include info log_config logio 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="aes avx f16c fma3 fma4 mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3 xop" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax navcom oceanserver oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 tsip tripmate tnt ublox" GUILE_SINGLE_TARGET="3-0" GUILE_TARGETS="3-0" INPUT_DEVICES="libinput" KERNEL="linux" L10N="ru ru_RU en_US" LCD_DEVICES="bayrad cfontz glk hd44780 lb216 lcdm001 mtxorb text" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php8-2" POSTGRES_TARGETS="postgres16" PYTHON_SINGLE_TARGET="python3_12" PYTHON_TARGETS="python3_12" RUBY_TARGETS="ruby32" VIDEO_CARDS="nouveau" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipp2p iface geoip fuzzy condition tarpit sysrq proto logmark ipmark dhcpmac delude chaos account"
Unset:  ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EMERGE_DEFAULT_OPTS, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LFLAGS, LIBTOOL, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PYTHONPATH, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS
Comment 2 jospezial 2024-11-17 20:25:10 UTC
Created attachment 908895 [details, diff]
libreoffice-25.2-unused-qt5network.patch
Comment 3 jospezial 2024-11-17 20:27:45 UTC
Created attachment 908896 [details, diff]
libreoffice-25.2-unused-qt6network.patch

Some parts about the framework versions of these patches are already in upstream code.
Comment 4 jospezial 2025-01-11 03:27:31 UTC
go to https://bugs.gentoo.org/946921 for ebuild changes and qt6 patch.

libreoffice-*-unused-qt5network.patch is unneeded now.
Comment 5 Larry the Git Cow gentoo-dev 2025-02-22 22:26:21 UTC
The bug has been closed via the following commit(s):

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

commit 398d7c9a0098183c0ee5656417f93d8aaace8219
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2025-02-22 20:50:15 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2025-02-22 22:22:16 +0000

    app-office/libreoffice: update 9999
    
    * As for bug #916435, accept defeat (not ideal) and filter -Werror=odr
      given it's "only" in the Vulkan bits (as in FF).
    
    * With regard to bug #902031, go with the suggested USE="gtk3 gtk4" for now
      but I rather suspect we'll change this in short-order to USE=gtk => gtk4.
    
    Thanks to jospezial for rebasing the build system patch and providing
    the starting diff for 9999.
    
    Bug: https://bugs.gentoo.org/902031
    Bug: https://bugs.gentoo.org/946921
    Closes: https://bugs.gentoo.org/916435
    Closes: https://bugs.gentoo.org/942831
    Signed-off-by: Sam James <sam@gentoo.org>

 app-office/libreoffice/Manifest                    |  4 +-
 .../files/libreoffice-25.2-unused-qt6network.patch | 45 +++++++++++++++++++++
 app-office/libreoffice/libreoffice-9999.ebuild     | 46 ++++++++++++++++------
 3 files changed, 81 insertions(+), 14 deletions(-)