From 481f5b8d43a37422be994012ea570b037b9c5c83 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 21 Jun 2011 17:54:25 +0000 Subject: [PATCH] - bugfix update to 2.34.1 --- x11/gnome/metacity/Makefile | 12 ++++++------ x11/gnome/metacity/distinfo | 10 +++++----- x11/gnome/metacity/patches/patch-src_core_main_c | 12 ------------ x11/gnome/metacity/pkg/PLIST | 3 +-- 4 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 x11/gnome/metacity/patches/patch-src_core_main_c diff --git a/x11/gnome/metacity/Makefile b/x11/gnome/metacity/Makefile index 1518eea83a8..6198813e3dc 100644 --- a/x11/gnome/metacity/Makefile +++ b/x11/gnome/metacity/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.62 2011/06/21 10:26:18 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.63 2011/06/21 17:54:25 jasper Exp $ SHARED_ONLY= Yes COMMENT= lightweight window manager GNOME_PROJECT= metacity -GNOME_VERSION= 2.34.0 - -REVISION= 8 +GNOME_VERSION= 2.34.1 SHARED_LIBS += metacity-private 1.0 # .0.0 @@ -25,14 +23,16 @@ WANTLIB += execinfo expat fontconfig freetype WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 kvm ltdl m ogg WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread pthread-stubs vorbis vorbisfile xcb xcb-atom -WANTLIB += xcb-aux xcb-event xcb-render z GL Xxf86vm drm xcb-shm +WANTLIB += png pthread pthread-stubs vorbis vorbisfile xcb X11-xcb +WANTLIB += xcb-aux xcb-render z GL Xxf86vm drm xcb-shm WANTLIB += startup-notification-1 canberra-gtk canberra gtop-2.0 MODULES= devel/gettext \ x11/gnome \ devel/gconf2 +EXTRACT_SUFX= .tar.xz + LIB_DEPENDS= devel/startup-notification \ audio/libcanberra,-gtk \ devel/libgtop2 diff --git a/x11/gnome/metacity/distinfo b/x11/gnome/metacity/distinfo index c86627a2543..803a311dd56 100644 --- a/x11/gnome/metacity/distinfo +++ b/x11/gnome/metacity/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/metacity-2.34.0.tar.bz2) = gpGri6QDT4mIlfOIiDd9dA== -RMD160 (gnome/metacity-2.34.0.tar.bz2) = 6TBy2SFXnLLFp6BILPG6YVD/GFk= -SHA1 (gnome/metacity-2.34.0.tar.bz2) = slrdLB+wwFurs0G9YxwYD9gucDk= -SHA256 (gnome/metacity-2.34.0.tar.bz2) = 4xa+/3ZljJjiHd9OfquhLNdhs1AC3DhwFEHbZ0Cm1pg= -SIZE (gnome/metacity-2.34.0.tar.bz2) = 2382473 +MD5 (gnome/metacity-2.34.1.tar.xz) = 1QXi15Nr2bEaP0hHCmFnZw== +RMD160 (gnome/metacity-2.34.1.tar.xz) = YxYdKX1iAaT7y8Y58k5zqiAmmwc= +SHA1 (gnome/metacity-2.34.1.tar.xz) = xvDzHiaRp5pSlI2dN44HLZzuKJ4= +SHA256 (gnome/metacity-2.34.1.tar.xz) = 8UTLQ5JcoA2OqsEpoU3zJgxUoyMktc0KTXiw/X/xAoo= +SIZE (gnome/metacity-2.34.1.tar.xz) = 1918056 diff --git a/x11/gnome/metacity/patches/patch-src_core_main_c b/x11/gnome/metacity/patches/patch-src_core_main_c deleted file mode 100644 index adb6ac9c224..00000000000 --- a/x11/gnome/metacity/patches/patch-src_core_main_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_core_main_c,v 1.2 2009/11/05 23:27:02 jasper Exp $ ---- src/core/main.c.orig Tue Sep 8 22:55:35 2009 -+++ src/core/main.c Fri Nov 6 00:26:21 2009 -@@ -58,7 +58,7 @@ - - #include - #include --#include -+#include - #include - #include - #include diff --git a/x11/gnome/metacity/pkg/PLIST b/x11/gnome/metacity/pkg/PLIST index b247de55aa6..46b9b78f035 100644 --- a/x11/gnome/metacity/pkg/PLIST +++ b/x11/gnome/metacity/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.27 2011/06/21 10:26:18 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.28 2011/06/21 17:54:25 jasper Exp $ @bin bin/metacity @bin bin/metacity-message @bin bin/metacity-theme-viewer @@ -169,7 +169,6 @@ share/themes/Bright/ share/themes/Bright/metacity-1/ share/themes/Bright/metacity-1/metacity-theme-1.xml share/themes/Bright/metacity-1/metacity-theme-2.xml -share/themes/Crux/ share/themes/Crux/metacity-1/ share/themes/Crux/metacity-1/active-above-button.png share/themes/Crux/metacity-1/active-border-top-left-border.png