From 5898d76e47144f2366f9acda9ab52827b696c2d5 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 20 Jun 2013 01:16:55 -0700 Subject: Thu Jun 20 01:16:07 PDT 2013 --- extra/isapnptools/PKGBUILD | 5 +- extra/libdmtx/PKGBUILD | 10 +- extra/libiodbc/PKGBUILD | 15 +- extra/libreoffice/PKGBUILD | 34 +- extra/libreoffice/PKGBUILD.41 | 660 +++++++++++++++++++++++++++++++++++++ extra/libreoffice/fix_install.diff | 82 +++++ extra/libreoffice/librelogo.diff | 43 --- extra/racket/PKGBUILD | 6 +- 8 files changed, 777 insertions(+), 78 deletions(-) create mode 100644 extra/libreoffice/PKGBUILD.41 create mode 100644 extra/libreoffice/fix_install.diff delete mode 100644 extra/libreoffice/librelogo.diff (limited to 'extra') diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD index fb0005b72..b5227742f 100644 --- a/extra/isapnptools/PKGBUILD +++ b/extra/isapnptools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185816 2013-05-19 12:09:03Z giovanni $ +# $Id: PKGBUILD 188739 2013-06-19 02:11:11Z eric $ # Maintainer: Giovanni Scafora pkgname=isapnptools @@ -9,7 +9,8 @@ url="http://www.roestock.demon.co.uk/isapnptools/" depends=('glibc') arch=('i686' 'x86_64') license=('GPL') -source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +#source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") +source=("http://ibiblio.org/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz") md5sums=('b997ba56583dc850fce9b93d658dfa0c') build() { diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD index 43a5f4421..cc60149fd 100644 --- a/extra/libdmtx/PKGBUILD +++ b/extra/libdmtx/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 149704 2012-02-09 14:15:34Z andrea $ +# $Id: PKGBUILD 188766 2013-06-19 20:23:44Z andrea $ # Maintainer: Andrea Scarpino # Contributor: jose pkgname=libdmtx pkgver=0.7.4 -pkgrel=3 +pkgrel=4 pkgdesc="A software for reading and writing Data Matrix 2D barcodes" url="http://www.libdmtx.org/" arch=('i686' 'x86_64') license=('GPL2') depends=('glibc') +options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('d3a4c0becd92895eb606dbdb78b023e2') -options=('!libtool') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD index f370cd9b4..72fa0616b 100644 --- a/extra/libiodbc/PKGBUILD +++ b/extra/libiodbc/PKGBUILD @@ -1,36 +1,35 @@ -# $Id: PKGBUILD 4453 2009-10-23 09:11:19Z spupykin $ +# $Id: PKGBUILD 188768 2013-06-19 20:32:16Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Contributor: Sergej Pupykin pkgname=libiodbc pkgver=3.52.8 -pkgrel=1 +pkgrel=2 pkgdesc='Independent Open DataBase Connectivity for Linux' arch=('i686' 'x86_64') url="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/" license=('LGPL') -depends=('glibc' 'sh') +depends=('sh') makedepends=('chrpath') -replaces=('iodbc') -conflicts=('iodbc') options=('!libtool') source=("http://downloads.sourceforge.net/iodbc/${pkgname}-${pkgver}.tar.gz") md5sums=('9889f95f632f10895ff53b8a22162810') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-static \ --includedir=/usr/include/libiodbc \ --disable-gui \ - --disable-libodbc + --disable-libodbc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + chrpath -d ${pkgdir}/usr/bin/iodbctest{,w} rm -rf ${pkgdir}/usr/share/libiodbc/ } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index a81628eb0..eb350d700 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186348 2013-05-25 05:24:32Z foutrelis $ +# $Id: PKGBUILD 188760 2013-06-19 19:35:08Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.3.3 -pkgver=4.0.3 -pkgrel=3 +_LOver=4.0.4.2 +pkgver=4.0.4 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,7 +29,7 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez-libs' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" @@ -74,9 +74,9 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/libcdr-0.0.12.tar.bz2 - ${_additional_source_url}/libmspub-0.0.5.tar.bz2 - ${_additional_source_url}/libvisio-0.0.26.tar.bz2 + ${_additional_source_url}/libcdr-0.0.14.tar.bz2 + ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libvisio-0.0.28.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @@ -108,12 +108,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.12.tar.bz2 - libmspub-0.0.5.tar.bz2 - libvisio-0.0.26.tar.bz2) -md5sums=('7bcde561375f3bbce08f6d05451c8ad7' - '994b1f3015668335c30b53ddd3d60dc8' - '05b9ba0e86181bda3afeadcaba9202a3' + libcdr-0.0.14.tar.bz2 + libmspub-0.0.6.tar.bz2 + libvisio-0.0.28.tar.bz2) +md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' + 'a4d5e6504a3251b7a7fbe17216f8d6e7' + '0ba553eea7284abe1370157bb35bd355' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -143,9 +143,9 @@ md5sums=('7bcde561375f3bbce08f6d05451c8ad7' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - '6db2c96a4ae5977da8b84893c1441038' - '881c4628ec5f54d47f35d5d19e335662' - '2f638cf6f92cec59c9205ac3cbf1702e' + 'd88f9b94df880d2c05be943b000ca112' + '1120705cd0f0d9bd5506360bf57b6c2e' + '05574c2ec54dd0c29d75cacdf9419f44' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') diff --git a/extra/libreoffice/PKGBUILD.41 b/extra/libreoffice/PKGBUILD.41 new file mode 100644 index 000000000..30930fce4 --- /dev/null +++ b/extra/libreoffice/PKGBUILD.41 @@ -0,0 +1,660 @@ +# $Id: PKGBUILD 186347 2013-05-25 05:23:41Z foutrelis $ +# Maintainer: AndyRTR + +pkgbase="libreoffice" +pkgname=('libreoffice-common' + 'libreoffice-base' + 'libreoffice-calc' + 'libreoffice-draw' + 'libreoffice-gnome' + 'libreoffice-impress' + 'libreoffice-kde4' + 'libreoffice-math' + 'libreoffice-sdk' + 'libreoffice-sdk-doc' + 'libreoffice-writer' + 'libreoffice-en-US' + 'libreoffice-postgresql-connector' + 'libreoffice-extension-presentation-minimizer' + 'libreoffice-extension-wiki-publisher' + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) +_LOver=4.1.0.0.beta2 +pkgver=4.1.0 +pkgrel=0.2 #beta2 +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' + 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' + 'clucene' 'bluez-libs' # 'harfbuzz' + # the runtime dependencies + "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'ttf-dejavu') # to satisfy regression tests + +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors + +_mirror="http://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}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz + ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-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}/d8bd5eed178db6e2b18eeed243f85aa8-flute-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}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 + ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz + ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 + ${_additional_source_url}/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 + ${_additional_source_url}/libcdr-0.0.14.tar.bz2 + ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.9.tar.bz2 + ${_additional_source_url}/libvisio-0.0.28.tar.bz2 + make-pyuno-work-with-system-wide-module-install.diff + libreoffice-common.sh libreoffice-common.csh + fix_install.diff) +noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 185d60944ea767075d27247c3162b3bc-unowinreg.dll + 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz + 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-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 + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 + c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 + libcdr-0.0.14.tar.bz2 + libmspub-0.0.6.tar.bz2 + libmwaw-0.1.9.tar.bz2 + libvisio-0.0.28.tar.bz2 ) +md5sums=('a785e1ed4809246edc39d0b55a807cdd' + '96ea39853d9058cb9e98749539827187' + '6ecbe09a87d5c2c1a186671d24643111' + 'f02578f5218f217a9f20e9c30e119c6a' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '625ff5f2f968dd908bca43c9469d6e6b' + '2c9b0f83ed5890af02c0df1c1776f39b' + '2e482c7567908d334785ce7d69ddfff7' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '08c85a6d6d793daee14e10e22eefdc4b' + 'dc3d21a3921931096d6e80f6701f6763' + 'b2371dc7cf4811c9d32146eec913d296' + 'ea2acaf140ae40a87a952caa75184f4d' + '36271d3fa0d9dec1632029b6d7aac925' + '0168229624cfac409e766913506961a8' + '17410483b5b5f267aa18b7e00b65e6e0' + '185d60944ea767075d27247c3162b3bc' + '8473296c671b6e3dd8197f4145e0854b' + 'c48827713e93539dc7285f9e86ffbdc5' + 'd88f9b94df880d2c05be943b000ca112' + '1120705cd0f0d9bd5506360bf57b6c2e' + '2090daf6e8a27b52e8c5f26c915bd7c5' + '05574c2ec54dd0c29d75cacdf9419f44' + '07d2bf5ad839a394cca008b3ec6e7bb1' + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' + 'd1fa6b1b1820cc5a7154720a1dcb0a4a') + +prepare() { + + cd ${srcdir}/libreoffice-$_LOver + + # fix exttextcat build error + # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + unset CPPFLAGS + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + # fix file-lists + # http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1&id=8ce82f83fb8146b684bec5d903d76f034ba37d4a + patch -Np1 -i ${srcdir}/fix_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 + + + # qt4 fix + sed -i "s:qmake:qmake-qt4:g" configure.ac +} + +build() { + cd ${srcdir}/libreoffice-$_LOver + + #autoconf -f + + # non-SMP test build + #export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + + ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-gstreamer \ + --enable-lockdown\ + --enable-opengl \ + --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --without-afms\ + --without-system-libwps\ + --without-system-libcdr \ + --without-system-mdds\ + --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-libmspub \ + --without-system-libexttextcat \ + --without-system-orcus \ + --without-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --without-system-libodfgen \ + --without-system-libmwaw \ + --without-system-harfbuzz \ + --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-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-npapi-headers \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --without-system-hsqldb \ + --with-alloc=system\ + --with-system-clucene\ + --without-system-servlet-api + +# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 + +# --without-ppds\ # breaks spadmin permission + +#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool + + touch src.downloaded + #./download + make + # fake installation to create split file lists + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice-common() { + + pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" + install=libreoffice-common.install + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + optdepends=('libreoffice-langpack: additional language support' + 'java-runtime: adds java support' + 'libcups: adds printing support' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping /macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + groups=('libreoffice') + provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # 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-common.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh + rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py + + # workaround all packages now depend on that file + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-base() { + pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." + install=libreoffice-base.install + depends=('libreoffice-common') + optdepends=('libreoffice-postgresql-connector') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-postgresql-connector() { + pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" + depends=('libreoffice-base' 'postgresql-libs') + groups=('libreoffice') + replaces=('libreoffice') + + # workaround double entries in the file list + mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig + sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-calc() { + pkgdesc="Spreadsheet application for LibreOffice." + install=libreoffice-calc.install + depends=('libreoffice-common' 'lpsolve' ) + #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-draw() { + pkgdesc="Drawing Application for LibreOffice." + install=libreoffice-draw.install + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-gnome() { + pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." + depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3 + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-impress() { + pkgdesc="Presentation Application for LibreOffice." + install=libreoffice-impress.install + depends=('libreoffice-common') + optdepends=('glu: for the OGLTrans extension') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-kde4() { + pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." + depends=('libreoffice-common' 'kdelibs') + optdepends=() + backup=() + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-math() { + pkgdesc="Equation Editor Application for LibreOffice." + depends=('libreoffice-common') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-sdk() { + pkgdesc="Software Development Kit for LibreOffice." + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + 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,csh} +} + +package_libreoffice-sdk-doc() { + pkgdesc="Software Development Kit documentation for LibreOffice" + depends=('libreoffice-common' 'libreoffice-sdk') + groups=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + #fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; +} + +package_libreoffice-writer() { + pkgdesc="Word Processor Application for LibreOffice." + install=libreoffice-writer.install + depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') + optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') + groups=('libreoffice') + replaces=('libreoffice') + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done + + # for workaround this file belongs now to common + rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd +} + +package_libreoffice-en-US() { + pkgdesc="English (US) language pack for LibreOffice" + #arch=('any') + provides=('openoffice-en-US' 'libreoffice-langpack') + replaces=(openoffice-en-US) + conflicts=(openoffice-en-US) + + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + +package_libreoffice-extension-wiki-publisher() { + + pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher +} + +package_libreoffice-extension-nlpsolver() { + + pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" + #arch=('any') + depends=('libreoffice-common' 'java-environment') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver +} diff --git a/extra/libreoffice/fix_install.diff b/extra/libreoffice/fix_install.diff new file mode 100644 index 000000000..b16320a22 --- /dev/null +++ b/extra/libreoffice/fix_install.diff @@ -0,0 +1,82 @@ +From 8ce82f83fb8146b684bec5d903d76f034ba37d4a Mon Sep 17 00:00:00 2001 +From: Petr Mladek +Date: Fri, 07 Jun 2013 12:13:24 +0000 +Subject: distro-install-file-lists: handle new filelists created for 4.1 + +Change-Id: I2d7a52b396a46f1f6546b92eb5612958a2cb7397 +--- +diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists +index d83855b..bbd462b 100755 +--- a/bin/distro-install-file-lists ++++ b/bin/distro-install-file-lists +@@ -80,6 +80,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + gid_Module_Root_Files_[0-9] \ + gid_Module_Root_Hack \ + gid_Module_Oo_Linguistic \ ++ gid_Module_Root_Extension_Dictionary_* \ + gid_Module_Root_Ure_Hidden ; do + merge_flists $module $FILELISTSDIR/common_list.txt + done +@@ -100,6 +101,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/math_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/writer_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/base_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/draw_list.txt ++ + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt + else +@@ -115,6 +119,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/common_list.txt + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt + fi +@@ -133,26 +139,26 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt + fi + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + fi + +@@ -413,7 +419,7 @@ else + create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer + create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress + create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base +- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno ++ create_package_directory gid_Module_Pyuno pkg/python-uno + create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome + create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde + create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/librelogo.diff b/extra/libreoffice/librelogo.diff deleted file mode 100644 index c17143225..000000000 --- a/extra/libreoffice/librelogo.diff +++ /dev/null @@ -1,43 +0,0 @@ -From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Thu, 21 Mar 2013 14:57:18 +0000 -Subject: Missing dependency of librelogo on writer - -...at least due to dependency of librelogo.xcd on writer.xcd, see -82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency." - -Otherwise, having librelogo installed but not writer will cause an uncaught -RuntimeException from configmgr::Components::parseXcdFiles -(configmgr/source/components.cxx) early on in soffice.bin. - -(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3) -Conflicts: - setup_native/source/packinfo/packinfo_office.txt - -Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08 -Reviewed-on: https://gerrit.libreoffice.org/2898 -Reviewed-by: Fridrich Strba -Reviewed-by: Andras Timar -Reviewed-by: Petr Mladek -Tested-by: Petr Mladek ---- -diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt -index 3e8c89e..cbf8c490 100644 ---- a/setup_native/source/packinfo/packinfo_office.txt -+++ b/setup_native/source/packinfo/packinfo_office.txt -@@ -314,10 +314,10 @@ End - Start - module = "gid_Module_Optional_Pyuno_LibreLogo" - solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" --solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython" -+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython" - packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" --freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" --requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" -+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" -+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" - copyright = "2012 The Document Foundation" - solariscopyright = "solariscopyrightfile" - vendor = "The Document Foundation" --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index b9156e4df..c5f3b91ac 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185732 2013-05-18 02:31:12Z eric $ +# $Id: PKGBUILD 188741 2013-06-19 03:52:40Z eric $ # Maintainer: Eric Bélanger pkgname=racket -pkgver=5.3.4 +pkgver=5.3.5 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop racket-libpng16.patch) -sha1sums=('7e37738e34c73a25bc7d51aeb53cf3dc5b0d533d' +sha1sums=('8a895454a9e0fdf689368fa54ce63ba88d432c5e' 'a20808f6b250225704856f82a544681a962a299d' '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e') -- cgit v1.2.3-54-g00ecf