diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/glade/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/ifplugd/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/ifplugd/ifplugd | 6 | ||||
-rw-r--r-- | extra/nautilus/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/nautilus/samba-crash.patch | 32 | ||||
-rw-r--r-- | extra/pidgin/PKGBUILD | 30 |
6 files changed, 58 insertions, 33 deletions
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 40b2f5361..af7b9d00e 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156788 2012-04-23 09:05:39Z ibiru $ +# $Id: PKGBUILD 158695 2012-05-07 14:01:07Z ibiru $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade -pkgver=3.12.0 +pkgver=3.12.1 pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=('!libtool') url="http://glade.gnome.org/" install=glade.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('70a820a0007fa3ed7761c92b011fe35ac1532038cab2f9ab30f4d29d5799d44d') +sha256sums=('27e89fb743adb9996c418aa70cde8ce3c0769103f3691cc8011e6c6846600e76') build() { cd "$pkgname-$pkgver" diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD index cde1a503b..420bf90d5 100644 --- a/extra/ifplugd/PKGBUILD +++ b/extra/ifplugd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157472 2012-04-28 18:54:17Z dreisner $ +# $Id: PKGBUILD 158689 2012-05-07 09:54:25Z dreisner $ # Contributor: Manolis Tzanidakis # Contributor: kevin <kevin@archlinux.org> # Maintainer: pkgname=ifplugd pkgver=0.28 -pkgrel=10 +pkgrel=11 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal." arch=('i686' 'x86_64') url="http://0pointer.de/lennart/projects/ifplugd" @@ -15,7 +15,7 @@ backup=('etc/ifplugd/ifplugd.conf' 'etc/ifplugd/ifplugd.action') options=('!makeflags') source=($url/${pkgname}-${pkgver}.tar.gz 'ifplugd' 'ifplugd.action' 'ifplugd-0.28-interface.patch' 'ifdown.01-route.sh' 'ifup.01-route.sh' 'ifup.02-ntpdate.sh') md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' - 'ef27f40434ca85ccaf57a7e388eb001e' + '2281cd3eda9e3403857863e1a1bc00be' '6f98767c4ea2cf0580f73ced81efd21a' '54eb22844b5aeed161c0b80aa9008570' 'd6ce6c7bd481a0b3944c944c5b277c0b' diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd index 667fc1f53..f7c34ade5 100644 --- a/extra/ifplugd/ifplugd +++ b/extra/ifplugd/ifplugd @@ -16,9 +16,11 @@ PID=$(pidof -o %PPID ifplugd) [[ -r $cfg ]] && . "$cfg" # discover interfaces to monitor -# (replacing INTERFACES with net_ifs, since AL +# (replacing INTERFACES with NET_IFS, since AL # already uses it in /etc/rc.conf) -if [[ -z $net_ifs ]]; then +if [[ $NET_IFS ]]; then + net_ifs=($NET_IFS) +else net_ifs=(/sys/class/net/!(lo)) net_ifs=("${net_ifs[@]##*/}") fi diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index d3df231ed..fa79432d3 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156938 2012-04-23 09:09:28Z ibiru $ +# $Id: PKGBUILD 158697 2012-05-07 15:42:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME file manager" arch=('i686' 'x86_64') license=('GPL') @@ -13,11 +13,14 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + samba-crash.patch) +sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d' + 'e437ced7bbebe49d2454b4daecd10cff39d1c427e9631fe0fe5325072ed6aefd') build() { cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/samba-crash.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nautilus \ diff --git a/extra/nautilus/samba-crash.patch b/extra/nautilus/samba-crash.patch new file mode 100644 index 000000000..b10d39008 --- /dev/null +++ b/extra/nautilus/samba-crash.patch @@ -0,0 +1,32 @@ +From 4e59e4cfc7bc68534664d9f72d0c7ea680b79db3 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi <cosimoc@gnome.org> +Date: Fri, 04 May 2012 18:38:43 +0000 +Subject: places-sidebar: don't double unref GMount objects + +Fixes a lot of reported crashers with NFS/Samba volumes. + +https://bugzilla.gnome.org/show_bug.cgi?id=674659 +--- +diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c +index 61f3658..672a4b0 100644 +--- a/src/nautilus-places-sidebar.c ++++ b/src/nautilus-places-sidebar.c +@@ -774,7 +774,7 @@ update_places (NautilusPlacesSidebar *sidebar) + root = g_mount_get_default_location (mount); + + if (!g_file_is_native (root)) { +- network_mounts = g_list_prepend (network_mounts, g_object_ref (mount)); ++ network_mounts = g_list_prepend (network_mounts, mount); + continue; + } + +@@ -856,7 +856,6 @@ update_places (NautilusPlacesSidebar *sidebar) + name, icon, mount_uri, + NULL, NULL, mount, 0, tooltip); + g_object_unref (root); +- g_object_unref (mount); + g_object_unref (icon); + g_free (name); + g_free (mount_uri); +-- +cgit v0.9.0.2 diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 29d04ce3b..7f8df9a63 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156957 2012-04-23 09:10:00Z ibiru $ +# $Id: PKGBUILD 158683 2012-05-07 06:27:02Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.3 -pkgrel=2 +pkgver=2.10.4 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -16,21 +16,12 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - port-to-farstream-v3.patch) -sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b' - '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e') build() { cd "$srcdir/$pkgname-$pkgver" - # Apply patch for farsight -> farstream transition - # http://developer.pidgin.im/ticket/14936 - patch -Np1 -i "$srcdir/port-to-farstream-v3.patch" - - # The farstream patch changes configure.ac - autoreconf -vi - # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -54,9 +45,7 @@ package_pidgin(){ depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' 'gstreamer0.10' 'hicolor-icon-theme') optdepends=('aspell: for spelling correction' - 'ca-certificates: SSL CA certificates' - 'gstreamer0.10-good-plugins: video and voice support' - 'tk: Tcl/Tk scripting support') + 'gstreamer0.10-good-plugins: video and voice support') install=pidgin.install cd "$srcdir/pidgin-$pkgver" @@ -79,7 +68,9 @@ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' - 'dbus-python: for purple-remote and purple-url-handler') + 'ca-certificates: SSL CA certificates' + 'dbus-python: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') cd "$srcdir/pidgin-$pkgver" @@ -91,9 +82,6 @@ package_libpurple(){ package_finch(){ pkgdesc="A ncurses-based messaging client" depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'tk: Tcl/Tk scripting support') cd "$srcdir/pidgin-$pkgver" |