Date: Saturday, April 12, 2014 @ 21:16:05 Author: faidoc Revision: 109280
upgpkg: muffin 2.2.0-1 Modified: muffin/trunk/PKGBUILD Deleted: muffin/trunk/gtkdoc.patch --------------+ PKGBUILD | 17 ++++++----------- gtkdoc.patch | 41 ----------------------------------------- 2 files changed, 6 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-12 19:14:16 UTC (rev 109279) +++ PKGBUILD 2014-04-12 19:16:05 UTC (rev 109280) @@ -4,8 +4,8 @@ # Contributor: Ner0 pkgname=muffin -pkgver=2.0.5 -pkgrel=3 +pkgver=2.2.0 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -12,15 +12,13 @@ license=('GPL') depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra' 'startup-notification' 'zenity' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') +makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - cogl_ABI.patch - gtkdoc.patch) -sha256sums=('81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee' - 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5' - '4f7deff60dc65557aefb9f0473bcc58a7c33c0d25ed6ebfcdd6602f7e1639caa') + cogl_ABI.patch) +sha256sums=('85332899ff4f441624b145af6ee9689dbab1d4b824517a35d01cc563bede9737' + 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5') prepare() { cd ${pkgname}-${pkgver} @@ -27,9 +25,6 @@ # Port to cogl 1.18 patch -Np1 -i ../cogl_ABI.patch - - # Build fix - patch -Np1 -i ../gtkdoc.patch } build() { Deleted: gtkdoc.patch =================================================================== --- gtkdoc.patch 2014-04-12 19:14:16 UTC (rev 109279) +++ gtkdoc.patch 2014-04-12 19:16:05 UTC (rev 109280) @@ -1,41 +0,0 @@ ---- a/src/meta/prefs.h -+++ b/src/meta/prefs.h -@@ -310,13 +310,13 @@ typedef struct - */ - GSList *bindings; - -- /** for keybindings that can have shift or not like Alt+Tab */ -+ /* for keybindings that can have shift or not like Alt+Tab */ - gboolean add_shift:1; - -- /** for keybindings that apply only to a window */ -+ /* for keybindings that apply only to a window */ - gboolean per_window:1; - -- /** for keybindings not added with meta_display_add_keybinding() */ -+ /* for keybindings not added with meta_display_add_keybinding() */ - gboolean builtin:1; - } MetaKeyPref; - -@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi - MetaPlacementMode meta_prefs_get_placement_mode (void); - - #endif -- -- ---- a/src/core/workspace.c -+++ b/src/core/workspace.c -@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen) - return workspace; - } - --/** Foreach function for workspace_free_struts() */ -+/* Foreach function for workspace_free_struts() */ - static void - free_this (gpointer candidate, gpointer dummy) - { -@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace - { - return workspace->screen; - } --