Menu
▾
▴
[Pkgbuild-sfe-commits] SF.net SVN: pkgbuild:[1393] spec-files-extra/trunk
|
From: <sim...@us...> - 2008-09-22 09:52:48
|
Revision: 1393
http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=1393&view=rev
Author: simonzheng
Date: 2008-09-22 09:52:22 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
2008-09-22 simon.zheng <sim...@su...>
* SUNWgnome-display-mgr.spec:
* patches/gdm-06-ICE-optionwidget.diff: Fix for unwritable $HOME issues.
* patches/gdm-07-gconfsanity.diff: Fix for gconf-sanity-check warning.
Modified Paths:
--------------
spec-files-extra/trunk/ChangeLog
spec-files-extra/trunk/SUNWgnome-display-mgr.spec
Added Paths:
-----------
spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff
spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog 2008-09-21 13:12:46 UTC (rev 1392)
+++ spec-files-extra/trunk/ChangeLog 2008-09-22 09:52:22 UTC (rev 1393)
@@ -1,3 +1,9 @@
+2008-09-22 simon.zheng <sim...@su...>
+
+ * SUNWgnome-display-mgr.spec:
+ * patches/gdm-06-ICE-optionwidget.diff: Fix for unwritable $HOME issues.
+ * patches/gdm-07-gconfsanity.diff: Fix for gconf-sanity-check warning.
+
2008-09-21 Dick Hoogendijk <di...@na...>
* SFEqt.spec: Bump to version 4.4.2
Modified: spec-files-extra/trunk/SUNWgnome-display-mgr.spec
===================================================================
--- spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-21 13:12:46 UTC (rev 1392)
+++ spec-files-extra/trunk/SUNWgnome-display-mgr.spec 2008-09-22 09:52:22 UTC (rev 1393)
@@ -30,8 +30,16 @@
Patch3: gdm-03-ctrun.diff
# Manage displays on the fly. Refer to bug #536355.
Patch4: gdm-04-dynamic-display.diff
-# Fix two issues gdm-simple-greeter crash and failure of login.
+# Fix two issues gdm-simple-greeter crash and failure of login.
+# Status: upstream.
Patch5: gdm-05-crash.diff
+# Possible fix for unwritable gdm user $HOME. gnome-session
+# tries to update ~/.ICEAuthority and gdm-simple-greeter crashes
+# when looking up option widgets.
+Patch6: gdm-06-ICE-optionwidget.diff
+# Fix gconf-santiy-check-2 warning dialog.
+# Please see http://bugzilla.gnome.org/show_bug.cgi?id=550832
+Patch7: gdm-07-gconfsanity.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -91,6 +99,8 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p0
+%patch7 -p0
%build
export LDFLAGS="%_ldflags -L/usr/openwin/lib -lXau -R/usr/openwin/lib -R/usr/sfw/lib"
@@ -260,7 +270,12 @@
%{_datadir}/gdm
%dir %attr (0755, root, other) %{_datadir}/gnome
%{_datadir}/gnome/help/gdm/C
-%attr (-, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/*/apps
+%{_datadir}/icons/hicolor/*/apps/*
#%{_datadir}/omf/gdm/*-C.omf
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/gnome-2.0/*
Added: spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff (rev 0)
+++ spec-files-extra/trunk/patches/gdm-06-ICE-optionwidget.diff 2008-09-22 09:52:22 UTC (rev 1393)
@@ -0,0 +1,27 @@
+--- daemon/gdm-welcome-session.c.orig 2008-09-06 18:40:04.753453000 +0800
++++ daemon/gdm-welcome-session.c 2008-09-06 18:42:20.633895000 +0800
+@@ -278,6 +278,8 @@
+
+ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (welcome_session->priv->x11_authority_file));
+ g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (welcome_session->priv->x11_display_name));
++ /* Due to HOME dirctory of gdm user, use tmp dir instead */
++ g_hash_table_insert (hash, g_strdup ("ICEAUTHORITY"), g_strdup ("/tmp/.ICEauthority"));
+
+ #if 0
+ /* hackish ain't it */
+--- gui/simple-greeter/gdm-option-widget.c.orig 2008-09-08 16:25:23.929558000 +0800
++++ gui/simple-greeter/gdm-option-widget.c 2008-09-08 16:30:11.180315000 +0800
+@@ -281,9 +281,10 @@
+ const char *item)
+ {
+ g_return_if_fail (GDM_IS_OPTION_WIDGET (widget));
+- g_return_if_fail (item == NULL ||
+- gdm_option_widget_lookup_item (widget, item,
+- NULL, NULL, NULL));
++ if ((item != NULL &&
++ ! gdm_option_widget_lookup_item (widget, item,
++ NULL, NULL, NULL)))
++ return;
+
+ if (widget->priv->default_item_id == NULL ||
+ item == NULL ||
Added: spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff
===================================================================
--- spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff (rev 0)
+++ spec-files-extra/trunk/patches/gdm-07-gconfsanity.diff 2008-09-22 09:52:22 UTC (rev 1393)
@@ -0,0 +1,19 @@
+--- data/gconf.path.orig 2008-09-08 14:11:27.378093000 +0800
++++ data/gconf.path 2008-09-08 14:11:35.518684000 +0800
+@@ -1,5 +1,5 @@
+ # treat system-wide settings as mandatory
+-xml:readonly:/etc/gconf/gconf.xml.system
++# xml:readonly:/etc/gconf/gconf.xml.system
+
+ # override some settings
+ # we treat settings in this location as
+--- data/Makefile.am.orig 2008-09-08 14:11:15.655240000 +0800
++++ data/Makefile.am 2008-09-08 14:10:47.595552000 +0800
+@@ -226,6 +226,7 @@
+ $(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
+ gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
+ gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries
++ chmod -R +rx $(DESTDIR)$(workingdir)/.gconf.mandatory
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|