From a247f0004e94d32b5fe69a5123e1c6684d8cf096 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Apr 2013 00:59:18 -0700 Subject: Fri Apr 26 00:59:18 PDT 2013 --- community/cinnamon/PKGBUILD | 26 +++++++--- community/cinnamon/fallback-helpers.patch | 21 ++++++++ community/cinnamon/switch-applications.patch | 55 ++++++++++++++++++++ .../0001-Add-the-GNOME-Flashback-session.patch | 2 +- community/gnome-panel/PKGBUILD | 6 +-- community/gnome-settings-daemon-compat/PKGBUILD | 24 ++++----- .../flashback-rename.patch | 27 ---------- .../move-desktop-file.patch | 60 ++++++++++++++++++++++ .../standalone-background-helper.patch | 4 +- .../standalone-media-keys-helper.patch | 4 +- community/haskell-pcre-light/PKGBUILD | 2 +- community/nginx/PKGBUILD | 6 ++- 12 files changed, 179 insertions(+), 58 deletions(-) create mode 100644 community/cinnamon/fallback-helpers.patch create mode 100644 community/cinnamon/switch-applications.patch delete mode 100644 community/gnome-settings-daemon-compat/flashback-rename.patch create mode 100644 community/gnome-settings-daemon-compat/move-desktop-file.patch (limited to 'community') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index a16839508..cf5e13723 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88709 2013-04-22 00:29:56Z bgyorgy $ +# $Id: PKGBUILD 88934 2013-04-25 02:04:16Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -15,7 +15,7 @@ depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging' - 'python2-pyinotify' 'python2-lxml' 'webkitgtk3') + 'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat') makedepends=('gnome-common' 'intltool') optdepends=('cinnamon-control-center: extended configurations for Cinnamon' 'cinnamon-screensaver: lock screen' @@ -27,11 +27,15 @@ install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" "keyboard_applet.patch" "fix-control-center-check.patch" - "gnome-3.8.patch") + "gnome-3.8.patch" + "switch-applications.patch" + "fallback-helpers.patch") md5sums=('95260dc968ca9be32c265b35df2dd49d' '2b1ece84416c3e4de030be15f1774d82' 'c3f25b06d345d9d36c197cd96e08f496' - 'cf2efbe1a5c48e1be53a0e8e4b7c3181') + 'cf2efbe1a5c48e1be53a0e8e4b7c3181' + '16258907bf51cd8c1569263791ffa620' + 'f7aa8ace9c9543ba2fd66bd530244fed') build() { cd ${srcdir}/linuxmint-Cinnamon* @@ -44,13 +48,19 @@ build() { # Fix Keyboard applet # https://github.com/linuxmint/Cinnamon/issues/1337 - patch -Np1 -i ${srcdir}/keyboard_applet.patch + patch -Np1 -i ../keyboard_applet.patch # Check for the cc-panel path, not for the unneeded binary - patch -Np1 -i ${srcdir}/fix-control-center-check.patch + patch -Np1 -i ../fix-control-center-check.patch # https://github.com/linuxmint/Cinnamon/pull/1888 - patch -Np1 -i ${srcdir}/gnome-3.8.patch + patch -Np1 -i ../gnome-3.8.patch + + # Fix windows switcher keybinding with default settings in GNOME 3.8 + patch -Np1 -i ../switch-applications.patch + + # Start media keys and mount helpers with the session + patch -Np1 -i ../fallback-helpers.patch ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch new file mode 100644 index 000000000..6fe318bd9 --- /dev/null +++ b/community/cinnamon/fallback-helpers.patch @@ -0,0 +1,21 @@ +diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session +--- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon2d.session 2013-04-15 15:55:01.000000000 +0200 ++++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session 2013-04-25 01:30:35.435650613 +0200 +@@ -1,5 +1,5 @@ + [GNOME Session] + Name=Cinnamon 2D +-RequiredComponents=cinnamon2d;gnome-settings-daemon; ++RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; + DesktopName=GNOME + +diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session +--- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session 2013-04-15 15:55:01.000000000 +0200 ++++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session 2013-04-25 01:30:33.645607769 +0200 +@@ -1,6 +1,6 @@ + [GNOME Session] + Name=Cinnamon +-RequiredComponents=cinnamon;gnome-settings-daemon; ++RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; + IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated + FallbackSession=cinnamon2d + DesktopName=GNOME diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch new file mode 100644 index 000000000..ce2e31825 --- /dev/null +++ b/community/cinnamon/switch-applications.patch @@ -0,0 +1,55 @@ +diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py +--- linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py 2013-04-15 15:55:01.000000000 +0200 ++++ linuxmint-Cinnamon-b41bad0/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py 2013-04-24 21:19:49.262020614 +0200 +@@ -43,8 +43,8 @@ + # Cinnamon stuff + [_("Toggle Scale"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-down", True, "cinnamon"], + [_("Toggle Expo"), "org.gnome.desktop.wm.keybindings", "switch-to-workspace-up", True, "cinnamon"], +- [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows", True, "cinnamon"], +- [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-windows-backward", True, "cinnamon"], ++ [_("Cycle through open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications", True, "cinnamon"], ++ [_("Cycle backwards though open windows"), "org.gnome.desktop.wm.keybindings", "switch-applications-backward", True, "cinnamon"], + [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"], + [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"], + +diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/altTab.js linuxmint-Cinnamon-b41bad0/js/ui/altTab.js +--- linuxmint-Cinnamon-b41bad0.orig/js/ui/altTab.js 2013-04-15 15:55:01.000000000 +0200 ++++ linuxmint-Cinnamon-b41bad0/js/ui/altTab.js 2013-04-24 21:22:38.309568355 +0200 +@@ -203,9 +203,9 @@ + } + } else if (binding == 'switch-group-backward') { + this._select(0, this._appIcons[0].cachedWindows.length - 1); +- } else if (binding == 'switch-windows-backward') { ++ } else if (binding == 'switch-applications-backward') { + this._select(this._appIcons.length - 1); +- } else if (binding == 'no-switch-windows') { ++ } else if (binding == 'no-switch-applications') { + this._select(0); + } else if (this._appIcons.length == 1) { + this._select(0); +@@ -296,7 +296,7 @@ + return false; + } + Main.wm.showWorkspaceOSD(); +- that.refresh('no-switch-windows'); ++ that.refresh('no-switch-applications'); + return true; + }; + let keysym = event.get_key_symbol(); +diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js +--- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js 2013-04-15 15:55:01.000000000 +0200 ++++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js 2013-04-24 21:21:22.447677094 +0200 +@@ -131,11 +131,11 @@ + Lang.bind(this, this._showWorkspaceSwitcher)); + Meta.keybindings_set_custom_handler('switch-to-workspace-down', + Lang.bind(this, this._showWorkspaceSwitcher)); +- Meta.keybindings_set_custom_handler('switch-windows', ++ Meta.keybindings_set_custom_handler('switch-applications', + Lang.bind(this, this._startAppSwitcher)); + Meta.keybindings_set_custom_handler('switch-group', + Lang.bind(this, this._startAppSwitcher)); +- Meta.keybindings_set_custom_handler('switch-windows-backward', ++ Meta.keybindings_set_custom_handler('switch-applications-backward', + Lang.bind(this, this._startAppSwitcher)); + Meta.keybindings_set_custom_handler('switch-group-backward', + Lang.bind(this, this._startAppSwitcher)); diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch index 2c90a9fe2..92f317cea 100644 --- a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch +++ b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch @@ -76,7 +76,7 @@ index 0000000..c012c58 @@ -0,0 +1,3 @@ +[GNOME Session] +_Name=GNOME Flashback -+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon; ++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; diff --git a/po/POTFILES.in b/po/POTFILES.in index bc65c4c..a6aa6c7 100644 --- a/po/POTFILES.in diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index a287972a4..e173e3492 100644 --- a/community/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88822 2013-04-23 02:28:34Z bgyorgy $ +# $Id: PKGBUILD 88932 2013-04-24 22:25:52Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan de Groot pkgbase=gnome-panel pkgname=('gnome-panel' 'gnome-flashback-session') pkgver=3.6.2 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('GPL') pkgdesc="Legacy GNOME panel" @@ -25,7 +25,7 @@ sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079' '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c' 'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305' '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775' - 'f313791d246749f18764ad4af13c4efe54483bc327fab371c47f9fbfc25b20a9' + '9db0d1dadd2183777ed39e84caca1096a857897bbcf0e18ad599996dd397f1e0' '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71') build() { diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD index 108f1ab5a..8c2ae9f43 100644 --- a/community/gnome-settings-daemon-compat/PKGBUILD +++ b/community/gnome-settings-daemon-compat/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 88858 2013-04-24 12:55:15Z bgyorgy $ +# $Id: PKGBUILD 88930 2013-04-24 22:24:31Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan Alexander Steffens (heftig) pkgname=gnome-settings-daemon-compat _pkgname=gnome-settings-daemon pkgver=3.6.4 -pkgrel=2 -pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session" +pkgrel=3 +pkgdesc="Compatibility package that provides background, media keys and mount helpers for the Gnome Flashback session" arch=('i686' 'x86_64') license=('GPL') depends=('gnome-settings-daemon') -makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom') +makedepends=('docbook-xsl' 'intltool' 'xf86-input-wacom') url="https://live.gnome.org/GnomeFlashback" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz standalone-background-helper.patch @@ -19,17 +19,17 @@ source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname- sessionisactive-port.patch revert-input-sources.patch xinput.patch - flashback-rename.patch - remove-libgsd-dependency.patch) + remove-libgsd-dependency.patch + move-desktop-file.patch) sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' - 'f9781a17d7baa2777b16fa2c71fb6053612131cffcfffcc635d49f9dacb1e637' - '4776de33b1517976b308a9ce23661cd0ac68ddd2bcf41465c73f8a2e2d09d20c' + '2e7e40175533556493bb58795a2c1b4e53b4baba35d151e632b933c6077456d9' + 'ddc4dfaa8083ff24a7d2fb6138b8c3fee5d4e6c60c24b4e80a39392d0c8f2162' '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a' '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915' '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a' 'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d' - '1edabf1a5a56d4b797ccdb7d5003bad396eebe98541d5aa330c9851340b68dfe' - '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c') + '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c' + 'c58ace67581a1e14dc21efc8d22dd1f385cd05483d67e8a385b0767a8daf9fb4') build() { cd $_pkgname-$pkgver @@ -51,8 +51,8 @@ build() { # Remove libgsd dependency patch -Np1 -i ../remove-libgsd-dependency.patch - # GNOME Fallback renamed to Flashback - patch -Np1 -i ../flashback-rename.patch + # Move desktop files out of autostart, so they can be easily reusable in custom sessions + patch -Np1 -i ../move-desktop-file.patch autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \ diff --git a/community/gnome-settings-daemon-compat/flashback-rename.patch b/community/gnome-settings-daemon-compat/flashback-rename.patch deleted file mode 100644 index 8f3816bef..000000000 --- a/community/gnome-settings-daemon-compat/flashback-rename.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 -@@ -9,4 +9,4 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -+AutostartCondition=GNOME3 if-session gnome-flashback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:32:47.290988000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 -@@ -9,4 +9,4 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -+AutostartCondition=GNOME3 if-session gnome-flashback -diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:32:52.807791000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:35:16.714696636 +0200 -@@ -9,4 +9,4 @@ - NoDisplay=true - OnlyShowIn=GNOME;Unity; - X-GNOME-Autostart-Notify=true --AutostartCondition=GNOME3 if-session gnome-fallback -+AutostartCondition=GNOME3 if-session gnome-flashback diff --git a/community/gnome-settings-daemon-compat/move-desktop-file.patch b/community/gnome-settings-daemon-compat/move-desktop-file.patch new file mode 100644 index 000000000..fe9272767 --- /dev/null +++ b/community/gnome-settings-daemon-compat/move-desktop-file.patch @@ -0,0 +1,60 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 23:13:10.169941000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 23:13:41.064001562 +0200 +@@ -9,4 +9,3 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am 2013-04-24 23:13:12.830004000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am 2013-04-24 23:13:36.613896914 +0200 +@@ -21,7 +21,7 @@ + $(SYSTEMD_LIBS) \ + $(AUTOMOUNT_LIBS) + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/applications + autostart_in_files = gnome-fallback-mount-helper.desktop.in + autostart_in_in_files = gnome-fallback-mount-helper.desktop.in.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 23:13:07.229872000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 23:13:43.670729520 +0200 +@@ -9,4 +9,3 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am 2013-04-24 23:13:04.913151000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am 2013-04-24 23:13:47.907495798 +0200 +@@ -17,7 +17,7 @@ + $(SETTINGS_PLUGIN_LIBS) \ + $(BACKGROUND_LIBS) + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/applications + autostart_in_files = gnome-fallback-background-helper.desktop.in + autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 23:12:58.579668000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 23:13:51.747586073 +0200 +@@ -9,4 +9,3 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am 2013-04-24 23:13:02.026416000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am 2013-04-24 23:13:54.570985777 +0200 +@@ -75,7 +75,7 @@ + $(MEDIA_KEYS_LIBS) \ + -lm + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/applications + autostart_in_files = gnome-fallback-media-keys-helper.desktop.in + autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch index 884f3031e..b52de042f 100644 --- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch +++ b/community/gnome-settings-daemon-compat/standalone-background-helper.patch @@ -114,8 +114,8 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-ba +++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 17:39:36.450215685 +0200 @@ -0,0 +1,12 @@ +[Desktop Entry] -+_Name=Background Helper -+_Comment=Draw desktop background ++_Name=Background ++_Comment=Background plugin +Exec=@LIBEXECDIR@/gnome-fallback-background-helper +Icon=desktop +Terminal=false diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch index dec5ff3e8..61be1737e 100644 --- a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch +++ b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch @@ -84,9 +84,9 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-me @@ -0,0 +1,12 @@ +[Desktop Entry] +_Name=Media keys -+_Comment=Handle media keys ++_Comment=Media keys plugin +Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper -+Icon=drive-optical ++Icon=multimedia +Terminal=false +Type=Application +Categories= diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD index 56ccb9c8c..9e6b83de1 100644 --- a/community/haskell-pcre-light/PKGBUILD +++ b/community/haskell-pcre-light/PKGBUILD @@ -3,7 +3,7 @@ _hkgname=pcre-light pkgname=haskell-pcre-light pkgver=0.4 -pkgrel=20 +pkgrel=21 pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions" url="http://code.haskell.org/~dons/code/pcre-light" license=(custom:BSD3) diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index fca931cac..ec7ab49e5 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88886 2013-04-24 15:32:13Z bpiotrowski $ +# $Id: PKGBUILD 88940 2013-04-25 04:37:43Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -55,8 +55,10 @@ build() { --with-file-aio \ --with-http_dav_module \ --with-http_geoip_module \ + --with-http_gunzip_module \ --with-http_gzip_static_module \ --with-http_realip_module \ + --with-http_spdy_module \ --with-http_ssl_module \ --with-http_stub_status_module \ --add-module=/usr/lib/passenger/ext/nginx \ -- cgit v1.2.3-54-g00ecf