diff options
29 files changed, 330 insertions, 1710 deletions
diff --git a/community/java-rxtx/PKGBUILD b/community/java-rxtx/PKGBUILD new file mode 100644 index 000000000..7a7abe7d9 --- /dev/null +++ b/community/java-rxtx/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 96583 2013-09-01 22:03:57Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua + +pkgname=java-rxtx +_pkgname=rxtx +pkgver=2.2pre2 +pkgrel=1 +pkgdesc="Java library for serial IO" +arch=('i686' 'x86_64') +url="http://rxtx.qbang.org/" +license=('LGPL') +depends=('glibc' 'java-runtime') +makedepends=('java-environment') +options=('!libtool') +provides=("$_pkgname-$pkgver") +replaces=("$_pkgname") +install=$_pkgname.install +source=(http://rxtx.qbang.org/pub/$_pkgname/$_pkgname-$pkgver.zip + utsrelease.patch + rxtx-2.2-lock.patch + rxtx-2.2-fhs_lock.patch + ttyACM_port.patch) +md5sums=('7eedb18e3f33a427e2b0e9be8ce3f94c' + '2f21ec5eb108f871815242698b6150f1' + '1f7c43d582bfe9daea22d7f7057436da' + 'f4d22d263f45cd1d4db6242dd0ac78ae' + '903a3fe0067d0682dd5f64483c741df6') + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + + # Fix build + patch -Np1 -i "$srcdir/utsrelease.patch" + + # Fix lockdir patch + patch -Np1 -i "$srcdir/rxtx-2.2-lock.patch" + + # Fix buffer overflow + patch -Np1 -i "$srcdir/rxtx-2.2-fhs_lock.patch" + + # Enable more ports + patch -Np1 -i "$srcdir/ttyACM_port.patch" +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make -j1 +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + mkdir -p "$pkgdir"/usr/{lib,share/java/rxtx} + make JHOME="$pkgdir/usr/share/java/rxtx" RXTX_PATH="$pkgdir/usr/lib" install +} diff --git a/community/java-rxtx/rxtx-2.2-fhs_lock.patch b/community/java-rxtx/rxtx-2.2-fhs_lock.patch new file mode 100644 index 000000000..5ec0685c2 --- /dev/null +++ b/community/java-rxtx/rxtx-2.2-fhs_lock.patch @@ -0,0 +1,13 @@ +--- ./src/SerialImp.c.orig 2011-03-17 14:42:48.946047373 -0500 ++++ ./src/SerialImp.c 2011-03-17 14:46:01.244904859 -0500 +@@ -5291,8 +5291,8 @@ + * + */ + int fd,j; +- char lockinfo[12], message[80]; +- char file[80], *p; ++ char lockinfo[12], message[200]; ++ char file[200], *p; + + j = strlen( filename ); + p = ( char * ) filename + j; diff --git a/community/java-rxtx/rxtx-2.2-lock.patch b/community/java-rxtx/rxtx-2.2-lock.patch new file mode 100644 index 000000000..c418fc4ad --- /dev/null +++ b/community/java-rxtx/rxtx-2.2-lock.patch @@ -0,0 +1,12 @@ +diff -up ./src/SerialImp.h.lock ./src/SerialImp.h +--- ./src/SerialImp.h.lock 2010-11-09 15:59:54.891179571 +0100 ++++ ./src/SerialImp.h 2010-11-09 16:01:12.257819409 +0100 +@@ -158,7 +158,7 @@ struct event_info_struct + # endif /* CMSPAR */ + # + # define DEVICEDIR "/dev/" +-# define LOCKDIR "/var/lock" ++# define LOCKDIR "/var/lock/lockdev" + # define LOCKFILEPREFIX "LCK.." + # define FHS + #endif /* __linux__ */ diff --git a/community/java-rxtx/rxtx.install b/community/java-rxtx/rxtx.install new file mode 100644 index 000000000..e0ddf215d --- /dev/null +++ b/community/java-rxtx/rxtx.install @@ -0,0 +1,3 @@ +post_install() { +echo "Users need to be in 'lock' and 'uucp' groups to connect to devices" +} diff --git a/community/java-rxtx/ttyACM_port.patch b/community/java-rxtx/ttyACM_port.patch new file mode 100644 index 000000000..da133c935 --- /dev/null +++ b/community/java-rxtx/ttyACM_port.patch @@ -0,0 +1,28 @@ +Description: Allows for the enumeration of many additional ports, including ttyACM for Arduino Unos +Author: Scott Howard <showard314@gmail.com> + +Index: rxtx/src/gnu/io/RXTXCommDriver.java +=================================================================== +--- rxtx.orig/src/gnu/io/RXTXCommDriver.java 2010-10-04 23:14:47.236148507 -0400 ++++ rxtx/src/gnu/io/RXTXCommDriver.java 2010-10-04 23:18:56.976108303 -0400 +@@ -574,20 +574,7 @@ + if(osName.equals("Linux")) + { + String[] Temp = { +- "ttyS", // linux Serial Ports + "ttySA", // for the IPAQs +- "ttyUSB", // for USB frobs +- "rfcomm", // bluetooth serial device +- "ttyircomm", // linux IrCommdevices (IrDA serial emu) +- }; +- CandidatePortPrefixes=Temp; +- } +- else if(osName.equals("Linux-all-ports")) +- { +- /* if you want to enumerate all ports ~5000 +- possible, then replace the above with this +- */ +- String[] Temp = { + "comx", // linux COMMX synchronous serial card + "holter", // custom card for heart monitoring + "modem", // linux symbolic link to modem. diff --git a/community/java-rxtx/utsrelease.patch b/community/java-rxtx/utsrelease.patch new file mode 100644 index 000000000..8e6babdd2 --- /dev/null +++ b/community/java-rxtx/utsrelease.patch @@ -0,0 +1,36 @@ +diff -Naur rxtx-2.2pre2.orig/src/I2CImp.c rxtx-2.2pre2/src/I2CImp.c +--- rxtx-2.2pre2.orig/src/I2CImp.c 2007-04-26 07:26:05.000000000 +0200 ++++ rxtx-2.2pre2/src/I2CImp.c 2013-08-10 13:28:54.690313710 +0200 +@@ -125,7 +125,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +diff -Naur rxtx-2.2pre2.orig/src/RawImp.c rxtx-2.2pre2/src/RawImp.c +--- rxtx-2.2pre2.orig/src/RawImp.c 2007-11-18 23:32:42.000000000 +0100 ++++ rxtx-2.2pre2/src/RawImp.c 2013-08-10 13:28:54.703647364 +0200 +@@ -270,7 +270,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +diff -Naur rxtx-2.2pre2.orig/src/RS485Imp.c rxtx-2.2pre2/src/RS485Imp.c +--- rxtx-2.2pre2.orig/src/RS485Imp.c 2007-04-26 07:26:05.000000000 +0200 ++++ rxtx-2.2pre2/src/RS485Imp.c 2013-08-10 13:28:54.706980778 +0200 +@@ -125,7 +125,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { diff --git a/community/lxpolkit/PKGBUILD b/community/lxpolkit/PKGBUILD new file mode 100644 index 000000000..2455ab0be --- /dev/null +++ b/community/lxpolkit/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 96579 2013-09-01 20:36:18Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=lxpolkit +pkgver=0.1.0 +pkgrel=2 +pkgdesc="Simple policykit authentication agent for LXDE" +arch=('i686' 'x86_64') +url="http://blog.lxde.org/?p=674" +license=('GPL') +groups=('lxde') +depends=('gtk2' 'polkit') +makedepends=('intltool') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('2597b00035fe1d695219e0f9bfa8c26f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index bc073921d..0709dcf76 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90984 2013-05-16 23:49:59Z svenstaro $ +# $Id: PKGBUILD 96567 2013-09-01 12:07:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> pkgname=nbd -pkgver=3.3 -pkgrel=3 +pkgver=3.4 +pkgrel=1 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64') url="http://nbd.sourceforge.net" @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install -md5sums=('cde8fe6e870b8a7459f12e5dcf572d86' +md5sums=('40ce12dfe408288b4eab36103b48fec0' '2d05d426b8c2708d5f8a0d028fcbae05' '5d1acc143018117174f79eff15afa038') diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD index 507542426..7ef6a9fc1 100644 --- a/community/openbox/PKGBUILD +++ b/community/openbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96487 2013-08-30 15:52:24Z bpiotrowski $ +# $Id: PKGBUILD 96565 2013-09-01 07:12:43Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,16 +6,14 @@ pkgname=openbox pkgver=3.5.2 -pkgrel=2 +pkgrel=3 pkgdesc='Highly configurable and lightweight X11 window manager' arch=('i686' 'x86_64') url='http://openbox.org' license=('GPL') depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr' - 'libxcursor' 'pango' 'imlib2') -makedepends=('librsvg') -optdepends=('python2: for the xdg-autostart script' - 'librsvg: for SVG icons support') + 'libxcursor' 'pango' 'imlib2' 'librsvg') +optdepends=('python2: for the xdg-autostart script') groups=('lxde') options=('!libtool') backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml' diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index ca9efec0f..1b80c4511 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 91247 2013-05-20 14:50:41Z bisson $ +# $Id: PKGBUILD 96581 2013-09-01 20:52:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.20 -pkgrel=2 +pkgrel=3 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') arch=('i686' 'x86_64') -depends=('openssl' 'ldns') makedepends=('expat') optdepends=('expat: unbound-anchor') +depends=('openssl' 'ldns' 'libevent') backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" 'service' @@ -33,6 +33,7 @@ build() { --sbindir=/usr/bin \ --disable-static \ --disable-rpath \ + --with-libevent \ --with-conf-file=/etc/unbound/unbound.conf \ --with-pidfile=/run/unbound.pid make diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 3d41301cc..5d709fcd9 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186044 2013-05-20 18:22:18Z andyrtr $ +# $Id: PKGBUILD 193795 2013-09-01 09:03:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.93 +pkgver=2.10.95 pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) @@ -12,10 +12,9 @@ depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 - 29-replace-bitmap-fonts.conf git_fixes.diff) -sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c' - '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6' - '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0') + 29-replace-bitmap-fonts.conf) +sha256sums=('abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b' + '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6') # a nice page to test font matching: # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html @@ -23,9 +22,6 @@ sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c' build() { cd "$srcdir/$pkgname-$pkgver" - # post release fixes - #patch -Np1 -i ${srcdir}/git_fixes.diff - # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f autoreconf -fi diff --git a/extra/fontconfig/git_fixes.diff b/extra/fontconfig/git_fixes.diff deleted file mode 100644 index 209cba64c..000000000 --- a/extra/fontconfig/git_fixes.diff +++ /dev/null @@ -1,732 +0,0 @@ -From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Mon, 01 Apr 2013 09:16:28 +0000 -Subject: Bug 62980 - matching native fonts with even :lang=en - -Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc -to deal with both strong and weak of FC_LANG as the same location in the score ---- -diff --git a/src/fcmatch.c b/src/fcmatch.c -index 68f39ae..2d7b798 100644 ---- a/src/fcmatch.c -+++ b/src/fcmatch.c -@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy { - #undef FC_OBJECT - - #undef PRI1 --#define PRI1(n) \ -- PRI_ ## n ## _STRONG, \ -- PRI_ ## n ## _WEAK -+#define PRI1(n) \ -+ PRI_ ## n, \ -+ PRI_ ## n ## _STRONG = PRI_ ## n, \ -+ PRI_ ## n ## _WEAK = PRI_ ## n - - typedef enum _FcMatcherPriority { - PRI1(HASH), -@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority { - PRI1(FOUNDRY), - PRI1(CHARSET), - PRI_FAMILY_STRONG, -- PRI_LANG_STRONG, - PRI_POSTSCRIPT_NAME_STRONG, -- PRI_LANG_WEAK, -+ PRI1(LANG), - PRI_FAMILY_WEAK, - PRI_POSTSCRIPT_NAME_WEAK, - PRI1(SPACING), -@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, - * If this node matches any language, go check - * which ones and satisfy those entries - */ -- if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 || -- nodeps[f]->score[PRI_LANG_WEAK] < 2000) -+ if (nodeps[f]->score[PRI_LANG] < 2000) - { - for (i = 0; i < nPatternLang; i++) - { -@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig *config FC_UNUSED, - } - patternLangSat[i] = FcTrue; - satisfies = FcTrue; -- /* adjust score to ensure it's not more than 10000.0 -- * which would means the lang didn't satisfy the requirements -- */ -- if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0) -- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; -- if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0) -- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; - break; - } - } -@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, - } - if (!satisfies) - { -- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; -- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; -+ nodeps[f]->score[PRI_LANG] = 10000.0; - } - } - --- -cgit v0.9.0.2-2-gbebe -From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001 -From: Sebastian Freundt <hroptatyr@fresse.org> -Date: Sun, 07 Apr 2013 00:02:58 +0000 -Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS - -As of automake-13.1 the INCLUDES directive is no longer supported. -An automake run will return with an error. - -This changeset simply follows automake's advice to replace INCLUDES -by AM_CPPFLAGS. ---- -diff --git a/Tools.mk b/Tools.mk -index 56766da..f0fa0ec 100644 ---- a/Tools.mk -+++ b/Tools.mk -@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD) - - EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST) - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(builddir) \ - -I$(srcdir) \ - -I$(top_builddir)/src \ -@@ -43,7 +43,7 @@ INCLUDES = \ - $(WARN_CFLAGS) - - $(TOOL): $(TSRC) $(ALIAS_FILES) -- $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES) -+ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) - - $(TARG): $(TMPL) $(TSRC) $(DEPS) - $(AM_V_GEN) $(MAKE) $(TOOL) && \ -diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am -index 7f7d1b1..0e10786 100644 ---- a/fc-cache/Makefile.am -+++ b/fc-cache/Makefile.am -@@ -36,7 +36,7 @@ uninstall-local: - -$(RM) -rf "$(DESTDIR)$(fc_cachedir)" - endif - --INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS) - - bin_PROGRAMS=fc-cache - -diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am -index b426723..04c1cc4 100644 ---- a/fc-cat/Makefile.am -+++ b/fc-cat/Makefile.am -@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat - - SGML = ${FC_CAT_SRC}/fc-cat.sgml - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - bin_PROGRAMS=fc-cat - -diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am -index b2c499d..c58540e 100644 ---- a/fc-list/Makefile.am -+++ b/fc-list/Makefile.am -@@ -29,7 +29,7 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml - - bin_PROGRAMS=fc-list - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - BUILT_MANS=fc-list.1 - -diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am -index 0e9e8fd..84afb8b 100644 ---- a/fc-match/Makefile.am -+++ b/fc-match/Makefile.am -@@ -29,7 +29,7 @@ FC_MATCH_SRC=${top_srcdir}/fc-match - - SGML = ${FC_MATCH_SRC}/fc-match.sgml - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - BUILT_MANS=fc-match.1 - -diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am -index 92b0433..c456247 100644 ---- a/fc-pattern/Makefile.am -+++ b/fc-pattern/Makefile.am -@@ -29,7 +29,7 @@ FC_PATTERN_SRC=${top_srcdir}/fc-pattern - - SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - BUILT_MANS=fc-pattern.1 - -diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am -index b3ea1e6..73b3f11 100644 ---- a/fc-query/Makefile.am -+++ b/fc-query/Makefile.am -@@ -29,7 +29,7 @@ FC_QUERY_SRC=${top_srcdir}/fc-query - - SGML = ${FC_QUERY_SRC}/fc-query.sgml - --INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) - - BUILT_MANS=fc-query.1 - -diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am -index 2063405..471a42f 100644 ---- a/fc-scan/Makefile.am -+++ b/fc-scan/Makefile.am -@@ -29,7 +29,7 @@ FC_SCAN_SRC=${top_srcdir}/fc-scan - - SGML = ${FC_SCAN_SRC}/fc-scan.sgml - --INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) - - BUILT_MANS=fc-scan.1 - -diff --git a/fc-validate/Makefile.am b/fc-validate/Makefile.am -index 54edec2..782cead 100644 ---- a/fc-validate/Makefile.am -+++ b/fc-validate/Makefile.am -@@ -29,7 +29,7 @@ FC_VALIDATE_SRC=${top_srcdir}/fc-validate - - SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml - --INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) - - BUILT_MANS=fc-validate.1 - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9fd7dd8..066cc03 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -70,7 +70,7 @@ uninstall-ms-import-lib: - - endif - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - $(FREETYPE_CFLAGS) \ --- -cgit v0.9.0.2-2-gbebe -From 9299155b5247255d6b6687448173056c3ca8d09b Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Tue, 09 Apr 2013 02:34:35 +0000 -Subject: Ensure closing fp on error - ---- -diff --git a/src/fchash.c b/src/fchash.c -index 827b20f..4ea5f37 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -220,7 +220,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename) - - ret = FcHashInitSHA256Digest (); - if (!ret) -- return NULL; -+ goto bail0; - - while (!feof (fp)) - { --- -cgit v0.9.0.2-2-gbebe -From c93a8b8b54afe33e5ecf9870723543cb4058fa94 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Tue, 09 Apr 2013 03:46:30 +0000 -Subject: Obtain fonts data via FT_Face instead of opening a file directly - ---- -diff --git a/src/fcfreetype.c b/src/fcfreetype.c -index 8a037c0..1eecfdb 100644 ---- a/src/fcfreetype.c -+++ b/src/fcfreetype.c -@@ -1662,7 +1662,7 @@ FcFreeTypeQueryFace (const FT_Face face, - if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative)) - goto bail1; - -- hashstr = FcHashGetSHA256DigestFromFile (file); -+ hashstr = FcHashGetSHA256DigestFromFace (face); - if (!hashstr) - goto bail1; - if (!FcPatternAddString (pat, FC_HASH, hashstr)) -diff --git a/src/fchash.c b/src/fchash.c -index 4ea5f37..043d94b 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -29,6 +29,9 @@ - #include "fcint.h" - #include <stdio.h> - #include <string.h> -+#include <ft2build.h> -+#include FT_TRUETYPE_TABLES_H -+#include FT_TRUETYPE_TAGS_H - - #define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n))) - #define ROTR32(v, n) ROTRN(32, v, n) -@@ -204,41 +207,50 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, - } - - FcChar8 * --FcHashGetSHA256DigestFromFile (const FcChar8 *filename) -+FcHashGetSHA256DigestFromFace (const FT_Face face) - { -- FILE *fp = fopen ((const char *)filename, "rb"); -- char ibuf[64]; -+ char ibuf[64], *buf = NULL; - FcChar32 *ret; -- size_t len; -- struct stat st; -+ FT_Error err; -+ FT_ULong len = 0, alen, i = 0; - -- if (!fp) -+ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -+ if (err != FT_Err_Ok) - return NULL; -- -- if (FcStat (filename, &st)) -+ alen = (len + 63) & ~63; -+ buf = malloc (alen); -+ if (!buf) -+ return NULL; -+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len); -+ if (err != FT_Err_Ok) - goto bail0; -+ memset (&buf[len], 0, alen - len); - - ret = FcHashInitSHA256Digest (); - if (!ret) - goto bail0; - -- while (!feof (fp)) -+ while (i <= len) - { -- if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) -+ if ((len - i) < 64) - { - long v; -+ int n; - - /* add a padding */ -- memset (&ibuf[len], 0, 64 - len); -- ibuf[len] = 0x80; -- if ((64 - len) < 9) -+ n = len - i; -+ if (n > 0) -+ memcpy (ibuf, &buf[i], n); -+ memset (&ibuf[n], 0, 64 - n); -+ ibuf[n] = 0x80; -+ if ((64 - n) < 9) - { - /* process a block once */ - FcHashComputeSHA256Digest (ret, ibuf); - memset (ibuf, 0, 64); - } - /* set input size at the end */ -- v = (long)st.st_size * 8; -+ v = len * 8; - ibuf[63 - 0] = v & 0xff; - ibuf[63 - 1] = (v >> 8) & 0xff; - ibuf[63 - 2] = (v >> 16) & 0xff; -@@ -252,14 +264,18 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename) - } - else - { -- FcHashComputeSHA256Digest (ret, ibuf); -+ FcHashComputeSHA256Digest (ret, &buf[i]); - } -+ i += 64; - } -- fclose (fp); -+ if (buf) -+ free (buf); - - return FcHashSHA256ToString (ret); - - bail0: -- fclose (fp); -+ if (buf) -+ free (buf); -+ - return NULL; - } -diff --git a/src/fcint.h b/src/fcint.h -index c45075e..703b983 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -47,6 +47,8 @@ - #include "fcdeprecate.h" - #include "fcmutex.h" - #include "fcatomic.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #ifndef FC_CONFIG_PATH - #define FC_CONFIG_PATH "fonts.conf" -@@ -819,7 +821,7 @@ FcPrivate FcChar8 * - FcHashGetSHA256Digest (const FcChar8 *input_strings, - size_t len); - FcPrivate FcChar8 * --FcHashGetSHA256DigestFromFile (const FcChar8 *filename); -+FcHashGetSHA256DigestFromFace (const FT_Face face); - - /* fcinit.c */ - FcPrivate FcConfig * --- -cgit v0.9.0.2-2-gbebe -From fc5a589abad0e8285f7d95007ebda76536e8fa7d Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Tue, 09 Apr 2013 08:18:43 +0000 -Subject: Revert the previous change and rework to not export freetype API outside fcfreetype.c - ---- -diff --git a/src/fcfreetype.c b/src/fcfreetype.c -index 1eecfdb..22064b3 100644 ---- a/src/fcfreetype.c -+++ b/src/fcfreetype.c -@@ -1104,7 +1104,10 @@ FcFreeTypeQueryFace (const FT_Face face, - char psname[256]; - const char *tmp; - -- FcChar8 *hashstr; -+ FcChar8 *hashstr = NULL; -+ char *fontdata = NULL; -+ FT_Error err; -+ FT_ULong len = 0, alen; - - pat = FcPatternCreate (); - if (!pat) -@@ -1662,12 +1665,22 @@ FcFreeTypeQueryFace (const FT_Face face, - if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative)) - goto bail1; - -- hashstr = FcHashGetSHA256DigestFromFace (face); -+ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -+ if (err != FT_Err_Ok) -+ goto bail1; -+ alen = (len + 63) & ~63; -+ fontdata = malloc (alen); -+ if (!fontdata) -+ goto bail1; -+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); -+ if (err != FT_Err_Ok) -+ goto bail1; -+ memset (&fontdata[len], 0, alen - len); -+ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); - if (!hashstr) - goto bail1; - if (!FcPatternAddString (pat, FC_HASH, hashstr)) - goto bail1; -- free (hashstr); - - /* - * Compute the unicode coverage for the font -@@ -1756,6 +1769,10 @@ FcFreeTypeQueryFace (const FT_Face face, - bail2: - FcCharSetDestroy (cs); - bail1: -+ if (hashstr) -+ free (hashstr); -+ if (fontdata) -+ free (fontdata); - FcPatternDestroy (pat); - bail0: - return NULL; -diff --git a/src/fchash.c b/src/fchash.c -index 043d94b..1ef1e16 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -29,9 +29,6 @@ - #include "fcint.h" - #include <stdio.h> - #include <string.h> --#include <ft2build.h> --#include FT_TRUETYPE_TABLES_H --#include FT_TRUETYPE_TAGS_H - - #define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n))) - #define ROTR32(v, n) ROTRN(32, v, n) -@@ -207,40 +204,28 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, - } - - FcChar8 * --FcHashGetSHA256DigestFromFace (const FT_Face face) -+FcHashGetSHA256DigestFromMemory (const char *fontdata, -+ size_t length) - { -- char ibuf[64], *buf = NULL; -+ char ibuf[64]; - FcChar32 *ret; -- FT_Error err; -- FT_ULong len = 0, alen, i = 0; -- -- err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -- if (err != FT_Err_Ok) -- return NULL; -- alen = (len + 63) & ~63; -- buf = malloc (alen); -- if (!buf) -- return NULL; -- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len); -- if (err != FT_Err_Ok) -- goto bail0; -- memset (&buf[len], 0, alen - len); -+ size_t i = 0; - - ret = FcHashInitSHA256Digest (); - if (!ret) -- goto bail0; -+ return NULL; - -- while (i <= len) -+ while (i <= length) - { -- if ((len - i) < 64) -+ if ((length - i) < 64) - { - long v; -- int n; -+ size_t n; - - /* add a padding */ -- n = len - i; -+ n = length - i; - if (n > 0) -- memcpy (ibuf, &buf[i], n); -+ memcpy (ibuf, &fontdata[i], n); - memset (&ibuf[n], 0, 64 - n); - ibuf[n] = 0x80; - if ((64 - n) < 9) -@@ -250,7 +235,7 @@ FcHashGetSHA256DigestFromFace (const FT_Face face) - memset (ibuf, 0, 64); - } - /* set input size at the end */ -- v = len * 8; -+ v = length * 8; - ibuf[63 - 0] = v & 0xff; - ibuf[63 - 1] = (v >> 8) & 0xff; - ibuf[63 - 2] = (v >> 16) & 0xff; -@@ -264,18 +249,10 @@ FcHashGetSHA256DigestFromFace (const FT_Face face) - } - else - { -- FcHashComputeSHA256Digest (ret, &buf[i]); -+ FcHashComputeSHA256Digest (ret, &fontdata[i]); - } - i += 64; - } -- if (buf) -- free (buf); - - return FcHashSHA256ToString (ret); -- --bail0: -- if (buf) -- free (buf); -- -- return NULL; - } -diff --git a/src/fcint.h b/src/fcint.h -index 703b983..a662dbf 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -47,8 +47,6 @@ - #include "fcdeprecate.h" - #include "fcmutex.h" - #include "fcatomic.h" --#include <ft2build.h> --#include FT_FREETYPE_H - - #ifndef FC_CONFIG_PATH - #define FC_CONFIG_PATH "fonts.conf" -@@ -821,7 +819,8 @@ FcPrivate FcChar8 * - FcHashGetSHA256Digest (const FcChar8 *input_strings, - size_t len); - FcPrivate FcChar8 * --FcHashGetSHA256DigestFromFace (const FT_Face face); -+FcHashGetSHA256DigestFromMemory (const char *fontdata, -+ size_t length); - - /* fcinit.c */ - FcPrivate FcConfig * --- -cgit v0.9.0.2-2-gbebe -From 77419a4dfdf41ed34dd03e74d0e4e6f89dbc65e1 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Wed, 10 Apr 2013 02:14:39 +0000 -Subject: documented FC_HASH and FC_POSTSCRIPT_NAME - ---- -diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml -index 05c5c09..a7b8530 100644 ---- a/doc/fontconfig-devel.sgml -+++ b/doc/fontconfig-devel.sgml -@@ -196,6 +196,9 @@ convenience for the application's rendering mechanism. - default value of familylang, - stylelang and fullnamelang - prgname FC_PRGNAME String Name of the running program -+ hash FC_HASH String SHA256 hash value of the font data -+ with "sha256:" prefix. -+ postscriptname FC_POSTSCRIPT_NAME String Font name in PostScript - </programlisting> - </sect2> - </sect1> --- -cgit v0.9.0.2-2-gbebe -From 03216ccf4ca0808f9c7b9513efcaeb7f4058b575 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Wed, 10 Apr 2013 09:41:22 +0000 -Subject: Bug 63329 - make check fails: .. contents:: :depth: 2 - -Add back FcHashGetSHA256DigestFromFile() and fall back to it -when font isn't SFNT-based font because FT_Load_Sfnt_Table -fails with FT_Err_Invalid_Face_Handle. ---- -diff --git a/src/fcfreetype.c b/src/fcfreetype.c -index 22064b3..5e8990d 100644 ---- a/src/fcfreetype.c -+++ b/src/fcfreetype.c -@@ -1666,17 +1666,29 @@ FcFreeTypeQueryFace (const FT_Face face, - goto bail1; - - err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -- if (err != FT_Err_Ok) -- goto bail1; -- alen = (len + 63) & ~63; -- fontdata = malloc (alen); -- if (!fontdata) -- goto bail1; -- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); -- if (err != FT_Err_Ok) -+ if (err == FT_Err_Ok) -+ { -+ alen = (len + 63) & ~63; -+ fontdata = malloc (alen); -+ if (!fontdata) -+ goto bail1; -+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); -+ if (err != FT_Err_Ok) -+ goto bail1; -+ memset (&fontdata[len], 0, alen - len); -+ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); -+ } -+ else if (err == FT_Err_Invalid_Face_Handle) -+ { -+ /* font may not support SFNT. falling back to -+ * read the font data from file directly -+ */ -+ hashstr = FcHashGetSHA256DigestFromFile (file); -+ } -+ else -+ { - goto bail1; -- memset (&fontdata[len], 0, alen - len); -- hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); -+ } - if (!hashstr) - goto bail1; - if (!FcPatternAddString (pat, FC_HASH, hashstr)) -diff --git a/src/fchash.c b/src/fchash.c -index 1ef1e16..92585a6 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -204,6 +204,68 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, - } - - FcChar8 * -+FcHashGetSHA256DigestFromFile (const FcChar8 *filename) -+{ -+ FILE *fp = fopen ((const char *)filename, "rb"); -+ char ibuf[64]; -+ FcChar32 *ret; -+ size_t len; -+ struct stat st; -+ -+ if (!fp) -+ return NULL; -+ -+ if (FcStat (filename, &st)) -+ goto bail0; -+ -+ ret = FcHashInitSHA256Digest (); -+ if (!ret) -+ goto bail0; -+ -+ while (!feof (fp)) -+ { -+ if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) -+ { -+ long v; -+ -+ /* add a padding */ -+ memset (&ibuf[len], 0, 64 - len); -+ ibuf[len] = 0x80; -+ if ((64 - len) < 9) -+ { -+ /* process a block once */ -+ FcHashComputeSHA256Digest (ret, ibuf); -+ memset (ibuf, 0, 64); -+ } -+ /* set input size at the end */ -+ v = (long)st.st_size * 8; -+ ibuf[63 - 0] = v & 0xff; -+ ibuf[63 - 1] = (v >> 8) & 0xff; -+ ibuf[63 - 2] = (v >> 16) & 0xff; -+ ibuf[63 - 3] = (v >> 24) & 0xff; -+ ibuf[63 - 4] = (v >> 32) & 0xff; -+ ibuf[63 - 5] = (v >> 40) & 0xff; -+ ibuf[63 - 6] = (v >> 48) & 0xff; -+ ibuf[63 - 7] = (v >> 56) & 0xff; -+ FcHashComputeSHA256Digest (ret, ibuf); -+ break; -+ } -+ else -+ { -+ FcHashComputeSHA256Digest (ret, ibuf); -+ } -+ } -+ fclose (fp); -+ -+ return FcHashSHA256ToString (ret); -+ -+bail0: -+ fclose (fp); -+ -+ return NULL; -+} -+ -+FcChar8 * - FcHashGetSHA256DigestFromMemory (const char *fontdata, - size_t length) - { -diff --git a/src/fcint.h b/src/fcint.h -index a662dbf..8919958 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -818,6 +818,10 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s); - FcPrivate FcChar8 * - FcHashGetSHA256Digest (const FcChar8 *input_strings, - size_t len); -+ -+FcPrivate FcChar8 * -+FcHashGetSHA256DigestFromFile (const FcChar8 *filename); -+ - FcPrivate FcChar8 * - FcHashGetSHA256DigestFromMemory (const char *fontdata, - size_t length); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index 45a3bc4bd..d14884e68 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 193179 2013-08-18 02:49:33Z heftig $ +# $Id: PKGBUILD 193801 2013-09-01 14:13:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) -pkgver=0.5.5.1 -pkgrel=2 +pkgver=0.5.6 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva - libxrandr git) + libxrandr) options=(!libtool !emptydirs) -#source=($url/$pkgbase-${pkgver}.tar.bz2) -source=("$pkgbase-$pkgver::git://gitorious.org/vaapi/gstreamer-vaapi.git#commit=73323ba") -sha1sums=('SKIP') +source=($url/$pkgbase-${pkgver}.tar.bz2) +sha1sums=('884a47cc4916f441bec160235927556a79c7ea09') prepare() { cd $pkgbase-$pkgver - NO_CONFIGURE=1 ./autogen.sh mkdir build-1.0 build-0.10 } @@ -29,7 +27,7 @@ build() { make cd ../build-0.10 - ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 + ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 --disable-wayland make } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 1e3205aaa..0aec90273 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193556 2013-08-23 16:48:04Z andyrtr $ +# $Id: PKGBUILD 193796 2013-09-01 09:04:01Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -16,12 +16,11 @@ pkgname=('libreoffice-common' 'libreoffice-en-US' 'libreoffice-postgresql-connector' 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.5.2 -pkgver=4.0.5 -pkgrel=1 +_LOver=4.1.1.2 +pkgver=4.1.1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,7 +28,8 @@ 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' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' + 'clucene' 'bluez-libs' 'harfbuzz-icu' # 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" @@ -52,9 +52,9 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_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}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-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}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-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 @@ -66,22 +66,24 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_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}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 + ${_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}/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 - ${_additional_source_url}/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 + ${_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}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 ${_additional_source_url}/libvisio-0.0.30.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 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 + 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 @@ -90,9 +92,9 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-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 @@ -104,16 +106,18 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 - 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 + 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 libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 - libvisio-0.0.30.tar.bz2) -md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' - 'a9ddcbde6d7b1148c8fdb626b26c0c69' - '914c5ea3f433643387593cb96d6c119b' + libmwaw-0.1.10.tar.bz2 + libvisio-0.0.30.tar.bz2 ) +md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2' + 'f6b418a1ed94ef9d5ee30e9f5d7f305a' + 'e8c69bdb55586531cc192904467f5e24' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -121,9 +125,9 @@ md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' '2a177023f9ea8ec8bd00837605c5df1b' 'a7983f859eafb2677d7ff386a023bc40' '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' + '625ff5f2f968dd908bca43c9469d6e6b' '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' + '2e482c7567908d334785ce7d69ddfff7' 'eeb2c7ddf0d302fba4bfc6e97eac9624' '39bb3fcea1514f1369fcfc87542390fd' '3404ab6b1792ae5f16bbd603bd1e1d03' @@ -135,16 +139,18 @@ md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' 'ace6ab49184e329db254e454a010f56d' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' - '9f9e15966b5624834157fe3d748312bc' + '08c85a6d6d793daee14e10e22eefdc4b' 'dc3d21a3921931096d6e80f6701f6763' 'b2371dc7cf4811c9d32146eec913d296' - '8755aac23317494a9028569374dc87b2' - '54e578c91b1b68e69c72be22adcb2195' + 'ea2acaf140ae40a87a952caa75184f4d' + '36271d3fa0d9dec1632029b6d7aac925' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' + '8473296c671b6e3dd8197f4145e0854b' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' + '2289bb137bbba9b473ce60168895c036' '9d9eb3ae6bee763c161228b2b12e25f8' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' @@ -164,7 +170,7 @@ prepare() { 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 @@ -182,7 +188,6 @@ prepare() { } build() { - cd libreoffice-$_LOver #autoconf -f @@ -192,7 +197,6 @@ build() { #./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" \ - --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ --with-parallelism=${MAKEFLAGS/-j/} \ --with-external-tar="${srcdir}/ext_sources" \ @@ -217,8 +221,6 @@ build() { --enable-scripting-javascript \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ - --disable-ext-mysql-connector \ - --with-system-mysql \ --without-fonts\ --without-afms\ --without-system-libwps\ @@ -233,6 +235,8 @@ build() { --without-system-liblangtag \ --without-system-jfreereport \ --without-system-apache-commons \ + --without-system-libodfgen \ + --without-system-libmwaw \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -243,7 +247,6 @@ build() { --with-system-libwpg \ --with-system-libwps \ --with-system-redland\ - --without-system-mozilla \ --without-system-npapi-headers \ --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ @@ -279,12 +282,11 @@ 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' + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.24.0" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + 'harfbuzz-icu' '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' @@ -300,10 +302,12 @@ package_libreoffice-common() { 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-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-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 @@ -338,9 +342,9 @@ package_libreoffice-common() { 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 + rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb # make pyuno find its modules install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages @@ -348,7 +352,11 @@ package_libreoffice-common() { 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 + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd + + # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages + mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic ${srcdir}/ + mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic ${srcdir}/ } package_libreoffice-base() { @@ -541,7 +549,8 @@ package_libreoffice-sdk() { 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} +# sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh } package_libreoffice-sdk-doc() { @@ -610,6 +619,11 @@ package_libreoffice-en-US() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done + + # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/wordbook + mv ${srcdir}/en-GB.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic + mv ${srcdir}/en-US.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic } package_libreoffice-extension-presentation-minimizer() { @@ -622,17 +636,6 @@ package_libreoffice-extension-presentation-minimizer() { unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer } -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #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/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - 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" diff --git a/extra/libreoffice/PKGBUILD.41 b/extra/libreoffice/PKGBUILD.41 deleted file mode 100644 index c73d74627..000000000 --- a/extra/libreoffice/PKGBUILD.41 +++ /dev/null @@ -1,651 +0,0 @@ -# $Id: PKGBUILD 186347 2013-05-25 05:23:41Z foutrelis $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -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.4 -pkgver=4.1.0 -pkgrel=1 -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-icu' - # 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}/libcdr-0.0.14.tar.bz2 - ${_additional_source_url}/libmspub-0.0.6.tar.bz2 - ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 - ${_additional_source_url}/libvisio-0.0.30.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 - 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 - libcdr-0.0.14.tar.bz2 - libmspub-0.0.6.tar.bz2 - libmwaw-0.1.10.tar.bz2 - libvisio-0.0.30.tar.bz2 ) -md5sums=('5311656e1b54eadd4b93f948dfd5e68e' - 'e2cd3b63e3050771a1330fc98e41a701' - '1f4438828cbcf83c257742482dade3ef' - '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' - 'd88f9b94df880d2c05be943b000ca112' - '1120705cd0f0d9bd5506360bf57b6c2e' - '2289bb137bbba9b473ce60168895c036' - '9d9eb3ae6bee763c161228b2b12e25f8' - '07d2bf5ad839a394cca008b3ec6e7bb1' - '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') - -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 - - #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 \ - --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" - 'harfbuzz-icu' '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} - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh -} - -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/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index ecd2ace16..6e992807c 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96190 2013-08-21 13:06:15Z fyan $ +# $Id: PKGBUILD 96553 2013-08-31 16:26:33Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -28,13 +28,22 @@ backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") build() { cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver" - # Use in-tree jansson since it is not compatible with jansson 2.0 - #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac + # We have latest jansson and libusb - just use them + sed "s|ac_subdirs_all='compat/libusb\-1.0'||" -i ./configure + sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure + sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure + sed 's|JANSSON_LIBS="compat/jansson/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure + sed 's|compat/Makefile compat/jansson/Makefile||' -i ./configure + + sed 's|JANSSON_INCLUDES = -I$(top_srcdir)/compat/jansson||' -i ./Makefile.in + sed 's|USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb\-1.0/libusb|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in + sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in + + rm -r compat # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - #./autogen.sh ./configure \ --prefix=/usr \ --enable-scrypt \ @@ -61,6 +70,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('2f308c9285755b62608da4a6be3942d08b6cfff218238dbb4c15da7d02c8f2ac46cd7a9fbd69b7a46faa11962a937ba6327aa03852c291e69ff6158e50c1e5b6' +sha512sums=('db648f18002ce558454fa0e4aa948146dcaeb473728c15503c8e908fc26507df25602edc5b8295cf578327bf43f99f9846d9580f9c3b4b08b03a0ca24da8f15c' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index c6262a0dc..22ddcf9a0 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.93 +_kernver=3.0.94 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=15 +pkgrel=16 pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index bfe0c4000..e1fa76aaf 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193507 2013-08-21 13:08:50Z tpowa $ +# $Id: PKGBUILD 193759 2013-08-30 10:08:14Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,10 +8,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=93 +_sublevel=94 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.93 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.94 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '0d900fb04812ca03cd2a6de094cdcc04' + 'f488335cb6f6cbae9dd5d07d31a532b3' '7373cc3ac66342156a7fc32af8577b46' 'b7229f80282337979514f9640a969ff5' 'c072b17032e80debc6a8626299245d46' @@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '0b0f582f9736f7d99d75b5f67cb56dfc') + 'f7faae4e260abb9dceb30d7b233d355d') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index 75945986a..d5bab2cde 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90358 2013-05-11 23:22:13Z speps $ +# $Id: PKGBUILD 96569 2013-09-01 16:36:10Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _name=QupZilla _pkgname=qupzilla pkgname=qupzilla-libre -pkgver=1.4.3 -pkgrel=1.2 +pkgver=1.4.4 +pkgrel=1 pkgdesc="Cross-platform QtWebKit browser, with DuckDuckGo HTML support" arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" @@ -18,15 +18,21 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver source=("$_pkgname-$pkgver.tar.gz::https://github.com/$_name/$_pkgname/tarball/v$pkgver" - 'libre.patch') -md5sums=('20187fcce11dbba876e1ee7dc5e32583' - '20c8304eb790cda5491078bf5bf71d49') + 'searchenginesmanager.cpp.sed' + 'speeddial.cpp.sed' + 'start.html.sed') +md5sums=('cfbf5cd23d184275c389c79a39a28631' + '1d926e97a5b287d40fb695f6516f2a06' + '0f166fa102af975b3b8ac030d477e9b8' + '77120a0c39ba8254e5b2c273910f029a') prepare() { cd "$srcdir/$_name-$_pkgname-"* - # remove Google, Youtube and Facebook support, replaces it to DDG HTML - patch -Np1 -i $srcdir/libre.patch + # remove Google and Youtube support, replaces it to DDG HTML + sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp + sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp + sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html } build() { diff --git a/libre/qupzilla-libre/libre.patch b/libre/qupzilla-libre/libre.patch deleted file mode 100644 index 6db34dd8f..000000000 --- a/libre/qupzilla-libre/libre.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp -index 72ae7d4..cb42795 100644 ---- a/src/lib/opensearch/searchenginesmanager.cpp -+++ b/src/lib/opensearch/searchenginesmanager.cpp -@@ -55,8 +55,8 @@ SearchEnginesManager::SearchEnginesManager() - { - Settings settings; - settings.beginGroup("SearchEngines"); -- m_startingEngineName = settings.value("activeEngine", "Google").toString(); -- m_defaultEngineName = settings.value("DefaultEngine", "Google").toString(); -+ m_startingEngineName = settings.value("activeEngine", "DuckDuckGo HTML").toString(); -+ m_defaultEngineName = settings.value("DefaultEngine", "DuckDuckGo HTML").toString(); - settings.endGroup(); - - connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave())); -@@ -126,13 +126,6 @@ QUrl SearchEnginesManager::searchUrl(const QString &string) - - void SearchEnginesManager::restoreDefaults() - { -- Engine google; -- google.name = "Google"; -- google.icon = QIcon(":icons/sites/google.png"); -- google.url = "http://www.google.com/search?client=qupzilla&q=%s"; -- google.shortcut = "g"; -- google.suggestionsUrl = "http://suggestqueries.google.com/complete/search?output=firefox&q=%s"; -- - Engine wiki; - wiki.name = "Wikipedia (en)"; - wiki.icon = QIcon(":/icons/sites/wikipedia.png"); -@@ -140,25 +133,16 @@ void SearchEnginesManager::restoreDefaults() - wiki.shortcut = "w"; - wiki.suggestionsUrl = "http://en.wikipedia.org/w/api.php?action=opensearch&search=%s&namespace=0"; - -- Engine yt; -- yt.name = "YouTube"; -- yt.icon = QIcon(":/icons/sites/youtube.png"); -- yt.url = "http://www.youtube.com/results?search_query=%s&search=Search"; -- yt.shortcut = "yt"; -- yt.suggestionsUrl = "http://suggestqueries.google.com/complete/search?ds=yt&output=firefox&q=%s"; -- - Engine duck; -- duck.name = "DuckDuckGo"; -+ duck.name = "DuckDuckGo HTML"; - duck.icon = QIcon(":/icons/sites/duck.png"); -- duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla"; -+ duck.url = "https://duckduckgo.com/html/?q=%s&t=qupzilla"; - duck.shortcut = "d"; - -- addEngine(google); - addEngine(wiki); -- addEngine(yt); - addEngine(duck); - -- m_defaultEngine = google; -+ m_defaultEngine = duck; - - emit enginesChanged(); - } -diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp -index 2039921..52afa22 100644 ---- a/src/lib/plugins/speeddial.cpp -+++ b/src/lib/plugins/speeddial.cpp -@@ -54,11 +54,10 @@ void SpeedDial::loadSettings() - settings.endGroup(); - - if (allPages.isEmpty()) { -- allPages = "url:\"http://www.google.com\"|title:\"Google\";" -+ allPages = "url:\"https://duckduckgo.com/html\"|title:\"DuckDuckGo HTML\";" - "url:\"http://www.qupzilla.com\"|title:\"QupZilla\";" - "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";" -- "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";" -- "url:\"https://facebook.com\"|title:\"Facebook\";"; -+ "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";"; - } - changed(allPages); - -diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html -index 0e48ed2..eb7d793 100644 ---- a/src/lib/data/html/start.html -+++ b/src/lib/data/html/start.html -@@ -19,7 +19,7 @@ a {color: #1a4ba4;text-decoration: none;font-weight: bold;} - - <img src="%ABOUT-IMG%"> - %PRIVATE-BROWSING% --<form action="https://duckduckgo.com/" method="GET"> -+<form action="https://duckduckgo.com/html" method="GET"> - <input type="hidden" name="t" value="qupzilla" /> - <input class="line" id="inp" class="question" name="q"/> <br/> - <input class="submit" type="submit" value="%BUTTON-LABEL%"> diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla-libre/searchenginesmanager.cpp.sed new file mode 100644 index 000000000..76011d058 --- /dev/null +++ b/libre/qupzilla-libre/searchenginesmanager.cpp.sed @@ -0,0 +1,19 @@ +s|DuckDuckGo|DuckDuckGo HTML| +\|m_startingEngineName = settings[.]value("activeEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| +\|m_defaultEngineName = settings[.]value("DefaultEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| +\|Engine google;|d +\|google[.]name = "Google";|d +\|google[.]icon = QIcon(":icons/sites/google[.]png");|d +\|google[.]url = "http://www[.]google[.]com/search?client=qupzilla[&]q=%s";|d +\|google[.]shortcut = "g";|d +\|google[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?output=firefox[&]q=%s";|d +\|Engine yt;|d +\|yt[.]name = "YouTube";|d +\|yt[.]icon = QIcon(":/icons/sites/youtube.png");|d +\|yt[.]url = "http://www[.]youtube[.]com/results?search_query=%s[&]search=Search";|d +\|yt[.]shortcut = "yt";|d +\|yt[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?ds=yt[&]output=firefox[&]q=%s";|d +\|https://duckduckgo[.]com/?q=%s[&]t=qupzilla| s|duckduckgo[.]com|duckduckgo.com/html| +\|addEngine(google);|d +\|addEngine(yt);|d +\|m_defaultEngine = google;| s|google|duck| diff --git a/libre/qupzilla-libre/speeddial.cpp.sed b/libre/qupzilla-libre/speeddial.cpp.sed new file mode 100644 index 000000000..b8f591e87 --- /dev/null +++ b/libre/qupzilla-libre/speeddial.cpp.sed @@ -0,0 +1,4 @@ +s|www[.]google[.]com|duckduckgo.com/html| +s|Google|DuckDuckGo HTML| +\#"url:[\]"https://github[.]com/QupZilla/qupzilla[\]"|title:[\]"QupZilla GitHub[\]";"# s#$#;# +\#"url:[\]"https://duckduckgo[.]com[\]"|title:[\]"DuckDuckGo[\]";";#d diff --git a/libre/qupzilla-libre/start.html.sed b/libre/qupzilla-libre/start.html.sed new file mode 100644 index 000000000..f59a65979 --- /dev/null +++ b/libre/qupzilla-libre/start.html.sed @@ -0,0 +1 @@ +\|<form action="https://duckduckgo[.]com/" method="GET">| s|duckduckgo[.]com|duckduckgo.com/html| diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD index 7b541c715..d91e396f5 100644 --- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD +++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 193763 2013-08-30 13:15:23Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gnome-online-accounts pkgname=gnome-online-accounts-nonprism -pkgver=3.8.2 -pkgrel=2.1 +pkgver=3.8.3 +pkgrel=1 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -17,19 +17,8 @@ conflicts=$_pkgname replaces=($_pkgname $pkgname-coherence) options=(!libtool) install=$_pkgname.install -source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - imap-smtp.patch - smtp-auth-plain.patch) -sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826' - '2b413d1f401647bd143b7dc6dd4b6d6660ff47ef9a11ccbc691b7c13de5cba69' - 'e7250be7c078053345699250433b7164751d3e457155bd35508c7d1660f459be') - -prepare() { - cd $_pkgname-$pkgver - # Upstream 3.8 branch - patch -Np1 -i ../imap-smtp.patch - patch -Np1 -i ../smtp-auth-plain.patch -} +source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz) +sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b') build() { cd $_pkgname-$pkgver diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install index ae4eb5fa7..525ecff63 100644 --- a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install +++ b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install @@ -9,4 +9,3 @@ post_upgrade() { post_remove() { post_install } - diff --git a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch b/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch deleted file mode 100644 index 7213c8d1e..000000000 --- a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 034da0871ad78629f9d0df618be494dbb19157e4 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Tue, 18 Jun 2013 10:35:42 +0000 -Subject: imap-smtp: Prevent error messages from expanding the dialog - ---- -diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c -index d10a9d8..841327d 100644 ---- a/src/goabackend/goaimapsmtpprovider.c -+++ b/src/goabackend/goaimapsmtpprovider.c -@@ -669,6 +669,7 @@ create_account_details_ui (GoaProvider *provider, - - data->cluebar_label = gtk_label_new (""); - gtk_label_set_line_wrap (GTK_LABEL (data->cluebar_label), TRUE); -+ gtk_label_set_max_width_chars (GTK_LABEL (data->cluebar_label), 36); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (data->cluebar))), - data->cluebar_label); - --- -cgit v0.9.2 diff --git a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch b/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch deleted file mode 100644 index c6782d0f6..000000000 --- a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2210bf547dc35adacbc95c0dcf4abe75a73a8368 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Tue, 18 Jun 2013 15:27:55 +0000 -Subject: smtp-auth-plain: Handle multiline SMTP greetings - -Fixes: https://bugzilla.gnome.org/702263 ---- -diff --git a/src/goabackend/goasmtpauthplain.c b/src/goabackend/goasmtpauthplain.c -index bb783bd..77324cf 100644 ---- a/src/goabackend/goasmtpauthplain.c -+++ b/src/goabackend/goasmtpauthplain.c -@@ -167,6 +167,40 @@ smtp_auth_plain_check_454 (const gchar *response, GError **error) - - /* ---------------------------------------------------------------------------------------------------- */ - -+static gboolean -+smtp_auth_plain_check_greeting (GDataInputStream *input, GCancellable *cancellable, GError **error) -+{ -+ gboolean ret; -+ gchar *response; -+ -+ response = NULL; -+ ret = FALSE; -+ -+ greeting_again: -+ response = g_data_input_stream_read_line (input, NULL, cancellable, error); -+ if (response == NULL) -+ goto out; -+ g_debug ("< %s", response); -+ if (smtp_auth_plain_check_421 (response, error)) -+ goto out; -+ if (smtp_auth_plain_check_not_220 (response, error)) -+ goto out; -+ -+ if (response[3] == '-') -+ { -+ g_clear_pointer (&response, g_free); -+ goto greeting_again; -+ } -+ -+ ret = TRUE; -+ -+ out: -+ g_free (response); -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ - static gchar * - smtp_auth_plain_get_domain (GoaSmtpAuthPlain *auth, - GError **error) -@@ -563,15 +597,8 @@ goa_smtp_auth_plain_run_sync (GoaMailAuth *_auth, - - if (!auth->greeting_absent) - { -- response = g_data_input_stream_read_line (input, NULL, cancellable, error); -- if (response == NULL) -- goto out; -- g_debug ("< %s", response); -- if (smtp_auth_plain_check_421 (response, error)) -+ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) - goto out; -- if (smtp_auth_plain_check_not_220 (response, error)) -- goto out; -- g_clear_pointer (&response, g_free); - } - - /* Send EHLO */ -@@ -685,15 +712,8 @@ goa_smtp_auth_plain_starttls_sync (GoaMailAuth *_auth, - - /* Check the greeting */ - -- response = g_data_input_stream_read_line (input, NULL, cancellable, error); -- if (response == NULL) -- goto out; -- g_debug ("< %s", response); -- if (smtp_auth_plain_check_421 (response, error)) -+ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) - goto out; -- if (smtp_auth_plain_check_not_220 (response, error)) -- goto out; -- g_clear_pointer (&response, g_free); - - /* Send EHLO */ - --- -cgit v0.9.2 diff --git a/pcr/tanglet/PKGBUILD b/pcr/tanglet/PKGBUILD index 23e20cd6c..a8114ba62 100644 --- a/pcr/tanglet/PKGBUILD +++ b/pcr/tanglet/PKGBUILD @@ -1,23 +1,23 @@ -# Maintainer (Arch): Graeme Gott <graeme@gottcode.org> -# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com> +# Maintainer (AUR): Graeme Gott <graeme@gottcode.org> +# Maintainer: Alon Ivtsan <alonivtsan@lavabit.com> # Based on https://aur.archlinux.org/packages.php?ID=32311 pkgname=tanglet -pkgver=1.2.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A single player word finding game based on Boggle." arch=('i686' 'x86_64') url="http://gottcode.org/${pkgname}/" license=('GPL3') -depends=('qt4') +depends=('qt5-base') install=${pkgname}.install source=(http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2) -md5sums=('109ad08a03cc64808fa2caad6c3a4a7c') -sha256sums=('94f4c5c76020ec1fe502ff076fbe5471e497d4b7bcabd1e9059e1022d1ce80c8') +md5sums=('584e50d01323c0686ff094195eba4341') +sha256sums=('c90d5c36b7e6cca54cdc001c7eecfb333795add16e6ae01f100026c61f4a84da') build() { cd "${srcdir}/${pkgname}-${pkgver}" - qmake-qt4 PREFIX=/usr + qmake-qt5 PREFIX=/usr make } diff --git a/pcr/tanglet/tanglet.install b/pcr/tanglet/tanglet.install index e70c054ec..81f2ba659 100644 --- a/pcr/tanglet/tanglet.install +++ b/pcr/tanglet/tanglet.install @@ -1,5 +1,5 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { |