diff options
55 files changed, 394 insertions, 488 deletions
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 5b817cdb6..88d7e2dfd 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92480 2013-06-06 17:40:18Z svenstaro $ +# $Id: PKGBUILD 92771 2013-06-15 00:51:49Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,37 +7,35 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=2.7.9 +pkgver=3.0 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') url="http://www.glfw.org/" license=('custom:ZLIB') -depends=('libgl' 'libxrandr' 'glu') -makedepends=('mesa') -source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('96e12be48801984f0f0c23e38549b277') +depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') +makedepends=('mesa' 'cmake' 'doxygen') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('415aef32d70af0cc829148c1cc7b1357') build() { cd "$srcdir/$pkgname-$pkgver" - export LFLAGS+="-lrt" - make x11 + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON + make } package() { cd "$srcdir/$pkgname-$pkgver" - make PREFIX="$pkgdir/usr" x11-dist-install - - # license - install -Dm644 COPYING.txt \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - # docs - install -d "$pkgdir/usr/share/doc/$pkgname" - install -Dm644 docs/*.pdf "$pkgdir/usr/share/doc/$pkgname" + cd build + make DESTDIR=$pkgdir install - # fix pc file prefix path - sed -i "s|$pkgdir||g" "$pkgdir/usr/lib/pkgconfig/lib$pkgname.pc" + cd .. + install -Dm644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 39c040f65..e03404d17 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 92338 2013-06-04 05:21:45Z svenstaro $ +# $Id: PKGBUILD 92773 2013-06-15 01:02:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20130604 +pkgver=0.11.0 +epoch=1 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') @@ -10,7 +11,7 @@ license=('BSD') depends=('llvm' 'libconfig') makedepends=('git' 'cmake') backup=('etc/ldc2.conf') -source=("git://github.com/ldc-developers/ldc.git") +source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}") sha1sums=('SKIP') [[ $CARCH == "x86_64" ]] && _multilib="ON" diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 35d7c9317..b1023c8d7 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76466 2012-09-18 18:52:24Z jlichtblau $ +# $Id: PKGBUILD 92809 2013-06-15 11:40:29Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw -pkgver=0.14.7 +pkgver=0.14.8 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('lcms') options=('!makeflags') changelog=$pkgname.changelog source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('7307a607249043bb544f3ab3b3a999e1923d72fbed12e4e2239d172e522143da') +sha256sums=('ec06bfb31ccefc8618c3939aa99fa7a42b413e0ccfb24205bb7fe7eaa4ba13ac') build() { cd ${srcdir}/LibRaw-${pkgver} diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog index 858be0c3f..c9ca492b8 100644 --- a/community/libraw/libraw.changelog +++ b/community/libraw/libraw.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libraw 0.14.8-1 + 2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * libraw 0.14.7-1 diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index 728f8e500..b9a6a79dc 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89669 2013-05-02 08:58:00Z lfleischer $ +# $Id: PKGBUILD 92797 2013-06-15 10:20:30Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Storyteller <spiralsorrow@hotmail.com> pkgname=lmms -pkgver=0.4.14 +pkgver=0.4.15 pkgrel=1 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64') @@ -25,7 +25,7 @@ options=('!libtool' '!makeflags') install=lmms.install source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2" zynaddsubfx_unlink.patch) -md5sums=('a30e4fcc24c117a1fb4fd7bef891f7e8' +md5sums=('0c754480ded76b7c081a99d7a884549c' 'd2ea78ac0cf2979505f140c6845617cf') build() { diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index dd0579bab..a96deb62e 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92476 2013-06-06 10:35:48Z bpiotrowski $ +# $Id: PKGBUILD 92789 2013-06-15 08:16:22Z 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.10 +pkgver=0.10.11 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('a54de71d2c3ac7ae864ab9640b6eecb27d7d49c190ac1ca6526243fd7a8ad15c') +sha256sums=('ee4b398efde1fa7a334435910447422dae58e93da8711602c2228485f2b58cb1') prepare() { cd node-v$pkgver diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 7f193d0e0..192425090 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 82020 2013-01-05 17:33:22Z jlichtblau $ +# $Id: PKGBUILD 92821 2013-06-15 13:40:37Z jlichtblau $ # 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.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64') -url="http://postgis.org/" +url="http://postgis.net/" license=('GPL') depends=('postgresql>=9.2' 'postgresql<9.3' 'proj' 'geos' 'gdal' 'json-c' 'libxml2') changelog=$pkgname.changelog options=('!libtool') -source=("http://postgis.org/download/${pkgname}-${pkgver}.tar.gz") -sha256sums=('57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391') +source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz) +sha256sums=('7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0') build() { cd ${srcdir}/${pkgname}-${pkgver} - + ./configure --prefix=/usr make diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 23a3034f8..1e53db33a 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * postgis-2.0.3-1 + 2013-01-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * postgis-2.0.2-1 diff --git a/community/pypanel/PKGBUILD b/community/pypanel/PKGBUILD index f078a915d..06e97709e 100644 --- a/community/pypanel/PKGBUILD +++ b/community/pypanel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86770 2013-03-22 00:26:29Z eric $ +# $Id: PKGBUILD 92799 2013-06-15 10:31:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jeff Mickey <j@codemac.net> # Contributor: Mr Green @@ -6,12 +6,12 @@ pkgname=pypanel pkgver=2.4 -pkgrel=7 +pkgrel=8 pkgdesc='A lightweight panel/taskbar for X11 window managers written in python.' arch=('i686' 'x86_64') url='http://pypanel.sourceforge.net/' license=('GPL') -depends=('python2' 'x-server' 'python-xlib' 'imlib2' 'libxft') +depends=('python2' 'x-server' 'python2-xlib' 'imlib2' 'libxft') source=("http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-${pkgver}.tar.gz") md5sums=('f1f9a2ed80be72ab36e748833618daba') diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 049cda336..3ab8cc589 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 88593 2013-04-20 16:06:40Z jlichtblau $ +#$Id: PKGBUILD 92815 2013-06-15 12:48:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.7.0 +pkgver=0.7.1 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support' install=$pkgname.install changelog=$pkgname.changelog source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('2f9a67821a711f925e27d7254eb3039d31019fe1a2aaa7a901be0d2f9066183d') +sha256sums=('5e86c3c783bffa384d4c5c8731ebaff7a1589f56b6e0ad69ec6f82a8da160671') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 57758c02f..cec0d2b97 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.1-1 + 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.7.0-1 diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index 6dc872ed6..2b43d1c7e 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 85404 2013-03-01 10:39:23Z andrea $ +# $Id: PKGBUILD 92818 2013-06-15 13:03:11Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm -pkgver=5.5 -pkgrel=2 +pkgver=5.9 +pkgrel=1 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64') -url="http://www.qtfm.org/" +url="http://qt-apps.org/content/show.php/QtFM?content=158787" license=('GPL') -depends=('file' 'qt4') +depends=('file' 'qt5-base' 'desktop-file-utils') install=$pkgname.install changelog=$pkgname.changelog -source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) -sha256sums=('845fc43800d12483fa1993c56a8c965ff8dc917b97f03d9ce2e24318806fb211') +source=(http://qt-apps.org/CONTENT/content-files/158787-qtfm.zip) +sha256sums=('07ffd61dd5d4aa7c16f1c544804517b621e3ef1a30eeda97c087219a3cb35128') build() { - cd "${srcdir}/$pkgname-$pkgver" + cd "${srcdir}/$pkgname" qmake make } package() { - cd "${srcdir}/$pkgname-$pkgver" + cd "${srcdir}/$pkgname" make INSTALL_ROOT="${pkgdir}" install } diff --git a/community/qtfm/qtfm.changelog b/community/qtfm/qtfm.changelog index 043ff07ec..2212da656 100644 --- a/community/qtfm/qtfm.changelog +++ b/community/qtfm/qtfm.changelog @@ -1,3 +1,6 @@ +2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qtfm 5.9-1 + 2012-06-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qtfm 5.5-1 diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 367179984..475d01451 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92703 2013-06-12 15:19:19Z alucryd $ +# $Id: PKGBUILD 92785 2013-06-15 06:20:46Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 9348ea3c8..6308e2fa5 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.5-1-ARCH' +VERSION='3.9.6-1-ARCH' post_install() { cat << EOF diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 7043167f8..70f6b8004 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.5-1-ARCH' +VERSION='3.9.6-1-ARCH' post_install() { cat << EOF diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD index 1aa1927d9..46232f58b 100644 --- a/community/xonotic/PKGBUILD +++ b/community/xonotic/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Alexander Suhoverhov <cy at ngs dot ru> pkgname=xonotic -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 pkgdesc="A free, fast-paced crossplatform first-person shooter" arch=('i686' 'x86_64') url="http://xonotic.org" @@ -12,7 +12,7 @@ makedepends=('unzip' 'mesa') source=("http://dl.xonotic.org/xonotic-${pkgver}-source.zip" "xonotic-glx.desktop" "xonotic-sdl.desktop") -md5sums=('47e8468054bf1346c57f3f8fdc97575e' +md5sums=('1cc50a79ac6abf27da916bfb5e066043' '914c7b9163e92b35f0ab57fdb1653ac5' 'da7d812ff231c9332cd694b39757adda') @@ -31,6 +31,7 @@ build() { make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sv-release cd $srcdir/Xonotic/source/d0_blind_id + sh autogen.sh ./configure --prefix=/usr --disable-rijndael make } diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD index 81dfd7765..0dbd50eae 100644 --- a/community/xwax/PKGBUILD +++ b/community/xwax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80901 2012-12-06 09:48:40Z lfleischer $ +# $Id: PKGBUILD 92791 2013-06-15 08:44:39Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: sputnick <gilles DOT quenot AT gmail DOT com> pkgname=xwax -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc='Open-source vinyl emulation software for Linux.' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import' 'mpg123: for MP3 import' 'ffmpeg: for video fallback import') source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('10c3b923eab17377705b1dea89edf6fb') +md5sums=('01afde1f1222fca38eab736e0b3df116') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index ad0747bee..4abe0670b 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186902 2013-05-31 16:49:40Z tpowa $ +# $Id: PKGBUILD 188529 2013-06-15 09:26:56Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.17 +pkgver=3.0.19 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) @@ -10,6 +10,8 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') +md5sums=('a083ca4a2a937c8cec07c63176fb125f' + 'SKIP') build() { cd $srcdir/$pkgname-$pkgver @@ -18,7 +20,5 @@ build() { package () { cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install + make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DOCDIR=/usr/share/doc install } -md5sums=('468b953ddc8baf66e9881d1a5eae03e2' - 'SKIP') diff --git a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch deleted file mode 100644 index 44e6e86b5..000000000 --- a/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 -+++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 -@@ -174,7 +174,10 @@ - offset = fs->root_start + next_free * sizeof(DIR_ENT); - memset(de, 0, sizeof(DIR_ENT)); - while (1) { -- sprintf((char *)de->name, pattern, curr_num); -+ char expanded[12]; -+ sprintf(expanded, pattern, curr_num); -+ memcpy(de->name, expanded, 8); -+ memcpy(de->ext, expanded + 8, 3); - for (scan = 0; scan < fs->root_entries; scan++) - if (scan != next_free && - !strncmp((const char *)root[scan].name, ---- dosfstools-3.0.12/src/fat.c -+++ dosfstools-3.0.12/src/fat.c -@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) - DIR_ENT de; - loff_t offset; - files++; -- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); -+ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = CT_LE_W(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = CT_LE_W(i >> 16); diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index a813c14aa..e261a268e 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186200 2013-05-22 00:37:41Z stephane $ +# $Id: PKGBUILD 188525 2013-06-15 07:57:25Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.11.2 -pkgrel=4 +pkgver=1.11.3 +pkgrel=1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -19,7 +19,7 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-si krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) -sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250' +sha1sums=('df708a530a22ed09c7825742c108180319b10463' '78ec307c2b5e32481a6da401013c428e0b867f36' '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' @@ -37,7 +37,7 @@ build() { patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch # Fix kpasswd UDP ping-pong (CVE-2002-2443) - patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch + #patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch rm lib/krb5/krb/deltat.c diff --git a/core/sdparm/PKGBUILD b/core/sdparm/PKGBUILD index d983deffd..1d2dafd40 100644 --- a/core/sdparm/PKGBUILD +++ b/core/sdparm/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 148461 2012-02-01 12:06:03Z stephane $ +# $Id: PKGBUILD 188486 2013-06-14 23:27:22Z eric $ # Maintainer: # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: grimi@poczta.fm pkgname=sdparm -pkgver=1.07 +pkgver=1.08 pkgrel=1 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('i686' 'x86_64') url="http://sg.danny.cz/sg/sdparm.html" license=('BSD') -depends=('glibc') -source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") -md5sums=('c807f9db3dd7af175214be0d7fece494') +depends=('glibc' 'bash') +source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz") +md5sums=('d290e6b45d690bfa2cc05700ec119073') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING \ diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 1f255b672..90e291606 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185605 2013-05-15 22:40:19Z andrea $ +# $Id: PKGBUILD 188524 2013-06-15 07:43:53Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org/" @@ -22,11 +22,19 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d') - -build() { +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde411.patch') +sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d' + 'c2fd0153ec622fccac47ebd31a1b0548c6222541') + +prepare() { mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kde411.patch +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/amarok/kde411.patch b/extra/amarok/kde411.patch new file mode 100644 index 000000000..8099a4432 --- /dev/null +++ b/extra/amarok/kde411.patch @@ -0,0 +1,35 @@ +commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 +Author: Hrvoje Senjan <hrvoje.senjan@gmail.com> +Date: Mon Jun 10 09:26:37 2013 +0200 + + Remove usage of (fake) Amarok-Mockup theme + + This is due to https://bugs.kde.org/show_bug.cgi?id=320855 + Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11 + If it is still needed, or there is a better solution, i'll discard the review... + + From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001 + From: Hrvoje Senjan <hrvoje.senjan@gmail.com> + Date: Sun, 9 Jun 2013 19:55:58 +0200 + Subject: [PATCH 1/1] Kill Amarok-Mockup + + BUG: 320855 + FIXED-IN: 2.8 + REVIEW: 110917 + +diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp +index f61518f..152f8da 100644 +--- a/src/context/ContextView.cpp ++++ b/src/context/ContextView.cpp +@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, Plasma::Corona *corona, QWi + p.setColor( QPalette::Base, c ); + setPalette( p ); + +- PERF_LOG( "Accessing Plasma::Theme" ); +- // here we initialize all the Plasma paths to Amarok paths +- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false ); +- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" ); +- PERF_LOG( "Access to Plasma::Theme complete" ) + contextScene()->setAppletMimeType( "text/x-amarokappletservicename" ); + + cont->setPos( 0, 0 ); diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD index ac4085b60..90b88109f 100644 --- a/extra/arora/PKGBUILD +++ b/extra/arora/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 145325 2011-12-21 20:47:00Z andrea $ +# $Id: PKGBUILD 188497 2013-06-15 04:38:48Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=arora pkgver=0.11.0 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight cross-platform Web browser' -url='http://www.arora-browser.org/' +url='http://code.google.com/p/arora/' license=('GPL') arch=('i686' 'x86_64') depends=('qtwebkit' 'desktop-file-utils') @@ -18,7 +18,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - qmake PREFIX='/usr' 'CONFIG-=debug' -r + qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r make } diff --git a/extra/arora/install b/extra/arora/install index 6c87527e2..b0409600c 100644 --- a/extra/arora/install +++ b/extra/arora/install @@ -1,6 +1,6 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true + update-desktop-database -q || true } post_upgrade() { diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index d07211f14..2fbcbb9a6 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186328 2013-05-24 20:18:53Z andyrtr $ +# $Id: PKGBUILD 188519 2013-06-15 07:02:29Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 epoch=1 arch=('i686' 'x86_64') @@ -10,23 +10,40 @@ url="http://projects.palaso.org/projects/graphitedev" pkgdesc='reimplementation of the SIL Graphite text processing engine' license=('LGPL' 'GPL' 'custom') depends=('gcc-libs') -makedepends=('cmake' 'freetype2' 'python2') -# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly +makedepends=('cmake' 'freetype2' 'python2') + # - only for docs - target doesn't install properly + # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('4bfd5db6c91a4097cd76a699beaca70e') +source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz + graphite2-1.2.0-cmakepath.patch) +md5sums=('7042305e4208af4c2d5249d814ccce58' + '00353b67941dbc30b76a43253760769e') build() { cd "${srcdir}" + + # python2 fixes sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py} + + # fix install path - .cmake files contain architecture dependend content - patch taken from FC/Slackware + pushd graphite2-${pkgver} + patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch + popd + mkdir build cd build cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ + -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DGRAPHITE2_COMPARE_RENDERER=OFF - make -# make docs + -DGRAPHITE2_COMPARE_RENDERER=OFF \ + #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target will be fixed + + # fix unwanted -O3 cflag (taken form Debian) + find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \; + + make + #make docs } check() { @@ -37,7 +54,8 @@ check() { package() { cd "${srcdir}"/build - make DESTDIR="$pkgdir/" install + # FIXME: all target doesn't install the docs target files + make DESTDIR="$pkgdir/" install # licenses mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} diff --git a/extra/graphite/graphite2-1.2.0-cmakepath.patch b/extra/graphite/graphite2-1.2.0-cmakepath.patch new file mode 100644 index 000000000..ee71cd6de --- /dev/null +++ b/extra/graphite/graphite2-1.2.0-cmakepath.patch @@ -0,0 +1,9 @@ +diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt +--- graphite2-1.2.0.orig/src/CMakeLists.txt 2013-01-29 15:47:32.465841769 +0530 ++++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530 +@@ -136,4 +136,4 @@ + + + install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) +-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_) ++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_) diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD index 57d38d906..bd56d00dc 100644 --- a/extra/gts/PKGBUILD +++ b/extra/gts/PKGBUILD @@ -1,5 +1,4 @@ -# $Id: PKGBUILD 143014 2011-11-20 23:59:13Z bisson $ - +# $Id: PKGBUILD 188503 2013-06-15 04:44:21Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thomas Dziedzic <gostrc at gmail> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +6,7 @@ pkgname=gts pkgver=0.7.6 -pkgrel=2 +pkgrel=3 pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles' url='http://gts.sourceforge.net/' license=('LGPL') @@ -15,6 +14,7 @@ arch=('i686' 'x86_64') depends=('glib2') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040') + options=('!libtool') build() { diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD new file mode 100644 index 000000000..94a3aae2b --- /dev/null +++ b/extra/jsoncpp/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 188521 2013-06-15 07:18:30Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jonahtan Schaeffer <joschaeffer@gmail.com> +# COntributor: Drake Arconis <lightdrake@gmail.com> + +pkgname=jsoncpp +pkgver=0.5.0 +pkgrel=4 +pkgdesc="A JSON C++ library" +url='http://jsoncpp.sourceforge.net/' +license=('custom:Public_Domain') +arch=('i686' 'x86_64') +depends=('gcc-libs') +makedepends=('scons') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-src-${pkgver}.tar.gz") +md5sums=('24482b67c1cb17aac1ed1814288a3a8f') + +build() { + cd ${pkgname}-src-${pkgver} + scons platform=linux-gcc +} + +package() { + cd ${pkgname}-src-${pkgver} + + install -d "${pkgdir}"/usr/include/jsoncpp + cp -r include/json "${pkgdir}"/usr/include/jsoncpp/json + + install -Dm644 buildscons/linux-gcc-*/src/lib_json/libjson_linux-gcc*libmt.so \ + "${pkgdir}"/usr/lib/libjsoncpp.so + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 5653fcf1c..d0084d9fe 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188044 2013-06-08 08:01:48Z andrea $ +# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,15 +11,15 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') pkgver=4.10.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' - 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') + 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' @@ -74,7 +74,7 @@ package_kdenetwork-kget() { package_kdenetwork-kopete() { pkgdesc='Instant Messenger' depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' - 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') + 'libidn' 'qimageblitz' 'libgadu') url="http://kde.org/applications/internet/kopete/" install='kdenetwork-kopete.install' cd $srcdir/build/kopete diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD index b5dd98216..5ac0c5fbb 100644 --- a/extra/libhangul/PKGBUILD +++ b/extra/libhangul/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 140549 2011-10-17 07:24:10Z bisson $ +# $Id: PKGBUILD 188501 2013-06-15 04:42:48Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libhangul pkgver=0.1.0 -pkgrel=1 -_filecode=6000 +pkgrel=2 pkgdesc='Input method library for Korean' -arch=('i686' 'x86_64') -url='http://kldp.net/projects/hangul/' +url='http://code.google.com/p/libhangul/' license=('LGPL') -options=('!libtool') -DLAGENTS=("http::/usr/bin/curl -A '' -fLC - --retry 3 --retry-delay 3 -o %o %u") # moronic httpd bans curl's user-agent -source=("http://kldp.net/frs/download.php/${_filecode}/${pkgname}-${pkgver}.tar.gz") +arch=('i686' 'x86_64') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD index d27e6b9c1..0bcc6d7c1 100644 --- a/extra/libspiro/PKGBUILD +++ b/extra/libspiro/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 145163 2011-12-18 12:09:22Z bisson $ -# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr> +# $Id: PKGBUILD 188499 2013-06-15 04:42:05Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr> pkgname=libspiro pkgver=20071029 -pkgrel=2 +pkgrel=3 pkgdesc='Simplifies the drawing of beautiful curves' url='http://libspiro.sourceforge.net/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2") sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD index 13f8142c3..731f2ea75 100644 --- a/extra/libsrtp/PKGBUILD +++ b/extra/libsrtp/PKGBUILD @@ -1,27 +1,35 @@ -# $Id: PKGBUILD 159152 2012-05-16 20:08:38Z andrea $ +# $Id: PKGBUILD 188535 2013-06-15 10:01:17Z andrea $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Yejun Yang <yejunx AT gmail DOT com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=libsrtp -pkgver=1.4.4 -pkgrel=2 +pkgver=15.1c9bd90 +pkgrel=1 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" url="http://srtp.sourceforge.net/srtp.html" arch=('i686' 'x86_64') license=('BSD') -source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz") -md5sums=('9b449edb011c934ca97009e7e0566d22') +depends=('glibc') +makedepends=('git') +source=("git://git.linphone.org/srtp.git#commit=1c9bd90") +md5sums=('SKIP') + +pkgver() { + cd srtp + echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) +} build() { - cd "${srcdir}"/srtp + cd srtp + autoconf ./configure --prefix=/usr - make CFLAGS="${CFLAGS} -fPIC" + make } package() { - cd "${srcdir}"/srtp + cd srtp make DESTDIR="${pkgdir}" install install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 1c3a15fa7..a877daa75 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $ +# $Id: PKGBUILD 188540 2013-06-15 10:10:22Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Adrià Arrufat <swiftscythe@gmail.com> pkgname=mediastreamer -pkgver=2.8.2 -pkgrel=5 +pkgver=2.9.0 +pkgrel=1 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') -makedepends=('intltool') +depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp') +# xxd from Vim is needed to build +makedepends=('intltool' 'vim') options=('!libtool') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - mediastreamer-ffmpeg.patch) -md5sums=('e51ea9d5fce1396b374d10473dfbadec' - '805da7def98f367e621363fa0c951fe8' - '553d5d47ea4a8c8dfeabdc0281849d5f') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch -} +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('f2ea0fe731a363749a81b6eaac22a62c' + 'SKIP') build() { cd $pkgname-$pkgver diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch deleted file mode 100644 index 3304e9f56..000000000 --- a/extra/mediastreamer/mediastreamer-ffmpeg.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit f586917ea4d66f9ba8910f0967a8830e54d50784 -Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> -Date: Tue Jun 5 11:07:48 2012 +0200 - - Fixes for new versions of ffmpeg - -diff --git a/src/h264dec.c b/src/h264dec.c -index c4a84ee..5229b5e 100644 ---- a/src/h264dec.c -+++ b/src/h264dec.c -@@ -45,7 +45,9 @@ typedef struct _DecData{ - static void ffmpeg_init(){ - static bool_t done=FALSE; - if (!done){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - done=TRUE; - } -diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..fb35760 100644 ---- a/src/videoenc.c -+++ b/src/videoenc.c -@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - static bool_t avcodec_initialized=FALSE; - -+#ifndef FF_I_TYPE -+#define FF_I_TYPE AV_PICTURE_TYPE_I -+#endif -+ - #ifdef ENABLE_LOG_FFMPEG - - void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) -@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - void ms_ffmpeg_check_init(){ - if(!avcodec_initialized){ -+#ifdef FF_API_AVCODEC_INIT - avcodec_init(); -+#endif - avcodec_register_all(); - avcodec_initialized=TRUE; - #ifdef ENABLE_LOG_FFMPEG -@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ - if (s->profile==0){ - s->codec=CODEC_ID_H263; - }else{ -+ /* - c->flags|=CODEC_FLAG_H263P_UMV; - c->flags|=CODEC_FLAG_AC_PRED; - c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -- /* - c->flags|=CODEC_FLAG_OBMC; - c->flags|=CODEC_FLAG_AC_PRED; - */ diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD index 3f132b4e9..1cb6bc708 100644 --- a/extra/ortp/PKGBUILD +++ b/extra/ortp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162825 2012-07-01 07:46:57Z andrea $ +# $Id: PKGBUILD 188538 2013-06-15 10:09:55Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=ortp -pkgver=0.20.0.20120701 +pkgver=0.22.0 pkgrel=1 pkgdesc="A Real-time Transport Protocol (RTP) library" arch=('i686' 'x86_64') @@ -13,14 +13,13 @@ url="http://www.linphone.org/index.php/eng/code_review/ortp" license=('GPL3') depends=('libzrtpcpp' 'libsrtp') options=('!libtool') -#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig} -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('91b66787c6ac3e8d4d43946beb7611ce') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}) +sha1sums=('3f4712307ceba27c6498abd2090f411e02084dbd' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} - ./autogen.sh ./configure --prefix=/usr \ --enable-zrtp \ --disable-strict @@ -28,6 +27,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index 00ba3f4a3..61d0d5996 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $ +# $Id: PKGBUILD 188483 2013-06-14 22:43:41Z eric $ # Maintainer: -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: francois at archlinux dot org pkgname=perl-dbd-sqlite -_cpanname=DBD-SQLite -pkgver=1.37 -pkgrel=2 +pkgver=1.39 +pkgrel=1 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" +url="http://search.cpan.org/dist/DBD-SQLite" license=('GPL' 'PerlArtistic') depends=('perl-dbi' 'sqlite') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('b8ac1c584befa63cd5ffc391b2366e84') +source=(http://www.cpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-${pkgver}.tar.gz) +md5sums=('8ca0719852fcbcbbee470c705eeff24a') build() { - cd "${srcdir}/${_cpanname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd DBD-SQLite-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_cpanname}-${pkgver}" + cd DBD-SQLite-${pkgver} make test } package() { - cd "${srcdir}/${_cpanname}-${pkgver}" + cd DBD-SQLite-${pkgver} make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 7f2b29caf..722116ab7 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $ +# $Id: PKGBUILD 188575 2013-06-15 17:19:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.54 -pkgrel=2 +pkgver=1.55 +pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('26e758fff1c90cb00e9358fea7e1e22f') +md5sums=('473b8d66ca69d5784bb0e428721f58e0') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index d7e987d38..f8ebacc12 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 183452 2013-04-21 22:11:58Z heftig $ +# $Id: PKGBUILD 188528 2013-06-15 09:16:15Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.110 -pkgrel=2 +pkgver=0.111 +pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/wiki/Software/polkit" -depends=(glib2 pam expat libsystemd js185) +depends=(glib2 pam expat libsystemd js) makedepends=(intltool gtk-doc gobject-introspection) options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz polkit.pam) -md5sums=('06e0d3b72e566ac277fc35c8206d2a28' - '6564f95878297b954f0572bc1610dd15') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --disable-static --enable-gtk-doc + --enable-libsystemd-login=yes --disable-static \ + --enable-gtk-doc make } @@ -36,3 +34,5 @@ package() { install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" } +md5sums=('81b116edf986d8e13502929a171f4e0d' + '6564f95878297b954f0572bc1610dd15') diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD index 08dfac7cc..5263aa628 100644 --- a/extra/scim-anthy/PKGBUILD +++ b/extra/scim-anthy/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 148916 2012-02-05 11:55:48Z ibiru $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188489 2013-06-15 00:05:53Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=scim-anthy pkgver=1.2.7 -pkgrel=3 +pkgrel=4 _filecode=37309 pkgdesc='Japanese input method module for SCIM' -arch=('i686' 'x86_64') url='http://sourceforge.jp/projects/scim-imengine/' +arch=('i686' 'x86_64') license=('GPL') depends=('scim' 'anthy') -options=('!libtool') source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz") sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8') +options=('!libtool') + build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD index ea3d7fac2..c1fbe9c6e 100644 --- a/extra/scim-chewing/PKGBUILD +++ b/extra/scim-chewing/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 176853 2013-02-01 14:44:22Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: whisky <archlinux.cle(at)gmail.com> +# $Id: PKGBUILD 188490 2013-06-15 00:05:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: whisky <archlinux.cle(at)gmail.com> +# Contributor: damir <damir@archlinux.org> pkgname=scim-chewing pkgver=0.3.5 -pkgrel=1 +pkgrel=2 pkgdesc='Traditional Chinese input method module for SCIM' url='http://chewing.csie.net/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64') makedepends=('intltool') depends=('scim' 'libchewing') source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") sha1sums=('f26ced990f0c9e5d43e271cd6e77583de81a008d') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD index b5e08cac0..9ca70271d 100644 --- a/extra/scim-hangul/PKGBUILD +++ b/extra/scim-hangul/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 165326 2012-08-15 15:47:04Z bisson $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188491 2013-06-15 00:05:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=scim-hangul pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Korean input method module for SCIM' url='http://www.scim-im.org/' license=('GPL') arch=('i686' 'x86_64') depends=('libhangul' 'scim') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" '2012.patch') sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555' 'a046c40b78521f85418b8ad2138b51815d47abec') -build() { +options=('!libtool') + +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../2012.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-skim-support make } diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD index 7938e7768..ffbc7bb51 100644 --- a/extra/scim-m17n/PKGBUILD +++ b/extra/scim-m17n/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 149048 2012-02-05 15:25:52Z bisson $ +# $Id: PKGBUILD 188492 2013-06-15 00:05:56Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> # Contributor: damir <damir@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-m17n pkgver=0.2.3 -pkgrel=4 +pkgrel=5 pkgdesc='Multilingual input method module for SCIM' url='http://www.scim-im.org/' license=('GPL') -options=('!libtool') arch=('i686' 'x86_64') depends=('scim' 'm17n-lib') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no + ./configure --prefix=/usr --disable-static make } diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD index 0364e310d..a31e1eadc 100644 --- a/extra/scim-pinyin/PKGBUILD +++ b/extra/scim-pinyin/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 165322 2012-08-15 15:28:33Z bisson $ +# $Id: PKGBUILD 188493 2013-06-15 00:05:57Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributer: Gan Lu <rhythm.gan@gmail.com> pkgname=scim-pinyin pkgver=0.5.92 -pkgrel=1 +pkgrel=2 pkgdesc='Chinese pinyin input for SCIM' url='http://www.scim-im.org/' arch=('i686' 'x86_64') license=('GPL') depends=('scim') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") sha1sums=('d7c2d52a5712753af241a5301db23527ba438ea1') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - + ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD index 557d9d80c..3868c42c0 100644 --- a/extra/scim-tables/PKGBUILD +++ b/extra/scim-tables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183256 2013-04-19 15:20:34Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: Gan Lu <rhythm.gan@gmail.com> +# $Id: PKGBUILD 188494 2013-06-15 00:05:58Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Gan Lu <rhythm.gan@gmail.com> +# Contributor: damir <damir@archlinux.org> pkgname=scim-tables -pkgver=0.5.12 +pkgver=0.5.13 pkgrel=1 pkgdesc='Generic table input method module for SCIM' url='http://www.scim-im.org/' @@ -13,7 +13,7 @@ license=('GPL') depends=('scim') makedepends=('intltool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c83515c1c3ce0c40fb7cf30f576d8837a06a626f') +sha1sums=('75363466cfca30e3cdff804e0dad713f12521776') options=('!libtool') diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD index 0edb9b433..8a3b46ed9 100644 --- a/extra/scim-uim/PKGBUILD +++ b/extra/scim-uim/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 166977 2012-09-24 04:57:10Z bisson $ -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 188495 2013-06-15 00:05:59Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org +# Contributor: damir <damir@archlinux.org> pkgname=scim-uim pkgver=0.2.0 -pkgrel=6 +pkgrel=7 pkgdesc='UIM bridging input engine for SCIM' url='http://www.scim-im.org/' license=('GPL') -options=('!libtool') depends=('scim' 'uim') arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" @@ -18,10 +17,16 @@ sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a' 'a9d67946f956d0572c73065e2b4b268bfdf149e3' '3b083260910f7855b5446960ab1203c052f4b56c') -build() { +options=('!libtool') + +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../fix-gcc43-build.patch patch -p1 -i ../uim-1.5.5-header.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index c2900e866..a04ce1828 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 185781 2013-05-18 17:19:08Z bisson $ +# $Id: PKGBUILD 188488 2013-06-15 00:05:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim pkgver=1.4.14 -pkgrel=3 +pkgrel=4 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('LGPL') -options=('!libtool') arch=('i686' 'x86_64') depends=('libltdl' 'gtk2') -makedepends=('intltool' 'optipng') -backup=('etc/scim/config' 'etc/scim/global') +optdepends=('qt4: qt4 immodule' + 'gtk3: gtk3 immodule') +makedepends=('intltool' 'qt4' 'gtk3' 'optipng') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b') +backup=('etc/scim/config' 'etc/scim/global') +options=('!libtool') install=install -prepare() { - find -name '*.png' -exec optipng -quiet -force -fix {} + -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" + find -name '*.png' -exec optipng -quiet -force -fix {} + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-static \ + --with-qt4-moc=/usr/bin/moc-qt4 \ + --with-gtk-version=2 # no gtk3 support in scim-anthy make } diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index d35c20c63..b517f492c 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $ +# $Id: PKGBUILD 188481 2013-06-14 22:21:14Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vte @@ -12,9 +12,9 @@ depends=('gtk2' 'vte-common') makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz -make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) + make_alt_work.patch) sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae' - '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') + '978c989fb63884289068bcee05a92614a3a2be9e5d9386ab789dfb87163b92c8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vte/make_alt_work.patch b/extra/vte/make_alt_work.patch new file mode 100644 index 000000000..8e6e3fcad --- /dev/null +++ b/extra/vte/make_alt_work.patch @@ -0,0 +1,21 @@ +From b73782a28894e25ed146271f9d6c6775a6836199 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <behdad@behdad.org> +Date: Fri, 04 Jun 2010 18:36:45 +0000 +Subject: Bug 601926 - Don't hardcode meta to alt + +--- +diff --git a/src/keymap.h b/src/keymap.h +index 3a4cefe..243e22e 100644 +--- a/src/keymap.h ++++ b/src/keymap.h +@@ -27,7 +27,7 @@ + + G_BEGIN_DECLS + +-#define VTE_META_MASK GDK_MOD1_MASK ++#define VTE_META_MASK GDK_META_MASK + #define VTE_NUMLOCK_MASK GDK_MOD2_MASK + + /* Map the specified keyval/modifier setup, dependent on the mode, to either +-- +cgit v0.9.2 diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD index 60865fe7c..2b2dc3754 100644 --- a/extra/webkitgtk2/PKGBUILD +++ b/extra/webkitgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188478 2013-06-14 20:00:26Z heftig $ +# $Id: PKGBUILD 188485 2013-06-14 23:12:24Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk2 pkgver=1.10.2 -pkgrel=6 +pkgrel=7 pkgdesc="GTK+ Web content engine library for GTK+ 2.0" arch=(i686 x86_64) url="http://webkitgtk.org/" @@ -42,4 +42,5 @@ package() { cd webkitgtk-$pkgver make -j1 DESTDIR="$pkgdir" install install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -r "$pkgdir/usr/share/gtk-doc/html/webkitgtk" } diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 064bd2c71..db8bd3503 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $ +# $Id: PKGBUILD 188542 2013-06-15 10:17:06Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,8 +7,8 @@ # Contributor: Milan Knížek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.0.2 -pkgrel=2 +pkgver=4.0.1.1 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/" @@ -20,19 +20,13 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz - x2goserver.service - revert.patch) -md5sums=('6b8cecfdd31a8877203f50d3666c265f' - 'f76081c01e40b6206895d194dc949707' - 'c487c31e7c0aa9a73323313007497764') + x2goserver.service) +md5sums=('d970699f1df8d7096a7d3151c0ede447' + 'f76081c01e40b6206895d194dc949707') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # revert an upstream commit that breaks sessions showing up - # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f - patch -Rp1 -i ${srcdir}/revert.patch - # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -45,7 +39,7 @@ build() { sed -i "s:-o root -g root ::g" $Makefile done - make + make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" } package() { @@ -60,8 +54,8 @@ package() { install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start - install -dm755 $pkgdir/lib/modules-load.d - echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf + install -dm755 $pkgdir/usr/lib/modules-load.d + echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch deleted file mode 100644 index 023bbd18c..000000000 --- a/extra/x2goserver/revert.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 -From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Date: Sun, 19 May 2013 00:41:32 +0200 -Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. - Hard-code path to x2gosqlitewrapper.pl during build via - defining a macro in the Makefile. Thanks to Richard - Weinberger for spotting this!!! - ---- - Makefile | 2 +- - debian/changelog | 3 +++ - debian/rules | 4 +-- - x2goserver/Makefile | 4 +-- - x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- - 5 files changed, 12 insertions(+), 55 deletions(-) - -diff --git a/Makefile b/Makefile -index 3be40f9..588084f 100755 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - LIBDIR=$(PREFIX)/lib/x2go - SHAREDIR=$(PREFIX)/share/x2go -diff --git a/debian/changelog b/debian/changelog -index 470a502..2cf2dde 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low - * New upstream version (4.0.0.2): - - Use make_path from File::Path in x2godbadmin to create user directory if - not present. (Fixes: #200). -+ - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to -+ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. -+ Thanks to Richard Weinberger for spotting this!!! - /debian/control: - + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: - #163). -diff --git a/debian/rules b/debian/rules -index b32e08d..5bb94b2 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -1,10 +1,10 @@ - #!/usr/bin/make -f - - %: -- dh $@ -+ PREFIX=/usr dh $@ - - override_dh_auto_install: -- make -f Makefile build-arch -+ PREFIX=/usr make -f Makefile build-arch - - override_dh_auto_clean: - rm -fv x2gosqlitewrapper -diff --git a/x2goserver/Makefile b/x2goserver/Makefile -index 4287478..e9d56e6 100755 ---- a/x2goserver/Makefile -+++ b/x2goserver/Makefile -@@ -15,7 +15,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin -@@ -41,7 +41,7 @@ build: build-arch build-indep - build-arch: build_setgidwrappers - - build_setgidwrappers: -- $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c - - build-indep: build_man2html - -diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c -index a134efc..ad95eff 100644 ---- a/x2goserver/x2gosqlitewrapper.c -+++ b/x2goserver/x2gosqlitewrapper.c -@@ -21,58 +21,12 @@ - * - */ - --#include <stdio.h> --#include <stdlib.h> --#include <unistd.h> --#include <libgen.h> --#include <errno.h> -- - int main( int argc, char *argv[] ) { -- char * x2gosqlitewrapper = NULL; -- size_t path_max; -- --/* -- The following snippet is taken from the realpath manpage --*/ --#ifdef PATH_MAX -- path_max = PATH_MAX; --#else -- path_max = pathconf (".", _PC_PATH_MAX); -- if (path_max <= 0){ -- path_max = 4096; -- } --#endif -- { -- // allocate dynamic buffer in stack: this needs C99 or gnu?? -- char buffer[path_max]; -- ssize_t rvrl; -- int rvap; -- -- // resolve link of /proc/self/exe to find out where we are -- rvrl = readlink("/proc/self/exe", buffer, path_max); -- if(rvrl == -1){ -- perror("readlink(\"/proc/self/exe\",buffer,path_max)"); -- exit(EXIT_FAILURE); -- } -- if(rvrl >= path_max){ -- fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); -- exit(EXIT_FAILURE); -- } -- -- // derive the full path of x2gosqlitewrapper.pl from path of this binary -- rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); -- if(rvap == -1){ -- fprintf(stderr, "Failed to allocate memory calling asprintf\n"); -- exit(EXIT_FAILURE); -- } -- -- // execute the script, running with user-rights of this binary -- execv(x2gosqlitewrapper, argv); - -- } -+ char x2gosqlitewrapper[] = TRUSTED_BINARY; - -- // ...fail -- fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); -- return EXIT_FAILURE; -+ argv[0] = "x2gosqlitewrapper.pl"; -+ // execute the script, running with user-rights of this binary -+ execv(x2gosqlitewrapper, argv); - - } --- -1.7.9.5 - diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index caacdcfeb..6d97546ee 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92536 2013-06-07 19:48:55Z jelle $ +# $Id: PKGBUILD 92801 2013-06-15 11:25:47Z 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.34 +pkgver=0.9.35 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('ce3e37758c2c0e85d940ff4b141b243f' +md5sums=('070aa5c1da33fb2ba9a2c0150d7a55c5' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 819bb02ce..89ed6edf3 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 188552 2013-06-15 11:11:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') pkgver=4.10.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kde' 'kdenetwork') makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' - 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') + 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' @@ -48,7 +48,7 @@ build() { package_kdenetwork-kopete-libre() { pkgdesc='Instant Messenger, without skype support' depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' - 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') + 'libidn' 'qimageblitz' 'libgadu') conflicts=('kdenetwork-kopete') provides=("kdenetwork-kopete=${pkgver}") replaces=('kdenetwork-kopete') |