From 5ccb53c16bf1d579ac8896091f5f78cf02fd323b Mon Sep 17 00:00:00 2001 From: jmmv Date: Thu, 1 Apr 2004 18:35:20 +0000 Subject: Update to 2.8.0: 2.8.0 ===== No code changes in this release, but some new translations. 2.7.1 ===== Thanks to Rob Adams for fixes in this release. - bug #122016 - fix a focus race - Change move_to_workspace_left/right/up/down keybindings to arrow to avoid conflicting with new keybindings in spacial nautilus. - fix dialog stacking order issues so e.g. panel properties dialog is above the panel 2.7.0 ===== First unstable release tarball for GNOME 2.6. Thanks to Anders Carlsson, Elijah Newren, Rob Adams, James Cape, Thomas Fitzimmons, Calum Benson for fixes in this release. --- wm/metacity/Makefile | 13 +++++-------- wm/metacity/PLIST | 8 +++++++- wm/metacity/buildlink3.mk | 4 ++-- wm/metacity/distinfo | 6 +++--- wm/metacity/patches/patch-aa | 20 -------------------- 5 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 wm/metacity/patches/patch-aa (limited to 'wm/metacity') diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index b1760d3c9c1..fd3163999a3 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2004/04/01 18:35:20 jmmv Exp $ # -DISTNAME= metacity-2.6.5 -PKGREVISION= 1 +DISTNAME= metacity-2.8.0 CATEGORIES= wm x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.6/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.8/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg@NetBSD.org @@ -27,10 +26,8 @@ GCONF2_SCHEMAS= metacity.schemas .include "../../mk/bsd.prefs.mk" -.if exists(${X11BASE}/lib/libXinerama.so) -CONFIGURE_ENV+= USE_XINERAMA=yes -.else -CONFIGURE_ENV+= USE_XINERAMA=no +.if !exists(${X11BASE}/lib/libXinerama.so) +CONFIGURE_ARGS+= --disable-xinerama .endif .include "../../devel/GConf2/schemas.mk" diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST index 755654b736d..a4ef95794a8 100644 --- a/wm/metacity/PLIST +++ b/wm/metacity/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2004/03/08 19:40:43 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.9 2004/04/01 18:35:20 jmmv Exp $ bin/metacity bin/metacity-message bin/metacity-theme-viewer @@ -19,6 +19,7 @@ libexec/metacity-dialog share/gconf/schemas/metacity.schemas share/gnome/wm-properties/metacity.desktop ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/metacity.mo +${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/metacity.mo @@ -29,6 +30,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/metacity.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/metacity.mo @@ -38,6 +40,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/metacity.mo +${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/metacity.mo @@ -65,6 +68,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/metacity.mo +${PKGLOCALEDIR}/locale/th/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/metacity.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/metacity.mo @@ -176,6 +180,8 @@ share/themes/Simple/metacity-1/minimize.png @dirrm share/themes/Atlanta @dirrm share/themes/AgingGorilla/metacity-1 @dirrm share/themes/AgingGorilla +@comment in xdg-dirs: @dirrm share/themes +@comment in xdg-dirs: @dirrm share/pixmaps @dirrm share/metacity/icons @dirrm share/metacity/glade @dirrm share/metacity diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk index b57fe67583e..2fb609dd483 100644 --- a/wm/metacity/buildlink3.mk +++ b/wm/metacity/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:35:20 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ METACITY_BUILDLINK3_MK:= ${METACITY_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmetacity} BUILDLINK_PACKAGES+= metacity .if !empty(METACITY_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.metacity+= metacity>=2.6.3nb1 +BUILDLINK_DEPENDS.metacity+= metacity>=2.8.0 BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity .endif # METACITY_BUILDLINK3_MK diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo index 6d23637d34e..3e1eb79a66b 100644 --- a/wm/metacity/distinfo +++ b/wm/metacity/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2004/02/19 13:41:57 jmmv Exp $ +$NetBSD: distinfo,v 1.9 2004/04/01 18:35:20 jmmv Exp $ -SHA1 (metacity-2.6.5.tar.bz2) = 1bd67db67a79e4e35b0b29a22141f971eb0bfb19 -Size (metacity-2.6.5.tar.bz2) = 1775893 bytes +SHA1 (metacity-2.8.0.tar.bz2) = b9aaa74529ce596f086288ef47f91af97eb11853 +Size (metacity-2.8.0.tar.bz2) = 1998468 bytes SHA1 (patch-aa) = eee7a8613f368d0df1aa8e6bfeafaa4f7cdf3b93 diff --git a/wm/metacity/patches/patch-aa b/wm/metacity/patches/patch-aa deleted file mode 100644 index f04f1c95b24..00000000000 --- a/wm/metacity/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2004/02/12 11:13:39 jmmv Exp $ - ---- configure.orig 2003-10-28 01:38:32.000000000 +0100 -+++ configure -@@ -24482,6 +24482,7 @@ ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X - metacity_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - -+if test "${USE_XINERAMA}" != no; then - use_solaris_xinerama=no - use_xfree_xinerama=no - case "$host" in -@@ -24740,6 +24741,7 @@ echo $ECHO_N "checking for Xinerama supp - echo "${ECHO_T}$use_xfree_xinerama" >&6; - ;; - esac -+fi - - CPPFLAGS="$metacity_save_cppflags" - -- cgit v1.2.3