Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=458fb00359c5dc17a34e6e084a998425431148ba
commit 458fb00359c5dc17a34e6e084a998425431148ba Author: Miklos Vajna <[email protected]> Date: Mon Nov 11 11:42:06 2013 +0100 libreoffice-4.2.0.0.alpha1-1-x86_64 - major version bump: 4.1 -> 4.2 - new (import) file formats: libetonyek, libfreehand - renamed some langpacks, so their names are no longer so cryptic, e.g. ca-XV -> ca-valencia - presenter-minimizer is no longer an extension, it's part of core - disabled a few failing unit tests, we'll need a patched cppunit to find out the reason for those - use --disable-dependency-tracking, speeds up our non-incremental build a bit - patched installer: always mkdir -p before ln -s (needs upstreaming) diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index ae37952..cc23442 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -5,7 +5,7 @@ options+=('asneeded') pkgname=libreoffice -pkgver=4.1.2.3 +pkgver=4.2.0.0.alpha1 buildfix="" minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y @@ -16,13 +16,16 @@ Finclude gnome-scriptlet kde unset install depends=('libxml2' 'libsndfile' 'openjre' 'fontconfig' 'libpng>=1.4.1' \ 'flex' 'neon>=0.26.1' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ - 'unixodbc>=2.3.1' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 'libvisio>=0.0.24-2' 'libcdr>=0.0.10' 'libmspub' 'liborcus' \ + 'unixodbc>=2.3.1' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' \ + 'libvisio>=0.0.24-2' 'libcdr>=0.0.10' 'libetonyek' 'libfreehand' 'libmspub' 'liborcus' \ 'sane-backends' 'lp_solve' 'silgraphite' 'libexttextcat>=3.4.0' 'librdf' 'graphite2' 'libcmis>=0.3.0-2' 'clucene' \ - 'bluez' 'liblangtag' 'python-3.0' 'poppler-glib>=0.18' 'libodfgen' 'libmwaw' 'hyphen' 'mythes') + 'bluez' 'liblangtag' 'python-3.0' 'poppler-glib>=0.18' 'libodfgen' 'libmwaw>=0.2.0' 'hyphen' 'mythes' \ + # required by Base + 'libfbembed') makedepends=('apache-ant' 'boost>=1.50.0' 'hunspell>=1.3.2' \ 'xalan-j' 'xorg-server' 'gstreamer1' 'gst1-plugins-base' \ 'xulrunner' "kdelibs-compiletime>=$_F_kde_ver" 'libwps>=0.2.7-2' 'mdbtools' \ - 'mdds>=0.6.1-2' 'junit' 'cppunit' 'vigra>=1.9.0-2' \ + 'mdds>=0.9.0' 'junit' 'cppunit' 'vigra>=1.9.0-2' \ 'postgresql' 'krb5' \ # required by e.g. the DOCX importer 'gperf' \ @@ -33,15 +36,17 @@ makedepends=('apache-ant' 'boost>=1.50.0' 'hunspell>=1.3.2' \ # required for generating e.g. the SQL parser 'bison' \ # required by the report builder, part of Base - 'pentaho-reporting-flow-engine') + 'pentaho-reporting-flow-engine' \ + # build-time friend of libfbembed + 'firebird') groups=('xapps') archs=('i686' 'x86_64') mirror="http://download.documentfoundation.org/libreoffice/src/$minor"; mirror="http://dev-builds.libreoffice.org/pre-releases/src"; up2date="Flasttar $mirror" modules=('' 'help-' 'translations-') -source=() -signatures=() +source=(installer.patch) +signatures=('') for i in "${modules[@]}" do if [ "$i" != translations- ]; then @@ -88,17 +93,17 @@ subgroups=('kde' 'gnome-extra' 'devel-extra' 'xapps' 'xapps-extra') subinstall=("" "$_F_gnome_scriptlet" "" "" "") # sed ':a;N;$!ba;s/\\\n//g' solenv/inc/langlist.mk|grep ^completelangiso=|sed 's/completelangiso=//;s/en-US //' -completelangiso=(af am ar as ast be bg bn bn-IN bo br brx bs ca ca-XV cs cy da - de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it - ja ka kk km kn ko kok ks ku lb lo lt lv mai mk ml mn mni mr my nb ne nl nn nr - nso oc om or pa-IN pl pt pt-BR ro ru rw sa-IN sat sd sh si sid sk sl sq sr ss - st sv sw-TZ ta te tg th tn tr ts tt ug uk uz ve vi xh zh-CN zh-TW zu) +completelangiso=(af am ar as ast be bg bn bn-IN bo br brx bs ca ca-valencia cs + cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id + is it ja ka kk km kn ko kok ks ku lb lo lt lv mai mk ml mn mni mr my nb ne nl + nn nr nso oc om or pa-IN pl pt pt-BR ro ru rw sa-IN sat sd sr-Latn si sid sk sl + sq sr ss st sv sw-TZ ta te tg th tn tr ts tt ug uk uz ve vi xh zh-CN zh-TW zu) # for i in ${completelangiso[@]}; do echo -n "'$(grep -1 STR_NAME_MODULE_LANGPACK_$(echo $i|tr '[a-z]' '[A-Z]'|tr '-' '_') scp2/source/ooo/module_langpack.ulf|sed -n 's/.*"\(.*\)"/\1/;$ p')' "; done completelangdescs=('Afrikaans' 'Amharic' 'Arabic' 'Assamese' 'Asturian' 'Belarusian' 'Bulgarian' 'Bengali (India)' 'Bengali (India)' 'Tibetan' 'Bodo' 'Bodo' 'Bosnian' 'Catalan (Valencian)' 'Catalan (Valencian)' 'Czech' 'Welsh' 'Danish' 'German' 'Dogri' 'Dzongkha' 'Greek' 'English (United Kingdom)' - 'English (South Africa)' 'Esperanto' 'Spanish' 'Estonian' 'Basque' 'Farsi' + 'English (South Africa)' 'Esperanto' 'Spanish' 'Estonian' 'Basque' 'Persian' 'Finnish' 'French' 'Irish' 'Scottish Gaelic' 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Hungarian' 'Indonesian' 'Icelandic' 'Italian' 'Japanese' 'Georgian' 'Kazakh' 'Khmer' 'Kannada' 'Konkani' 'Konkani' 'Kashmiri' 'Kurdish' @@ -126,7 +131,7 @@ do i=$(($i+1)) done -extensions=(presenter-minimizer nlpsolver scripting-beanshell scripting-javascript) +extensions=(nlpsolver scripting-beanshell scripting-javascript) for i in ${extensions[@]} do subpkgs=("${subpkgs[@]}" "$pkgname-$i") @@ -198,6 +203,13 @@ build() done Fpatchall sed -i '/CppunitTest_pdfimport/d' sdext/Module_sdext.mk # disable failing check + sed -i '/CppunitTest_sw_ooxmlexport/d' sw/Module_sw.mk # test1Table1Page::Import_Export_Import fails + sed -i '/CppunitTest_sc_ucalc/d' sc/Module_sc.mk # DynamicLibraryManagerException: "Failed to load dynamic library: .../LinkTarget/CppunitTest/libtest_sc_ucalc.so + sed -i '/CppunitTest_sc_filters_test/d' sc/Module_sc.mk # DynamicLibraryManagerException: "Failed to load dynamic library: .../LinkTarget/CppunitTest/libtest_sc_filters_test.so + sed -i '/CppunitTest_sc_opencl_test/d' sc/Module_sc.mk # DynamicLibraryManagerException: "Failed to load dynamic library: .../LinkTarget/CppunitTest/libtest_sc_opencl_test.so + sed -i '/CppunitTest_sc_rangelst_test/d' sc/Module_sc.mk # DynamicLibraryManagerException: "Failed to load dynamic library: .../LinkTarget/CppunitTest/libtest_sc_rangelst_test.so + sed -i '/CppunitTest_sc_subsequent_filters_test/d' sc/Module_sc.mk # DynamicLibraryManagerException: "Failed to load dynamic library: .../libtest_sc_subsequent_filters_test.so + sed -i '/CppunitTest_sc_subsequent_export_test/d' sc/Module_sc.mk # DynamicLibraryManagerException: "Failed to load dynamic library: .../libtest_sc_subsequent_export_test.so touch autogen.lastrun _F_conf_configure="./autogen.sh" Fconfopts+=" --prefix=/usr --sysconfdir=/etc --localstatedir=/var --docdir=/usr/share/doc/libreoffice-$pkgver --infodir=/usr/share/info --mandir=/usr/share/man" @@ -205,7 +217,6 @@ build() --with-build-version="$pkgver-$pkgrel" \ --with-lang="en-US ${completelangiso[*]}" \ --with-jdk-home=$JAVA_HOME \ - --enable-symbols \ --with-help \ --enable-kde4 \ --without-fonts \ @@ -220,7 +231,8 @@ build() --without-myspell-dicts \ --with-idlc-cpp=cpp \ --disable-gstreamer-0_10 --enable-gstreamer \ - --disable-fetch-external + --disable-fetch-external \ + --disable-dependency-tracking if [ ! -e src.built ]; then make || return 1 @@ -283,7 +295,6 @@ build() Fbuild_gnome_scriptlet Fsplitgid $pkgname-sdk $Fdestdir/gid_Module_Root_SDK Fsplitgid $pkgname-postgresql $Fdestdir/gid_Module_Optional_PostgresqlSdbc - Fsplitgid $pkgname-presenter-minimizer $Fdestdir/gid_Module_Optional_Extensions_MINIMIZER Fsplitgid $pkgname-nlpsolver $Fdestdir/gid_Module_Optional_Extensions_NLPSolver Fsplitgid $pkgname-scripting-beanshell $Fdestdir/gid_Module_Optional_Extensions_Script_Provider_For_BS Fsplitgid $pkgname-scripting-javascript $Fdestdir/gid_Module_Optional_Extensions_Script_Provider_For_JS diff --git a/source/xapps/libreoffice/installer.patch b/source/xapps/libreoffice/installer.patch new file mode 100644 index 0000000..ec37977 --- /dev/null +++ b/source/xapps/libreoffice/installer.patch @@ -0,0 +1,21 @@ +--- solenv/bin/modules/installer/worker.pm.orig 2013-11-11 06:15:30.717721872 +0100 ++++ solenv/bin/modules/installer/worker.pm 2013-11-11 08:57:10.882562943 +0100 +@@ -23,6 +23,7 @@ + use File::stat; + use File::Temp qw(tmpnam); + use File::Path; ++use File::Basename; + use installer::control; + use installer::converter; + use installer::exiter; +@@ -369,7 +370,9 @@ + my $onelink = ${$unixlinksarray}[$i]; + my $target = $onelink->{'Target'}; + my $destination = $onelink->{'destination'}; +- my $cmd = "ln -sf '$target' '$destdir$destination'"; ++ my $cmd = "mkdir -p '" . dirname($destdir . $destination) . "'"; ++ system($cmd) && die "Failed to execute \"$cmd\""; ++ $cmd = "ln -sf '$target' '$destdir$destination'"; + + system($cmd) && die "Failed \"$cmd\""; + push @lines, "$destination\n"; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
