From 0bf564cf7a3d99207457267c75f92ceb67197537 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Feb 2013 00:04:52 -0800 Subject: Thu Feb 14 00:04:51 PST 2013 --- extra/feh/PKGBUILD | 8 ++-- extra/fluxbox/PKGBUILD | 6 +-- extra/gnome-shell/PKGBUILD | 13 +++--- extra/leveldb/PKGBUILD | 11 ++--- extra/mutter/PKGBUILD | 6 +-- extra/oxygen-gtk2/PKGBUILD | 16 +++----- extra/oxygen-gtk2/fix-regression.patch | 48 ---------------------- extra/pidgin/PKGBUILD | 8 ++-- extra/snappy/PKGBUILD | 8 ++-- extra/system-config-printer/PKGBUILD | 13 ++++-- .../fix-typo-in-service.patch | 18 ++++++++ extra/xf86-video-intel/PKGBUILD | 6 +-- extra/xorg-xrandr/PKGBUILD | 6 +-- 13 files changed, 67 insertions(+), 100 deletions(-) delete mode 100644 extra/oxygen-gtk2/fix-regression.patch create mode 100644 extra/system-config-printer/fix-typo-in-service.patch (limited to 'extra') diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 1d0160666..af54cc2ed 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 175213 2013-01-16 21:13:09Z bisson $ +# $Id: PKGBUILD 178006 2013-02-13 12:35:32Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andrea Scarpino # Contributor: dorphell # Contributor: Tom Newsom pkgname=feh -pkgver=2.8 -pkgrel=2 +pkgver=2.9 +pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' license=('custom:MIT') @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('eeb251d5971cf07e632661ef0b514fc3b0c7aca6') +sha1sums=('efaeb598bd613f20b010c8f9c8a301e6878e2d9d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD index 1f3bec017..5dd7836db 100644 --- a/extra/fluxbox/PKGBUILD +++ b/extra/fluxbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 177926 2013-02-11 02:54:48Z eric $ +# $Id: PKGBUILD 178032 2013-02-13 22:22:13Z eric $ # Maintainer: Eric Bélanger pkgname=fluxbox -pkgver=1.3.4 +pkgver=1.3.5 pkgrel=1 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu util options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ fluxbox.desktop) -sha1sums=('8a4f0d79238609523e1127808d9d2eab15030ea0' +sha1sums=('495d82ca428949cc2bc85814898b49cf4624b7cb' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 8889b702d..050867755 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 170877 2012-11-12 21:32:36Z heftig $ +# $Id: PKGBUILD 178025 2013-02-13 18:59:41Z heftig $ # Maintainer: Ionut Biru # Contributor: Flamelab # Contributor: feydaykyn pkgname=leveldb -pkgver=1.7.0 +pkgver=1.9.0 pkgrel=1 pkgdesc="A fast and lightweight key/value database library" arch=('i686' 'x86_64') @@ -11,12 +11,9 @@ url="https://code.google.com/p/leveldb/" license=('BSD') depends=('gperftools' 'snappy') source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('82332ac97d48ad5da02aab4785658c06d0351be1') +sha1sums=('4d832277120912211998a2334fb975b995d51885') build() { - # buildsys doesn't play nicely with -Wl,--as-needed - LDFLAGS=-Wl,-O1,--sort-common,-z,relro - make -C "$pkgname-$pkgver" } @@ -32,7 +29,7 @@ package() { "$pkgdir"/usr/share/doc/"$pkgname" # libraries - install -m755 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a + install -m644 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a cp -P libleveldb.so{,.1} "$pkgdir/usr/lib" # headers diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 9278ba006..6e6a00998 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170875 2012-11-12 21:30:35Z heftig $ +# $Id: PKGBUILD 178030 2013-02-13 22:13:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Ionut Biru # Contributor: Michael Kanis pkgname=mutter -pkgver=3.6.2 +pkgver=3.6.3 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('924f47681c972c3e8da610608c6aef35e61f52b338b5690e5721ed7ef8c2befc') +sha256sums=('aa1d558210d58f9a835a7e718a6b6eb8318ac8fb276c43234c47b1efde755c86') build() { cd "$pkgname-$pkgver" diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index 4c84a7685..160446aa5 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177572 2013-02-07 13:44:31Z andrea $ +# $Id: PKGBUILD 178010 2013-02-13 13:33:05Z andrea $ # Maintainer: Andrea Scarpino # Contributor: birdflesh pkgname=oxygen-gtk2 -pkgver=1.3.2 -pkgrel=2 +pkgver=1.3.2.1 +pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/' @@ -13,16 +13,10 @@ depends=('gtk2') conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'fix-regression.patch') -md5sums=('7c4ecfca330102b7ff50e472a62dfc60' - 'bced3ab820c3eafbb4e40a279d05bff6') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('cc33b2ac08f66d4b70f9c85303d44aad') build() { - cd ${pkgname}-${pkgver}/ - patch -p1 -i "${srcdir}"/fix-regression.patch - cd ../ - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/oxygen-gtk2/fix-regression.patch b/extra/oxygen-gtk2/fix-regression.patch deleted file mode 100644 index 466b53c17..000000000 --- a/extra/oxygen-gtk2/fix-regression.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp -index f2ad1af..9965086 100644 ---- a/src/oxygenqtsettings.cpp -+++ b/src/oxygenqtsettings.cpp -@@ -102,6 +102,9 @@ namespace Oxygen - - const bool forced( flags&Forced ); - -+ // no attempt at initializing if gtk settings is not yet set -+ if( !gtk_settings_get_default() ) return false; -+ - if( _initialized && !forced ) return false; - else if( !forced ) _initialized = true; - -diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp -index ff0666b..a2572b0 100644 ---- a/src/oxygenstylewrapper.cpp -+++ b/src/oxygenstylewrapper.cpp -@@ -3741,6 +3741,10 @@ namespace Oxygen - #endif - - // style initialization -+ /* -+ this is normally achieved in theme_init, but is somehow not working with gnome shell -+ so that it is redone here, since duplication is avoided when initialization is called twice without modifications -+ */ - Style::instance().initialize(); - - // hooks -diff --git a/src/oxygentheme.cpp b/src/oxygentheme.cpp -index 50b04e2..9bc49e1 100644 ---- a/src/oxygentheme.cpp -+++ b/src/oxygentheme.cpp -@@ -52,12 +52,8 @@ void theme_init( GTypeModule* module ) - Oxygen::RCStyle::registerType( module ); - Oxygen::StyleWrapper::registerType( module ); - -- // initialize oxygen here, for XUL applications -- // special care is taken to not initialize everything -- Oxygen::ApplicationName applicationName; -- applicationName.initialize(); -- if( applicationName.isXul() ) -- { Oxygen::Style::instance().initialize( Oxygen::QtSettings::Forced | Oxygen::QtSettings::Colors ); } -+ // style initialization -+ Oxygen::Style::instance().initialize(); - - } - diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 89aed9993..bb43785ee 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174743 2013-01-05 21:41:56Z foutrelis $ +# $Id: PKGBUILD 178012 2013-02-13 16:03:52Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -6,8 +6,8 @@ # Contributor: Lucien Immink pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.6 -pkgrel=4 +pkgver=2.10.7 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -16,7 +16,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96') +sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD index fbd7a1ac5..3e9b287e9 100644 --- a/extra/snappy/PKGBUILD +++ b/extra/snappy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166939 2012-09-22 20:17:43Z dreisner $ +# $Id: PKGBUILD 178016 2013-02-13 16:35:15Z dreisner $ # Maintainer: Dave Reisner # Contributor: Antony Male > pkgname=snappy -pkgver=1.0.5 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc='A fast compressor/decompressor library' arch=('i686' 'x86_64') url="http://code.google.com/p/snappy/" @@ -13,7 +13,7 @@ depends=('glibc' 'gcc-libs') checkdepends=('zlib') options=('!libtool') source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz") -md5sums=('4c0af044e654f5983f4acbf00d1ac236') +md5sums=('c8f3ef29b5281e78f4946b2d739cea4f') build() { cd "$pkgname-$pkgver" diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 0156783e5..5d3794597 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177777 2013-02-08 12:50:50Z andrea $ +# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $ # Maintainer: # Contributor: Andrea Scarpino pkgname=system-config-printer pkgver=1.3.12 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') @@ -15,13 +15,18 @@ makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') conflicts=('system-config-printer-common' 'system-config-printer-gnome') -source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig} + 'fix-typo-in-service.patch') md5sums=('0775647e1c34ef25364de3c178a4ed36' - '1aa2246047b424e2d23473749368b8c6') + '1aa2246047b424e2d23473749368b8c6' + 'd30d14aeb6d2bfeac0679d28704473ec') build() { cd ${pkgname}-${pkgver} + # Fixed upstream + patch -p1 -i "${srcdir}"/fix-typo-in-service.patch + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch new file mode 100644 index 000000000..56f17dcec --- /dev/null +++ b/extra/system-config-printer/fix-typo-in-service.patch @@ -0,0 +1,18 @@ +From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 +From: Tim Waugh +Date: Tue, 23 Oct 2012 13:55:12 +0000 +Subject: Fixed typo in systemd config file. + +--- +diff --git a/udev/configure-printer@.service.in b/udev/configure-printer@.service.in +index 8a20967..5898c79 100644 +--- a/udev/configure-printer@.service.in ++++ b/udev/configure-printer@.service.in +@@ -4,4 +4,4 @@ Requires=cups.socket + After=cups.socket + + [Service] +-ExecStart=@udevhelperdir@/configure-printer add "%i" ++ExecStart=@udevhelperdir@/udev-configure-printer add "%i" +-- +cgit v0.9.1 diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 8ce522b90..81beb4f8e 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176993 2013-02-03 15:42:22Z andyrtr $ +# $Id: PKGBUILD 178020 2013-02-13 16:45:46Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.21.0 +pkgver=2.21.2 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d872adef06cbf1a4434811baad4b8a18feacc6633b59b36557e8d7db7161081c') +sha256sums=('2e6890ecacc715caa5459581b00b63152e08646ea1b76330bf79b996a139d850') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD index a208b1ee3..aedfacecf 100644 --- a/extra/xorg-xrandr/PKGBUILD +++ b/extra/xorg-xrandr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 130753 2011-07-07 22:30:11Z andyrtr $ +# $Id: PKGBUILD 178018 2013-02-13 16:44:53Z andyrtr $ # Maintainer: Jan de Groot pkgname=xorg-xrandr -pkgver=1.3.5 +pkgver=1.4.0 pkgrel=1 pkgdesc="Primitive command line interface to RandR extension" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('libxrandr' 'libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2) -sha1sums=('ef45925d5b0e72c73d21798d65a41d476fdb0d3f') +sha256sums=('a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693') build() { cd "${srcdir}/xrandr-${pkgver}" -- cgit v1.2.3-54-g00ecf