--- a/ChangeLog Wed Apr 15 06:11:23 2009 +0000
+++ b/ChangeLog Wed Apr 15 07:01:52 2009 +0000
@@ -1,3 +1,28 @@
+2009-04-15 Dave Lin <[email protected]>
+
+ * base-specs/gvfs.spec: Bump to 1.2.2.
+ * base-specs/libgtop.spec: Bump to 2.26.1.
+ * base-specs/nautilus.spec: Bump to 2.26.2.
+ * patches/nautilus-09-trusted-extensions.diff: Reworked.
+ * patches/nautilus-07-lockdown.diff: Reworked.
+ * base-specs/gnome-themes.spec: Bump to 2.26.1.
+ * base-specs/gtk2-engines.spec: Bump to 2.18.1.
+ * base-specs/gnome-desktop.spec: Bump to 2.26.1.
+ * base-specs/gnome-menus.spec: Bump to 2.26.1.
+ * base-specs/gnome-panel.spec: Bump to 2.26.1.
+ * base-specs/libgweather.spec: Bump to 2.26.1.
+ * base-specs/libwnck.spec: Bump to 2.26.1.
+ * patches/gnome-desktop-06-xrandr-probing.diff: Reworked.
+ * patches/gnome-desktop-01-jds-about-branding.diff: Reworked.
+ * base-specs/gnome-python.spec: Bump to 2.26.1.
+ * base-specs/gnome-session.spec: Bump to 2.26.1.
+ * patches/gnome-session-02-gnome-about.diff: Reworked.
+ * base-specs/gnome-settings-daemon.spec: Bump to 2.26.1.
+ * patches/gnome-settings-daemon-01-no-libgnomekbd.diff: Reworked.
+ * patches/gnome-settings-daemon-09-notification-closed.diff: Removed.
+ * patches/gnome-settings-daemon-10-default-keybinding.diff,
+ * patches/gnome-settings-daemon-09-default-keybinding.diff: Reordered.
+
2009-04-15 Jerry Tan <[email protected]>
* SUNWlibcanberra.spec
--- a/base-specs/gnome-desktop.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gnome-desktop.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,7 +11,7 @@
Name: gnome-desktop
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.26.0
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -187,6 +187,8 @@
%{_libdir}/libgnome-desktop-2.so
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
- Added 07-gtkdoc-rebase.diff to fix GTKDOC_REBASE issue.
--- a/base-specs/gnome-menus.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gnome-menus.spec Wed Apr 15 07:01:52 2009 +0000
@@ -9,7 +9,7 @@
Name: gnome-menus
License: LGPL
Group: System/GUI/GNOME
-Version: 2.26.0
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -152,6 +152,8 @@
%{_includedir}/gnome-menus/*
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
* Tue Feb 17 2009 - [email protected]
--- a/base-specs/gnome-panel.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gnome-panel.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,7 +11,7 @@
Name: gnome-panel
License: GPL
Group: System/GUI/GNOME
-Version: 2.26.0
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -266,6 +266,8 @@
%{_mandir}/man3/*
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Fri Apr 03 2009 - [email protected]
- Fix d.o.o.:7280, add patch 16-set-default-location-crash.diff
* Tue Mar 17 2009 - [email protected]
--- a/base-specs/gnome-python.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gnome-python.spec Wed Apr 15 07:01:52 2009 +0000
@@ -10,7 +10,7 @@
Name: gnome-python
License: LGPL
Group: System/Library
-Version: 2.26.0
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -105,6 +105,8 @@
%{_includedir}/*
%changelog -n gnome-python
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
* Mon Feb 16 2009 - [email protected]
--- a/base-specs/gnome-session.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gnome-session.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,7 +11,7 @@
Name: gnome-session
License: GPL
Group: System/GUI/GNOME
-Version: 2.26.0
+Version: 2.26.1
Release: 3
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -183,6 +183,8 @@
%{_libdir}/compiz-by-default
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Wed Apr 08 2009 - [email protected]
- Added gnome-session-15-reenable-session.diff to re-enable a last minute
changes made in the community that disable session saving.
--- a/base-specs/gnome-settings-daemon.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gnome-settings-daemon.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,12 +11,12 @@
Name: gnome-settings-daemon
License: GPL
Group: System/GUI/GNOME
-Version: 2.25.92
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: The GNOME Settings Daemon
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.25/gnome-settings-daemon-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.26/gnome-settings-daemon-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -38,10 +38,8 @@
Patch7: gnome-settings-daemon-07-default-dpi-and-aa.diff
# date:2008-09-23 owner:dkenny type:branding
Patch8: gnome-settings-daemon-08-find-xrdb.diff
-# date:2009-03-27 owner:bewitche type:bug bugzilla:576535
-Patch9: gnome-settings-daemon-09-notification-closed.diff
# date:2009-04-02 owner:lin type:branding bugzilla:6746963
-Patch10: gnome-settings-daemon-10-default-keybinding.diff
+Patch9: gnome-settings-daemon-09-default-keybinding.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/control-center2
@@ -108,7 +106,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
# Rename dir so that #include does not have to change on gnome-control-center.
# Combines with patch mv-src-dir.diff (see bugzilla 511820).
@@ -220,6 +217,8 @@
%{_libdir}/*.so
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Thu Apr 02 2009 - [email protected]
- Add patch 10 for fix bugzilla 6746963.
* Mon Mar 30 2009 - [email protected]
--- a/base-specs/gnome-themes.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gnome-themes.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,7 +11,7 @@
License: GPL
Group: System/GUI/GNOME
# icon-naming-utils should be bumped at the same time - it's a dependency.
-Version: 2.26.0
+Version: 2.26.1
Release: 3
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -97,6 +97,8 @@
%{_datadir}/locale/*/LC_MESSAGES/*.mo
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Wed Mar 18 2009 - [email protected]
- Bump to 2.26.0
* Fri Mar 13 2009 - [email protected]
--- a/base-specs/gtk2-engines.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gtk2-engines.spec Wed Apr 15 07:01:52 2009 +0000
@@ -10,7 +10,7 @@
Name: gtk2-engines
License: GPL
Group: System/GUI/GNOME
-Version: 2.18.0
+Version: 2.18.1
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -76,6 +76,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog -n gtk2-engines
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.18.1
* Tue Mar 17 2009 - [email protected]
- Bump to 2.18.0
* Fri Mar 13 2009 - [email protected]
--- a/base-specs/gvfs.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/gvfs.spec Wed Apr 15 07:01:52 2009 +0000
@@ -10,7 +10,7 @@
Name: gvfs
License: LGPL
Group: System/Libraries/GNOME
-Version: 1.2.0
+Version: 1.2.2
Release: 4
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -64,6 +64,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 1.2.2
* Mon Mar 23 2009 - [email protected]
- added gvfs-03-debug-crash.diff to stop crashing when default workgroup is nul.
* Tue Mar 17 2009 - [email protected]
--- a/base-specs/libgtop.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/libgtop.spec Wed Apr 15 07:01:52 2009 +0000
@@ -10,7 +10,7 @@
Name: libgtop
License: GPL v2
Group: System/Libraries/GNOME
-Version: 2.26.0
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -112,6 +112,8 @@
%{_libdir}/*.so
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Mon Mar 24 2009 - [email protected]
- add libgtop-02-link.diff, fixes d.o.o#3402
* Mon Mar 23 2009 - [email protected]
--- a/base-specs/libgweather.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/libgweather.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,7 +11,7 @@
Name: libgweather
License: GPL
Group: System/GUI/GNOME
-Version: 2.26.0
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -70,6 +70,8 @@
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
* Fri Mar 13 2009 - [email protected]
--- a/base-specs/libwnck.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/libwnck.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,7 +11,7 @@
Name: libwnck
License: GPL
Group: System/Libraries/GNOME
-Version: 2.26.0
+Version: 2.26.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -117,6 +117,8 @@
%{_datadir}/gtk-doc
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
- Add patch 02-gtkdoc-rebase.diff to fix GTKDOC_REBASE issue.
--- a/base-specs/nautilus.spec Wed Apr 15 06:11:23 2009 +0000
+++ b/base-specs/nautilus.spec Wed Apr 15 07:01:52 2009 +0000
@@ -11,7 +11,7 @@
Name: nautilus
License: GPL
Group: Productivity/File utilities
-Version: 2.26.0
+Version: 2.26.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -255,6 +255,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.2
* Tue Mar 17 2009 - [email protected]
- Bump to 2.26.0
* Fri Mar 13 2009 - [email protected]
--- a/patches/gnome-desktop-01-jds-about-branding.diff Wed Apr 15 06:11:23 2009 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff Wed Apr 15 07:01:52 2009 +0000
@@ -28,30 +28,6 @@
@INTLTOOL_XML_RULE@
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
---- gnome-desktop-2.21.2.old/configure.in 2007-11-19 17:16:14.653238000 +0000
-+++ gnome-desktop-2.21.2/configure.in 2007-11-19 17:17:29.243978000 +0000
-@@ -40,15 +40,21 @@
- GNOME_DATE=`date +"%Y-%m-%d"`
-
- AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor])
-+AC_ARG_WITH(gnome_distributor_version, [ --with-gnome-distributor-version=DISTRIBUTOR Specify version of GNOME distributor])
-
- if test "x$with_gnome_distributor" != x ; then
- GNOME_DISTRIBUTOR=$with_gnome_distributor
- fi
-
-+if test "x$with_gnome_distributor_version" != x ; then
-+ GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version
-+fi
-+
- AC_SUBST(GNOME_PLATFORM)
- AC_SUBST(GNOME_MINOR)
- AC_SUBST(GNOME_MICRO)
- AC_SUBST(GNOME_DISTRIBUTOR)
-+AC_SUBST(GNOME_DISTRIBUTOR_VERSION)
- AC_SUBST(GNOME_DATE)
-
- GNOME_COMMON_INIT
--- gnome-desktop-2.21.2.old/gnome-about/contributors.list 2007-11-19 17:16:13.948459000 +0000
+++ gnome-desktop-2.21.2/gnome-about/contributors.list 2007-11-19 17:17:07.507665000 +0000
@@ -555,3 +555,96 @@
@@ -163,8 +139,37 @@
Exec=gnome-about
Icon=gnome-logo-icon-transparent
Terminal=false
---- gnome-desktop-2.22.1.old/gnome-about/gnome-about.in 2008-04-30 13:40:59.991106000 +0100
-+++ gnome-desktop-2.22.1/gnome-about/gnome-about.in 2008-04-30 13:46:03.284742000 +0100
+--- gnome-desktop-2.26.1/configure.in.ori 2009-04-15 05:09:04.491642625 +0100
++++ gnome-desktop-2.26.1/configure.in 2009-04-15 05:11:42.008855355 +0100
+@@ -39,12 +39,17 @@
+ GNOME_DISTRIBUTOR="GNOME.Org"
+ GNOME_DATE=`date +"%Y-%m-%d"`
+
+-AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor])
++AC_ARG_WITH(gnome_distributor_version, [ --with-gnome-distributor-version=DISTRIBUTOR Specify version of GNOME distributor
++])
+
+ if test "x$with_gnome_distributor" != x ; then
+ GNOME_DISTRIBUTOR=$with_gnome_distributor
+ fi
+
++if test "x$with_gnome_distributor_version" != x ; then
++ GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version
++fi
++
+ AC_ARG_ENABLE([date-in-gnome-version],
+ [AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])],
+ [],[enable_date_in_gnome_version=yes])
+@@ -61,6 +66,7 @@
+ AC_SUBST(GNOME_MINOR)
+ AC_SUBST(GNOME_MICRO)
+ AC_SUBST(GNOME_DISTRIBUTOR)
++AC_SUBST(GNOME_DISTRIBUTOR_VERSION)
+ AC_SUBST(GNOME_DATE)
+ AC_SUBST(GNOME_DATE_COMMENT_START)
+ AC_SUBST(GNOME_DATE_COMMENT_END)
+--- gnome-desktop-2.26.1/gnome-about/gnome-about.in.ori 2009-04-15 05:12:19.050569253 +0100
++++ gnome-desktop-2.26.1/gnome-about/gnome-about.in 2009-04-15 05:23:27.498819963 +0100
@@ -38,7 +38,7 @@
import cairo
from math import pi
@@ -211,7 +216,7 @@
def cleanup_date (date):
'''Parse a date as found in gnome-version.xml and nicely format it'''
try:
-@@ -535,14 +548,16 @@
+@@ -544,14 +557,16 @@
url = ""
menu = None
selection = None
@@ -229,7 +234,7 @@
self.create_menu ()
link_color = self.style_get_property ("link-color")
if not link_color:
-@@ -551,10 +566,16 @@
+@@ -560,10 +575,16 @@
def open_url (self, *args):
'''Use GNOME API to open the url'''
@@ -250,7 +255,7 @@
def copy_url (self, *args):
'''Copy URL to Clipboard'''
-@@ -724,22 +745,33 @@
+@@ -733,22 +754,33 @@
def make_link_widget (link):
'''Helper function which makes an HyperLink and shows it'''
@@ -296,7 +301,7 @@
self.width = current_x + 10
self.height = current_y
-@@ -880,7 +912,7 @@
+@@ -889,7 +921,7 @@
main_box.pack_start (welcome_label)
descriptions_label = VertAnimatedLabel (self.description_messages,
@@ -305,7 +310,7 @@
DESCRIPTION_DELAY, "%s")
welcome_label.connect ("button-press-event",
descriptions_label.on_button_press)
-@@ -954,6 +986,7 @@
+@@ -963,6 +995,7 @@
"minor" : "",
"micro" : "",
"distributor" : "",
@@ -313,11 +318,13 @@
"date" : ""
}
-@@ -964,13 +997,17 @@
+@@ -973,15 +1006,19 @@
self.load_description_messages (node)
'''Format version'''
-- if not len (infos["minor"]):
+- if not len (infos["platform"]):
+- version = ""
+- elif not len (infos["minor"]):
- version = infos["platform"]
- elif not len (infos["micro"]):
- version = "%s.%s" % (infos["platform"], infos["minor"])
@@ -327,7 +334,9 @@
else:
- version = "%s.%s.%s" % (infos["platform"], infos["minor"],
- infos["micro"])
-+ if not len (infos["minor"]):
++ if not len (infos["platform"]):
++ version = ""
++ elif not len (infos["minor"]):
+ version = infos["platform"]
+ elif not len (infos["micro"]):
+ version = "%s.%s" % (infos["platform"], infos["minor"])
@@ -335,5 +344,5 @@
+ version = "%s.%s.%s" % (infos["platform"], infos["minor"],
+ infos["micro"])
- return [
- (_("Version"), version),
+ date = cleanup_date (infos["date"])
+
--- a/patches/gnome-desktop-06-xrandr-probing.diff Wed Apr 15 06:11:23 2009 +0000
+++ b/patches/gnome-desktop-06-xrandr-probing.diff Wed Apr 15 07:01:52 2009 +0000
@@ -1,15 +1,24 @@
-/jds/bin/diff -uprN gnome-desktop-2.25.3.old/libgnome-desktop/gnome-rr.c gnome-desktop-2.25.3/libgnome-desktop/gnome-rr.c
---- gnome-desktop-2.25.3.old/libgnome-desktop/gnome-rr.c 2009-01-08 13:35:56.834705000 +0000
-+++ gnome-desktop-2.25.3/libgnome-desktop/gnome-rr.c 2009-01-08 13:40:31.739553000 +0000
-@@ -449,9 +450,33 @@ fill_out_screen_info (Display *xdisplay,
+--- gnome-desktop-2.26.0/libgnome-desktop/gnome-rr-private.h.ori 2009-03-17 08:06:05.955978124 +0000
++++ gnome-desktop-2.26.0/libgnome-desktop/gnome-rr-private.h 2009-03-17 08:07:12.576608678 +0000
+@@ -34,6 +34,7 @@
+
+ GnomeRRScreenChanged callback;
+ gpointer data;
++ GTimeVal last_update_time;
+ };
+
+ #endif
+--- gnome-desktop-2.26.1/libgnome-desktop/gnome-rr.c.ori 2009-04-15 05:28:28.927718257 +0100
++++ gnome-desktop-2.26.1/libgnome-desktop/gnome-rr.c 2009-04-15 05:34:06.962714756 +0100
+@@ -432,9 +432,34 @@
static ScreenInfo *
- screen_info_new (GnomeRRScreen *screen, GError **error)
+ screen_info_new (GnomeRRScreen *screen, gboolean needs_reprobe, GError **error)
{
- ScreenInfo *info = g_new0 (ScreenInfo, 1);
-
-+ GTimeVal cur_time_val;
-+ gint64 cur, prev;
-+
++ GTimeVal cur_time_val;
++ gint64 cur, prev;
++
g_assert (screen != NULL);
+
+ if ( screen->info != NULL ) {
@@ -26,7 +35,7 @@
+ }
+ else {
+ /* Don't return any update, which should result in caller using
-+ * existing data
++ * existing data
+ */
+ g_warning("Call to screen_info_new is too frequent, skipping...");
+ return( NULL );
@@ -34,26 +43,17 @@
+ }
+
+ ScreenInfo *info = g_new0 (ScreenInfo, 1);
++
info->outputs = NULL;
info->crtcs = NULL;
-@@ -553,6 +578,9 @@ gnome_rr_screen_new (GdkScreen *gdk_scre
- screen->randr_event_base = event_base;
-
- screen->info = screen_info_new (screen, error);
+@@ -557,6 +582,9 @@
+ XRRQueryVersion (dpy, &screen->rr_major_version, &screen->rr_minor_version);
+
+ screen->info = screen_info_new (screen, TRUE, error);
+
-+ /* Initialize the last udpate time */
-+ g_get_current_time (&(screen->last_update_time));
++ /* Initialize the last udpate time */
++ g_get_current_time (&(screen->last_update_time));
if (!screen->info) {
g_free (screen);
---- gnome-desktop-2.26.0/libgnome-desktop/gnome-rr-private.h.ori 2009-03-17 08:06:05.955978124 +0000
-+++ gnome-desktop-2.26.0/libgnome-desktop/gnome-rr-private.h 2009-03-17 08:07:12.576608678 +0000
-@@ -34,6 +34,7 @@
-
- GnomeRRScreenChanged callback;
- gpointer data;
-+ GTimeVal last_update_time;
- };
-
- #endif
--- a/patches/gnome-session-02-gnome-about.diff Wed Apr 15 06:11:23 2009 +0000
+++ b/patches/gnome-session-02-gnome-about.diff Wed Apr 15 07:01:52 2009 +0000
@@ -1,32 +1,29 @@
-Binary files gnome-session-2.25.92/data/gnome-splash.png and ../SUNWgnome-session-2.25.91.p2/gnome-session-2.25.92/data/gnome-splash.png differ
-diff -urN -x'*.orig' -x'*.rej' gnome-session-2.25.92/gnome-session/gsm-manager.c ../SUNWgnome-session-2.25.91.p2/gnome-session-2.25.92/gnome-session/gsm-manager.c
---- gnome-session-2.25.92/gnome-session/gsm-manager.c 2009-03-03 16:58:00.000000000 +0000
-+++ ../SUNWgnome-session-2.25.91.p2/gnome-session-2.25.92/gnome-session/gsm-manager.c 2009-03-09 15:35:49.160894000 +0000
-@@ -356,6 +356,23 @@
+--- gnome-session-2.26.1/gnome-session/gsm-manager.c.ori 2009-04-15 07:31:14.825694454 +0100
++++ gnome-session-2.26.1/gnome-session/gsm-manager.c 2009-04-15 07:33:02.709285954 +0100
+@@ -376,6 +376,22 @@
+ }
static void start_phase (GsmManager *manager);
-
+#define ABOUT_PROMPT_KEY "/desktop/gnome/session/sun_extensions/viewed_about_jds_three"
+
+static gint
+show_gnome_about (gpointer data)
+{
-+ int status;
++ int status;
+
-+ if (g_spawn_command_line_async("gnome-about", NULL))
-+ {
-+ GConfClient *gconf_client = gconf_client_get_default ();
-+ gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
-+ g_object_unref (gconf_client);
-+ }
++ if (g_spawn_command_line_async("gnome-about", NULL))
++ {
++ GConfClient *gconf_client = gconf_client_get_default ();
++ gconf_client_set_bool (gconf_client, ABOUT_PROMPT_KEY, TRUE, NULL);
++ g_object_unref (gconf_client);
++ }
+
-+ return FALSE;
++ return FALSE;
+}
-+
+
static void
- end_phase (GsmManager *manager)
- {
-@@ -1089,6 +1106,9 @@
+ quit_request_completed (GsmConsolekit *consolekit,
+@@ -1276,6 +1292,9 @@
void
gsm_manager_start (GsmManager *manager)
{
@@ -36,7 +33,7 @@
g_debug ("GsmManager: GSM starting to manage");
g_return_if_fail (GSM_IS_MANAGER (manager));
-@@ -1096,6 +1116,10 @@
+@@ -1283,6 +1302,10 @@
gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_INITIALIZATION);
debug_app_summary (manager);
start_phase (manager);
--- a/patches/gnome-settings-daemon-01-no-libgnomekbd.diff Wed Apr 15 06:11:23 2009 +0000
+++ b/patches/gnome-settings-daemon-01-no-libgnomekbd.diff Wed Apr 15 07:01:52 2009 +0000
@@ -34,39 +34,6 @@
gsd-xmodmap.h \
gsd-xmodmap.c \
delayed-dialog.h \
---- gnome-settings-daemon-2.25.2/plugins/keyboard/gsd-keyboard-manager.c.ori 2008-12-01 11:38:46.000000000 +0000
-+++ gnome-settings-daemon-2.25.2/plugins/keyboard/gsd-keyboard-manager.c 2008-12-24 08:00:44.042726771 +0000
-@@ -36,6 +36,7 @@
- #include <gdk/gdk.h>
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
-+#include <gconf/gconf-client.h>
-
- #ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
- # include <X11/extensions/xf86misc.h>
-@@ -48,7 +49,9 @@
- #include "gnome-settings-profile.h"
- #include "gsd-keyboard-manager.h"
-
-+#ifdef HAVE_GSWITCHIT
- #include "gsd-keyboard-xkb.h"
-+#endif
- #include "gsd-xmodmap.h"
-
- #define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
-@@ -384,9 +387,11 @@
-
- gconf_client_add_dir (client, GSD_KEYBOARD_KEY, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
-+#ifdef HAVE_GSWITCHIT
- /* Essential - xkb initialization should happen before */
- gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL);
- gsd_keyboard_xkb_init (client);
-+#endif
-
- #ifdef HAVE_X11_EXTENSIONS_XKB_H
- numlock_xkb_init (manager);
-/jds/bin/diff -uprN gnome-settings-daemon-2.25.90.old/configure.ac gnome-settings-daemon-2.25.90/configure.ac
--- gnome-settings-daemon-2.25.90.old/configure.ac 2009-02-10 19:09:44.237204000 +0000
+++ gnome-settings-daemon-2.25.90/configure.ac 2009-02-10 19:11:11.738123000 +0000
@@ -208,9 +208,23 @@ AC_CHECK_X_LIB(Xxf86misc, XF86MiscQueryE
@@ -96,3 +63,35 @@
dnl ---------------------------------------------------------------------------
dnl - Housekeeping plugin stuff
+--- gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-manager.c.ori 2009-04-15 07:07:26.999526943 +0100
++++ gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-manager.c 2009-04-15 07:08:43.002715791 +0100
+@@ -36,6 +36,7 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
++#include <gconf/gconf-client.h>
+
+ #ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
+ # include <X11/extensions/xf86misc.h>
+@@ -48,7 +49,9 @@
+ #include "gnome-settings-profile.h"
+ #include "gsd-keyboard-manager.h"
+
++#ifdef HAVE_GSWITCHIT
+ #include "gsd-keyboard-xkb.h"
++#endif
+ #include "gsd-xmodmap.h"
+
+ #define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
+@@ -384,9 +387,11 @@
+
+ gconf_client_add_dir (client, GSD_KEYBOARD_KEY, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+
++#ifdef HAVE_GSWITCHIT
+ /* Essential - xkb initialization should happen before */
+ gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL);
+ gsd_keyboard_xkb_init (client);
++#endif
+
+ #ifdef HAVE_X11_EXTENSIONS_XKB_H
+ numlock_xkb_init (manager);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-settings-daemon-09-default-keybinding.diff Wed Apr 15 07:01:52 2009 +0000
@@ -0,0 +1,40 @@
+diff --git a/data/apps_gnome_settings_daemon_keybindings.schemas.in b/data/apps_gnome_settings_daemon_keybindings.schemas.in
+index ac3e312..66a2c51 100644
+--- a/data/apps_gnome_settings_daemon_keybindings.schemas.in
++++ b/data/apps_gnome_settings_daemon_keybindings.schemas.in
+@@ -17,7 +17,7 @@
+ <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mute</key>
+ <applyto>/apps/gnome_settings_daemon/keybindings/volume_mute</applyto>
+ <type>string</type>
+- <default>XF86AudioMute</default>
++ <default>SunAudioMute</default>
+ <locale name="C">
+ <short>Volume mute</short>
+ <long>Binding to mute the system volume.</long>
+@@ -29,7 +29,7 @@
+ <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_down</key>
+ <applyto>/apps/gnome_settings_daemon/keybindings/volume_down</applyto>
+ <type>string</type>
+- <default>XF86AudioLowerVolume</default>
++ <default>SunAudioLowerVolume</default>
+ <locale name="C">
+ <short>Volume down</short>
+ <long>Binding to lower the system volume.</long>
+@@ -41,7 +41,7 @@
+ <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_up</key>
+ <applyto>/apps/gnome_settings_daemon/keybindings/volume_up</applyto>
+ <type>string</type>
+- <default>XF86AudioRaiseVolume</default>
++ <default>SunAudioRaiseVolume</default>
+ <locale name="C">
+ <short>Volume up</short>
+ <long>Binding to raise the system volume.</long>
+@@ -113,7 +113,7 @@
+ <key>/schemas/apps/gnome_settings_daemon/keybindings/sleep</key>
+ <applyto>/apps/gnome_settings_daemon/keybindings/sleep</applyto>
+ <type>string</type>
+- <default></default>
++ <default>SunPowerSwitch</default>
+ <locale name="C">
+ <short>Suspend</short>
+ <long>Binding to suspend the computer.</long>
--- a/patches/gnome-settings-daemon-09-notification-closed.diff Wed Apr 15 06:11:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
---- gnome-settings-daemon-2.25.92/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c.old 2009-03-27 12:31:35.476346000 +0800
-+++ gnome-settings-daemon-2.25.92/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c 2009-03-27 12:34:36.238370000 +0800
-@@ -445,10 +445,9 @@
- #ifdef HAVE_LIBNOTIFY
- static void
- on_notification_closed (NotifyNotification *notification,
-- int reason,
- GsdA11yKeyboardManager *manager)
- {
-- /* seems to crash if we unref */
-+ g_object_unref (manager->priv->notification);
- manager->priv->notification = NULL;
- }
-
-@@ -1111,8 +1110,8 @@
-
- g_debug ("Stopping a11y_keyboard manager");
-
-- if (manager->priv->status_icon)
-- gtk_status_icon_set_visible (manager->priv->status_icon, FALSE);
-+ if (p->status_icon)
-+ gtk_status_icon_set_visible (p->status_icon, FALSE);
-
- if (p->gconf_notify != 0) {
- GConfClient *client = gconf_client_get_default ();
--- a/patches/gnome-settings-daemon-10-default-keybinding.diff Wed Apr 15 06:11:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-diff --git a/data/apps_gnome_settings_daemon_keybindings.schemas.in b/data/apps_gnome_settings_daemon_keybindings.schemas.in
-index ac3e312..66a2c51 100644
---- a/data/apps_gnome_settings_daemon_keybindings.schemas.in
-+++ b/data/apps_gnome_settings_daemon_keybindings.schemas.in
-@@ -17,7 +17,7 @@
- <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mute</key>
- <applyto>/apps/gnome_settings_daemon/keybindings/volume_mute</applyto>
- <type>string</type>
-- <default>XF86AudioMute</default>
-+ <default>SunAudioMute</default>
- <locale name="C">
- <short>Volume mute</short>
- <long>Binding to mute the system volume.</long>
-@@ -29,7 +29,7 @@
- <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_down</key>
- <applyto>/apps/gnome_settings_daemon/keybindings/volume_down</applyto>
- <type>string</type>
-- <default>XF86AudioLowerVolume</default>
-+ <default>SunAudioLowerVolume</default>
- <locale name="C">
- <short>Volume down</short>
- <long>Binding to lower the system volume.</long>
-@@ -41,7 +41,7 @@
- <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_up</key>
- <applyto>/apps/gnome_settings_daemon/keybindings/volume_up</applyto>
- <type>string</type>
-- <default>XF86AudioRaiseVolume</default>
-+ <default>SunAudioRaiseVolume</default>
- <locale name="C">
- <short>Volume up</short>
- <long>Binding to raise the system volume.</long>
-@@ -113,7 +113,7 @@
- <key>/schemas/apps/gnome_settings_daemon/keybindings/sleep</key>
- <applyto>/apps/gnome_settings_daemon/keybindings/sleep</applyto>
- <type>string</type>
-- <default></default>
-+ <default>SunPowerSwitch</default>
- <locale name="C">
- <short>Suspend</short>
- <long>Binding to suspend the computer.</long>
--- a/patches/nautilus-07-lockdown.diff Wed Apr 15 06:11:23 2009 +0000
+++ b/patches/nautilus-07-lockdown.diff Wed Apr 15 07:01:52 2009 +0000
@@ -473,67 +473,6 @@
+G_END_DECLS
+
+#endif /* __NAUTILUS_LOCKDOWN_H__ */
-diff -urN naut.orig/libnautilus-private/nautilus-program-choosing.c naut.new/libnautilus-private/nautilus-program-choosing.c
---- naut.orig/libnautilus-private/nautilus-program-choosing.c 2008-08-21 00:31:04.949357000 +0100
-+++ naut.new/libnautilus-private/nautilus-program-choosing.c 2008-08-21 00:32:23.668032000 +0100
-@@ -243,6 +243,22 @@
- eel_g_list_free_deep (uris);
- }
-
-+static gboolean
-+command_is_allowed (const char *full_command)
-+{
-+ gboolean allowed = !nautilus_lockdown_is_forbidden_command(full_command);
-+ if (!allowed) {
-+ eel_show_error_dialog
-+ /* SUN_BRANDING */
-+ (_("Sorry, This is a restricted application which "
-+ "you may not run."),
-+ /* SUN_BRANDING */
-+ _("Restricted Application"),
-+ NULL);
-+ }
-+ return allowed;
-+}
-+
- /**
- * nautilus_launch_application_from_command:
- *
-@@ -324,8 +340,22 @@
- }
- }
-
-+ if (!command_is_allowed (command_string)) {
-+ g_free (full_command);
-+ return;
-+ }
-+
- if (use_terminal) {
-- eel_gnome_open_terminal_on_screen (full_command, screen);
-+ if (!nautilus_lockdown_is_command_line_disabled ()) {
-+ eel_gnome_open_terminal_on_screen (full_command, screen);
-+ } else {
-+ eel_show_error_dialog
-+ /* SUN_BRANDING */
-+ (_("Sorry, this command requires a terminal "),
-+ /* SUN_BRANDING */
-+ _("Terminal access is restricted."),
-+ NULL);
-+ }
- } else {
- gdk_spawn_command_line_on_screen (screen, full_command, NULL);
- }
-@@ -376,6 +406,10 @@
- parent_window);
- return;
- }
-+
-+ if (!command_is_allowed (g_app_info_get_executable (app_info))) {
-+ return;
-+ }
-
- /* count the number of uris with local paths */
- count = 0;
--- nautilus-2.24.0.old/src/file-manager/fm-directory-view.c 2008-09-21 23:11:41.000000000 +0100
+++ nautilus-2.24.0/src/file-manager/fm-directory-view.c 2008-09-24 22:08:05.993129000 +0100
@@ -316,6 +316,7 @@
@@ -631,32 +570,6 @@
g_free (view->details);
G_OBJECT_CLASS (parent_class)->finalize (object);
---- /usr/tmp/nautilus-2.25.2/src/nautilus-main.c 2008-12-01 11:08:00.000000000 +0000
-+++ nautilus-2.25.2/src/nautilus-main.c 2009-01-02 09:17:43.908580000 +0000
-@@ -48,6 +48,7 @@
- #include <libnautilus-private/nautilus-debug-log.h>
- #include <libnautilus-private/nautilus-directory-metafile.h>
- #include <libnautilus-private/nautilus-global-preferences.h>
-+#include <libnautilus-private/nautilus-lockdown.h>
- #include <libnautilus-private/nautilus-lib-self-check-functions.h>
- #include <libnautilus-private/nautilus-icon-names.h>
- #include <libxml/parser.h>
-@@ -447,6 +448,7 @@
- (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
- }
-
-+ nautilus_lockdown_init ();
- application = NULL;
-
- /* Do either the self-check or the real work. */
-@@ -508,6 +510,7 @@
- g_object_unref (application);
- }
-
-+ nautilus_lockdown_finalize ();
- eel_debug_shut_down ();
-
- return EXIT_SUCCESS;
diff -urN naut.orig/src/nautilus-window-menus.c naut.new/src/nautilus-window-menus.c
--- naut.orig/src/nautilus-window-menus.c 2008-08-21 00:30:56.182989000 +0100
+++ naut.new/src/nautilus-window-menus.c 2008-08-21 00:32:23.813862000 +0100
@@ -703,17 +616,6 @@
void
nautilus_window_load_extension_menus (NautilusWindow *window)
{
---- /usr/tmp/nautilus-2.25.4/src/nautilus-window-private.h 2008-12-19 11:34:06.000000000 +0000
-+++ nautilus-2.25.4/src/nautilus-window-private.h 2009-02-16 09:31:25.354115000 +0000
-@@ -164,6 +164,8 @@
- const char *status);
- void nautilus_window_load_view_as_menus (NautilusWindow *window);
- void nautilus_window_load_extension_menus (NautilusWindow *window);
-+void nautilus_window_menus_lockdown_notify_add (NautilusWindow *window);
-+void nautilus_window_menus_lockdown_notify_remove (NautilusWindow *window);
- void nautilus_window_initialize_menus (NautilusWindow *window);
- void nautilus_menus_append_bookmark_to_menu (NautilusWindow *window,
- NautilusBookmark *bookmark,
--- /usr/tmp/nautilus-2.25.4/src/nautilus-window.c 2008-12-19 11:34:06.000000000 +0000
+++ nautilus-2.25.4/src/nautilus-window.c 2009-02-16 09:34:42.336842000 +0000
@@ -628,6 +628,8 @@
@@ -744,3 +646,100 @@
NULL };
/* Forward declarations */
+--- nautilus-2.26.2/src/nautilus-main.c.ori 2009-04-15 06:30:11.209902629 +0100
++++ nautilus-2.26.2/src/nautilus-main.c 2009-04-15 06:31:36.570691772 +0100
+@@ -48,6 +48,7 @@
+ #include <libnautilus-private/nautilus-debug-log.h>
+ #include <libnautilus-private/nautilus-directory-metafile.h>
+ #include <libnautilus-private/nautilus-global-preferences.h>
++#include <libnautilus-private/nautilus-lockdown.h>
+ #include <libnautilus-private/nautilus-lib-self-check-functions.h>
+ #include <libnautilus-private/nautilus-icon-names.h>
+ #include <libxml/parser.h>
+@@ -464,6 +465,7 @@
+ (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
+ }
+
++ nautilus_lockdown_init ();
+ application = NULL;
+
+ /* Do either the self-check or the real work. */
+@@ -525,6 +527,7 @@
+ g_object_unref (application);
+ }
+
++ nautilus_lockdown_finalize ();
+ eel_debug_shut_down ();
+
+ nautilus_application_save_accel_map (NULL);
+--- nautilus-2.26.2/src/nautilus-window-private.h.ori 2009-04-15 06:33:04.011629039 +0100
++++ nautilus-2.26.2/src/nautilus-window-private.h 2009-04-15 06:34:36.857486098 +0100
+@@ -164,6 +164,8 @@
+ const char *status);
+ void nautilus_window_load_view_as_menus (NautilusWindow *window);
+ void nautilus_window_load_extension_menus (NautilusWindow *window);
++void nautilus_window_menus_lockdown_notify_add (NautilusWindow *window);
++void nautilus_window_menus_lockdown_notify_remove (NautilusWindow *window);
+ void nautilus_window_initialize_menus (NautilusWindow *window);
+ void nautilus_window_remove_trash_monitor_callback (NautilusWindow *window);
+ void nautilus_menus_append_bookmark_to_menu (NautilusWindow *window,
+--- nautilus-2.26.2/libnautilus-private/nautilus-program-choosing.c.ori 2009-04-15 06:27:45.072758259 +0100
++++ nautilus-2.26.2/libnautilus-private/nautilus-program-choosing.c 2009-04-15 06:29:37.692472686 +0100
+@@ -158,6 +158,22 @@
+ eel_g_list_free_deep (uris);
+ }
+
++static gboolean
++command_is_allowed (const char *full_command)
++{
++ gboolean allowed = !nautilus_lockdown_is_forbidden_command(full_command);
++ if (!allowed) {
++ eel_show_error_dialog
++ /* SUN_BRANDING */
++ (_("Sorry, This is a restricted application which "
++ "you may not run."),
++ /* SUN_BRANDING */
++ _("Restricted Application"),
++ NULL);
++ }
++ return allowed;
++}
++
+ void
+ nautilus_launch_application_by_uri (GAppInfo *application,
+ GList *uris,
+@@ -335,8 +351,22 @@
+ }
+ }
+
++ if (!command_is_allowed (command_string)) {
++ g_free (full_command);
++ return;
++ }
++
+ if (use_terminal) {
+- eel_gnome_open_terminal_on_screen (full_command, screen);
++ if (!nautilus_lockdown_is_command_line_disabled ()) {
++ eel_gnome_open_terminal_on_screen (full_command, screen);
++ } else {
++ eel_show_error_dialog
++ /* SUN_BRANDING */
++ (_("Sorry, this command requires a terminal "),
++ /* SUN_BRANDING */
++ _("Terminal access is restricted."),
++ NULL);
++ }
+ } else {
+ gdk_spawn_command_line_on_screen (screen, full_command, NULL);
+ }
+@@ -387,6 +417,10 @@
+ parent_window);
+ return;
+ }
++
++ if (!command_is_allowed (g_app_info_get_executable (app_info))) {
++ return;
++ }
+
+ /* count the number of uris with local paths */
+ count = 0;
--- a/patches/nautilus-09-trusted-extensions.diff Wed Apr 15 06:11:23 2009 +0000
+++ b/patches/nautilus-09-trusted-extensions.diff Wed Apr 15 07:01:52 2009 +0000
@@ -10,25 +10,6 @@
nautilus-ui-utilities.c \
nautilus-ui-utilities.h \
nautilus-undo-manager.c \
-diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-column-utilities.c naut.new/libnautilus-private/nautilus-column-utilities.c
---- naut.orig/libnautilus-private/nautilus-column-utilities.c 2009-03-25 15:48:56.405155840 +0000
-+++ naut.new/libnautilus-private/nautilus-column-utilities.c 2009-03-25 15:50:31.163460018 +0000
-@@ -113,6 +113,7 @@
- "label", _("MIME Type"),
- "description", _("The mime type of the file."),
- NULL));
-+#ifdef HAVE_SELINUX
- columns = g_list_append (columns,
- g_object_new (NAUTILUS_TYPE_COLUMN,
- "name", "selinux_context",
-@@ -120,6 +121,7 @@
- "label", _("SELinux Context"),
- "description", _("The SELinux security context of the file."),
- NULL));
-+#endif
-
- return columns;
- }
diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-module.c naut.new/libnautilus-private/nautilus-module.c
--- naut.orig/libnautilus-private/nautilus-module.c 2009-03-25 15:48:56.426647854 +0000
+++ naut.new/libnautilus-private/nautilus-module.c 2009-03-31 11:05:33.382333482 +0100
@@ -582,3 +563,21 @@
}
static void
+--- nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c.ori 2009-04-15 06:40:35.671068662 +0100
++++ nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c 2009-04-15 06:42:17.453055378 +0100
+@@ -113,6 +113,7 @@
+ "label", _("MIME Type"),
+ "description", _("The mime type of the file."),
+ NULL));
++#ifdef HAVE_SELINUX
+ columns = g_list_append (columns,
+ g_object_new (NAUTILUS_TYPE_COLUMN,
+ "name", "selinux_context",
+@@ -120,6 +121,7 @@
+ "label", _("SELinux Context"),
+ "description", _("The SELinux security context of the file."),
+ NULL));
++#endif
+ columns = g_list_append (columns,
+ g_object_new (NAUTILUS_TYPE_COLUMN,
+ "name", "where",