summaryrefslogtreecommitdiffstats
path: root/x11/gdm
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gdm')
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/patch-common_gdm-address.c18
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c91
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c50
-rw-r--r--x11/gdm/pkg-plist5
6 files changed, 67 insertions, 107 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 334f5132d..487447278 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.119 2008/03/24 14:15:11 kwm Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.120 2008/03/30 03:38:55 marcus Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.21.9
+PORTVERSION= 2.22.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 1c38110ac..19cd33b5d 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.21.9.tar.bz2) = b20aa0790405f540df9a2ec9e0d6eb03
-SHA256 (gnome2/gdm-2.21.9.tar.bz2) = fef13bbcaba1e8acfb43fc75158acd9aed9089dbee023bb4f784feed9ad7ad2c
-SIZE (gnome2/gdm-2.21.9.tar.bz2) = 2203733
+MD5 (gnome2/gdm-2.22.0.tar.bz2) = ee0fc096a42a10d7095d5c27b47045ad
+SHA256 (gnome2/gdm-2.22.0.tar.bz2) = 6ff4bef13b15a1c54895eabcc37f7046fa13ca3bc449c9541c38e6993930fffa
+SIZE (gnome2/gdm-2.22.0.tar.bz2) = 2244663
diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c
index 994bdf404..4c38474cb 100644
--- a/x11/gdm/files/patch-common_gdm-address.c
+++ b/x11/gdm/files/patch-common_gdm-address.c
@@ -1,25 +1,23 @@
---- common/gdm-address.c.orig 2008-02-03 11:52:26.000000000 -0500
-+++ common/gdm-address.c 2008-02-13 01:23:07.000000000 -0500
-@@ -25,8 +25,9 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
--#include <stropts.h>
+--- common/gdm-address.c.orig 2008-04-17 23:29:27.000000000 -0400
++++ common/gdm-address.c 2008-05-02 14:36:15.000000000 -0400
+@@ -29,6 +29,8 @@
+ #include <stropts.h>
+ #endif
#include <string.h>
+#include <sys/types.h>
+#include <sys/param.h>
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-@@ -35,7 +36,6 @@
+@@ -37,7 +39,6 @@
#endif
#include <netdb.h>
#include <sys/ioctl.h>
-#include <net/if.h>
#ifndef G_OS_WIN32
- #include <sys/socket.h>
-@@ -46,6 +46,7 @@
+ #include <sys/select.h>
+@@ -47,6 +48,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
deleted file mode 100644
index 0ad57a462..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- gui/simple-greeter/gdm-languages.c.orig 2008-02-25 17:21:43.000000000 -0500
-+++ gui/simple-greeter/gdm-languages.c 2008-02-27 01:17:09.000000000 -0500
-@@ -50,6 +50,8 @@
- #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
- #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-
-+#define GDM_DEFAULT_LOCALE "C"
-+
- typedef struct _GdmLocale {
- char *id;
- char *name;
-@@ -479,7 +481,7 @@ select_dirs (const struct dirent *dirent
- struct stat st;
- char *path;
-
-- path = g_build_filename (LIBLOCALEDIR, dirent->d_name, NULL);
-+ path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL);
- if (g_stat (path, &st) == 0) {
- mode = st.st_mode;
- }
-@@ -499,7 +501,7 @@ collect_locales_from_directory (void)
- int ndirents;
- int cnt;
-
-- ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort);
-+ ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort);
-
- for (cnt = 0; cnt < ndirents; ++cnt) {
- char *path;
-@@ -533,7 +535,7 @@ collect_locales_from_directory (void)
- }
-
- /* try to get additional information from LC_IDENTIFICATION */
-- path = g_build_filename (LIBLOCALEDIR, dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL);
-+ path = g_build_filename ("/usr/share/locale", dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL);
- res = g_file_test (path, G_FILE_TEST_IS_REGULAR);
- if (res) {
- GMappedFile *mapped;
-@@ -568,6 +570,35 @@ collect_locales_from_aliases (void)
- }
-
- static void
-+collect_default_locale (void)
-+{
-+ GdmLocale *locale;
-+ GdmLocale *old_locale;
-+
-+ locale = g_new0 (GdmLocale, 1);
-+ gdm_parse_language_name (GDM_DEFAULT_LOCALE,
-+ &locale->language_code,
-+ &locale->territory_code,
-+ &locale->codeset,
-+ &locale->modifier);
-+
-+ locale->id = construct_language_name (locale->language_code, locale->territory_code,
-+ NULL, locale->modifier);
-+ locale->name = construct_language_name (locale->language_code, locale->territory_code,
-+ locale->codeset, locale->modifier);
-+
-+ old_locale = g_hash_table_lookup (gdm_available_locales_map, locale->id);
-+ if (old_locale != NULL) {
-+ if (strlen (old_locale->name) > strlen (locale->name)) {
-+ chooser_locale_free (locale);
-+ return;
-+ }
-+ }
-+
-+ g_hash_table_insert (gdm_available_locales_map, g_strdup (locale->id), locale);
-+}
-+
-+static void
- collect_locales (void)
- {
-
-@@ -575,6 +606,7 @@ collect_locales (void)
- gdm_available_locales_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) chooser_locale_free);
- }
-
-+ collect_default_locale ();
- collect_locales_from_archive ();
- collect_locales_from_directory ();
- collect_locales_from_aliases ();
-@@ -957,6 +989,8 @@ gdm_get_language_from_name (const char *
- }
-
- language = get_translated_language (language_code, name);
-+ if (language == NULL && ! strcmp (language_code, GDM_DEFAULT_LOCALE))
-+ language = GDM_DEFAULT_LOCALE;
-
- if (territory_code != NULL) {
- territory = get_translated_territory (territory_code, name);
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
new file mode 100644
index 000000000..a4b6f4590
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -0,0 +1,50 @@
+--- gui/simple-greeter/gdm-user-manager.c.orig 2008-05-02 14:45:56.000000000 -0400
++++ gui/simple-greeter/gdm-user-manager.c 2008-05-02 14:45:36.000000000 -0400
+@@ -1269,17 +1269,21 @@ reload_passwd (GdmUserManager *manager)
+ GSList *old_users;
+ GSList *new_users;
+ GSList *list;
++#ifndef __FreeBSD__
+ FILE *fp;
++#endif
+
+ old_users = NULL;
+ new_users = NULL;
+
++#ifndef __FreeBSD__
+ 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
+
+ g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
+ g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+@@ -1291,7 +1295,13 @@ reload_passwd (GdmUserManager *manager)
+ new_users = g_slist_prepend (new_users, g_object_ref (list->data));
+ }
+ }
++#ifdef __FreeBSD__
++ setpwent ();
++
++ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) {
++#else
+ for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
++#endif
+ GdmUser *user;
+
+ user = NULL;
+@@ -1354,7 +1364,11 @@ reload_passwd (GdmUserManager *manager)
+ out:
+ /* Cleanup */
+
++#ifdef __FreeBSD__
++ endpwent ();
++#else
+ fclose (fp);
++#endif
+
+ g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
+ g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index e6706c1a6..c4f919b40 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -1,3 +1,4 @@
+bin/gdm-screenshot
bin/gdmflexiserver
etc/dbus-1/system.d/gdm.conf
etc/gdm/Init/Default
@@ -28,7 +29,6 @@ sbin/gdm-safe-restart
sbin/gdm-stop
%%DATADIR%%/gdm-a11y-preferences-dialog.glade
%%DATADIR%%/gdm-greeter-login-window.glade
-%%DATADIR%%/gdm-user-switch-applet.glade
share/gdm/gdb-cmd
share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
share/icons/hicolor/16x16/apps/gdm-xnest.png
@@ -59,6 +59,7 @@ share/locale/eu/LC_MESSAGES/gdm.mo
share/locale/fa/LC_MESSAGES/gdm.mo
share/locale/fi/LC_MESSAGES/gdm.mo
share/locale/fr/LC_MESSAGES/gdm.mo
+share/locale/fur/LC_MESSAGES/gdm.mo
share/locale/ga/LC_MESSAGES/gdm.mo
share/locale/gl/LC_MESSAGES/gdm.mo
share/locale/gu/LC_MESSAGES/gdm.mo
@@ -192,6 +193,8 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 17:53:10 +0800