Date: Tuesday, November 4, 2014 @ 19:04:06 Author: flexiondotorg Revision: 121863
upgpkg: marco 1.8.2-3 - Update key bindings with Marco's new name. Added: marco/trunk/update_keybindings_with_new_name.diff Modified: marco/trunk/PKGBUILD ---------------------------------------+ PKGBUILD | 11 +++++++--- update_keybindings_with_new_name.diff | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-04 18:03:47 UTC (rev 121862) +++ PKGBUILD 2014-11-04 18:04:06 UTC (rev 121863) @@ -3,7 +3,7 @@ pkgname=marco pkgver=1.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="A window manager for MATE" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -18,9 +18,11 @@ options=('!emptydirs') groups=('mate') source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" - "do_not_add_shadows_to_ARGB_windows.diff") + 'do_not_add_shadows_to_ARGB_windows.diff' + 'update_keybindings_with_new_name.diff') sha1sums=('0b361403ad4603d6b93f1b7b684c8c5b905ddf3c' - 'a2af3d1d6ea6a3b19bf9aa290036b2c7181a3587') + 'a2af3d1d6ea6a3b19bf9aa290036b2c7181a3587' + 'f09d9871ef920e7848458bca853589f482f340b3') install=${pkgname}.install prepare() { @@ -28,6 +30,9 @@ # Adapted from the commit below to correct drop down menu rendering with GTK 3.14. # - https://git.gnome.org/browse/metacity/commit/?id=a6b29b2d2f6a7787c59cfffdc2bed1b5b5b99244 patch -Np1 -i "${srcdir}/do_not_add_shadows_to_ARGB_windows.diff" + # Update keybindings files with new name + # - https://github.com/mate-desktop/marco/commit/c2cbcaa90d88d3d74dc7b79cae17964f4243a51d + patch -Np1 -i "${srcdir}/update_keybindings_with_new_name.diff" } build() { Added: update_keybindings_with_new_name.diff =================================================================== --- update_keybindings_with_new_name.diff (rev 0) +++ update_keybindings_with_new_name.diff 2014-11-04 18:04:06 UTC (rev 121863) @@ -0,0 +1,33 @@ +diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in +index 00ebc91..f9e33c3 100644 +--- a/src/50-marco-desktop-key.xml.in ++++ b/src/50-marco-desktop-key.xml.in +@@ -1,5 +1,5 @@ + <?xml version="1.0" encoding="UTF-8" ?> +-<KeyListEntries _name="Desktop" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings"> ++<KeyListEntries _name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings"> + + <KeyListEntry name="panel-run-dialog" _description="Show the panel's "Run Application" dialog box" /> + +diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in +index 9a61c37..81a8db8 100644 +--- a/src/50-marco-global-key.xml.in ++++ b/src/50-marco-global-key.xml.in +@@ -1,5 +1,5 @@ + <?xml version="1.0" encoding="UTF-8" ?> +-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings"> ++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings"> + + <KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" /> + +diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in +index 3aba645..5d79933 100644 +--- a/src/50-marco-window-key.xml.in ++++ b/src/50-marco-window-key.xml.in +@@ -1,5 +1,5 @@ + <?xml version="1.0" encoding="UTF-8" ?> +-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.window-keybindings"> ++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings"> + + <KeyListEntry + name="activate-window-menu"