From 52ca919fb611ba9514cd57d006e64435aca7d3e658f6b192f383a7173902670d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 20 Sep 2007 21:03:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=38 --- fix-desktop-files.diff | 152 ---------------------------------------- gdm-language-save.patch | 25 +++++++ gdm.changes | 8 +++ gdm.spec | 12 +++- 4 files changed, 42 insertions(+), 155 deletions(-) delete mode 100644 fix-desktop-files.diff create mode 100644 gdm-language-save.patch diff --git a/fix-desktop-files.diff b/fix-desktop-files.diff deleted file mode 100644 index b6eee2e..0000000 --- a/fix-desktop-files.diff +++ /dev/null @@ -1,152 +0,0 @@ ---- ./gui/gdmflexiserver-xnest.desktop.in.in 2007/09/13 08:35:04 1.1 -+++ ./gui/gdmflexiserver-xnest.desktop.in.in 2007/09/13 08:36:01 -@@ -1,7 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 - _Name=New Login in a Window --_GenericName=New Login in a Window - _Comment=Login as another user in a window - TryExec=@X_XNEST_CMD@ - Exec=gdmflexiserver --xnest ---- ./gui/gdmflexiserver-xnest.desktop 2007/09/13 08:35:10 1.1 -+++ ./gui/gdmflexiserver-xnest.desktop 2007/09/13 08:35:28 -@@ -26,32 +26,6 @@ - Name[th]=การเข้าระบบใหม่ในหน้าต่าง - Name[vi]=Đăng nhập mới trong cửa sổ - Name[zh_CN]=窗口中的新登录 --GenericName=New Login in a Window --GenericName[bg]=Ново влизане в прозорец --GenericName[bn_IN]=উইন্ডোর মধ্যে নতুন লগ-ইন --GenericName[de]=In einem Fenster neu anmelden --GenericName[dz]=སྒོ་སྒྲིག་ཅིག་ནང་ ནང་བསྐྱོད་གསརཔ --GenericName[en_CA]=New Login in a Window --GenericName[es]=Nuevo acceso en una ventana --GenericName[et]=Uus sisselogimine aknas --GenericName[eu]=Saio berria leiho batean --GenericName[fi]=Uusi kirjautuminen ikkunassa --GenericName[fr]=Nouvelle connexion dans une fenêtre --GenericName[gu]=વિન્ડોમાં નવો પ્રવેશ --GenericName[hu]=Új bejelentkezés egy ablakban --GenericName[ja]=ウィンドウから新しいログイン --GenericName[kn]=ಒಂದು ವಿಂಡೋದಲ್ಲಿ ಹೊಸ ಪ್ರವೇಶ --GenericName[ko]=창에서 새로 로그인 --GenericName[lt]=Naujas prisijungimas lange --GenericName[ml]=ജാലകത്തില്‍ ഉളള പുതിയ ലോഗിന്‍ --GenericName[nb]=Ny innlogging i et vindu --GenericName[or]=ଗୋଟିଏ ୱିଣ୍ଡୋରେ ନୂତନ ଲଗଇନ --GenericName[pt_BR]=Nova Sessão em uma Janela --GenericName[sv]=Ny inloggning i ett fönster --GenericName[ta]=சாளரத்தில் புதிய நுழைவு --GenericName[th]=การเข้าระบบใหม่ในหน้าต่าง --GenericName[vi]=Đăng nhập mới trong cửa sổ --GenericName[zh_CN]=窗口中的新登录 - Comment=Login as another user in a window - Comment[bg]=Влизане в системата като друг потребител в прозорец - Comment[bn_IN]=লগ-আউট না করে পৃথক ব্যবহারকারীরূপে উইন্ডোর মধ্যে লগ-ইন করুন ---- gui/gdmphotosetup.desktop.in 2007/09/13 08:33:22 1.25 -+++ gui/gdmphotosetup.desktop.in 2007/09/13 08:36:41 -@@ -1,7 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 - _Name=Login Photo --_GenericName=Login Photo - _Comment=Change the picture that will show in the GDM (login manager) face browser - TryExec=gdmphotosetup - Exec=gdmphotosetup ---- ./gui/gdmflexiserver.desktop 2007/09/13 08:37:47 1.1 -+++ ./gui/gdmflexiserver.desktop 2007/09/13 08:38:04 -@@ -78,84 +78,6 @@ - Name[zh_HK]=以新身分登入 - Name[zh_TW]=以新身分登入 - Name[zu]=Umngenisi omusha --GenericName=New Login --GenericName[af]=Nuwe aanmelding --GenericName[ar]=ولوج جديد --GenericName[az]=Yeni Giriş --GenericName[be]=Новы ўваход --GenericName[bg]=Ново влизане --GenericName[bn]=নতুন লগইন --GenericName[bn_IN]=নতুন লগ-ইন --GenericName[bs]=Nova prijava --GenericName[ca]=Entrada nova --GenericName[cs]=Nové přihlášení --GenericName[cy]=Mewngofnodiad Newydd --GenericName[da]=Nyt logind --GenericName[de]=Neu anmelden --GenericName[dz]=ནང་བསྐྱོད་གསརཔ། --GenericName[el]=Νέα Είσοδος --GenericName[en_CA]=New Login --GenericName[en_GB]=New Login --GenericName[es]=Pantalla de entrada nueva --GenericName[et]=Uus seanss --GenericName[eu]=Saio-hasiera berria --GenericName[fa]=ورود جدید به سیستم --GenericName[fi]=Uusi kirjautuminen --GenericName[fr]=Nouvelle connexion --GenericName[ga]=Logann nua --GenericName[gl]=Nova sesión --GenericName[gu]=નવો પ્રવેશ --GenericName[he]=חיבור חדש --GenericName[hi]=नया लॉगइन --GenericName[hr]=Nova prijava --GenericName[hu]=Új bejelentkezés --GenericName[hy]=Նոր մուտք --GenericName[id]=Login Baru --GenericName[it]=Nuovo login --GenericName[ja]=新しいログイン --GenericName[ka]=ახალი შესვლა --GenericName[kn]=ಹೊಸ ದಾಖಲಾತಿ --GenericName[ko]=새로 로그인 --GenericName[ku]=Têketina Nû --GenericName[lt]=Naujas prisijungimas --GenericName[lv]=Jauna pieslēgšanās --GenericName[mg]=Fidirana vaovao --GenericName[mk]=Ново најавување --GenericName[ml]=പുയിയ ലോഗിന്‍ --GenericName[mn]=Шинэ нэвтрэлт --GenericName[mr]=नविन प्रवेश --GenericName[ms]=Logmasuk baru --GenericName[nb]=Ny innlogging --GenericName[ne]=नयाँ लगइन --GenericName[nl]=Nieuwe aanmelding --GenericName[nn]=Ny innlogging --GenericName[nso]=Go Tsena go go Swa --GenericName[oc]=Connection novèla --GenericName[or]=ନୂତନ ଲଗଇନ୍ --GenericName[pa]=ਨਵਾਂ ਲਾਗਇਨ --GenericName[pl]=Nowy login --GenericName[pt]=Nova Sessão --GenericName[pt_BR]=Nova Sessão --GenericName[ro]=Autentificare nouă --GenericName[ru]=Новый сеанс --GenericName[si]=නව පිවිසුම --GenericName[sk]=Nové prihlásenie --GenericName[sl]=Nova prijava --GenericName[sq]=Login i Ri --GenericName[sr]=Нова пријава --GenericName[sr@Latn]=Nova prijava --GenericName[sv]=Ny inloggning --GenericName[ta]=புதிய உள்நுழைவு --GenericName[th]=การเข้าระบบใหม่ --GenericName[tr]=Yeni Giriş --GenericName[uk]=Новий сеанс --GenericName[vi]=Đăng nhập mới --GenericName[wa]=Novea elodjaedje --GenericName[xh]=Ungeno Olutsha --GenericName[zh_CN]=新登录 --GenericName[zh_HK]=以新身分登入 --GenericName[zh_TW]=以新身分登入 --GenericName[zu]=Umngenisi omusha - Comment=Log in as another user without logging out - Comment[af]=Meld aan as 'n ander gebruiker sonder om eers af te meld - Comment[ar]=لُجْ كمستخدم آخر دون الخروج ---- ./gui/gdmflexiserver.desktop.in 2007/09/13 08:50:58 1.25 -+++ ./gui/gdmflexiserver.desktop.in 2007/09/13 08:51:40 -@@ -1,7 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 - _Name=New Login --_GenericName=New Login - _Comment=Log in as another user without logging out - Exec=gdmflexiserver - Icon=gdm diff --git a/gdm-language-save.patch b/gdm-language-save.patch new file mode 100644 index 0000000..0840e2a --- /dev/null +++ b/gdm-language-save.patch @@ -0,0 +1,25 @@ +--- daemon/gdm-daemon-config.c 2007-09-19 16:40:33.000000000 -0600 ++++ daemon/gdm-daemon-config.c 2007-09-19 16:17:30.000000000 -0600 +@@ -2846,10 +2846,20 @@ + gchar *cfgstr; + + cfgstr = g_build_filename (home_dir, ".dmrc", NULL); +- + dmrc = gdm_common_config_load (cfgstr, NULL); + if (dmrc == NULL) { +- return; ++ gint fd = -1; ++ gdm_debug ("file: %s does not exist - creating it", cfgstr); ++ VE_IGNORE_EINTR (fd = g_open (cfgstr, O_CREAT | O_TRUNC | O_RDWR, 0644)); ++ if (fd < 0) return; ++ write (fd, "\n", 2); ++ close (fd); ++ dmrc = gdm_common_config_load (cfgstr, NULL); ++ if (dmrc == NULL) { ++ gdm_debug ("failed to open %s after creating it", cfgstr); ++ return; ++ } ++ + } + + if (savesess) { diff --git a/gdm.changes b/gdm.changes index 2cac535..f367653 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 20 20:01:48 CEST 2007 - banderso@suse.de + +- added gdm-language-save.patch. Patch fixes a problem where the + .dmrc file was not getting created in the process of saving the + default selected language. + Novell bug #309066 + ------------------------------------------------------------------- Tue Sep 18 20:43:21 CEST 2007 - hpj@suse.de diff --git a/gdm.spec b/gdm.spec index b0715db..1c6c81c 100644 --- a/gdm.spec +++ b/gdm.spec @@ -22,7 +22,7 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.20.0 -Release: 1 +Release: 2 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -54,8 +54,9 @@ Patch37: gdm-2.19.3-token-login.patch # don't ask. Patch38: gdm-2.19.3-token-login2.patch Patch40: gdm-XKeepsCrashing-SaX2.patch -Patch42: fix-desktop-files.diff +#Patch42: fix-desktop-files.diff Patch43: gdm-language-hang.patch +Patch44: gdm-language-save.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} @@ -112,6 +113,7 @@ gnome-patch-translation-prepare %patch40 #%patch42 - dont think this patch is needed with suse_udpate_desktop_file -g working. %patch43 +%patch44 gnome-patch-translation-update %build @@ -243,8 +245,12 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %endif %files lang -f %{name}.lang - %changelog +* Thu Sep 20 2007 - banderso@suse.de +- added gdm-language-save.patch. Patch fixes a problem where the + .dmrc file was not getting created in the process of saving the + default selected language. + Novell bug #309066 * Tue Sep 18 2007 - hpj@suse.de - Updated gdm-2.8.0.0-any-hostname-auth.patch to use localhost instead of localhost.localdomain for xauth tokens. Related to