From 44c10f274ec720a1512b15457b9eeffea28c6041 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 16 Jun 2013 01:26:25 -0700 Subject: Sun Jun 16 01:25:28 PDT 2013 --- community/libraw/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'community/libraw/PKGBUILD') diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 35d7c9317..b1023c8d7 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76466 2012-09-18 18:52:24Z jlichtblau $ +# $Id: PKGBUILD 92809 2013-06-15 11:40:29Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Ionut Biru # Contributor: Joeny Ang # Contributor: Brad Fanella pkgname=libraw -pkgver=0.14.7 +pkgver=0.14.8 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('lcms') options=('!makeflags') changelog=$pkgname.changelog source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('7307a607249043bb544f3ab3b3a999e1923d72fbed12e4e2239d172e522143da') +sha256sums=('ec06bfb31ccefc8618c3939aa99fa7a42b413e0ccfb24205bb7fe7eaa4ba13ac') build() { cd ${srcdir}/LibRaw-${pkgver} -- cgit v1.2.3-54-g00ecf 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 --- community/erlang-nox/PKGBUILD | 8 +- community/erlang/PKGBUILD | 10 +- community/libraw/PKGBUILD | 6 +- community/libraw/libraw.changelog | 3 + community/luminancehdr/PKGBUILD | 4 +- community/luminancehdr/luminancehdr.changelog | 3 + community/miniupnpc/PKGBUILD | 8 +- community/mlt/PKGBUILD | 8 +- community/nodejs/PKGBUILD | 6 +- community/os-prober/PKGBUILD | 12 +- community/pdflib-lite/PKGBUILD | 49 ++ community/rsyslog/PKGBUILD | 13 +- community/shotwell/PKGBUILD | 19 +- community/shotwell/libraw-0.15.2.patch | 33 ++ 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 +- libre/foomatic-filters-libre/PKGBUILD | 7 +- libre/gnormalize-libre/PKGBUILD | 56 ++- libre/lsb-release-libre/PKGBUILD | 39 -- libre/lsb-release-libre/lsb-release.install | 14 - libre/lsb-release/PKGBUILD | 40 ++ libre/lsb-release/lsb-release.install | 14 + libre/mc-libre/PKGBUILD | 73 +-- pcr/corosync/PKGBUILD | 15 +- pcr/ganglia/PKGBUILD | 112 +++-- pcr/ganglia/ganglia.install | 28 +- pcr/ganglia/gmetad.rc | 62 --- pcr/ganglia/gmetad.service | 11 - pcr/ganglia/gmetad.service.in | 11 + pcr/ganglia/gmond.rc | 62 --- pcr/ganglia/gmond.service | 9 - pcr/ganglia/gmond.service.in | 9 + pcr/ganglia/uid.patch | 33 -- pcr/libqb/PKGBUILD | 7 +- pcr/mednafen-server/PKGBUILD | 15 +- pcr/spacenav-daemon/PKGBUILD | 44 ++ pcr/spacenav-daemon/spacenav.service | 10 + pcr/spacenav-daemon/spnavrc | 8 + pcr/spacenavd/PKGBUILD | 30 -- pcr/spacenavd/spacenav.service | 10 - pcr/spacenavd/spacenavd | 38 -- 47 files changed, 1215 insertions(+), 579 deletions(-) create mode 100644 community/pdflib-lite/PKGBUILD create mode 100644 community/shotwell/libraw-0.15.2.patch create mode 100644 extra/libreoffice/PKGBUILD.41 create mode 100644 extra/libreoffice/fix_install.diff delete mode 100644 extra/libreoffice/librelogo.diff delete mode 100644 libre/lsb-release-libre/PKGBUILD delete mode 100644 libre/lsb-release-libre/lsb-release.install create mode 100644 libre/lsb-release/PKGBUILD create mode 100644 libre/lsb-release/lsb-release.install delete mode 100644 pcr/ganglia/gmetad.rc delete mode 100644 pcr/ganglia/gmetad.service create mode 100644 pcr/ganglia/gmetad.service.in delete mode 100644 pcr/ganglia/gmond.rc delete mode 100644 pcr/ganglia/gmond.service create mode 100644 pcr/ganglia/gmond.service.in delete mode 100644 pcr/ganglia/uid.patch create mode 100644 pcr/spacenav-daemon/PKGBUILD create mode 100644 pcr/spacenav-daemon/spacenav.service create mode 100644 pcr/spacenav-daemon/spnavrc delete mode 100644 pcr/spacenavd/PKGBUILD delete mode 100644 pcr/spacenavd/spacenav.service delete mode 100644 pcr/spacenavd/spacenavd (limited to 'community/libraw/PKGBUILD') diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index 899e1e02f..77f98da86 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85253 2013-02-28 10:04:50Z arodseth $ +# $Id: PKGBUILD 92931 2013-06-19 14:22:24Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Lukas Fleischer # Contributor: Vesa Kaihlavirta @@ -7,7 +7,7 @@ # Contributor: Ricardo Catalinas Jiménez pkgname=erlang-nox -pkgver=R16B +pkgver=R16B01 pkgrel=1 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') @@ -22,8 +22,8 @@ optdepends=('erlang-unixodbc: database support' 'lksctp-tools: for SCTP support') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' - 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') +sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0' + '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2') build() { cd "$srcdir/otp_src_${pkgver/_1/}" diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 23addb204..c6f117d3c 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92656 2013-06-10 17:00:39Z arodseth $ +# $Id: PKGBUILD 92929 2013-06-19 13:52:02Z arodseth $ # Maintainer: Lukas Fleischer # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta @@ -8,16 +8,16 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') -pkgver=R16B -pkgrel=6 +pkgver=R16B01 +pkgrel=1 arch=('x86_64' 'i686') url='http://www.erlang.org/' license=('custom') makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' - 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') +sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0' + '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2') build() { cd "$srcdir/otp_src_${pkgver/_1/}" diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index b1023c8d7..0c1004e39 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92809 2013-06-15 11:40:29Z jlichtblau $ +# $Id: PKGBUILD 92940 2013-06-19 21:09:45Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau # Contributor: Ionut Biru # Contributor: Joeny Ang # Contributor: Brad Fanella pkgname=libraw -pkgver=0.14.8 +pkgver=0.15.2 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('lcms') options=('!makeflags') changelog=$pkgname.changelog source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('ec06bfb31ccefc8618c3939aa99fa7a42b413e0ccfb24205bb7fe7eaa4ba13ac') +sha256sums=('828eac93910f26f813f91d35f92f33a9e719c2ec8522d575b248063194b068c6') build() { cd ${srcdir}/LibRaw-${pkgver} diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog index c9ca492b8..ae434aae0 100644 --- a/community/libraw/libraw.changelog +++ b/community/libraw/libraw.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau + * libraw 0.15.2-1 + 2013-06-15 Jaroslav Lichtblau * libraw 0.14.8-1 diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 9855176ab..1815ec67f 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90056 2013-05-06 19:38:11Z foutrelis $ +# $Id: PKGBUILD 92941 2013-06-19 21:09:46Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau # Contributor: Lukas Jirkovsky # Contributor: Dmitry N. Shilov pkgname=luminancehdr pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index 908eb4476..ab6898db8 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau + * luminancehdr 2.3.1-3 libraw rebuild + 2013-04-20 Jaroslav Lichtblau * luminancehdr 2.3.1-1 diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD index 0dd8bdea3..6b163f4c4 100644 --- a/community/miniupnpc/PKGBUILD +++ b/community/miniupnpc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 60858 2011-12-19 15:16:56Z tredaelli $ +# $Id: PKGBUILD 92933 2013-06-19 14:29:17Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Florian Loitsch pkgname=miniupnpc -pkgver=1.6 -pkgrel=2 +pkgver=1.8 +pkgrel=1 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices" arch=('i686' 'x86_64') url="http://miniupnp.free.fr" license=('BSD') depends=('sh') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz") -md5sums=('88055f2d4a061cfd4cfe25a9eae22f67') +md5sums=('065bf20a20ebe605c675b7a5aaef340a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index d0ce1644b..d807e93f1 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92329 2013-06-04 04:33:12Z svenstaro $ +# $Id: PKGBUILD 92918 2013-06-19 09:58:46Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Fabian Schoelzel # Contributor: funkyou @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') url="http://www.mltframework.org" @@ -26,9 +26,9 @@ build() { msg "SSE2=$SSE2" ./configure --prefix=/usr --disable-gtk2 \ - --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/qt4 \ --avformat-vdpau \ - --avformat-swscale + --avformat-swscale \ + --enable-gpl --enable-gpl3 make # mlt python bindings diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index a96deb62e..36c2d8574 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92789 2013-06-15 08:16:22Z bpiotrowski $ +# $Id: PKGBUILD 92939 2013-06-19 19:43:24Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.11 +pkgver=0.10.12 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('ee4b398efde1fa7a334435910447422dae58e93da8711602c2228485f2b58cb1') +sha256sums=('7339a7c333454a567a41c900b6ef2f6c89e8c778062c173beb029611b29496b6') prepare() { cd node-v$pkgver diff --git a/community/os-prober/PKGBUILD b/community/os-prober/PKGBUILD index 267009a6a..e3af2e380 100644 --- a/community/os-prober/PKGBUILD +++ b/community/os-prober/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 83235 2013-01-28 14:43:38Z tredaelli $ +# $Id: PKGBUILD 92922 2013-06-19 10:19:18Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: darkcoder pkgname=os-prober -pkgver=1.57 -pkgrel=3 +pkgver=1.58 +pkgrel=1 pkgdesc="Utility to detect other OSes on a set of drives" url="http://joey.kitenet.net/code/os-prober/" arch=('i686' 'x86_64') license=('GPL3') depends=('sh') source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz) -md5sums=('67548b17d55cc32c1168bb5a4061170d') -sha256sums=('d63c6cbb825a7e411aac5e4805edc6db2fbf77a59282b71c10bd29723b8d860c') +md5sums=('11406f47d9536bccb655456d6d92d111') +sha256sums=('db1d936c0356e7a7c2dab5e9aebdf4132e745fd2972ba5016ed6690a0445ea93') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,7 +35,7 @@ package() { for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do install -dm755 "$pkgdir/usr/lib/$dir" install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/common/* - [[ -d "$dir"/x86 ]] && install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/x86/* + [[ -d "$dir"/x86 ]] && cp -r "$dir"/x86/* "$pkgdir/usr/lib/$dir" done install -Dm755 os-probes/mounted/powerpc/20macosx "$pkgdir"/usr/lib/os-probes/mounted/20macosx diff --git a/community/pdflib-lite/PKGBUILD b/community/pdflib-lite/PKGBUILD new file mode 100644 index 000000000..f99c4f350 --- /dev/null +++ b/community/pdflib-lite/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Connor Behan +# Contributor: Olivier Mehani + +pkgname=pdflib-lite +_pkgnamecaps=PDFlib-Lite +pkgver=7.0.5p3 +_basepkgver=${pkgver/p*/} +pkgrel=2 +pkgdesc="PDF manipulation library." +url="http://www.pdflib.com" +arch=(i686 x86_64) +depends=('glibc') +provides=('pdflib') +source=(http://www.pdflib.com/binaries/PDFlib/${_basepkgver//./}/${_pkgnamecaps}-${pkgver}.tar.gz http://www.pdflib.com/fileadmin/pdflib/pdf/license/PDFlib-Lite-license.pdf) +license=(custom:pdflib-lite) + +build() { + cd "$srcdir"/$_pkgnamecaps-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$_pkgnamecaps-$pkgver + make prefix="$pkgdir"/usr install + + ## Copy files required by the license + # Documentation + mkdir -p "$pkgdir"/usr/share/pdflib-lite/doc + cp ./doc/pdflib/* "$pkgdir"/usr/share/pdflib-lite/doc + + # License + mkdir -p "$pkgdir"/usr/share/licenses/pdflib-lite + cp -H ../PDFlib-Lite-license.pdf "$pkgdir"/usr/share/licenses/pdflib-lite/LICENSE.pdf + + # Examples + make -C ./bind/pdflib clean + cp -R ./bind/pdflib/{c,cpp,java} "$pkgdir"/usr/share/pdflib-lite + find "$pkgdir"/usr/share/pdflib-lite \( \ + -name Makefile \ + -o -name *.dsp \ + -o -name *.dsw \ + -o -name *.sln \ + -o -name *.vcproj \ + \) -exec rm {} \; +} + +md5sums=('371d332d610a8b21a542bb7a2bdaf954' + '2f3f9cc20199aad91b33dc26cdcbbab4') diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 41a7a0525..68fed6fab 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 92529 2013-06-07 17:30:50Z spupykin $ +# $Id: PKGBUILD 92920 2013-06-19 10:05:52Z spupykin $ # Maintainer: Sergej Pupykin pkgname=rsyslog -pkgver=7.4.0 -pkgrel=2 +pkgver=7.4.1 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c') +depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd') makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' 'python-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' @@ -22,7 +22,7 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('5bd05354331f4955337d8e4bc64db985' +md5sums=('8e0e868a425bfa5c2c13bdc28338e1af' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') @@ -37,10 +37,13 @@ build() { --enable-snmp \ --enable-gnutls \ --enable-inet \ + --enable-imjournal \ + --enable-omjournal \ --with-systemdsystemunitdir=/usr/lib/systemd/system echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile make } + package() { cd ${srcdir}/${pkgname}-${pkgver} make install DESTDIR=${pkgdir} diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 7726c625c..c84b466c1 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 88680 2013-04-21 22:16:49Z heftig $ +# $Id: PKGBUILD 92942 2013-06-19 21:09:47Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer : Ionut Biru # Contributor: Joeny Ang pkgname=shotwell pkgver=0.14.1 -pkgrel=3 +pkgrel=4 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('libgee06' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' +depends=('libgee06' 'webkitgtk' 'libgexiv2' 'libraw' 'rest' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' 'gst-plugins-base' 'libgphoto2') makedepends=('intltool' 'vala>=0.17.2' 'libunique3') install=shotwell.install source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz" - "no-libexec.patch") + "no-libexec.patch" + "libraw-0.15.2.patch") md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' - 'b4124e022c98b4382530e6fbcef965e2') + 'b4124e022c98b4382530e6fbcef965e2' + '3ad21364f82229122f48452f5c74dfde') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/no-libexec.patch + patch -Rp1 <$srcdir/libraw-0.15.2.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --disable-schemas-compile \ --disable-desktop-update \ diff --git a/community/shotwell/libraw-0.15.2.patch b/community/shotwell/libraw-0.15.2.patch new file mode 100644 index 000000000..248c5f236 --- /dev/null +++ b/community/shotwell/libraw-0.15.2.patch @@ -0,0 +1,33 @@ +diff -wbBur shotwell-0.14.1/src/photos/GRaw.vala shotwell-0.14.1/src/photos/GRaw.vala +--- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/src/photos/GRaw.vala 2013-06-17 16:26:12.247179310 +0400 ++++ shotwell-0.14.1/src/photos/GRaw.vala 2013-04-03 04:54:23.000000000 +0400 +@@ -168,7 +168,7 @@ + } + + public void document_mode_processing() throws Exception { +- throw_exception("document_mode_processing", 0); ++ throw_exception("document_mode_processing", proc.document_mode_processing()); + } + + public unowned LibRaw.ImageOther get_image_other() { +@@ -244,7 +244,7 @@ + // threshold + output_params->half_size = half_size; + // four_color_rgb +-// output_params->document_mode = GRaw.DocMode.STANDARD; ++ output_params->document_mode = GRaw.DocMode.STANDARD; + output_params->highlight = GRaw.HighlightMode.CLIP; + output_params->use_auto_wb = true; + output_params->use_camera_wb = true; +diff -wbBur shotwell-0.14.1/vapi/libraw.vapi shotwell-0.14.1/vapi/libraw.vapi +--- /home/sergej/tmp/BUILD/staging-i686/sergej/build/shotwell/src/shotwell-0.14.1/vapi/libraw.vapi 2013-06-17 16:25:23.623846536 +0400 ++++ shotwell-0.14.1/vapi/libraw.vapi 2013-04-03 04:54:23.000000000 +0400 +@@ -184,6 +184,8 @@ + public Processor(Options flags = Options.NONE); + + public Result adjust_sizes_info_only(); ++ [CCode (cname="libraw_dcraw_document_mode_processing")] ++ public Result document_mode_processing(); + public unowned ImageOther get_image_other() { return other; } + public unowned ImageParams get_image_params() { return idata; } + public Progress get_progress_flags() { return progress_flags; } 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') diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD index 73a7af6c4..eeb26a639 100644 --- a/libre/foomatic-filters-libre/PKGBUILD +++ b/libre/foomatic-filters-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $ # Maintainer: Andreas Radke # Contributor (Parabola): André Silva pkgbase="foomatic" pkgname=('foomatic-filters-libre') arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120712 +_snapdate=20130518 _filtersver=4.0.17 pkgver=${_filtersver}_${_snapdate} pkgrel=1 @@ -18,7 +18,7 @@ md5sums=('b05f5dcbfe359f198eef3df5b283d896') package_foomatic-filters-libre() { - pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format." + pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format, without nonfree scripts" # arch=('i686' 'x86_64') license=('GPL') backup=(etc/foomatic/filter.conf) @@ -30,6 +30,7 @@ package_foomatic-filters-libre() { 'net-snmp: certain (mostly HP) printers need it to work') cd ${srcdir}/foomatic-filters-${_filtersver} + # remove nonfree scripts rm -rfv test/{lsbfuncs,shfuncs,tcm,tetapi}.sh ./configure --prefix=/usr --sysconfdir=/etc make diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD index 8df68e2b6..6a07966b2 100644 --- a/libre/gnormalize-libre/PKGBUILD +++ b/libre/gnormalize-libre/PKGBUILD @@ -1,5 +1,6 @@ -# $Id$ -# Maintainer: Chris Brannon +# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Chris Brannon # Contributor: Corrado Primier # Contributor:JZsolt Varadi (karmaxxl) # Maintainer (Parabola): André Silva @@ -7,13 +8,13 @@ _pkgname=gnormalize pkgname=gnormalize-libre pkgver=0.63 -pkgrel=4 -pkgdesc="An audio normalizer, converter, encoder/decoder, ripper, tagger and player (without nonfree faac and mac recommendation)" -arch=(any) -url="http://gnormalize.sourceforge.net/" +pkgrel=5 +pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation' +arch=('any') +url='http://gnormalize.sourceforge.net/' license=('GPL') -depends=(perl cddb_get desktop-file-utils gtk2-perl hicolor-icon-theme) -makedepends=('xz') +depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme') +makedepends=('xz' 'gendesk') optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer' 'lame: MP3 encoding' 'mpg321: MP3 playing' @@ -29,26 +30,33 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver install=gnormalize.install -source=(http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz - gnormalize.desktop) -md5sums=('25ca7520731e61a8b7f4b7fa61928d54' '81c6dffab2139816919842e042705884') +source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz") +sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6') -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - install -Dm755 gnormalize "${pkgdir}/usr/bin/gnormalize" +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + + gendesk -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --mimetypes \ + 'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg' lzma -qd gnormalize.1.lzma - install -Dm644 gnormalize.1 "${pkgdir}/usr/share/man/man1/gnormalize.1" - install -d "${pkgdir}/usr/share/gnormalize/animations" - install -m644 animations/*.gif "${pkgdir}/usr/share/gnormalize/animations/" - install -Dm644 README "${pkgdir}/usr/share/doc/gnormalize/README" - install -Dm644 icons/gnormalize.png \ - "${pkgdir}/usr/share/pixmaps/gnormalize.png" +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname" + install -Dm644 "$_pkgname.1" "$pkgdir/usr/share/man/man1/$_pkgname.1" + install -d "$pkgdir/usr/share/$_pkgname/animations" + install -m644 animations/*.gif "$pkgdir/usr/share/$_pkgname/animations/" + install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README" + install -Dm644 "icons/$_pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$_pkgname.png" for i in 16 32 48 ; do - install -Dm644 icons/gnormalize-${i}.png \ - "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/gnormalize.png" + install -Dm644 "icons/gnormalize-$i.png" \ + "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png" done - install -Dm644 "${srcdir}/gnormalize.desktop" \ - "${pkgdir}/usr/share/applications/gnormalize.desktop" + install -Dm644 "$_pkgname.desktop" \ + "$pkgdir/usr/share/applications/$_pkgname.desktop" } # vim:set ts=2 sw=2 et: diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD deleted file mode 100644 index 51ec79bea..000000000 --- a/libre/lsb-release-libre/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Parabola maintainer: Michał Masłowski -# Parabola contributor: André Silva -# $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Malte Rabenseifner -# Contributor: John Gerritse - -_pkgname=lsb-release -pkgname=lsb-release-libre -pkgver=1.4 -pkgrel=12 -pkgdesc="LSB version query program with Parabola name" -arch=('any') -url="http://www.linuxbase.org/" -license=('GPL2') -provides=('lsb-release') -conflicts=('lsb-release') -replaces=('lsb-release') -install=lsb-release.install -source=(http://downloads.sourceforge.net/lsb/$_pkgname-$pkgver.tar.gz) -md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - install -dm755 "$pkgdir/etc" - echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release" - echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release" - echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release" - - install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz" - install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release" -} diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release-libre/lsb-release.install deleted file mode 100644 index 62d404892..000000000 --- a/libre/lsb-release-libre/lsb-release.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - rm -f /etc/arch-release - echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release -} - -post_upgrade() { - rm -f /etc/arch-release - sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release - echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release -} - -pre_remove() { - sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release -} diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD new file mode 100644 index 000000000..adf9c4774 --- /dev/null +++ b/libre/lsb-release/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 79819 2012-11-13 13:12:30Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Malte Rabenseifner +# Contributor: John Gerritse +# Maintainer (Parabola): Michał Masłowski +# Contributor (Parabola): André Silva emulatorman@lavabit.com> + +pkgname=lsb-release +pkgver=1.4 +pkgrel=13 +pkgdesc="LSB version query program (Parabola rebranded)" +arch=('any') +url="http://www.linuxbase.org/" +license=('GPL2') +depends=('bash') +provides=('lsb-release-libre') +conflicts=('lsb-release-libre') +replaces=('lsb-release-libre') +install=lsb-release.install +source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz) +md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -dm755 "$pkgdir/etc" + echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release" + echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release" + echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release" + echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release" + + install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz" + install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release" +} diff --git a/libre/lsb-release/lsb-release.install b/libre/lsb-release/lsb-release.install new file mode 100644 index 000000000..62d404892 --- /dev/null +++ b/libre/lsb-release/lsb-release.install @@ -0,0 +1,14 @@ +post_install() { + rm -f /etc/arch-release + echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release +} + +post_upgrade() { + rm -f /etc/arch-release + sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release + echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release +} + +pre_remove() { + sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release +} diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index 3528fba0e..d286f9cf3 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,36 +1,44 @@ -# $Id$ +# $Id: PKGBUILD 87679 2013-04-05 09:08:28Z schuay $ # Contributor: Daniel J Griffiths # Maintainer: schuay _pkgname=mc pkgname=mc-libre -pkgver=4.8.4 +pkgver=4.8.8 pkgrel=1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" +pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/" license=('GPL') -depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') +depends=( + 'e2fsprogs' + 'glib2' + 'gpm' + 'libssh2' + 'pcre' + 'slang') makedepends=('libxt' 'libx11') -optdepends=('p7zip: support for 7zip archives' - 'mtools: a+ extfs' - 'cdparanoia: audio extfs' - 'gawk: hp48+ extfs' - 'cdrkit: iso9660 extfs' - 'perl: needed by several extfs scripts' - 'python-boto: s3+ extfs' - 'python2-pytz: s3+ extfs' - 'p7zip: u7z extfs' - 'arj: uarj extfs' - 'cabextract: ucab extfs' - 'ununrar: urar extfs' - 'zip: uzip extfs') +optdepends=( + 'cabextract: ucab extfs' + 'cdparanoia: audio extfs' + 'cdrkit: iso9660 extfs' + 'gawk: hp48+ extfs' + 'aspell: spelling corrections' + 'cvs: CVS support' + 'mtools: a+ extfs' + 'perl: needed by several extfs scripts' + 'python2-boto: s3+ extfs' + 'python2-pytz: s3+ extfs' + 'smb: VFS support' + 'arj: uarj extfs' + 'unar: urar extfs' + 'zip: uzip extfs' + 'p7zip: support for 7zip archives') conflicts=('mc') replaces=('mc') provides=("mc=${pkgver}") options=('!emptydirs' '!makeflags') backup=('etc/mc/edit.indent.rc' - 'etc/mc/edit.spell.rc' 'etc/mc/filehighlight.ini' 'etc/mc/mcedit.menu' 'etc/mc/mc.ext' @@ -40,30 +48,25 @@ backup=('etc/mc/edit.indent.rc' source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") build() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-background --enable-charset --enable-largefile \ - --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \ - --with-screen=slang --with-subshell --with-vfs --with-x \ - --without-debug --without-gnome --without-included-gettext \ - --libexecdir=/usr/lib + ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \ + --with-x --libexecdir=/usr/lib - make + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install - # Fix FS#15177 - sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" + # Fix FS#15177 + sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - sed 's#/usr/bin/env python#/usr/bin/python2#' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" + sed 's#/usr/bin/env python#/usr/bin/python2#' \ + -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('a8edb8226cb25869f925ecce043faf1e') +md5sums=('324ff5a192d30d3a3b234c130550eb0a') diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD index e176cb112..7bd87f791 100644 --- a/pcr/corosync/PKGBUILD +++ b/pcr/corosync/PKGBUILD @@ -3,7 +3,7 @@ pkgname=corosync _pkgflag=lts pkgver=2.3.0 -pkgrel=2 +pkgrel=4 pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications' arch=( i686 @@ -13,21 +13,23 @@ arch=( url=http://www.$pkgname.org license=BSD depends=( + dbus libqb libstatgrab net-snmp nss ) -makedepends=doxygen +optdepends='augeas: for config files' +makedepends=( + augeas + doxygen + graphviz +) conflicts=$pkgname-$_pkgflag options=(!libtool) source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51 -prepare() { - cd $srcdir/$pkgname-$pkgver -} - build() { cd $srcdir/$pkgname-$pkgver setarch $CARCH ./configure --prefix=/usr\ @@ -49,6 +51,7 @@ build() { --enable-xmlconf\ --libdir=/usr/lib\ --localstatedir=/var\ + --sbindir=/usr/bin\ --sysconfdir=/etc\ --with-initddir=/etc/rc.d\ --with-systemddir=/usr/lib/systemd/system diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD index f5a900b88..9fed072aa 100644 --- a/pcr/ganglia/PKGBUILD +++ b/pcr/ganglia/PKGBUILD @@ -2,69 +2,77 @@ pkgname=ganglia pkgver=3.6.0 -pkgrel=2 -pkgdesc="A scalable distributed monitoring system for high-performance computing systems such as clusters and Grids." -arch=('i686' 'x86_64') -url="http://ganglia.sourceforge.net/" -license=('BSD') -depends=('apr' 'confuse' 'expat' 'pcre' 'python2' 'rrdtool') -options=('!libtool') -optdepends=('ganglia-web: Web frontend') -install='ganglia.install' -backup=('etc/ganglia/gmond.conf' - 'etc/ganglia/gmetad.conf') -source=("http://downloads.sourceforge.net/ganglia/$pkgname-$pkgver.tar.gz" - 'gmond.rc' - 'gmetad.rc' - 'gmond.service' - 'gmetad.service' - 'ganglia.install' - 'uid.patch') -md5sums=('05926bb18c22af508a3718a90b2e9a2c' - '12b2f85361754eaf6fc5129cccec7034' - '292b74a5a09a0bd9a4a658823adc034b' - '25ebc6cf829089a9f330ad177befdd45' - 'd795bca44fb73cdf8a2b550e27c50b6f' - 'acad2273520f13f4d0638ca9109ca2d8' - 'a0d469dd2b9ec40dbe20377c51ca904c') +pkgrel=4 +pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.' +arch=( + i686 + x86_64 + mips64el +) +url=http://$pkgname.sourceforge.net/ +license=BSD +depends=( + apr + confuse + #php-embed + python2 + rrdtool +) +install=$pkgname.install +options=(!libtool) +optdepends="$pkgname-web: Web frontend" +backup=( + etc/ganglia/gmond.conf + etc/ganglia/gmetad.conf +) +source=( + http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + gmetad.service.in + gmond.service.in +) +sha512sums=( + 2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394 + a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836 + c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb +) prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver - for patch in $srcdir/*.patch; do - msg2 "Applying $(basename $patch)" - patch -Np1 -i $patch - done + #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure + + sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in # FIXME: Hopefully this will soon no longer be required? - msg2 "Copying systemd units into source as workaround for bug" - cp "$srcdir/gmond.service" "$srcdir/$pkgname-$pkgver/gmond/gmond.service.in" - cp "$srcdir/gmetad.service" "$srcdir/$pkgname-$pkgver/gmetad/gmetad.service.in" + msg2 'Copying systemd units into source as workaround for bug' + cp $srcdir/gmetad.service.in gmetad/gmetad.service.in + cp $srcdir/gmond.service.in gmond/gmond.service.in } build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc/ganglia \ - --with-gmetad --enable-gexec --enable-status \ - --with-python=/usr/bin/python2 - make + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --enable-gexec\ + --enable-perl\ + --enable-setuid=ganglia\ + --enable-status\ + --disable-static\ + --libdir=/usr/lib\ + --with-gmetad\ + --with-python=/usr/bin/python2\ + --sbindir=/usr/bin\ + --sysconfdir=/etc/ganglia +# --enable-php\ +# --enable-setgid=ganglia\ + setarch $CARCH make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - # Move sbin to bin - mv "$pkgdir/usr/sbin"/* "$pkgdir/usr/bin/" - rmdir "$pkgdir/usr/sbin" + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install - mkdir -p "$pkgdir/usr/lib/ganglia/python_modules" + mkdir $pkgdir/usr/lib/$pkgname/python_modules - msg2 "Generating default gmond.conf" - ./gmond/gmond --default_config > "$pkgdir/etc/ganglia/gmond.conf" - - # Uncomment these lines to install the rc files - #install -m 755 -D "$srcdir/gmond.rc" "$pkgdir/etc/rc.d/gmond" - #install -m 755 -D "$srcdir/gmetad.rc" "$pkgdir/etc/rc.d/gmetad" + msg2 'Generating default gmond.conf' + ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf } diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install index 60b7f102d..6a196af1f 100644 --- a/pcr/ganglia/ganglia.install +++ b/pcr/ganglia/ganglia.install @@ -1,32 +1,24 @@ -# arg 1: the new package version post_install() { - post_upgrade -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { if [ "`vercmp $2 3.4.0`" -lt 0 ]; then - echo "WARNING: The ganglia package has been split. If you use the" \ + echo 'WARNING: The ganglia package has been split. If you use the' \ "web frontend, you'll need to install the ganglia-web package as well." fi id ganglia >& /dev/null if [ $? -ne 0 ]; then - echo "Adding ganglia system group and user..." - groupadd -r ganglia - useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia + echo 'Adding ganglia system group and user...' + groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia # Lock the account to prevent logging in passwd -l ganglia &> /dev/null fi - install -d -o ganglia -g ganglia /var/lib/ganglia - install -d -o ganglia -g ganglia /var/lib/ganglia/rrds + install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds +} + +post_upgrade() { + post_install } -# arg 1: the old package version post_remove() { - echo "Removing ganglia system group and user..." + echo 'Removing ganglia system group and user...' userdel ganglia - echo "NOTE: Please remove /var/lib/ganglia manually if it is no longer required." + echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.' } - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ganglia/gmetad.rc b/pcr/ganglia/gmetad.rc deleted file mode 100644 index 823062fac..000000000 --- a/pcr/ganglia/gmetad.rc +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - PID=`pidof -o %PPID /usr/sbin/gmetad` -} -get_pid - -case "$1" in - start) - stat_busy "Starting Ganglia gmetad" - [ -z "$PID" ] && /usr/sbin/gmetad - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - sleep 1 - get_pid - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $PID > /var/run/gmetad.pid - add_daemon gmetad - stat_done - fi - fi - ;; - - stop) - stat_busy "Stopping Ganglia gmetad" - [ ! -z "$PID" ] && kill $PID > /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - sleep 1 - get_pid - if [ $? -gt 0 ]; then - rm /var/run/gmetad.pid - rm_daemon gmetad - stat_done - else - stat_fail - exit 1 - fi - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" - exit 1 - -esac diff --git a/pcr/ganglia/gmetad.service b/pcr/ganglia/gmetad.service deleted file mode 100644 index a721c2b4c..000000000 --- a/pcr/ganglia/gmetad.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Ganglia Meta Daemon -After=network.target - -[Service] -Type=forking -PIDFile=/run/gmetad.pid -ExecStart=/usr/bin/gmetad -p /run/gmetad.pid - -[Install] -WantedBy=multi-user.target diff --git a/pcr/ganglia/gmetad.service.in b/pcr/ganglia/gmetad.service.in new file mode 100644 index 000000000..a721c2b4c --- /dev/null +++ b/pcr/ganglia/gmetad.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Ganglia Meta Daemon +After=network.target + +[Service] +Type=forking +PIDFile=/run/gmetad.pid +ExecStart=/usr/bin/gmetad -p /run/gmetad.pid + +[Install] +WantedBy=multi-user.target diff --git a/pcr/ganglia/gmond.rc b/pcr/ganglia/gmond.rc deleted file mode 100644 index c465c4dbf..000000000 --- a/pcr/ganglia/gmond.rc +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - PID=`pidof -o %PPID /usr/sbin/gmond` -} -get_pid - -case "$1" in - start) - stat_busy "Starting Ganglia gmond" - [ -z "$PID" ] && /usr/sbin/gmond - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - sleep 1 - get_pid - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $PID > /var/run/gmond.pid - add_daemon gmond - stat_done - fi - fi - ;; - - stop) - stat_busy "Stopping Ganglia gmond" - [ ! -z "$PID" ] && kill $PID > /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - sleep 1 - get_pid - if [ $? -gt 0 ]; then - rm /var/run/gmond.pid - rm_daemon gmond - stat_done - else - stat_fail - exit 1 - fi - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" - exit 1 - -esac diff --git a/pcr/ganglia/gmond.service b/pcr/ganglia/gmond.service deleted file mode 100644 index 5cbd31629..000000000 --- a/pcr/ganglia/gmond.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Ganglia Monitor Daemon -After=network.target - -[Service] -ExecStart=/usr/bin/gmond -f -p /run/gmond.pid - -[Install] -WantedBy=multi-user.target diff --git a/pcr/ganglia/gmond.service.in b/pcr/ganglia/gmond.service.in new file mode 100644 index 000000000..5cbd31629 --- /dev/null +++ b/pcr/ganglia/gmond.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Ganglia Monitor Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/gmond -f -p /run/gmond.pid + +[Install] +WantedBy=multi-user.target diff --git a/pcr/ganglia/uid.patch b/pcr/ganglia/uid.patch deleted file mode 100644 index 165549033..000000000 --- a/pcr/ganglia/uid.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure -+++ b/configure -@@ -1588,7 +1588,7 @@ Optional Features: - - --enable-debug turn on debugging output and compile options - --enable-gexec turn on gexec support (platform-specific) -- --enable-setuid=USER turn on setuid support (default setuid=nobody) -+ --enable-setuid=USER turn on setuid support (default setuid=ganglia) - --enable-setgid=GROUP turn on setgid support (default setgid=no) - --enable-pedantic turn on pedantic mode during compile - --enable-memcheck turn on memory checking during compile -@@ -11152,7 +11152,7 @@ $as_echo "#define SUPPORT_GEXEC 0" >>confdefs.h - fi - - --setuid_user=nobody -+setuid_user=ganglia - # Check whether --enable-setuid was given. - if test "${enable_setuid+set}" = set; then : - enableval=$enable_setuid; if test x"$enableval" != xno; then no_setuid=0; setuid_user=$enableval ; fi ---- a/gmetad/gmetad.conf.in -+++ b/gmetad/gmetad.conf.in -@@ -99,8 +99,8 @@ data_source "my cluster" localhost - #------------------------------------------------------------------------------- - # User gmetad will setuid to (defaults to "nobody") - # default: "nobody" --# setuid_username "nobody" --# -+setuid_username "ganglia" -+ - #------------------------------------------------------------------------------- - # Umask to apply to created rrd files and grid directory structure - # default: 0 (files are public) diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD index 6b9d7d9d7..85b3ff082 100644 --- a/pcr/libqb/PKGBUILD +++ b/pcr/libqb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=libqb pkgver=0.14.4 -pkgrel=2 +pkgrel=3 pkgdesc='Library with the primary purpose of providing high performance client server reusable features' arch=( i686 @@ -14,7 +14,7 @@ makedepends=( splint ) license=LGPL2.1 -options=!libtool +options=(!libtool) url=https://github.com/asalkeld/$pkgname/wiki source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977 @@ -25,7 +25,8 @@ build() { setarch $CARCH ./configure --prefix=/usr\ --disable-fatal-warnings\ --disable-static\ - --libdir=/usr/lib + --libdir=/usr/lib\ + --sbindir=/usr/bin setarch $CARCH make } diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD index 0c7057908..0db1b1068 100644 --- a/pcr/mednafen-server/PKGBUILD +++ b/pcr/mednafen-server/PKGBUILD @@ -1,26 +1,24 @@ # Maintainer (Parabola): Márcio Silva pkgname=mednafen-server +_pkgname=${pkgname%-server} pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='A server multi-system gaming emulator' -url=http://${pkgname%-server}.sourceforge.net/ -license=( - GPL -) +url=http://$_pkgname.sourceforge.net/ +license=GPL2 arch=( i686 x86_64 mips64el ) +backup=etc/$pkgname/standard.conf source=( - http://downloads.sourceforge.net/project/${pkgname%-server}/Mednafen-Server/$pkgver/$pkgname-$pkgver.tar.gz - ${pkgname}d + http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz $pkgname.service ) sha512sums=( 700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d - 55cba761db9c10978a5146e4f92ccce2a645e0566d0744e745b36ede56a0332d1cb1f6c8a09df6a1c01320b539f07ccd7073b2d85eca6b340449a1c3b9761407 cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700 ) @@ -34,6 +32,5 @@ package() { cd $srcdir/$pkgname make DESTDIR=$pkgdir install install -Dm644 standard.conf $pkgdir/etc/$pkgname/standard.conf - install -Dm644 $srcdir/${pkgname}d $pkgdir/etc/rc.d/$pkgname install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD new file mode 100644 index 000000000..0f06af418 --- /dev/null +++ b/pcr/spacenav-daemon/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=spacenav-daemon +_pkgname=${pkgname%-daemon} +pkgver=0.5 +pkgrel=3 +pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices." +arch=( + i686 + x86_64 + mips64el +) +conflicts=${_pkgname}d +replaces=${_pkgname}d +url=http://$_pkgname.sourceforge.net/ +license=GPL2 +depends=libx11 +backup=etc/spnavrc +source=( + http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz + $_pkgname.service + spnavrc +) +sha512sums=( + 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2 + 61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160 + f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728 +) + +build() { + cd $srcdir/${_pkgname}d-$pkgver + ./configure --prefix=$pkgdir/usr + make +} + +package() { + cd $srcdir/${_pkgname}d-$pkgver + make DESTDIR=$pkgdir install + + install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service + install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/spacenav-daemon/spacenav.service b/pcr/spacenav-daemon/spacenav.service new file mode 100644 index 000000000..30e8019e9 --- /dev/null +++ b/pcr/spacenav-daemon/spacenav.service @@ -0,0 +1,10 @@ +[Unit] +Description=Spacenavigator Daemon Service + +[Service] +Type=forking +ExecStart=/usr/bin/spacenavd + +[Install] +WantedBy=multi-user.target + diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc new file mode 100644 index 000000000..7d19ae03b --- /dev/null +++ b/pcr/spacenav-daemon/spnavrc @@ -0,0 +1,8 @@ +# sensitivity is multiplied with every motion (1.0 normal). +sensitivity = 1.000 + +# dead zone; any motion less than this number, is discarded as noise. +dead-zone = 2 + +# disable led +led = 0 diff --git a/pcr/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD deleted file mode 100644 index cf8a43c32..000000000 --- a/pcr/spacenavd/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Jan Hambrecht -# Maintainer (Parabola): Márcio Silva - -pkgname=spacenavd -pkgver=0.5 -pkgrel=2 -pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)." -arch=('i686' 'x86_64' 'mips64el') -url="http://spacenav.sourceforge.net/" -license=('GPL') -depends=('libx11') -backup=('etc/spnavrc') -source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz - spacenavd - spacenav.service) - -md5sums=('0bb21da5315bd376aa508157a9455aaa' - '27a739300d4de07920879af2d2bdd47f' - 'b404c8021254636b861651a7a48d17a6') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=$pkgdir/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 - # for initscript service - install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1 - # for systend service - install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1 -} diff --git a/pcr/spacenavd/spacenav.service b/pcr/spacenavd/spacenav.service deleted file mode 100644 index 30e8019e9..000000000 --- a/pcr/spacenavd/spacenav.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Spacenavigator Daemon Service - -[Service] -Type=forking -ExecStart=/usr/bin/spacenavd - -[Install] -WantedBy=multi-user.target - diff --git a/pcr/spacenavd/spacenavd b/pcr/spacenavd/spacenavd deleted file mode 100644 index 61946197c..000000000 --- a/pcr/spacenavd/spacenavd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=/usr/bin/spacenavd - -PID=`pidof -o %PPID $DAEMON` -case "$1" in - start) - stat_busy "Starting Spacenavigator Daemon" - [ -z "$PID" ] && $DAEMON - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon spacenavd - stat_done - fi - ;; - stop) - stat_busy "Stopping Spacenavigator Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon spacenavd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -- cgit v1.2.3-54-g00ecf