From d58156c1b5019bd4522bfade3ac09b1280c9de75 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 15 Nov 2008 12:21:34 +0000 Subject: Update to 2.24.1. Split off options handling into options.mk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit =============== Version 2.24.1 =============== - Fixed #555701, libgnome-desktop:gnome_bg_create_pixmap() leaks pixmaps and X clients (Scott Remnant) - Fixed #451498, Preview of "Blank screen" is not consistent (Neil Patel) - Fixed #552119, Add GTK and GNOME to screensaver desktop (William Jon McCann) - Fixed #552523, Screensaver suddenly stopped working (William Jon McCann) - Fixed #555254, gnome-screensaver-dialog NULL pointer crash (William Jon McCann) - Fixed #555491, gnome-screensaver should release mouse/keyboard when failed to grab both of them (Joey Yu Zheng) - Fixed #560456, Cleaning up GTK Includes in gnome-screensaver (Maxim Ermilov) Translations: - Updated ar: Djihed Afifi - Updated ast: Andre Klapper, Astur - Updated be@latin: Ihar Hračyška, Ihar Hrachyshka - Updated pt_BR: Leonardo Ferreira Fontenelle, Vladimir Melo =============== Version 2.24.0 =============== - Updated LINGUAS, sr@latin.po, sr@Latn: Arangel Angov - Updated ar: Djihed Afifi, Khaled Hosny - Updated bg: Alexander Shopov - Updated bn_IN: Runa Bhattacharjee - Updated ca: Gil Forcada - Updated da: Kenneth Nielsen - Updated de: Hendrik Richter - Updated dz: Pema Geyleg, Dawa pemo - Updated en_GB: Philip Withnall, David Lodge - Updated et: Ivar Smolin - Updated fr: Claude Paroz - Updated ga: Seán de Búrca - Updated hr: Robert Sedak, Ante Karamatić - Updated hu: Gabor Kelemen - Updated it: Luca Ferretti - Updated kn: Shankar Prasad - Updated ko: Changwoo Ryu - Updated mk: Arangel Angov, Clytie Siddall - Updated ml: Praveen Arimbrathodiyil, പ്രവീണ്‍ അരിമ്പ്രത്തൊടിയില്‍ - Updated mr: Sandeep Shedmake - Updated nl: Wouter Bolsterlee - Updated pl: Wadim Dziedzic, wadim dziedzic - Updated pt_BR: Vladimir Melo - Updated ro: Mugurel Tudor, Mișu Moldovan - Updated sr.po, sr@latin: Goran Rakić - Updated ta: I. Felix - Updated tr: Baris Cicek =============== Version 2.23.90 =============== - use standard icon names (Matthias Clasen) - Paint widget background color as face background color. - Add/remove windows as necessary in response to RANDR 1.2 events - Honor the disable_user_switching lockdown key. - Fixed #547013, The dialog incorrectly tell that the numlock is on (William Jon McCann) Translations: - Updated LINGUAS, sr@latin.po, sr@Latn: Goran Rakic - Updated ar: Khaled Hosny - Updated cs: Petr Kovar - Updated eu: Inaki Larranaga Murgoitio, Iñaki Larrañaga Murgoitio - Updated fi: Ilkka Tuohela, Timo Jyrinki - Updated gu: Daniel Nylander, Sweta Kothari - Updated he: Yair Hershkovitz , Yaniv Abir - Updated ja: Takeshi AIHANA - Updated lt: Gintautas Miliauskas - Updated pt: Duarte Loreto - Updated pt_BR: Vladimir Melo - Updated sv: Daniel Nylander Help Manual Translations: None =============== Version 2.23.3 =============== * Fix build issue (Wouter Bolsterlee) * Add a simple frame around user icon * Add a new child widget to use for themes to draw on =============== Version 2.23.2 =============== * Fix gamma lost during fade * Show default desktop background behind lock dialog * Add reporting of inhibitors to --query command --- x11/gnome-screensaver/Makefile | 43 +++++++++++----------------------- x11/gnome-screensaver/PLIST | 8 +++++-- x11/gnome-screensaver/distinfo | 9 ++++--- x11/gnome-screensaver/options.mk | 19 +++++++++++++++ x11/gnome-screensaver/patches/patch-ac | 12 ---------- 5 files changed, 43 insertions(+), 48 deletions(-) create mode 100644 x11/gnome-screensaver/options.mk delete mode 100644 x11/gnome-screensaver/patches/patch-ac (limited to 'x11/gnome-screensaver') diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index ef46717ec00..6df7457d133 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -1,14 +1,16 @@ -# $NetBSD: Makefile,v 1.30 2008/06/20 01:09:44 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2008/11/15 12:21:34 wiz Exp $ # -DISTNAME= gnome-screensaver-2.22.2 +DISTNAME= gnome-screensaver-2.24.1 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.22/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.24/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://live.gnome.org/GnomeScreensaver/ COMMENT= Screen saver and locker for the GNOME desktop +BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto + PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes @@ -16,26 +18,10 @@ USE_DIRS+= xdg-1.3 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt pkg-config -USE_X11= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-screensaver -PKG_SUPPORTED_OPTIONS= pam - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mpam) -. include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --enable-pam -. include "../../mk/bsd.prefs.mk" -. if ${OPSYS} == "NetBSD" -# needed to read shadow passwords -DEPENDS+= pam-pwauth_suid-*:../../security/pam-pwauth_suid -. endif -.else -CONFIGURE_ARGS+= --disable-pam -.endif +.include "options.mk" PKGCONFIG_OVERRIDE= data/gnome-screensaver.pc.in @@ -48,11 +34,6 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus CONF_FILES= ${EGDIR}/xdg/menus/gnome-screensavers.menu \ ${PKG_SYSCONFDIR}/xdg/menus/gnome-screensavers.menu -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0 -BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.12 -BUILDLINK_API_DEPENDS.libglade+= libglade>=2.5.0 - INSTALLATION_DIRS= ${EGDIR}/pam.d post-install: @@ -61,23 +42,27 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/data/gnome-screensaver \ ${DESTDIR}${EGDIR}/pam.d/gnome-screensaver-Linux -.if empty(PKG_OPTIONS:Mpam) -SPECIAL_PERMS+= libexec/gnome-screensaver-dialog ${SETUID_ROOT_PERMS} -.endif - .include "../../devel/GConf/schemas.mk" +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 .include "../../devel/glib2/buildlink3.mk" +BUILDLINK_API_DEPENDS.libglade+= libglade>=2.5.0 .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" +.include "../../graphics/MesaLib/buildlink3.mk" +BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.12 .include "../../graphics/libexif/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" +BUILDLINK_API_DEPENDS.gnome-desktop+= gnome-desktop>=2.23.2 +.include "../../x11/gnome-desktop/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.11.5 .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXScrnSaver/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXxf86misc/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" +.include "../../x11/libgnomekbd/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-screensaver/PLIST b/x11/gnome-screensaver/PLIST index a7053237af7..d99c4ab14da 100644 --- a/x11/gnome-screensaver/PLIST +++ b/x11/gnome-screensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2008/04/15 18:12:08 drochner Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/11/15 12:21:34 wiz Exp $ bin/gnome-screensaver bin/gnome-screensaver-command bin/gnome-screensaver-preferences @@ -25,6 +25,7 @@ share/gnome-screensaver/gnome-screensaver-preferences.glade share/gnome-screensaver/lock-dialog-default.glade share/locale/ar/LC_MESSAGES/gnome-screensaver.mo share/locale/as/LC_MESSAGES/gnome-screensaver.mo +share/locale/ast/LC_MESSAGES/gnome-screensaver.mo share/locale/be/LC_MESSAGES/gnome-screensaver.mo share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo share/locale/bg/LC_MESSAGES/gnome-screensaver.mo @@ -50,11 +51,14 @@ share/locale/gl/LC_MESSAGES/gnome-screensaver.mo share/locale/gu/LC_MESSAGES/gnome-screensaver.mo share/locale/he/LC_MESSAGES/gnome-screensaver.mo share/locale/hi/LC_MESSAGES/gnome-screensaver.mo +share/locale/hr/LC_MESSAGES/gnome-screensaver.mo share/locale/hu/LC_MESSAGES/gnome-screensaver.mo share/locale/id/LC_MESSAGES/gnome-screensaver.mo +share/locale/is/LC_MESSAGES/gnome-screensaver.mo share/locale/it/LC_MESSAGES/gnome-screensaver.mo share/locale/ja/LC_MESSAGES/gnome-screensaver.mo share/locale/ka/LC_MESSAGES/gnome-screensaver.mo +share/locale/kn/LC_MESSAGES/gnome-screensaver.mo share/locale/ko/LC_MESSAGES/gnome-screensaver.mo share/locale/ku/LC_MESSAGES/gnome-screensaver.mo share/locale/lt/LC_MESSAGES/gnome-screensaver.mo @@ -82,7 +86,7 @@ share/locale/sk/LC_MESSAGES/gnome-screensaver.mo share/locale/sl/LC_MESSAGES/gnome-screensaver.mo share/locale/sq/LC_MESSAGES/gnome-screensaver.mo share/locale/sr/LC_MESSAGES/gnome-screensaver.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo +share/locale/sr@latin/LC_MESSAGES/gnome-screensaver.mo share/locale/sv/LC_MESSAGES/gnome-screensaver.mo share/locale/ta/LC_MESSAGES/gnome-screensaver.mo share/locale/te/LC_MESSAGES/gnome-screensaver.mo diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index accc88889ca..749b2f8e1d7 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.13 2008/09/16 02:56:08 jmcneill Exp $ +$NetBSD: distinfo,v 1.14 2008/11/15 12:21:34 wiz Exp $ -SHA1 (gnome-screensaver-2.22.2.tar.gz) = 83a524c956e5cea7c8e563842d660ef3997ddcb7 -RMD160 (gnome-screensaver-2.22.2.tar.gz) = d400a90df65d0c5a1b7d69f704d551fc0c09e74a -Size (gnome-screensaver-2.22.2.tar.gz) = 2321751 bytes +SHA1 (gnome-screensaver-2.24.1.tar.gz) = dd66c19b852094962ab25915c76ea832a3bd8430 +RMD160 (gnome-screensaver-2.24.1.tar.gz) = 661bb4bc28c66c62a11fb1549b2f0775cd2b5fcf +Size (gnome-screensaver-2.24.1.tar.gz) = 2351800 bytes SHA1 (patch-aa) = 2ae4a97f1d51ff20f4002fca9e01c4d70624b696 SHA1 (patch-ab) = 5b5f9d69fd071bfd6f9b316626e23585841dad9d -SHA1 (patch-ac) = a040a5aa256e0137e80878ab5e40c9463ab546b6 diff --git a/x11/gnome-screensaver/options.mk b/x11/gnome-screensaver/options.mk new file mode 100644 index 00000000000..552877390bd --- /dev/null +++ b/x11/gnome-screensaver/options.mk @@ -0,0 +1,19 @@ +# $NetBSD: options.mk,v 1.1 2008/11/15 12:21:34 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-screensaver +PKG_SUPPORTED_OPTIONS= pam + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mpam) +. include "../../mk/pam.buildlink3.mk" +CONFIGURE_ARGS+= --enable-pam +. include "../../mk/bsd.prefs.mk" +. if ${OPSYS} == "NetBSD" +# needed to read shadow passwords +DEPENDS+= pam-pwauth_suid-[0-9]*:../../security/pam-pwauth_suid +. endif +.else +CONFIGURE_ARGS+= --disable-pam +SPECIAL_PERMS+= libexec/gnome-screensaver-dialog ${SETUID_ROOT_PERMS} +.endif diff --git a/x11/gnome-screensaver/patches/patch-ac b/x11/gnome-screensaver/patches/patch-ac deleted file mode 100644 index 851ebdc4f8b..00000000000 --- a/x11/gnome-screensaver/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2008/09/16 02:56:08 jmcneill Exp $ - ---- src/copy-theme-dialog.c.orig 2008-09-15 22:53:50.000000000 -0400 -+++ src/copy-theme-dialog.c 2008-09-15 22:54:07.000000000 -0400 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "copy-theme-dialog.h" - -- cgit v1.2.3