From fe975b2ad7adacc9a120641da8241a0fb513bf98 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 15 Apr 2008 17:53:51 +0000 Subject: update to 2.22.0 This switches to the gnome-2.22 release branch. --- wm/metacity/Makefile | 7 ++++--- wm/metacity/PLIST | 3 ++- wm/metacity/buildlink3.mk | 4 +++- wm/metacity/distinfo | 8 ++++---- x11/libgnomekbd/Makefile | 7 +++---- x11/libgnomekbd/PLIST | 19 ++++++++++++++----- x11/libgnomekbd/distinfo | 9 ++++----- x11/libgnomekbd/patches/patch-aa | 13 ------------- 8 files changed, 34 insertions(+), 36 deletions(-) delete mode 100644 x11/libgnomekbd/patches/patch-aa diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index bb9259f8f67..04b6518f26c 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.75 2008/01/11 12:55:59 drochner Exp $ +# $NetBSD: Makefile,v 1.76 2008/04/15 17:53:51 drochner Exp $ # -DISTNAME= metacity-2.20.2 +DISTNAME= metacity-2.22.0 CATEGORIES= wm x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.20/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.22/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -44,5 +44,6 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST index 81b4666e34c..45ee6331d02 100644 --- a/wm/metacity/PLIST +++ b/wm/metacity/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2007/11/05 19:40:42 drochner Exp $ +@comment $NetBSD: PLIST,v 1.27 2008/04/15 17:53:51 drochner Exp $ bin/metacity bin/metacity-message bin/metacity-theme-viewer @@ -22,6 +22,7 @@ share/gnome-control-center/keybindings/50-metacity-key.xml share/gnome/wm-properties/metacity.desktop share/locale/am/LC_MESSAGES/metacity.mo share/locale/ar/LC_MESSAGES/metacity.mo +share/locale/as/LC_MESSAGES/metacity.mo share/locale/az/LC_MESSAGES/metacity.mo share/locale/be/LC_MESSAGES/metacity.mo share/locale/be@latin/LC_MESSAGES/metacity.mo diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk index 89ce86db1b4..4a53c731def 100644 --- a/wm/metacity/buildlink3.mk +++ b/wm/metacity/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2007/11/05 19:40:42 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2008/04/15 17:53:51 drochner Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ METACITY_BUILDLINK3_MK:= ${METACITY_BUILDLINK3_MK}+ @@ -21,5 +21,7 @@ BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity .include "../../devel/pango/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../x11/libXcomposite/buildlink3.mk" +.include "../../x11/libXdamage/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo index 7ac66c056e9..51afb5b5084 100644 --- a/wm/metacity/distinfo +++ b/wm/metacity/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.35 2008/01/11 12:55:59 drochner Exp $ +$NetBSD: distinfo,v 1.36 2008/04/15 17:53:51 drochner Exp $ -SHA1 (metacity-2.20.2.tar.bz2) = 04779d07627326040b48138dfffa07de2b88820c -RMD160 (metacity-2.20.2.tar.bz2) = 7b2478c1327a6ba04665bb42997fda79217b1e00 -Size (metacity-2.20.2.tar.bz2) = 2035610 bytes +SHA1 (metacity-2.22.0.tar.bz2) = 18e7761152d033b31b13a455be459d986f55a8ba +RMD160 (metacity-2.22.0.tar.bz2) = 9432a4a809b70e1088d3eb5a54be1044ee4e5ccc +Size (metacity-2.22.0.tar.bz2) = 2071931 bytes diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 370fd40fef0..7b092519814 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2008/03/06 14:53:56 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2008/04/15 17:57:15 drochner Exp $ # -DISTNAME= libgnomekbd-2.20.0 -PKGREVISION= 1 +DISTNAME= libgnomekbd-2.22.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.20/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.22/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST index 1a2330b4ecf..cac749cce56 100644 --- a/x11/libgnomekbd/PLIST +++ b/x11/libgnomekbd/PLIST @@ -1,7 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2007/11/03 17:28:00 drochner Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/15 17:57:15 drochner Exp $ bin/gkbd-indicator-plugins-capplet -include/libgnomekbd/gkbd-config-registry-client.h -include/libgnomekbd/gkbd-config-registry.h include/libgnomekbd/gkbd-desktop-config.h include/libgnomekbd/gkbd-indicator-config.h include/libgnomekbd/gkbd-indicator-plugin.h @@ -15,13 +13,13 @@ lib/pkgconfig/libgnomekbd.pc lib/pkgconfig/libgnomekbdui.pc share/applications/gkbd-indicator-plugins-capplet.desktop share/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas -share/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png share/libgnomekbd/glade/gkbd-indicator-plugins.glade share/locale/ar/LC_MESSAGES/libgnomekbd.mo share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo share/locale/bg/LC_MESSAGES/libgnomekbd.mo share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo share/locale/ca/LC_MESSAGES/libgnomekbd.mo +share/locale/cs/LC_MESSAGES/libgnomekbd.mo share/locale/da/LC_MESSAGES/libgnomekbd.mo share/locale/de/LC_MESSAGES/libgnomekbd.mo share/locale/dz/LC_MESSAGES/libgnomekbd.mo @@ -29,10 +27,12 @@ share/locale/el/LC_MESSAGES/libgnomekbd.mo share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo share/locale/es/LC_MESSAGES/libgnomekbd.mo share/locale/et/LC_MESSAGES/libgnomekbd.mo +share/locale/eu/LC_MESSAGES/libgnomekbd.mo share/locale/fi/LC_MESSAGES/libgnomekbd.mo share/locale/fr/LC_MESSAGES/libgnomekbd.mo share/locale/gl/LC_MESSAGES/libgnomekbd.mo share/locale/gu/LC_MESSAGES/libgnomekbd.mo +share/locale/he/LC_MESSAGES/libgnomekbd.mo share/locale/hu/LC_MESSAGES/libgnomekbd.mo share/locale/it/LC_MESSAGES/libgnomekbd.mo share/locale/ja/LC_MESSAGES/libgnomekbd.mo @@ -40,8 +40,11 @@ share/locale/ka/LC_MESSAGES/libgnomekbd.mo share/locale/ko/LC_MESSAGES/libgnomekbd.mo share/locale/lt/LC_MESSAGES/libgnomekbd.mo share/locale/mk/LC_MESSAGES/libgnomekbd.mo +share/locale/ml/LC_MESSAGES/libgnomekbd.mo +share/locale/mr/LC_MESSAGES/libgnomekbd.mo share/locale/nb/LC_MESSAGES/libgnomekbd.mo share/locale/nl/LC_MESSAGES/libgnomekbd.mo +share/locale/nn/LC_MESSAGES/libgnomekbd.mo share/locale/oc/LC_MESSAGES/libgnomekbd.mo share/locale/or/LC_MESSAGES/libgnomekbd.mo share/locale/pa/LC_MESSAGES/libgnomekbd.mo @@ -50,15 +53,21 @@ share/locale/pt/LC_MESSAGES/libgnomekbd.mo share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo share/locale/ru/LC_MESSAGES/libgnomekbd.mo share/locale/si/LC_MESSAGES/libgnomekbd.mo +share/locale/sl/LC_MESSAGES/libgnomekbd.mo +share/locale/sq/LC_MESSAGES/libgnomekbd.mo +share/locale/sr/LC_MESSAGES/libgnomekbd.mo +share/locale/sr@Latn/LC_MESSAGES/libgnomekbd.mo share/locale/sv/LC_MESSAGES/libgnomekbd.mo share/locale/ta/LC_MESSAGES/libgnomekbd.mo share/locale/th/LC_MESSAGES/libgnomekbd.mo +share/locale/tr/LC_MESSAGES/libgnomekbd.mo share/locale/uk/LC_MESSAGES/libgnomekbd.mo share/locale/vi/LC_MESSAGES/libgnomekbd.mo share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo +share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo +share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo @dirrm share/libgnomekbd/glade @dirrm share/libgnomekbd -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor @comment in GConf: @dirrm share/gconf/schemas @comment in xdg-dirs: @dirrm share/applications diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index a3c6b92ff44..84f5c8bf3dc 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.3 2007/11/03 17:28:00 drochner Exp $ +$NetBSD: distinfo,v 1.4 2008/04/15 17:57:15 drochner Exp $ -SHA1 (libgnomekbd-2.20.0.tar.bz2) = f48867cf237e9d0bc8508f5e5966b7307c902759 -RMD160 (libgnomekbd-2.20.0.tar.bz2) = 594ce4e66300fcd468d25f9d65624d8789f46de1 -Size (libgnomekbd-2.20.0.tar.bz2) = 392206 bytes -SHA1 (patch-aa) = f8b99c1ae11fc3a563fdddf3613b111605fe3130 +SHA1 (libgnomekbd-2.22.0.tar.bz2) = 62a11b227d4bcbc3df64fbdfc7e075e9366140da +RMD160 (libgnomekbd-2.22.0.tar.bz2) = 23cabca07aaf18325fc6ca6d4daade4b86044ad0 +Size (libgnomekbd-2.22.0.tar.bz2) = 406083 bytes diff --git a/x11/libgnomekbd/patches/patch-aa b/x11/libgnomekbd/patches/patch-aa deleted file mode 100644 index 7e2f09c09f1..00000000000 --- a/x11/libgnomekbd/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2007/11/03 17:28:00 drochner Exp $ - ---- libgnomekbd/Makefile.in.orig 2007-09-17 12:34:59.000000000 +0200 -+++ libgnomekbd/Makefile.in -@@ -308,7 +308,7 @@ common_LDFLAGS = -version-info @VERSION_ - libgnomekbd_la_LDFLAGS = $(common_LDFLAGS) - libgnomekbdui_la_LDFLAGS = $(common_LDFLAGS) \ - $(GTK_LIBS) \ -- -lgnomekbd -+ libgnomekbd.la - - libgnomekbd_la_SOURCES = \ - gkbd-config-registry.c \ -- cgit v1.2.3