diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-15 01:03:16 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-15 01:03:16 -0700 |
| commit | 5d8af7c82b707f4cbda87bb0538fef84daf3791b (patch) | |
| tree | 9db9400005dcee2e2ca264794e32c22efc39a3ac /extra | |
| parent | d053938d834e74b0c881c12a5cb240ad4bab0d9b (diff) | |
Tue Oct 15 01:02:49 PDT 2013
Diffstat (limited to 'extra')
27 files changed, 180 insertions, 199 deletions
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 2274f74c5..201b385da 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196016 2013-10-07 11:50:29Z jgc $ +# $Id: PKGBUILD 196511 2013-10-14 15:43:43Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.10.0 +pkgver=2.10.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('dbus' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db') +sha256sums=('349b7ad5e6a8eebbf88aaefcb67a0f49b025dbcdf6ad646978faf2ca84650119') build() { cd $pkgname-$pkgver diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index 53f1590ab..8e98e8df6 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196020 2013-10-07 11:50:34Z jgc $ +# $Id: PKGBUILD 196508 2013-10-14 15:42:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('eb0d8ba5211a4fe804d540e16a7fb61f16c467e23b106370723c32731b6e620b') +sha256sums=('ff2e89921eb6a1eec38b4cde69ee8d0dd48ebeb821715e0080f94aa4c1064cc4') build() { cd $pkgname-$pkgver diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index 7d20a28e2..4bef7ace9 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191838 2013-07-31 09:34:14Z ioni $ +# $Id: PKGBUILD 196482 2013-10-14 09:30:29Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> @@ -6,9 +6,9 @@ # Contributor: Marco Crosio <marco.crosio@gmail.com> pkgname=eclipse -pkgver=4.3 +pkgver=4.3.1 pkgrel=1 -_date=201306052000 +_date=201309111000 pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64') url="http://eclipse.org" @@ -18,12 +18,12 @@ makedepends=('zip') license=("EPL/1.1") source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz" 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg') -md5sums=('8046626198b529c2e292022c39c18262' +md5sums=('04880311281ff9de71a7d1def630b29e' '7ea99a30fbaf06ec29261541b8eb1e23' 'ba2cf02c48e6e35bfe3685401c26bb5b' '77cff7543ccf7e177cb6667f5a20ce19') [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='8dba840856c5ca38b3c08ebac9a47cb8' +[ "$CARCH" = "x86_64" ] && md5sums[0]='61e44d550751d3b176fbe56dd0f75060' package() { # install eclipse @@ -32,7 +32,7 @@ package() { # install misc install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \ - $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps + $pkgdir/usr/share/icons/hicolor/apps install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse" install -m644 eclipse.desktop "$pkgdir/usr/share/applications/" # install icon diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 5c268a4b6..6cd1144a0 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196028 2013-10-07 11:50:41Z jgc $ +# $Id: PKGBUILD 196526 2013-10-14 18:16:20Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=(i686 x86_64) @@ -19,7 +19,7 @@ options=('!libtool' '!makeflags') groups=(gnome) install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f') +sha256sums=('a5d96f1a408613b885fc254d8b6f33fceae01e212d2370cc77444d66fa945054') build() { cd $pkgname-$pkgver diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index db238481b..c647748a1 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191825 2013-07-31 08:49:27Z ioni $ +# $Id: PKGBUILD 196480 2013-10-14 08:50:55Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.10 +pkgver=3.11 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('d1930df6e70a5204e8154a9911992be4') +md5sums=('5f3a0ed1b3510ca0695db0b4debdd292') build() { cd $pkgname-$pkgver diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index a43d476b6..eda892b1b 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196044 2013-10-07 11:51:01Z jgc $ +# $Id: PKGBUILD 196527 2013-10-14 18:17:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4c20049ccee2198468edaf20fba9dbd44e3baf50bd304700b4f24257571cdca5') +sha256sums=('2d2e931661c2c2f9ea76cb581fe0eb09d65925b06a57ee7e20cbecb49474cab7') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index 6d1e47b04..e7cd71d07 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196390 2013-10-12 16:54:13Z heftig $ +# $Id: PKGBUILD 196449 2013-10-14 00:53:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.10.1 +pkgver=3.10.1.1 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ options=('!emptydirs' '!libtool') install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6541db85d2ca5b843fce61bd3be9c08733cf456c6fdf9bbc02ad78d043ca71fd') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('abdee96eaf56689c4c2bd78cd115a0e30d302e16a8f42dfcb39520c9a33c6eec') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 7ba591dad..e445fb950 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196054 2013-10-07 11:51:16Z jgc $ +# $Id: PKGBUILD 196487 2013-10-14 11:53:01Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('95e27198fb6c7d45918d1a47a440ed5af0c65bbe2ec53fb8898d4c00c7dc8f00') +sha256sums=('2944627f4166aaac08ba9d73614cbd79eba93573bd7d32e17a12082e30fb1399') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-music/PKGBUILD b/extra/gnome-music/PKGBUILD index 409f8ebb0..bc54efe94 100644 --- a/extra/gnome-music/PKGBUILD +++ b/extra/gnome-music/PKGBUILD @@ -1,19 +1,19 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-music -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="Music player and management application" arch=(i686 x86_64) license=('GPL') url="https://wiki.gnome.org/Apps/Music" -depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib) +depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib gnome-icon-theme gnome-themes-standard gtk3 gvfs tracker python-gobject) makedepends=(intltool) options=('!libtool') groups=('gnome-extra') install=gnome-music.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('16ecbb93f4e69a7e85b86fc73413744073d69edaa09e71e135afe2c8de5b1d69') +sha256sums=('3b75643e8a6e4d9b44b2572f0ddecfa0ec32affd9172c43a4bec909d15ac9d7c') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-music/gnome-music.install b/extra/gnome-music/gnome-music.install index 2b172e29c..c0ed9a0d7 100644 --- a/extra/gnome-music/gnome-music.install +++ b/extra/gnome-music/gnome-music.install @@ -1,6 +1,5 @@ post_install() { glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD index a2a51b53b..be3f2c4bb 100644 --- a/extra/gnome-photos/PKGBUILD +++ b/extra/gnome-photos/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196072 2013-10-07 11:51:43Z jgc $ +# $Id: PKGBUILD 196501 2013-10-14 14:05:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-photos -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Access, organize, and share your photos on GNOME" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=(!libtool) groups=(gnome-extra) install=gnome-photos.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('65cb5790ec5a282c8bc8b4902858a0b4b3cec2fe39709a580dc073a23a5fc210') +sha256sums=('40129310635fc5939e5c95616c2ea2042f30f0eef5e0c8cdd21aa0e7ff7c7085') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index b24a9c7ee..9e272cde5 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196073 2013-10-07 11:51:45Z jgc $ +# $Id: PKGBUILD 196489 2013-10-14 11:54:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="System power information and statistics" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(intltool) options=(!emptydirs) install=gnome-power-manager.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e193f7b6c813acab2d57eefec783d267b26d114c2185ffe41334000c65f76841') +sha256sums=('71c79a2f74ca076153a4f2a5dfc28a1dcb9179722108644421033780950595e2') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-python-desktop/01_wnck_enums.patch b/extra/gnome-python-desktop/01_wnck_enums.patch new file mode 100644 index 000000000..512b702df --- /dev/null +++ b/extra/gnome-python-desktop/01_wnck_enums.patch @@ -0,0 +1,32 @@ +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=630063 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597414 + +--- a/wnck/wnck.defs ++++ b/wnck/wnck.defs +@@ -100,7 +100,7 @@ + ) + ) + +-(define-enum WindowState ++(define-flags WindowState + (in-module "Wnck") + (c-name "WnckWindowState") + (gtype-id "WNCK_TYPE_WINDOW_STATE") +@@ -121,7 +121,7 @@ + ) + ) + +-(define-enum WindowActions ++(define-flags WindowActions + (in-module "Wnck") + (c-name "WnckWindowActions") + (gtype-id "WNCK_TYPE_WINDOW_ACTIONS") +@@ -184,7 +184,7 @@ + ) + ) + +-(define-enum WindowMoveResizeMask ++(define-flags WindowMoveResizeMask + (in-module "Wnck") + (c-name "WnckWindowMoveResizeMask") + (gtype-id "WNCK_TYPE_WINDOW_MOVE_RESIZE_MASK") diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index ab07d1d88..fd0ea9a27 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,34 +1,38 @@ -# $Id: PKGBUILD 196074 2013-10-07 11:51:47Z jgc $ +# $Id: PKGBUILD 196474 2013-10-14 07:42:40Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgbase=gnome-python-desktop -pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') +pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') pkgver=2.32.0 -pkgrel=13 +pkgrel=14 arch=(i686 x86_64) license=('GPL' 'LGPL') options=('!libtool') -makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck') +makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'librsvg' 'libwnck') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2 - gnome-python-desktop-2.32.0-metacity-build.patch) + 01_wnck_enums.patch) sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9' - 'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3') + 'bb51a303bc745f13f9386c734c0467267a19cb193c330eff0b7d39aad0edb1c1') + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../01_wnck_enums.patch +} build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity + cd $pkgbase-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-metacity make } package_gnome-python-desktop() { - depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python') + depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python') pkgdesc="Python bindings for the GNOME desktop environment" - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make install-pkgconfigDATA DESTDIR="${pkgdir}" } @@ -38,7 +42,7 @@ package_python2-gnomedesktop() { conflicts=('python-gnomedesktop<=2.32.0-10') replaces=('python-gnomedesktop<=2.32.0-10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make -C gnomedesktop install DESTDIR="${pkgdir}" } @@ -48,7 +52,7 @@ package_python2-gnomekeyring() { conflicts=('python-gnomekeyring<=2.32.0-10') replaces=('python-gnomekeyring<=2.32.0-10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make -C gnomekeyring install DESTDIR="${pkgdir}" } @@ -58,27 +62,17 @@ package_python2-gtop() { conflicts=('python-gtop<=2.32.0-10') replaces=('python-gtop<=2.32.0-10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make -C gtop install DESTDIR="${pkgdir}" } -package_python2-metacity() { - depends=('pygtk' 'metacity') - pkgdesc="Python bindings for metacity" - conflicts=('python-metacity<=2.32.0-10') - replaces=('python-metacity<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C metacity install DESTDIR="${pkgdir}" -} - package_python2-rsvg() { depends=('pygtk' 'librsvg') pkgdesc="Python bindings for librsvg" conflicts=('python-rsvg<=2.32.0-10') replaces=('python-rsvg<=2.32.0-10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make -C rsvg install DESTDIR="${pkgdir}" install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" @@ -90,7 +84,7 @@ package_python2-totem-plparser() { conflicts=('python-totem-plparser<=2.32.0-10') replaces=('python-totem-plparser<=2.32.0-10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make -C totem install DESTDIR="${pkgdir}" install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" @@ -102,6 +96,6 @@ package_python2-wnck() { conflicts=('python-wnck<=2.32.0-10') replaces=('python-wnck<=2.32.0-10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make -C wnck install DESTDIR="${pkgdir}" } diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 1c0b3a1bc..72f23163e 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187860 2013-06-07 09:24:56Z tomegun $ +# $Id: PKGBUILD 196497 2013-10-14 13:18:42Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=gpsd pkgver=3.9 -pkgrel=3 +pkgrel=4 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') url="http://catb.org/gpsd/" @@ -33,9 +33,10 @@ build() { gpscat gpsfake gpsprof xgps xgpsspeed scons prefix=/usr \ - systemd=yes \ - libQgpsmm=no \ - PYTHONPATH=/usr/bin/python2 + systemd=yes \ + libQgpsmm=no \ + gpsd_group=uucp \ + PYTHONPATH=/usr/bin/python2 scons build } diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 83eed102c..9482ca348 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 194533 2013-09-17 17:04:18Z bisson $ +# $Id: PKGBUILD 196467 2013-10-14 07:09:39Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz -pkgver=2.32.0 -pkgrel=2 +pkgver=2.34.0 +pkgrel=1 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('CPL') arch=('i686' 'x86_64') depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') -makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt4') +makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4') optdepends=('mono: sharp bindings' 'guile: guile bindings' 'lua51: lua bindings' @@ -20,11 +20,10 @@ optdepends=('mono: sharp bindings' 'php: php bindings' 'python2: python bindings' 'r: r bindings' - 'ruby: ruby bindings' 'tcl: tcl bindings' 'qt4: gvedit') source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a64f4a409012d13d18338ecb8bd7253083ebc35e') +sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441') options=('!libtool') install=install @@ -32,15 +31,6 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed \ - -e 's: qw(\([^)]*\)): (qw(\1)):g' \ - -i config/config_perl.pl - sed \ - -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ - -e '/CONFIG/s:site:vendor:' \ - -i config/config_ruby.rb - sed \ - -e 's:guile-1.8:guile-2.0:g' \ - -e 's:ruby-1.9:ruby-2.0:g' \ -e '/LIBPOSTFIX="64"/d' \ -i configure } @@ -50,8 +40,7 @@ build() { export PYTHON=python2 export LUA=lua5.1 - ./configure --prefix=/usr --with-cgraph=no - make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky + ./configure --prefix=/usr make } diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 2c90fad85..ccbd7bef8 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196105 2013-10-07 11:52:37Z jgc $ +# $Id: PKGBUILD 196525 2013-10-14 18:14:27Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('5208afa6edccf4d70a30ed1da399cefcceb8a8b879305d491be4be3e3d6ef776') +sha256sums=('38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 2ef3a22e8..2c29975ad 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196150 2013-10-07 11:53:48Z jgc $ +# $Id: PKGBUILD 196488 2013-10-14 11:53:46Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 arch=(i686 x86_64) url="https://live.gnome.org/PyGObject" @@ -11,7 +11,7 @@ license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077') +sha256sums=('87a4d3de4b8ea30a1290229f62092aeb0b77e6b21ca6588bb4704e05fd750837') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/pyxml/PKGBUILD b/extra/pyxml/PKGBUILD deleted file mode 100644 index b81767462..000000000 --- a/extra/pyxml/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 165447 2012-08-19 17:09:13Z jgc $ -# Maintainer: -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=pyxml -pkgver=0.8.4 -pkgrel=10 -pkgdesc="Python XML parsing library" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/pyxml/" -license=('custom') -depends=('python2') -source=("http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-${pkgver}.tar.gz" - 'fix-python2.6.patch' - 'foreigncharsfix.patch') -md5sums=('1f7655050cebbb664db976405fdba209' - '4b652e0c866e3cca7e2386e8e383d5ba' - 'c9c54fdf0f7d1515a3b7aa34b01d1c46') - -build() { - cd "${srcdir}/PyXML-${pkgver}" - - patch -Np1 -i "${srcdir}/fix-python2.6.patch" - - # as warranted by eric (the python IDE) - patch -Np1 -i "${srcdir}/foreigncharsfix.patch" - - python2 setup.py build -} - -package() { - cd "${srcdir}/PyXML-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - sed -e 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/ext/c14n.py - sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/html/GenerateHtml.py -} diff --git a/extra/pyxml/fix-python2.6.patch b/extra/pyxml/fix-python2.6.patch deleted file mode 100644 index 7bf1c46fc..000000000 --- a/extra/pyxml/fix-python2.6.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 -@@ -24,8 +24,8 @@ - self._rel = rel - nt = ParsedNodeTest.ParsedNodeTest('node', '') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._step = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._step = ParsedStep.ParsedStep(asp, nt, ppl) - return - - def evaluate(self, context): -diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 -@@ -28,8 +28,8 @@ - self._right = right - nt = ParsedNodeTest.ParsedNodeTest('node','') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._middle = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) - - def evaluate(self, context): - res = [] diff --git a/extra/pyxml/foreigncharsfix.patch b/extra/pyxml/foreigncharsfix.patch deleted file mode 100644 index 024d4472d..000000000 --- a/extra/pyxml/foreigncharsfix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py ---- PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:27:53.936666669 +0800 -+++ PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:30:39.230000003 +0800 -@@ -720,6 +720,7 @@ - # to the recoding. - try: - self.data = self.charset_converter(self.data) -+ self.datasize = len(self.data) - except UnicodeError, e: - self._handle_decoding_error(self.data, e) - self.input_encoding = enc1 diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 9aba39b0e..62154e81a 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191650 2013-07-29 07:23:54Z andrea $ +# $Id: PKGBUILD 196523 2013-10-14 18:08:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.3.2 +pkgver=2.3.3 pkgrel=1 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' @@ -12,19 +12,28 @@ depends=('qt4' 'systemd' 'gstreamer0.10-base') makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') _qtver=4.8.5 -source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}" +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz" "http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz" 'use-python2.patch' + 'bison3.patch' 'qwebview.patch') -sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c' +sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f' '745f9ebf091696c0d5403ce691dc28c039d77b9e' '315b6ff603f35e5492a036f7082f6aa075dfb607' - 'ef467fcfc9e74aa88356f27acc21792706ed1e4d') - -build() { - cd webkit-qtwebkit-23 + 'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2' + '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667') +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/use-python2.patch + patch -p1 -i "${srcdir}"/bison3.patch + + cd ../qt-everywhere-opensource-src-${_qtver} + patch -p1 -i "${srcdir}"/qwebview.patch +} + +build() { + cd ${pkgname}-${pkgver} OPTS="--no-webkit2" if [ "${CARCH}" = "i686" ]; then @@ -40,15 +49,13 @@ build() { ${OPTS} # Build the QWebView plugin (FS#27914) - cd ../qt-everywhere-opensource-src-${_qtver} - patch -p1 -i "${srcdir}"/qwebview.patch - cd tools/designer/src/plugins/qwebview + cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview qmake-qt4 make } package() { - cd webkit-qtwebkit-23 + cd ${pkgname}-${pkgver} make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview diff --git a/extra/qtwebkit/bison3.patch b/extra/qtwebkit/bison3.patch new file mode 100644 index 000000000..4070c88e8 --- /dev/null +++ b/extra/qtwebkit/bison3.patch @@ -0,0 +1,38 @@ +From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Fri, 16 Aug 2013 18:27:07 +0200 +Subject: [PATCH] ANGLE doesn't build with bison 3.0 + +https://bugs.webkit.org/show_bug.cgi?id=119798 + +Reviewed by Antti Koivisto. + +Make glslang.y compatible with bison 3.0 +by using %lex-param to set YYLEX_PARAM. + +* src/compiler/glslang.y: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +Task-number: QTBUG-32913 +Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3 +Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +--- + Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +index 3cad335..b41e95a 100644 +--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y ++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). + %expect 1 /* One shift reduce conflict because of if | else */ + %pure-parser + %parse-param {TParseContext* context} ++%lex-param {YYLEX_PARAM} + + %union { + struct { +-- +1.7.1 + diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch index 98f6f0f03..3788e0bff 100644 --- a/extra/qtwebkit/qwebview.patch +++ b/extra/qtwebkit/qwebview.patch @@ -1,8 +1,8 @@ --- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 +++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 @@ -1,3 +1,6 @@ -+INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include -+LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib ++INCLUDEPATH += ../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/include ++LIBS += -L../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/lib + CONFIG += designer win32|mac: CONFIG+= debug_and_release diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 435b40215..ce8b66dd8 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196134 2013-10-07 11:53:25Z jgc $ +# $Id: PKGBUILD 196490 2013-10-14 11:55:08Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.20.0 +pkgver=0.20.1 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=(i686 x86_64) @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f695bae2c20b911393f7abf265c18f3c5a5c42fe4223fc9150ab9007558363fe') +sha256sums=('00792c8db8f5ca0cb655ab00d90bec6f90e2a4b505f10faf03924800285a7ec3') build() { cd $pkgname-$pkgver diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index f3f45fbc9..dd42b444f 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 196144 2013-10-07 11:53:40Z jgc $ +# $Id: PKGBUILD 196509 2013-10-14 15:43:03Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=(i686 x86_64) license=(GPL) @@ -16,16 +16,16 @@ depends=(libsecret gtk-vnc vte3 telepathy-glib avahi desktop-file-utils dconf sh gnome-icon-theme spice-gtk3) optdepends=('openssh: SSH plugin' 'freerdp: RDP plugin') -makedepends=(docbook-xsl intltool freerdp openssh itstool) +makedepends=(docbook-xsl intltool freerdp openssh itstool spice-protocol) groups=(gnome-extra) options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d90ca19d1075149d044a58274016bb3976b2201774ae079d661fd7c3859a1900') +sha256sums=('ea8cc79e227148359d3582ff121dab864913eb1dfcba6458e11da32d4dfec503') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/$pkgname --enable-rdp + --libexecdir=/usr/lib/$pkgname --enable-rdp --enable-spice make } diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index f88ebec9c..1861cab1f 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196145 2013-10-07 11:53:41Z jgc $ +# $Id: PKGBUILD 196510 2013-10-14 15:43:19Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=(i686 x86_64) @@ -15,7 +15,7 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('927b71eaafc5ac4c6e098fb9ff0164899eae3ca599a32f5d18897a02b4be1fdd') +sha256sums=('faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46') build() { cd $pkgname-$pkgver |