diff options
author | root <root@rshg054.dnsready.net> | 2013-09-04 02:15:19 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-09-04 02:15:19 -0700 |
commit | c270fd5b2cd42b593708a919254fbbb609bbf641 (patch) | |
tree | 2cc8a32b6fe3260814e158bb8b18abec1a09e18d /community | |
parent | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (diff) |
Wed Sep 4 02:13:41 PDT 2013
Diffstat (limited to 'community')
30 files changed, 430 insertions, 378 deletions
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index bc9f113c9..2c9b394fa 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 95942 2013-08-19 01:37:35Z dwallace $ +#$Id: PKGBUILD 96694 2013-09-03 03:45:40Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.16 +pkgver=1.17 pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" @@ -17,7 +17,7 @@ makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') options=('!libtool') source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('2a6958ba28c29802ccdf9481d9a87fa2' +md5sums=('21ab8945f84b2ebf5f60bc8591fecdfd' 'a8d22ee089fb0ed725130d16ad393047') prepare(){ diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 9d54d6079..69a9b566d 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96628 2013-09-02 14:22:26Z spupykin $ +# $Id: PKGBUILD 96731 2013-09-03 16:12:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime' 'libzdb' 'mhash' 'libevent') @@ -29,7 +29,9 @@ source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz dbmail-imapd.xinetd dbmail-lmtpd.xinetd dbmail-pop3d.xinetd - dbmail-timsieved.xinetd) + dbmail-timsieved.xinetd + "boundary.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=fd742e39b13ec45e4ecf2e175113a6a0120af27b" + "crlf.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=17a2e61917ae64b1f20039f49b70b9130b678c87") md5sums=('0090bb7998469e963d2eb49b7d16ea3f' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' @@ -39,7 +41,15 @@ md5sums=('0090bb7998469e963d2eb49b7d16ea3f' '890de13361afbdf4fed12d6d7eb53e66' '961593658cd596297d03d25eb9c9e98f' '4cb764894abd3914802e90602bf90a0c' - 'e78dc86355f9aaf24590bc7c6611162f') + 'e78dc86355f9aaf24590bc7c6611162f' + 'e9f9c1140e77e3714fd2c3905b1760f1' + 'c86c4c2a4e9171ae8c0ad5692262b393') + +prepare() { + cd $srcdir/dbmail-${pkgver/_/-}/ + patch -p1 <$srcdir/boundary.patch + patch -p1 <$srcdir/crlf.patch +} build() { cd $srcdir/dbmail-${pkgver/_/-}/ diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 56c51bbcf..9705c7d36 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92894 2013-06-18 09:01:17Z lfleischer $ +# $Id: PKGBUILD 96719 2013-09-03 12:45:13Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.21 -pkgrel=3 +pkgver=0.6.22 +pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' @@ -18,18 +18,9 @@ optdepends=('lftp: FTPS backend' 'python2-httplib2: Ubuntu One backend' 'python2-oauthlib: Ubuntu One backend' 'rsync: rsync backend') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} - "u1backend.patch") -md5sums=('4ade1de475e0af64211bb6933b593057' - '3521d679ba7dff46653313aa3b3e6855' - 'b7aede10a3f5503ae4428a506b57486c') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix Ubuntu One backup (FS#35487, upstream revisions 912 and 913, will be fixed in 0.6.22). - patch -p0 duplicity/backends/u1backend.py ../u1backend.patch -} +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('5b035359a6bb7b2f3f3b9829c6c071e1' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/duplicity/botobackend.patch b/community/duplicity/botobackend.patch deleted file mode 100644 index 302e1e2b1..000000000 --- a/community/duplicity/botobackend.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file duplicity/backends/botobackend.py ---- duplicity/backends/botobackend.py 2011-11-25 17:47:57 +0000 -+++ duplicity/backends/botobackend.py 2011-12-01 16:15:25 +0000 -@@ -26,6 +26,6 @@ - if sys.version_info[:2] < (2,6): - print "Sorry, S3 multiprocessing requires version 2.6 or later of python" - sys.exit(1) -- import _boto_multi.py -+ import _boto_multi - else: -- import _boto_single.py -+ import _boto_single - diff --git a/community/duplicity/duplicity-0.6.17-fix-memleak.patch b/community/duplicity/duplicity-0.6.17-fix-memleak.patch deleted file mode 100644 index 1c4c8daff..000000000 --- a/community/duplicity/duplicity-0.6.17-fix-memleak.patch +++ /dev/null @@ -1,29 +0,0 @@ -=== modified file 'duplicity/util.py' ---- duplicity/util.py 2011-08-23 18:14:17 +0000 -+++ duplicity/util.py 2012-01-20 21:50:01 +0000 -@@ -71,6 +71,10 @@ - else: - raise - -+class BlackHoleList(list): -+ def append(self, x): -+ pass -+ - class FakeTarFile: - debug = 0 - def __iter__(self): -@@ -83,7 +87,12 @@ - # yet. So we want to ignore ReadError exceptions, which are used to signal - # this. - try: -- return tarfile.TarFile("arbitrary", mode, fp) -+ tf = tarfile.TarFile("arbitrary", mode, fp) -+ # Now we cause TarFile to not cache TarInfo objects. It would end up -+ # consuming a lot of memory over the lifetime of our long-lasting -+ # signature files otherwise. -+ tf.members = BlackHoleList() -+ return tf - except tarfile.ReadError: - return FakeTarFile() - - diff --git a/community/duplicity/u1backend.patch b/community/duplicity/u1backend.patch deleted file mode 100644 index 7aba89fbb..000000000 --- a/community/duplicity/u1backend.patch +++ /dev/null @@ -1,16 +0,0 @@ -86a87,90 -> -> if isinstance(body, file): -> body.seek(0) # Go to the beginning of the file for the retry -> -108a113,115 -> if isinstance(body, file): -> body.seek(0) # Go to the beginning of the file for the retry -> -209a217 -> size = os.path.getsize(source_path.name) -213c221,222 -< headers = {"Content-Type": content_type} ---- -> headers = {"Content-Length": str(size), -> "Content-Type": content_type} diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD index 2e1f2a1ad..db606f240 100644 --- a/community/enet/PKGBUILD +++ b/community/enet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92446 2013-06-05 15:30:42Z svenstaro $ +# $Id: PKGBUILD 96714 2013-09-03 11:27:11Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Bj?indeijer <bjorn@lindeijer.nl> pkgname=enet -pkgver=1.3.8 +pkgver=1.3.9 pkgrel=1 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('72284b0699ace09c1723fd532742077ca775b724') +sha1sums=('c188e380024f346758376290ad80a1c89e206171') build() { cd "${pkgname}-${pkgver}" diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 8c83d8e8e..ae9c6ce71 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 96289 2013-08-24 08:49:00Z fyan $ +# $Id: PKGBUILD 96696 2013-09-03 03:55:15Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> ## Mozc compile option _bldtype=Release -_zipcoderel=201306 +_zipcoderel=201307 _protobuf_ver=2.5.0 +_gyp_rev=1656 _pkgbase=mozc pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" -pkgver=1.11.1502.102 +pkgver=1.11.1522.102 _patchver=${pkgver}.1 pkgrel=1 arch=('i686' 'x86_64') @@ -22,6 +23,7 @@ makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa') replaces=('mozc-fcitx') conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx') source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 + http://downloads.sourceforge.net/project/pnsft-aur/mozc/gyp-${_gyp_rev}.tar.xz http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2 @@ -64,6 +66,9 @@ build() { python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt msg "Done." + # Copy gyp + cp -rf "${srcdir}"/gyp-${_gyp_rev}/* third_party/gyp + # Copy protobuf to be linked statically cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files @@ -111,9 +116,10 @@ package() { install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } -sha512sums=('a88c98822d4eeefab2d50b760f3a161deecff5664837d4758652f61996dc7c78fe4ff278f93445810d905b2deb16d50aee02c4a8d64e19a47c7b1389ab03e746' - '1e2ad1c68c2a1e85cfbc8d171e81cf33d9c1905bcb952eb0f2ff19cf114b569438a75ec88b7737af4446e33374f3f543bea8061a18d415f1e86dd3b7a5207148' - '181adbee2d5090b3821d7472a35cd8e2b7d0ee1df4ba7e22acc9181b405c7707e67ba314b7d7dc2af006e42febb3ad1b55d244a2447d49649d775274c6785263' +sha512sums=('f1319b6cee9ba9444e75a3775abbd5804fda545be87e1977aa48825a14073448db6b12c2312d1cf74469cec7392af5c889a0fbd64cf741cc4e8c1c44dcdbf68f' + 'c162dab8d2935793002fef9a12d49a9ec36b4be3af73fe425e522302871744bf0710726539444bfd354244b41cea9fc649fb83a957000d70bcb0556265cdb171' + '9661c697368e3d3afec65fda3e07db5ceea358e26ecc372872dcdd52a688c5cf5a14d2b2eeb8a3875c1941b192efb5a100eb846067d4d5cb32afdb9dd4b0ba29' + '14b0dd6854e8732c4aa0105b6a8e39e7778c86ac94adf899ddb42424c6033eccd5686734f4bbe7ba8542903ac987fd553a051abfeeceae5c1649f9a74cb9e8a1' '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee' - 'd2935578c2eb76fa9d30f5eb689cbc04b95a38c94082216f752178f82ff63e409acfe22f345b9714db9434243c403f155fa574817e196bb86c4bc7dac1eb5b75' + '8d7a132613193c2e120d4a17fad97045451bcc700a552fa52e85f83cf5403de36b66c4bf6148c9cdabb493e82a5338cc090b693569d8ff087f4646e0604e0d3b' '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a') diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index c0444b87b..3583fd577 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95465 2013-08-12 19:44:52Z bpiotrowski $ +# $Id: PKGBUILD 96686 2013-09-03 02:30:19Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -15,6 +15,7 @@ groups=('lxde') options=('!libtool') install=libfm.install depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') +makedepends=('intltool') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) md5sums=('c09072e26b9688a7d171843c0da9b33f') diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 0c1004e39..6d1023661 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92940 2013-06-19 21:09:45Z bpiotrowski $ +# $Id: PKGBUILD 96733 2013-09-03 17:15:14Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw -pkgver=0.15.2 +pkgver=0.15.4 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('lcms') options=('!makeflags') changelog=$pkgname.changelog source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('828eac93910f26f813f91d35f92f33a9e719c2ec8522d575b248063194b068c6') +sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79') build() { cd ${srcdir}/LibRaw-${pkgver} diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog index ae434aae0..0c3b4b6fa 100644 --- a/community/libraw/libraw.changelog +++ b/community/libraw/libraw.changelog @@ -1,3 +1,6 @@ +2013-09-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libraw 0.15.4-1 + 2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * libraw 0.15.2-1 diff --git a/community/libsieve/PKGBUILD b/community/libsieve/PKGBUILD index 47887d420..245294222 100644 --- a/community/libsieve/PKGBUILD +++ b/community/libsieve/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 96634 2013-09-02 16:06:17Z spupykin $ +# $Id: PKGBUILD 96725 2013-09-03 13:55:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libsieve pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="sieve interpretator lib" arch=(i686 x86_64) url="http://libsieve.sourceforge.net/" license=('GPL') options=('!libtool') source=("https://github.com/downloads/sodabrew/libsieve/libsieve-$pkgver.tar.gz" - "glibc-regex.patch") + "glibc-regex.patch" + "crash-fix.patch") md5sums=('bb48eecf877cc7fdb2b0dfe757b48d7a' - '0d98d9e8f0583857616b2ba98f1833fa') + '0d98d9e8f0583857616b2ba98f1833fa' + '05ce47217ced05fd32a3ae41dc37f07e') prepare() { cd "$srcdir/$pkgname-$pkgver" rm -rf src/sv_regex + rm -f src/sv_parser/{addr,header,sieve}.{c,h} + rm -f src/sv_parser/{addr,header,sieve}-lex.{c,h} patch -p1 <$srcdir/glibc-regex.patch + patch -p1 <$srcdir/crash-fix.patch } build() { @@ -25,16 +30,32 @@ build() { aclocal automake autoconf +# export CFLAGS="-g -O2" +# export LDFLAGS="-g -O2" ./configure --prefix=/usr + (cd src/sv_parser && for i in `ls -1 *.l | sed 's|\.l||'`; do flex --header-file=$i.h -o $i.c $i.l; done) make } check() { cd "$srcdir/$pkgname-$pkgver/src/sv_test" + export LD_LIBRARY_PATH=$srcdir/libsieve-$pkgver/src/.libs:$LD_LIBRARY_PATH ls -1 script* | while read script; do ls -1 message* | while read msg; do - msg "checking $script $msg" - ./example $script $msg || true # upstream bugs? + if [ "$script" == "script22.sv" ]; then + # script22.sv: syntax errors check + msg "checking !$script $msg" + ./example $script $msg && false || true + else + if [ "$script" == "script23.sv" ]; then + # script23.sv: enotify looks unsupported or I don't know how to use it - skip it + msg "skipping $script $msg" + true + else + msg "checking $script $msg" + ./example $script $msg + fi + fi done done } diff --git a/community/libsieve/crash-fix.patch b/community/libsieve/crash-fix.patch new file mode 100644 index 000000000..7dfde87cc --- /dev/null +++ b/community/libsieve/crash-fix.patch @@ -0,0 +1,78 @@ +diff -wbBur libsieve-2.3.1/src/sv_parser/header.y libsieve-2.3.1.q/src/sv_parser/header.y +--- libsieve-2.3.1/src/sv_parser/header.y 2012-05-31 13:16:50.000000000 +0400 ++++ libsieve-2.3.1.q/src/sv_parser/header.y 2013-09-02 20:21:26.000000000 +0400 +@@ -70,7 +70,7 @@ + } + | body WRAP { + TRACE_DEBUG( "body: body WRAP: %s %s", $1, $2 ); +- $$ = libsieve_strbuf(context->strbuf, libsieve_strconcat( $1, $2, NULL ), strlen($1)+strlen($2), FREEME); ++ $$ = libsieve_strbuf(context->strbuf, libsieve_strconcat( $1 ? $1 : "", $2, NULL ), strlen($1 ? $1 : "")+strlen($2), FREEME); + }; + + %% +diff -wbBur libsieve-2.3.1/src/sv_parser/addr.y libsieve-2.3.1.q/src/sv_parser/addr.y +--- libsieve-2.3.1/src/sv_parser/addr.y 2012-05-31 13:16:50.000000000 +0400 ++++ libsieve-2.3.1.q/src/sv_parser/addr.y 2013-09-02 21:42:15.267979609 +0400 +@@ -38,6 +38,7 @@ + + /* sv_util */ + #include "src/sv_util/util.h" ++#include "src/sv_interface/context2.h" + + /* sv_parser */ + #include "addr.h" +@@ -74,10 +74,10 @@ + context->addr_addr->name = $1; + }; + +-address: mailbox_list { TRACE_DEBUG( "address: mailbox: %s", $1 ); } +- | group { TRACE_DEBUG( "address: group: %s", $1 ); }; ++address: mailbox_list { $$ = $1; TRACE_DEBUG( "address: mailbox: %s", $1 ); } ++ | group { $$ = $1; TRACE_DEBUG( "address: group: %s", $1 ); }; + +-group: phrase ':' ';' { TRACE_DEBUG( "group: phrase: %s", $1 ); } ++group: phrase ':' ';' { $$ = $1; TRACE_DEBUG( "group: phrase: %s", $1 ); } + | phrase ':' mailbox_list ';' { TRACE_DEBUG( "group: phrase mailbox_list: %s %s", $1, $3 ); }; + + mailbox_list: mailbox { +@@ -94,8 +94,8 @@ + }; + + mailbox: +- angle_addr { TRACE_DEBUG( "mailbox: angle_addr: %s", $1 ); } +- | addr_spec { TRACE_DEBUG( "mailbox: addr_spec: %s", $1 ); } ++ angle_addr { $$ = $1; TRACE_DEBUG( "mailbox: angle_addr: %s", $1 ); } ++ | addr_spec { $$ = $1; TRACE_DEBUG( "mailbox: addr_spec: %s", $1 ); } + | phrase angle_addr { + TRACE_DEBUG( "mailbox: phrase angle_addr: %s %s", $1, $2 ); + // This is a "top terminal" state... +@@ -103,7 +103,7 @@ + context->addr_addr->name = libsieve_strdup( $1 ); + }; + +-angle_addr: '<' addr_spec '>' { TRACE_DEBUG( "angle_addr: addr_spec: %s", $2 ); } ++angle_addr: '<' addr_spec '>' { $$ = $2; TRACE_DEBUG( "angle_addr: addr_spec: %s", $2 ); } + | '<' route ':' addr_spec '>' { + TRACE_DEBUG( "angle_addr: route addr_spec: %s:%s", $2, $4 ); + // This is a "top terminal" state... +@@ -133,13 +133,13 @@ + $$ = libsieve_strbuf(context->strbuf, libsieve_strconcat( "@", $2, ",", $4, NULL ), strlen($2)+strlen($4)+2, FREEME); + }; + +-local_part: DOTATOM { TRACE_DEBUG( "local_part: DOTATOM: %s", $1 ); } +- | ATOM { TRACE_DEBUG( "local_part: ATOM : %s", $1); } +- | qstring { TRACE_DEBUG( "local_part: qstring: %s", $1); } +- +-domain: DOTATOM { TRACE_DEBUG( "domain: DOTATOM: %s", $1 ); } +- | ATOM { TRACE_DEBUG("domain: ATOM: %s", $1); } +- | domainlit { TRACE_DEBUG( "domain: domainlit: %s", $1); }; ++local_part: DOTATOM { $$ = $1; TRACE_DEBUG( "local_part: DOTATOM: %s", $1 ); } ++ | ATOM { $$ = $1; TRACE_DEBUG( "local_part: ATOM : %s", $1); } ++ | qstring { $$ = $1; TRACE_DEBUG( "local_part: qstring: %s", $1); } ++ ++domain: DOTATOM { $$ = $1; TRACE_DEBUG( "domain: DOTATOM: %s", $1 ); } ++ | ATOM { $$ = $1; TRACE_DEBUG("domain: ATOM: %s", $1); } ++ | domainlit { $$ = $1; TRACE_DEBUG( "domain: domainlit: %s", $1); }; + + domainlit: '[' DTEXT ']' { + TRACE_DEBUG( "domainlit: DTEXT: %s", $2 ); diff --git a/community/lxappearance-obconf/PKGBUILD b/community/lxappearance-obconf/PKGBUILD index 92b47b7fb..9f771b4bf 100644 --- a/community/lxappearance-obconf/PKGBUILD +++ b/community/lxappearance-obconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71868 2012-06-02 14:56:09Z bpiotrowski $ +# $Id: PKGBUILD 96676 2013-09-03 01:00:14Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgname=lxappearance-obconf pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='A plugin for LXAppearance to configure Openbox' arch=('i686' 'x86_64') license=('GPL2') @@ -11,12 +11,22 @@ url="http://lxde.org/" groups=('lxde') depends=('lxappearance' 'openbox') makedepends=('intltool') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) -md5sums=('8bf23c90febe6a655e0f86c80e44725d') +options=('!libtool') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz + obconf-rrbutton.patch) +md5sums=('8bf23c90febe6a655e0f86c80e44725d' + '73cd418ff8dc68a76538fc829d6260c7') + +prepare() { + cd $srcdir/$pkgname-$pkgver + + # Fix building with openbox-3.5.2 + patch -Np1 -i ../obconf-rrbutton.patch +} build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/community/lxappearance-obconf/obconf-rrbutton.patch b/community/lxappearance-obconf/obconf-rrbutton.patch new file mode 100644 index 000000000..334a9db4a --- /dev/null +++ b/community/lxappearance-obconf/obconf-rrbutton.patch @@ -0,0 +1,49 @@ +commit 9cffa6a9ddfc4074f3de8d0302404d70c2818d8f +Author: Markos Chandras <hwoarang@gentoo.org> +Date: Fri Aug 5 16:24:57 2011 +0100 + + Use new RrButton structure + +diff --git a/src/preview.c b/src/preview.c +index a82cf15..320e7ac 100644 +--- a/src/preview.c ++++ b/src/preview.c +@@ -327,28 +327,28 @@ static GdkPixbuf* preview_window(RrTheme *theme, const gchar *titlelayout, + switch (*layout) { + case 'D': + a = focus ? +- theme->a_focused_unpressed_desk : +- theme->a_unfocused_unpressed_desk; ++ theme->btn_desk->a_focused_unpressed : ++ theme->btn_desk->a_unfocused_unpressed; + break; + case 'S': + a = focus ? +- theme->a_focused_unpressed_shade : +- theme->a_unfocused_unpressed_shade; ++ theme->btn_shade->a_focused_unpressed : ++ theme->btn_shade->a_unfocused_unpressed; + break; + case 'I': + a = focus ? +- theme->a_focused_unpressed_iconify : +- theme->a_unfocused_unpressed_iconify; ++ theme->btn_iconify->a_focused_unpressed : ++ theme->btn_iconify->a_unfocused_unpressed; + break; + case 'M': + a = focus ? +- theme->a_focused_unpressed_max : +- theme->a_unfocused_unpressed_max; ++ theme->btn_max->a_focused_unpressed : ++ theme->btn_max->a_unfocused_unpressed; + break; + case 'C': + a = focus ? +- theme->a_focused_unpressed_close : +- theme->a_unfocused_unpressed_close; ++ theme->btn_close->a_focused_unpressed : ++ theme->btn_close->a_unfocused_unpressed; + break; + default: + continue; diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index 322e4c7d6..98b7c0477 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,18 +1,18 @@ -#$Id: PKGBUILD 71027 2012-05-22 05:49:29Z bpiotrowski $ +#$Id: PKGBUILD 96680 2013-09-03 01:45:50Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxappearance pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Feature-rich GTK+ theme switcher of the LXDE Desktop" arch=('i686' 'x86_64') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk2' 'intltool') -makedepends=('pkgconfig') +depends=('gtk2') +makedepends=('intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) md5sums=('a088c6ef08fd25df7dc3be5b07168bbe') diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD index 42e2df8ef..bbfefe933 100644 --- a/community/lxlauncher/PKGBUILD +++ b/community/lxlauncher/PKGBUILD @@ -1,28 +1,36 @@ -# $Id: PKGBUILD 93768 2013-07-10 07:02:47Z bpiotrowski $ +# $Id: PKGBUILD 96678 2013-09-03 01:34:25Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxlauncher pkgver=0.2.2 -pkgrel=3 +pkgrel=4 pkgdesc='Open source clone of the Asus launcher for EeePC' arch=('i686' 'x86_64') license=('GPL2') url='http://lxde.org/' groups=('lxde') -depends=('gtk2' 'startup-notification' 'gnome-menus' 'menu-cache' 'intltool') -makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz) -md5sums=('16df627447838b170a72cc3a9ee21497') +depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache') +makedepends=('intltool') +source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz + fix-empty-launcher.patch) +md5sums=('16df627447838b170a72cc3a9ee21497' + '4dd715f9cccf04ef87c662cee1dcb798') + +prepare() { + cd $pkgname-$pkgver + # Fix empty launcher + patch -Np1 -i ../fix-empty-launcher.patch +} build() { cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } diff --git a/community/lxlauncher/fix-empty-launcher.patch b/community/lxlauncher/fix-empty-launcher.patch new file mode 100644 index 000000000..20efe1a6b --- /dev/null +++ b/community/lxlauncher/fix-empty-launcher.patch @@ -0,0 +1,89 @@ +From 56a244f2aa3c474b2506847ba9a2f5a21cb8efc2 Mon Sep 17 00:00:00 2001 +From: Julien Lavergne <julien.lavergne@gmail.com> +Date: Tue, 26 Jul 2011 01:21:04 +0200 +Subject: [PATCH] Fix GtkAllocation to fix empty lxlauncher + +--- + src/exo-wrap-table.c | 26 ++++++++++++++++---------- + 1 files changed, 16 insertions(+), 10 deletions(-) + +diff --git a/src/exo-wrap-table.c b/src/exo-wrap-table.c +index c691434..f48322f 100644 +--- a/src/exo-wrap-table.c ++++ b/src/exo-wrap-table.c +@@ -326,14 +326,14 @@ exo_wrap_table_size_request (GtkWidget *widget, + if (G_LIKELY (num_children > 0)) + { + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_set_allocation(widget, &allocation); +- num_cols = exo_wrap_table_get_num_fitting (allocation.width ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(widget), allocation); ++ num_cols = exo_wrap_table_get_num_fitting (allocation->width + - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, + table->priv->col_spacing, max_width); + #else + num_cols = exo_wrap_table_get_num_fitting (widget->allocation.width +- - gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2, ++ - GTK_CONTAINER (widget)->border_width * 2, + table->priv->col_spacing, max_width); + #endif + num_rows = num_children / num_cols; +@@ -345,7 +345,12 @@ exo_wrap_table_size_request (GtkWidget *widget, + requisition->width = -1; + requisition->height = (num_rows * max_height) + + (num_rows - 1) * table->priv->col_spacing ++#if GTK_CHECK_VERSION(2,18,0) + + gtk_container_get_border_width(GTK_CONTAINER (widget)) * 2; ++ g_free (allocation); ++#else ++ + GTK_CONTAINER (widget)->border_width * 2; ++#endif + } + else + { +@@ -479,8 +484,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + gint max_height; + gint max_width; + #if GTK_CHECK_VERSION(2,18,0) +- GtkAllocation allocation; +- gtk_widget_set_allocation(GTK_WIDGET(table), &allocation); ++ GtkAllocation *allocation = g_new0 (GtkAllocation, 1); ++ gtk_widget_get_allocation(GTK_WIDGET(table), allocation); + #endif + + /* determine the number of visible children and the max size */ +@@ -490,7 +495,7 @@ exo_wrap_table_layout (ExoWrapTable *table) + + /* determine the number of columns */ + #if GTK_CHECK_VERSION(2,18,0) +- num_cols = exo_wrap_table_get_num_fitting (allocation.width ++ num_cols = exo_wrap_table_get_num_fitting (allocation->width + - gtk_container_get_border_width(GTK_CONTAINER (table)) * 2, + table->priv->col_spacing, max_width); + #else +@@ -509,8 +514,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + + /* determine the horizontal bounds */ + #if GTK_CHECK_VERSION(2,18,0) +- x0 = allocation.x + gtk_container_get_border_width(GTK_CONTAINER (table)); +- x1 = x0 + allocation.width - gtk_container_get_border_width(GTK_CONTAINER (table)); ++ x0 = allocation->x + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ x1 = x0 + allocation->width - gtk_container_get_border_width(GTK_CONTAINER (table)); + #else + x0 = GTK_WIDGET (table)->allocation.x + GTK_CONTAINER (table)->border_width; + x1 = x0 + GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width; +@@ -519,7 +524,8 @@ exo_wrap_table_layout (ExoWrapTable *table) + /* initialize the position */ + x = x0; + #if GTK_CHECK_VERSION(2,18,0) +- y = allocation.y + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ y = allocation->y + gtk_container_get_border_width(GTK_CONTAINER (table)); ++ g_free (allocation); + #else + y = GTK_WIDGET (table)->allocation.y + GTK_CONTAINER (table)->border_width; + #endif +-- +1.7.4.1 + diff --git a/community/lxlauncher/intltool.patch b/community/lxlauncher/intltool.patch deleted file mode 100644 index 3829806c8..000000000 --- a/community/lxlauncher/intltool.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -NrU5 lxlauncher-0.2.1.original/configure.in lxlauncher-0.2.1/configure.in ---- lxlauncher-0.2.1.original/configure.in 2009-07-18 21:49:07.000000000 -0600 -+++ lxlauncher-0.2.1/configure.in 2009-07-18 21:49:50.000000000 -0600 -@@ -2,10 +2,11 @@ - - AC_INIT(configure.in) - AM_INIT_AUTOMAKE(lxlauncher, 0.2.1) - AM_CONFIG_HEADER(config.h) - AM_MAINTAINER_MODE -+IT_PROG_INTLTOOL - - AC_ISC_POSIX - AC_PROG_CC - AM_PROG_CC_STDC - AC_HEADER_STDC - diff --git a/community/lxlauncher/lxlauncher-0.2.1-dsofix.patch b/community/lxlauncher/lxlauncher-0.2.1-dsofix.patch deleted file mode 100644 index 7ee0c1c68..000000000 --- a/community/lxlauncher/lxlauncher-0.2.1-dsofix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur lxlauncher-0.2.1.orig/src/Makefile.in lxlauncher-0.2.1/src/Makefile.in ---- lxlauncher-0.2.1.orig/src/Makefile.in 2009-07-07 14:46:41.000000000 +0200 -+++ lxlauncher-0.2.1/src/Makefile.in 2010-02-17 13:34:43.000000000 +0100 -@@ -101,7 +101,7 @@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lX11 - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LTLIBOBJS = @LTLIBOBJS@ diff --git a/community/lxlauncher/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch b/community/lxlauncher/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch deleted file mode 100644 index 49a4b3488..000000000 --- a/community/lxlauncher/lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cb99b126dd90a8460c5bd4a837fdb7505658ba52 Mon Sep 17 00:00:00 2001 -From: martyj19 <martyj19@comcast.net> -Date: Mon, 13 Jul 2009 16:46:09 +0000 -Subject: [PATCH 02/50] Fix SUSE lint warnings - ---- - src/lxlauncher.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/lxlauncher.c b/src/lxlauncher.c -index 7dab830..034d308 100644 ---- a/src/lxlauncher.c -+++ b/src/lxlauncher.c -@@ -311,6 +311,7 @@ static gboolean on_scroll( GtkAdjustment* adj, PageData* data ) - { - // Dirty hacks used to force pseudo-transparent background - gtk_widget_queue_draw( data->table ); -+ return TRUE; - } - - // Dirty hacks used to reduce unnecessary redrew during scroll -@@ -674,6 +675,7 @@ gchar* get_xdg_config_file(const char *name) { - } - free(file); - } -+ return NULL; - } - - int main(int argc, char** argv) --- -1.6.6 - diff --git a/community/lxlauncher/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch b/community/lxlauncher/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch deleted file mode 100644 index 1720d3e62..000000000 --- a/community/lxlauncher/lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch +++ /dev/null @@ -1,125 +0,0 @@ -From a7dad81b883a783bc1ac4f8092a1571b7f843914 Mon Sep 17 00:00:00 2001 -From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com> -Date: Wed, 17 Feb 2010 22:42:01 +0800 -Subject: [PATCH 50/50] Fix for the new behavior of libmenu-cache 0.3 series. - ---- - src/lxlauncher.c | 67 +++++++++++++++++++++++++++++++++++++---------------- - 1 files changed, 47 insertions(+), 20 deletions(-) - -diff --git a/src/lxlauncher.c b/src/lxlauncher.c -index 6dfbbc9..3a39bc6 100644 ---- a/src/lxlauncher.c -+++ b/src/lxlauncher.c -@@ -663,21 +663,40 @@ gchar* get_xdg_config_file(const char *name) { - gchar *file; - - file = g_build_filename(user_dir, name, NULL); -- if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) { -- return file; -- } -+ if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) -+ return file; - free(file); - - for (dir = system_dirs; *dir; ++dir ) { -- file = g_build_filename(*dir, name, NULL); -- if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) { -- return file; -- } -- free(file); -+ file = g_build_filename(*dir, name, NULL); -+ if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) -+ return file; -+ free(file); - } - return NULL; - } - -+static void on_menu_cache_reload(MenuCache* mc, gpointer user_data) -+{ -+ GMainLoop* mainloop = (GMainLoop*)user_data; -+ g_main_loop_quit(mainloop); -+} -+ -+MenuCache* _menu_cache_lookup_sync( const char* menu_name ) -+{ -+ MenuCache* mc = menu_cache_lookup(menu_name); -+ /* ensure that the menu cache is loaded */ -+ if(! menu_cache_get_root_dir(mc)) /* if it's not yet loaded */ -+ { -+ GMainLoop* mainloop = g_main_loop_new(NULL, FALSE); -+ gpointer notify_id = menu_cache_add_reload_notify(mc, on_menu_cache_reload, mainloop); -+ g_main_loop_run(mainloop); -+ g_main_loop_unref(mainloop); -+ menu_cache_remove_reload_notify(mc, notify_id); -+ } -+ return mc; -+} -+ - int main(int argc, char** argv) - { - int i; -@@ -697,13 +716,14 @@ int main(int argc, char** argv) - GError *error = NULL; - gchar *config_file = get_xdg_config_file(CONFIG_FILE); - if (config_file && -- g_key_file_load_from_file(key_file, -- config_file, -- G_KEY_FILE_NONE, -- &error)) { -- printf("Loaded %s\n", config_file); -- } else { -- perror("Error loading " CONFIG_FILE); -+ g_key_file_load_from_file(key_file, -+ config_file, -+ G_KEY_FILE_NONE, -+ &error)) { -+ printf("Loaded %s\n", config_file); -+ } -+ else { -+ perror("Error loading " CONFIG_FILE); - } - if (config_file) - free(config_file); -@@ -719,15 +739,17 @@ int main(int argc, char** argv) - gchar* gtkrc_file = get_xdg_config_file("lxlauncher/gtkrc"); - gtk_rc_parse(gtkrc_file); - if (gtkrc_file) { -- free(gtkrc_file); -+ free(gtkrc_file); - } - - button_size = g_key_file_get_integer(key_file, "Main", "BUTTON_SIZE", NULL); - img_size = g_key_file_get_integer(key_file, "Main", "IMG_SIZE", NULL); - - // to prevent from going without configure file -- if(!button_size) button_size = BUTTON_SIZE_FALLBACK; -- if(!img_size) img_size = IMG_SIZE_FALLBACK; -+ if(!button_size) -+ button_size = BUTTON_SIZE_FALLBACK; -+ if(!img_size) -+ img_size = IMG_SIZE_FALLBACK; - - icon_size = gtk_icon_size_register( "ALIcon", img_size, img_size ); - -@@ -758,9 +780,14 @@ int main(int argc, char** argv) - gtk_container_add( (GtkContainer*)main_window, notebook ); - - g_setenv("XDG_MENU_PREFIX", "lxlauncher-", TRUE); -- menu_tree = menu_cache_lookup( "applications.menu" ); -+ menu_tree = _menu_cache_lookup_sync( "applications.menu" ); -+ if(!menu_tree) -+ { -+ g_print("Unable to load application menu\n"); -+ return 1; -+ } -+ root_dir = menu_cache_item_ref(menu_cache_get_root_dir( menu_tree )); - reload_notify_id = menu_cache_add_reload_notify( menu_tree, on_menu_tree_changed, NULL ); -- root_dir = menu_cache_ref(menu_cache_get_root_dir( menu_tree )); - - create_notebook_pages(); - --- -1.6.6 - diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index d9e2cdaf5..f06e08208 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93770 2013-07-10 07:14:37Z bpiotrowski $ +# $Id: PKGBUILD 96687 2013-09-03 02:37:13Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -12,7 +12,7 @@ license=('GPL2') url='http://lxde.org/' groups=('lxde') depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck') -makedepends=('docbook-xml' 'docbook-xsl' 'wireless_tools') +makedepends=('intltool' 'docbook-xml' 'docbook-xsl' 'wireless_tools') optdepends=('wireless_tools: netstat plugin') source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz lxpanel-0.5.12-automake-1.14-support.patch) diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD index 915f30b71..b8f6a1477 100644 --- a/community/menu-cache/PKGBUILD +++ b/community/menu-cache/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 93764 2013-07-10 06:48:17Z bpiotrowski $ +# $Id: PKGBUILD 96685 2013-09-03 02:22:03Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=menu-cache pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='Caching mechanism for freedesktop.org compliant menus' arch=('i686' 'x86_64') license=('GPL2') url='http://lxde.org/' groups=('lxde') -depends=('intltool' 'glib2') +depends=('glib2') options=('!libtool') -makedepends=('pkgconfig') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) sha256sums=('875a7441b34bb24debc1c8017d74d59987d7a704c4c023e81a0b4ebcc2d7904a') diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD new file mode 100644 index 000000000..87eb5686c --- /dev/null +++ b/community/mpv/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 96700 2013-09-03 06:44:12Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Eivind Uggedal <eivind@uggedal.com> + +pkgname=mpv +pkgver=0.1.4 +pkgrel=4 +pkgdesc='Video player based on MPlayer/mplayer2' +arch=('i686' 'x86_64') +license=('GPL') +url='http://mpv.io' +depends=('portaudio' 'ffmpeg' 'lcms2' 'libxinerama' 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva') +makedepends=('mesa' 'python-docutils') +options=(!emptydirs) +source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") +md5sums=('7a0ff10fb0c6a2a8c176d40883eb09d4') + +build() { + unset CFLAGS + unset LDFLAGS + + cd $pkgname-$pkgver + + ./configure --prefix=/usr \ + --confdir=/etc/mpv \ + --disable-lircc \ + --disable-joystick \ + --disable-radio \ + --disable-radio-capture \ + --disable-radio-v4l2 \ + --disable-rpath \ + --disable-libbs2b \ + --disable-direct3d \ + --disable-corevideo \ + --disable-cocoa \ + --disable-coreaudio + make +} + +package() { + cd $pkgname-$pkgver + make -j1 DESTDIR="$pkgdir" install + + install -d $pkgdir/usr/share/doc/mpv/examples + install -m644 etc/{input,example,encoding-example-profiles}.conf \ + "$pkgdir"/usr/share/doc/mpv/examples + install -m644 DOCS/{encoding.rst,tech-overview.txt} \ + "$pkgdir"/usr/share/doc/mpv + install -m755 TOOLS/mpv_identify.sh "$pkgdir"/usr/bin +} diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index c2f31b445..cee1881d0 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 96473 2013-08-30 11:19:31Z arodseth $ +# $Id: PKGBUILD 96739 2013-09-03 19:46:20Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=10 +pkgrel=12 pkgdesc='Simple paint program for creating icons and pixel based artwork' arch=('x86_64' 'i686') url='http://mtpaint.sourceforge.net/' license=('GPL3') -depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2' 'jasper') -makedepends=('gtk2' 'giflib' 'openjpeg' 'lcms2' 'setconf' 'jasper') +depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2' + 'jasper' 'libtiff' 'libpng' 'freetype2') +makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'jasper' 'libtiff' + 'libpng' 'freetype2') install='mtpaint.install' -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" - 'libpng15.patch') -sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' - 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") +sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - patch -Np1 -i '../libpng15.patch' - sed -i 's:openjpeg.h:openjpeg-1.5/openjpeg.h:' src/png.c sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c @@ -30,18 +28,15 @@ prepare() { } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - export CFLAGS="`pkg-config gtk+-2.0 --cflags` $CFLAGS" - ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff - sed -i 's:-lpng:-lpng -lgif:' _conf.txt - sed -i 's:ungif:gif:g' _conf.txt - setconf _conf.txt CC 'gcc -w' + export CFLAGS="-w `pkg-config libopenjpeg --cflags` $CFLAGS" + ./configure --prefix=/usr --mandir=/usr/share/man man intl GIF jpeg tiff cflags lcms2 jp2 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/mtpaint/libpng15.patch b/community/mtpaint/libpng15.patch deleted file mode 100644 index 7df3b2127..000000000 --- a/community/mtpaint/libpng15.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c ---- mtpaint-3.31.orig/src/png.c 2010-01-25 00:43:07.000000000 +0200 -+++ mtpaint-3.31/src/png.c 2010-01-25 00:43:39.000000000 +0200 -@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_ - if (settings->bpp == 3) - { - png_set_strip_16(png_ptr); -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - png_set_palette_to_rgb(png_ptr); - png_set_gray_to_rgb(png_ptr); - -@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_ - png_set_strip_alpha(png_ptr); - png_set_packing(png_ptr); - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - for (i = 0; i < height; i++) - { - row_pointers[i] = settings->img[CHN_IMAGE] + i * width; diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index 1bcf90acc..d9e5a6335 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 94084 2013-07-14 10:32:42Z jlichtblau $ +# $Id: PKGBUILD 96729 2013-09-03 15:26:43Z alucryd $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget pkgver=11.0 -pkgrel=1 +pkgrel=3 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686') url="http://nzbget.sourceforge.net/" license=('GPL') -depends=('gnutls' 'libpar2' 'libxml2' 'libsigc++' 'libgcrypt') -makedepends=('autoconf' 'automake') -changelog=$pkgname.changelog -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.gz) +depends=('gnutls' 'libpar2' 'libsigc++' 'libxml2' 'python') +changelog="${pkgname}.changelog" +source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") sha256sums=('27abacf6c604969dc987b7e50689caef22a65dbb1690b020b0c6d147ae123b3d') build() { - cd ${srcdir}/$pkgname-$pkgver + cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --enable-parcheck - make CXXFLAGS="-lsigc-2.0" + ./configure --prefix='/usr' --sbindir='/usr/bin' --enable-parcheck + make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -d ${pkgdir}/usr/share/$pkgname - install -m644 -t ${pkgdir}/usr/share/$pkgname AUTHORS ChangeLog README + install -d "${pkgdir}"/usr/share/${pkgname} + install -m644 -t "${pkgdir}"/usr/share/${pkgname} AUTHORS ChangeLog README } + +# vim: ts=2 sw=2 et: diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog index 7e2a9312a..8670f51a9 100644 --- a/community/nzbget/nzbget.changelog +++ b/community/nzbget/nzbget.changelog @@ -1,36 +1,39 @@ -2013-07-14-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * nzbget 11.0-1 +2013-09-03 Maxime Gauduin <alucryd@gmail.com> + * Fixed FS#36250 - package built without system CXXFLAGS + +2013-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * nzbget 11.0-1 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * nzbget 10.2-1 + * nzbget 10.2-1 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * nzbget 9.1-1 + * nzbget 9.1-1 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * nzbget 9.0-1 + * nzbget 9.0-1 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * nzbget 0.8.0-1 + * nzbget 0.8.0-1 2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * nzbget 0.7.0-4 package signed + * nzbget 0.7.0-4 package signed 2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Fixed FS#19399 - missing postprocess-example.conf file + * Fixed FS#19399 - missing postprocess-example.conf file 2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.7.0 + * Update to major release 0.7.0 2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Dependency added (gnutls) in v0.6.0-2 + * Dependency added (gnutls) in v0.6.0-2 2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.6.0 + * Update to major release 0.6.0 2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.5.1 + * Update to major release 0.5.1 2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Package moved to [community] - * Update to major release 0.5.0 + * Package moved to [community] + * Update to major release 0.5.0 diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index ed36c0ca8..2672e91cd 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94860 2013-07-31 13:09:35Z seblu $ +# $Id: PKGBUILD 96712 2013-09-03 08:11:01Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga -pkgver=0.99.22.3 +pkgver=0.99.22.4 pkgrel=1 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ripd.service' 'ripngd.service' 'zebra.service') -md5sums=('1467b6828842af59b31252515729bb09' +md5sums=('1b68aa52d403b6b4ea877e005610a6b4' '20a8e36ad851d4e06467aeb56a84b245' 'cc90c234aac9098c5132d653037d5269' '67d0ada0f3000b9a86351798786c5256' @@ -41,6 +41,8 @@ prepare() { build() { cd $pkgname-$pkgver + # fix broken 0.99.22.4 tarball + autoreconf -fvi ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ |