summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjmmv <jmmv>2006-03-30 21:25:48 +0000
committerjmmv <jmmv>2006-03-30 21:25:48 +0000
commit49d6b23ad22fa4b27c44da77ad02ccc900c9b4a3 (patch)
treec47502d89e0b56da43396973d473f68ec47f04c2 /x11
parenteebc942aba03ed3c65d4b7a11f26407618989839 (diff)
downloadpkgsrc-49d6b23ad22fa4b27c44da77ad02ccc900c9b4a3.tar.gz
Update to 2.14.0:
2.14.0 stuff: - Now GDM will update the actual custom configuration file used by the daemon, so if gdm.conf is being used by the daemon, it will also be edited by gdmsetup. - Now the Options menu will appear below the button if there is room, and above the button otherwise. Previously it always appeared above, even if there was no room. - Fix sound-on-login-success and sound-on-login-failure configuration options so they are honored. Previously the sounds were playing even if set to false. - Translation updates (Stanislav Brabec, Beno\303\256t Dejean, Laurent Dhima, Priit Laes, Ole Laursen, Lukas Novotny, Daniel Nylander, Rajest Ranjan, Alexander Shopov, Mugurel Tudor, Ilkka Tuohela, Tommi Vainikainen, Vincent van Adrighem) 2.13.0.10 stuff: - Now GDM will use the gdm.conf file if it exists as the custom.conf file, so if the user has an old configuration file it will continue to use that. (Brian Cameron) - Translation updates (Gabor Kelemen, Alexander Shopov) 2.13.0.9 stuff: - New "gtk-theme" property can be used with the <greeter> tag in gdmgreeter themes to specify a theme to control the appearance of the F10/Options menu, the entry field, and other GTK+ widget appearance. (Brian Cameron) - Core dumping problem with gdmgreeter should be fixed. (Brian Cameron) - Some fixes to memory management. Memory leak issues resolved. (Brian Cameron) - Correct error message that is printed when ServAuthDir isn't owned by root:gdm. THis doesn't affect localization since the string didn't change, just the value placed into the %s sequence. (Brian Cameron) - Some C-99 compile issues resolved. (Jans Granseur) - Translation updates (Takeshi AIHANA, \305\275ygimantas Beru\304\215ka, Raphael Higino, Inaki Larranaga, Rhys Jones, Leonid Kanter, Priit Laes, Chao-Hsiung Liao, Duarte Loreto, Kjartan Maraas, Kostas Papadimas, Satoru SATOH, Clytie Siddall, Slobodan D. Sredojevic) 2.13.0.8 stuff: - Because the main gdm.conf file is now read-only, contains distro defaults and is not to be edited by the user, the file has been moved to ${datadir}/gdm/defaults.conf (also factory-gdm.conf is now %{datadir}/gdm/factory-defaults.conf). Users can use the --with-defaults-conf to specify the location of this file. Note that this means that distributions who want to preserve GDM configuration set by those using older versions of GDM should use preinstall/postinstall scripts to move the /etc/gdm/gdm.conf file to /etc/gdm/gdm.conf-custom if the file has been edited (compare against /etc/gdm/factory-gdm.conf to see if it has been modified). "make install" for GDM does this if building from source. GDM docs updated to reflect this change. - Lots of performance issues with the GDM sockets connection improved. Now the code deals much better with failures, and better debug is printed to the log. - Improved debug logic in GDM slaves so they use common functions. - Fix gdmdynamic so it supports up to hundreds of displays rather than just a dozen or so. Now gdmdynamic backs off on sending sockets commands to the server if it is being flooded with requests. Added new "SERVER_BUSY" sockets command to support this feature and new -t and -s command line options so the back-off behavior can be tuned, if needed. - The config logic for the slaves will now return the compiled in value if it fails to connect to the server for better behavior. - gdm-restart, gdm-safe-restart, gdm-stop, and gdm.spec now use gdmflexiserver to get config data rather than trying to grep and awk the config file directly. - Fix Xsession script so zenity calls work. - Lots of improvements to the GDM docs. Added section about "PAM" in Security. Add comment that +xkb is needed for keyboard gesture listeners (accessibility) to work. Also updated README and README.install and moved some information that was in these files to the docs. - Bump MAX_CONNECTIONS from 10 to 15 so that the daemon will accept more connections from slaves. This improves performance when the daemon is flooded with requests. - Fix include statement in daemon/gdmconfig.c to fix compile problem on LFS. - Translation updates (Raphael Higino, Theppitak Karoonboonyanan, Priit Laes, Kjartan Maraas, Lukas Novotny, Ankit Patel, Josep Puigdemont i Casamaj\303\263, Ignacio Casal Quinteiro, Hendrik Richter, Francisco Javier F. Serrador, Clytie Siddall, Slobodan D. Sredojevic, Ilkka Tuohela, Vincent van Adrighem, Funda Wang, Adam Weinberger) 2.13.0.7 stuff: - Turns out the core dumping issue that was supposed to be fixed in 2.13.0.6 wasn't really fixed. Now it is. (Sebastien Bacher) - New "options_button" available for gdmgreeter themes. This pops up the F10 menu which has all the choices found in the Disconnect, System, Sessions, and Language buttons so that themes can have a cleaner 1-button look. The default circles, happygnome, and happygnome-list themes now use this style. (Sebastien Bacher, Brian Cameron) - Fix bugs that were causing User24HourClock=auto to not work properly. Now GDM should properly grab the system time format when auto is set. (Christopher Aillon) - Fix bug in PreSession script that was causing it to not properly set the background color before starting user session. (Brian Cameron) - GDM docs now has a troubleshooting section. (Brian Cameron) - Make sure /usr/openwin/bin is in PATH on Solaris, since this is needed for PreSession/PostSession scripts to find sessreg and other needed X programs. (Brian Cameron) - String change of "XDMCP Chooser" to "Remote Login via XDMCP". (Brian Cameron) - Minor tweaks to default/example gdmprefetchlist file so it works better for GNOME 2.14 out of the box. (Brian Cameron) - Translation updates (Stanislav Brabec, Theppitak Karoonboonyanan, Chao-Hsiung Liao, Kjartan Maraas, Lasse Bang Mikkelsen, Kostas Papadimas, Ankit Patel, Ignacio Casal Quinteiro, Alexander Shopov, Clytie Siddall, Slobodan D. Sredojevic, Ilkka Tuohela, Vincent van Adrighem, Adam Weinberger, Funda Wang) 2.13.0.6 stuff: - The core dumping issue mentioned in the previous release note has been corrected. IncludeAll and the Face Browser should no longer core dump. (Sebastien Bacher) - Using "restart" instead of "reboot" in messages. (Brian Cameron) - Docs added for "Secure Remote" feature added in last release. (Dominique Hazael-Massieux) - Translation updates (Kjartan Maraas, Lasse Bang Mikkelsen, Ankit Patel, Ignacia Casal Quinteriro, Clytie Siddall, Ilkka Tuohela) 2.13.0.5 stuff: Note: Some users have been complaining that GDM 2.13.0.4 core dumps when the IncludeAll feature is turned on, and the face browser is also being used. I can not recreate this problem on my machine, so this issue may still exist on some platforms. - GDM now supports secure remote login which can be enabled by using --enable-securelogin at configure time. (Dominique Hazael-Massieux) - Fixed gdmsetup so the Logo/Background file chooser does not generate assert warnings and no longer will reset your logo/background to NULL. I think this problem was causing occasional core dumping issues. Also cleaned up memory management in gdmsetup a bit. (Brian Cameron) - Now SELinux initialization logic does not use setexeccon if is_selinux_enabled returns -1. (Dan Walsh) - The prefetch logic that is enabled by using --with-prefetch was improved and GDM will now install a default librarylist if the feature is enabled. Now GDM will only launch the gdm_prefetch program the first time that a greeter is displayed. Since this behavior is very specific to the needs of prefetching libraries, the gdm.conf key changed from PostDisplayProgram to PreFetchProgram. (Padraig O'Briain/Brian Cameron) - GDM no longer requires libgnome or libgnomeui at all. This should improve GDM performance and make GDM more lightweight. (Jani Monoses) - GDM Daemon now uses the GDK_DISPLAY_XDISPLAY macro instead of the GDK_DISPLAY macro since the GDK_DISPLAY macro causes the GDM daemon to require the libgdk-x11 library to always be loaded into memory. Now it can lazyload this library only when needed (when GDM daemon displays error GUI's which only happens when GDM can't start up properly). This should improve performance and make GDM more lightweight for the normal case where GDM does start up. (Brian Cameron) - Minor cleanup of gdmsetup. (Dennis Cranston) - Caps lock and Shut down messages changed to be more consistant between gdmlogin and gdmgreeter. Error message provided when session file is invalid now tells you the name of the offending file. (Brian Cameron) - GDM docs given some attention, new "Security" and "Performance" sections and a good bit of information added to the "Introduction" and "Accessibility" sections. (Brian Cameron) - Translation updates (Takeshi AIHANA, Chao-Hsiung Liao, Theppitak Karoonboonyanan, Kjartan Maraas, Ankit Patel, Josep Puigdemont, Ignacio Casal Quinteiro, Francisco Javier F. Serrador, Clytie Siddall, Alexander Sopov, Slobodan D. Sredojevic, Ilkka Tuohela, Vincent van Adrighem, Adam Weinberger) 2.13.0.4 stuff: Interface Changes: - This version of GDM handles its configuration files slighly differently. Now users are not recommended to modify the installed gdm.conf file and are instead encouraged to make changes to gdm.conf-custom. The gdmsetup program now saves user configuration changes to the gdm.conf-custom file. Configuration options specified in gdm.conf-custom file override the values in the main gdm.conf file. This allows distributions to overwrite the gdm.conf file without worry that the file contains any user customizations. When running "make install" GDM now compares the already installed gdm.conf with the already installed factory-gdm.conf file and if they both exist and are not the same, then gdm.conf file is moved to gdm.conf-custom to preserve user changes. If the gdm.conf-custom file already exists it is renamed to gdm.conf.org. Distributions should do the same when upgrading GDM. Note that this change is backwards compatible. GDM will still work as it did before even if no gdm.conf-custom file exists on the system. (Brian Cameron) - gdmconfig no longer supports the --config command line option since it now accesses the configuration data over the sockets protocol rather than reading the configuration files directly. Note the GDM daemon still supports the --config command line option. - Added PostDisplayProgram and the --with-prefetch configuration option to support GDM running a prefetch script to preload libraries when it firsts starts the greeter program, which has been shown to improve first time login time. (Padraig O'Briain, Brian Cameron) - Add new priority configuration option for servers defined in the [server-foo] section of the configuration files. This can be set from -20 to +20 in order to specify the priority value given to the Xserver on startup. (Philip Prindeville) Other Changes: - This release completes the internal redesign of GDM's configuration system. Now all configuration information is read by the daemon and accessed via the GDM sockets protocol. The GET_SERVER_LIST and GET_SERVER_DETAILS sockets commands were added to support accessing the [server-foo] sections of the configuration file via the sockets protocol. (Brian Cameron) - Merged code for parsing character sequences in gdmgreeter labels and the Welcome/RemoteWelcome keys, so now they are handled the same by both gdmlogin and gdmgreeter. Now %d is used for display number and %s is the system name (uname.sysname). The previously undocumented sequences are now explained in the documentation. (Brian Cameron) - Fixed bug that caused TimedLogin/AutomaticLogin to be turned on if it had a username value but TimedLoginEnable/AutomaticLoginEnable had a "false" value. (Brian Cameron) - Fixed bug that caused the TimedLogin user to be logged in if the user hit the "ENTER" key without entering a password. Mention in the GDM documentation that if the user does not enter a username but just hits the ENTER key while the login program is requesting the username, then GDM will just login as the timed user. (Brian Cameron) - Removed libgnome as a GDM dependency and removed most libgnomeui dependencies. Redesigning GDM's configuration allowed GDM to stop using deprecated gnome_config interfaces, for example. (Brian Cameron) - Fixed a bug with keeping the sockets protocol open for multiple commands that was included in the last release, and fixed memory handling issues that was causing core dumping with gdmsetup in the previous release. (Brian Cameron) - Fixed bug with the --with-configdir configure option. (Brian Cameron) - Now use glib stdio functions like g_chmod instead of chmod. (Brian Cameron) - Corrected typos and grammar (Brian Cameron, Asmund Skjaeveland, Adam Weinberger) - Translation updates (Takeshi AIHANA, \305\275ygimantas Beru\304\215ka, Theppitak Karoonboonyanan, Kostas Papadimas, Ankit Patel, Ignacio Casal Quinteiro, Francisco Javier F. Serrador, Clytie Siddall, Marcel Telka, Ilkka tuohela, Funda Wang, Adam Weinberger) 2.13.0.3 stuff: - Minor UI improvements to gdmsetup (Dennis Cranston, Calum Benson) - Removed libgnome dependencies for all GDM programs except gdmflexiserver and gdmsetup. These should be fixed for the next release. (Jani Monoses, Brian Cameron) - Now communications protocol used by client does not shut down after each call, improves performance. (Brian Cameron) - More clear stability information about gdm.conf file in README (Brian Cameron) - Translation updates (Takeshi AIHANA, \305\275ygimantas Beru\304\215ka, Theppitak Karoonboonyanan, Kjartan Maraas, Christophe Merlet, Francisco Javier F. Serrador, \303\205smund Skj\303\246veland, Alexander Shopov, Marcel Telka, Miloslav Trmac, Ignacio Casal Quinteiro, Adam Weinberger) 2.13.0.2 stuff: - Further redesign of configuration parsing logic. Now all GDM slaves (except gdmsetup) use the GET_CONFIG socket command to access configuration data. This means all configuration parsing is now handled in one place, the daemon. Improvements to the daemon configuration parsing so it correctly parses and validates all parameters used by the slave programs. Also fix some compile issues that were causing problems with certain configurations. (Brian Cameron) - Improved the GET_CONFIG command so that you don't have to include the default value (you can use "greeter/IncludeAll" instead of having to use "greeter/IncludeAll=false". Also you can access keys that contain translatable strings (e.g. "greeter/Welcome[cs]") via the GET_CONFIG command. (Brian Cameron) - Changes to peeking VT freeness in 2.13.0.1 broke virtual terminal support on BSD. This release corrects this problem. (Brian Cameron) - Correct Linux get VT logic so it returns the correct VT. (Frederic Crozat) - Now gdmlogin always uses GDK_RGB_DITHER_MAX when painting the background to ensure a nice background regardless of X configuration (e.g. X in 16bpp mode). (Frederic Crozat) - Now check for Xserver in prefix /usr. (J\303\274rg Billeter) - Fix configure for Darwin. (dmacks@netspace.org) - Fix compiler warnings. (Frederic Crozat, dmacks@netspace.org, Brian Cameron) - Ensure gnome.desktop and default.desktop have 644 perms. (Andrew Benton) - Translation updates (Takeshi AIHANA, \305\275ygimantas Beru\304\215ka, Theppitak Karoonboonyanan, Priit Laes, Ignacio Casal Quinteiro, Alexander Shopov, Francisco Javier F. Serrador, Marcel Telka, Funda Wang, Adam Weinberger) 2.13.0.1 stuff: - Complete redesign of gdmsetup so it follows usability recommendation mockups by Calum Benson. (Dennis Cranston, Calum Benson) - gdmsetup now supports drag-and-drop for new themes. (Dennis Cranston) - The chooser GUI has been HIGified. (Dennis Cranston) - Redesign of configuration parsing logic in the GDM daemon which simplifies how the UPDATE_CONFIG and GET_CONFIG commands work, better encapsulates the vicious-extensions logic, and cleans up the code. (Brian Cameron) - If slave does not respond to a SIGTERM, try a SIGKILL the second time. This resolves a problem where GDM sometimes stops managing a display because it just keeps waiting for the slave to die. See bug #113902. (Vaclav Smilauer) - GDM now uses VT_GETSTATE for peeking VT freeness (Samuel Thibault) - Now GDM warns correctly about caps lock if an alternate keymap is enabled. kbGetState is used instead of XkbGetIndicator State. (Sebastien Bacher) - Fixed race condition where a variable used by the signal handlers was not being set until after the signal handlers were setup. Now it is set before avoiding a race. (Simon Bowden/Brian Cameron) - Now check for X server in prefix /usr. (J\303\274rg Billeter) - Check for XInput fixed in configure and add a check for libgen.h to avoid compiler warnings. (Brian Cameron) - Updated check in configure for socklen_t so it includes sys/socket.h to better support BSD platforms that define socklen_t there. (dmacks@netspace.org) - Kurdish added to ALL_LINGUAS. (Erdal Ronahi) - Translation updates (Takeshi AIHANA, Dan Damian, Theppitak Karoonboonyanan, Priit Laes, Chao-Hsiung Liao, Roozbeh Pournader, Erdal Ronahi, Francisco Javier F. Serrador, Marcel Telka, Funda Wang, Adam Weinberger) 2.13.0.0 stuff: - Fix problem with PostSession script not always being executed when user kills the Xserver with ctrl-alt-backspace. Fixes bug #152906. (Jerry G. DeLapp) - No longer set tooltips for menu items in gdmlogin. These do not work with accessibility and no GNOME programs use menu tooltips, it is not recommended. (Brian Cameron) - Change the way the "OK" and "Cancel" buttons work so they are consistant. Now the "Cancel" button in gdmlogin is active when the Username is requested and just clears the field. This makes gdmlogin work like gdmgreeter. Now make the buttons insensitive when the ok/enter/tab is pressed and make them sensitive again when the greeter wants entry. This fixes a bug where the greeter's memory could get corrupted by pressing "Cancel" after authentication (which would only happen if the PostLogin script caused a long enough delay to allow this to happen or perhaps on a really slow machine). (Brian Cameron) - Correct reading of config file in gdmflexiserver. (Christiaan Welvaart) - GNOME HIG fixes for the Language, Session, and Message dialogs. (Dennis Cranston) - Define SoundProgram to be /usr/bin/audioplay instead of /usr/bin/play on Solaris. /usr/bin/play does not exist on Solaris. - Better /etc/default/login support on Solaris. Previously it supported only PASSREQ. Now it supports PATH, SUPATH and CONSOLE (the same ones CDE login supports). Added new PasswordRequired gdm.conf setting so that PASSREQ can be controlled via gdm.conf as well. - Memory leaks fixed. (Steve Grubb/Brian Cameron) - Improvements to strings and docs (Adam Weinberger, Brian Cameron) - Translation updates (Takeshi AIHANA, Runa Bhattacharjee, Priit Laes, Chao-Hsiung Liao, Ignacio Casal Quinteiro, Vincent van Adrighem, Funda Wang, Adam Weinberger)
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile27
-rw-r--r--x11/gdm/PLIST20
-rw-r--r--x11/gdm/distinfo20
-rwxr-xr-xx11/gdm/files/gdm.sh4
-rw-r--r--x11/gdm/patches/patch-aa58
-rw-r--r--x11/gdm/patches/patch-ac6
-rw-r--r--x11/gdm/patches/patch-ad14
-rw-r--r--x11/gdm/patches/patch-ae41
-rw-r--r--x11/gdm/patches/patch-af127
-rw-r--r--x11/gdm/patches/patch-ag20
-rw-r--r--x11/gdm/patches/patch-ai14
-rw-r--r--x11/gdm/patches/patch-aj14
-rw-r--r--x11/gdm/patches/patch-ak16
13 files changed, 109 insertions, 272 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index bb759575d93..0ea10590459 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2006/03/21 06:00:52 jlam Exp $
+# $NetBSD: Makefile,v 1.103 2006/03/30 21:25:48 jmmv Exp $
#
-DISTNAME= gdm-2.8.0.7
-PKGREVISION= 4
+DISTNAME= gdm-2.14.0
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.8/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.14/}
EXTRACT_SUFX= .tar.bz2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.README Daemon.png
@@ -14,6 +13,8 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program
BUILD_USES_MSGFMT= YES
+DEPENDS+= zenity>=2.14.0:../../x11/zenity
+
BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11
SITES_Daemon.README= ${MASTER_SITE_LOCAL}
@@ -35,10 +36,13 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
+INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR}/gdm/custom.conf
+INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
-OWN_DIRS= ${PKG_SYSCONFDIR}/dm/Sessions
+OWN_DIRS= ${PKG_SYSCONFDIR}/dm
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/Init
+OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PostLogin
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PostSession
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/PreSession
OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/modules
@@ -46,17 +50,16 @@ OWN_DIRS+= ${VARBASE}/gdm
OWN_DIRS+= ${VARBASE}/log/gdm
EGDIR= ${PREFIX}/share/examples
-CONF_FILES= ${EGDIR}/dm/Sessions/default.desktop \
- ${PKG_SYSCONFDIR}/dm/Sessions/default.desktop
-.for f in gdm.conf locale.alias \
+CONF_FILES=
+.for f in custom.conf locale.alias \
modules/AccessDwellMouseEvents modules/AccessKeyMouseEvents \
modules/factory-AccessDwellMouseEvents \
modules/factory-AccessKeyMouseEvents
CONF_FILES+= ${EGDIR}/gdm/${f} \
${PKG_SYSCONFDIR}/gdm/${f}
.endfor
-.for f in Init/Default PostSession/Default PreSession/Default \
- XKeepsCrashing Xsession
+.for f in Init/Default PostLogin/Default.sample PostSession/Default \
+ PreSession/Default XKeepsCrashing Xsession
CONF_FILES_PERMS+= ${EGDIR}/gdm/${f} \
${PKG_SYSCONFDIR}/gdm/${f} \
${ROOT_USER} ${ROOT_GROUP} 0755
@@ -120,6 +123,7 @@ PLIST_SUBST+= DMX=""
.else
PLIST_SUBST+= DMX="@comment "
.endif
+PRINT_PLIST_AWK+= /dmx/ { print "$${DMX}" $$0; next }
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gdm
@@ -129,14 +133,13 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 775fb29e43a..658e9164ff2 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2005/10/22 22:11:51 minskim Exp $
+@comment $NetBSD: PLIST,v 1.25 2006/03/30 21:25:48 jmmv Exp $
${DMX}bin/gdm-dmx-reconnect-proxy
bin/gdmXnest
bin/gdmXnestchooser
@@ -31,8 +31,7 @@ share/examples/gdm/PostSession/Default
share/examples/gdm/PreSession/Default
share/examples/gdm/XKeepsCrashing
share/examples/gdm/Xsession
-share/examples/gdm/factory-gdm.conf
-share/examples/gdm/gdm.conf
+share/examples/gdm/custom.conf
share/examples/gdm/locale.alias
share/examples/gdm/modules/AccessDwellMouseEvents
share/examples/gdm/modules/AccessKeyMouseEvents
@@ -40,6 +39,8 @@ share/examples/gdm/modules/factory-AccessDwellMouseEvents
share/examples/gdm/modules/factory-AccessKeyMouseEvents
share/examples/rc.d/gdm
share/gdm/BuiltInSessions/default.desktop
+share/gdm/defaults.conf
+share/gdm/factory-defaults.conf
share/gdm/gdmchooser.glade
share/gdm/gdmphotosetup.glade
share/gdm/gdmsetup.glade
@@ -52,22 +53,16 @@ share/gdm/themes/circles/options.png
share/gdm/themes/circles/screenshot.png
share/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
share/gdm/themes/happygnome-list/background.svg
-share/gdm/themes/happygnome-list/disconnect.png
share/gdm/themes/happygnome-list/gnome-logo.png
share/gdm/themes/happygnome-list/happygnome.xml
share/gdm/themes/happygnome-list/options.png
share/gdm/themes/happygnome-list/screenshot.png
-share/gdm/themes/happygnome-list/session.png
-share/gdm/themes/happygnome-list/system.png
share/gdm/themes/happygnome/GdmGreeterTheme.desktop
share/gdm/themes/happygnome/background.svg
-share/gdm/themes/happygnome/disconnect.png
share/gdm/themes/happygnome/gnome-logo.png
share/gdm/themes/happygnome/happygnome.xml
share/gdm/themes/happygnome/options.png
share/gdm/themes/happygnome/screenshot.png
-share/gdm/themes/happygnome/session.png
-share/gdm/themes/happygnome/system.png
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
share/gnome/help/gdm/de/figures/gdm_window.png
@@ -91,6 +86,8 @@ share/gnome/help/gdm/ko/legal.xml
share/gnome/help/gdm/sv/figures/gdm_window.png
share/gnome/help/gdm/sv/gdm.xml
share/gnome/help/gdm/sv/legal.xml
+share/gnome/help/gdm/uk/gdm.xml
+share/gnome/help/gdm/uk/legal.xml
share/gnome/help/gdm/zh_CN/figures/gdm_window.png
share/gnome/help/gdm/zh_CN/gdm.xml
share/gnome/help/gdm/zh_CN/legal.xml
@@ -173,6 +170,7 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gdm.mo
share/omf/gdm/gdm-C.omf
@@ -183,6 +181,7 @@ share/omf/gdm/gdm-it.omf
share/omf/gdm/gdm-ja.omf
share/omf/gdm/gdm-ko.omf
share/omf/gdm/gdm-sv.omf
+share/omf/gdm/gdm-uk.omf
share/omf/gdm/gdm-zh_CN.omf
share/omf/gdm/gdm-zh_HK.omf
share/omf/gdm/gdm-zh_TW.omf
@@ -232,6 +231,7 @@ share/xsessions/gnome.desktop
@dirrm share/gnome/help/gdm/zh_HK
@dirrm share/gnome/help/gdm/zh_CN/figures
@dirrm share/gnome/help/gdm/zh_CN
+@dirrm share/gnome/help/gdm/uk
@dirrm share/gnome/help/gdm/sv/figures
@dirrm share/gnome/help/gdm/sv
@dirrm share/gnome/help/gdm/ko/figures
@@ -261,8 +261,6 @@ share/xsessions/gnome.desktop
@dirrm share/examples/gdm/PostLogin
@dirrm share/examples/gdm/Init
@dirrm share/examples/gdm
-@exec ${MKDIR} %D/share/examples/dm
-@dirrm share/examples/dm
@dirrm share/doc/gdm
@comment in xdg-dirs: @dirrm share/applications
@comment in gtk2: @dirrm lib/gtk-2.0/modules
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 6ad959000fd..38d7da8619b 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.32 2006/01/24 19:43:50 jmmv Exp $
+$NetBSD: distinfo,v 1.33 2006/03/30 21:25:48 jmmv Exp $
-SHA1 (gdm-2.8.0.7.tar.bz2) = 8643faefc7151f38021a83c7986f08e3a4e2d1b6
-RMD160 (gdm-2.8.0.7.tar.bz2) = 1c75d83e1a0f94ec1b927491a0409ea86e12a51f
-Size (gdm-2.8.0.7.tar.bz2) = 2777760 bytes
+SHA1 (gdm-2.14.0.tar.bz2) = 84e2f91e6215bf2e75f70ded6e7b2afb29c28082
+RMD160 (gdm-2.14.0.tar.bz2) = 1a152d4d2dde11f70be24e6dade98721c3d7c5a1
+Size (gdm-2.14.0.tar.bz2) = 2997013 bytes
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
Size (Daemon.README) = 2191 bytes
SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 649f62f21f55822afb17753cacda9a4bc8873595
SHA1 (patch-ab) = 527a77fd79ba47d897bd4693d0ce7c0eae08081e
-SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
-SHA1 (patch-ad) = 4f4c4395ba6de7235069fe7ff9877381e9bc997a
-SHA1 (patch-ae) = 01288c3cff79f957fb616feeb81234e7fb7210ba
-SHA1 (patch-af) = a52aff5bd9656036a205dd9d76960e3d58d33a67
-SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
+SHA1 (patch-ac) = 1870b541791bfbc41ff30b63debcf493782984f7
+SHA1 (patch-ad) = 66659330d6ac66bc88b7fb5f6f08ba8512be73c5
+SHA1 (patch-ae) = 0fb90856c3a85e896633b83cc9197984b8e96422
+SHA1 (patch-ai) = 9123d74db483148ca65d864626723e6b8e3f2444
+SHA1 (patch-aj) = e675f38079ab309064cadf917a4a9442a7a00ef4
+SHA1 (patch-ak) = e3eaf2dfa1e393f9808d22fe4384710a46a83afc
diff --git a/x11/gdm/files/gdm.sh b/x11/gdm/files/gdm.sh
index 1b92850381e..a4f7e395d4a 100755
--- a/x11/gdm/files/gdm.sh
+++ b/x11/gdm/files/gdm.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: gdm.sh,v 1.3 2005/06/26 16:52:14 jmmv Exp $
+# $NetBSD: gdm.sh,v 1.4 2006/03/30 21:25:48 jmmv Exp $
#
# PROVIDE: gdm
@@ -16,7 +16,7 @@ rcvar=${name}
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
procname="@PREFIX@/sbin/gdm-binary"
-required_files="@PKG_SYSCONFDIR@/gdm/gdm.conf"
+required_files="@PKG_SYSCONFDIR@/gdm/custom.conf"
extra_commands="reload"
if [ -f /etc/rc.subr ]; then
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
deleted file mode 100644
index a2785051a1d..00000000000
--- a/x11/gdm/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2005/10/14 21:47:01 jmmv Exp $
-
---- configure.orig 2005-10-04 05:31:08.000000000 +0200
-+++ configure
-@@ -23168,12 +23168,12 @@ else
- if test "x$ac_cv_env_DAEMON_CFLAGS_set" = "xset"; then
- pkg_cv_DAEMON_CFLAGS=$ac_cv_env_DAEMON_CFLAGS_value
- elif test -n "$PKG_CONFIG"; then
-- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED\" >/dev/null 2>&1") >&5
-- ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED" >/dev/null 2>&1) 2>&5
-+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED\" >/dev/null 2>&1") >&5
-+ ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" >/dev/null 2>&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
-+ pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -23191,12 +23191,12 @@ else
- if test "x$ac_cv_env_DAEMON_LIBS_set" = "xset"; then
- pkg_cv_DAEMON_LIBS=$ac_cv_env_DAEMON_LIBS_value
- elif test -n "$PKG_CONFIG"; then
-- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED\" >/dev/null 2>&1") >&5
-- ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED" >/dev/null 2>&1) 2>&5
-+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gtk+-2.0 >= \$GTK_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED\" >/dev/null 2>&1") >&5
-+ ($PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" >/dev/null 2>&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null`
-+ pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -23208,18 +23208,18 @@ echo "$as_me:$LINENO: result: $pkg_cv_DA
- echo "${ECHO_T}$pkg_cv_DAEMON_LIBS" >&6
-
- if test $pkg_failed = yes; then
-- DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
-+ DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED"`
- # Put the nasty error message in config.log where it belongs
- echo "$DAEMON_PKG_ERRORS" 1>&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met.
-+ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
- Alternatively you may set the DAEMON_CFLAGS and DAEMON_LIBS environment variables
- to avoid the need to call pkg-config. See the pkg-config man page for
- more details." >&5
--echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met.
-+echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
diff --git a/x11/gdm/patches/patch-ac b/x11/gdm/patches/patch-ac
index 4b7d6ef2c94..cca6842223b 100644
--- a/x11/gdm/patches/patch-ac
+++ b/x11/gdm/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/02/03 13:37:03 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2006/03/30 21:25:48 jmmv Exp $
---- gui/modules/Makefile.in.orig 2005-02-02 18:35:48.000000000 +0100
+--- gui/modules/Makefile.in.orig 2006-03-13 22:42:41.000000000 +0100
+++ gui/modules/Makefile.in
-@@ -269,7 +269,7 @@ prefix = @prefix@
+@@ -323,7 +323,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
diff --git a/x11/gdm/patches/patch-ad b/x11/gdm/patches/patch-ad
index 2f252f98317..50511c88258 100644
--- a/x11/gdm/patches/patch-ad
+++ b/x11/gdm/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2005/07/17 22:53:06 kristerw Exp $
+$NetBSD: patch-ad,v 1.6 2006/03/30 21:25:48 jmmv Exp $
---- daemon/xdmcp.c.orig Sun Jul 17 23:22:30 2005
-+++ daemon/xdmcp.c Sun Jul 17 23:41:59 2005
-@@ -1175,6 +1175,7 @@
+--- daemon/xdmcp.c.orig 2006-02-08 00:57:25.000000000 +0100
++++ daemon/xdmcp.c
+@@ -1142,6 +1142,7 @@ gdm_xdmcp_handle_forward_query (struct s
if (clnt_port.length == 2 &&
clnt_addr.length == 4) {
@@ -10,12 +10,12 @@ $NetBSD: patch-ad,v 1.5 2005/07/17 22:53:06 kristerw Exp $
/* Convert IPv4 address to IPv6 if needed */
struct sockaddr_in tmp_disp_sa = {0};
-@@ -1182,7 +1183,7 @@
+@@ -1149,7 +1150,7 @@ gdm_xdmcp_handle_forward_query (struct s
memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_port, clnt_port.data, 2);
memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr.s_addr, clnt_addr.data, 4);
- char * ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
+ ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
- strcpy(buffer6, "::ffff:");
- strncat(buffer6, ipv4_addr, INET_ADDRSTRLEN);
+ strcpy (buffer6, "::ffff:");
+ strncat (buffer6, ipv4_addr, INET_ADDRSTRLEN);
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index cf211885ec9..c34abaee6e0 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,25 +1,19 @@
-$NetBSD: patch-ae,v 1.9 2005/10/22 22:07:32 minskim Exp $
+$NetBSD: patch-ae,v 1.10 2006/03/30 21:25:48 jmmv Exp $
---- config/Makefile.in.orig 2005-10-03 20:31:14.000000000 -0700
+--- config/Makefile.in.orig 2006-03-13 22:42:30.000000000 +0100
+++ config/Makefile.in
-@@ -277,13 +277,13 @@ prefix = @prefix@
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples
- target_alias = @target_alias@
- pixmapdir = $(datadir)/pixmaps
- confdir = $(sysconfdir)/gdm
--gdmconfdir = $(GDM_CONFIGDIR)
-+gdmconfdir = $(confdir)
- crossconfdir = $(sysconfdir)/dm
--localedir = $(sysconfdir)/gdm
-+localedir = /usr/pkg/share/locale
- bisessdir = $(datadir)/gdm/BuiltInSessions
- instsessdir = $(datadir)/xsessions
- initdir = $(sysconfdir)/gdm/Init
-@@ -539,10 +539,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -545,10 +545,6 @@ install-data-hook: gdm.conf gdm.conf-cus
+ $(mkinstalldirs) $(DESTDIR)$(confdir); \
+ chmod 755 $(DESTDIR)$(confdir); \
+ fi
+- if test '!' -d $(DESTDIR)$(crossconfdir); then \
+- $(mkinstalldirs) $(DESTDIR)$(crossconfdir); \
+- chmod 755 $(DESTDIR)$(crossconfdir); \
+- fi
+ if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
+ $(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+ chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+@@ -577,10 +573,7 @@ install-data-hook: gdm.conf gdm.conf-cus
$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
@@ -31,7 +25,7 @@ $NetBSD: patch-ae,v 1.9 2005/10/22 22:07:32 minskim Exp $
if test '!' -d $(DESTDIR)$(bisessdir); then \
$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
-@@ -618,18 +615,6 @@ install-data-hook: gdm.conf Xsession gno
+@@ -658,20 +651,8 @@ install-data-hook: gdm.conf gdm.conf-cus
chmod 755 $(DESTDIR)$(gnomercdir); \
fi
@@ -48,5 +42,8 @@ $NetBSD: patch-ae,v 1.9 2005/10/22 22:07:32 minskim Exp $
- fi
-
system=`uname`; \
- if test -f /usr/include/security/pam_appl.h; then \
+- if test -f /usr/include/security/pam_appl.h; then \
++ if false; then \
if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
+ $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
+ chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af
deleted file mode 100644
index 67c32a90cd9..00000000000
--- a/x11/gdm/patches/patch-af
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-af,v 1.12 2006/01/20 13:33:19 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=142338
-
---- vicious-extensions/ve-misc.c.orig 2005-11-22 21:23:27.000000000 +0100
-+++ vicious-extensions/ve-misc.c
-@@ -345,120 +345,6 @@ ve_locale_exists (const char *loc)
- return ret;
- }
-
--/**
-- * ve_setenv:
-- * @name: An environment variable name.
-- * @value: The value to assign to the environment variable.
-- * @overwrite: If %TRUE, overwrite the existing @name variable in the
-- * environment.
-- *
-- * Adds "@name=@value" to the environment. Note that on systems without setenv,
-- * this leaks memory so please do not use inside a loop or anything like that.
-- * The semantics are the same as the glibc setenv() (if setenv() exists, it is
-- * used).
-- *
-- * If @overwrite is %FALSE and the variable already exists in the environment,
-- * then %0 is returned and the value is not changed.
-- *
-- * Returns: %0 on success, %-1 on error
-- *
-- **/
--#if ! GLIB_CHECK_VERSION(2,3,1)
--int
--ve_setenv (const char *name, const char *value, gboolean overwrite)
--{
--#if defined (HAVE_SETENV)
-- return setenv (name, value != NULL ? value : "", overwrite);
--#else
-- char *string;
--
-- if (! overwrite && g_getenv (name) != NULL) {
-- return 0;
-- }
--
-- /* This results in a leak when you overwrite existing
-- * settings. It would be fairly easy to fix this by keeping
-- * our own parallel array or hash table.
-- */
-- string = g_strconcat (name, "=", value, NULL);
-- return putenv (string);
--#endif
--}
--#endif
--
--/**
-- * ve_unsetenv:
-- * @name: The environment variable to unset.
-- *
-- * Description: Removes @name from the environment.
-- * In case there is no native implementation of unsetenv,
-- * this could cause leaks depending on the implementation of
-- * environment.
-- *
-- **/
--#if ! GLIB_CHECK_VERSION(2,3,1)
--void
--ve_unsetenv (const char *name)
--{
--#if defined (HAVE_SETENV)
-- unsetenv (name);
--#else
--
--#ifdef HAVE__NSGETENVIRON
--#define environ (*_NSGetEnviron())
--#else
-- extern char **environ;
--#endif
-- int i, len;
--
-- if (environ == NULL)
-- return;
--
-- len = strlen (name);
--
-- /* Mess directly with the environ array.
-- * This seems to be the only portable way to do this.
-- */
-- for (i = 0; environ[i] != NULL; i++) {
-- if (strncmp (environ[i], name, len) == 0
-- && environ[i][len + 1] == '=') {
-- break;
-- }
-- }
-- while (environ[i] != NULL) {
-- environ[i] = environ[i + 1];
-- i++;
-- }
--#endif
--}
--#endif
--
--/**
-- * ve_clearenv:
-- *
-- * Description: Clears out the environment completely.
-- * In case there is no native implementation of clearenv,
-- * this could cause leaks depending on the implementation
-- * of environment.
-- *
-- **/
--void
--ve_clearenv (void)
--{
--#ifdef HAVE_CLEARENV
-- clearenv ();
--#else
--
--#ifdef HAVE__NSGETENVIRON
--#define environ (*_NSGetEnviron())
--#else
-- extern char **environ;
--#endif
-- if (environ != NULL)
-- environ[0] = NULL;
--#endif
--}
--
- char *
- ve_find_prog_in_path (const char *prog, const char *path)
- {
diff --git a/x11/gdm/patches/patch-ag b/x11/gdm/patches/patch-ag
deleted file mode 100644
index d85360c1a1b..00000000000
--- a/x11/gdm/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/05/17 01:17:46 danw Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=142338
-
---- vicious-extensions/ve-misc.h.orig Sun Apr 11 21:38:02 2004
-+++ vicious-extensions/ve-misc.h
-@@ -86,10 +86,10 @@ gboolean ve_locale_exists (const char *l
- #define ve_setenv g_setenv
- #define ve_unsetenv g_unsetenv
- #else
--int ve_setenv (const char *name, const char *value, gboolean overwrite);
--void ve_unsetenv (const char *name);
-+#define ve_setenv gnome_setenv
-+#define ve_unsetenv gnome_unsetenv
- #endif
--void ve_clearenv (void);
-+#define ve_clearenv gnome_clearenv
-
- /* just like gnome_i18n_get_language_list (in fact if you link to
- gnome it uses that */
diff --git a/x11/gdm/patches/patch-ai b/x11/gdm/patches/patch-ai
new file mode 100644
index 00000000000..00fdbb4321a
--- /dev/null
+++ b/x11/gdm/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.5 2006/03/30 21:25:48 jmmv Exp $
+
+--- daemon/gdmconfig.c.orig 2006-03-13 22:18:24.000000000 +0100
++++ daemon/gdmconfig.c
+@@ -38,6 +38,9 @@
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#if defined(__NetBSD__)
++#include <sys/resource.h>
++#endif
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <pwd.h>
diff --git a/x11/gdm/patches/patch-aj b/x11/gdm/patches/patch-aj
new file mode 100644
index 00000000000..d5f49b20858
--- /dev/null
+++ b/x11/gdm/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.3 2006/03/30 21:25:48 jmmv Exp $
+
+--- daemon/server.c.orig 2006-01-19 00:32:50.000000000 +0100
++++ daemon/server.c
+@@ -27,6 +27,9 @@
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <grp.h>
++#if defined(__NetBSD__)
++#include <sys/resource.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
diff --git a/x11/gdm/patches/patch-ak b/x11/gdm/patches/patch-ak
new file mode 100644
index 00000000000..33a1df84fb9
--- /dev/null
+++ b/x11/gdm/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.3 2006/03/30 21:25:48 jmmv Exp $
+
+--- gui/greeter/Makefile.in.orig 2006-03-13 22:42:37.000000000 +0100
++++ gui/greeter/Makefile.in
+@@ -386,9 +386,8 @@ gdmgreeter_SOURCES = \
+ greeter_system.h
+
+ gdmgreeter_LDADD = \
+- -L$(top_builddir)/gui \
+- -lgdmwm \
+- -lgdmcommon \
++ $(top_builddir)/gui/libgdmwm.a \
++ $(top_builddir)/gui/libgdmcommon.a \
+ $(top_builddir)/vicious-extensions/libviciousui-minimal.a \
+ $(GLIB_LIBS) \
+ $(GOBJECT_LIBS) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 20:27:46 +0000