diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-06 11:43:14 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-06 11:43:14 +0200 |
| commit | 601a559448eb957ac98aca7a6e03de59e45fff91 (patch) | |
| tree | 13fc71216622c3d764aa611b6a54e1918f21c496 /extra/gnome-shell | |
| parent | c96a7351e1f295c1e311860dec19ac7b506b0c5c (diff) | |
| parent | f37e773fe397778858ea8d51601554863c252536 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/rtorrent/PKGBUILD
core/libcap/PKGBUILD
extra/samba/PKGBUILD
extra/systemd/PKGBUILD
extra/usbmuxd/PKGBUILD
testing/glib2/PKGBUILD
Diffstat (limited to 'extra/gnome-shell')
| -rw-r--r-- | extra/gnome-shell/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/gnome-shell/recorder.patch | 28 |
2 files changed, 35 insertions, 4 deletions
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 3e9294262..bd21ffc66 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157397 2012-04-28 09:26:38Z allan $ +# $Id: PKGBUILD 158538 2012-05-04 12:58:08Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeShell" @@ -15,11 +15,14 @@ optdepends=('network-manager-applet: shell integration for networkmanager') options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + recorder.patch) +sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9' + 'b00589e867c0ae63b47982145cb4ab366afec84a568e66867f51fa8da13027f1') build() { cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/recorder.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ diff --git a/extra/gnome-shell/recorder.patch b/extra/gnome-shell/recorder.patch new file mode 100644 index 000000000..41134a31a --- /dev/null +++ b/extra/gnome-shell/recorder.patch @@ -0,0 +1,28 @@ +From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Wed, 02 May 2012 14:44:40 +0000 +Subject: main: Close the recorder instead of pausing it + +Pausing means that we will continue to use the same output file when +the keybinding is activated again. While useful to record a single +video in chunks, it doesn't seem to be how most users understand the +keybinding. Closing the recorder will close the file and create a new +one the next time the keybinding is pressed. + +https://bugzilla.gnome.org/show_bug.cgi?id=675128 +--- +diff --git a/js/ui/main.js b/js/ui/main.js +index 3b80297..25ad8d8 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -110,7 +110,7 @@ function _initRecorder() { + } + + if (recorder.is_recording()) { +- recorder.pause(); ++ recorder.close(); + Meta.enable_unredirect_for_screen(global.screen); + } else { + // read the parameters from GSettings always in case they have changed +-- +cgit v0.9.0.2 |