Update metacity to 2.34.13 (now starts as finds default icon)

Version 2.34.13
===============

- Fix minimization problem of iconified windows (Florian Müllner, Daniel Drake)

Translations:
    Rūdolfs Mazurs (lv)
    Rajesh Ranjan (hi)
    Nguyễn Thái Ngọc Duy (vi)
    Theppitak Karoonboonyanan (th)
    Piotr Drąg (pl)

Version 2.34.8
==============
 - Port themes documentation to yelp-tools (Florian Müllner)

Translations:
    Mattias Põldaru (et)
    Nilamdyuti Goswami (as)
    Fran Diéguez (gl)

Version 2.34.5
==============
 - Fix memory leak (Pavel Vasin)
 - Add disable-mouse-button-modifiers message (Daniel Drake)

Translations:
    Daniel Korostil (uk)
    Jiro Matsuzawa (ja)
    Reşat SABIQ (crh)
    Aurimas Černius (lt)
    Carles Ferrando (ca@valencia)
    Arash Mousavi (fa)
    Kristjan SCHMIDT (eo)
    Sandeep Sheshrao Shedmake (mr)
    Jordi Serratosa (ca)
    Tom Tryfonidis (el)
    Praveen Illa (te)
    Luca Ferretti (it)
    Andika Triwidada (id)
    Daniel Mustieles (es)
    Nilamdyuti Goswami (as)


Version 2.34.3
==============

 - Use the correct translation domain in keybinding definitions (Ryan Lortie, Florian Müllner)

Translations:
    YunQiang Su (zh_CN)
    Abderrahim Kitouni (ar)
    Marek Černocký (cs)
    David Planella (ca)
    Sasi Bhushan (te)
    A S Alam (pa)
    Duarte Loreto (pt)
    Antonio Fernandes C. Neto (pt_BR)
    Anita Reitere (lv)
    Bruce Cowan (en_GB)
    Daniel Nylander (sv)
    Timo Jyrinki (fi)
    Nilamdyuti Goswami (as)
    Piotr Drąg (pl)
    Claude Paroz (fr)
    Seong-ho Cho (ko)
    Inaki Larranaga Murgoitio (eu)
    Mario Blättermann (de)
    Nguyễn Thái Ngọc Duy (vi)
    Gabor Kelemen (hu)
    Daniel Mustieles (es)
    Dr.T.Vasudevan (ta)
    Kasia Bondarava (be)
    Alexander Shopov (bg)
    Ask H. Larsen (da)
    Мирослав Николић (sr)
    Yuri Myasoedov (ru)
    Mattias Põldaru (et)


Version 2.34.2
==============

 - Port preferences to GSettings (Florian Müllner, Milan Bouchet-Valat, Jason Siefken)
 - Remove deprecated GTK+ symbols and use accessor functions (Florian Müllner)
 - Include the default window icon (Matthias Clasen)
 - Various small build system changes (Javier Jardón, Piotr Drąg, Florian Müllner, Rico Tzschichholz)

Translations:
    Abduxukur Abdurixit (ug)
    Kjartan Maraas (nb)
    Theppitak Karoonboonyanan (th)
    Ihar Hrachyshka (be)
    Aurimas Černius (lt)
    Daniel Mustieles (es)
    Jiro Matsuzawa (ja)
    Fabrício Godoy (pt_BR)
    krishnababu k (te)
    OKANO Takayoshi (ja)
    Mario Blättermann (de)
    Bruce Cowan (en_GB)
    Mattias Põldaru (et)
    Fran Diéguez (gl)
    Marek Černocký (cs)
    Gil Forcada (ca)
    Piotr Drąg (pl)
    Matej Urbančič (sl)
    Bruno Brouard (fr)
    Daniel Nylander (sv)
    Praveen Illa (te)
    Wouter Bolsterlee (nl)
    Antonio Fernandes C. Neto (pt_BR)
    Yaron Shahrabani (he)
    Xandru Armesto (ast)
    Alexander Shopov (bg)
    Chao-Hsiung Liao (zh_HK, zh_TW)

