Date: Sunday, July 30, 2017 @ 09:03:39 Author: andyrtr Revision: 301409
archrelease: copy trunk to testing-i686, testing-x86_64 Added: libreoffice-fresh/repos/testing-i686/PKGBUILD (from rev 301408, libreoffice-fresh/trunk/PKGBUILD) libreoffice-fresh/repos/testing-i686/libreoffice-fresh.csh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.csh) libreoffice-fresh/repos/testing-i686/libreoffice-fresh.sh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.sh) libreoffice-fresh/repos/testing-i686/make-pyuno-work-with-system-wide-module-install.diff (from rev 301408, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff) libreoffice-fresh/repos/testing-x86_64/PKGBUILD (from rev 301408, libreoffice-fresh/trunk/PKGBUILD) libreoffice-fresh/repos/testing-x86_64/libreoffice-fresh.csh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.csh) libreoffice-fresh/repos/testing-x86_64/libreoffice-fresh.sh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.sh) libreoffice-fresh/repos/testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 301408, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff) Deleted: libreoffice-fresh/repos/testing-i686/PKGBUILD libreoffice-fresh/repos/testing-i686/libreoffice-fresh.csh libreoffice-fresh/repos/testing-i686/libreoffice-fresh.sh libreoffice-fresh/repos/testing-i686/make-pyuno-work-with-system-wide-module-install.diff libreoffice-fresh/repos/testing-x86_64/PKGBUILD libreoffice-fresh/repos/testing-x86_64/libreoffice-fresh.csh libreoffice-fresh/repos/testing-x86_64/libreoffice-fresh.sh libreoffice-fresh/repos/testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff ---------------------------------------------------------------------+ /PKGBUILD | 752 ++++++++++ /libreoffice-fresh.csh | 12 /libreoffice-fresh.sh | 12 /make-pyuno-work-with-system-wide-module-install.diff | 36 testing-i686/PKGBUILD | 378 ----- testing-i686/libreoffice-fresh.csh | 6 testing-i686/libreoffice-fresh.sh | 6 testing-i686/make-pyuno-work-with-system-wide-module-install.diff | 18 testing-x86_64/PKGBUILD | 378 ----- testing-x86_64/libreoffice-fresh.csh | 6 testing-x86_64/libreoffice-fresh.sh | 6 testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff | 18 12 files changed, 812 insertions(+), 816 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-i686/PKGBUILD 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,378 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> - -# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) -# Note: These are for Arch Linux use ONLY. For your own distribution, please -# get your own set of keys. Feel free to contact foutre...@archlinux.org for -# more information. -_google_default_client_id=413772536636.apps.googleusercontent.com -_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 - -pkgbase=libreoffice-fresh -pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=5.3.4.2 -pkgver=5.3.4 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' - 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' - 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' - 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' - 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' - 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs' - 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' - 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' - 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl' - 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' - 'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker' - 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' - 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' - 'libtommath' 'libzmf') - -_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -_additional_source_url="http://dev-www.libreoffice.org/src" -_additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} - ${_additional_source_url}/boost_1_60_0.tar.bz2 - ${_additional_source_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/commons-logging-1.2-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - ${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2 - ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 - ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - ${_additional_source_url}/libgltf/libgltf-0.0.2.tar.bz2 - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/libfreehand-0.1.1.tar.bz2 - ${_additional_source_url}/libstaroffice-0.0.2.tar.bz2 - ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 - ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite - ${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite - ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - make-pyuno-work-with-system-wide-module-install.diff - libreoffice-fresh.sh libreoffice-fresh.csh) -noextract=(boost_1_60_0.tar.bz2 - 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - commons-logging-1.2-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - language-subtag-registry-2015-08-04.tar.bz2 - 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - OpenCOLLADA-master-6509aa13af.tar.bz2 - 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libgltf-0.0.2.tar.bz2 - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - libfreehand-0.1.1.tar.bz2 - libstaroffice-0.0.2.tar.bz2 - Firebird-3.0.0.32483-0.tar.bz2 - 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar - a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar - 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz - 185d60944ea767075d27247c3162b3bc-unowinreg.dll) -validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <bu...@documentfoundation.org> -sha256sums=('1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379' - 'SKIP' - 'ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a' - 'SKIP' - '0f5acb29e93ab8a75a216e82c87192aabcf29fe8bada8e968cc7b255fcdf81af' - 'SKIP' - '686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b' - '41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f' - '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' - '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' - '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' - '49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81' - '75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba' - '085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045' - '5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b' - '3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8' - '05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343' - 'abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095' - 'e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743' - '7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66' - 'e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772' - '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' - 'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9' - 'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb' - '8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4' - 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' - 'd1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b' - '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' - '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' - '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877' - 'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899' - '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' - 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' - 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' - 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' - 'ff546050a1789b0cf62369524fe939526541e32a74bdd0c9137bbe0d40d7f533' - '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' - 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') - -prepare() { - - cd libreoffice-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - # don't run broken tests on i686 - [ "$CARCH" = "i686" ] && sed -i "/CppunitTest_sw_ooxmlexport7/d" sw/Module_sw.mk - - # unowinreg.dll must be a file not a symlink or the result will become a broken symlink - # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll - rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll - cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources - - # fix not upstreamable pyuno paths - FS#54250 - patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done -} - -build() { - cd libreoffice-$_LOver - - # strip -s from Makeflags in case you use it to shorten build logs - _MAKEFLAGS=${MAKEFLAGS/-s/} - - ./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \ - --with-vendor="Arch Linux" \ - --enable-split-app-modules \ - --with-parallelism=${_MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --enable-release-build \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --with-lang="" \ - --with-help \ - --disable-avahi \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --enable-kde4\ - --enable-gtk3 \ - --enable-introspection \ - --disable-gstreamer-0-10 \ - --enable-openssl \ - --enable-odk\ - --enable-orcus \ - --enable-python=system \ - --enable-scripting-beanshell \ - --enable-scripting-javascript \ - --disable-telepathy \ - --disable-dconf \ - --enable-ext-wiki-publisher \ - --enable-ext-nlpsolver \ - --without-fonts\ - --with-system-apr \ - --with-system-libcdr \ - --with-system-mdds\ - --without-myspell-dicts \ - --with-system-libvisio \ - --with-system-libcmis \ - --with-system-libmspub \ - --with-system-libexttextcat \ - --with-system-orcus \ - --with-system-liblangtag \ - --without-system-jfreereport \ - --without-system-apache-commons \ - --with-system-libodfgen \ - --with-system-libmwaw \ - --with-system-libetonyek \ - --without-system-libfreehand \ - --without-system-firebird \ - --with-system-libtommath \ - --with-system-libatomic-ops \ - --with-system-libebook \ - --with-system-libabw \ - --with-system-coinmp \ - --without-system-libgltf \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-glew \ - --with-system-glm \ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --with-system-libzmf \ - --without-system-libstaroffice \ - --with-system-serf \ - --with-jdk-home="/usr/lib/jvm/default" \ - --with-ant-home="/usr/share/apache-ant"\ - --without-system-boost\ - --with-system-icu \ - --with-system-cairo \ - --with-system-libs \ - --with-system-mythes \ - --with-system-headers \ - --without-system-hsqldb \ - --with-alloc=system \ - --with-system-clucene \ - --with-gdrive-client-id=${_google_default_client_id} \ - --with-gdrive-client-secret=${_google_default_client_secret} \ - --disable-dependency-tracking - - touch src.downloaded - - # many tests are broken when crossbuilding i686 - if [ "$CARCH" = "x86_64" ]; then - make build - else - make build-nocheck - fi - - mkdir ${srcdir}/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-fresh-sdk() { - pkgdesc="Software Development Kit for LibreOffice Fresh" - depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - provides=('libreoffice-sdk') - conflicts=('libreoffice-still-sdk') - - for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do - install -dm755 ${pkgdir}/${dir/\%dir/} - done - - for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do - dirname=$(dirname $file) - [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname - mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file - done - - # fix environment path to keep compatibility with other java-environments - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \ - ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh - - # fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + - - # add LibreOfficeKit headers; FS#48066 - install -dm755 ${pkgdir}/usr/include/LibreOfficeKit - install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/* ${pkgdir}/usr/include/LibreOfficeKit -} - -package_libreoffice-fresh() { - pkgdesc="LibreOffice branch which contains new features and program enhancements" - depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' - 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' - 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' - 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' - 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' - 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker' - 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' - 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' 'liborcus' - 'libtommath' 'libzmf' 'libatomic_ops') - optdepends=('java-runtime: adds java support' - 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' - 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'libmythes: for use in thesaurus' - 'beanshell: interactive java -- good for prototyping/macros' - 'libwpg: library for importing and converting WordPerfect Graphics format' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'gst-plugins-base-libs: for multimedia content, e.g. in Impress' - 'libpaper: takes care of papersize' - 'postgresql-libs: for postgresql-connector' - 'coin-or-mp: required by the Calc solver' - 'gtk2: for GTK2 integration' - 'gtk3: for GTK3 integration' - 'kdelibs: for KDE desktop integration') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf - etc/profile.d/libreoffice-fresh.sh - etc/profile.d/libreoffice-fresh.csh) - provides=('libreoffice' 'libreoffice-en-US') - conflicts=('libreoffice-still') - - mv fakeinstall/* ${pkgdir}/ - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \ - ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \ - ${pkgdir}/etc/libreoffice/ - - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - # allow to preset desired VLC - install -dm755 ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/ - - # make pyuno find its modules - install -dm755 ${pkgdir}/usr/lib/python3.6/site-packages - ln -svf /usr/lib/libreoffice/program/uno.py \ - ${pkgdir}/usr/lib/python3.6/site-packages/uno.py - ln -svf /usr/lib/libreoffice/program/unohelper.py \ - ${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py - - # add a symlink required for gnome-documents; FS#51887 - # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html - ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \ - ${pkgdir}/usr/lib/liblibreofficekitgtk.so - - # cleanup - rm -rf ${pkgdir}/usr/share/libreoffice/sdk - - # add application descriptions - install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ - ${pkgdir}/usr/share/appdata -} Copied: libreoffice-fresh/repos/testing-i686/PKGBUILD (from rev 301408, libreoffice-fresh/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,376 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) +# Note: These are for Arch Linux use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact foutre...@archlinux.org for +# more information. +_google_default_client_id=413772536636.apps.googleusercontent.com +_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 + +pkgbase=libreoffice-fresh +pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') +_LOver=5.4.0.3 +pkgver=5.4.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' + 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' + 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' + 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs' + 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' + 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' + 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl' + 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' + 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'glm' 'libxinerama' 'libpagemaker' + 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' + 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' + 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode') + +_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="https://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} + ${_additional_source_url}/boost_1_63_0.tar.bz2 + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/commons-logging-1.2-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2 + ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 + ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url}/libgltf/libgltf-0.1.0.tar.gz + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/libfreehand-0.1.1.tar.bz2 + ${_additional_source_url}/libstaroffice-0.0.3.tar.xz + ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 + ${_additional_source_url}/pdfium-3064.tar.bz2 + ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite + ${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + make-pyuno-work-with-system-wide-module-install.diff + libreoffice-fresh.sh libreoffice-fresh.csh) +noextract=(boost_1_63_0.tar.bz2 + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + commons-logging-1.2-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + language-subtag-registry-2015-08-04.tar.bz2 + 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 + OpenCOLLADA-master-6509aa13af.tar.bz2 + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + libgltf-0.1.0.tar.gz + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + libfreehand-0.1.1.tar.bz2 + libstaroffice-0.0.3.tar.xz + Firebird-3.0.0.32483-0.tar.bz2 + pdfium-3064.tar.bz2 + 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar + a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar + 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz + 185d60944ea767075d27247c3162b3bc-unowinreg.dll) +validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <bu...@documentfoundation.org> +sha256sums=('17b29d05349b0db15f606f2d630e84c0969c89af6bd06aad8d75a074ee2add94' + 'SKIP' + 'e1460aee386733725e0d734bb5fed4866c93b0342a49936eb45ec350e45e27d9' + 'SKIP' + '579f79ba01e6e9046ce99895540cef6d8987e2445cedba4fb78d2969e593145e' + 'SKIP' + 'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0' + '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' + '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' + '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' + '49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81' + '75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba' + '085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045' + '5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b' + '3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8' + '05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343' + 'abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095' + 'e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743' + '7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66' + 'e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772' + '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' + 'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9' + 'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb' + '8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4' + 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' + '119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da' + '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' + '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' + '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877' + 'bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6' + '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' + 'ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883' + 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' + 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' + 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' + 'ff546050a1789b0cf62369524fe939526541e32a74bdd0c9137bbe0d40d7f533' + '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' + 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') + +prepare() { + + cd libreoffice-$_LOver + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # don't run broken tests + sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk + + # unowinreg.dll must be a file not a symlink or the result will become a broken symlink + # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll + rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll + cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources + + # fix not upstreamable pyuno paths - FS#54250 + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done +} + +build() { + cd libreoffice-$_LOver + + # strip -s from Makeflags in case you use it to shorten build logs + _MAKEFLAGS=${MAKEFLAGS/-s/} + + ./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \ + --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${_MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --enable-release-build \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --with-help \ + --disable-avahi \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --enable-kde4\ + --enable-gtk3 \ + --enable-introspection \ + --disable-gstreamer-0-10 \ + --enable-openssl \ + --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --disable-dconf \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --with-system-apr \ + --with-system-libcdr \ + --with-system-mdds\ + --without-myspell-dicts \ + --with-system-libvisio \ + --with-system-libcmis \ + --with-system-libmspub \ + --with-system-libexttextcat \ + --with-system-orcus \ + --with-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --with-system-libodfgen \ + --with-system-libmwaw \ + --with-system-libetonyek \ + --without-system-libfreehand \ + --without-system-firebird \ + --with-system-libtommath \ + --with-system-libatomic-ops \ + --with-system-libebook \ + --with-system-libabw \ + --with-system-coinmp \ + --without-system-libgltf \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-glm \ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --with-system-libzmf \ + --with-system-gpgmepp \ + --without-system-libstaroffice \ + --with-system-serf \ + --with-jdk-home="/usr/lib/jvm/default" \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-icu \ + --with-system-cairo \ + --with-system-libs \ + --with-system-mythes \ + --with-system-headers \ + --without-system-hsqldb \ + --with-alloc=system \ + --with-system-clucene \ + --with-gdrive-client-id=${_google_default_client_id} \ + --with-gdrive-client-secret=${_google_default_client_secret} \ + --disable-dependency-tracking + + touch src.downloaded + + # many tests are broken when crossbuilding i686 + if [ "$CARCH" = "x86_64" ]; then + make build + else + make build-nocheck + fi + + mkdir ${srcdir}/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-fresh-sdk() { + pkgdesc="Software Development Kit for LibreOffice Fresh" + depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + provides=('libreoffice-sdk') + conflicts=('libreoffice-still-sdk') + + for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do + install -dm755 ${pkgdir}/${dir/\%dir/} + done + + for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do + dirname=$(dirname $file) + [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname + mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file + done + + # fix environment path to keep compatibility with other java-environments + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \ + ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh + + # fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + + + # add LibreOfficeKit headers; FS#48066 + install -dm755 ${pkgdir}/usr/include/LibreOfficeKit + install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/* ${pkgdir}/usr/include/LibreOfficeKit +} + +package_libreoffice-fresh() { + pkgdesc="LibreOffice branch which contains new features and program enhancements" + depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' + 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' + 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' + 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker' + 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' + 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' 'liborcus' + 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec') + optdepends=('java-runtime: adds java support' + 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping/macros' + 'libwpg: library for importing and converting WordPerfect Graphics format' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: for multimedia content, e.g. in Impress' + 'libpaper: takes care of papersize' + 'postgresql-libs: for postgresql-connector' + 'coin-or-mp: required by the Calc solver' + 'gtk2: for GTK2 integration' + 'gtk3: for GTK3 integration' + 'kdelibs: for KDE desktop integration') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-fresh.sh + etc/profile.d/libreoffice-fresh.csh) + provides=('libreoffice' 'libreoffice-en-US') + conflicts=('libreoffice-still') + + mv fakeinstall/* ${pkgdir}/ + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \ + ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \ + ${pkgdir}/etc/libreoffice/ + + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/ + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.6/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py \ + ${pkgdir}/usr/lib/python3.6/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py \ + ${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py + + # add a symlink required for gnome-documents; FS#51887 + # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html + ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \ + ${pkgdir}/usr/lib/liblibreofficekitgtk.so + + # cleanup + rm -rf ${pkgdir}/usr/share/libreoffice/sdk + + # add application descriptions + install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ + ${pkgdir}/usr/share/appdata +} Deleted: testing-i686/libreoffice-fresh.csh =================================================================== --- testing-i686/libreoffice-fresh.csh 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-i686/libreoffice-fresh.csh 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN kde4 -#setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 Copied: libreoffice-fresh/repos/testing-i686/libreoffice-fresh.csh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.csh) =================================================================== --- testing-i686/libreoffice-fresh.csh (rev 0) +++ testing-i686/libreoffice-fresh.csh 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 Deleted: testing-i686/libreoffice-fresh.sh =================================================================== --- testing-i686/libreoffice-fresh.sh 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-i686/libreoffice-fresh.sh 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=kde4 -#export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 Copied: libreoffice-fresh/repos/testing-i686/libreoffice-fresh.sh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.sh) =================================================================== --- testing-i686/libreoffice-fresh.sh (rev 0) +++ testing-i686/libreoffice-fresh.sh 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 Deleted: testing-i686/make-pyuno-work-with-system-wide-module-install.diff =================================================================== --- testing-i686/make-pyuno-work-with-system-wide-module-install.diff 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-i686/make-pyuno-work-with-system-wide-module-install.diff 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,18 +0,0 @@ ---- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200 -+++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200 -@@ -16,8 +16,14 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # --import pyuno -+ -+# Special modification to make uno load on Arch -+import os - import sys -+sys.path.append("/usr/lib/libreoffice/program/") -+os.putenv("URE_BOOTSTRAP", "vnd.sun.start.pathname:/usr/lib/libreoffice/program/fundamentalrc") -+ -+import pyuno - import traceback - import warnings - Copied: libreoffice-fresh/repos/testing-i686/make-pyuno-work-with-system-wide-module-install.diff (from rev 301408, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff) =================================================================== --- testing-i686/make-pyuno-work-with-system-wide-module-install.diff (rev 0) +++ testing-i686/make-pyuno-work-with-system-wide-module-install.diff 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,18 @@ +--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200 ++++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200 +@@ -16,8 +16,14 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # +-import pyuno ++ ++# Special modification to make uno load on Arch ++import os + import sys ++sys.path.append("/usr/lib/libreoffice/program/") ++os.putenv("URE_BOOTSTRAP", "vnd.sun.start.pathname:/usr/lib/libreoffice/program/fundamentalrc") ++ ++import pyuno + import traceback + import warnings + Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-x86_64/PKGBUILD 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,378 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> - -# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) -# Note: These are for Arch Linux use ONLY. For your own distribution, please -# get your own set of keys. Feel free to contact foutre...@archlinux.org for -# more information. -_google_default_client_id=413772536636.apps.googleusercontent.com -_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 - -pkgbase=libreoffice-fresh -pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=5.3.4.2 -pkgver=5.3.4 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' - 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' - 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' - 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' - 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' - 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs' - 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' - 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' - 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl' - 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' - 'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker' - 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' - 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' - 'libtommath' 'libzmf') - -_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -_additional_source_url="http://dev-www.libreoffice.org/src" -_additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} - ${_additional_source_url}/boost_1_60_0.tar.bz2 - ${_additional_source_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/commons-logging-1.2-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - ${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2 - ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 - ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - ${_additional_source_url}/libgltf/libgltf-0.0.2.tar.bz2 - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/libfreehand-0.1.1.tar.bz2 - ${_additional_source_url}/libstaroffice-0.0.2.tar.bz2 - ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 - ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite - ${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite - ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - make-pyuno-work-with-system-wide-module-install.diff - libreoffice-fresh.sh libreoffice-fresh.csh) -noextract=(boost_1_60_0.tar.bz2 - 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - commons-logging-1.2-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - language-subtag-registry-2015-08-04.tar.bz2 - 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - OpenCOLLADA-master-6509aa13af.tar.bz2 - 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libgltf-0.0.2.tar.bz2 - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - libfreehand-0.1.1.tar.bz2 - libstaroffice-0.0.2.tar.bz2 - Firebird-3.0.0.32483-0.tar.bz2 - 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar - a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar - 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz - 185d60944ea767075d27247c3162b3bc-unowinreg.dll) -validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <bu...@documentfoundation.org> -sha256sums=('1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379' - 'SKIP' - 'ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a' - 'SKIP' - '0f5acb29e93ab8a75a216e82c87192aabcf29fe8bada8e968cc7b255fcdf81af' - 'SKIP' - '686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b' - '41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f' - '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' - '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' - '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' - '49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81' - '75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba' - '085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045' - '5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b' - '3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8' - '05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343' - 'abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095' - 'e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743' - '7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66' - 'e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772' - '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' - 'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9' - 'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb' - '8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4' - 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' - 'd1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b' - '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' - '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' - '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877' - 'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899' - '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' - 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' - 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' - 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' - 'ff546050a1789b0cf62369524fe939526541e32a74bdd0c9137bbe0d40d7f533' - '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' - 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') - -prepare() { - - cd libreoffice-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - # don't run broken tests on i686 - [ "$CARCH" = "i686" ] && sed -i "/CppunitTest_sw_ooxmlexport7/d" sw/Module_sw.mk - - # unowinreg.dll must be a file not a symlink or the result will become a broken symlink - # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll - rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll - cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources - - # fix not upstreamable pyuno paths - FS#54250 - patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done -} - -build() { - cd libreoffice-$_LOver - - # strip -s from Makeflags in case you use it to shorten build logs - _MAKEFLAGS=${MAKEFLAGS/-s/} - - ./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \ - --with-vendor="Arch Linux" \ - --enable-split-app-modules \ - --with-parallelism=${_MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --enable-release-build \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --with-lang="" \ - --with-help \ - --disable-avahi \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --enable-kde4\ - --enable-gtk3 \ - --enable-introspection \ - --disable-gstreamer-0-10 \ - --enable-openssl \ - --enable-odk\ - --enable-orcus \ - --enable-python=system \ - --enable-scripting-beanshell \ - --enable-scripting-javascript \ - --disable-telepathy \ - --disable-dconf \ - --enable-ext-wiki-publisher \ - --enable-ext-nlpsolver \ - --without-fonts\ - --with-system-apr \ - --with-system-libcdr \ - --with-system-mdds\ - --without-myspell-dicts \ - --with-system-libvisio \ - --with-system-libcmis \ - --with-system-libmspub \ - --with-system-libexttextcat \ - --with-system-orcus \ - --with-system-liblangtag \ - --without-system-jfreereport \ - --without-system-apache-commons \ - --with-system-libodfgen \ - --with-system-libmwaw \ - --with-system-libetonyek \ - --without-system-libfreehand \ - --without-system-firebird \ - --with-system-libtommath \ - --with-system-libatomic-ops \ - --with-system-libebook \ - --with-system-libabw \ - --with-system-coinmp \ - --without-system-libgltf \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-glew \ - --with-system-glm \ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --with-system-libzmf \ - --without-system-libstaroffice \ - --with-system-serf \ - --with-jdk-home="/usr/lib/jvm/default" \ - --with-ant-home="/usr/share/apache-ant"\ - --without-system-boost\ - --with-system-icu \ - --with-system-cairo \ - --with-system-libs \ - --with-system-mythes \ - --with-system-headers \ - --without-system-hsqldb \ - --with-alloc=system \ - --with-system-clucene \ - --with-gdrive-client-id=${_google_default_client_id} \ - --with-gdrive-client-secret=${_google_default_client_secret} \ - --disable-dependency-tracking - - touch src.downloaded - - # many tests are broken when crossbuilding i686 - if [ "$CARCH" = "x86_64" ]; then - make build - else - make build-nocheck - fi - - mkdir ${srcdir}/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-fresh-sdk() { - pkgdesc="Software Development Kit for LibreOffice Fresh" - depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - provides=('libreoffice-sdk') - conflicts=('libreoffice-still-sdk') - - for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do - install -dm755 ${pkgdir}/${dir/\%dir/} - done - - for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do - dirname=$(dirname $file) - [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname - mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file - done - - # fix environment path to keep compatibility with other java-environments - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \ - ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh - - # fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + - - # add LibreOfficeKit headers; FS#48066 - install -dm755 ${pkgdir}/usr/include/LibreOfficeKit - install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/* ${pkgdir}/usr/include/LibreOfficeKit -} - -package_libreoffice-fresh() { - pkgdesc="LibreOffice branch which contains new features and program enhancements" - depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' - 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' - 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' - 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' - 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' - 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker' - 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' - 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' 'liborcus' - 'libtommath' 'libzmf' 'libatomic_ops') - optdepends=('java-runtime: adds java support' - 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' - 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'libmythes: for use in thesaurus' - 'beanshell: interactive java -- good for prototyping/macros' - 'libwpg: library for importing and converting WordPerfect Graphics format' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'gst-plugins-base-libs: for multimedia content, e.g. in Impress' - 'libpaper: takes care of papersize' - 'postgresql-libs: for postgresql-connector' - 'coin-or-mp: required by the Calc solver' - 'gtk2: for GTK2 integration' - 'gtk3: for GTK3 integration' - 'kdelibs: for KDE desktop integration') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf - etc/profile.d/libreoffice-fresh.sh - etc/profile.d/libreoffice-fresh.csh) - provides=('libreoffice' 'libreoffice-en-US') - conflicts=('libreoffice-still') - - mv fakeinstall/* ${pkgdir}/ - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \ - ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \ - ${pkgdir}/etc/libreoffice/ - - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - # allow to preset desired VLC - install -dm755 ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/ - - # make pyuno find its modules - install -dm755 ${pkgdir}/usr/lib/python3.6/site-packages - ln -svf /usr/lib/libreoffice/program/uno.py \ - ${pkgdir}/usr/lib/python3.6/site-packages/uno.py - ln -svf /usr/lib/libreoffice/program/unohelper.py \ - ${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py - - # add a symlink required for gnome-documents; FS#51887 - # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html - ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \ - ${pkgdir}/usr/lib/liblibreofficekitgtk.so - - # cleanup - rm -rf ${pkgdir}/usr/share/libreoffice/sdk - - # add application descriptions - install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ - ${pkgdir}/usr/share/appdata -} Copied: libreoffice-fresh/repos/testing-x86_64/PKGBUILD (from rev 301408, libreoffice-fresh/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,376 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) +# Note: These are for Arch Linux use ONLY. For your own distribution, please +# get your own set of keys. Feel free to contact foutre...@archlinux.org for +# more information. +_google_default_client_id=413772536636.apps.googleusercontent.com +_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 + +pkgbase=libreoffice-fresh +pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') +_LOver=5.4.0.3 +pkgver=5.4.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' + 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' + 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' + 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs' + 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' + 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' + 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl' + 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' + 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'glm' 'libxinerama' 'libpagemaker' + 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' + 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' + 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode') + +_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" +#_mirror="https://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} + ${_additional_source_url}/boost_1_63_0.tar.bz2 + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/commons-logging-1.2-src.tar.gz + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2 + ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 + ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url}/libgltf/libgltf-0.1.0.tar.gz + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/libfreehand-0.1.1.tar.bz2 + ${_additional_source_url}/libstaroffice-0.0.3.tar.xz + ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 + ${_additional_source_url}/pdfium-3064.tar.bz2 + ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite + ${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + make-pyuno-work-with-system-wide-module-install.diff + libreoffice-fresh.sh libreoffice-fresh.csh) +noextract=(boost_1_63_0.tar.bz2 + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + commons-logging-1.2-src.tar.gz + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + language-subtag-registry-2015-08-04.tar.bz2 + 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 + OpenCOLLADA-master-6509aa13af.tar.bz2 + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + libgltf-0.1.0.tar.gz + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + libfreehand-0.1.1.tar.bz2 + libstaroffice-0.0.3.tar.xz + Firebird-3.0.0.32483-0.tar.bz2 + pdfium-3064.tar.bz2 + 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar + a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar + 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz + 185d60944ea767075d27247c3162b3bc-unowinreg.dll) +validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <bu...@documentfoundation.org> +sha256sums=('17b29d05349b0db15f606f2d630e84c0969c89af6bd06aad8d75a074ee2add94' + 'SKIP' + 'e1460aee386733725e0d734bb5fed4866c93b0342a49936eb45ec350e45e27d9' + 'SKIP' + '579f79ba01e6e9046ce99895540cef6d8987e2445cedba4fb78d2969e593145e' + 'SKIP' + 'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0' + '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' + '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' + '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' + '49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81' + '75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba' + '085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045' + '5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b' + '3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8' + '05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343' + 'abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095' + 'e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743' + '7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66' + 'e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772' + '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' + 'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9' + 'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb' + '8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4' + 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' + '119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da' + '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' + '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' + '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877' + 'bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6' + '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' + 'ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883' + 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' + 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' + 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' + 'ff546050a1789b0cf62369524fe939526541e32a74bdd0c9137bbe0d40d7f533' + '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' + 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') + +prepare() { + + cd libreoffice-$_LOver + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # don't run broken tests + sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk + + # unowinreg.dll must be a file not a symlink or the result will become a broken symlink + # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll + rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll + cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources + + # fix not upstreamable pyuno paths - FS#54250 + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done +} + +build() { + cd libreoffice-$_LOver + + # strip -s from Makeflags in case you use it to shorten build logs + _MAKEFLAGS=${MAKEFLAGS/-s/} + + ./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \ + --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${_MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --enable-release-build \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --with-help \ + --disable-avahi \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --enable-kde4\ + --enable-gtk3 \ + --enable-introspection \ + --disable-gstreamer-0-10 \ + --enable-openssl \ + --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --disable-dconf \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --with-system-apr \ + --with-system-libcdr \ + --with-system-mdds\ + --without-myspell-dicts \ + --with-system-libvisio \ + --with-system-libcmis \ + --with-system-libmspub \ + --with-system-libexttextcat \ + --with-system-orcus \ + --with-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --with-system-libodfgen \ + --with-system-libmwaw \ + --with-system-libetonyek \ + --without-system-libfreehand \ + --without-system-firebird \ + --with-system-libtommath \ + --with-system-libatomic-ops \ + --with-system-libebook \ + --with-system-libabw \ + --with-system-coinmp \ + --without-system-libgltf \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-glm \ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --with-system-libzmf \ + --with-system-gpgmepp \ + --without-system-libstaroffice \ + --with-system-serf \ + --with-jdk-home="/usr/lib/jvm/default" \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-icu \ + --with-system-cairo \ + --with-system-libs \ + --with-system-mythes \ + --with-system-headers \ + --without-system-hsqldb \ + --with-alloc=system \ + --with-system-clucene \ + --with-gdrive-client-id=${_google_default_client_id} \ + --with-gdrive-client-secret=${_google_default_client_secret} \ + --disable-dependency-tracking + + touch src.downloaded + + # many tests are broken when crossbuilding i686 + if [ "$CARCH" = "x86_64" ]; then + make build + else + make build-nocheck + fi + + mkdir ${srcdir}/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-fresh-sdk() { + pkgdesc="Software Development Kit for LibreOffice Fresh" + depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + provides=('libreoffice-sdk') + conflicts=('libreoffice-still-sdk') + + for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do + install -dm755 ${pkgdir}/${dir/\%dir/} + done + + for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do + dirname=$(dirname $file) + [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname + mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file + done + + # fix environment path to keep compatibility with other java-environments + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \ + ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh + + # fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} + + + # add LibreOfficeKit headers; FS#48066 + install -dm755 ${pkgdir}/usr/include/LibreOfficeKit + install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/* ${pkgdir}/usr/include/LibreOfficeKit +} + +package_libreoffice-fresh() { + pkgdesc="LibreOffice branch which contains new features and program enhancements" + depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' + 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' + 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' + 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' + 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker' + 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' + 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' 'liborcus' + 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec') + optdepends=('java-runtime: adds java support' + 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping/macros' + 'libwpg: library for importing and converting WordPerfect Graphics format' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: for multimedia content, e.g. in Impress' + 'libpaper: takes care of papersize' + 'postgresql-libs: for postgresql-connector' + 'coin-or-mp: required by the Calc solver' + 'gtk2: for GTK2 integration' + 'gtk3: for GTK3 integration' + 'kdelibs: for KDE desktop integration') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-fresh.sh + etc/profile.d/libreoffice-fresh.csh) + provides=('libreoffice' 'libreoffice-en-US') + conflicts=('libreoffice-still') + + mv fakeinstall/* ${pkgdir}/ + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \ + ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \ + ${pkgdir}/etc/libreoffice/ + + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/ + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.6/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py \ + ${pkgdir}/usr/lib/python3.6/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py \ + ${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py + + # add a symlink required for gnome-documents; FS#51887 + # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html + ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \ + ${pkgdir}/usr/lib/liblibreofficekitgtk.so + + # cleanup + rm -rf ${pkgdir}/usr/share/libreoffice/sdk + + # add application descriptions + install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ + ${pkgdir}/usr/share/appdata +} Deleted: testing-x86_64/libreoffice-fresh.csh =================================================================== --- testing-x86_64/libreoffice-fresh.csh 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-x86_64/libreoffice-fresh.csh 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN kde4 -#setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 Copied: libreoffice-fresh/repos/testing-x86_64/libreoffice-fresh.csh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.csh) =================================================================== --- testing-x86_64/libreoffice-fresh.csh (rev 0) +++ testing-x86_64/libreoffice-fresh.csh 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 Deleted: testing-x86_64/libreoffice-fresh.sh =================================================================== --- testing-x86_64/libreoffice-fresh.sh 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-x86_64/libreoffice-fresh.sh 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=kde4 -#export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 Copied: libreoffice-fresh/repos/testing-x86_64/libreoffice-fresh.sh (from rev 301408, libreoffice-fresh/trunk/libreoffice-fresh.sh) =================================================================== --- testing-x86_64/libreoffice-fresh.sh (rev 0) +++ testing-x86_64/libreoffice-fresh.sh 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 Deleted: testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff =================================================================== --- testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff 2017-07-30 09:03:15 UTC (rev 301408) +++ testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff 2017-07-30 09:03:39 UTC (rev 301409) @@ -1,18 +0,0 @@ ---- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200 -+++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200 -@@ -16,8 +16,14 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # --import pyuno -+ -+# Special modification to make uno load on Arch -+import os - import sys -+sys.path.append("/usr/lib/libreoffice/program/") -+os.putenv("URE_BOOTSTRAP", "vnd.sun.start.pathname:/usr/lib/libreoffice/program/fundamentalrc") -+ -+import pyuno - import traceback - import warnings - Copied: libreoffice-fresh/repos/testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 301408, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff) =================================================================== --- testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff (rev 0) +++ testing-x86_64/make-pyuno-work-with-system-wide-module-install.diff 2017-07-30 09:03:39 UTC (rev 301409) @@ -0,0 +1,18 @@ +--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200 ++++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200 +@@ -16,8 +16,14 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # +-import pyuno ++ ++# Special modification to make uno load on Arch ++import os + import sys ++sys.path.append("/usr/lib/libreoffice/program/") ++os.putenv("URE_BOOTSTRAP", "vnd.sun.start.pathname:/usr/lib/libreoffice/program/fundamentalrc") ++ ++import pyuno + import traceback + import warnings +