diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
commit | 66e4c91d4531eef5adcd9dbe4a71e63c9b72cd7e (patch) | |
tree | 19e3e26a15f15fc8405ba2016fe9d4cc19919833 /community/seahorse-nautilus | |
parent | c646bdd97c63b2d81bc27060203fabfebabda716 (diff) | |
parent | c84b2cd310f86dc50c4f52a5907cb17652e8c87c (diff) |
Merged upstream, mesa needs revision
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gigi/PKGBUILD
community-staging/lxdm/PKGBUILD
community-staging/lxdm/lxdm-pam
community-staging/lxdm/lxdm.install
community-staging/lxdm/service
community-testing/gigi/PKGBUILD
community/calf/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/prboom/PKGBUILD
community/scorched3d/PKGBUILD
community/tmux/PKGBUILD
community/torcs/PKGBUILD
core/curl/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/akonadi/PKGBUILD
extra/bzflag/PKGBUILD
extra/dhcp/PKGBUILD
extra/ftgl/PKGBUILD
extra/gcin/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
extra/python-telepathy/PKGBUILD
extra/qtiplot/PKGBUILD
extra/ruby/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-sqlite/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
staging/calligra/PKGBUILD
staging/inkscape/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdebase-workspace/kde-np.pam
staging/kdebase-workspace/kde.pam
staging/kdebase-workspace/kdm.service
staging/libreoffice/PKGBUILD
staging/libreoffice/libreoffice-common.csh
staging/libreoffice/libreoffice-common.sh
staging/poppler/PKGBUILD
testing/dbus-python/PKGBUILD
testing/e2fsprogs/PKGBUILD
testing/iproute2/PKGBUILD
testing/iptables/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kde-np.pam
testing/kdebase-workspace/kde.pam
testing/kdebindings-python/PKGBUILD
testing/lvm2/PKGBUILD
testing/lvm2/lvm-on-crypt.service
testing/lvm2/lvm.service
testing/miro/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/ppp/PKGBUILD
testing/ppp/ip-down
testing/pyqt/PKGBUILD
testing/qscintilla/PKGBUILD
testing/sip/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/util-linux/PKGBUILD
testing/wpa_supplicant/PKGBUILD
testing/wpa_supplicant/config
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/seahorse-nautilus')
-rw-r--r-- | community/seahorse-nautilus/PKGBUILD | 15 | ||||
-rw-r--r-- | community/seahorse-nautilus/fix-schema.patch | 20 | ||||
-rw-r--r-- | community/seahorse-nautilus/seahorse-nautilus.install | 1 |
3 files changed, 30 insertions, 6 deletions
diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD index dae741987..efe700478 100644 --- a/community/seahorse-nautilus/PKGBUILD +++ b/community/seahorse-nautilus/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 69331 2012-04-14 01:17:42Z bgyorgy $ +# $Id: PKGBUILD 77770 2012-10-14 16:18:22Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=seahorse-nautilus -pkgver=3.4.0 +pkgver=3.6.0 pkgrel=1 pkgdesc="PGP encryption and signing for nautilus" arch=('i686' 'x86_64' 'mips64el') url="http://git.gnome.org/browse/seahorse-nautilus/" license=('GPL') -depends=('gconf' 'libcryptui' 'nautilus') +depends=('libcryptui' 'gcr' 'nautilus') makedepends=('intltool') replaces=('seahorse-plugins') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4724438b8c09d5c25c30a304cbc398950d5a2fdd1e2ef3f6389ffbf18ac01480') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fix-schema.patch) +sha256sums=('edae97cf7bab38ed928e25a7805913977f892ec9b9120783d874cda07912519d' + '3c5a3fe557fc56d5d5cda12d4b4909f513260da9b439d8bbaca2bf42b4fd114c') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-schema.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + --disable-static --disable-schemas-compile make } diff --git a/community/seahorse-nautilus/fix-schema.patch b/community/seahorse-nautilus/fix-schema.patch new file mode 100644 index 000000000..cd68e7a7f --- /dev/null +++ b/community/seahorse-nautilus/fix-schema.patch @@ -0,0 +1,20 @@ +From 8f48809c0fb6633bb45eac2144c1125f79933053 Mon Sep 17 00:00:00 2001 +From: Stef Walter <stefw@gnome.org> +Date: Mon, 01 Oct 2012 08:15:13 +0000 +Subject: Fix the schema identifier for GSettings window settings + +https://bugzilla.gnome.org/show_bug.cgi?id=685124 +--- +diff --git a/data/org.gnome.seahorse.nautilus.window.gschema.xml b/data/org.gnome.seahorse.nautilus.window.gschema.xml +index 9263a25..89f49f1 100644 +--- a/data/org.gnome.seahorse.nautilus.window.gschema.xml ++++ b/data/org.gnome.seahorse.nautilus.window.gschema.xml +@@ -1,5 +1,5 @@ + <schemalist> +- <schema id="org.gnome.seahorse.window"> ++ <schema id="org.gnome.seahorse.nautilus.window"> + <key name="width" type="i"> + <default>-1</default> + <summary>Width of the window</summary> +-- +cgit v0.9.0.2 diff --git a/community/seahorse-nautilus/seahorse-nautilus.install b/community/seahorse-nautilus/seahorse-nautilus.install index 2eaa60550..21f12fbda 100644 --- a/community/seahorse-nautilus/seahorse-nautilus.install +++ b/community/seahorse-nautilus/seahorse-nautilus.install @@ -1,4 +1,5 @@ post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q } |