5 files changed, 34 insertions, 87 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 36081a3f017..4b0e12178c0 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.112 2014/05/05 00:48:25 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.113 2014/05/27 11:45:22 prlw1 Exp $
 
-DISTNAME=	metacity-2.34.1
-PKGREVISION=	16
+DISTNAME=	metacity-2.34.13
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.34/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity/
 COMMENT=	GNOME-compliant window manager
+LICENSE=	gnu-gpl-v2
 
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
@@ -18,8 +17,6 @@ USE_LIBTOOL=		YES
 
 PKGCONFIG_OVERRIDE=	src/libmetacity-private.pc.in
 
-GCONF_SCHEMAS=		metacity.schemas
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${X11_TYPE} != "native"
@@ -37,20 +34,20 @@ CFLAGS.SunOS+=		-std=c99 -D__EXTENSIONS__
 BUILDLINK_TRANSFORM+=	rm:-ansi
 .endif
 
+BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 
-BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.6.0
-BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.25.10
+BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.24.0
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.7
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../audio/libcanberra/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
-.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index b2af8e96568..41ed4bd8a0c 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2011/07/13 20:06:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.35 2014/05/27 11:45:22 prlw1 Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -16,16 +16,15 @@ man/man1/metacity-message.1
 man/man1/metacity-theme-viewer.1
 man/man1/metacity-window-demo.1
 man/man1/metacity.1
+share/GConf/gsettings/metacity-schemas.convert
 share/applications/metacity.desktop
-share/gconf/schemas/metacity.schemas
-share/gnome-control-center/keybindings/50-metacity-launchers.xml
+share/glib-2.0/schemas/org.gnome.metacity.gschema.xml
 share/gnome-control-center/keybindings/50-metacity-navigation.xml
-share/gnome-control-center/keybindings/50-metacity-screenshot.xml
 share/gnome-control-center/keybindings/50-metacity-system.xml
 share/gnome-control-center/keybindings/50-metacity-windows.xml
-share/gnome/help/creating-metacity-themes/C/creating-metacity-themes.xml
-share/gnome/help/creating-metacity-themes/de/creating-metacity-themes.xml
 share/gnome/wm-properties/metacity-wm.desktop
+share/help/C/creating-metacity-themes/index.docbook
+share/help/de/creating-metacity-themes/index.docbook
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
 share/locale/as/LC_MESSAGES/metacity.mo
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 15594f846d8..a38d17fec0d 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.44 2011/07/13 20:06:15 drochner Exp $
+$NetBSD: distinfo,v 1.45 2014/05/27 11:45:22 prlw1 Exp $
 
