diff options
163 files changed, 1839 insertions, 2048 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 9f8449bbb..c7fe00c3b 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91648 2013-05-26 09:24:29Z bluewind $ +# $Id: PKGBUILD 96266 2013-08-23 04:10:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd -pkgver=5.3.0 -pkgrel=3 +pkgver=5.4.0 +pkgrel=1 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -38,11 +38,11 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached' depends=('libltdl' 'iptables') -source=("${url}files/${pkgname}-${pkgver}.tar.gz" +source=("${url}files/${pkgname}-${pkgver}.tar.bz2" 'libperl.patch' 'service') -sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' - '245c098d121a4a05594553583310953b3a2f6461' +sha1sums=('c2bc3ca3c62cfba4499c4eb14066a4c78301cc2c' + '5364ea1330bc56c3b7cfb6d7f19a627c0053279e' '04f676d0b76c34df0bbf94629813e035b1febe04') backup=('etc/collectd.conf') @@ -50,10 +50,9 @@ options=('!libtool') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - + sed 's/-Werror//g' -i *.in */*.in */*/*.in patch -p1 -i ../libperl.patch autoconf - sed 's/-Werror//g' -i src/Makefile.in } build() { diff --git a/community/collectd/libperl.patch b/community/collectd/libperl.patch index baa9c5397..31b269a41 100644 --- a/community/collectd/libperl.patch +++ b/community/collectd/libperl.patch @@ -1,7 +1,7 @@ -diff -aur old/configure.in new/configure.in ---- old/configure.in 2011-09-29 20:38:56.725672831 +1000 -+++ new/configure.in 2011-09-29 20:39:07.975658829 +1000 -@@ -2810,11 +2810,13 @@ +diff -Naur old/configure.in new/configure.in +--- old/configure.in 2013-08-18 22:24:25.049973054 +1200 ++++ new/configure.in 2013-08-23 15:58:24.552240546 +1200 +@@ -3101,11 +3101,13 @@ then SAVE_CFLAGS="$CFLAGS" SAVE_LDFLAGS="$LDFLAGS" @@ -15,9 +15,9 @@ diff -aur old/configure.in new/configure.in AC_CACHE_CHECK([for libperl], [c_cv_have_libperl], -@@ -2833,7 +2835,10 @@ - Nullsv); - ]]), +@@ -3124,7 +3126,10 @@ + ]]] + )], [c_cv_have_libperl="yes"], - [c_cv_have_libperl="no"] + [ diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index ab5be235b..f8c5d7b76 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 92844 2013-06-17 00:23:34Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# $Id: PKGBUILD 96324 2013-08-25 17:11:08Z dicebot $ +# Maintainer: Mihails Strasunse <public@dicebot.lv> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Anders Bergh <anders1@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> -pkgname=('dmd' 'libphobos' 'dtools') +pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools') +groups=('dlang' 'dlang-dmd') pkgbase=dmd pkgver=2.063.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.dlang.org" -makedepends=('git') +makedepends=('git' 'gcc' 'make') source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver" "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver" "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver" - "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver") + "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver" + "soname.diff") sha1sums=('SKIP' 'SKIP' 'SKIP' - 'SKIP') + 'SKIP' + '5a2198e8a024e1e6494034da569f0df18fabcf9d') [[ $CARCH == "x86_64" ]] && _archbits="64" [[ $CARCH == "i686" ]] && _archbits="32" @@ -32,11 +36,17 @@ build() { make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 cd $srcdir/phobos + # will be in upstream in next release but making naming change as early as possible + git apply $srcdir/soname.diff make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 cd $srcdir/tools - for tool in rdmd.d ddemangle.d catdoc.d detab.d tolf.d dget.d; do - $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ $tool + + # rdmd is used to buil others + $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-rdmd rdmd.d + + for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do + ./dtools-rdmd --compiler=$srcdir/dmd/src/dmd --build-only -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-`basename $tool` $tool.d done } @@ -44,13 +54,15 @@ package_dmd() { pkgdesc="The D programming language reference compiler" backup=('etc/dmd.conf') depends=('gcc') + optdepends=('dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package') provides=("d-compiler=$pkgver") license=('custom') + backup=('etc/dmd.conf') install -Dm755 $srcdir/dmd/src/dmd $pkgdir/usr/bin/dmd mkdir -p $pkgdir/etc - echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf + echo -e "[Environment]\nDFLAGS=-I/usr/include/dlang/dmd -I/usr/include/dlang/dmd/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf install -Dm644 $srcdir/dmd/docs/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1 install -Dm644 $srcdir/dmd/docs/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5 @@ -58,36 +70,27 @@ package_dmd() { install -Dm644 $srcdir/dmd/src/backendlicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-backend install -Dm644 $srcdir/dmd/src/gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.1 install -Dm644 $srcdir/dmd/src/artistic.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.2 + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos mkdir -p $pkgdir/usr/share/d/samples/ cp -r $srcdir/dmd/samples/* $pkgdir/usr/share/d/samples/ find $pkgdir/usr -type f | xargs chmod 0644 chmod 755 $pkgdir/usr/bin/* - - # No longer available, because not source code is provided and those are not mandatory. - # Please get those from http://dlang.org if absolutely needed. - - # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/dumpobj $pkgdir/usr/bin/dumpobj - # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/obj2asm $pkgdir/usr/bin/obj2asm } -# Will be packaged separately once GDC/LDC will be able to compile phobos and pass test suite. -# For now only dependency is relaxed -package_libphobos() { - depends=("d-compiler>=$pkgver" "curl") - pkgdesc="The Phobos standard library for D programming language" - license=("boost") - install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a - install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so +package_libphobos-devel() { + pkgdesc="The Phobos standard library for D programming language. Modules and static library." + depends=("dmd") + license=("custom") - mkdir -p $pkgdir/usr/include/d - cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/d + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a - mkdir -p $pkgdir/usr/include/d/druntime - cp -r $srcdir/druntime/import $pkgdir/usr/include/d/druntime + mkdir -p $pkgdir/usr/include/dlang/dmd + cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/dlang/dmd - mkdir -p $pkgdir/usr/share/doc/d/ + mkdir -p $pkgdir/usr/include/dlang/dmd/druntime + cp -r $srcdir/druntime/import $pkgdir/usr/include/dlang/dmd/druntime find $pkgdir/usr -type f | xargs chmod 0644 @@ -95,12 +98,31 @@ package_libphobos() { install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos } +package_libphobos() { + pkgdesc="The Phobos standard library for D programming language." + depends=("curl") + license=("custom") + + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + package_dtools() { pkgdesc="Ancilliary tools for the D programming language compiler" - license=("boost") depends=("curl") + license=("custom") cd $srcdir/tools + mkdir -p $pkgdir/usr/bin - install -m755 -t $pkgdir/usr/bin rdmd ddemangle catdoc detab tolf dget + for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do + install -m755 -t $pkgdir/usr/bin $pkgname-$tool + done + + cd $pkgdir + ln -s dtools-rdmd usr/bin/rdmd + ln -s dtools-dustmite usr/bin/dustmite + + # same Boost license as Phobos + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE-phobos } diff --git a/community/dmd/soname.diff b/community/dmd/soname.diff new file mode 100644 index 000000000..7d155a52a --- /dev/null +++ b/community/dmd/soname.diff @@ -0,0 +1,15 @@ +diff --git a/posix.mak b/posix.mak +index 8fd953e..3776bb4 100644 +--- a/posix.mak ++++ b/posix.mak +@@ -153,8 +153,8 @@ DDOC=$(DMD) + VERSION=../dmd/VERSION + + # Set SONAME, the name of the shared library. +-# The awk script will produce the last 2 digits of the version string, i.e. 2.063 produces 63 +-SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$NF + 0 }' $(VERSION)) ++# The awk script will return the second group without leading zeros of the version string, i.e. 2.063.2 produces 63 ++SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$2 + 0 }' $(VERSION)) + + # Set LIB, the ultimate target + ifeq (,$(findstring win,$(OS))) diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 9e277b54e..6cfb2265d 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92929 2013-06-19 13:52:02Z arodseth $ +# $Id: PKGBUILD 96358 2013-08-26 11:47:54Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -9,15 +9,21 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') pkgver=R16B01 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686' 'mips64el') url='http://www.erlang.org/' license=('custom') makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" - "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") + "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz" + 'epmd.service' + 'epmd.socket' + 'epmd.conf') sha256sums=('da388bc07b8ebdd008f5bb6c3d2c280e358bd188b5aac3ea01e3a7436315abc0' - '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2') + '71972049fbac73457fb6868be18068edce9f2c9fc2aeeab15f019d4217b6a8c2' + 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' + '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34' + '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2') build() { cd "$srcdir/otp_src_${pkgver/_1/}" @@ -57,6 +63,12 @@ package_erlang() { mkdir "$srcdir/unixodbc" mv "$pkgdir/usr/lib/erlang/lib/odbc"* "$srcdir/unixodbc/" mv "$pkgdir/usr/lib/erlang/man/man3/odbc.3.gz" "$srcdir" + + # epmd service, socket and conf + cd "$srcdir" + install -Dm644 epmd.service "$pkgdir/etc/systemd/system/epmd.service" + install -Dm644 epmd.socket "$pkgdir/etc/systemd/system/epmd.socket" + install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd" } package_erlang-unixodbc() { diff --git a/community/erlang/epmd.conf b/community/erlang/epmd.conf new file mode 100644 index 000000000..e4f831c39 --- /dev/null +++ b/community/erlang/epmd.conf @@ -0,0 +1,3 @@ +#ERL_EPMD_ADDRESS= +#ERL_EPMD_PORT=4369 +#ERL_EPMD_RELAXED_COMMAND_CHECK= diff --git a/community/erlang/epmd.service b/community/erlang/epmd.service new file mode 100644 index 000000000..643eff3b2 --- /dev/null +++ b/community/erlang/epmd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Erlang Port Mapper Daemon + +[Service] +EnvironmentFile=/etc/conf.d/epmd +ExecStart=/usr/bin/epmd -daemon $EPMD_OPTS +ExecStop=/usr/bin/epmd -kill +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/community/erlang/epmd.socket b/community/erlang/epmd.socket new file mode 100644 index 000000000..ae3594242 --- /dev/null +++ b/community/erlang/epmd.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=epmd.service + +[Socket] +ListenStream=4369 +Accept=no + +[Install] +WantedBy=sockets.target diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index f702f9ace..29ad730e1 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 88241 2013-04-15 00:59:54Z fyan $ +# $Id: PKGBUILD 96289 2013-08-24 08:49:00Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> ## Mozc compile option _bldtype=Release -_zipcoderel=201303 +_zipcoderel=201306 _protobuf_ver=2.5.0 _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.10.1390.102 -_patchver=${pkgver}.2 -pkgrel=3 +pkgver=1.11.1502.102 +_patchver=${pkgver}.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/mozc/" license=('custom') @@ -25,9 +25,9 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 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 - http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch - http://fcitx.googlecode.com/files/fcitx-mozc-icon.tar.gz - mozc_1.10.1390.102_remove_warn_as_error.patch + http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_patchver}.patch + http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz + #mozc_1.10.1390.102_remove_warn_as_error.patch ) build() { @@ -53,7 +53,7 @@ build() { sed -i 's|(qt_dir_env)/bin|(qt_dir_env)/lib/qt4/bin|' gui/*.gyp{,i} # Patch for gcc>=4.8 - patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch" + #patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch" # Adjust to use python2 find . -name \*.py -type f -exec sed -i -e "1s|python.*$|python2|" {} + @@ -71,22 +71,21 @@ build() { _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc" - QTDIR=/usr python2 build_mozc.py gyp --channel_dev=0 + QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname" python2 build_mozc.py gyp --channel_dev=0 python2 build_mozc.py build_tools -c $_bldtype python2 build_mozc.py build -c $_bldtype $_targets # Extract license part of mozc - head -n 28 server/mozc_server.cc > LICENSE + head -n 29 server/mozc_server.cc > LICENSE } package() { cd "${srcdir}/${_pkgbase}-${pkgver}" install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server" install -m 755 out_linux/${_bldtype}/mozc_tool "${pkgdir}/usr/lib/mozc/mozc_tool" - install -d "${pkgdir}/usr/lib/mozc/documents/" - install -m 644 data/installer/*.html "${pkgdir}/usr/lib/mozc/documents/" - install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -d "${pkgdir}/usr/share/licenses/$pkgname/" + install -m 644 LICENSE data/installer/*.html "${pkgdir}/usr/share/licenses/${pkgname}/" for mofile in out_linux/${_bldtype}/obj/gen/unix/fcitx/po/*.mo do @@ -111,10 +110,10 @@ package() { install -m 644 "$srcdir/fcitx-mozc-icons/mozc-properties.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } -md5sums=('ff1611354703cbaa76cd562007ba57e9' - '63310f8bad30f528ba10a6574b807952' - 'bb9fa83c00dece4de5f92ca1773e2bc5' - 'a72001a9067a4c2c4e0e836d0f92ece4' - '1d94b16b5379f0ccd9f4e372c59b8190' - '80fe2ef127b70649df22d133822ac8a7' - '36689e236c97e570c1a8c98f947755bb') + +sha512sums=('a88c98822d4eeefab2d50b760f3a161deecff5664837d4758652f61996dc7c78fe4ff278f93445810d905b2deb16d50aee02c4a8d64e19a47c7b1389ab03e746' + '1e2ad1c68c2a1e85cfbc8d171e81cf33d9c1905bcb952eb0f2ff19cf114b569438a75ec88b7737af4446e33374f3f543bea8061a18d415f1e86dd3b7a5207148' + '181adbee2d5090b3821d7472a35cd8e2b7d0ee1df4ba7e22acc9181b405c7707e67ba314b7d7dc2af006e42febb3ad1b55d244a2447d49649d775274c6785263' + '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee' + 'd2935578c2eb76fa9d30f5eb689cbc04b95a38c94082216f752178f82ff63e409acfe22f345b9714db9434243c403f155fa574817e196bb86c4bc7dac1eb5b75' + '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a') diff --git a/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch deleted file mode 100644 index ff6e9f09b..000000000 --- a/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gyp/common.gypi
-===================================================================
---- gyp/common.gypi (revision 151)
-+++ gyp/common.gypi (working copy)
-@@ -58,7 +58,6 @@
- # warning_cflags will be shared with Mac and Linux. - 'warning_cflags': [ - '-Wall', -- '-Werror', - '-Wno-char-subscripts', - '-Wno-sign-compare', - '-Wno-deprecated-declarations', diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD new file mode 100644 index 000000000..31230ed9b --- /dev/null +++ b/community/gdc/PKGBUILD @@ -0,0 +1,97 @@ +# Maintainer: Mihails Strasuns <public@dicebot.lv> +# Contributor: Moritz Maxeiner <moritz@ucworks.org> +# Contributor: Jerome Berger <jeberger@free.fr> +# Contributor: Jesus Alvarez <jeezusjr@gmail.com> + +pkgname=('gdc' 'libgphobos-devel') +pkgver=4.8.1 +pkgrel=2 +arch=('i686' 'x86_64') +url="https://github.com/D-Programming-GDC/GDC" +license=('GPL') +makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') +options=('!libtool' '!emptydirs' '!buildflags') +_snapshot=4.8-20130725 +source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8 + folders.diff) +sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' + 'SKIP' + '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') + +groups=('dlang' 'dlang-gdc') +conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') + +prepare() +{ + cd $srcdir/gcc-$_snapshot + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + echo $pkgver > gcc/BASE-VER + + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + + cd $srcdir/gdc + git apply $srcdir/folders.diff # fix gdc_include_path + ./setup-gcc.sh ../gcc-$_snapshot + + mkdir $srcdir/gcc-build +} + + +build() +{ + cd ${srcdir}/gcc-build + + ${srcdir}/gcc-$_snapshot/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=d \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch \ + --enable-gnu-unique-object --enable-linker-build-id \ + --enable-cloog-backend=isl --disable-cloog-version-check \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --with-linker-hash-style=gnu --disable-install-libiberty \ + --disable-multilib --disable-libssp --disable-werror \ + --disable-nls --disable-bootstrap \ + --disable-libgomp --disable-libmudflap --disable-libquadmath + + make +} + +package_gdc() +{ + depends=('libmpc' 'zlib') + optdepends=('libgphobos-devel: D standard library, GDC version') + description="Compiler for D programming language wich uses gcc backend" + + install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc + install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/4.8.1/cc1d +} + +package_libgphobos-devel() +{ + description="Standard library for D programming language, GDC port" + depends=('gdc') + + # druntime + install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/$pkgver/object.di + cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core + cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc + + # phobos + cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d + cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std + cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc + + install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a + install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a +} diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff new file mode 100644 index 000000000..05fc9991a --- /dev/null +++ b/community/gdc/folders.diff @@ -0,0 +1,33 @@ +diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in +index 9570bf3..52addc0 100644 +--- a/gcc/d/Make-lang.in ++++ b/gcc/d/Make-lang.in +@@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor + + # This should be configured + ifeq ($(host), $(target)) +- D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/d/$(version) ++ D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc/$(version) + gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..$(D_include_dir) + else +- gcc_d_include_dir = $(libsubdir)/include/d ++ gcc_d_include_dir = $(libsubdir)/include/dlang/gdc + endif + + +diff --git a/libphobos/configure.ac b/libphobos/configure.ac +index dfb8fec..0b88ff4 100644 +--- a/libphobos/configure.ac ++++ b/libphobos/configure.ac +@@ -220,9 +220,9 @@ dnl (# Default case for install directory for include files.) and on + # will have to modify gcc/configure.ac .. + # For now, basic workaround for cross compilers .. + if test "${host}" != "${build}"; then +- gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d ++ gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang/ + else +- gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} ++ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} + fi + AC_SUBST(gdc_include_dir) + AC_ARG_WITH([cross-host], diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index 52fe0bf3f..753284cd4 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90958 2013-05-16 14:50:52Z arodseth $ +# $Id: PKGBUILD 96278 2013-08-23 11:35:11Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gendesk -pkgver=0.5.2 +pkgver=0.5.3 pkgrel=1 pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') @@ -12,7 +12,7 @@ makedepends=('go') depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" 'http://roboticoverlords.org/images/default.png') -sha256sums=('33a989aa7603d2cb15711137f653a8985143297a2ab7532dfad1c15aa649fe17' +sha256sums=('f6f2db255bd5ea978c00f165cfd8e298a1427ec79e7ec265d50b84a8d45d0144' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/jad/PKGBUILD b/community/jad/PKGBUILD index 840929b94..9d4421016 100644 --- a/community/jad/PKGBUILD +++ b/community/jad/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 86961 2013-03-25 11:13:01Z arodseth $ +# $Id: PKGBUILD 96321 2013-08-25 14:38:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: astaroth <astaroth_@web.de> pkgname=jad pkgver=1.5.8e -pkgrel=4 +pkgrel=5 pkgdesc='Java decompiler' license=('custom') arch=('x86_64' 'i686' 'mips64el') url='http://www.varaneckas.com/jad' +optdepends=('vim-jad: open class files directly in vim and see the decompiled source code') +makedepends=('links') source=("http://www.varaneckas.com/$pkgname/${pkgname}${pkgver//./}.linux.static.zip" 'jad.html::http://www.varaneckas.com/jad') sha256sums=('2878e19fc1fdd725b516f538a57b02aaec1b2d1e4b106d550230381ffa9c0c81' - '4acee94ff29fe01ea2a9c4c0b47f22fb5a93fc667ee2dd8b6740f7f36bcbcdf2') + '5a0a0a26ca84c733c3a213960c070285bb2046b149adec49d6f47f00b2736dd0') -build() { +prepare() { cd "$srcdir" - grep '<code>' jad.html -A18 | sed 's:<code>::' | sed 's:</code>::' > LICENSE + links -dump jad.html | grep -A19 Copyright > LICENSE } package() { diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index e03404d17..035275fed 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,47 +1,73 @@ -# $Id: PKGBUILD 92773 2013-06-15 01:02:41Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -pkgname=ldc +# $Id: PKGBUILD 96332 2013-08-25 18:27:42Z dicebot $ +# Maintainer: Mihails Strasuns <public@dicebot.lv> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=('ldc' 'liblphobos-devel') +groups=('dlang' 'dlang-ldc') pkgver=0.11.0 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') -url="http://www.dsource.org/projects/ldc" +url="https://github.com/ldc-developers/ldc" license=('BSD') -depends=('llvm' 'libconfig') -makedepends=('git' 'cmake') +depends=('libconfig') +makedepends=('git' 'cmake' 'llvm') backup=('etc/ldc2.conf') -source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}") -sha1sums=('SKIP') - -[[ $CARCH == "x86_64" ]] && _multilib="ON" -[[ $CARCH == "i686" ]] && _multilib="OFF" +source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}" + "ldc2.conf" + "ldc2.rebuild.conf" + ) +sha1sums=('SKIP' + 'e4e2c9656a24a2433cfb00f792abdc247a845b46' + '0e6e5e072ccc006a200a8fc918cb1ebeb2e12b7b' + ) build() { - cd "$srcdir"/ldc - git submodule update --init --recursive - - mkdir build && cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINCLUDE_INSTALL_DIR=/usr/include/d/std-ldc \ - -DMULTILIB=$_multilib \ - .. - make + cd $srcdir/ldc + + git submodule update --init --recursive + + mkdir build && cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc \ + .. + make } -package() { - cd "$srcdir"/ldc +package_ldc() { + optdepends=("liblphobos-devel: stadard library, static one + imports, LDC version") + backup=("etc/ldc2.conf" + "etc/ldc2.rebuild.conf" + ) + + # binaries + install -D -m755 $srcdir/ldc/build/bin/ldmd2 $pkgdir/usr/bin/ldmd2 + install -D -m755 $srcdir/ldc/build/bin/ldc2 $pkgdir/usr/bin/ldc2 + + # supplementaries + install -D -m644 $srcdir/ldc/bash_completion.d/ldc $pkgdir/usr/share/bash-completion/completions/ldc + + # licenses + install -D -m644 $srcdir/ldc/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # default configuration files + install -D -m644 $srcdir/ldc2.conf $pkgdir/etc/ldc2.conf + install -D -m644 $srcdir/ldc2.rebuild.conf $pkgdir/etc/ldc2.rebuild.conf +} - cd build - make DESTDIR=$pkgdir install - cd .. +package_liblphobos-devel() { + depends=("ldc") - mkdir -p $pkgdir/usr/share/bash-completion/ - mv $pkgdir/etc/bash_completion.d $pkgdir/usr/share/bash-completion/completions + # libraries + install -D -m644 $srcdir/ldc/build/lib/libphobos-ldc.a $pkgdir/usr/lib/liblphobos.a + install -D -m644 $srcdir/ldc/build/lib/libphobos-ldc-debug.a $pkgdir/usr/lib/liblphobos-debug.a - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + # imports + mkdir -p $pkgdir/usr/include/dlang/ldc + cp -r $srcdir/ldc/build/import/* $pkgdir/usr/include/dlang/ldc/ + cp -r $srcdir/ldc/runtime/phobos/std $pkgdir/usr/include/dlang/ldc/ - # We don't actually want the multilib libs in this package - rm -rf $pkgdir/usr/lib32 + # licenses + install -D -m644 $srcdir/ldc/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/ldc/ldc2.conf b/community/ldc/ldc2.conf new file mode 100644 index 000000000..8fe82063c --- /dev/null +++ b/community/ldc/ldc2.conf @@ -0,0 +1,18 @@ +// This configuration file uses libconfig. +// See http://www.hyperrealm.com/libconfig/ for syntax details. + +// The default group is required +default: +{ + // 'switches' holds array of string that are appends to the command line + // arguments before they are parsed. + switches = [ + "-I/usr/include/dlang/ldc/ldc", + "-I/usr/include/dlang/ldc", + "-L-L/usr/lib", + "-L-L/usr/lib32", + "-L--no-warn-search-mismatch", + "-defaultlib=lphobos", + "-debuglib=lphobos-debug" + ]; +}; diff --git a/community/ldc/ldc2.rebuild.conf b/community/ldc/ldc2.rebuild.conf new file mode 100644 index 000000000..e9683d1ee --- /dev/null +++ b/community/ldc/ldc2.rebuild.conf @@ -0,0 +1,2 @@ +[Environment] +DFLAGS=-I-I/usr/include/dlang/ldc/ldc -I/usr/include/dlang/ldc -L-L/usr/lib -defaultlib=lphobos -debuglib=lphobos-debug diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD index 6b5759978..ca711e0ce 100644 --- a/community/libgexiv2/PKGBUILD +++ b/community/libgexiv2/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 87061 2013-03-26 15:12:47Z arodseth $ +# $Id: PKGBUILD 96280 2013-08-23 12:38:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=libgexiv2 pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='GObject-based wrapper around the Exiv2 library' arch=('x86_64' 'i686' 'mips64el') -url='http://redmine.yorba.org/projects/gexiv2' +url='http://redmine.yorba.org/projects/gexiv2/roadmap' +# http://yorba.org/download/gexiv2/ license=('GPL2') depends=('exiv2' 'gobject-introspection') +makedepends=('python-gobject' 'python2-gobject') options=('!libtool') source=("http://yorba.org/download/gexiv2/${pkgver%.1}/${pkgname}_$pkgver.tar.xz") sha256sums=('72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3') @@ -17,6 +19,9 @@ sha256sums=('72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3') build() { cd "$srcdir/$pkgname-$pkgver" + # In order for the build process to include any python-related files, + # 'import gi; print(gi._overridesdir)' must work with either python or + # python2. The gi module is provided by python-gobject and python2-gobject. ./configure --prefix=/usr --enable-introspection make } diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 1496dd78d..64a60c64c 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 92709 2013-06-13 08:52:31Z alucryd $ +# $Id: PKGBUILD 96356 2013-08-26 09:25:31Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') pkgver=1.6.0 -pkgrel=5 +pkgrel=7 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/lightdm" license=('GPL3' 'LGPL3') -groups=('lightdm') -makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base' 'yelp-tools') +makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base' 'yelp-tools') options=('!emptydirs' '!libtool') source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" 'lightdm.service' @@ -36,7 +35,7 @@ sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') prepare() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} patch -Np1 -i ../lightdm-default-config.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch @@ -45,23 +44,27 @@ prepare() { } build() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests} + ./configure --prefix='/usr' --sbindir='/usr/bin' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgbase}" --with-greeter-user='lightdm' --with-greeter-session='lightdm-gtk-greeter' --disable-{static,tests} make } package_lightdm() { -depends=('libxklavier' 'systemd') +depends=('libxklavier' 'polkit' 'systemd') optdepends=('xorg-server-xephyr: LightDM test mode' 'accountsservice: limit visible accounts') backup=('etc/apparmor.d/lightdm-guest-session' 'etc/lightdm/keys.conf' 'etc/lightdm/lightdm.conf' - 'etc/lightdm/users.conf') + 'etc/lightdm/users.conf' + 'etc/lightdm/xsession' + 'etc/pam.d/lightdm' + 'etc/pam.d/lightdm-autologin' + 'etc/pam.d/lightdm-greeter') install=${pkgbase}.install - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall @@ -81,7 +84,7 @@ install=${pkgbase}.install install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin # PolicyKit - install -dm 700 "${pkgdir}"/usr/share/polkit-1/rules.d + install -dm 700 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d install -m 644 ../lightdm.rules "${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules # Systemd @@ -94,7 +97,7 @@ package_liblightdm-qt4() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt4') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install @@ -108,7 +111,7 @@ package_liblightdm-qt5() { pkgdesc=('LightDM Qt client library') depends=('lightdm' 'qt5-base') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index 80c6e6e00..6d5a7c483 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 95868 2013-08-17 16:21:10Z arodseth $ +# $Id: PKGBUILD 96319 2013-08-25 13:45:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=liteide pkgver=19 -pkgrel=2 +pkgrel=3 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' -depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit') +depends=('go' 'libpng12' 'qt5-webkit') replaces=('golangide') conflicts=('golangide') makedepends=('gendesk') -options=('!strip') +options=('!strip' '!emptydirs') source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'liteide.png' 'liteide.sh') @@ -56,6 +56,7 @@ package() { done install -Dm755 bin/liteide "$pkgdir/usr/bin/liteide.elf" install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/golangide" cd "$srcdir/liteide-x$pkgver/liteidex" diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD index fd8973a58..eb24dbe65 100644 --- a/community/lshw/PKGBUILD +++ b/community/lshw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91516 2013-05-23 11:14:32Z spupykin $ +# $Id: PKGBUILD 96350 2013-08-26 09:20:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> # Contributor: Chuck Yang <Chuck.Yang@gmail.com> pkgname=lshw -pkgver=B.02.16 -pkgrel=5 +pkgver=B.02.17 +pkgrel=1 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine." url="http://ezix.org/project/wiki/HardwareLiSter" license=('GPL') @@ -14,7 +14,7 @@ depends=('gcc-libs' 'hwids') optdepends=('gtk2') makedepends=('gcc' 'gtk2' 'sqlite') source=(http://ezix.org/software/files/lshw-$pkgver.tar.gz) -md5sums=('67479167add605e8f001097c30e96d0d') +md5sums=('a5feb796cb302850eaf5b4530888e3ed') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mesa-dri1/LICENSE b/community/mesa-dri1/LICENSE new file mode 100644 index 000000000..ae33d2709 --- /dev/null +++ b/community/mesa-dri1/LICENSE @@ -0,0 +1,82 @@ +Disclaimer + +Mesa is a 3-D graphics library with an API which is very similar to +that of OpenGL* +To the extent that Mesa utilizes the OpenGL command syntax or state +machine, it is being used with authorization from Silicon Graphics, +Inc.(SGI). However, the author does not possess an OpenGL license +from SGI, and makes no claim that Mesa is in any way a compatible +replacement for OpenGL or associated with SGI. Those who want a +licensed implementation of OpenGL should contact a licensed +vendor. + +Please do not refer to the library as MesaGL (for legal +reasons). It's just Mesa or The Mesa 3-D graphics +library + +* OpenGL is a trademark of Silicon Graphics Incorporated. + +License / Copyright Information + +The Mesa distribution consists of several components. Different copyrights +and licenses apply to different components. For example, GLUT is copyrighted +by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa +device drivers are copyrighted by their authors. See below for a list of +Mesa's main components and the license for each. + +The core Mesa library is licensed according to the terms of the MIT license. +This allows integration with the XFree86, Xorg and DRI projects. + +The default Mesa license is as follows: + +Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Attention, Contributors + +When contributing to the Mesa project you must agree to the licensing terms +of the component to which you're contributing. +The following section lists the primary components of the Mesa distribution +and their respective licenses. + + +Mesa Component Licenses + +Component Location Primary Author License +---------------------------------------------------------------------------- +Main Mesa code src/mesa/ Brian Paul Mesa (MIT) + +Device drivers src/mesa/drivers/* See drivers See drivers + +Ext headers include/GL/glext.h SGI SGI Free B + include/GL/glxext.h + +GLUT src/glut/ Mark Kilgard Mark's copyright + +Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL + +SGI GLU library src/glu/sgi/ SGI SGI Free B + +demo programs progs/demos/ various see source files + +X demos progs/xdemos/ Brian Paul see source files + +SGI demos progs/samples/ SGI SGI copyright + +RedBook demos progs/redbook/ SGI SGI copyright diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD index 3fa2266bf..a4bf95a06 100644 --- a/community/mesa-dri1/PKGBUILD +++ b/community/mesa-dri1/PKGBUILD @@ -4,14 +4,16 @@ pkgbase=mesa-dri1 pkgname=('unichrome-dri' 'i810-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') pkgver=7.11.2 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev') url="http://mesa3d.sourceforge.net" license=('custom') -source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") -md5sums=('0837c52698fe3252369c3fdb5195afcc') +source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" + LICENSE) +md5sums=('0837c52698fe3252369c3fdb5195afcc' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* @@ -39,6 +41,8 @@ package_unichrome-dri() { pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/unichrome-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/unichrome-dri/" } package_i810-dri() { @@ -46,6 +50,8 @@ package_i810-dri() { pkgdesc="Mesa DRI drivers for Intel i810" make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/i810-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/i810-dri/" } package_mach64-dri() { @@ -54,6 +60,8 @@ package_mach64-dri() { conflicts=('xf86-video-mach64<6.8.2') make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/mach64-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mach64-dri/" } package_mga-dri() { @@ -62,6 +70,8 @@ package_mga-dri() { conflicts=('xf86-video-mga<1.4.11') make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/mga-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mga-dri/" } package_r128-dri() { @@ -70,6 +80,8 @@ package_r128-dri() { conflicts=('xf86-video-r128<6.8.1') make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/r128-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/r128-dri/" } package_savage-dri() { @@ -78,6 +90,8 @@ package_savage-dri() { conflicts=('xf86-video-savage<2.3.1') make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/savage-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/savage-dri/" } package_sis-dri() { @@ -86,6 +100,8 @@ package_sis-dri() { conflicts=('xf86-video-sis<0.10.2') make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/sis-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/sis-dri/" } package_tdfx-dri() { @@ -94,4 +110,6 @@ package_tdfx-dri() { conflicts=('xf86-video-tdfx<1.4.3') make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/tdfx-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/tdfx-dri/" } diff --git a/community/monica/PKGBUILD b/community/monica/PKGBUILD index 30b21a1b8..11c9c0d3d 100644 --- a/community/monica/PKGBUILD +++ b/community/monica/PKGBUILD @@ -1,33 +1,44 @@ -# $Id: PKGBUILD 83166 2013-01-27 16:22:08Z pierre $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 96371 2013-08-26 20:02:02Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=monica pkgver=3.7 -pkgrel=2.1 -pkgdesc="A monitor calibration tool" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 +pkgdesc='Monitor calibration tool' +arch=('x86_64' 'i686' 'mips64el') url="http://www.pcbypaul.com/software/monica.html" license=('BSD') depends=('fltk' 'xorg-xgamma') -makedepends=('librsvg') -#http://www.pcbypaul.com/software/dl/${pkgname}-${pkgver}.tar.bz2 -source=(ftp://ftp.archlinux.org/other/monica/${pkgname}-${pkgver}.tar.bz2 \ - monica.desktop monica.svg) -md5sums=('490aabc35b830e4a3dc32a2f893ba805' - 'a337bfda1fca7228420db0ce92256816' - '4569f5df7d7b3eaf20108adf48e8dfe4') +makedepends=('gendesk') +source=("ftp://ftp.archlinux.org/other/monica/$pkgname-$pkgver.tar.bz2" + 'monica.png') +sha256sums=('da0d7762f5a2eed482e8e2f87762d3ac1f013d5c99bd99b34083b69f03492036' + '4c9852c7462f747eeede72f252e2578d827c12f09ffd83808f695a64c67bee69') + +prepare() { + cd "$pkgname-$pkgver" + + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \ + --categories 'Application;Settings;System' +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -Dm755 monica "${pkgdir}/usr/bin/monica" - install -Dm644 "${srcdir}/monica.desktop" "${pkgdir}/usr/share/applications/monica.desktop" - install -Dm644 "${srcdir}/monica.svg" "${pkgdir}/usr/share/pixmaps/monica.svg" - rsvg-convert -w 64 -h 57 -f png -o "${pkgdir}/usr/share/pixmaps/monica.png" "${srcdir}/monica.svg" - install -Dm644 licence "${pkgdir}/usr/share/licenses/monica/license.txt" + cd "$pkgname-$pkgver" + + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$srcdir/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 licence "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/monica/monica.desktop b/community/monica/monica.desktop deleted file mode 100644 index 6b17659ca..000000000 --- a/community/monica/monica.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Monica -Comment=Monitor Calibration for x-server -Exec=monica -Icon=monica -Terminal=false -Type=Application -X-MultipleArgs=false -Categories=Application;Settings;System; diff --git a/community/monica/monica.png b/community/monica/monica.png Binary files differnew file mode 100644 index 000000000..8a2b10f86 --- /dev/null +++ b/community/monica/monica.png diff --git a/community/monica/monica.svg b/community/monica/monica.svg deleted file mode 100644 index bb9f77d9b..000000000 --- a/community/monica/monica.svg +++ /dev/null @@ -1,248 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="monica.svg" - sodipodi:docbase="/home/pool/graphics/arch_candy/svg-icons" - height="67.000000pt" - width="70.000000pt" - inkscape:version="0.41" - sodipodi:version="0.32" - id="svg1573"> - <defs - id="defs1575"> - <linearGradient - id="linearGradient1606"> - <stop - id="stop1607" - offset="0.0000000" - style="stop-color:#000000;stop-opacity:0.62745100;" /> - <stop - id="stop1608" - offset="1.0000000" - style="stop-color:#000000;stop-opacity:0.0000000;" /> - </linearGradient> - <radialGradient - gradientTransform="translate(0.000000,3.125000)" - gradientUnits="userSpaceOnUse" - fy="12.500000" - fx="12.500000" - r="12.433378" - cy="12.500000" - cx="12.500000" - id="radialGradient1636" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.437333,0.000000,0.000000,0.410284,0.000000,3.125000)" - y2="0.0000000" - x2="20.514223" - y1="30.771334" - x1="20.514223" - id="linearGradient1638" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(-12.50000,3.250000)" - gradientUnits="userSpaceOnUse" - fy="12.500000" - fx="100.00000" - r="12.500000" - cy="12.500000" - cx="100.00000" - id="radialGradient1643" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.447214,0.000000,0.000000,2.236068,-12.50000,3.250000)" - y2="19.565595" - x2="251.55765" - y1="19.565595" - x1="223.60680" - id="linearGradient1645" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.508806,0.000000,0.000000,1.965387,0.000000,3.125000)" - y2="18.889412" - x2="0.0000000" - y1="18.889412" - x1="25.058681" - id="linearGradient1647" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.814390,0.000000,0.000000,0.355317,0.000000,-10.12500)" - y2="246.61094" - x2="22.207298" - y1="211.07926" - x1="22.207298" - id="linearGradient1649" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(0.000000,-10.12500)" - gradientUnits="userSpaceOnUse" - fy="75.000000" - fx="12.500000" - r="12.500000" - cy="75.000000" - cx="12.500000" - id="radialGradient1651" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(-12.50000,-10.000000)" - gradientUnits="userSpaceOnUse" - fy="75.000000" - fx="100.00000" - r="12.500000" - cy="75.000000" - cx="100.00000" - id="radialGradient1653" - xlink:href="#linearGradient1606" - inkscape:collect="always" /> - </defs> - <sodipodi:namedview - inkscape:current-layer="svg1573" - inkscape:window-y="3" - inkscape:window-x="0" - inkscape:grid-points="true" - inkscape:grid-bbox="true" - gridtolerance="2.0000000px" - gridoriginx="0.0000000pt" - gridoriginy="0.0000000pt" - gridspacingx="10.000000pt" - gridspacingy="10.000000pt" - snaptogrid="false" - showgrid="true" - inkscape:window-height="1002" - inkscape:window-width="1272" - inkscape:cy="50.235475" - inkscape:cx="67.194289" - inkscape:zoom="7.9999998" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" /> - <metadata - id="metadata1576"> - <rdf:RDF - id="RDF1577"> - <cc:Work - id="Work1578" - rdf:about=""> - <dc:description - id="description1579">Created with Inkscape -http://www.inkscape.org/</dc:description> - <dc:format - id="format1581">image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" - id="type1583" /> - <dc:title - id="title1606">ML-Term Icon</dc:title> - <dc:date - id="date1608">2004-07-14</dc:date> - <dc:creator - id="creator1610"> - <cc:Agent - id="Agent1611"> - <dc:title - id="title1612">Tobias Kieslich</dc:title> - </cc:Agent> - </dc:creator> - <dc:coverage - id="coverage1614" /> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" - id="license1616" /> - </cc:Work> - <cc:License - id="License1624" - rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> - <cc:permits - id="permits1625" - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - id="permits1626" - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - id="requires1627" - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - id="permits1628" - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - id="requires1629" - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - id="requires1630" - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> - </rdf:RDF> - </metadata> - <path - sodipodi:nodetypes="cc" - id="path2775" - d="M 5.8437501,76.625001 L 82.343750,76.625001" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:9.1875000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2007" - d="M 10.593750,6.8437510 L 77.343750,6.8437510" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cccc" - id="path2803" - d="M 8.2187499,9.3437490 L 8.2187499,59.593751 L 79.718750,59.593751 L 79.718750,9.3437490" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2807" - d="M 29.750001,67.218750 L 58.125000,67.218750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:14.937500;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2953" - d="M 22.468750,14.718749 L 22.468750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#3f0000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2955" - d="M 27.468750,14.718749 L 27.468750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ff1500;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2957" - d="M 41.593750,14.718749 L 41.593750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#0b2f00;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2959" - d="M 46.593750,14.718749 L 46.593750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#08ce00;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2961" - d="M 60.718750,14.718749 L 60.718750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#00004e;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> - <path - sodipodi:nodetypes="cc" - id="path2963" - d="M 65.718750,14.718749 L 65.718750,52.468750" - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#0072ff;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> -</svg> diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index dfe40f45f..e1c91f5dd 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 78204 2012-10-17 10:24:52Z allan $ +# $Id: PKGBUILD 96352 2013-08-26 09:20:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nicolas Doualot <packages@slubman.info> pkgname=neatx pkgver=0.3.1 -pkgrel=13 +pkgrel=14 pkgdesc="A free NX server by google" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/neatx/" license=('GPL') -depends=('nxserver' 'python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk') -makedepends=('python2-docutils') +depends=('python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk') +makedepends=('docutils') optdepends=('xorg-xdm: if you want to use KDE or GNOME session' 'xorg-fonts-misc: to use default font' 'xterm: if you want console session') diff --git a/community/nimrod/PKGBUILD b/community/nimrod/PKGBUILD new file mode 100644 index 000000000..25b5c4913 --- /dev/null +++ b/community/nimrod/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 96341 2013-08-25 20:41:23Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Dominik Picheta <morfeusz8@gmail.com> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=nimrod +pkgver=0.9.2 +pkgrel=3 +pkgdesc='Imparative, multi-paradigm, compiled programming language' +arch=('x86_64' 'i686') +url='http://nimrod-code.org/' +license=('MIT') +makedepends=('setconf') +source=("http://nimrod-code.org/download/${pkgname}_$pkgver.zip") +options=('!emptydirs') +sha256sums=('4903ff46b90caa61194551f66fdff291b1ecba8bb4eec1611373cd34ecaf7090') + +prepare() { + cd "$pkgname" + + setconf install.sh bindir "$pkgdir/usr/bin" + setconf install.sh configdir "$pkgdir/etc" + setconf install.sh libdir "$pkgdir/usr/lib/$pkgname" + setconf install.sh docdir "$pkgdir/usr/share/doc/$pkgname" + setconf install.sh datadir "$pkgdir/usr/share/$pkgname" +} + +build() { + cd "$pkgname" + + sh build.sh + ./bin/nimrod c -d:release koch + PATH="$PATH":./bin/nimrod ./koch boot -d:release -d:useGnuReadline +} + +package() { + cd "$pkgname" + + install -d "$pkgdir/usr/bin" + install -d "$pkgdir/etc" + install -d "$pkgdir/usr/lib/$pkgname" + install -d "$pkgdir/usr/share/doc/$pkgname" + install -d "$pkgdir/usr/share/$pkgname" + sh install.sh /usr/bin + install -Dm644 copying.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 913cd7f47..0bafca50a 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95908 2013-08-18 16:16:15Z bpiotrowski $ +# $Id: PKGBUILD 96268 2013-08-23 06:19:32Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.16 +pkgver=0.10.17 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('62db6ec83f34733bffdae2f8ee50d7273d568bba8814be29e78a042c1d64f31a') +sha256sums=('1f9de40dd2d98bc984a4970ef399ed3ad67f040feaafc711e549f3265bcce61c') prepare() { cd node-v$pkgver diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index ca2281204..927542dcf 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 95837 2013-08-17 14:25:58Z jsteel $ +# $Id: PKGBUILD 96253 2013-08-22 17:25:25Z jsteel $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-xml-libxml -pkgver=2.0101 +pkgver=2.0103 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/XML-LibXML" license=('GPL') -depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07') +depends=('libxml2' 'perl-xml-sax' 'perl-xml-namespacesupport') provides=('perl-libxml' 'perl-xml-libxml-common') replaces=('perl-libxml' 'perl-xml-libxml-common') conflicts=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') -install=perl-xml-libxml.install +install=$pkgname.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('5f60ca19b651628eb80341da99a56598') +md5sums=('77184192598ea59389b76dfea2a23b7c') build() { cd XML-LibXML-$pkgver @@ -32,5 +32,5 @@ check() { package() { cd XML-LibXML-$pkgver - make pure_install doc_install DESTDIR="$pkgdir" + make pure_install doc_install DESTDIR="$pkgdir"/ } diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 17214559a..0761f81cd 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,36 +1,32 @@ -# $Id: PKGBUILD 92821 2013-06-15 13:40:37Z jlichtblau $ +# $Id: PKGBUILD 96248 2013-08-22 17:02:31Z alucryd $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=2.0.3 +pkgver=2.1.0 pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://postgis.net/" license=('GPL') -depends=('postgresql>=9.2' 'postgresql<9.3' 'proj' 'geos' 'gdal' 'json-c' 'libxml2') +depends=('postgresql' 'gdal' 'json-c') changelog=$pkgname.changelog options=('!libtool') source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz) -sha256sums=('7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0') +sha256sums=('fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr - make + cd ${pkgname}-${pkgver} - # Build utils (FS#25836) - cd utils + ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} - cd utils - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } + +# vim: ts=2 sw=2 et: diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 1e53db33a..ce4c3b267 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,7 @@ +2013-08-22 Maxime Gauduin <alucryd@gmail.com> + * postgis-2.1.0-1 + * Fixes FS#35816 + 2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * postgis-2.0.3-1 diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 639da6d20..eb59b2dc4 100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 94432 2013-07-24 19:06:38Z ttoepper $ +# $Id: PKGBUILD 96288 2013-08-24 07:44:52Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: J0k3r <moebius282 e4a t gmail D0_T com> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)hotmail.com> pkgname=pragha -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.2.1 +pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') url="http://pragha.wikispaces.com/" @@ -23,7 +23,7 @@ makedepends=('intltool') replaces=('dissonance') install=pragha.install source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2") -sha1sums=('3e6456275a216110bd6942b2dc19b1120f4d14e5') +sha1sums=('f8fe9f1f6fa89b6d9657dedad26a90db494b200b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/python-apsw/LICENSE b/community/python-apsw/LICENSE new file mode 100644 index 000000000..a0470b2a0 --- /dev/null +++ b/community/python-apsw/LICENSE @@ -0,0 +1,15 @@ +Copyright (C) 2004-2009 Roger Binns + +This software is provided ‘as-is’, without any express or implied warranty. In no event will the authors be held liable +for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it +and redistribute it freely, subject to the following restrictions: + +- The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If + you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not + required. + +- Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + +- This notice may not be removed or altered from any source distribution. diff --git a/community/python-apsw/PKGBUILD b/community/python-apsw/PKGBUILD new file mode 100644 index 000000000..99b0954f6 --- /dev/null +++ b/community/python-apsw/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Brendan MacDonell <macdonellba at gmail dot com> +# Former Maintainer: Linmiao Xu <linmiao.xu@gmail.com> +# Contributor: Juan Miguel Cejuela <juanmi@jmcejuela.net> + +pkgbase=python-apsw +pkgname=('python-apsw' 'python2-apsw') +pkgver=3.7.17_r1 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://code.google.com/p/apsw/" +license=('MIT') +makedepends=('python' 'python2') +source=("http://apsw.googlecode.com/files/apsw-${pkgver//_/-}.zip" 'LICENSE') + +md5sums=('5393765e7ef55def11dae08149133136' + 'efc704d50cb39441d00f9dc76cbe6665') + +build() { + cd $srcdir + cp -rf apsw-${pkgver//_/-} apsw2 +} + +package_python-apsw() { +depends=('python' 'sqlite3>=3.7.5') +pkgdesc="Python wrapper for SQLite" + cd $srcdir/apsw-${pkgver//_/-} + python setup.py install --root=$pkgdir/ + + install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + + +package_python2-apsw() { +depends=('python2' 'sqlite3>=3.7.5') +pkgdesc="Python2 wrapper for SQLite" + cd $srcdir/apsw2 + python2 setup.py install --root=$pkgdir/ + + install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD index a685daf6f..b986d80c2 100644 --- a/community/python-openbabel/PKGBUILD +++ b/community/python-openbabel/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 80457 2012-11-22 01:42:13Z arodseth $ +# $Id: PKGBUILD 96310 2013-08-24 20:06:01Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> pkgname=('python-openbabel' 'python2-openbabel') pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Python bindings for the openbabel library' arch=('i686' 'x86_64' 'mips64el') url='http://openbabel.org/wiki/Python' license=('GPL') depends=('gcc-libs' "openbabel=${pkgver}" 'eigen2') -makedepends=('swig' 'cmake' 'python-distribute' 'python2-distribute') +makedepends=('swig' 'cmake' 'python-setuptools' 'python2-setuptools') options=('!libtool') source=("http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz") sha256sums=('4eaca26679aa6cc85ebf96af19191472ac63ca442c36b0427b369c3a25705188') build() { cp -r openbabel-$pkgver python2-openbabel-$pkgver - cd $srcdir/openbabel-$pkgver # Create babelconfig.h @@ -26,7 +25,7 @@ build() { # Regenerate interface with the patched swig 2.0.2 cd scripts - swig -I../include/ -python -py3 -c++ openbabel-python.i + swig -O -I../include/ -python -py3 -c++ openbabel-python.i mv openbabel-python_wrap.cxx python/openbabel-python.cpp mv openbabel.py python/ diff --git a/community/python2-greenlet/PKGBUILD b/community/python2-greenlet/PKGBUILD index d31643caa..ea9605f52 100644 --- a/community/python2-greenlet/PKGBUILD +++ b/community/python2-greenlet/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Ralf Schmitt <ralf@systemexit.de> pkgname=python2-greenlet -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="python coroutine library" license=("MIT") @@ -23,4 +23,5 @@ package() { python2 setup.py install --root="$pkgdir" install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" } -md5sums=('87887570082caadc08fb1f8671dbed71') + +sha512sums=('bb33db07b8b86ba8ccec920748cfc207d27eed0b76218cf06c3b1706a1e9350be62a99a92e05c8e683a7c3ab1e232dbb46259380c7e5f2c6b140a3a96a36f8bf') diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD index c6eaa15a2..93f725f35 100644 --- a/community/qstardict/PKGBUILD +++ b/community/qstardict/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 85395 2013-03-01 10:38:40Z andrea $ +# $Id: PKGBUILD 96239 2013-08-22 12:10:16Z jelle $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> -pkgname=qstardict +#pkgbase=qstardict +pkgname=('qstardict' 'kdeplasma-applets-qstardict') pkgver=1.0.1 -pkgrel=2 -pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries" +pkgrel=3 +depends=('qt4') +makedepends=('cmake' 'automoc4' 'kdelibs') arch=('i686' 'x86_64' 'mips64el') url="http://qstardict.ylsoftware.com/index.php" license=('GPL2') -depends=('qt4') -provides=('stardict') changelog=$pkgname.changelog source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2 qstardict-1.0.1-glib.patch) @@ -21,12 +21,30 @@ build() { cd "${srcdir}/$pkgname-$pkgver" sed -i -e 's|glib/gmem.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' plugins/stardict/stardict.cpp - qmake ENABLED_PLUGINS="stardict web swac" + qmake-qt4 ENABLED_PLUGINS="stardict web swac" + make + + + cd "${srcdir}/$pkgname-$pkgver/kdeplasma" + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } -package() { +package_qstardict() { +pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries" +provides=('stardict') cd "${srcdir}/$pkgname-$pkgver" make INSTALL_ROOT="${pkgdir}" install } + +package_kdeplasma-applets-qstardict(){ +pkgdesc="Qt4 clone of StarDict with full support of StarDict dictionaries" +depends=('kdelibs' 'qt4' 'qstardict') + cd "${srcdir}/qstardict-$pkgver/kdeplasma/build" + + make DESTDIR=${pkgdir} install +} + diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index da26dca53..87eb801ca 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91733 2013-05-26 19:25:26Z jelle $ +# $Id: PKGBUILD 96366 2013-08-26 17:18:57Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgbase=quassel pkgname=('quassel-client' 'quassel-core') pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64' 'mips64el') url="http://quassel-irc.org/" @@ -48,7 +48,7 @@ build() { cd $srcdir/build-client cmake \ -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DWITH_KDE=0 \ + -DWITH_KDE=1 \ -DWITH_OPENSSL=ON \ -DCMAKE_BUILD_TYPE="Release" \ -DWANT_CORE=OFF \ @@ -82,7 +82,7 @@ install=quassel.install package_quassel-client() { pkgdesc="Qt4 IRC client with a separated core - client only" -depends=('qt4') +depends=('qt4' 'kdelibs') install=quassel-client.install cd $srcdir/build-client diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD index 7f7670d4c..7ed26bf3e 100755 --- a/community/rbutil/PKGBUILD +++ b/community/rbutil/PKGBUILD @@ -1,41 +1,40 @@ -# $Id: PKGBUILD 85455 2013-03-01 19:10:50Z andrea $ +# $Id: PKGBUILD 96229 2013-08-22 00:02:57Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: said <atvordhosbn@gmail.com> # Contributor: clinx <clinx.hacker@googlemail.com> pkgname=rbutil pkgver=1.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Rockbox Utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility" license=("GPL") -depends=('qt4' 'libusb') +depends=('qt4' 'libusbx') +makedepends=('gendesk') optdepends=('speex: voice files support') -source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2" "${pkgname}.desktop") -sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca' - '539285237af16fbc60a7501963e8c2f584e58a31f2613481e6b42d21337b7a25') +source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2") +sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca') + +prepare() { + gendesk -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="Rockbox Utility" --exec="RockboxUtility" --categories="Application;Utility;" --comment="Rockbox automated installer" +} build() { - cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt + cd RockboxUtility-v${pkgver}/${pkgname}/rbutilqt -# Build lrelease-qt4 rbutilqt.pro qmake-qt4 make } package(){ - cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt - -# Install - install -dm 755 "${pkgdir}"/usr/{bin,share/pixmaps} - install -m 644 icons/rockbox-64.png "${pkgdir}"/usr/share/pixmaps/rbutil.png - install -m 755 RockboxUtility "${pkgdir}"/usr/bin/rbutil + cd RockboxUtility-v${pkgver}/${pkgname}/rbutilqt -# Desktop file - install -dm 755 "${pkgdir}"/usr/share/applications - install -m 644 "${srcdir}"/rbutil.desktop "${pkgdir}"/usr/share/applications/rbutil.desktop + install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps}} + install -m 755 {,"${pkgdir}"/usr/bin/}RockboxUtility + install -m 644 icons/rockbox-256.png "${pkgdir}"/usr/share/pixmaps/rbutil.png + install -m 644 {"${srcdir}","${pkgdir}"/usr/share/applications}/rbutil.desktop } #vim: ts=2 sw=2 et: diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 01b71f940..0b5b82db8 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95069 2013-08-05 10:49:57Z spupykin $ +# $Id: PKGBUILD 96235 2013-08-22 08:59:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.6.14 -pkgrel=2 +pkgver=2.6.15 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" @@ -15,11 +15,11 @@ makedepends=('gcc>=3.1' 'make' 'pkgconfig') backup=("etc/redis.conf" "etc/logrotate.d/redis") install=redis.install -source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" +source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('02e0c06e953413017ff64862953e2756' +md5sums=('cff9cce74f29f70694ec21b1c4f134a6' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/shell-fm/PKGBUILD b/community/shell-fm/PKGBUILD deleted file mode 100644 index 20ee6c60a..000000000 --- a/community/shell-fm/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 68046 2012-03-17 12:04:37Z giovanni $ -# Maintainer: Daenyth -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> -# Contributor: Jeff Mickey <jeff@archlinux.org> - -pkgname=shell-fm -pkgver=0.8 -pkgrel=1 -pkgdesc="A console based player for the streams provided by Last.FM" -arch=('i686' 'x86_64' 'mips64el') -url="http://github.com/jkramer/$pkgname" -license=('GPL') -depends=('libmad' 'libao' 'taglib') -source=($pkgname-$pkgver.tar.gz::http://github.com/jkramer/$pkgname/tarball/v$pkgver) -md5sums=('ce5c45ead71a299edbff280d4007ad99') - -build() { - cd "$srcdir"/jkramer-$pkgname-* - - make -} - -package() { - cd "$srcdir"/jkramer-$pkgname-* - - make DESTDIR="$pkgdir" install - - cd "$pkgdir/usr" - install -dm755 "$pkgdir/usr/share" - mv man share -} diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 3a860f36e..57e890a72 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.12.1 +pkgver=0.12.2 pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,8 @@ _name=('Dungeon Crawl Stone Soup') package() { cd "$srcdir" - gendesk -n + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \ + --exec 'crawl-tiles' --name 'Dungeon Crawl Stone Soup' cd "stone_soup-${pkgver}/source" @@ -64,4 +65,5 @@ package() { "${pkgdir}/usr/share/applications/${pkgname}.desktop" } -md5sums=('47d7c65cf72786d446e1289533af01de') + +md5sums=('a0d5e6f2c4e32c943eb82d9d655199a4') diff --git a/community/tig/PKGBUILD b/community/tig/PKGBUILD index 4e49d4c56..1b5714899 100644 --- a/community/tig/PKGBUILD +++ b/community/tig/PKGBUILD @@ -4,15 +4,16 @@ # Contributor: Nathan Jones <nathanj@insightbb.com> pkgname=tig -pkgver=1.2 +pkgver=1.2.1 pkgrel=1 pkgdesc='Text-mode interface for Git.' depends=('git' 'ncurses') +makedepends=('asciidoc' 'xmlto') url='http://jonas.nitro.dk/tig/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('9821525564aa3f4aa51ad2b6c11b3a91') +md5sums=('9dec2966d3d51f7d8b5b8d4a4b8d93eb') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD index a6f51cbb4..750621132 100644 --- a/community/tilda/PKGBUILD +++ b/community/tilda/PKGBUILD @@ -1,21 +1,34 @@ -# $Id: PKGBUILD 95282 2013-08-08 19:28:31Z jlichtblau $ +# $Id: PKGBUILD 96258 2013-08-22 23:47:58Z eric $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=tilda pkgver=1.1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A Gtk based drop down terminal for Linux and Unix" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/lanoxx/tilda" license=('GPL') -depends=('vte3' 'confuse' 'gtk3') -source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz) -sha256sums=('ed96ae2cf0ceb2a5b2f4a62948c5c0d28d1d54f89ade5153b2e67515cf4dc5e7') +depends=('vte3' 'confuse') +source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz + start-hidden-fix.patch + tab-count-fix.patch) +sha256sums=('ed96ae2cf0ceb2a5b2f4a62948c5c0d28d1d54f89ade5153b2e67515cf4dc5e7' + 'e6d6075bb923c2dcae57706fe0555c28f9094f5115f1a3c60b8f85b8ff267b96' + '5d80a76f904a2094cd7b156654ea6d1860c319fc6c18927f2fb342c0f477c110') + +prepare() { + cd $pkgname-$pkgname-$pkgver + + patch -Np1 -i ../start-hidden-fix.patch + patch -Np1 -i ../tab-count-fix.patch + sed 's/Exec=.*/Exec=tilda/; s/Icon=.*/Icon=tilda/' -i tilda.desktop.in + +} build() { - cd $srcdir/$pkgname-$pkgname-$pkgver + cd $pkgname-$pkgname-$pkgver ./autogen.sh ./configure --prefix=/usr @@ -23,7 +36,9 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgname-$pkgver + cd $pkgname-$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } + +# vim: ts=2 sw=2 et: diff --git a/community/tilda/start-hidden-fix.patch b/community/tilda/start-hidden-fix.patch new file mode 100755 index 000000000..d42fa0393 --- /dev/null +++ b/community/tilda/start-hidden-fix.patch @@ -0,0 +1,24 @@ +diff --git a/src/tilda.c b/src/tilda.c +index c0a435f..50daa47 100644 +--- a/src/tilda.c ++++ b/src/tilda.c +@@ -639,18 +639,7 @@ int main (int argc, char *argv[]) + } + } + +- if (config_getbool ("hidden")) +- { +- /* It does not cause graphical glitches to make tilda hidden on start this way. +- * It does make tilda appear much faster on it's first appearance, so I'm leaving +- * it this way, because it has a good benefit, and no apparent drawbacks. */ +- gtk_widget_show (GTK_WIDGET(tw->window)); +- gtk_widget_hide (GTK_WIDGET(tw->window)); +- } +- else +- { +- pull (tw, PULL_DOWN); +- } ++ pull (tw, config_getbool ("hidden") ? PULL_UP : PULL_DOWN); + + g_print ("Tilda has started. Press %s to pull down the window.\n", + config_getstr ("key")); diff --git a/community/tilda/tab-count-fix.patch b/community/tilda/tab-count-fix.patch new file mode 100755 index 000000000..b0e1522a1 --- /dev/null +++ b/community/tilda/tab-count-fix.patch @@ -0,0 +1,11 @@ +--- a/src/tilda_window.c ++++ b/src/tilda_window.c +@@ -378,7 +378,7 @@ static gboolean goto_tab_generic (tilda_window *tw, guint tab_number) + + if (g_list_length (tw->terms) > (tab_number-1)) + { +- goto_tab (tw, g_list_length (tw->terms) - tab_number); ++ goto_tab (tw, tab_number - 1); + return TRUE; + } + diff --git a/community/tilda/tilda.changelog b/community/tilda/tilda.changelog index f5a9e46d9..9885de98e 100644 --- a/community/tilda/tilda.changelog +++ b/community/tilda/tilda.changelog @@ -1,18 +1,22 @@ -2013-08-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * tilda 1.1.7-1 +2013-08-22 Maxime Gauduin <alucryd@gmail.com> + * tilda 1.1.7-3 + * Fixes FS#36542, FS#36516 and FS#36543 -2012-06-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#29754 fixed +2013-08-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * tilda 1.1.7-1 -2011-08-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#25762 fixed +2012-06-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#29754 fixed -2008-04-29 Mateusz Herych <heniekk@gmail.com> - * Updated for x86_64 - 0.9.6 +2011-08-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#25762 fixed -2008-04-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - * Updated for i686 - 0.9.6 +2008-04-29 Mateusz Herych <heniekk@gmail.com> + * Updated for x86_64 - 0.9.6 -2007-12-30 Douglas Soares de Andrade <dsa@aur.archlinux.org> - * Updated to newer version - 0.9.5 +2008-04-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> + * Updated for i686 - 0.9.6 + +2007-12-30 Douglas Soares de Andrade <dsa@aur.archlinux.org> + * Updated to newer version - 0.9.5 diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index ec39ecbe7..e2d517a01 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95968 2013-08-19 07:51:31Z tpowa $ +# $Id: PKGBUILD 96298 2013-08-24 12:18:47Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.16 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 7eba5c783..62631f955 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94173 2013-07-15 21:54:10Z tomegun $ +# $Id: PKGBUILD 96283 2013-08-23 18:19:07Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64' 'mips64el') url='http://wayland.freedesktop.org' @@ -12,13 +12,14 @@ license=('MIT') options=(!libtool) depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('23201d31e71768e5ec3de0d10fa6de988dd273c8') +sha1sums=('111e639940ff06c6b8f3fcb866b53449a5690d3e') build() { cd $pkgname-$pkgver ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib/weston + --libexecdir=/usr/lib/weston \ + --enable-demo-clients make } @@ -27,9 +28,4 @@ package() { make DESTDIR="$pkgdir" install # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # embed more clients - for _c in calibrator clickdot cliptest dnd editor eventdemo flower fullscreen gears \ - image resizor simple-egl simple-shm simple-touch smoke transformed view; do - install -Dm755 "clients/$_c" "$pkgdir/usr/bin/weston-$_c" - done } diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD index ec0b832c1..cb8413a44 100644 --- a/community/xfe/PKGBUILD +++ b/community/xfe/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84135 2013-02-11 11:34:51Z spupykin $ +# $Id: PKGBUILD 96354 2013-08-26 09:21:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Ravi Desai <ravster3@hotmail.com> pkgname=xfe -pkgver=1.34 +pkgver=1.35 pkgrel=1 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=("GPL") depends=('fox') makedepends=('intltool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('36d0a590d95742eb59d8128a9a7a35b4') +md5sums=('2cff624a9ee8ee8d8f80e2688fc62feb') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/zsync/PKGBUILD b/community/zsync/PKGBUILD new file mode 100644 index 000000000..5835bdad1 --- /dev/null +++ b/community/zsync/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 96292 2013-08-24 09:07:29Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com> +# Contributor: damir <damir@archlinux.org> + +pkgname=zsync +pkgver=0.6.2 +pkgrel=2 +pkgdesc="A file transfer program that's able to connect to rsync servers" +arch=("i686" "x86_64") +url="http://zsync.moria.org.uk/" +depends=("glibc") +license=("custom:Artistic") +#source=(http://belnet.dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=(http://${pkgname}.moria.org.uk/download/${pkgname}-${pkgver}.tar.bz2) + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + make prefix="${pkgdir}"/usr install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/common/$pkgname/COPYING" +} + +sha1sums=('5e69f084c8adaad6a677b68f7388ae0f9507617a') diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index c379ab0e3..90731c03d 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 189899 2013-07-11 06:27:56Z tpowa $ +# $Id: PKGBUILD 193578 2013-08-24 12:17:50Z tpowa $ # Maintainer: pkgname=gettext -pkgver=0.18.3 +pkgver=0.18.3.1 pkgrel=1 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,9 @@ optdepends=('cvs: for autopoint tool') options=(!libtool !docs) install=gettext.install source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('3fa4236c41b7e837355de144210207ec' +md5sums=('3fc808f7d25487fc72b5759df7419e02' 'SKIP') + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index c3e4d18b9..e4038de59 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185721 2013-05-17 17:22:08Z bisson $ +# $Id: PKGBUILD 193522 2013-08-21 22:25:01Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg -pkgver=2.0.20 -pkgrel=2 +pkgver=2.0.21 +pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -18,7 +18,7 @@ makedepends=('curl' 'libldap' 'libusb-compat') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} 'protect-tool-env.patch') -sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP' +sha1sums=('5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26' 'SKIP' '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') install=install diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index 7b546ece3..5e04bcfa8 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 188940 2013-06-26 05:31:47Z allan $ +# $Id: PKGBUILD 193525 2013-08-22 05:37:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl -pkgver=0.12 +pkgver=0.12.1 pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kotnet.org/~skimo/isl/" +url="http://freecode.com/projects/isl" depends=('gmp') license=('MIT') options=('!libtool') -source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('eaa1968dda763f12dc84e45a892cd428') +source=(ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/$pkgname-$pkgver.tar.bz2) +md5sums=('27d381085ff1b5733c3e8a9b6ad24a4d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,7 +29,7 @@ package() { make -j1 DESTDIR="$pkgdir/" install install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.0-gdb.py + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.1-gdb.py install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE } diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 78753965e..71911ca48 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 189849 2013-07-09 13:17:26Z dreisner $ +# $Id: PKGBUILD 193604 2013-08-25 14:43:28Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=14 +pkgver=15 pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('38009d0d6f10678a3ec22ccd29210d13' +md5sums=('d03372179ed2cfa0c52b6672cf438901' 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index b5db3ec25..44931f986 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 179100 2013-03-03 17:28:26Z dreisner $ +# $Id: PKGBUILD 193605 2013-08-25 14:43:38Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive pkgver=3.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64' 'mips64el') url="http://libarchive.org/" license=('BSD') depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib') +provides=('libarchive.so') source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" - '0001-mtree-fix-line-filename-length-calculation.patch') + '0001-mtree-fix-line-filename-length-calculation.patch' + 'libarchive-3.1.2-acl.patch') md5sums=('efad5a503f66329bb9d2f4308b5de98a' - 'fda89c145bbcd793a96b06b463ef6a72') + 'fda89c145bbcd793a96b06b463ef6a72' + 'a5c995661c62429ceff2c23ea322393b') build() { cd "$pkgname-$pkgver" @@ -21,6 +24,9 @@ build() { # upstream commit e65bf287f0133426b26611fe3e80b51267987106 patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch" + # https://code.google.com/p/libarchive/issues/detail?id=329 + patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch" + ./configure --prefix=/usr --without-xml2 make } diff --git a/core/libarchive/libarchive-3.1.2-acl.patch b/core/libarchive/libarchive-3.1.2-acl.patch new file mode 100644 index 000000000..ce563b0c1 --- /dev/null +++ b/core/libarchive/libarchive-3.1.2-acl.patch @@ -0,0 +1,219 @@ +diff -ruN libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c +--- libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c 2013-02-08 01:52:07.000000000 +0100 ++++ libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c 2013-08-08 10:47:41.000000000 +0200 +@@ -399,7 +399,7 @@ + #endif + + +-#if defined(HAVE_POSIX_ACL) && defined(ACL_TYPE_NFS4) ++#ifdef HAVE_POSIX_ACL + static int translate_acl(struct archive_read_disk *a, + struct archive_entry *entry, acl_t acl, int archive_entry_acl_type); + +@@ -419,6 +419,7 @@ + + archive_entry_acl_clear(entry); + ++#ifdef ACL_TYPE_NFS4 + /* Try NFS4 ACL first. */ + if (*fd >= 0) + acl = acl_get_fd(*fd); +@@ -447,6 +448,7 @@ + acl_free(acl); + return (ARCHIVE_OK); + } ++#endif + + /* Retrieve access ACL from file. */ + if (*fd >= 0) +@@ -492,6 +494,7 @@ + {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE}, + {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE}, + {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, ++#ifdef ACL_TYPE_NFS4 + {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA}, + {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY}, + {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA}, +@@ -508,8 +511,10 @@ + {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL}, + {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER}, + {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} ++#endif + }; + ++#ifdef ACL_TYPE_NFS4 + static struct { + int archive_inherit; + int platform_inherit; +@@ -519,21 +524,25 @@ + {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + }; +- ++#endif + static int + translate_acl(struct archive_read_disk *a, + struct archive_entry *entry, acl_t acl, int default_entry_acl_type) + { + acl_tag_t acl_tag; ++#ifdef ACL_TYPE_NFS4 + acl_entry_type_t acl_type; + acl_flagset_t acl_flagset; ++ int brand, r; ++#endif + acl_entry_t acl_entry; + acl_permset_t acl_permset; +- int brand, i, r, entry_acl_type; ++ int i, entry_acl_type; + int s, ae_id, ae_tag, ae_perm; + const char *ae_name; + + ++#ifdef ACL_TYPE_NFS4 + // FreeBSD "brands" ACLs as POSIX.1e or NFSv4 + // Make sure the "brand" on this ACL is consistent + // with the default_entry_acl_type bits provided. +@@ -560,6 +569,7 @@ + return ARCHIVE_FAILED; + break; + } ++#endif + + + s = acl_get_entry(acl, ACL_FIRST_ENTRY, &acl_entry); +@@ -592,9 +602,11 @@ + case ACL_OTHER: + ae_tag = ARCHIVE_ENTRY_ACL_OTHER; + break; ++#ifdef ACL_TYPE_NFS4 + case ACL_EVERYONE: + ae_tag = ARCHIVE_ENTRY_ACL_EVERYONE; + break; ++#endif + default: + /* Skip types that libarchive can't support. */ + s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry); +@@ -605,6 +617,7 @@ + // XXX acl_get_entry_type_np on FreeBSD returns EINVAL for + // non-NFSv4 ACLs + entry_acl_type = default_entry_acl_type; ++#ifdef ACL_TYPE_NFS4 + r = acl_get_entry_type_np(acl_entry, &acl_type); + if (r == 0) { + switch (acl_type) { +@@ -634,9 +647,10 @@ + ae_perm |= acl_inherit_map[i].archive_inherit; + + } ++#endif + + acl_get_permset(acl_entry, &acl_permset); +- for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) { ++ for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) { + /* + * acl_get_perm() is spelled differently on different + * platforms; see above. +diff -ruN libarchive-3.1.2/libarchive/archive_write_disk_acl.c libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c +--- libarchive-3.1.2/libarchive/archive_write_disk_acl.c 2013-01-14 02:43:45.000000000 +0100 ++++ libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c 2013-08-08 10:31:35.000000000 +0200 +@@ -43,7 +43,7 @@ + #include "archive_acl_private.h" + #include "archive_write_disk_private.h" + +-#if !defined(HAVE_POSIX_ACL) || !defined(ACL_TYPE_NFS4) ++#ifndef HAVE_POSIX_ACL + /* Default empty function body to satisfy mainline code. */ + int + archive_write_disk_set_acls(struct archive *a, int fd, const char *name, +@@ -79,10 +79,12 @@ + ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_DEFAULT, + ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default"); + return (ret); ++#ifdef ACL_TYPE_NFS4 + } else if (archive_acl_count(abstract_acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4) > 0) { + ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_NFS4, + ARCHIVE_ENTRY_ACL_TYPE_NFS4, "nfs4"); + return (ret); ++#endif + } else + return ARCHIVE_OK; + } +@@ -94,6 +96,7 @@ + {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE}, + {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE}, + {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, ++#ifdef ACL_TYPE_NFS4 + {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA}, + {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY}, + {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA}, +@@ -110,8 +113,10 @@ + {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL}, + {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER}, + {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} ++#endif + }; + ++#ifdef ACL_TYPE_NFS4 + static struct { + int archive_inherit; + int platform_inherit; +@@ -121,6 +126,7 @@ + {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + }; ++#endif + + static int + set_acl(struct archive *a, int fd, const char *name, +@@ -130,7 +136,9 @@ + acl_t acl; + acl_entry_t acl_entry; + acl_permset_t acl_permset; ++#ifdef ACL_TYPE_NFS4 + acl_flagset_t acl_flagset; ++#endif + int ret; + int ae_type, ae_permset, ae_tag, ae_id; + uid_t ae_uid; +@@ -171,14 +179,17 @@ + case ARCHIVE_ENTRY_ACL_OTHER: + acl_set_tag_type(acl_entry, ACL_OTHER); + break; ++#ifdef ACL_TYPE_NFS4 + case ARCHIVE_ENTRY_ACL_EVERYONE: + acl_set_tag_type(acl_entry, ACL_EVERYONE); + break; ++#endif + default: + /* XXX */ + break; + } + ++#ifdef ACL_TYPE_NFS4 + switch (ae_type) { + case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: + acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALLOW); +@@ -200,6 +211,7 @@ + // XXX error handling here. + break; + } ++#endif + + acl_get_permset(acl_entry, &acl_permset); + acl_clear_perms(acl_permset); +@@ -210,6 +222,7 @@ + acl_perm_map[i].platform_perm); + } + ++#ifdef ACL_TYPE_NFS4 + acl_get_flagset_np(acl_entry, &acl_flagset); + acl_clear_flags_np(acl_flagset); + for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) { +@@ -217,6 +230,7 @@ + acl_add_flag_np(acl_flagset, + acl_inherit_map[i].platform_inherit); + } ++#endif + } + + /* Try restoring the ACL through 'fd' if we can. */ diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 2e2054f7e..ab7f8f246 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189848 2013-07-09 13:13:14Z heftig $ +# $Id: PKGBUILD 193628 2013-08-26 09:59:39Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice pkgver=0.6.34 -pkgrel=1 +pkgrel=2 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') url="http://www.freedesktop.org/software/accountsservice/" @@ -11,13 +11,18 @@ license=('GPL3') depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') -source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) +source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch git-fixes.patch) md5sums=('dbf4323b688a314b4bf76890ad6d5279' - '45ef529fb38d32ec7a1d03005dd20ced') + '45ef529fb38d32ec7a1d03005dd20ced' + '5082c3ba917c520b70f3c5089cb02c9c') -build() { +prepare() { cd $pkgname-$pkgver + patch -Np1 -i ../git-fixes.patch patch -Np1 -i ../more-exclusions.patch +} +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/accountsservice \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ diff --git a/extra/accountsservice/git-fixes.patch b/extra/accountsservice/git-fixes.patch new file mode 100644 index 000000000..b0c3c4019 --- /dev/null +++ b/extra/accountsservice/git-fixes.patch @@ -0,0 +1,245 @@ +diff --git a/src/daemon.c b/src/daemon.c +index ec5cc82..f85050a 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -256,6 +256,13 @@ typedef struct { + GHashTable *logout_hash; + } WTmpGeneratorState; + ++static void ++user_previous_login_free (UserPreviousLogin *previous_login) ++{ ++ g_free (previous_login->id); ++ g_free (previous_login); ++} ++ + static struct passwd * + entry_generator_wtmp (GHashTable *users, + gpointer *state) +@@ -365,11 +372,7 @@ entry_generator_wtmp (GHashTable *users, + + user = g_hash_table_lookup (users, key); + if (user == NULL) { +- for (l = accounting->previous_logins; l != NULL; l = l->next) { +- previous_login = l->data; +- g_free (previous_login->id); +- } +- g_list_free (accounting->previous_logins); ++ g_list_free_full (accounting->previous_logins, (GDestroyNotify) user_previous_login_free); + continue; + } + +@@ -384,11 +387,10 @@ entry_generator_wtmp (GHashTable *users, + g_variant_builder_add (builder2, "{sv}", "type", g_variant_new_string (previous_login->id)); + g_variant_builder_add (builder, "(xxa{sv})", previous_login->login_time, previous_login->logout_time, builder2); + g_variant_builder_unref (builder2); +- g_free (previous_login->id); + } + g_object_set (user, "login-history", g_variant_new ("a(xxa{sv})", builder), NULL); + g_variant_builder_unref (builder); +- g_list_free (accounting->previous_logins); ++ g_list_free_full (accounting->previous_logins, (GDestroyNotify) user_previous_login_free); + + user_changed (user); + } +@@ -491,7 +493,7 @@ entry_generator_cachedir (GHashTable *users, + key_file = g_key_file_new (); + if (g_key_file_load_from_file (key_file, filename, 0, NULL)) + user_update_from_keyfile (user, key_file); +- g_key_file_free (key_file); ++ g_key_file_unref (key_file); + g_free (filename); + } + +diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c +index fd660e5..cf2cbfa 100644 +--- a/src/libaccountsservice/act-user-manager.c ++++ b/src/libaccountsservice/act-user-manager.c +@@ -1178,6 +1178,28 @@ get_current_session_id (ActUserManager *manager) + return; + } + #endif ++ ++ if (manager->priv->ck_manager_proxy == NULL) { ++ GError *error = NULL; ++ ++ manager->priv->ck_manager_proxy = console_kit_manager_proxy_new_sync (manager->priv->connection, ++ G_DBUS_PROXY_FLAGS_NONE, ++ CK_NAME, ++ CK_MANAGER_PATH, ++ NULL, ++ &error); ++ if (manager->priv->ck_manager_proxy == NULL) { ++ if (error != NULL) { ++ g_warning ("Failed to create ConsoleKit proxy: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_warning ("Failed to create_ConsoleKit_proxy"); ++ } ++ unload_seat (manager); ++ return; ++ } ++ } ++ + console_kit_manager_call_get_current_session (manager->priv->ck_manager_proxy, NULL, + on_get_current_session_finished, + g_object_ref (manager)); +@@ -1933,12 +1955,13 @@ reload_systemd_sessions (ActUserManager *manager) + } + + #endif +-static void ++static gboolean + on_session_monitor_event (GPollableInputStream *stream, + ActUserManager *manager) + { + sd_login_monitor_flush (manager->priv->seat.session_monitor); + reload_systemd_sessions (manager); ++ return TRUE; + } + + static void +@@ -2535,9 +2558,13 @@ load_seat_incrementally (ActUserManager *manager) + static gboolean + load_idle (ActUserManager *manager) + { ++ /* The order below is important: load_seat_incrementally might ++ set "is-loaded" immediately and we thus need to call ++ load_users before it. ++ */ ++ load_users (manager); + manager->priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED + 1; + load_seat_incrementally (manager); +- load_users (manager); + manager->priv->load_id = 0; + + return FALSE; +@@ -2805,22 +2832,6 @@ act_user_manager_init (ActUserManager *manager) + G_CALLBACK (on_user_removed_in_accounts_service), + manager); + +- manager->priv->ck_manager_proxy = console_kit_manager_proxy_new_sync (manager->priv->connection, +- G_DBUS_PROXY_FLAGS_NONE, +- CK_NAME, +- CK_MANAGER_PATH, +- NULL, +- &error); +- if (manager->priv->ck_manager_proxy == NULL) { +- if (error != NULL) { +- g_warning ("Failed to create ConsoleKit proxy: %s", error->message); +- g_error_free (error); +- } else { +- g_warning ("Failed to create_ConsoleKit_proxy"); +- } +- return; +- } +- + manager->priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED; + } + +diff --git a/src/libaccountsservice/act-user.h b/src/libaccountsservice/act-user.h +index 31b2cc6..e2966f4 100644 +--- a/src/libaccountsservice/act-user.h ++++ b/src/libaccountsservice/act-user.h +@@ -64,7 +64,9 @@ const char *act_user_get_shell (ActUser *user); + const char *act_user_get_email (ActUser *user); + const char *act_user_get_location (ActUser *user); + guint act_user_get_num_sessions (ActUser *user); ++guint act_user_get_num_sessions_anywhere (ActUser *user); + gboolean act_user_is_logged_in (ActUser *user); ++gboolean act_user_is_logged_in_anywhere (ActUser *user); + int act_user_get_login_frequency (ActUser *user); + gint64 act_user_get_login_time (ActUser *user); + const GVariant*act_user_get_login_history (ActUser *user); +diff --git a/src/user.c b/src/user.c +index 5271b63..661067a 100644 +--- a/src/user.c ++++ b/src/user.c +@@ -78,6 +78,8 @@ struct User { + + Daemon *daemon; + ++ GKeyFile *keyfile; ++ + uid_t uid; + gid_t gid; + gchar *user_name; +@@ -360,6 +362,9 @@ user_update_from_keyfile (User *user, + } + } + ++ g_clear_pointer (&user->keyfile, g_key_file_unref); ++ user->keyfile = g_key_file_ref (keyfile); ++ + g_object_thaw_notify (G_OBJECT (user)); + } + +@@ -387,6 +392,8 @@ static void + user_save_to_keyfile (User *user, + GKeyFile *keyfile) + { ++ g_key_file_remove_group (keyfile, "User", NULL); ++ + if (user->email) + g_key_file_set_string (keyfile, "User", "Email", user->email); + +@@ -412,15 +419,13 @@ static void + save_extra_data (User *user) + { + gchar *filename; +- GKeyFile *keyfile; + gchar *data; + GError *error; + +- keyfile = g_key_file_new (); +- user_save_to_keyfile (user, keyfile); ++ user_save_to_keyfile (user, user->keyfile); + + error = NULL; +- data = g_key_file_to_data (keyfile, NULL, &error); ++ data = g_key_file_to_data (user->keyfile, NULL, &error); + if (error == NULL) { + filename = g_build_filename (USERDIR, + user->user_name, +@@ -433,7 +438,6 @@ save_extra_data (User *user) + user->user_name, error->message); + g_error_free (error); + } +- g_key_file_free (keyfile); + } + + static void +@@ -1816,6 +1820,8 @@ user_finalize (GObject *object) + + user = USER (object); + ++ g_clear_pointer (&user->keyfile, g_key_file_unref); ++ + g_free (user->object_path); + g_free (user->user_name); + g_free (user->real_name); +@@ -1829,6 +1835,9 @@ user_finalize (GObject *object) + g_free (user->location); + g_free (user->password_hint); + ++ if (user->login_history) ++ g_variant_unref (user->login_history); ++ + if (G_OBJECT_CLASS (user_parent_class)->finalize) + (*G_OBJECT_CLASS (user_parent_class)->finalize) (object); + } +@@ -1861,6 +1870,8 @@ user_set_property (GObject *object, + user->login_time = g_value_get_int64 (value); + break; + case PROP_LOGIN_HISTORY: ++ if (user->login_history) ++ g_variant_unref (user->login_history); + user->login_history = g_variant_ref (g_value_get_variant (value)); + break; + case PROP_AUTOMATIC_LOGIN: +@@ -2031,4 +2042,5 @@ user_init (User *user) + user->automatic_login = FALSE; + user->system_account = FALSE; + user->login_history = NULL; ++ user->keyfile = g_key_file_new (); + } diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index c8803a2eb..5128e8878 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185936 2013-05-19 21:23:57Z dan $ +# $Id: PKGBUILD 193586 2013-08-24 16:53:45Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') @@ -11,8 +11,8 @@ url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' 'texlive-latexextra' 'graphviz') source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('5f460b91c0d8c34a76173cf22015c2fc') -sha1sums=('a363811b932e44d479addbadffcc8257cde60b44') +md5sums=('db51274568755e2c75c2657e30a78a55') +sha1sums=('1fc5ceec21122fe5037edee4c308ac94b59ee33e') build() { export PATH=$PATH:/usr/lib/qt4/bin diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index b68b66126..4501c3f87 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185677 2013-05-16 20:58:57Z ronald $ +# $Id: PKGBUILD 193666 2013-08-26 20:17:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('f13e9c3bcd4823920cdf3bacbd2c03a1935399a1') +sha1sums=('726b2c4259e8818921ce0c27a3d452d414255975') build() { cd $srcdir/$pkgname-$pkgver @@ -50,3 +50,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index aa807856f..810132ac2 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185669 2013-05-16 20:56:13Z ronald $ +# $Id: PKGBUILD 193658 2013-08-26 20:14:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('8ee61a186f2a41477415d78af4475e8a05132920') +sha1sums=('8b8c88a211cb80bb19284560d8d481979ae0c111') build() { cd $srcdir/$pkgname-$pkgver @@ -94,3 +94,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index 6719ebf8c..a2c20b2cf 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185673 2013-05-16 20:57:24Z ronald $ +# $Id: PKGBUILD 193662 2013-08-26 20:16:08Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('cad21ed849b09d1436bebe3742e058177bc26a8b') +sha1sums=('3fbff1d0b8473a0498ccee44745cf6609d73005e') build() { cd $srcdir/$pkgname-$pkgver @@ -50,3 +50,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index 267b98676..0d8042cc9 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185666 2013-05-16 20:55:11Z ronald $ +# $Id: PKGBUILD 193655 2013-08-26 20:13:56Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('d3f756321147b26c89b69ece8c6115ba0f68490e') +sha1sums=('d68e17fb155954c7d524cdba98244c09ae511513') build() { cd $srcdir/$pkgname-$pkgver @@ -38,3 +38,4 @@ package(){ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index 606513462..99dc2bbc4 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185671 2013-05-16 20:56:53Z ronald $ +# $Id: PKGBUILD 193660 2013-08-26 20:15:37Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('45b2920b059baa80a2ccf93320751139045e6a72') +sha1sums=('86a552cbdbbb7e8d968083b2c2429e0df60a6a68') build() { cd "$srcdir/$pkgname-$pkgver" @@ -37,3 +37,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index f61d36291..63a0ab43e 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185676 2013-05-16 20:58:32Z ronald $ +# $Id: PKGBUILD 193665 2013-08-26 20:17:07Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('df466e60825b24d9c0eb1dbac5f688f884e58404') +sha1sums=('5981bf49149366b15618050af3a65d6cf145c827') build() { cd $srcdir/$pkgname-$pkgver @@ -41,3 +41,4 @@ package(){ } + diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index e7296c4db..c3f3288ae 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185665 2013-05-16 20:54:50Z ronald $ +# $Id: PKGBUILD 193654 2013-08-26 20:13:37Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('74260d239cdf1f7da1f0ab106fb144fa23d74a87') +sha1sums=('f655b2691d3976fdc2cfe116166e790c1b8bc90d') build() { cd $srcdir/$pkgname-$pkgver @@ -48,3 +48,4 @@ package(){ cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } + diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index 19ae2f149..5c1c387c6 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185670 2013-05-16 20:56:37Z ronald $ +# $Id: PKGBUILD 193659 2013-08-26 20:15:22Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('1c1bf133496de65c35a19319988796c9913d1d42') +sha1sums=('75425d2ddd6ddc7a7f668e4f92c43e9d72d057ed') build() { cd $srcdir/$pkgname-$pkgver @@ -40,3 +40,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index fa079c039..a7cddd47f 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185678 2013-05-16 20:59:24Z ronald $ +# $Id: PKGBUILD 193667 2013-08-26 20:17:40Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('1a4dbc727780eff95c102cd8ecf9533c07a3631d') +sha1sums=('5cae29bd8310691fbf459ce9132264dcef8338ed') build() { cd $srcdir/$pkgname-$pkgver @@ -51,3 +51,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index 4051e860d..84aa31786 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185672 2013-05-16 20:57:07Z ronald $ +# $Id: PKGBUILD 193661 2013-08-26 20:15:52Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('204fa38463b64d3b97e4c598942e9389dc89216e') +sha1sums=('879c0dd75de6c402707da4981716a2b7c1dab618') build() { cd $srcdir/$pkgname-$pkgver @@ -35,3 +35,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index 5fe2807a6..d7bad45d8 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185674 2013-05-16 20:57:59Z ronald $ +# $Id: PKGBUILD 193663 2013-08-26 20:16:34Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('e42b73a268afaa022efb179966991cfb3865168b') +sha1sums=('a0f9ddbd6b26a69de2fc6958327da1497bd2f420') build() { cd $srcdir/$pkgname-$pkgver @@ -41,3 +41,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 06edaadd8..d3444ca5c 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185679 2013-05-16 21:02:06Z ronald $ +# $Id: PKGBUILD 193669 2013-08-26 20:20:21Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.3 +pkgver=0.17.4 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('998a5ada3861028ffd65f994270e5f7f8e9baf9b' +sha1sums=('29f5f4c10bcc7b32f79013ccbc7257abeea78faf' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index 0a8017308..88c758ca8 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185675 2013-05-16 20:58:16Z ronald $ +# $Id: PKGBUILD 193664 2013-08-26 20:16:51Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.7 +pkgver=1.7.8 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('37d173fea2ce68ee1cedd379f235663c1211d20d') +sha1sums=('c19b5d8abbf79aa4df1c5523829ece751dc3c268') build() { cd $srcdir/$pkgname-$pkgver @@ -42,3 +42,4 @@ package(){ install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING } + diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 4c12a00a0..3bffdbe40 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191915 2013-08-01 06:59:44Z bpiotrowski $ +# $Id: PKGBUILD 193657 2013-08-26 20:14:26Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.7 -pkgrel=2 +pkgver=1.7.8 +pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,15 +12,9 @@ license=('BSD') depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') -source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz - evas-1.7.5-giflib5.patch) -sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af' - 'ec40d3aff6240dc0e33e648c76393f62b985628a') +source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('ce71de058896e80c8f1822d967a6dcee01a1c9ac') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../evas-1.7.5-giflib5.patch -} build() { cd $pkgname-$pkgver @@ -69,3 +63,5 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + + diff --git a/extra/evas/evas-1.7.5-giflib5.patch b/extra/evas/evas-1.7.5-giflib5.patch deleted file mode 100644 index 48d1834c5..000000000 --- a/extra/evas/evas-1.7.5-giflib5.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c -index 18a6e23..e8cc562 100644 ---- a/src/modules/loaders/gif/evas_image_load_gif.c -+++ b/src/modules/loaders/gif/evas_image_load_gif.c -@@ -684,7 +684,9 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key - int h; - int alpha; - int loop_count = -1; -- -+#if GIFLIB_MAJOR >= 5 -+ int err; -+#endif - w = 0; - h = 0; - alpha = -1; -@@ -700,7 +702,11 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key - return EINA_FALSE; - } - -+#if GIFLIB_MAJOR >= 5 -+ gif = DGifOpenFileHandle(fd, &err); -+#else - gif = DGifOpenFileHandle(fd); -+#endif - if (!gif) - { - if (fd) close(fd); -@@ -826,6 +832,9 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde - GifFileType *gif; - Image_Entry_Frame *frame = NULL; - Gif_Frame *gif_frame = NULL; -+#if GIFLIB_MAJOR >= 5 -+ int err; -+#endif - - #ifndef __EMX__ - fd = open(file, O_RDONLY); -@@ -838,7 +847,11 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde - return EINA_FALSE; - } - -+#if GIFLIB_MAJOR >= 5 -+ gif = DGifOpenFileHandle(fd, &err); -+#else - gif = DGifOpenFileHandle(fd); -+#endif - if (!gif) - { - if (fd) close(fd); -@@ -915,6 +928,9 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key - { - int fd; - GifFileType *gif; -+#if GIFLIB_MAJOR >= 5 -+ int err; -+#endif - - #ifndef __EMX__ - fd = open(file, O_RDONLY); -@@ -927,7 +943,11 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key - return EINA_FALSE; - } - -+#if GIFLIB_MAJOR >= 5 -+ gif = DGifOpenFileHandle(fd, &err); -+#else - gif = DGifOpenFileHandle(fd); -+#endif - if (!gif) - { - if (fd) close(fd); -@@ -984,6 +1004,9 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int - int remain_frames = frame_num; - double duration = 0; - int frame_count = 0; -+#if GIFLIB_MAJOR >= 5 -+ int err; -+#endif - - frame_count = ie->frame_count; - -@@ -1000,7 +1023,11 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int - #endif - if (fd < 0) return -1; - -+#if GIFLIB_MAJOR >= 5 -+ gif = DGifOpenFileHandle(fd, &err); -+#else - gif = DGifOpenFileHandle(fd); -+#endif - if (!gif) - { - if (fd) close(fd); diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index ca5461359..6bfe01592 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192061 2013-08-05 14:17:30Z andyrtr $ +# $Id: PKGBUILD 193656 2013-08-26 20:14:12Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.7 -pkgrel=4 +pkgver=1.7.8 +pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('f4c753e995a7adb5e18535f41446e222f19227c2') +sha1sums=('fe08848b794621e6695cd0df86b465412b0037fa') build() { cd "$srcdir/$pkgname-$pkgver" @@ -41,3 +41,4 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 1bf0cec55..cce616b56 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178956 2013-03-01 10:20:17Z andrea $ +# $Id: PKGBUILD 193564 2013-08-24 05:33:50Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.8.0 -pkgrel=2 +pkgver=2.8.1 +pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' license=('LGPL') @@ -17,21 +17,22 @@ optdepends=('qt4: support for qt4 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz") -sha1sums=('69fe604939bc013f043ff0b4baa63b7951b26c95') +sha1sums=('fc7323f1e0558675a94e91de2166c484c72d464d') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - source /etc/profile.d/qt4.sh sed 's/lib64/lib/g' -i configure sed '/include suffixes-rule/a \ CFLAGS+='"${CFLAGS}"' \ LDFLAGS+='"${LDFLAGS}"' \ OPTFLAGS=' \ -i Makefile +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --use_i18n=Y make } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 74a7cbe7d..11f677f4c 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $ +# $Id: PKGBUILD 193588 2013-08-24 16:58:24Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3.4 +pkgver=1.8.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -90,13 +90,13 @@ package() { cp -a ./contrib/* $pkgdir/usr/share/git/ # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ "$pkgdir"/usr/lib/git-core/git-p4 \ "$pkgdir"/usr/share/git/gitview/gitview \ "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \ "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg - sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \ + sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \ "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py @@ -115,7 +115,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('80eec3201a5d012913d287b85adaee8e' - '86fd812754d25201fd72c7476045dfec' +md5sums=('355768a1c70d0cb4fedf4b598ac1375b' + 'e3720f56e18a5ab8ee1871ac9c72ca7c' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index 3dca99e8e..0a7733c79 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174150 2013-01-03 05:50:14Z eric $ +# $Id: PKGBUILD 193595 2013-08-24 22:19:33Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glsof -pkgver=2.2.0 -_fmver=2.2.0 +pkgver=2.4.0 +_fmver=2.4.0 _qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" @@ -15,17 +15,19 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) -sha1sums=('01697febfacc466b1cf0d7932c83ffd24b6e6784' +sha1sums=('a605167063492da724ae75fab0492b9cc44fa93f' 'd5a17d66dd02cd78bad5ffdda0b936c7848e4890' 'c5dd12e9b2860f1c427ed7cd482e898978051d2c' - '197b58f40880995d6442fd42a58fa1f4594fd19d' + '9c3097119aa98723c5c59196e6089226829cf09d' '2797c326904af16a254c3e39b8c529ea14ef37e5') package() { cd "${srcdir}" install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor" install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries" - install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" + install -d "${pkgdir}/usr/share/java/glsof" + install -D -m644 filemonitor/*.jar "${pkgdir}/usr/share/java/glsof" + install -D -m644 filemonitor/*.txt "${pkgdir}/usr/share/java/glsof" if [ "$CARCH" = "i686" ]; then install -D -m644 queries_linux32/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar" install -D -m644 queries_linux32/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf" diff --git a/extra/glsof/glsof-filemonitor b/extra/glsof/glsof-filemonitor index 616e23ac7..9dff4c0e7 100644 --- a/extra/glsof/glsof-filemonitor +++ b/extra/glsof/glsof-filemonitor @@ -1,2 +1,2 @@ #!/bin/sh -java -jar /usr/share/java/glsof/filemonitor.jar +java -Djava.security.policy=/usr/share/java/glsof/security-client.txt -jar /usr/share/java/glsof/filemonitor.jar diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 0eff0e9d2..cf56d7b7c 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190849 2013-07-18 20:27:30Z jgc $ +# $Id: PKGBUILD 193620 2013-08-26 07:59:33Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.4 +pkgver=1.12.5 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('562e17d8b56f4587e33f54adff89a65ede6e6e0c57bcd561589453d8edae80bd' +sha256sums=('7ff36dff134157ce6919c4cebc1a419192e529b00e42c52d9cebbd15e8dd5871' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index f6d7e0c2c..178d3ea4e 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 191285 2013-07-23 10:02:47Z jgc $ +# $Id: PKGBUILD 193611 2013-08-26 07:04:31Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.8 -pkgrel=2 +pkgver=0.2.9 +pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') license=(LGPL) depends=(grilo sqlite libgcrypt) -makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing +makedepends=(gupnp-av libgdata gmime rest libtracker-sparql totem-plparser libdmapsharing json-glib intltool) optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' - 'libquvi: Youtube plugin, Vimeo plugin' 'gmime: Podcasts plugin' 'rest: Blip.tv plugin' 'libtracker-sparql: Tracker plugin' - 'totem-plparser: Optical media plugin' + 'totem-plparser: Youtube plugin, Vimeo plugin, Optical media plugin' 'libdmapsharing: DMAP sharing plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80') +sha256sums=('902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e') build() { cd $pkgname-$pkgver diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD deleted file mode 100644 index 9e224d891..000000000 --- a/extra/kdeadmin/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 189522 2013-07-03 17:01:18Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeadmin -pkgname=('kdeadmin-kcron' - 'kdeadmin-ksystemlog' - 'kdeadmin-kuser') -pkgver=4.10.5 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeadmin') -makedepends=('cmake' 'automoc4' 'kdelibs' 'kdebase-runtime' 'kdepimlibs') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'syslog-path.patch') -sha1sums=('0b809772effe249d1ec581902fcecb73e7761134' - '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') - -prepare() { - cd ${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/syslog-path.patch -} - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_strigi-analyzer=OFF - make -} - -package_kdeadmin-kcron() { - pkgdesc='Configure and schedule tasks' - url='http://userbase.kde.org/KCron' - depends=('kdelibs') - cd $srcdir/build/kcron - make DESTDIR=$pkgdir install - cd $srcdir/build/kcron/doc - make DESTDIR=$pkgdir install -} - -package_kdeadmin-ksystemlog() { - pkgdesc='System log viewer tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/ksystemlog/" - cd $srcdir/build/ksystemlog - make DESTDIR=$pkgdir install - cd $srcdir/build/ksystemlog/doc - make DESTDIR=$pkgdir install -} - -package_kdeadmin-kuser() { - pkgdesc='User Manager' - depends=('kdebase-runtime' 'kdepimlibs') - url="http://kde.org/applications/system/kuser/" - install='kdeadmin.install' - cd $srcdir/build/kuser - make DESTDIR=$pkgdir install - cd $srcdir/build/kuser/doc - make DESTDIR=$pkgdir install -} diff --git a/extra/kdeadmin/kdeadmin.install b/extra/kdeadmin/kdeadmin.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdeadmin/kdeadmin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdeadmin/syslog-path.patch b/extra/kdeadmin/syslog-path.patch deleted file mode 100644 index 8a9142bf6..000000000 --- a/extra/kdeadmin/syslog-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 -+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 -@@ -39,7 +39,7 @@ - SystemConfiguration() : - GenericLogModeConfiguration( - QLatin1String( SYSTEM_LOG_MODE_ID ), -- QStringList() << QLatin1String( "/var/log/syslog" ), -+ QStringList() << QLatin1String( "/var/log/messages.log" ), - QList<int>() << INFORMATION_LOG_LEVEL_ID - ) { - diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD deleted file mode 100644 index 5848026bc..000000000 --- a/extra/kdenetwork/PKGBUILD +++ /dev/null @@ -1,109 +0,0 @@ -# $Id: PKGBUILD 191923 2013-08-01 06:59:53Z bpiotrowski $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdenetwork -pkgname=('kdenetwork-filesharing' - 'kdenetwork-kdnssd' - 'kdenetwork-kget' - 'kdenetwork-kppp' - 'kdenetwork-krdc' - 'kdenetwork-krfb') -pkgver=4.10.5 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' - 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' - 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' - 'libktorrent' 'libmms' 'telepathy-qt') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch' - 'giflib5.patch') -sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' - '388319373e96e6f44446ea1132c35ae9f660e01c') - -prepare() { - cd ${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/use-libotr3.patch - cd kopete - patch -p1 -i "${srcdir}"/giflib5.patch -} - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ - -DWITH_Xmms=OFF \ - -DWITH_LibMeanwhile=OFF \ - -DWITH_qq=OFF - make -} - -package_kdenetwork-filesharing() { - pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' - depends=('kdelibs' 'smbclient') - install='kdenetwork.install' - cd $srcdir/build/kdenetwork-filesharing - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kdnssd() { - pkgdesc='Monitors the network for DNS-SD services' - depends=('kdelibs') - cd $srcdir/build/kdnssd - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kget() { - pkgdesc='Download Manager' - depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') - url="http://kde.org/applications/internet/kget/" - install='kdenetwork-kget.install' - cd $srcdir/build/kget - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kppp() { - pkgdesc='Internet Dial-Up Tool' - depends=('kdebase-runtime' 'ppp') - url="http://kde.org/applications/internet/kppp/" - install='kdenetwork-kppp.install' - cd $srcdir/build/kppp - make DESTDIR=$pkgdir install - cd $srcdir/build/kppp/doc - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krdc() { - pkgdesc='Remote Desktop Client' - depends=('kdebase-runtime' 'telepathy-qt') - optdepends=('libvncserver: VNC support' - 'rdesktop: RDP support' - 'kdebase-keditbookmarks: to edit bookmarks') - url="http://kde.org/applications/internet/krdc/" - cd $srcdir/build/krdc - make DESTDIR=$pkgdir install - cd $srcdir/build/krdc/doc - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krfb() { - pkgdesc='Desktop Sharing' - # note on libxdamage: - # not detected by namcap because libgl depends on it - # but nvidia providing libgl does not depend on libxdamage - depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') - cd $srcdir/build/krfb - make DESTDIR=$pkgdir install - cd $srcdir/build/krfb/doc - make DESTDIR=$pkgdir install -} diff --git a/extra/kdenetwork/giflib5.patch b/extra/kdenetwork/giflib5.patch deleted file mode 100644 index 231aefbc2..000000000 --- a/extra/kdenetwork/giflib5.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Raymond Wooninck <tittiatcoke@gmail.com> -Date: Sun, 17 Mar 2013 12:24:09 +0000 -Subject: Enable building with giflib v5 -X-Git-Tag: v4.10.80 -X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 ---- -Enable building with giflib v5 - -REVIEW: 7066 - -svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 ---- - - ---- a/protocols/wlm/wlmchatsession.cpp -+++ b/protocols/wlm/wlmchatsession.cpp -@@ -65,6 +65,10 @@ - #include "wlmchatsessioninkaction.h" - #ifdef HAVE_GIFLIB - #include <gif_lib.h> -+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ -+#ifndef GIFLIB_MAJOR -+#define GIFLIB_MAJOR 4 -+#endif - #endif - - WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, -@@ -467,11 +471,15 @@ - { - #ifdef HAVE_GIFLIB - #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ -+#if GIFLIB_MAJOR >= 5 -+ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); -+#else - const char * errorString = GifErrorString(); - if (errorString) - fprintf(stderr, "GIF-LIB error: %s\n", errorString); - else - fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); -+#endif - #else // older giflib versions, libungif - PrintGifError(); - #endif // HAVE_GIF_ERROR_STRING -@@ -483,6 +491,10 @@ - WlmChatSession::convertToGif( const QPixmap & ink, QString filename) - { - #ifdef HAVE_GIFLIB -+#if GIFLIB_MAJOR >= 5 -+#define FreeMapObject GifFreeMapObject -+#define MakeMapObject GifMakeMapObject -+#endif - int i, status; - GifFileType *GifFile; - ColorMapObject *screenColourmap; -@@ -525,7 +537,11 @@ - } - } - -+#if GIFLIB_MAJOR >= 5 -+ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); -+#else - GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); -+#endif - if (!GifFile) { - FreeMapObject(imageColourmap); - FreeMapObject(screenColourmap); - diff --git a/extra/kdenetwork/kdenetwork-kget.install b/extra/kdenetwork/kdenetwork-kget.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdenetwork/kdenetwork-kget.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/kdenetwork-kopete.install b/extra/kdenetwork/kdenetwork-kopete.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdenetwork/kdenetwork-kopete.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/kdenetwork-kppp.install b/extra/kdenetwork/kdenetwork-kppp.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdenetwork/kdenetwork-kppp.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/kdenetwork.install b/extra/kdenetwork/kdenetwork.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdenetwork/kdenetwork.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/use-libotr3.patch b/extra/kdenetwork/use-libotr3.patch deleted file mode 100644 index 1e96c98d6..000000000 --- a/extra/kdenetwork/use-libotr3.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake ---- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600 -+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700 -@@ -13,13 +13,13 @@ - SET(LIBOTR_FIND_QUIETLY TRUE) - ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) - --FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) -+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) - --FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) -+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) - --# Determine version information from libotr/version.h -+# Determine version information from libotr3/version.h - IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) -- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) -+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) - STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") - STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") - # Check if version is at least 3.2.0 -diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h ---- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700 -@@ -26,7 +26,7 @@ - */ - - extern "C"{ --#include "libotr/proto.h" -+#include "libotr3/proto.h" - } - - #include "kopetechatsession.h" -diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h ---- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700 -@@ -36,10 +36,10 @@ - #include "authenticationwizard.h" - - extern "C" { --#include <libotr/privkey.h> --#include <libotr/proto.h> --#include <libotr/message.h> --#include <libotr/userstate.h> -+#include <libotr3/privkey.h> -+#include <libotr3/proto.h> -+#include <libotr3/message.h> -+#include <libotr3/userstate.h> - } - - -diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h ---- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700 -@@ -32,11 +32,11 @@ - #include <kopetechatsession.h> - - extern "C" { --#include <libotr/privkey.h> --#include <libotr/proto.h> --#include <libotr/message.h> --#include <libotr/userstate.h> --#include <libotr/context.h> -+#include <libotr3/privkey.h> -+#include <libotr3/proto.h> -+#include <libotr3/message.h> -+#include <libotr3/userstate.h> -+#include <libotr3/context.h> - } - - class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD deleted file mode 100644 index c0e4d4663..000000000 --- a/extra/kdesdk/PKGBUILD +++ /dev/null @@ -1,199 +0,0 @@ -# $Id: PKGBUILD 189610 2013-07-03 17:03:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdesdk -pkgname=('kdesdk-cervisia' - 'kdesdk-dolphin-plugins' - 'kdesdk-dev-utils' - 'kdesdk-dev-scripts' - 'kdesdk-kapptemplate' - 'kdesdk-kcachegrind' - 'kdesdk-kioslaves' - 'kdesdk-kompare' - 'kdesdk-lokalize' - 'kdesdk-okteta' - 'kdesdk-poxml' - 'kdesdk-strigi-analyzers' - 'kdesdk-umbrello') -pkgver=4.10.5 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdesdk') -makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' - 'kdebase-lib') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'fix-python2-path.patch') -sha1sums=('e14780cfd63f14cc4b5ec2f769af6a5e9b416940' - '07db42bbcae402c292eebf002e549b04162621c5') - -prepare() { - cd ${pkgbase}-${pkgver} - - # Fix hardcoded python2 cmd - patch -Np1 -i ${srcdir}/fix-python2-path.patch -} - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdesdk-cervisia() { - pkgdesc='CVS Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/cervisia/" - install='kdesdk-cervisia.install' - cd $srcdir/build/cervisia - make DESTDIR=$pkgdir install -} - -package_kdesdk-dev-utils() { - pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks' - url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils" - depends=('kdebase-runtime') - conflicts=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod' - 'kdesdk-kstartperf' 'kdesdk-kuiviewer') - replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod' - 'kdesdk-kstartperf' 'kdesdk-kuiviewer') - install='kdesdk-dev-utils.install' - cd $srcdir/build/kde-dev-utils - make DESTDIR=$pkgdir install -} - -package_kdesdk-dolphin-plugins() { - pkgdesc='Extra Dolphin plugins' - url="https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins" - depends=('kdebase-dolphin') - optdepends=('bzr: bazaar support' - 'git: git support' - 'mercurial: hg support' - 'subversion: svn support') - install='kdesdk.install' - cd $srcdir/build/dolphin-plugins - make DESTDIR=$pkgdir install -} - -package_kdesdk-kapptemplate() { - pkgdesc='KDE Template Generator' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kapptemplate/" - install='kdesdk.install' - cd $srcdir/build/kapptemplate - make DESTDIR=$pkgdir install -} - -package_kdesdk-kcachegrind() { - pkgdesc='Visualization of Performance Profiling Data' - depends=('kdebase-runtime' 'python2') - optdepends=('php: PHP support') - url="http://kde.org/applications/development/kcachegrind/" - install='kdesdk-kcachegrind.install' - cd $srcdir/build/kcachegrind - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/hotshot2calltree -} - -package_kdesdk-kioslaves() { - pkgdesc='KIO-Slaves' - url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves" - depends=('kdebase-runtime' 'subversion') - install='kdesdk.install' - replaces=('kdesdk-kioslave') - conflicts=('kdesdk-kioslave') - cd $srcdir/build/kdesdk-kioslaves - make DESTDIR=$pkgdir install -} - -package_kdesdk-kompare() { - pkgdesc='Diff/Patch Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kompare/" - install='kdesdk-kompare.install' - cd $srcdir/build/kompare - make DESTDIR=$pkgdir install -} - -package_kdesdk-lokalize() { - pkgdesc='Computer-Aided Translation System' - depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers') - url="http://kde.org/applications/development/lokalize/" - optdepends=('translate-toolkit: enable extra python script') - install='kdesdk-lokalize.install' - cd $srcdir/build/lokalize - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py -} - -package_kdesdk-okteta() { - pkgdesc='Hex Editor' - depends=('kdebase-runtime') - replaces=('kdeutils-okteta') - conflicts=('kdeutils-okteta') - url="http://kde.org/applications/utilities/okteta/" - install='kdesdk-okteta.install' - cd $srcdir/build/okteta - make DESTDIR=$pkgdir install -} - -package_kdesdk-poxml() { - pkgdesc='Translates DocBook XML files using gettext po files' - url="https://projects.kde.org/projects/kde/kdesdk/poxml" - depends=('qt4') - optdepends=('antlr2: required for po2xml and swappo tool') - cd $srcdir/build/poxml - make DESTDIR=$pkgdir install -} - -package_kdesdk-dev-scripts() { - pkgdesc='Scripts and setting files useful during development of KDE software' - url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts" - depends=('python2') - replaces=('kdesdk-scripts') - conflicts=('kdesdk-scripts') - cd $srcdir/build/kde-dev-scripts - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/{zonetab2pot,kde-systemsettings-tree}.py - sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/{kdelnk2desktop.py,kde_generate_export_header} -} - -package_kdesdk-strigi-analyzers() { - pkgdesc='Analyzer plugins for strigi' - url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers" - depends=('kdelibs') - conflicts=('kdesdk-strigi-analyzer') - replaces=('kdesdk-strigi-analyzer') - cd $srcdir/build/kdesdk-strigi-analyzers - make DESTDIR=$pkgdir install -} - -package_kdesdk-umbrello() { - pkgdesc='UML Modeller' - depends=('kdebase-runtime') - optdepends=('ruby') - url="http://kde.org/applications/development/umbrello/" - install='kdesdk-umbrello.install' - cd $srcdir/build/umbrello - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py -} diff --git a/extra/kdesdk/fix-python2-path.patch b/extra/kdesdk/fix-python2-path.patch deleted file mode 100644 index 9e9a442c0..000000000 --- a/extra/kdesdk/fix-python2-path.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 -@@ -114,7 +114,7 @@ - print >>sys.stderr, "Execution failed:", e - - cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) -- if os.name!='nt': cmd='python '+cmd -+ if os.name!='nt': cmd='python2 '+cmd - else: cmd=cmd.replace('/','\\') - os.system(cmd) - ---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 -@@ -42,7 +42,7 @@ - xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) - - ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] -- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) -+ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) - - try: convert() - except: print 'error occured' diff --git a/extra/kdesdk/kdesdk-cervisia.install b/extra/kdesdk/kdesdk-cervisia.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-cervisia.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-dev-utils.install b/extra/kdesdk/kdesdk-dev-utils.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-dev-utils.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-kcachegrind.install b/extra/kdesdk/kdesdk-kcachegrind.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-kcachegrind.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-kompare.install b/extra/kdesdk/kdesdk-kompare.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-kompare.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-lokalize.install b/extra/kdesdk/kdesdk-lokalize.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-lokalize.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-okteta.install b/extra/kdesdk/kdesdk-okteta.install deleted file mode 100644 index 3f06b8deb..000000000 --- a/extra/kdesdk/kdesdk-okteta.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-umbrello.install b/extra/kdesdk/kdesdk-umbrello.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-umbrello.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk.install b/extra/kdesdk/kdesdk.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdesdk/kdesdk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD deleted file mode 100644 index 08b5c89eb..000000000 --- a/extra/kdetoys/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 189611 2013-07-03 17:03:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdetoys -pkgname=('kdetoys-amor' - 'kdetoys-kteatime' - 'kdetoys-ktux') -pkgver=4.10.5 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdetoys') -makedepends=('cmake' 'automoc4' 'kdebase-workspace') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('acecc68284addf327b70a72c787befd2cc0f28d2') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdetoys-amor() { - pkgdesc='On-Screen Creature' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/amor - make DESTDIR=$pkgdir install -} - -package_kdetoys-kteatime() { - pkgdesc='Tea Cooker' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/kteatime - make DESTDIR=$pkgdir install -} - -package_kdetoys-ktux() { - pkgdesc='KTux' - depends=('kdebase-workspace' ) - install='kdetoys.install' - cd $srcdir/build/ktux - make DESTDIR=$pkgdir install -} diff --git a/extra/kdetoys/kdetoys.install b/extra/kdetoys/kdetoys.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdetoys/kdetoys.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 5cb642dd3..3a61e5a17 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $ +# $Id: PKGBUILD 193566 2013-08-24 08:12:15Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.8 +pkgver=4.4.9 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) -md5sums=('7140263fbe12f17f74183cf065a7d381') +md5sums=('f942d632d71b7bf35dca2e75a8432b83') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index 703d14ace..89e029458 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,29 +1,19 @@ -# $Id: PKGBUILD 188690 2013-06-18 01:22:22Z heftig $ +# $Id: PKGBUILD 193609 2013-08-25 22:20:49Z allan $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libbsd -pkgver=0.5.2 -pkgrel=2 +pkgver=0.6.0 +pkgrel=1 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64' 'mips64el') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') options=('!libtool') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc} - spt.patch) -md5sums=('be8b2e0dc4614699834c49693574fd1a' - 'SKIP' - '56236fb72c8ec6cbdbd0daa5f404bccb') - -prepare() { - cd $pkgname-$pkgver - - # Paper over a firefox crash - # http://lists.freedesktop.org/archives/libbsd/2013-June/000085.html - patch -Np1 -i ../spt.patch -} +source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}) +md5sums=('f6c75f0a9818e323a589bcbd560a0eb4' + 'SKIP') build() { cd $pkgname-$pkgver diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index 1ea74c633..30a01ffdd 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188871 2013-06-23 17:47:47Z heftig $ +# $Id: PKGBUILD 193624 2013-08-26 08:14:46Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libgsf -pkgver=1.14.27 +pkgver=1.14.28 pkgrel=1 arch=(i686 x86_64 mips64el) pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" @@ -13,7 +13,7 @@ options=('!libtool') depends=('libxml2' 'gdk-pixbuf2' 'bzip2') makedepends=('intltool' 'gobject-introspection') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) -sha256sums=('a012e63bedd6003cea9ae8fa78944516b50c334767163b88527c6b2332bc3e6c') +sha256sums=('ea94914f1fdaa5d4eb49149f0228ae6e41a54bdeb8caf52a7dd8acaa329fcbe4') build() { cd "$pkgname-$pkgver" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 6ba2ea184..1e3205aaa 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192063 2013-08-05 14:17:33Z andyrtr $ +# $Id: PKGBUILD 193556 2013-08-23 16:48:04Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.4.2 -pkgver=4.0.4 -pkgrel=2 +_LOver=4.0.5.2 +pkgver=4.0.5 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -76,9 +76,8 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 - ${_additional_source_url}/libvisio-0.0.28.tar.bz2 + ${_additional_source_url}/libvisio-0.0.30.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - poppler_buildfix.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -111,10 +110,10 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 - libvisio-0.0.28.tar.bz2) -md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' - 'a4d5e6504a3251b7a7fbe17216f8d6e7' - '0ba553eea7284abe1370157bb35bd355' + libvisio-0.0.30.tar.bz2) +md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' + 'a9ddcbde6d7b1148c8fdb626b26c0c69' + '914c5ea3f433643387593cb96d6c119b' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -146,9 +145,8 @@ md5sums=('19462798bbf6e1dc75a8b12bd1775ea2' '185d60944ea767075d27247c3162b3bc' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' - '05574c2ec54dd0c29d75cacdf9419f44' + '9d9eb3ae6bee763c161228b2b12e25f8' '07d2bf5ad839a394cca008b3ec6e7bb1' - '092939d16adbb006780c68040192f8ce' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') @@ -167,9 +165,6 @@ prepare() { done popd - # fix build with poppler 0.24.0 - patch -Np1 -i ${srcdir}/poppler_buildfix.diff - # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff diff --git a/extra/libreoffice/poppler_buildfix.diff b/extra/libreoffice/poppler_buildfix.diff deleted file mode 100644 index ae11d8b1f..000000000 --- a/extra/libreoffice/poppler_buildfix.diff +++ /dev/null @@ -1,50 +0,0 @@ -From a7688eff345133147984507c35bf444131cc3d63 Mon Sep 17 00:00:00 2001 -From: Petr Mladek <pmladek@suse.cz> -Date: Tue, 16 Jul 2013 14:45:31 +0000 -Subject: fix build with system poppler-0.23.0 - -XRef *xref parameter has been added to the OutputDev::startPage method, see -http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499 - -Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db -Reviewed-on: https://gerrit.libreoffice.org/4940 -Reviewed-by: Andras Timar <atimar@suse.com> -Tested-by: Andras Timar <atimar@suse.com> ---- -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 03adf89..53a77d3 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - { - } - --void PDFOutDev::startPage(int /*pageNum*/, GfxState* state) -+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state -+#if POPPLER_CHECK_VERSION(0, 23, 0) -+ , XRef* /*xref*/ -+#endif -+) - { - assert(state); - printf("startPage %f %f\n", -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index c0977cb7..4f3d3a9 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -181,7 +181,11 @@ namespace pdfi - virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE; - - // Start a page. -- virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE; -+ virtual void startPage(int pageNum, GfxState *state -+#if POPPLER_CHECK_VERSION(0, 23, 0) -+ , XRef *xref -+#endif -+ ) SAL_OVERRIDE; - - // End a page. - virtual void endPage() SAL_OVERRIDE; --- -cgit v0.9.0.2-2-gbebe - diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index d0b9a8f08..086f4c6e2 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 184408 2013-05-06 19:38:35Z foutrelis $ +# $Id: PKGBUILD 193630 2013-08-26 12:12:13Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg pkgver=2.37.0 -pkgrel=2 +pkgrel=1 +epoch=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index cf529d757..bca83965b 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $ +# $Id: PKGBUILD 193540 2013-08-22 21:13:54Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff pkgver=4.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64' 'mips64el') url="http://www.remotesensing.org/libtiff/" @@ -18,14 +18,18 @@ source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz tiff-4.0.3-CVE-2013-1960.patch tiff-4.0.3-CVE-2013-1961.patch tiff-4.0.3-libjpeg-turbo.patch - tiff-4.0.3-tiff2pdf-colors.patch) + tiff-4.0.3-tiff2pdf-colors.patch + tiff-4.0.3-CVE-2013-4231.patch + tiff-4.0.3-CVE-2013-4232.patch) sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' '41be661638282dae0d07bd2788414cb6650f8981' '6cb3d480908132335c05c769b5a51f951413725d' '5903355afdd0bb27ea3746339e2196720f9fac9d' '29a91870cca5d4cd9ca1c464f8074088eddc3fb8' '02d57835df50d3f84587571ec52b36f5af838de2' - '23443ad0bc130d70860b6cc6d19b69584ae7a6cc') + '23443ad0bc130d70860b6cc6d19b69584ae7a6cc' + '969f588e9da5991e7f17dddf69ae59424b05fa16' + '2a23c55d081bed74ac8dd99541a93d312cc72b64') prepare() { cd tiff-${pkgver} @@ -35,6 +39,9 @@ prepare() { patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" + cd tools + patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch" + patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch" } build() { diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch new file mode 100644 index 000000000..3c2171829 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch @@ -0,0 +1,18 @@ +Index: gif2tiff.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v +retrieving revision 1.12 +diff -u -r1.12 gif2tiff.c +--- gif2tiff.c 15 Dec 2010 00:22:44 -0000 1.12 ++++ gif2tiff.c 13 Aug 2013 08:25:38 -0000 +@@ -333,6 +333,10 @@ + int status = 1; + + datasize = getc(infile); ++ ++ if (datasize > 12) ++ return 0; ++ + clear = 1 << datasize; + eoi = clear + 1; + avail = clear + 2; diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch new file mode 100644 index 000000000..87673d91b --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch @@ -0,0 +1,15 @@ +Index: tiff2pdf.c +=================================================================== +RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiff2pdf.c,v +retrieving revision 1.71 +diff -u -r1.71 tiff2pdf.c +--- tiff2pdf.c 2 May 2013 14:54:08 -0000 1.71 ++++ tiff2pdf.c 13 Aug 2013 04:45:40 -0000 +@@ -2462,6 +2462,7 @@ + TIFFFileName(input)); + t2p->t2p_error = T2P_ERR_ERROR; + _TIFFfree(buffer); ++ return(0); + } else { + buffer=samplebuffer; + t2p->tiff_datasize *= t2p->tiff_samplesperpixel; diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD index 785d92ef6..0d1efbf9b 100644 --- a/extra/libwpd/PKGBUILD +++ b/extra/libwpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183192 2013-04-18 16:39:00Z andyrtr $ +# $Id: PKGBUILD 193569 2013-08-24 08:25:38Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libwpd -pkgver=0.9.6 +pkgver=0.9.9 pkgrel=1 pkgdesc="Library for importing WordPerfect (tm) documents" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('gcc-libs' 'zlib') makedepends=('libgsf>=1.14.26') options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('63f476b892bf783072854b98d2fc4fa2') +md5sums=('6b74a863c957563924546e16cc833591') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 9f6ac8428..b1f89e3b8 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193137 2013-08-17 08:22:16Z pierre $ +# $Id: PKGBUILD 193545 2013-08-23 06:57:45Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.2 +pkgver=5.5.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -30,10 +30,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd') -source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('caf7f4d86514a568fb3c8021b096a9f0' +md5sums=('437e98144ef014dfab0922a9eed36853' 'f9ee638591aaf1526767db7976d95847' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '880afea327bb00c47082d22c507e6bfc' diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD index 179b54d38..cc69461ab 100644 --- a/extra/pkgfile/PKGBUILD +++ b/extra/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179110 2013-03-03 17:28:37Z dreisner $ +# $Id: PKGBUILD 193608 2013-08-25 20:10:57Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=8 -pkgrel=2.1 +pkgver=9 +pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/pkgfile" @@ -12,8 +12,8 @@ depends=('libarchive' 'curl' 'pcre' 'pacman') conflicts=('pkgtools<24-2') source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('772d02872ddf112c5e24d6ad40e5623d' - '712c546c0291975e646a1d2170034e10') +md5sums=('7e27e9c15da6d59ae04f32d5dc977485' + 'SKIP') options=(!strip) diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD index 8fba5379f..de6ee8423 100644 --- a/extra/pyqt4/PKGBUILD +++ b/extra/pyqt4/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $ +# $Id: PKGBUILD 193533 2013-08-22 14:50:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt4 pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4') -pkgver=4.10.2 -pkgrel=2 +pkgver=4.10.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -url="http://riverbankcomputing.co.uk/software/pyqt/intro" +url='http://www.riverbankcomputing.com/software/pyqt/intro' license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('9257e12fec9b1b21e5a0d76d455d1691') +md5sums=('8b13d2ab64e4d2fd0037b81b7e78c15c') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index aa335c293..99e8cfb6d 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188708 2013-06-18 12:21:58Z andrea $ +# $Id: PKGBUILD 193634 2013-08-26 13:32:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.7.2 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 1954b0992..1b919070b 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192314 2013-08-10 05:37:22Z tpowa $ +# $Id: PKGBUILD 193534 2013-08-22 15:56:50Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,7 +17,7 @@ _COMPILER="GCC46" pkgname="refind-efi" pkgver="0.7.3" -pkgrel="1" +pkgrel="2" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 75950afcd..541758fe9 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $ +# $Id: PKGBUILD 193580 2013-08-24 12:37:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14.7 +pkgver=4.15.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -url="http://www.riverbankcomputing.com/software/sip/" +url='http://www.riverbankcomputing.com/software/sip/intro' license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('f5c8001f16ecffd711708de0e07d542f') +md5sums=('ec1ce361ac3618fe05359ec6f5368463') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 4a0017af7..0eac5ad0c 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 193396 2013-08-19 16:20:40Z andyrtr $ +# $Id: PKGBUILD 193636 2013-08-26 14:58:30Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3071700 +_amalgamationver=3080000 _docver=${_amalgamationver} -#_docver=3071601 -pkgver=3.7.17 -pkgrel=2 +#_docver=3080001 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') license=('custom:Public Domain') @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -sha1sums=('e31958e56b1d7bef9433b1ff2e875c8c290d37f4' +sha1sums=('610d01764c2fc6c6220ab88a57ac4de86515ebc8' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD index 91c6d1670..6aaa1f6f6 100644 --- a/extra/suil/PKGBUILD +++ b/extra/suil/PKGBUILD @@ -4,12 +4,12 @@ pkgname=suil pkgver=0.6.14 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" arch=('i686' 'x86_64' 'mips64el') url="http://drobilla.net/software/suil/" license=('custom:ISC') -depends=('lv2') +depends=('lv2>=1.6.0') makedepends=('python2' 'qt4' 'gtk2') optdepends=('qt4: Qt 4.x UI wrapping support' 'gtk2: GTK+ 2.x UI wrapping support') @@ -23,7 +23,7 @@ build() { sed -i "/ldconfig/d" wscript python2 waf configure --prefix=/usr - python2 waf + python2 waf build $MAKEFLAGS } package() { diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 1909ea3d0..163b5dc50 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 192368 2013-08-10 11:00:07Z andrea $ +# $Id: PKGBUILD 193542 2013-08-22 21:22:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler pkgver=0.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('telepathy-kde-common-internals' 'qjson') +depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 962feec51..f7f2d4f4b 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 192403 2013-08-10 17:30:29Z lcarlier $ +# $Id: PKGBUILD 193567 2013-08-24 08:12:29Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.14 -pkgrel=2 +pkgver=2.21.15 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') install=$pkgname.install pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd') +depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9') makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender') replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna') provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna') @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('cc74d482dfd1f6b87773233a6d5c36118039b42fe7f8d99ee28bda7b78aa3b49') +sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install index b03eea8aa..661387906 100644 --- a/extra/xf86-video-intel/xf86-video-intel.install +++ b/extra/xf86-video-intel/xf86-video-intel.install @@ -1,12 +1,19 @@ post_upgrade() { - post_install + if (( $(vercmp $2 2.21.15) < 0 )); then + post_install + fi } post_install() { - echo ">>> This driver now uses sna as the default" - echo ">>> acceleration methods." - echo ">>> You can use uxa method if you run into trouble." - echo ">>> Add to the device section in /etc/X11/xorg.conf" - echo ">>> Option \"AccelMethod\" \"uxa\"" + cat <<MSG +>>> This driver now uses SNA as the default acceleration method. You can + still fall back to UXA if you run into trouble. To do so, save a file + with the following content as /etc/X11/xorg.conf.d/20-intel.conf : + Section "Device" + Identifier "Intel Graphics" + Driver "intel" + Option "AccelMethod" "uxa" + EndSection +MSG } diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index a2e8a5627..6d30bb5d3 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $ +# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.9 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -24,7 +24,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' '3.10.6-logitech-dj.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '8d05dec5772b17c4c21c00b93da42bd8' + '312e4b4203d2e74201a14f1a9633482d' '7dc48829b6bcb5db3779d558c705ab63' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 613d8b993..7391edac4 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ # Maintainer: Joakim Hernberg <jbh@alchemy.lu> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: timbosa <tinny_tim@dodo.com.au> @@ -9,12 +10,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_releasever=6 -_rtpatchver=rt3 +_releasever=9 +_rtpatchver=rt5 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=2 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,12 +34,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'criu-no-expert.patch' '3.10.6-logitech-dj.patch' - '3.10.6-reset-superseed-xhci-hcd.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '63a1c2aba22871f8e8dacdb4968d9a1f' - 'a339a92745c5e34533e20cb9100bbb11' - '9240ca6835f21e4d2a54d2218de5d246' + '312e4b4203d2e74201a14f1a9633482d' + '9840bcd0525a85e13cfa95ea95b16ba0' + '9dad7b1491caf056b10d4fbf54081988' '6fb1660497947ec5c20405dc439b5c5a' '82496e68851d1960543a07ba51cdb44a' '2967cecc3af9f954ccc822fd63dca6ff' @@ -47,8 +47,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - 'e751378a3e94532bfe85fb82c80e26c0' - '0f0e9441467a3eca33e23ebb75709f06') + 'd2fb29339d9ec7978af71f80daa27a12') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -83,9 +82,6 @@ prepare() { # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch" - # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd - patch -Np1 -i "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index c19bc2f10..8b98c58a5 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.5-1 Kernel Configuration +# Linux/x86 3.10.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1630,7 +1630,7 @@ CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set -CONFIG_HWLAT_DETECTOR=m +# CONFIG_HWLAT_DETECTOR is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m CONFIG_SGI_IOC4=m diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 227a66426..03649c605 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $ +# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.9 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -24,7 +24,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' '3.10.6-logitech-dj.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '8d05dec5772b17c4c21c00b93da42bd8' + '312e4b4203d2e74201a14f1a9633482d' 'f104314d8db864b1702c50ea97134be3' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index aa3f3181d..cb7c71655 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install -pkgrel=10 +pkgrel=11 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 1a0bff6b6..1eb17b175 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95754 2013-08-16 10:44:14Z jelle $ +# $Id: PKGBUILD 96275 2013-08-23 10:26:11Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.44 +pkgver=1.0.0 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' 'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' - 'python2-netifaces' 'python2-cssselect') + 'python2-netifaces' 'python2-cssselect' 'python2-apsw') makedepends=('python2-pycountry' 'qt4-private-headers') optdepends=('ipython2: to use calibre-debug') replaces=$_pkgname @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('5598d6717ce568a32ea2a4a1c173016b' +md5sums=('5f3d0c3630a7289ef1f36d68153ea7a3' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index c9f22703d..5e088da07 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -12,7 +12,7 @@ _debname=iceape _debver=2.7.12 -_debrel=1 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,19 +22,20 @@ pkgbase=iceape-l10n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) +epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=4 +pkgrel=1 pkgdesc="Language packs for Debian Iceape." arch=('any') url="http://packages.debian.org/sid/iceape" license=('MPL' 'GPL') -depends=("iceape-libre>=$pkgver") +depends=("iceape-libre>=$epoch:$pkgver") makedepends=('unzip' 'zip') source=('region.properties') for lang in ${_langpacks[@]} do - source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") + source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb") done _path="/usr/lib/iceape/extensions" diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 22ad1541b..1ea0c56b0 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -4,14 +4,15 @@ # We're getting this from Debian Sid _debname=iceape _debver=2.7.12 -_debrel=1 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre +epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=8 +pkgrel=1 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -23,7 +24,7 @@ provides=('seamonkey') install=$_pkgname.install url="http://packages.debian.org/sid/${_pkgname}" source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz" mozconfig ${_pkgname}.desktop ${_pkgname}-2.0-lang.patch @@ -98,6 +99,11 @@ prepare() { } build() { + export DEBIAN_BUILD="comm-release" + export DEBIAN_BRANDING_DIR="debian/branding" + + export ICEAPE_ICONS_BRANDING="suite/branding/nightly" + cd "${srcdir}/${DEBIAN_BUILD}" export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" @@ -113,6 +119,11 @@ build() { } package() { + export DEBIAN_BUILD="comm-release" + export DEBIAN_BRANDING_DIR="debian/branding" + + export ICEAPE_ICONS_BRANDING="suite/branding/nightly" + cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="${pkgdir}" install diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index f1446b23b..bbd3e1213 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -2,8 +2,9 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgbase=icedove-l10n +epoch=1 _pkgver=17.0.8 -pkgver=17.0.8.1 +pkgver=17.0.8.deb1 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -16,7 +17,7 @@ pkgdesc="Language packs for Debian Icedove." arch=('any') url="http://packages.debian.org/sid/icedove" license=('MPL' 'GPL') -depends=("icedove-libre>=$pkgver") +depends=("icedove-libre>=$epoch:$pkgver") makedepends=('unzip' 'zip') _url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch deleted file mode 100644 index 751305147..000000000 --- a/libre/icedove-libre/Icedove-branding.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Sat, 24 Nov 2012 11:36:16 +0100 -Subject: Icedove branding - ---- - mail/app/application.ini | 2 +- - mail/confvars.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mail/app/application.ini b/mail/app/application.ini -index 8380eb7..12902c2 100644 ---- a/mail/app/application.ini -+++ b/mail/app/application.ini -@@ -4,7 +4,7 @@ - - #filter substitution - [App] --Name=Thunderbird -+Name=Icedove - Version=@APP_VERSION@ - BuildID=@GRE_BUILDID@ - #ifdef MOZ_SOURCE_REPO -diff --git a/mail/confvars.sh b/mail/confvars.sh -index 5c34d70..395bb87 100755 ---- a/mail/confvars.sh -+++ b/mail/confvars.sh -@@ -3,8 +3,8 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --MOZ_APP_BASENAME=Thunderbird --MOZ_APP_NAME=thunderbird -+MOZ_APP_BASENAME=Icedove -+MOZ_APP_NAME=icedove - MOZ_UPDATER=1 - MOZ_THUNDERBIRD=1 - MOZ_CHROME_FILE_FORMAT=omni diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index e793f5924..246f228bc 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -4,12 +4,13 @@ # We're getting this from Debian Sid _debname=icedove _debver=17.0.8 -_debrel=1 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre +epoch=1 pkgver=${_debver}.${_debrel} pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." @@ -24,24 +25,18 @@ conflicts=('thunderbird') provides=('thunderbird') install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz" mozconfig replace-urls.txt vendor.js - makefile.patch - branding.patch - ${_pkgname}.desktop - Icedove-branding.patch) + ${_pkgname}.desktop) options=(!emptydirs) md5sums=('37a706e6b2c17049ab70739600ef47b0' '0524d248bd0e83fa62c261700640ac0d' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' - 'c4ed43e85945e180a89cce03e45ec62c' - '126b1446212396c33220936c01d9592d' - 'e785e0c267f4435ae1a9aa0b03bcacfb' - 'ea5f7a06967f561d47d7e5c35b23de6f') + 'e785e0c267f4435ae1a9aa0b03bcacfb') prepare() { export DEBIAN_BUILD="comm-esr17" @@ -63,14 +58,24 @@ prepare() { install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" done - # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh. - rm -v debian/patches/debian-hacks/Icedove-branding.patch || true + # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh. + sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch quilt push -av - patch -Np1 -i "${srcdir}/makefile.patch" # small fix - patch -Np1 -i "${srcdir}/branding.patch" # fixing branding - patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version + # Fix paths on makefile + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/Makefile.in + + sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; + s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; + s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; + ' mail/branding/icedove/locales/Makefile.in + + # Fix branding + sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch deleted file mode 100644 index d84b8075a..000000000 --- a/libre/icedove-libre/branding.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd ---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-30 16:41:16.000000000 -0200 -+++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-31 22:35:04.203666114 -0200 -@@ -1,4 +1,4 @@ - <!ENTITY brandShortName "Icedove"> --<!ENTITY brandFullName "Icedove Mail/News"> --<!ENTITY vendorShortName "Icedove"> -+<!ENTITY brandFullName "Icedove"> -+<!ENTITY vendorShortName "Mozilla"> - <!ENTITY trademarkInfo.part1 " "> -diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties ---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties 2012-10-30 10:13:50.000000000 -0200 -+++ comm-release/mail/branding/icedove/locales/en-US/brand.properties 2012-10-31 22:35:14.786423732 -0200 -@@ -1,3 +1,3 @@ - brandShortName=Icedove --brandFullName=Icedove Mail/News --vendorShortName=Icedove -+brandFullName=Icedove -+vendorShortName=Mozilla diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch deleted file mode 100644 index a6f23bdcd..000000000 --- a/libre/icedove-libre/libre.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js ---- comm-esr17.orig/mail/app/profile/all-thunderbird.js 2013-05-18 18:46:27.290732014 -0300 -+++ comm-esr17/mail/app/profile/all-thunderbird.js 2013-05-18 18:10:57.239376924 -0300 -@@ -160,11 +160,11 @@ - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); -+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain"); -+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain"); -+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain"); - - // Blocklist preferences - pref("extensions.blocklist.enabled", true); -@@ -189,7 +189,7 @@ - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - --pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); -+pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - -@@ -390,7 +390,7 @@ - - pref("spellchecker.dictionary", ""); - // Dictionary download preference --pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/"); -+pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain"); - - // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular - // mail application without any user intervention. Possible values are: -@@ -747,9 +747,7 @@ - #endif - - // plugin finder service url --pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService. --php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS= --%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); -+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%"); - - // By default we show an infobar message when pages require plugins the user has - // not installed, or are outdated. diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch deleted file mode 100644 index 8f8137bec..000000000 --- a/libre/icedove-libre/makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in ---- comm-release.orig/mail/branding/icedove/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/Makefile.in 2012-05-08 04:03:25.680643202 -0300 -@@ -38,11 +38,11 @@ - # Branding Makefile for Icedove branding - - DEPTH = ../../.. --topsrcdir = ../../../ -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DIRS = \ - locales \ -@@ -50,7 +50,7 @@ - - PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk - - export:: - $(NSINSTALL) -D $(DIST)/branding -diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in ---- comm-release.orig/mail/branding/icedove/locales/Makefile.in 2012-04-18 15:42:15.000000000 -0300 -+++ comm-release/mail/branding/icedove/locales/Makefile.in 2012-05-08 05:32:57.481620942 -0300 -@@ -36,13 +36,13 @@ - # ***** END LICENSE BLOCK ***** - - DEPTH = ../../../.. --topsrcdir = ../../../.. -+topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ - relativesrcdir = mail/branding/icedove/locales - --include $(topsrcdir)/config/autoconf.mk -+include $(DEPTH)/config/autoconf.mk - - DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) - --include $(DEPTH)/config/rules.mk -+include $(topsrcdir)/config/rules.mk diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index fae6951dd..19400ce5f 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -12,7 +12,7 @@ _debname=iceweasel _debver=23.0.1 -_debrel=1 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,19 +22,20 @@ pkgbase=iceweasel-l10n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) +epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') -url="http://packages.debian.org/experimental/iceweasel" +url="http://packages.debian.org/sid/iceweasel" license=('MPL' 'GPL') -depends=("iceweasel-libre>=$pkgver") +depends=("iceweasel-libre>=$epoch:$pkgver") makedepends=('unzip' 'zip') source=('region.properties') for lang in ${_langpacks[@]} do - source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") + source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb") done _path="/usr/lib/iceweasel/browser/extensions/" diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 6172155ef..1918e27a6 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -12,17 +12,18 @@ _pgo=true -# We're getting this from Debian Experimental +# We're getting this from Debian Sid _debname=iceweasel _debver=23.0.1 -_debrel=1 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre +epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -37,13 +38,13 @@ if $_pgo; then fi optdepends=('networkmanager: Location detection via available WiFi networks' 'libpulse: PulseAudio audio driver') -url="http://packages.debian.org/experimental/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" install=iceweasel.install replaces=('firefox') conflicts=('firefox') provides=('firefox') source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" - "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" + "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz" mozconfig mozconfig.pgo libre.patch diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 00714409a..c6262a0dc 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.91 +_kernver=3.0.93 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=14 +pkgrel=15 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 fc8e94f77..bfe0c4000 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193105 2013-08-16 10:56:05Z tpowa $ +# $Id: PKGBUILD 193507 2013-08-21 13:08:50Z tpowa $ # 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=91 +_sublevel=93 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.91 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.93 # 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' - 'cb479cc4ee4709804bf65677c4178985' + '0d900fb04812ca03cd2a6de094cdcc04' '7373cc3ac66342156a7fc32af8577b46' 'b7229f80282337979514f9640a969ff5' 'c072b17032e80debc6a8626299245d46' @@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '0acdb5346ba868c3a1819f36902ef562') + '0b0f582f9736f7d99d75b5f67cb56dfc') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ab34633d7..7746b91a1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $ +# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=7 +_sublevel=9 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # 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 '3.10.6-logitech-dj.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '8d05dec5772b17c4c21c00b93da42bd8' + '312e4b4203d2e74201a14f1a9633482d' '8ec987449e0e42a1c98d8ce92b9019c2' '8efbd1f17f37bdaa8649c8a63761bf07' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - '797e952fb0a168c0c1822acc0fac67bc') + 'd2fb29339d9ec7978af71f80daa27a12') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index a5e5212b1..a1c0ddbae 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193099 2013-08-16 10:37:27Z tpowa $ +# $Id: PKGBUILD 193472 2013-08-20 22:18:28Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=56 +pkgrel=57 epoch=1 _extramodules=extramodules-3.10-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 04773b21a..11faf618b 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95735 2013-08-16 09:00:08Z tpowa $ +# $Id: PKGBUILD 96173 2013-08-20 22:21:57Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=31 +pkgrel=32 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index d0a47e872..b26b45dd1 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95737 2013-08-16 09:00:28Z tpowa $ +# $Id: PKGBUILD 96175 2013-08-20 22:22:25Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.10-LIBRE -pkgrel=10 +pkgrel=11 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/pcr/asterisk/PKGBUILD b/pcr/asterisk/PKGBUILD new file mode 100644 index 000000000..01bc1ae6e --- /dev/null +++ b/pcr/asterisk/PKGBUILD @@ -0,0 +1,95 @@ +# Maintainer : Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributor: Alessio Biancalana <dottorblaster@gmail.com> +# Contributor: Maik Broemme <mbroemme@libmpq.org> + +pkgname=asterisk +pkgver=11.5.0 +pkgrel=2 +pkgdesc="A complete PBX solution" +arch=('i686' 'x86_64') +backup=('etc/asterisk/acl.conf' 'etc/asterisk/adsi.conf' +'etc/asterisk/agents.conf' 'etc/asterisk/alarmreceiver.conf' +'etc/asterisk/alsa.conf' 'etc/asterisk/amd.conf' +'etc/asterisk/app_mysql.conf' 'etc/asterisk/app_skel.conf' +'etc/asterisk/asterisk.conf' 'etc/asterisk/calendar.conf' +'etc/asterisk/ccss.conf' 'etc/asterisk/cdr.conf' +'etc/asterisk/cdr_adaptive_odbc.conf' 'etc/asterisk/cdr_custom.conf' +'etc/asterisk/cdr_manager.conf' 'etc/asterisk/cdr_mysql.conf' +'etc/asterisk/cdr_odbc.conf' 'etc/asterisk/cdr_pgsql.conf' +'etc/asterisk/cdr_sqlite3_custom.conf' 'etc/asterisk/cdr_syslog.conf' +'etc/asterisk/cdr_tds.conf' 'etc/asterisk/cel.conf' +'etc/asterisk/cel_custom.conf' 'etc/asterisk/cel_odbc.conf' +'etc/asterisk/cel_pgsql.conf' 'etc/asterisk/cel_sqlite3_custom.conf' +'etc/asterisk/cel_tds.conf' 'etc/asterisk/chan_dahdi.conf' +'etc/asterisk/chan_mobile.conf' 'etc/asterisk/cli.conf' +'etc/asterisk/cli_aliases.conf' 'etc/asterisk/cli_permissions.conf' +'etc/asterisk/codecs.conf' 'etc/asterisk/confbridge.conf' +'etc/asterisk/config_test.conf' 'etc/asterisk/console.conf' +'etc/asterisk/dbsep.conf' 'etc/asterisk/dnsmgr.conf' +'etc/asterisk/dsp.conf' 'etc/asterisk/dundi.conf' +'etc/asterisk/enum.conf' 'etc/asterisk/extconfig.conf' +'etc/asterisk/extensions.conf' 'etc/asterisk/extensions_minivm.conf' +'etc/asterisk/features.conf' 'etc/asterisk/festival.conf' +'etc/asterisk/followme.conf' 'etc/asterisk/func_odbc.conf' +'etc/asterisk/gtalk.conf' 'etc/asterisk/h323.conf' +'etc/asterisk/http.conf' 'etc/asterisk/iax.conf' +'etc/asterisk/iaxprov.conf' 'etc/asterisk/indications.conf' +'etc/asterisk/jabber.conf' 'etc/asterisk/jingle.conf' +'etc/asterisk/logger.conf' 'etc/asterisk/manager.conf' +'etc/asterisk/meetme.conf' 'etc/asterisk/mgcp.conf' +'etc/asterisk/minivm.conf' 'etc/asterisk/misdn.conf' +'etc/asterisk/modules.conf' 'etc/asterisk/motif.conf' +'etc/asterisk/musiconhold.conf' 'etc/asterisk/muted.conf' +'etc/asterisk/ooh323.conf' 'etc/asterisk/osp.conf' +'etc/asterisk/oss.conf' 'etc/asterisk/phone.conf' +'etc/asterisk/phoneprov.conf' 'etc/asterisk/queuerules.conf' +'etc/asterisk/queues.conf' 'etc/asterisk/res_config_mysql.conf' +'etc/asterisk/res_config_sqlite.conf' +'etc/asterisk/res_config_sqlite3.conf' 'etc/asterisk/res_corosync.conf' +'etc/asterisk/res_curl.conf' 'etc/asterisk/res_fax.conf' +'etc/asterisk/res_ldap.conf' 'etc/asterisk/res_odbc.conf' +'etc/asterisk/res_pgsql.conf' 'etc/asterisk/res_pktccops.conf' +'etc/asterisk/res_snmp.conf' 'etc/asterisk/res_stun_monitor.conf' +'etc/asterisk/rtp.conf' 'etc/asterisk/say.conf' 'etc/asterisk/sip.conf' +'etc/asterisk/sip_notify.conf' 'etc/asterisk/skinny.conf' +'etc/asterisk/sla.conf' 'etc/asterisk/smdi.conf' +'etc/asterisk/udptl.conf' 'etc/asterisk/unistim.conf' +'etc/asterisk/users.conf' 'etc/asterisk/voicemail.conf' +'etc/asterisk/vpb.conf' 'etc/asterisk/xmpp.conf') +url="http://www.asterisk.org" +license=('GPL') +depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl') +makedepends=('postgresql' 'unixodbc' 'sqlite3') +optdepends=('libpri' 'libss7' 'openr2' 'iksemel' 'radiusclient-ng' 'dahdi') +source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${pkgver}.tar.gz \ + ${pkgname}.service \ + ${pkgname}.logrotated \ + ${pkgname}.tmpfile) +install=${pkgname}.install +sha256sums=('a82c1ddd9fb1d98f0dab6e0255a127fb7c7eaa687b3d515182458244062b4194' + '74e0b278d553499f0c648a6e3d55c0dbb11b0c6dc93a85b020a21eafadb83783' + 'caa24cfec5c6b4f8cea385269e39557362acad7e2a552994c3bc24080e3bdd4e' + '673c0c55bce8068c297f9cdd389402c2d5d5a25e2cf84732cb071198bd6fa78a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} samples + + sed -i -e "s/\/var\/run/\/run/" ${pkgdir}/etc/asterisk/asterisk.conf + + mkdir -p ${pkgdir}/usr/share/doc/asterisk/examples + for i in ${pkgdir}/etc/asterisk/*; do install -D -m 644 $i ${pkgdir}/usr/share/doc/asterisk/examples/; done + + mv ${pkgdir}/var/run ${pkgdir} + + install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk + install -D -m 644 ${srcdir}/asterisk.service ${pkgdir}/usr/lib/systemd/system/asterisk.service + install -D -m 644 ${srcdir}/asterisk.tmpfile ${pkgdir}/usr/lib/tmpfiles.d/asterisk.conf + } diff --git a/pcr/asterisk/asterisk.install b/pcr/asterisk/asterisk.install new file mode 100644 index 000000000..b7c1a71f7 --- /dev/null +++ b/pcr/asterisk/asterisk.install @@ -0,0 +1,15 @@ +post_install() { + groupadd -r asterisk + useradd -MNr -s /bin/false -d /run/asterisk -g asterisk asterisk && passwd -l asterisk &>/dev/null + + chown -R asterisk:asterisk /etc/asterisk + chown -R asterisk:asterisk /var/lib/asterisk + chown -R asterisk:asterisk /var/log/asterisk + chown -R asterisk:asterisk /run/asterisk + chown -R asterisk:asterisk /var/spool/asterisk +} + +post_remove() { + userdel asterisk &>/dev/null + groupdel asterisk &>/dev/null +} diff --git a/social/asterisk/asterisk.logrotated b/pcr/asterisk/asterisk.logrotated index f03d0acd3..f03d0acd3 100644 --- a/social/asterisk/asterisk.logrotated +++ b/pcr/asterisk/asterisk.logrotated diff --git a/pcr/asterisk/asterisk.service b/pcr/asterisk/asterisk.service new file mode 100644 index 000000000..789a1adda --- /dev/null +++ b/pcr/asterisk/asterisk.service @@ -0,0 +1,20 @@ +[Unit] +Description=Asterisk PBX and telephony daemon +Documentation=man:asterisk(8) +Wants=network.target +After=network.target + +[Service] +Type=simple +User=asterisk +Group=asterisk +ExecStart=/usr/bin/asterisk -f -C /etc/asterisk/asterisk.conf +ExecStop=/usr/bin/asterisk -rx 'core stop now' +ExecReload=/usr/bin/asterisk -rx 'core reload' + +# safe_asterisk emulation +Restart=always +RestartSec=10 + +[Install] +WantedBy=multi-user.target diff --git a/pcr/asterisk/asterisk.tmpfile b/pcr/asterisk/asterisk.tmpfile new file mode 100644 index 000000000..6f1042e8a --- /dev/null +++ b/pcr/asterisk/asterisk.tmpfile @@ -0,0 +1 @@ +d /run/asterisk 0755 asterisk asterisk - diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD index d5a45b5b1..e4f4ef65e 100644 --- a/pcr/debootstrap/PKGBUILD +++ b/pcr/debootstrap-libre/PKGBUILD @@ -1,23 +1,29 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -pkgname=debootstrap -pkgver=1.0.52 +_pkgname=debootstrap +pkgname=debootstrap-libre +pkgver=1.0.53 pkgrel=3 -pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt" +pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)" arch=('any') license=('GPL') url="http://packages.debian.org/sid/debootstrap" depends=('wget') -source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb" - 'metad' +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://ftp.debian.org/debian/pool/main/d/${_pkgname}/${_pkgname}_${pkgver}_all.deb" + 'gnewsense' 'trisquel') install="debootstrap.install" -md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a' - '4425300ca68d60fb60a6d699e153a519' +md5sums=('1ea9c87d54b6cf9349d602406bf43e5a' + '13978bdd1d877a0dd2c3c874ecd54f03' 'b020aa8426e70a6024c8e76312c17d78') package(){ tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/" + # remove Debian scripts + rm -v "${pkgdir}/usr/share/debootstrap/scripts"/* # move the executables to /usr/bin mkdir -p ${pkgdir}/usr/bin mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/" @@ -25,14 +31,13 @@ package(){ # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap # doesn't work with gpg 2.x, patch to point to gpg1v - sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions" + sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions" # add gNewSense script - install -m644 metad "$pkgdir/usr/share/debootstrap/scripts" + install -m644 gnewsense "$pkgdir/usr/share/debootstrap/scripts" # create gNewSense symlinks - ln -s metad "$pkgdir/usr/share/debootstrap/scripts/deltah" - ln -s metad "$pkgdir/usr/share/debootstrap/scripts/parkes" + ln -s gnewsense "$pkgdir/usr/share/debootstrap/scripts/parkes" # add Trisquel script install -m644 trisquel "$pkgdir/usr/share/debootstrap/scripts" diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap-libre/debootstrap.install index 85a99f160..3da2f1d22 100644 --- a/pcr/debootstrap/debootstrap.install +++ b/pcr/debootstrap-libre/debootstrap.install @@ -1,7 +1,7 @@ post_install() { if [ "$(uname -m)" = "x86_64" ]; then darch="amd64" - elif [ "$(uname -m)" = "i386" ]; then + elif [ "$(uname -m)" = "i686" ]; then darch="i386" else darch="mips64el" diff --git a/pcr/debootstrap/metad b/pcr/debootstrap-libre/gnewsense index 8d14c0ed9..884ac88a0 100644 --- a/pcr/debootstrap/metad +++ b/pcr/debootstrap-libre/gnewsense @@ -1,13 +1,4 @@ -case $SUITE in - parkes|metad) - default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense/ - ;; - deltah) - default_mirror http://archive.gnewsense.org/gnewsense - ;; -esac - - +default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense mirror_style release download_style apt finddebs_style from-indices diff --git a/pcr/debootstrap/trisquel b/pcr/debootstrap-libre/trisquel index 7efa062f9..7efa062f9 100644 --- a/pcr/debootstrap/trisquel +++ b/pcr/debootstrap-libre/trisquel diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD new file mode 100644 index 000000000..ed6aa3a03 --- /dev/null +++ b/pcr/libquvi-scripts-current/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 188870 2013-06-23 17:45:51Z heftig $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> + +pkgname=libquvi-scripts-current +_pkgname=libquvi-scripts +provides=(libquvi-scripts) +pkgver=0.4.17 +pkgrel=1 +pkgdesc='Library for parsing video download links.' +arch=('any') +url='http://quvi.sourceforge.net/' +license=('LGPL') +depends=('curl' 'lua') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig}) +md5sums=('8a887905a368bf31e0ace28e49b5c800' + 'SKIP') + +build() { + cd "${_pkgname}-${pkgver}" + ./configure --prefix=/usr --with-nsfw --with-nlfy + make +} + +package() { + cd "${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index ac73b6637..b6b7526e6 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.08.17 +pkgver=2013.08.23 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('3fd78626b19ac128f15f1bbfee578011' +md5sums=('50c348f8dc28adff28d76420deff7297' 'SKIP') prepare() { diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD deleted file mode 100644 index fe8204d0a..000000000 --- a/social/asterisk/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Contributor: Alessio Biancalana <dottorblaster@gmail.com> - -pkgname=asterisk -pkgver=11.0.1 -pkgrel=1 -pkgdesc="A complete PBX solution" -arch=('i686' 'x86_64') -url="http://www.asterisk.org" -license=('GPL') -depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl') -makedepends=('postgresql' 'unixodbc' 'sqlite3') -optdepends=('libpri' 'libss7' 'openr2' 'iksemel') -backup=(etc/asterisk/asterisk.conf) -source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$pkgver.tar.gz \ - asterisk \ - asterisk.logrotated) -install=$pkgname.install -md5sums=('3e80a5cef7b0f8808578efcc84c39fd7' - '59146273738605f1e011d8e7bed3561a' - '486e07a0a1405ea25ec5b1736034653e') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - make DESTDIR=${pkgdir} samples || return 1 - - (cd ${pkgdir}/etc/asterisk -# for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done -ls -I asterisk.conf | xargs -I '{}' mv '{}' '{}.default') -# cp ${srcdir}/modules.conf modules.conf - sed -i -e "s/\/var\/run/\/var\/run\/asterisk/" $startdir/pkg/etc/asterisk/asterisk.conf - - install -D -m 755 ${srcdir}/asterisk ${pkgdir}/etc/rc.d/asterisk - install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk - } diff --git a/social/asterisk/asterisk b/social/asterisk/asterisk deleted file mode 100644 index f823caefc..000000000 --- a/social/asterisk/asterisk +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/asterisk` -case "$1" in - start) - stat_busy "Starting Asterisk" - [ -z "$PID" ] && cd /var/lib/asterisk && /usr/sbin/asterisk -G asterisk -U asterisk - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon asterisk - stat_done - fi - ;; - stop) - stat_busy "Stopping Asterisk" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/asterisk/asterisk.pid &>/dev/null - rm_daemon asterisk - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/social/asterisk/asterisk.install b/social/asterisk/asterisk.install deleted file mode 100644 index 1a3b998b7..000000000 --- a/social/asterisk/asterisk.install +++ /dev/null @@ -1,38 +0,0 @@ -post_install() { - echo -n "adding asterisk system group... " - groupadd -g 5060 asterisk && echo "done." - echo -n "adding asterisk system user... " - useradd -c "Asterisk daemon" -u 5060 -d /var/lib/asterisk -g asterisk -s /bin/false asterisk \ - && echo "done." - passwd -l asterisk &>/dev/null - chown -R asterisk:asterisk /var/run/asterisk - chown -R asterisk:asterisk /var/log/asterisk - chown -R asterisk:asterisk /var/spool/asterisk - chown -R asterisk:asterisk /var/lib/asterisk - -cat << EOF ->>> ->>> To get Music on Hold working do pacman -S mpg123 ->>> To get the postgresql, unixodbc or sqlite2 modules working ->>> download the respective package and modify modules.conf to reflect ->>> your changes. ->>> -EOF - -} - -post_upgrade() { - if grep asterisk /etc/passwd &>/dev/null; then - /bin/true - else - post_install $1 - fi -} - -post_remove() { - echo -n -e "\nremoving asterisk system user... " - userdel asterisk && echo "done." -} -op=$1 -shift -$op $* |
