diff --git a/app-office/gnumeric/gnumeric-1.12.60.recipe b/app-office/gnumeric/gnumeric-1.12.60.recipe index 58f7a182c..9e8a70cca 100644 --- a/app-office/gnumeric/gnumeric-1.12.60.recipe +++ b/app-office/gnumeric/gnumeric-1.12.60.recipe @@ -13,7 +13,8 @@ LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/gnumeric/${portVersion%.*}/gnumeric-$portVersion.tar.xz" CHECKSUM_SHA256="bb02feb286062805564438534e1fea459f97cebac8a090b1a7e47ca251e07467" -PATCHES="gnumeric-$portVersion.patchset" +PATCHES="gnumeric-$portVersion.patchset + 0001-docs-fix-parallel-builds.patch" ADDITIONAL_FILES="gnumeric.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -87,8 +88,10 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:awk cmd:bison$secondaryArchSuffix + cmd:cmp + cmd:diff cmd:gcc$secondaryArchSuffix - cmd:intltoolize + cmd:intltool_update cmd:itstool cmd:make cmd:msgfmt$secondaryArchSuffix @@ -101,11 +104,9 @@ defineDebugInfoPackage gnumeric$secondaryArchSuffix \ BUILD() { - runConfigure --omit-dirs "binDir sbinDir" ./configure \ + runConfigure --omit-dirs binDir ./configure \ --bindir=$commandBinDir \ - --sbindir=$commandBinDir \ - --with-goffice-plugins-dir=$libDir/goffice/0.10.60/plugins \ - --disable-werror + --with-goffice-plugins-dir=$libDir/goffice/0.10.60/plugins make $jobArgs } diff --git a/app-office/gnumeric/patches/0001-docs-fix-parallel-builds.patch b/app-office/gnumeric/patches/0001-docs-fix-parallel-builds.patch new file mode 100644 index 000000000..9bcebc349 --- /dev/null +++ b/app-office/gnumeric/patches/0001-docs-fix-parallel-builds.patch @@ -0,0 +1,37 @@ +From 23ffcecd33e945e4521eb62663a421b369a87fd8 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 24 Feb 2026 15:18:29 +0100 +Subject: [PATCH] docs: fix parallel builds + +Avoid tempfile clash when building in parallel. + +fixes https://gitlab.gnome.org/GNOME/gnumeric/-/issues/852 +--- + tools/itstoolwrapper | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/itstoolwrapper b/tools/itstoolwrapper +index 70be4d172..4567b307e 100755 +--- a/tools/itstoolwrapper ++++ b/tools/itstoolwrapper +@@ -33,7 +33,7 @@ sub make_potfile { + my ($dasho, $potfile, $main) = @ARGV; + + my $tmp = $main; +- $tmp =~ s/(\.xml)$/-tmp$1/; ++ $tmp =~ s/(\.xml)$/$$-tmp$1/; + + &run ("xmllint", "--noent", "-o", $tmp, $main); + &exit_if_failed (); +@@ -50,7 +50,7 @@ sub make_mofile { + my $rbuilddir = &dirname ($mofile); + + my $tmpbase = &basename ($main); +- $tmpbase =~ s/(\.xml)$/-tmp$1/; ++ $tmpbase =~ s/(\.xml)$/$$-tmp$1/; + # The ".." here means "somewhere else" because intltool is weird + my $tmp = "$rbuilddir/../$tmpbase"; + +-- +2.53.0 +