-SHA1 (metacity-2.34.1.tar.bz2) = 2b691c4a2c98be0b53deed2274b901880d3d6c84
-RMD160 (metacity-2.34.1.tar.bz2) = 965fcef1affb2308e54d99990909194780291b52
-Size (metacity-2.34.1.tar.bz2) = 2411563 bytes
-SHA1 (patch-aa) = e57853437a8485399f302553a4a4289e607d3780
-SHA1 (patch-ac) = bfdb91948f619a7021a6d1d7d0ff4b7995c8e91d
+SHA1 (metacity-2.34.13.tar.xz) = 7b5b20e84ffb86290955a726af946a78b7a45e26
+RMD160 (metacity-2.34.13.tar.xz) = c04af49aedb46207053c199c61974751461bfd37
+Size (metacity-2.34.13.tar.xz) = 1660136 bytes
+SHA1 (patch-ac) = a672cc7cc5cfa2dfe0be93be1f6dd764b11beeb2
diff --git a/wm/metacity/patches/patch-aa b/wm/metacity/patches/patch-aa
deleted file mode 100644
index 9271463a64c..00000000000
--- a/wm/metacity/patches/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2008/12/24 18:49:55 jmcneill Exp $
-
---- src/compositor/compositor-xrender.c.orig	2008-12-24 13:43:30.000000000 -0500
-+++ src/compositor/compositor-xrender.c	2008-12-24 13:46:14.000000000 -0500
-@@ -288,6 +288,7 @@ make_gaussian_map (double r)
-   return c;
- }
- 
-+#ifdef HAVE_COMPOSITE_EXTENSIONS
- static void
- dump_xserver_region (const char   *location, 
-                      MetaDisplay  *display,
-@@ -321,6 +322,7 @@ dump_xserver_region (const char   *locat
-   else
-     fprintf (stderr, "%s (XSR): null\n", location);
- }
-+#endif
- 
- /*
- * A picture will help
-@@ -1052,7 +1054,7 @@ get_window_picture (MetaCompWindow *cw)
- 
-   meta_error_trap_push (display);
- 
--#ifdef HAVE_NAME_WINDOW_PIXMAP
-+#if defined(HAVE_NAME_WINDOW_PIXMAP) && defined(HAVE_COMPOSITE_EXTENSIONS)
-   if (have_name_window_pixmap (display))
-     {
-       if (cw->back_pixmap == None)
-@@ -1219,7 +1221,7 @@ paint_windows (MetaScreen   *screen,
-         {
-           int x, y, wid, hei;
-           
--#ifdef HAVE_NAME_WINDOW_PIXMAP
-+#if defined(HAVE_NAME_WINDOW_PIXMAP) && defined(HAVE_COMPOSITE_EXTENSIONS)
-           if (have_name_window_pixmap (display))
-             {
-               x = cw->attrs.x;
-@@ -1361,7 +1363,9 @@ paint_all (MetaScreen   *screen,
-     {
-       Picture overlay;
- 
-+#ifdef HAVE_COMPOSITE_EXTENSIONS
-       dump_xserver_region ("paint_all", display, region);
-+#endif
- 
-       /* Make a random colour overlay */
-       overlay = solid_picture (display, screen, TRUE, 1, /* 0.3, alpha */
-@@ -2481,7 +2485,7 @@ show_overlay_window (MetaScreen *screen,
-   MetaDisplay *display = meta_screen_get_display (screen);
-   Display *xdisplay = meta_display_get_xdisplay (display);
- 
--#ifdef HAVE_COW
-+#if defined(HAVE_COW) && defined(HAVE_COMPOSITE_EXTENSIONS)
-   if (have_cow (display))
-     {
-       XserverRegion region;
diff --git a/wm/metacity/patches/patch-ac b/wm/metacity/patches/patch-ac
index 83d0348bc0d..b8fa0390ae4 100644
--- a/wm/metacity/patches/patch-ac
+++ b/wm/metacity/patches/patch-ac
@@ -1,12 +1,21 @@
-$NetBSD: patch-ac,v 1.1 2010/02/11 18:19:13 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2014/05/27 11:45:23 prlw1 Exp $
 
---- src/core/delete.c.orig	2010-01-26 11:11:27.000000000 +0000
+Look for WIFEXITED and WEXITSTATUS in sys/wait.h
+https://bugzilla.gnome.org/show_bug.cgi?id=681328
+commit 7b3e8f63eaa055fda49d48178e53b0ad2ae513ce
+
+--- src/core/delete.c.orig	2011-11-10 14:14:34.000000000 +0000
 +++ src/core/delete.c
-@@ -38,6 +38,7 @@
+@@ -32,11 +32,11 @@
+ #include "workspace.h"
+ 
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <errno.h>
  #include <string.h>
- #include <stdlib.h>
+-#include <stdlib.h>
  #include <stdio.h>
-+#include <sys/wait.h>
  
  static void meta_window_present_delete_dialog (MetaWindow *window,
-                                                guint32     timestamp);