mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Merge pull request #75850 from mmilata/libreoffice-refactor
libreoffice: merge -still and -fresh into common expression
This commit is contained in:
Michael Raskin
GitHub
commit
d7a0236c4c
@ -1,10 +1,9 @@
|
|||||||
LibreOffice
|
LibreOffice
|
||||||
===========
|
===========
|
||||||
|
|
||||||
To generate `libreoffice-srcs.nix`:
|
To generate `src-$VARIANT/download.nix`, i.e. list of additional sources that
|
||||||
|
the libreoffice build process needs to download:
|
||||||
|
|
||||||
nix-shell default-gen-shell.nix --run generate
|
nix-shell gen-shell.nix --argstr variant VARIANT --run generate
|
||||||
|
|
||||||
To generate `libreoffice-srcs-still.nix`:
|
Where VARIANT is either `still` or `fresh`.
|
||||||
|
|
||||||
nix-shell still-gen-shell.nix --run generate
|
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
{ fetchurl }:
|
|
||||||
|
|
||||||
rec {
|
|
||||||
major = "6";
|
|
||||||
minor = "3";
|
|
||||||
patch = "0";
|
|
||||||
tweak = "4";
|
|
||||||
|
|
||||||
subdir = "${major}.${minor}.${patch}";
|
|
||||||
|
|
||||||
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
|
||||||
sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -16,27 +16,25 @@
|
|||||||
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ]
|
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ]
|
||||||
, withHelp ? true
|
, withHelp ? true
|
||||||
, kdeIntegration ? false
|
, kdeIntegration ? false
|
||||||
}:
|
, variant ? "fresh"
|
||||||
|
} @ args:
|
||||||
|
|
||||||
|
assert builtins.elem variant [ "fresh" "still" ];
|
||||||
|
|
||||||
let
|
let
|
||||||
primary-src = import ./default-primary-src.nix { inherit fetchurl; };
|
importVariant = f: import (./. + "/src-${variant}/${f}");
|
||||||
in
|
|
||||||
|
|
||||||
let inherit (primary-src) major minor subdir version; in
|
primary-src = importVariant "primary.nix" { inherit fetchurl; };
|
||||||
|
|
||||||
|
inherit (primary-src) major minor subdir version;
|
||||||
|
|
||||||
let
|
|
||||||
lib = stdenv.lib;
|
lib = stdenv.lib;
|
||||||
langsSpaces = lib.concatStringsSep " " langs;
|
langsSpaces = lib.concatStringsSep " " langs;
|
||||||
|
|
||||||
fetchSrc = {name, sha256}: fetchurl {
|
|
||||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
srcs = {
|
srcs = {
|
||||||
third_party =
|
third_party =
|
||||||
map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
|
map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
|
||||||
((import ./libreoffice-srcs.nix) ++ [
|
(importVariant "download.nix" ++ [
|
||||||
(rec {
|
(rec {
|
||||||
name = "unowinreg.dll";
|
name = "unowinreg.dll";
|
||||||
url = "https://dev-www.libreoffice.org/extern/${md5name}";
|
url = "https://dev-www.libreoffice.org/extern/${md5name}";
|
||||||
@ -46,20 +44,10 @@ let
|
|||||||
})
|
})
|
||||||
]);
|
]);
|
||||||
|
|
||||||
translations = fetchSrc {
|
translations = primary-src.translations;
|
||||||
name = "translations";
|
help = primary-src.help;
|
||||||
sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009";
|
|
||||||
};
|
|
||||||
|
|
||||||
# TODO: dictionaries
|
|
||||||
|
|
||||||
help = fetchSrc {
|
|
||||||
name = "help";
|
|
||||||
sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z";
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in (stdenv.mkDerivation rec {
|
||||||
pname = "libreoffice";
|
pname = "libreoffice";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
@ -402,4 +390,4 @@ in stdenv.mkDerivation rec {
|
|||||||
maintainers = with maintainers; [ raskin ];
|
maintainers = with maintainers; [ raskin ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}).overrideAttrs ((importVariant "override.nix") args)
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
{ pkgs ? (import <nixpkgs> {}) }:
|
{ pkgs ? (import <nixpkgs> {}), variant }:
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
primary-src = callPackage ./default-primary-src.nix {};
|
primary-src = callPackage (./. + "/src-${variant}/primary.nix") {};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
function generate {
|
function generate {
|
||||||
python3 generate-libreoffice-srcs.py > libreoffice-srcs.nix
|
python3 generate-libreoffice-srcs.py ${variant} > src-${variant}/download.nix
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
@ -0,0 +1 @@
|
|||||||
|
args: f: {}
|
||||||
35
pkgs/applications/office/libreoffice/src-fresh/primary.nix
Normal file
35
pkgs/applications/office/libreoffice/src-fresh/primary.nix
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{ fetchurl }:
|
||||||
|
|
||||||
|
rec {
|
||||||
|
fetchSrc = {name, sha256}: fetchurl {
|
||||||
|
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
major = "6";
|
||||||
|
minor = "3";
|
||||||
|
patch = "0";
|
||||||
|
tweak = "4";
|
||||||
|
|
||||||
|
subdir = "${major}.${minor}.${patch}";
|
||||||
|
|
||||||
|
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||||
|
sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7";
|
||||||
|
};
|
||||||
|
|
||||||
|
# FIXME rename
|
||||||
|
translations = fetchSrc {
|
||||||
|
name = "translations";
|
||||||
|
sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009";
|
||||||
|
};
|
||||||
|
|
||||||
|
# TODO: dictionaries
|
||||||
|
|
||||||
|
help = fetchSrc {
|
||||||
|
name = "help";
|
||||||
|
sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
{ stdenv, ... }:
|
||||||
|
attrs:
|
||||||
|
{
|
||||||
|
NIX_CFLAGS_COMPILE = stdenv.lib.lists.remove "-mno-fma" attrs.NIX_CFLAGS_COMPILE;
|
||||||
|
configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags;
|
||||||
|
meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
|
||||||
|
}
|
||||||
34
pkgs/applications/office/libreoffice/src-still/primary.nix
Normal file
34
pkgs/applications/office/libreoffice/src-still/primary.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ fetchurl }:
|
||||||
|
|
||||||
|
rec {
|
||||||
|
fetchSrc = {name, sha256}: fetchurl {
|
||||||
|
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
major = "6";
|
||||||
|
minor = "2";
|
||||||
|
patch = "6";
|
||||||
|
tweak = "2";
|
||||||
|
|
||||||
|
subdir = "${major}.${minor}.${patch}";
|
||||||
|
|
||||||
|
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||||
|
sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq";
|
||||||
|
};
|
||||||
|
|
||||||
|
translations = fetchSrc {
|
||||||
|
name = "translations";
|
||||||
|
sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh";
|
||||||
|
};
|
||||||
|
|
||||||
|
# TODO: dictionaries
|
||||||
|
|
||||||
|
help = fetchSrc {
|
||||||
|
name = "help";
|
||||||
|
sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,29 +0,0 @@
|
|||||||
{ pkgs ? (import <nixpkgs> {}) }:
|
|
||||||
|
|
||||||
with pkgs;
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
primary-src = callPackage ./still-primary-src.nix {};
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "generate-libreoffice-srcs-shell";
|
|
||||||
|
|
||||||
buildCommand = "exit 1";
|
|
||||||
|
|
||||||
downloadList = stdenv.mkDerivation {
|
|
||||||
name = "libreoffice-${primary-src.version}-download-list";
|
|
||||||
inherit (primary-src) src version;
|
|
||||||
builder = ./download-list-builder.sh;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ python3 ];
|
|
||||||
|
|
||||||
shellHook = ''
|
|
||||||
function generate {
|
|
||||||
python3 generate-libreoffice-srcs.py > libreoffice-srcs-still.nix
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
{ fetchurl }:
|
|
||||||
|
|
||||||
rec {
|
|
||||||
major = "6";
|
|
||||||
minor = "2";
|
|
||||||
patch = "6";
|
|
||||||
tweak = "2";
|
|
||||||
|
|
||||||
subdir = "${major}.${minor}.${patch}";
|
|
||||||
|
|
||||||
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
|
||||||
sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,402 +0,0 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
|
|
||||||
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
|
|
||||||
, libxml2, db, curl, fontconfig, libsndfile, neon
|
|
||||||
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
|
|
||||||
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
|
|
||||||
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
|
|
||||||
, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
|
|
||||||
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
|
|
||||||
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
|
|
||||||
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
|
|
||||||
, fontsConf, pkgconfig, bluez5, libtool, carlito
|
|
||||||
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
|
|
||||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
|
||||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
|
||||||
, gnome3, glib, ncurses, epoxy, gpgme
|
|
||||||
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ]
|
|
||||||
, withHelp ? true
|
|
||||||
, kdeIntegration ? false
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
primary-src = import ./still-primary-src.nix { inherit fetchurl; };
|
|
||||||
in
|
|
||||||
|
|
||||||
let inherit (primary-src) major minor subdir version; in
|
|
||||||
|
|
||||||
let
|
|
||||||
lib = stdenv.lib;
|
|
||||||
langsSpaces = lib.concatStringsSep " " langs;
|
|
||||||
|
|
||||||
fetchSrc = {name, sha256}: fetchurl {
|
|
||||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
srcs = {
|
|
||||||
third_party =
|
|
||||||
map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
|
|
||||||
((import ./libreoffice-srcs-still.nix) ++ [
|
|
||||||
(rec {
|
|
||||||
name = "unowinreg.dll";
|
|
||||||
url = "https://dev-www.libreoffice.org/extern/${md5name}";
|
|
||||||
sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
|
|
||||||
md5 = "185d60944ea767075d27247c3162b3bc";
|
|
||||||
md5name = "${md5}-${name}";
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
|
|
||||||
translations = fetchSrc {
|
|
||||||
name = "translations";
|
|
||||||
sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh";
|
|
||||||
};
|
|
||||||
|
|
||||||
# TODO: dictionaries
|
|
||||||
|
|
||||||
help = fetchSrc {
|
|
||||||
name = "help";
|
|
||||||
sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz";
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
pname = "libreoffice";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
inherit (primary-src) src;
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
|
||||||
|
|
||||||
# For some reason librdf_redland sometimes refers to rasqal.h instead
|
|
||||||
# of rasqal/rasqal.h
|
|
||||||
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./xdg-open-brief.patch
|
|
||||||
|
|
||||||
# Poppler-0.82 compatibility
|
|
||||||
# https://gerrit.libreoffice.org/81545
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
|
|
||||||
sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
|
|
||||||
})
|
|
||||||
# Poppler-0.83 compatibility
|
|
||||||
# https://gerrit.libreoffice.org/84384
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
|
|
||||||
sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
tarballPath = "external/tarballs";
|
|
||||||
|
|
||||||
postUnpack = ''
|
|
||||||
mkdir -v $sourceRoot/${tarballPath}
|
|
||||||
'' + (lib.flip lib.concatMapStrings srcs.third_party (f: ''
|
|
||||||
ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
|
|
||||||
ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
|
|
||||||
''))
|
|
||||||
+ ''
|
|
||||||
ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
|
|
||||||
ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
|
|
||||||
tar -xf ${srcs.help}
|
|
||||||
tar -xf ${srcs.translations}
|
|
||||||
'';
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx
|
|
||||||
|
|
||||||
# configure checks for header 'gpgme++/gpgmepp_version.h',
|
|
||||||
# and if it is found (no matter where) uses a hardcoded path
|
|
||||||
# in what presumably is an effort to make it possible to write
|
|
||||||
# '#include <context.h>' instead of '#include <gpgmepp/context.h>'.
|
|
||||||
#
|
|
||||||
# Fix this path to point to where the headers can actually be found instead.
|
|
||||||
substituteInPlace configure.ac --replace \
|
|
||||||
'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
|
|
||||||
'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
|
|
||||||
'';
|
|
||||||
|
|
||||||
QT4DIR = qt4;
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
configureFlagsArray=(
|
|
||||||
"--with-parallelism=$NIX_BUILD_CORES"
|
|
||||||
"--with-lang=${langsSpaces}"
|
|
||||||
);
|
|
||||||
|
|
||||||
chmod a+x ./bin/unpack-sources
|
|
||||||
patchShebangs .
|
|
||||||
|
|
||||||
# This is required as some cppunittests require fontconfig configured
|
|
||||||
cp "${fontsConf}" fonts.conf
|
|
||||||
sed -e '/include/i<include>${carlito}/etc/fonts/conf.d</include>' -i fonts.conf
|
|
||||||
export FONTCONFIG_FILE="$PWD/fonts.conf"
|
|
||||||
|
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
postConfigure =
|
|
||||||
# fetch_Download_item tries to interpret the name as a variable name, let it do so...
|
|
||||||
''
|
|
||||||
sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
|
|
||||||
sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
|
|
||||||
''
|
|
||||||
# Test fixups
|
|
||||||
# May need to be revisited/pruned, left alone for now.
|
|
||||||
+ ''
|
|
||||||
# unit test sd_tiledrendering seems to be fragile
|
|
||||||
# https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
|
|
||||||
echo > ./sd/CppunitTest_sd_tiledrendering.mk
|
|
||||||
sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
|
|
||||||
# Pivot chart tests. Fragile.
|
|
||||||
sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx
|
|
||||||
sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx
|
|
||||||
# one more fragile test?
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
|
|
||||||
# this I actually hate, this should be a data consistency test!
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
|
|
||||||
# rendering-dependent test
|
|
||||||
sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
|
|
||||||
# tilde expansion in path processing checks the existence of $HOME
|
|
||||||
sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
|
|
||||||
# fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071
|
|
||||||
sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx'
|
|
||||||
# rendering-dependent: on my computer the test table actually doesn't fit…
|
|
||||||
# interesting fact: test disabled on macOS by upstream
|
|
||||||
sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
|
|
||||||
# Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
|
|
||||||
sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
|
|
||||||
# one more fragile test?
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
|
|
||||||
# rendering-dependent tests
|
|
||||||
sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
|
|
||||||
sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
|
|
||||||
sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
|
|
||||||
sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx
|
|
||||||
sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
|
|
||||||
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
|
||||||
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
|
|
||||||
sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
|
|
||||||
sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
|
|
||||||
# not sure about this fragile test
|
|
||||||
sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
|
||||||
# bunch of new Fresh failures. Sigh.
|
|
||||||
sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
|
|
||||||
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx'
|
|
||||||
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx"
|
|
||||||
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
|
|
||||||
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
|
|
||||||
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx"
|
|
||||||
''
|
|
||||||
# This to avoid using /lib:/usr/lib at linking
|
|
||||||
+ ''
|
|
||||||
sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
|
|
||||||
|
|
||||||
find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
|
|
||||||
'';
|
|
||||||
|
|
||||||
makeFlags = "SHELL=${bash}/bin/bash";
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
make build-nocheck
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
# It installs only things to $out/lib/libreoffice
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $out/bin $out/share/desktop
|
|
||||||
|
|
||||||
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
|
|
||||||
|
|
||||||
for a in sbase scalc sdraw smath swriter simpress soffice; do
|
|
||||||
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
|
|
||||||
done
|
|
||||||
|
|
||||||
ln -s $out/bin/soffice $out/bin/libreoffice
|
|
||||||
ln -s $out/lib/libreoffice/share/xdg $out/share/applications
|
|
||||||
|
|
||||||
for f in $out/share/applications/*.desktop; do
|
|
||||||
substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice"
|
|
||||||
substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
|
|
||||||
substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice"
|
|
||||||
done
|
|
||||||
|
|
||||||
cp -r sysui/desktop/icons "$out/share"
|
|
||||||
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
|
|
||||||
|
|
||||||
mkdir -p $dev
|
|
||||||
cp -r include $dev
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
(if withHelp then "" else "--without-help")
|
|
||||||
"--with-boost=${boost.dev}"
|
|
||||||
"--with-boost-libdir=${boost.out}/lib"
|
|
||||||
"--with-beanshell-jar=${bsh}"
|
|
||||||
"--with-vendor=NixOS"
|
|
||||||
"--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
|
|
||||||
"--disable-report-builder"
|
|
||||||
"--disable-online-update"
|
|
||||||
"--enable-python=system"
|
|
||||||
"--enable-dbus"
|
|
||||||
"--enable-release-build"
|
|
||||||
(lib.enableFeature kdeIntegration "kde4")
|
|
||||||
"--enable-epm"
|
|
||||||
"--with-jdk-home=${jdk.home}"
|
|
||||||
"--with-ant-home=${ant}/lib/ant"
|
|
||||||
"--with-system-cairo"
|
|
||||||
"--with-system-libs"
|
|
||||||
"--with-system-headers"
|
|
||||||
"--with-system-openssl"
|
|
||||||
"--with-system-libabw"
|
|
||||||
"--with-system-libcmis"
|
|
||||||
"--with-system-libwps"
|
|
||||||
"--with-system-openldap"
|
|
||||||
"--with-system-coinmp"
|
|
||||||
|
|
||||||
"--with-alloc=system"
|
|
||||||
|
|
||||||
# Without these, configure does not finish
|
|
||||||
"--without-junit"
|
|
||||||
|
|
||||||
"--disable-libnumbertext" # system-libnumbertext"
|
|
||||||
|
|
||||||
# We do tarball prefetching ourselves
|
|
||||||
"--disable-fetch-external"
|
|
||||||
"--enable-build-opensymbol"
|
|
||||||
|
|
||||||
# I imagine this helps. Copied from go-oo.
|
|
||||||
# Modified on every upgrade, though
|
|
||||||
"--disable-odk"
|
|
||||||
"--disable-postgresql-sdbc"
|
|
||||||
"--disable-firebird-sdbc"
|
|
||||||
"--without-fonts"
|
|
||||||
"--without-myspell-dicts"
|
|
||||||
"--without-doxygen"
|
|
||||||
|
|
||||||
# TODO: package these as system libraries
|
|
||||||
"--with-system-beanshell"
|
|
||||||
"--without-system-hsqldb"
|
|
||||||
"--without-system-altlinuxhyph"
|
|
||||||
"--without-system-lpsolve"
|
|
||||||
"--without-system-libetonyek"
|
|
||||||
"--without-system-libfreehand"
|
|
||||||
"--without-system-liblangtag"
|
|
||||||
"--without-system-libmspub"
|
|
||||||
"--without-system-libpagemaker"
|
|
||||||
"--without-system-libstaroffice"
|
|
||||||
"--without-system-libepubgen"
|
|
||||||
"--without-system-libqxp"
|
|
||||||
"--without-system-mdds"
|
|
||||||
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
|
|
||||||
"--without-system-orcus"
|
|
||||||
"--without-system-xmlsec"
|
|
||||||
];
|
|
||||||
|
|
||||||
checkPhase = ''
|
|
||||||
make unitcheck
|
|
||||||
make slowcheck
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ];
|
|
||||||
|
|
||||||
buildInputs = with xorg;
|
|
||||||
[ ant ArchiveZip boost cairo clucene_core
|
|
||||||
IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
|
|
||||||
freetype GConf getopt gnome_vfs gperf gtk3 gtk2
|
|
||||||
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
|
|
||||||
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
|
|
||||||
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
|
|
||||||
libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer
|
|
||||||
gst_all_1.gst-plugins-base glib libmysqlclient
|
|
||||||
neon nspr nss openldap openssl ORBit2 pam perl poppler
|
|
||||||
python3 sane-backends unzip vigra which zip zlib
|
|
||||||
mdds bluez5 libcmis libwps libabw libzmf
|
|
||||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
|
|
||||||
librevenge libe-book libmwaw glm glew ncurses epoxy
|
|
||||||
libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
|
|
||||||
]
|
|
||||||
++ lib.optional kdeIntegration kdelibs4;
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
inherit srcs jdk;
|
|
||||||
};
|
|
||||||
|
|
||||||
requiredSystemFeatures = [ "big-parallel" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Comprehensive, professional-quality productivity suite (Still/Stable release)";
|
|
||||||
homepage = https://libreoffice.org/;
|
|
||||||
license = licenses.lgpl3;
|
|
||||||
maintainers = with maintainers; [ raskin ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -19794,13 +19794,15 @@ in
|
|||||||
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
||||||
libreoffice = callPackage ../applications/office/libreoffice
|
libreoffice = callPackage ../applications/office/libreoffice
|
||||||
(libreoffice-args // {
|
(libreoffice-args // {
|
||||||
|
variant = "fresh";
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice;
|
libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice;
|
||||||
|
|
||||||
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
||||||
libreoffice = callPackage ../applications/office/libreoffice/still.nix
|
libreoffice = callPackage ../applications/office/libreoffice
|
||||||
(libreoffice-args // {
|
(libreoffice-args // {
|
||||||
|
variant = "still";
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
libreoffice-still-unwrapped = libreoffice-still.libreoffice;
|
libreoffice-still-unwrapped = libreoffice-still.libreoffice;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user