diff options
| -rw-r--r-- | x11/gdm/distinfo | 6 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-aa | 38 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-af | 113 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-ag | 20 |
4 files changed, 169 insertions, 8 deletions
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index dc589a3b3ca..110f48c976f 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2004/05/08 00:27:16 xtraeme Exp $ +$NetBSD: distinfo,v 1.13 2004/05/17 01:17:46 danw Exp $ SHA1 (gdm-2.6.0.2.tar.bz2) = d662a0d0a9f1311423a6486c2471cc85fe9ee815 Size (gdm-2.6.0.2.tar.bz2) = 3029505 bytes @@ -6,7 +6,9 @@ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes -SHA1 (patch-aa) = f505afd68df33ecdcbb56c3619f58bec045a6cea +SHA1 (patch-aa) = 48f95c7fb2debc275d6a5792b08f2d9f239a5786 SHA1 (patch-ab) = 049d4fe8b6e71239392e7a8bae00006103dff309 SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516 SHA1 (patch-ae) = 1df52914ead2f8aa5b69f60213ebd26e8d2202a4 +SHA1 (patch-af) = 98f890ee76bb463a80ac8cf33428b647b559d83a +SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa index 577f947c930..19bc1bc6ee7 100644 --- a/x11/gdm/patches/patch-aa +++ b/x11/gdm/patches/patch-aa @@ -1,8 +1,34 @@ -$NetBSD: patch-aa,v 1.7 2004/04/02 15:17:43 jmmv Exp $ +$NetBSD: patch-aa,v 1.8 2004/05/17 01:17:46 danw Exp $ ---- configure.orig 2004-03-15 19:38:10.000000000 +0100 +--- configure.orig Sun Apr 11 21:53:01 2004 +++ configure -@@ -24803,6 +24803,7 @@ VRFY="verify-crypt" +@@ -21237,7 +21237,8 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default ++#include <sys/types.h> ++#include <sys/socket.h> + int + main () + { +@@ -21606,13 +21607,13 @@ echo "${ECHO_T}yes" >&6 + + echo "$as_me:$LINENO: checking DAEMON_CFLAGS" >&5 + echo $ECHO_N "checking DAEMON_CFLAGS... $ECHO_C" >&6 +- DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED"` ++ DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0"` + echo "$as_me:$LINENO: result: $DAEMON_CFLAGS" >&5 + echo "${ECHO_T}$DAEMON_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking DAEMON_LIBS" >&5 + echo $ECHO_N "checking DAEMON_LIBS... $ECHO_C" >&6 +- DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED"` ++ DAEMON_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0"` + echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5 + echo "${ECHO_T}$DAEMON_LIBS" >&6 + else +@@ -24803,6 +24804,7 @@ VRFY="verify-crypt" if test x$enable_authentication_scheme != xcrypt -a \ x$enable_authentication_scheme != xshadow ; then @@ -10,7 +36,7 @@ $NetBSD: patch-aa,v 1.7 2004/04/02 15:17:43 jmmv Exp $ for ac_header in security/pam_appl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -24960,6 +24961,7 @@ fi +@@ -24960,6 +24962,7 @@ fi done fi @@ -18,7 +44,7 @@ $NetBSD: patch-aa,v 1.7 2004/04/02 15:17:43 jmmv Exp $ GDMASKPASS= EXTRA_GDMASKPASS_LIBS= -@@ -28015,6 +28017,10 @@ else +@@ -28015,6 +28018,10 @@ else X_SERVER="/usr/X11R6/bin/X" X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin" fi @@ -29,7 +55,7 @@ $NetBSD: patch-aa,v 1.7 2004/04/02 15:17:43 jmmv Exp $ -@@ -28064,6 +28070,8 @@ prefix=$old_prefix +@@ -28064,6 +28071,8 @@ prefix=$old_prefix exec_prefix=$old_exec_prefix ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile docs/de/Makefile docs/es/Makefile docs/fr/Makefile docs/it/Makefile docs/sv/Makefile docs/ja/Makefile docs/ko/Makefile docs/zh_CN/Makefile docs/zh_HK/Makefile docs/zh_TW/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec" diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af new file mode 100644 index 00000000000..666578224f8 --- /dev/null +++ b/x11/gdm/patches/patch-af @@ -0,0 +1,113 @@ +$NetBSD: patch-af,v 1.10 2004/05/17 01:17:46 danw Exp $ + +http://bugzilla.gnome.org/show_bug.cgi?id=142338 + +--- vicious-extensions/ve-misc.c.orig Sun Apr 11 21:37:56 2004 ++++ vicious-extensions/ve-misc.c +@@ -342,106 +342,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 +- extern char **environ; +- int i, len; +- +- 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 +- extern char **environ; +- 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 new file mode 100644 index 00000000000..d85360c1a1b --- /dev/null +++ b/x11/gdm/patches/patch-ag @@ -0,0 +1,20 @@ +$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 */ |