summaryrefslogtreecommitdiffstats
path: root/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-10-28 06:10:10 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-10-28 06:10:10 +0800
commit752a66b40a757b50196fb97fda1143a42e96c295 (patch)
tree49bd85e2fc333a96c40e09b46a8027f64b1a470f /x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
parent2d81cfc3ccdf086d3ac5c107818ffe2f73f04d9a (diff)
downloadmarcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.gz
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.tar.zst
marcuscom-ports-752a66b40a757b50196fb97fda1143a42e96c295.zip
Move gnome3 ports into the place of the gnome2 locations.
Update to new port rules, remove conflicts, latest_link, enable stage support. gnome-games was skipped because I got a update for that. gnome-keyring 2 vs 3, needs to be looked at. zenity 2 vs 3, and libgnomekbd 2 vs 3 Use new lib_depend syntax in bsd.gnome.mk. Possible lots of broken links. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c')
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c57
1 files changed, 0 insertions, 57 deletions
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
deleted file mode 100644
index a7bfbc883..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- gui/simple-greeter/gdm-user-manager.c.orig 2010-06-26 00:09:31.000000000 +0200
-+++ gui/simple-greeter/gdm-user-manager.c 2010-07-20 23:23:07.000000000 +0200
-@@ -62,6 +62,8 @@
-
- #ifdef __sun
- #define DEFAULT_MINIMAL_UID 100
-+#elif defined(__FreeBSD__)
-+#define DEFAULT_MINIMAL_UID 1000
- #else
- #define DEFAULT_MINIMAL_UID 500
- #endif
-@@ -1678,12 +1680,17 @@ reload_passwd_file (GHashTable *valid_sh
- NULL,
- g_object_unref);
-
-+#ifdef __FreeBSD__
-+ setpwent ();
-+#else
-+
- errno = 0;
- fp = fopen (PATH_PASSWD, "r");
- if (fp == NULL) {
- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
- goto out;
- }
-+#endif
-
- /* Make sure we keep users who are logged in no matter what. */
- g_hash_table_iter_init (&iter, current_users_by_name);
-@@ -1733,9 +1740,15 @@ reload_passwd_file (GHashTable *valid_sh
-
- g_debug ("GdmUserManager: include_all is TRUE");
-
-+#ifdef __FreeBSD__
-+ for (pwent = getpwent ();
-+ pwent != NULL;
-+ pwent = getpwent ()) {
-+#else
- for (pwent = fgetpwent (fp);
- pwent != NULL;
- pwent = fgetpwent (fp)) {
-+#endif
-
- /* Skip users below MinimalUID... */
- if (pwent->pw_uid < DEFAULT_MINIMAL_UID) {
-@@ -1810,7 +1823,11 @@ reload_passwd_file (GHashTable *valid_sh
- out:
- /* Cleanup */
-
-+#ifdef __FreeBSD__
-+ endpwent ();
-+#else
- fclose (fp);
-+#endif
-
- g_hash_table_iter_init (&iter, new_users_by_name);
- while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {