[arch-commits] Commit in metacity/trunk (PKGBUILD fix-build-gcc-4.5.patch)

[Ionut Biru]

    Date: Saturday, April 3, 2010 @ 13:08:18
  Author: ibiru
Revision: 75789

upgpkg: metacity 2.30.0-2
revert fix build gcc 4.5 patch, since is making metacity crash on right click. fixes upstream bug 614592, FS#18909

Added:
  metacity/trunk/fix-build-gcc-4.5.patch
Modified:
  metacity/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    9 +++--
 fix-build-gcc-4.5.patch |   78 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-03 15:54:10 UTC (rev 75788)
+++ PKGBUILD	2010-04-03 17:08:18 UTC (rev 75789)
@@ -3,7 +3,7 @@
 
 pkgname=metacity
 pkgver=2.30.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
@@ -14,13 +14,16 @@
 options=('!libtool' '!emptydirs')
 install=metacity.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
-        metacity-restartstyle.patch)
+        metacity-restartstyle.patch
+        fix-build-gcc-4.5.patch)
 sha256sums=('5c4e2af2216de022181f692f15427361a1dae3d30756ef89b97a11ff5bd50b22'
-            '3a7e484ec2eb97e7b7f1baaa33e5d925e67a35c84e49c5abe6c32cf2c25f16eb')
+            '3a7e484ec2eb97e7b7f1baaa33e5d925e67a35c84e49c5abe6c32cf2c25f16eb'
+	    '100e6dd9f79e9b634a81a34c42fcdf8c19c91bc41f5d69809586021652a32c2b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/metacity-restartstyle.patch" || return 1
+  patch -Np1 -R -i "${srcdir}/fix-build-gcc-4.5.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/metacity \
       --localstatedir=/var --disable-static || return 1

Added: fix-build-gcc-4.5.patch
===================================================================
--- fix-build-gcc-4.5.patch	                        (rev 0)
+++ fix-build-gcc-4.5.patch	2010-04-03 17:08:18 UTC (rev 75789)
@@ -0,0 +1,78 @@
+From 333446ab5f6b773b4c8357a302d80155e8851d22 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Wed, 31 Mar 2010 20:34:02 +0000
+Subject: Fix build with gcc 4.5
+
+Based on patch by Dominique Leuenberger
+<dominique-gnomezilla at leuenberger.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=606719
+---
+diff --git a/src/core/core.c b/src/core/core.c
+index a63531f..6d98075 100644
+--- a/src/core/core.c
++++ b/src/core/core.c
+@@ -519,6 +519,9 @@ meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
+   
+   switch (menu_op)
+     {
++    case META_MENU_OP_NONE:
++      name = "none";
++      break;
+     case META_MENU_OP_DELETE:
+       name = "close";
+       break;
+diff --git a/src/core/window.c b/src/core/window.c
+index 8149de3..ebbb047 100644
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -6385,9 +6385,12 @@ menu_callback (MetaWindowMenu *menu,
+     {
+       meta_verbose ("Menu op %u on %s\n", op, window->desc);
+       
+-      /* op can be 0 for none */
+       switch (op)
+         {
++        case META_MENU_OP_NONE:
++          /* nothing */
++          break;
++
+         case META_MENU_OP_DELETE:
+           meta_window_delete (window, timestamp);
+           break;
+@@ -6475,10 +6478,6 @@ menu_callback (MetaWindowMenu *menu,
+           meta_window_shove_titlebar_onscreen (window);
+           break;
+           
+-        case 0:
+-          /* nothing */
+-          break;
+-          
+         default:
+           meta_warning (G_STRLOC": Unknown window op\n");
+           break;
+@@ -6529,8 +6528,8 @@ meta_window_show_menu (MetaWindow *window,
+       window->display->window_with_menu = NULL;
+     }
+ 
+-  ops = 0;
+-  insensitive = 0;
++  ops = META_MENU_OP_NONE;
++  insensitive = META_MENU_OP_NONE;
+ 
+   ops |= (META_MENU_OP_DELETE | META_MENU_OP_MINIMIZE | META_MENU_OP_MOVE | META_MENU_OP_RESIZE);
+ 
+diff --git a/src/include/common.h b/src/include/common.h
+index 8463ced..de2dfff 100644
+--- a/src/include/common.h
++++ b/src/include/common.h
+@@ -52,6 +52,7 @@ typedef enum
+ 
+ typedef enum
+ {
++  META_MENU_OP_NONE        = 0,
+   META_MENU_OP_DELETE      = 1 << 0,
+   META_MENU_OP_MINIMIZE    = 1 << 1,
+   META_MENU_OP_UNMAXIMIZE  = 1 << 2,
+--
+cgit v0.8.3.1