Merged 217update branch changes r9777:9830 into trunk branch.
--- a/ChangeLog Fri Nov 24 15:00:22 2006 +0000
+++ b/ChangeLog Fri Nov 24 16:56:15 2006 +0000
@@ -3,6 +3,97 @@
* Solaris/SUNWacroread.spec, acroread.spec, ext-sources/defaults.list:
This is a fix for bug#6497045.
+2006-11-24 Damien Carbery <[email protected]>
+
+ * cairo.spec: Bump to 1.3.2. Add patch 04-float-word to fix configure
+ issue. Fixes #9124.
+ * patches/cairo-04-float-word.diff: Added. Fixes 9124.
+
+2006-11-24 Damien Carbery <[email protected]>
+
+ * file-roller.spec: Add --libexecdir to configure call.
+ * gnome-games.spec: Add patches 01-array-init to fix 363438 and
+ 02-ggz-function to fix 362444.
+ * patches/gnome-games-01-array-init.diff: Fix 363438.
+ * patches/gnome-games-02-ggz-function.diff: Fix 362444.
+
+2006-11-23 Damien Carbery <[email protected]>
+
+ * dbus.spec: Remove upstream patch 01, 02, 04, 05 and 06.
+ * patches/dbus-01-glib_cflags.diff, patches/dbus-02-python.diff,
+ patches/dbus-04-libexec.diff, patches/dbus-05-priv.diff,
+ patches/dbus-06-proxy-change-owner-crash.diff: Removed, upstream.
+ * patches/dbus-01-dbus-launch.diff: Added, renamed from 01. Also
+ reworked for 1.0.1 tarball.
+
+2006-11-23 Damien Carbery <[email protected]>
+
+ * patches/gnome-system-monitor-01-solaris.diff: Reworked for 2.17.2.1
+ tarball.
+
+2006-11-23 Damien Carbery <[email protected]>
+
+ * patches/gnome-volume-manager-04-fixlocaluser.diff: Reworked for
+ 2.17.0 tarball.
+ * patches/gnome-session-03-gnome-atom.diff,
+ patches/gnome-session-05-gnome-about.diff,
+ patches/gnome-session-09-trusted-extensions.diff: Reworked for 2.17.2
+ tarball.
+ * patches/gnome-utils-04-logview-plugin.diff: Reworked for 2.17.0
+ tarball.
+ * patches/metacity-05-raise-on-frame-click.diff,
+ patches/metacity-10-trusted-extensions.diff: Rework for 2.17.2
+ tarball.
+
+2006-11-23 Damien Carbery <[email protected]>
+
+ * patches/gdm-06-system-locale.diff: Rework for 2.17.2 tarball.
+ * patches/gdm-07-linguas.diff: Rework for 2.17.2 tarball.
+ * patches/libgnome-01-default-background.diff: Rework for 2.17.0
+ tarball.
+ * patches/totem-05-moz-plugin.diff: Rework for 2.17.3 tarball.
+ * patches/gnome-desktop-01-jds-about-branding.diff: Rework for 2.17.2
+ tarball.
+ * libgnomeprint.spec: Remove upstream patch, 03-g11n-filename.
+ * patches/libgnomeprint-03-g11n-filename.diff: Removed, upstream.
+ * vino.spec: Remove upstream patches, 02-a11y-theme-icons and
+ 03-a11y-selectable-label. Renumber remainder.
+ * patches/vino-02-a11y-theme-icons.diff: Removed, upstream.
+ * patches/vino-03-a11y-selectable-label.diff: Removed, upstream.
+ * patches/vino-02-disable-xsun.diff: Added, renamed from 04.
+
+2006-11-23 Damien Carbery <[email protected]>
+
+ * file-roller.spec: Remove upstream patch, 02-rpm-cpio.
+ * patches/file-roller-02-rpm-cpio.diff: Removed, upstream.
+ * gdm.spec:
+ * patches/gdm-09-sun-branding-patch.diff: Removed, upstream.
+ * patches/gdm-10-fixfocus.diff: Removed, upstream.
+ * patches/gdm-09-gdmsetup-launch-menu-tooltip.diff: Added, renamed from
+ 11.
+
+2006-11-23 Damien Carbery <[email protected]>
+
+ * libgnomeprintui.spec: Bump to 2.17.0.
+ * nautilus-cd-burner.spec: Bump to 2.17.2.
+ * orca.spec: Bump to 2.17.2.
+ * totem.spec: Bump to 2.17.3.
+ * vino.spec: Bump to 2.17.2. Remove 8 upstream patches:
+ 02-gnome-keyring, 03-xgl, 04-ipv6-remove-dead-code,
+ 05-ipv6-use-getaddrinfo, 06-ipv6-use-inet-ntop,
+ 07-ipv6-configure-check, 08-ipv6-create-ipv6-socket,
+ 09-ipv6-create-ipv6-http-socket.
+ * patches/vino-02-gnome-keyring.diff, patches/vino-03-xgl.diff,
+ patches/vino-04-ipv6-remove-dead-code.diff,
+ patches/vino-05-ipv6-use-getaddrinfo.diff,
+ patches/vino-06-ipv6-use-inet-ntop.diff,
+ patches/vino-07-ipv6-configure-check.diff,
+ patches/vino-08-ipv6-create-ipv6-socket.diff,
+ patches/vino-09-ipv6-create-ipv6-http-socket.diff: Removed, upstream.
+ * patches/vino-02-a11y-theme-icons.diff: Added, renamed from 10.
+ * patches/vino-03-a11y-selectable-label.diff: Added, renamed from 11.
+ * patches/vino-04-disable-xsun.diff: Added, renamed from 12.
+
2006-11-23 Padraig O'Briain <[email protected]>
* gtk2.spec: Add references to patch gtk+-20-gedit-menu-shortcuts.diff.
@@ -34,10 +125,54 @@
nautilus.spec, poppler.spec, yelp.spec: add --datadir=%{_datadir}
configure option, fixes 6443777
+2006-11-22 Damien Carbery <[email protected]>
+
+ * gnome-volume-manager.spec: Bump to 2.17.0.
+ * libgnome.spec: Bump to 2.17.0.
+ * libgnomeprint.spec: Bump to 2.17.0. Remove upstream patch, 01-Wall.
+ Renumber remainder.
+ * patches/libgnomeprint-01-papi-print-dialog.diff: Renumbered from 02.
+ * patches/libgnomeprint-02-evince-crash.diff: Renumbered from 03.
+ * patches/libgnomeprint-03-g11n-filename.diff: Renumbered from 04.
+
+2006-11-22 Damien Carbery <[email protected]>
+
+ * gnome-python-desktop.spec: Bump to 2.17.1. Add patch, 01-no_inline,
+ to fix #368364.
+ * patches/gnome-python-desktop-01-no_inline.diff: Added, fixes 368364.
+ * gnome-session.spec: Bump to 2.17.2.
+ * gnome-system-monitor.spec: Bump to 2.17.2.1.
+ * gnome-themes.spec: Bump to 2.17.2. Remove upstream patches,
+ 01-accessibility-icons and 03-icon-name-mapping. Rename remainder.
+ * patches/gnome-themes-01-accessibility-icons.diff: Removed, upstream.
+ * patches/gnome-themes-03-icon-name-mapping.diff: Removed, upstream.
+ * patches/gnome-themes-01-add-so8-a11y-icons.diff: Renamed from 02.
+ * gnome-utils.spec: Bump to 2.17.0.
+ * dbus.spec: Bump to 1.0.1.
+
+2006-11-22 Damien Carbery <[email protected]>
+
+ * gnome-desktop.spec: Bump to 2.17.2.
+ * gnome-games.spec: Bump to 2.17.1.
+ * gnome-icon-theme.spec: Bump to 2.17.2.1.
+ * gnome-menus.spec: Bump to 2.17.2.
+
2006-11-21 Laszlo (Laca) Peter <[email protected]>
* python.spec: delete, unused.
+2006-11-20 Damien Carbery <[email protected]>
+
+ * gnome-screensaver.spec: Bump to 2.17.2.
+ * metacity.spec: Bump to 2.17.2. Remove upstream patch,
+ 13-terminal-strict-focus. Comment out patch 9 as it needs rework.
+ * patches/metacity-13-terminal-strict-focus.diff: Removed, upstream.
+ * control-center.spec: Bump to 2.17.1.
+ * deskbar-applet.spec: Bump to 2.17.1.
+ * eog.spec: Bump to 2.17.1.
+ * file-roller.spec: Bump to 2.17.2.
+ * gdm.spec: Bump to 2.17.2.
+
2006-11-20 Henry Zhang <[email protected]>
* patches/gnome-system-tools-06-time.diff
--- a/Solaris/.pkgtoolrc Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/.pkgtoolrc Fri Nov 24 16:56:15 2006 +0000
@@ -1,5 +1,5 @@
# tarballdirs [string]: colon (:) separated list of directories where source tarballs are searched for
-tarballdirs: /sgnome/tarballs/gnome2.14:/sgnome/tarballs/gnome2.15:/sgnome/tarballs/moz-evo:/jds/packages/SOURCES:${MYDIR}/manpages/sun-manpage-tarballs:${tarballdirs}
+tarballdirs: /sgnome/tarballs/gnome2.18:/sgnome/tarballs/gnome2.15:/sgnome/tarballs/gnome2.14:/sgnome/tarballs/moz-evo:/jds/packages/SOURCES:${MYDIR}/manpages/sun-manpage-tarballs:${tarballdirs}
# logdir [string]: the directory for saving log files
# logdir: /tmp
--- a/Solaris/ChangeLog Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/ChangeLog Fri Nov 24 16:56:15 2006 +0000
@@ -1,3 +1,12 @@
+2006-11-24 Damien Carbery <[email protected]>
+
+ * SUNWdbus.spec: Update %files - remove python dir, add
+ %{_localstatedir}/lib/dbus.
+ * SUNWgnome-utils.spec: Update %files (baobab icons) for 2.17.0 tarball.
+ * SUNWgnome-archive-mgr.spec: Update %files for 2.17.2 tarball.
+ * SUNWgnome-games.spec: Remove empty %{_libdir}. Remove glchess and
+ gnome-sudoku games as they were not installed.
+
2006-11-24 Padraig O'Briain <[email protected]>
* manages/Makefile: Change all references to sman to man.
@@ -9,6 +18,11 @@
* manpages/sman5: Rename to manpages/man5
Fix for bug 6497033.
+2006-11-23 Damien Carbery <[email protected]>
+
+ * .pkgtoolrc: Add gnome2.18 dir to tarballdirs list.
+ * Solaris.inc: Bump SUNW_ProdVers and default_pkg_version to 2.17.1.
+
2006-11-22 Laszlo Peter <[email protected]>
* SUNWTiff.spec: add patches for 6451119, see ../ChangeLog.
@@ -17,6 +31,13 @@
* SUNWopensp.spec: add --datadir=%{_datadir}, part of 6443777
+2006-11-22 Damien Carbery <[email protected]>
+
+ * SUNWgnome-games.spec: 2.17.1 changes - remove gataxx references; add
+ glchess, gnome-sudoku and ggz games.
+ * SUNWgnome-system-monitor.spec: 2.17 update: Add SUNWgnome-libs/-devel
+ dependency and add pixmaps to %files.
+
2006-11-21 Damien Carbery <[email protected]>
* SUNWgnome-panel.spec: Remove man3 dir from -devel package. Fixes
--- a/Solaris/SUNWdbus.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/SUNWdbus.spec Fri Nov 24 16:56:15 2006 +0000
@@ -147,13 +147,14 @@
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
-%attr (-, root, bin) %{_libdir}/python*
%files root
%defattr (-, root, bin)
%dir %attr (0755, root, sys) %dir %{_sysconfdir}
%config %{_sysconfdir}/dbus-1
%dir %attr (0755, root, sys) %{_localstatedir}
+%dir %attr (0755, root, other) %{_localstatedir}/lib
+%attr (0755, root, root) %{_localstatedir}/lib/dbus
%dir %attr (0755, root, sys) %{_localstatedir}/run
%attr (0755, root, root) %{_localstatedir}/run/dbus
%dir %attr (0755, root, sys) /var/svc
@@ -176,6 +177,8 @@
%changelog
+* Fri Nov 24 2006 - [email protected]
+- Update %files - remove python dir, add %{_localstatedir}/lib/dbus.
* Mon Sep 18 2006 - [email protected]
- revert to normal optimisation flags, the build problems were caused by
ld(1) bug 6467925
--- a/Solaris/SUNWgnome-archive-mgr.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/SUNWgnome-archive-mgr.spec Fri Nov 24 16:56:15 2006 +0000
@@ -136,6 +136,7 @@
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/file-roller
%{_libdir}/nautilus
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
@@ -166,6 +167,8 @@
%{_sysconfdir}/gconf/schemas/file-roller.schemas
%changelog
+* Fri Nov 24 2006 - [email protected]
+- Update %files for 2.17.2 tarball.
* Fri Sep 01 2006 - [email protected]
- New Manpage tarball
* Mon Aug 21 2006 - [email protected]
--- a/Solaris/SUNWgnome-games.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/SUNWgnome-games.spec Fri Nov 24 16:56:15 2006 +0000
@@ -58,9 +58,9 @@
%build
export PKG_CONFIG_PATH=%{_pkg_config_path}
-export CFLAGS="%optflags -I%{_includedir}"
+export CFLAGS="%optflags -I%{_includedir} -I/usr/sfw/include"
export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%_ldflags -lX11 -L/usr/sfw/lib -lexpat"
%gnome_games.build -d %name-%version
@@ -71,6 +71,9 @@
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/lib/games
rmdir $RPM_BUILD_ROOT%{_localstatedir}/lib
rmdir $RPM_BUILD_ROOT%{_localstatedir}
+# Remove these empty dirs.
+rmdir $RPM_BUILD_ROOT%{_includedir}
+rmdir $RPM_BUILD_ROOT%{_libdir}
%if %build_l10n
%else
@@ -125,8 +128,7 @@
echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
- echo 'schemas="$SDIR/gataxx.schemas';
- echo ' $SDIR/glines.schemas';
+ echo 'schemas="$SDIR/glines.schemas';
echo ' $SDIR/gnect.schemas';
echo ' $SDIR/gnibbles.schemas';
echo ' $SDIR/gnobots2.schemas';
@@ -149,11 +151,11 @@
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
%{_datadir}/gnect
+%{_datadir}/ggz
%{_datadir}/gnibbles
%{_datadir}/gnobots2
%dir %attr (0755, root, other) %{_datadir}/gnome
%{_datadir}/gnome/help/*/C
-%{_datadir}/gnome-games/ataxx
%{_datadir}/gnome-games/mahjongg
%{_datadir}/gnome-games/same-gnome
%{_datadir}/omf/*/*-C.omf
@@ -177,7 +179,6 @@
%defattr (-, root, sys)
%attr(0755, root, sys) %dir %{_sysconfdir}
%{_sysconfdir}/sound/events/*
-%{_sysconfdir}/gconf/schemas/gataxx.schemas
%{_sysconfdir}/gconf/schemas/glines.schemas
%{_sysconfdir}/gconf/schemas/gnect.schemas
%{_sysconfdir}/gconf/schemas/gnibbles.schemas
@@ -193,6 +194,12 @@
%changelog
+* Fri Nov 24 2006 - [email protected]
+- Remove empty %{_libdir}. Remove glchess and gnome-sudoku games as they were
+ not installed.
+* Wed Nov 22 2006 - [email protected]
+- 2.17.1 changes - remove gataxx references; add glchess, gnome-sudoku and ggz
+ games.
* Thu Nov 09 2006 - [email protected]
- Add BuildRequires SUNWgnome-vfs-devel as gnome-libs pc file requires
gnome-vfs.
--- a/Solaris/SUNWgnome-system-monitor.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/SUNWgnome-system-monitor.spec Fri Nov 24 16:56:15 2006 +0000
@@ -24,10 +24,12 @@
Requires: SUNWgnome-doc-utils
Requires: SUNWgnome-config
Requires: SUNWgnome-base-libs
+Requires: SUNWgnome-libs
Requires: SUNWlibgtop
Requires: SUNWgnome-panel
Requires: SUNWperl-xml-parser
BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWgnome-doc-utils-devel
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWlibgtop-devel
@@ -147,6 +149,8 @@
%{_datadir}/gnome/help/*/C
%dir %attr(0755, root, bin) %{_datadir}/omf
%{_datadir}/omf/*/*-C.omf
+%dir %attr (0755, root, other) %{_datadir}/pixmaps
+%{_datadir}/pixmaps/gnome-system-monitor/side.png
%dir %attr(0755, root, bin) %{_mandir}
%{_mandir}/*/*
@@ -170,6 +174,8 @@
%endif
%changelog
+* Wed Nov 22 2006 - [email protected]
+- 2.17 update: Add SUNWgnome-libs/-devel dependency and add pixmaps to %files.
* Mon Sep 04 2006 - [email protected]
- New Manpage tarball
* Fri Aug 25 2006 - [email protected]
--- a/Solaris/SUNWgnome-utils.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/SUNWgnome-utils.spec Fri Nov 24 16:56:15 2006 +0000
@@ -529,9 +529,12 @@
%{_datadir}/omf/baobab/baobab-C.omf
%dir %attr (-, root, other) %{_datadir}/icons
%dir %attr (-, root, other) %{_datadir}/icons/hicolor
-%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
-%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps
-%{_datadir}/icons/hicolor/48x48/apps/baobab.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24/apps
+%{_datadir}/icons/hicolor/24x24/apps/baobab.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable/apps
+%{_datadir}/icons/hicolor/scalable/apps/baobab.svg
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
%{_mandir}/*/*baobab*
@@ -552,6 +555,8 @@
%endif
%changelog
+* Fri Nov 24 2006 - [email protected]
+- Update %files (baobab icons) for 2.17.0 tarball.
* Wed Nov 15 2006 - [email protected]
- Remove unneeded chmod call. It changed help xml files to 0755 for no obvious
reason.
--- a/Solaris/Solaris.inc Fri Nov 24 15:00:22 2006 +0000
+++ b/Solaris/Solaris.inc Fri Nov 24 16:56:15 2006 +0000
@@ -4,14 +4,14 @@
# Copyright (c) 2003 Sun Microsystems, Inc.
#
SUNW_ProdName: GNOME
-SUNW_ProdVers: 2.16.1
+SUNW_ProdVers: 2.17.1
# Note: you need JDS CBE 1.4.1 or later for these 3:
%{?!jds_version:#}SUNW_Pkg_AllZones: false
%{?!jds_version:#}SUNW_Pkg_Hollow: false
%{?!jds_version:#}SUNW_Pkg_ThisZone: false
-%define default_pkg_version 2.16.1
+%define default_pkg_version 2.17.1
%{?jds_version:#}%define jds_version JDSosol
%define default_category GNOME2,application,%{jds_version}
%{?support_level:#}%define support_level unsupported
@@ -132,6 +132,8 @@
%define _pkg_config_path64 %{_libdir}/%{_arch64}/pkgconfig
# ChangeLog:
+# 2006-11-23 Damien Carbery <[email protected]>
+# - Bump SUNW_ProdVers and default_pkg_version to 2.17.1.
# 2006-11-03 Laszlo Peter <[email protected]>
# - define %gtk_doc_option, lets the user disable building gtk-docs
# using --without-gtk-doc; also added comments about usage
--- a/cairo.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/cairo.spec Fri Nov 24 16:56:15 2006 +0000
@@ -4,11 +4,12 @@
# package are under the same license as the package itself.
#
# Owner: erwannc
+# bugdb: bugzilla.freedesktop.org
#
Name: cairo
License: LGPL
Group: System/Libraries
-Version: 1.2.4
+Version: 1.3.2
Release: 5
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -18,6 +19,8 @@
Patch2: cairo-02-8bit-fix.diff
#owner:erwannc date:2006-11-02 type:feature
Patch3: cairo-03-full-hinting.diff
+# owner:dcarbery date:2006-11-24 type:bug bugzilla:9124
+Patch4: cairo-04-float-word.diff
URL: http://www.cairographics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -64,8 +67,9 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
+##%patch2 -p1
%patch3 -p1
+%patch4 -p1
%ifos solaris
%ifarch amd64 sparcv9
@@ -174,6 +178,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Fri Nov 24 2006 - [email protected]
+- Bump to 1.3.2. Add patch 04-float-word to fix configure issue. Fixes #9124.
* Fri Nov 3 2006 - [email protected]
- use %gtk_doc_option in configure so that it can be disabled using
--without-gtk-doc
--- a/control-center.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/control-center.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: control-center
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.17.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: The GNOME control center for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/control-center/2.16/control-center-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/control-center/2.17/control-center-%{version}.tar.bz2
Source1: gnome-font-viewer.1.gz
Source2: gnome-accessibility-keyboard-properties.1.gz
Source3: gnome-background-properties.1.gz
@@ -254,6 +254,9 @@
%{_libdir}/*.so
%changelog
+* Mon Nov 20 2006 - [email protected]
+- Bump to 2.17.1.
+
* Tue Nov 14 2006 - [email protected]
- Remove patch -keybinding-fix-edit as changes are now made in
-custom-keybinding patch.
--- a/dbus.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/dbus.spec Fri Nov 24 16:56:15 2006 +0000
@@ -11,20 +11,14 @@
Name: dbus
License: Other
Group: System/Libraries
-Version: 0.62
+Version: 1.0.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Simple IPC library based on messages
Source: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
URL: http://www.freedesktop.org/wiki/Software_2fdbus
-Patch1: dbus-01-glib_cflags.diff
-Patch2: dbus-02-python.diff
-Patch3: dbus-03-dbus-launch.diff
-Patch4: dbus-04-libexec.diff
-Patch5: dbus-05-priv.diff
-#owner:gheet bugster:6488534 bugzilla:5899 type:bug
-Patch6: dbus-06-proxy-change-owner-crash.diff
+Patch1: dbus-01-dbus-launch.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
Autoreqprov: on
@@ -69,11 +63,6 @@
%setup -q
%ifos solaris
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%endif
%build
@@ -137,6 +126,10 @@
%{_libdir}/python?.?/vendor-packages/*
%changelog
+* Thu Nov 23 2006 - [email protected]
+- Removed upstream patches, 01, 02, 04, 05 and 06. Renumber remainder.
+* Wed Nov 22 2006 - [email protected]
+- Bump to 1.0.1.
* Fri Nov 17 2006 - [email protected]
- Added patch dbus-06-proxy-change-owner-crash.diff. This patch is only
for 0.6x release of dbus, when dbus 1.0 is incorporated, this patch
--- a/deskbar-applet.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/deskbar-applet.spec Fri Nov 24 16:56:15 2006 +0000
@@ -9,12 +9,12 @@
Name: deskbar-applet
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.17.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Deskbar Applet
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Patch1: deskbar-applet-01-browser-locations.diff
Patch2: deskbar-applet-02-webeyes-compatibility.diff
URL: http://www.gnome.org
@@ -112,6 +112,9 @@
%{_libdir}/python2.4/
%changelog
+* Mon Nov 20 2006 - [email protected]
+- Bump to 2.17.2.
+
* Tue Oct 24 2006 - [email protected]
- Bump to 2.16.1.
--- a/eog.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/eog.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: eog
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1.1
+Version: 2.17.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Eye Of GNOME Image Viewer
-Source: http://ftp.gnome.org/pub/GNOME/sources/eog/2.16/eog-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/eog/2.17/eog-%{version}.tar.bz2
Source1: eog.1.gz
Patch1: eog-01-full-screen-show.diff
Patch2: eog-02-jpeg.diff
@@ -123,6 +123,8 @@
%{_prefix}/var/scrollkeeper
%changelog
+* Mon Nov 20 2006 - [email protected]
+- Bump to 2.17.1.
* Fri Oct 20 2006 - [email protected]
- Bump to 2.16.1.1.
* Mon Oct 02 2006 - [email protected]
--- a/file-roller.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/file-roller.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,16 +10,14 @@
Name: file-roller
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.17.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: An archive manager for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.17/%{name}-%{version}.tar.bz2
Source1: file-roller.1.gz
Patch1: file-roller-01-menu-entry.diff
-# owner:mattman type:bug date:2006-10-04 bugster:6478062 bugzilla:359629
-Patch2: file-roller-02-rpm-cpio.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -55,7 +53,6 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
for po in po/*.po; do
dos2unix -ascii $po $po
done
@@ -82,6 +79,7 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure \
--prefix=%{_prefix} \
+ --libexecdir=%{_libexecdir} \
--sysconfdir=%{_sysconfdir} \
--disable-scrollkeeper
make -j $CPUS
@@ -126,6 +124,12 @@
%{_mandir}/man1/file-roller.1.gz
%changelog
+* Fri Nov 24 2006 - [email protected]
+- Add --libexecdir to configure call.
+* Thu Nov 23 2006 - [email protected]
+- Remove upstream patch, 02-rpm-cpio.
+* Mon Nov 20 2006 - [email protected]
+- Bump to 2.17.2.
* Wed Oct 04 2006 - [email protected]
- Add patch 02-rpm-cpio.diff : bugster : 6478062, bugzilla : 359629
* Tue Oct 03 2006 - [email protected]
--- a/gdm.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gdm.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: gdm
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.2
+Version: 2.17.2
Release: 7
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: The GNOME 2.x Display Manager
-Source: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.16/gdm-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.17/gdm-%{version}.tar.bz2
Source1: gdm-stop.1m.gz
Source2: gdmconfig.1m.gz
Source3: gdm-binary.1.gz
@@ -43,10 +43,8 @@
Patch6: gdm-06-system-locale.diff
Patch7: gdm-07-linguas.diff
Patch8: gdm-08-login-photo-menu.diff
-Patch9: gdm-09-sun-branding-patch.diff
-Patch10: gdm-10-fixfocus.diff
#date:2006-11-15 owner:calumb bugster:6489289 bugzilla:375634 type:bug
-Patch11: gdm-11-gdmsetup-launch-menu-tooltip.diff
+Patch9: gdm-09-gdmsetup-launch-menu-tooltip.diff
URL: www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -118,8 +116,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
-%patch11 -p1
%build
%ifos linux
@@ -251,6 +247,13 @@
%config /etc/security/*
%changelog
+* Thu Nov 23 2006 - [email protected]
+- Remove upstream patchs, 09-sun-branding-patch and 10-fixfocus. Renumber
+ remainder.
+
+* Mon Nov 20 2006 - [email protected]
+- Bump to 2.17.2.
+
* Wed Nov 15 2006 - [email protected]
- Modify tooltip to match latest UI spec.
--- a/gnome-desktop.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-desktop.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: gnome-desktop
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.16.1
+Version: 2.17.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Desktop Library
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Source1: blueprint-extra-icons.tar.bz2
Source2: gnome-feedback.xml
Source3: sun-gnome-version.xml
@@ -163,6 +163,8 @@
%{_libdir}/libgnome-desktop-2.so
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.2.
* Tue Oct 03 2006 - [email protected]
- Bump to 2.16.1.
* Mon Sep 04 2006 - [email protected]
--- a/gnome-games.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-games.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,18 @@
Name: gnome-games
License: GPL
Group: Amusements/Games
-Version: 2.16.1.1
+Version: 2.17.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME games
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
+# date:2006-11-23 owner:dcarbery type:bug bugzilla:363438
+# patch sent upstream
+Patch1: gnome-games-01-array-init.diff
+# date:2006-11-23 owner:dcarbery type:bug bugzilla:362444
+# patch sent upstream
+Patch2: gnome-games-02-ggz-function.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -37,6 +43,8 @@
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
%build
%ifos linux
@@ -137,6 +145,10 @@
%config %{_sysconfdir}/sound/events/*
%changelog
+* Fri Nov 24 2006 - [email protected]
+- Add patches 01-array-init to fix 363438 and 02-ggz-function to fix 362444.
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.1.
* Thu Nov 09 2006 - [email protected]
- Bump to 2.16.1.1.
* Tue Oct 03 2006 - [email protected]
--- a/gnome-icon-theme.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-icon-theme.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
License: GPL
Group: System/GUI/GNOME
BuildArchitectures: noarch
-Version: 2.16.0.1
+Version: 2.17.2.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Icon Themes
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Source3: branded-throbber.tar.gz
Source4: sun_java.png
Patch1: gnome-icon-theme-01-sun-java-icon.diff
@@ -84,6 +84,8 @@
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.2.1.
* Tue Sep 05 2006 - [email protected]
- Bump to 2.16.0.1.
* Mon Sep 04 2006 - [email protected]
--- a/gnome-menus.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-menus.spec Fri Nov 24 16:56:15 2006 +0000
@@ -8,12 +8,12 @@
Name: gnome-menus
License: LGPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.17.2
Release: 3
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Implementation of Desktop Menu Specification for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Patch1: gnome-menus-01-quickstart.diff
Patch2: gnome-menus-02-application-submenu-rename.diff
Patch3: gnome-menus-03-preferences.diff
@@ -129,6 +129,9 @@
%{_includedir}/gnome-menus/*
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.2.
+
* Tue Oct 03 2006 - [email protected]
- Bump to 2.16.1.
--- a/gnome-python-desktop.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-python-desktop.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,14 @@
Name: gnome-python-desktop
License: GPL
Group: System/Library
-Version: 2.16.0
+Version: 2.17.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Python bindings for various GNOME desktop libraries
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+#owner:dcarbery date:2006-11-22 type:bug bugzilla:368364
+Patch1: gnome-python-desktop-01-no_inline.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -72,6 +74,7 @@
%prep
%setup -q -n gnome-python-desktop-%{version}
+%patch1 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" \
@@ -110,6 +113,8 @@
%{_datadir}/gtk-doc
%changelog -n gnome-python-desktop
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.1. Add patch, 01-no_inline, to fix #368364.
* Fri Nov 3 2006 - [email protected]
- use %gtk_doc_option in configure so that it can be disabled using
--without-gtk-doc
--- a/gnome-screensaver.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-screensaver.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: gnome-screensaver
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.17.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: The GNOME screen saver
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
URL: www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -99,6 +99,9 @@
%{_libdir}/*
%changelog
+* Mon Nov 20 2006 - [email protected]
+- Bump to 2.17.2.
+
* Mon Oct 23 2006 - [email protected]
- Remove src-libs patch since it's now upstream.
--- a/gnome-session.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-session.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: gnome-session
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.17.2
Release: 6
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Session Manager for the GNOME Desktop
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Source1: gnome-splash.png
Source2: gnome-session-remove.1.gz
Source3: gnome-session.1.gz
@@ -144,6 +144,9 @@
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.2.
+
* Fri Nov 03 2006 - [email protected]
- Fixed up gnome-session-09-trusted-extensions.diff for 2.16
--- a/gnome-system-monitor.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-system-monitor.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: gnome-system-monitor
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.17.2.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Simple process monitor
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Source1: gnome-system-monitor.1.gz
#owner:henryz date:2006-11-15 type:feature
#This patch make libgtop run at Solaris
@@ -70,6 +70,8 @@
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir}
+# Create a missing file. Fixed in cvs.
+touch pixmaps/side.png
make -j $CPUS
%install
@@ -110,7 +112,9 @@
%{_mandir}/man1/*
%changelog
-* Thur. Nov. 16 2006 - [email protected]
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.2.1.
+* Thu Nov 16 2006 - [email protected]
- add patch comments.
* Wed Nov 15 2006 - [email protected]
- Modify launch menu entry to match latest UI spec.
--- a/gnome-themes.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-themes.spec Fri Nov 24 16:56:15 2006 +0000
@@ -11,21 +11,16 @@
License: GPL
Group: System/GUI/GNOME
# icon-naming-utils should be bumped at the same time - it's a dependency.
-Version: 2.16.1.1
+Version: 2.17.2
Release: 3
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME themes
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Source1: accessibility-icons.tar.gz
Source2: staroffice8-accessibility-icons.tar.gz
-#owner:calumb date:2006-11-14
-#bugster:5072859,6255199,6484251 bugzilla:357931 type:bug
-Patch1: gnome-themes-01-accessibility-icons.diff
#owner:calumb date:2005-05-27 bugster:6298139 type:bug
-Patch2: gnome-themes-02-add-so8-a11y-icons.diff
-#owner:damienc date:2006-07-21 bugzilla:364697 type:bug
-Patch3: gnome-themes-03-icon-name-mapping.diff
+Patch1: gnome-themes-01-add-so8-a11y-icons.diff
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArchitectures: noarch
@@ -45,8 +40,6 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
gzip -dc %SOURCE1 | tar xvf -
gzip -dc %SOURCE2 | tar xvf -
@@ -98,6 +91,10 @@
%{_datadir}/locale/*/LC_MESSAGES/*.mo
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.2. Remove upstream patches, 01-accessibility-icons and
+ 03-icon-name-mapping. Rename remainder.
+
* Wed Nov 15 2006 - [email protected]
- Add --enable-all-themes flag, as per UI spec.
--- a/gnome-utils.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-utils.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: gnome-utils
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.2
+Version: 2.17.0
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Basic Utilities for the GNOME 2.0 Desktop
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Source1: gnome-search-tool.1.gz
Source2: gfloppy.1.gz
Source3: gnome-dictionary.1.gz
@@ -155,6 +155,9 @@
%{_libdir}/pkgconfig
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.0.
+
* Wed Nov 15 2006 - [email protected]
- Tweak menu item name to match latest UI spec.
--- a/gnome-volume-manager.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/gnome-volume-manager.spec Fri Nov 24 16:56:15 2006 +0000
@@ -9,12 +9,12 @@
Name: gnome-volume-manager
License: GPL
Group: System/GUI/GNOME
-Version: 2.15.0
+Version: 2.17.0
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: A Volume Manager for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-volume-manager/2.15/gnome-volume-manager-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-volume-manager/2.17/gnome-volume-manager-%{version}.tar.bz2
#owner:yippi date:2006-05-01 type:bug
Patch1: gnome-volume-manager-01-fixcompile.diff
#owner:Irene date:2006-07-04 type:feature bugster:6849183,6849189,6483288
@@ -124,6 +124,8 @@
%config /etc/security/*
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.0.
* Wed Nov 01 2006 - [email protected]
- merge 02-autoplay.diff and 06-autoplay.diff to
02-autoplay.diff, move 07-no-linux-msg.diff to
--- a/libgnome.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/libgnome.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: libgnome
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.16.0
+Version: 2.17.0
Release: 5
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Base Library
-Source: http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.16/libgnome-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.17/libgnome-%{version}.tar.bz2
Source1: gnome-open.1.gz
Source2: libgnome-2.3.gz
Patch1: libgnome-01-default-background.diff
@@ -173,6 +173,8 @@
%{_mandir}/man7/*
%changelog
+* Wed Nov 22 2006 - [email protected]
+- Bump to 2.17.0.
* Fri Nov 3 2006 - [email protected]
- use %gtk_doc_option in configure so that it can be disabled using
--without-gtk-doc
--- a/libgnomeprint.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/libgnomeprint.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,18 +10,15 @@
Name: libgnomeprint
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.12.1
+Version: 2.17.0
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Print Library for the GNOME Desktop
-Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.12/libgnomeprint-%{version}.tar.bz2
-Patch1: libgnomeprint-01-Wall.diff
-Patch2: libgnomeprint-02-papi-print-dialog.diff
-Patch3: libgnomeprint-03-evince-crash.diff
+Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.17/libgnomeprint-%{version}.tar.bz2
+Patch1: libgnomeprint-01-papi-print-dialog.diff
+Patch2: libgnomeprint-02-evince-crash.diff
# owner:fujiwara data:2006-11-16 type:l10n
-# bugster:6452832,6245399 bugzilla:361876,324150
-Patch4: libgnomeprint-04-g11n-filename.diff
Source1: libgnomeprint-2.2.3.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -71,8 +68,6 @@
%setup -q
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%ifos linux
@@ -140,6 +135,10 @@
%{_mandir}/man3/*
%changelog
+* Thu Nov 23 2005 - [email protected]
+- Remove upstream patch, 03-g11n-filename.
+* Wed Nov 22 2005 - [email protected]
+- Bump to 2.17.0. Remove upstream patch, 01-Wall. Renumber remainder.
* Thu Nov 16 2006 - [email protected]
- Add libgnomeprint-04-g11n-filename.diff. fixes 6452832 and 6245399
* Fri Nov 3 2006 - [email protected]
--- a/libgnomeprintui.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/libgnomeprintui.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: libgnomeprintui
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.12.1
+Version: 2.17.0
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Print User Interface Library for the GNOME Desktop
-Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.12/libgnomeprintui-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.17/libgnomeprintui-%{version}.tar.bz2
Source1: libgnomeprintui-2.2.3.gz
Patch1: libgnomeprintui-01-papi-print-dialog.diff
URL: http://www.gnome.org
@@ -122,6 +122,8 @@
%{_mandir}/man3/*
%changelog
+* Thu Nov 23 2005 - [email protected]
+- Bump to 2.17.0.
* Fri Nov 3 2006 - [email protected]
- use %gtk_doc_option in configure so that it can be disabled using
--without-gtk-doc
--- a/metacity.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/metacity.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: metacity
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.3
+Version: 2.17.2
Release: 4
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Window Manager
-Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.16/metacity-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.17/metacity-%{version}.tar.bz2
Source1: metacity-window-demo.1.gz
Source2: metacity.1.gz
Source3: metacity-theme-viewer.1.gz
@@ -28,12 +28,12 @@
Patch6: metacity-06-logout-shortcut.diff
Patch7: metacity-07-window-title.diff
Patch8: metacity-08-pretty-function.diff
+## patch9 needs rework for 2.17.2.
Patch9: metacity-09-branding-hack.diff
#owner:erwannc date:2006-11-02 type:feature bugster:6393724
Patch10: metacity-10-trusted-extensions.diff
Patch11: metacity-11-empty-struct.diff
Patch12: metacity-12-composite.diff
-Patch13: metacity-13-terminal-strict-focus.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -65,11 +65,11 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
+# patch9 needs rework for 2.17.2.
+#%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p1
%build
%ifos linux
@@ -146,6 +146,10 @@
%{_mandir}/man1/*
%changelog
+* Thu Nov 23 2006 - [email protected]
+- Bump to 2.17.2. Remove upstream patch, 13-terminal-strict-focus. Comment out
+ patch 9 as it needs rework.
+
* Sat 28 Oct 2006 - [email protected]
- Commit patch to preserve strict focus mode with terminals
and keep a few kernel hackers on our side. Bugzilla #361054.
--- a/nautilus-cd-burner.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/nautilus-cd-burner.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: nautilus-cd-burner
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.16.1
+Version: 2.17.2
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: nautilus-cd-burner is an extension to Nautilus that makes it easy to write files to a CD burner.
-Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.16/nautilus-cd-burner-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.17/nautilus-cd-burner-%{version}.tar.bz2
Source1: nautilus-cd-burner.1.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -117,6 +117,8 @@
%{_libdir}/pkgconfig/libnautilus-burn.pc
%changelog
+* Thu Nov 23 2006 - [email protected]
+- Bump to 2.17.2.
* Tue Oct 03 2006 - [email protected]
- Bump to 2.16.1. Remove all patches as they are upstream.
* Mon Sep 18 2006 - [email protected]
--- a/orca.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/orca.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: orca
License: LGPL
Group: System/Library
-Version: 1.0.0
+Version: 2.17.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Orca Screen Reader/Magnifier
-Source: http://ftp.gnome.org/pub/GNOME/sources/orca/1.0/orca-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/orca/2.17/orca-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -91,6 +91,8 @@
%doc AUTHORS NEWS README ChangeLog
%changelog
+* Thu Nov 23 2006 - [email protected]
+- Bump to 2.17.2.
* Mon Sep 04 2006 - [email protected]
- Bump to 1.0.0.
* Tue Aug 21 2006 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cairo-04-float-word.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,15 @@
+--- cairo-1.3.2/acinclude.m4.orig 2006-11-24 15:52:17.786544300 +0000
++++ cairo-1.3.2/acinclude.m4 2006-11-24 15:53:46.272494900 +0000
+@@ -84,10 +84,10 @@
+
+ ]])], [
+
+-if grep noonsees conftest.$ac_objext >/dev/null ; then
++if strings -a conftest.$ac_objext | grep noonsees >/dev/null ; then
+ ax_cv_c_float_words_bigendian=yes
+ fi
+-if grep seesnoon conftest.$ac_objext >/dev/null ; then
++if strings -a conftest.$ac_objext | grep seesnoon >/dev/null ; then
+ if test "$ax_cv_c_float_words_bigendian" = unknown; then
+ ax_cv_c_float_words_bigendian=no
+ else
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dbus-01-dbus-launch.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,41 @@
+--- dbus-1.0.1/tools/dbus-launch.c-orig 2006-08-02 10:56:51.441963000 +0100
++++ dbus-1.0.1/tools/dbus-launch.c 2006-08-02 10:54:59.320618000 +0100
+@@ -392,6 +392,9 @@
+ x_fd = -1;
+ #endif
+
++#ifdef __sun
++ tty_fd = -1;
++#else
+ if (isatty (0))
+ tty_fd = 0;
+ else
+@@ -401,6 +404,7 @@
+ verbose ("stdin isatty(), monitoring it\n");
+ else
+ verbose ("stdin was not a TTY, not monitoring it\n");
++#endif
+
+ if (tty_fd < 0 && x_fd < 0)
+ {
+@@ -412,7 +416,11 @@
+ {
+ FD_ZERO (&read_set);
+ FD_ZERO (&err_set);
+-
++#ifndef __sun
++/*
++ * read() sometimes returns 0 on Solaris in valid conditions, so this
++ * test causes dbus-launch to fail to start gnome-session
++ */
+ if (tty_fd >= 0)
+ {
+ FD_SET (tty_fd, &read_set);
+@@ -433,6 +441,7 @@
+ verbose ("Got SIGHUP, exiting\n");
+ kill_bus_and_exit (0);
+ }
++#endif
+
+ #ifdef DBUS_BUILD_X11
+ /* Dump events on the floor, and let
--- a/patches/dbus-01-glib_cflags.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
---- dbus-0.35.2/glib/Makefile.am.orig Fri Oct 21 15:30:12 2005
-+++ dbus-0.35.2/glib/Makefile.am Fri Oct 21 15:31:15 2005
-@@ -1,6 +1,6 @@
- SUBDIRS = . examples
-
--INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" $(CFLAGS)
-
- lib_LTLIBRARIES=libdbus-glib-1.la
-
---- dbus-0.35.2/glib/Makefile.in.orig Fri Oct 21 15:30:19 2005
-+++ dbus-0.35.2/glib/Makefile.in Fri Oct 21 15:31:57 2005
-@@ -361,7 +361,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- SUBDIRS = . examples
--INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" $(CFLAGS)
- lib_LTLIBRARIES = libdbus-glib-1.la
- BUILT_SOURCES = dbus-glib-error-switch.h
- CLEANFILES = $(BUILT_SOURCES)
--- a/patches/dbus-02-python.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- dbus-0.61/python/dbus_bindings.pxd.in.orig 2006-02-27 13:13:26.286935000 -0500
-+++ dbus-0.61/python/dbus_bindings.pxd.in 2006-02-27 12:10:15.013328000 -0500
-@@ -1,3 +1,8 @@
-+cdef extern from "sys/types.h":
-+ ctypedef size_t
-+ ctypedef __int64_t
-+ ctypedef __uint64_t
-+
- #include "dbus_h_wrapper.h"
-
- cdef class Connection:
--- a/patches/dbus-03-dbus-launch.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
---- dbus-0.62/tools/dbus-launch.c-orig 2006-08-02 10:56:51.441963000 +0100
-+++ dbus-0.62/tools/dbus-launch.c 2006-08-02 10:54:59.320618000 +0100
-@@ -352,6 +352,9 @@
- x_fd = -1;
- #endif
-
-+#ifdef __sun
-+ tty_fd = -1;
-+#else
- if (isatty (0))
- tty_fd = 0;
- else
-@@ -361,6 +364,7 @@
- verbose ("stdin isatty(), monitoring it\n");
- else
- verbose ("stdin was not a TTY, not monitoring it\n");
-+#endif
-
- if (tty_fd < 0 && x_fd < 0)
- {
-@@ -414,6 +418,11 @@
- }
- #endif
-
-+#ifndef __sun
-+/*
-+ * read() sometimes returns 0 on Solaris in valid conditions, so this
-+ * test causes dbus-launch to fail to start gnome-session
-+ */
- if (tty_fd >= 0)
- {
- if (FD_ISSET (tty_fd, &read_set))
-@@ -447,6 +456,7 @@
- kill_bus_and_exit ();
- }
- }
-+#endif
- }
- }
-
--- a/patches/dbus-04-libexec.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
---- dbus-0.62/configure.in-orig 2006-08-02 16:00:58.979121000 -0500
-+++ dbus-0.62/configure.in 2006-08-02 16:06:31.588274000 -0500
-@@ -79,6 +79,7 @@ AC_ARG_WITH(system-socket, AS_HELP_STRIN
- AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]],[directory to check for console ownerhip]))
- AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner]))
- AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
-+AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon]))
-
-
- dnl DBUS_BUILD_TESTS controls unit tests built in to .c files
-@@ -1330,6 +1331,15 @@ fi
- AC_SUBST(DBUS_USER)
- AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon])
-
-+#### Directory to install dbus-daemon
-+if test -z "$with_dbus_daemondir" ; then
-+ DBUS_DAEMONDIR="${bindir}"
-+else
-+ DBUS_DAEMONDIR=$with_dbus_daemondir
-+fi
-+AC_SUBST(DBUS_DAEMONDIR)
-+AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon])
-+
- #### Tell tests where to find certain stuff in builddir
- ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`
-
---- dbus-0.62/tools/Makefile.am-orig 2006-07-20 16:22:03.668619000 -0500
-+++ dbus-0.62/tools/Makefile.am 2006-07-20 16:28:54.688750000 -0500
-@@ -1,4 +1,4 @@
--INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION
-+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
-
- if HAVE_GLIB
- GLIB_TOOLS=dbus-monitor
---- /tmp/dbus-launch.c 2006-07-20 16:55:40.804739310 -0500
-+++ dbus-0.62/tools/dbus-launch.c 2006-07-20 16:53:48.243775000 -0500
-@@ -777,6 +777,25 @@ main (int argc, char **argv)
-
- verbose ("Calling exec()\n");
-
-+ execl (DBUS_DAEMONDIR"/dbus-daemon",
-+ DBUS_DAEMONDIR"/dbus-daemon",
-+ "--fork",
-+ "--print-pid", write_pid_fd_as_string,
-+ "--print-address", write_address_fd_as_string,
-+ config_file ? "--config-file" : "--session",
-+ config_file, /* has to be last in this varargs list */
-+ NULL);
-+
-+ fprintf (stderr,
-+ "Failed to execute message bus daemon %s: %s. Will try again without full path.\n",
-+ DBUS_DAEMONDIR"/dbus-daemon", strerror (errno));
-+
-+ /*
-+ * If it failed, try running without full PATH. Note this is needed
-+ * because the build process builds the run-with-tmp-session-bus.conf
-+ * file and the dbus-daemon will not be in the install location during
-+ * build time.
-+ */
- execlp ("dbus-daemon",
- "dbus-daemon",
- "--fork",
---- dbus-0.62/bus/Makefile.am-orig 2006-08-02 17:21:59.721315000 -0500
-+++ dbus-0.62/bus/Makefile.am 2006-08-02 18:03:48.906867000 -0500
-@@ -16,8 +16,6 @@ config_DATA= \
- session.conf \
- system.conf
-
--bin_PROGRAMS=dbus-daemon
--
- if DBUS_USE_LIBXML
- XML_SOURCES=config-loader-libxml.c
- endif
-@@ -79,7 +77,7 @@ endif
-
- ## we use noinst_PROGRAMS not check_PROGRAMS so that we build
- ## even when not doing "make check"
--noinst_PROGRAMS=$(TESTS)
-+noinst_PROGRAMS=$(TESTS) dbus-daemon
-
- bus_test_SOURCES= \
- $(BUS_SOURCES) \
-@@ -91,7 +89,15 @@ bus_test_LDADD=$(top_builddir)/dbus/libd
- clean-local:
- /bin/rm *.bb *.bbg *.da *.gcov || true
-
-+uninstall-hook:
-+ rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
-+
- install-data-hook:
-+ if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
-+ $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
-+ chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
-+ fi
-+ $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
- $(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus
- $(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d
- $(mkinstalldirs) $(DESTDIR)/$(datadir)/dbus-1/services
--- a/patches/dbus-05-priv.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
---- dbus-0.62/dbus/dbus-sysdeps-util-orig.c Fri Jul 28 17:54:16 2006
-+++ dbus-0.62/dbus/dbus-sysdeps-util.c Fri Jul 28 17:54:24 2006
-@@ -43,6 +43,10 @@
- #include <dirent.h>
- #include <sys/un.h>
-
-+#ifdef sun
-+#include <priv.h>
-+#endif
-+
- #ifndef O_BINARY
- #define O_BINARY 0
- #endif
-@@ -242,6 +246,8 @@
- * @param error return location for errors
- * @returns #FALSE on failure
- */
-+#ifndef sun
-+
- dbus_bool_t
- _dbus_change_identity (dbus_uid_t uid,
- dbus_gid_t gid,
-@@ -279,6 +285,59 @@
- return TRUE;
- }
-
-+#else /* sun */
-+
-+dbus_bool_t
-+_dbus_change_identity (dbus_uid_t uid,
-+ dbus_gid_t gid,
-+ DBusError *error)
-+{
-+ priv_set_t *pPrivSet = NULL;
-+ priv_set_t *lPrivSet = NULL;
-+
-+ /* become user daemon */
-+ (void) setgroups(0, NULL);
-+ if (setgid(12) != 0)
-+ return FALSE;
-+ if (setreuid(1, 1) != 0)
-+ return FALSE;
-+
-+ /*
-+ * Start with the 'basic' privilege set and then remove any
-+ * of the 'basic' privileges that will not be needed by this
-+ * process. The 'net_icmpaccess' privilege will be added
-+ * since we know that we will need it for the permitted set.
-+ */
-+ if ((pPrivSet = priv_str_to_set("basic", ",", NULL)) == NULL)
-+ return FALSE;
-+
-+ /*
-+ * Let's clear all of the privileges we know we will not
-+ * need from the 'basic' set.
-+ */
-+ (void) priv_delset(pPrivSet, PRIV_FILE_LINK_ANY);
-+ (void) priv_delset(pPrivSet, PRIV_PROC_INFO);
-+
-+ /* Set the permitted privilege set. */
-+ if (setppriv(PRIV_SET, PRIV_PERMITTED, pPrivSet) != 0)
-+ return FALSE;
-+
-+ /* Clear the limit set. */
-+ if ((lPrivSet = priv_allocset()) == NULL)
-+ return FALSE;
-+
-+ priv_emptyset(lPrivSet);
-+
-+ if (setppriv(PRIV_SET, PRIV_LIMIT, lPrivSet) != 0)
-+ return FALSE;
-+
-+ priv_freeset(lPrivSet);
-+
-+ return TRUE;
-+}
-+
-+#endif /* sun */
-+
- /** Installs a UNIX signal handler
- *
- * @param sig the signal to handle
--- a/patches/dbus-06-proxy-change-owner-crash.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urN dbus-0.62/glib/dbus-gproxy.c ../SUNWdbus-0.62.hacked/dbus-0.62/glib/dbus-gproxy.c
---- dbus-0.62/glib/dbus-gproxy.c 2006-04-30 10:45:41.000000000 +0000
-+++ ../SUNWdbus-0.62.hacked/dbus-0.62/glib/dbus-gproxy.c 2006-11-17 16:03:35.319439000 +0000
-@@ -493,6 +493,8 @@
- const DBusGProxyNameOwnerInfo *info = a;
- const char *name = b;
-
-+ if (info == NULL || info->name == NULL)
-+ return 1;
- return strcmp (info->name, name);
- }
-
--- a/patches/file-roller-02-rpm-cpio.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
---- file-roller-2.16.1.old/src/fr-command-rpm.c 2006-10-04 16:37:10.181585000 +0100
-+++ file-roller-2.16.1/src/fr-command-rpm.c 2006-10-04 16:37:44.987636000 +0100
-@@ -86,6 +86,16 @@
-
- fdata = file_data_new ();
-
-+#ifdef __sun
-+ fields = split_line (line, 9);
-+ fdata->size = g_ascii_strtoull (fields[4], NULL, 10);
-+ fdata->modified = mktime_from_string (fields[5], fields[6], fields[8]);
-+ g_strfreev (fields);
-+
-+ /* Full path */
-+
-+ name_field = get_last_field (line, 10);
-+#else
- fields = split_line (line, 8);
- fdata->size = g_ascii_strtoull (fields[4], NULL, 10);
- fdata->modified = mktime_from_string (fields[5], fields[6], fields[7]);
-@@ -94,6 +104,8 @@
- /* Full path */
-
- name_field = get_last_field (line, 9);
-+#endif /* __sun */
-+
- fields = g_strsplit (name_field, " -> ", 2);
-
- if (fields[1] == NULL) {
-@@ -133,7 +145,7 @@
-
- fr_process_begin_command (comm->process, "rpm2cpio");
- fr_process_add_arg (comm->process, comm->e_filename);
-- fr_process_add_arg (comm->process, "| cpio --list --force-local --verbose");
-+ fr_process_add_arg (comm->process, "| cpio -i -t -v");
- fr_process_end_command (comm->process);
- fr_process_start (comm->process);
- }
-@@ -154,7 +166,7 @@
- if (dest_dir != NULL)
- fr_process_set_working_dir (comm->process, dest_dir);
- fr_process_add_arg (comm->process, comm->e_filename);
-- fr_process_add_arg (comm->process, "| cpio --extract --force-local --unconditional --make-directories");
-+ fr_process_add_arg (comm->process, "| cpio -i -u -d");
- for (scan = file_list; scan; scan = scan->next) {
- char *filename = (char*) scan->data;
- fr_process_add_arg (comm->process, filename);
--- a/patches/gdm-06-system-locale.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gdm-06-system-locale.diff Fri Nov 24 16:56:15 2006 +0000
@@ -22,7 +22,7 @@
sig.sa_flags = SA_RESTART;
--- gdm-2.6.0.3/daemon/slave.c 2005-03-10 16:34:02.000000000 -0800
+++ gdm-2.6.0.3-patch/daemon/slave.c 2005-03-10 16:57:58.936564792 -0800
-@@ -137,6 +137,9 @@
+@@ -156,6 +156,9 @@
/* wait for a GO in the SOP protocol */
extern gboolean gdm_wait_for_go;
@@ -32,15 +32,16 @@
/* Local prototypes */
static gint gdm_slave_xerror_handler (Display *disp, XErrorEvent *evt);
static gint gdm_slave_xioerror_handler (Display *disp);
-@@ -4160,7 +4163,10 @@
- home_dir_ok,
+@@ -4292,7 +4295,11 @@
+ #endif
session,
save_session,
- language,
++
+ ((gdm_system_locale != (char *) NULL) &&
-+ ( (language == NULL) ||
-+ ((language != NULL) && (strcmp (language, "") == 0) )) == TRUE ?
-+ gdm_system_locale : language),
++ ( (language == NULL) ||
++ ((language != NULL) && (strcmp (language, "") == 0))) == TRUE ?
++ gdm_system_locale : language),
gnome_session,
usrcfgok,
savesess,
--- a/patches/gdm-07-linguas.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gdm-07-linguas.diff Fri Nov 24 16:56:15 2006 +0000
@@ -1,299 +1,17 @@
---- gdm-2.16.2/config/locale.alias-orig 2006-01-09 17:49:40.000000000 -0600
-+++ gdm-2.16.2/config/locale.alias 2006-11-07 02:00:26.205764000 -0600
+--- gdm-2.17.2/config/locale.alias-orig 2006-01-09 17:49:40.000000000 -0600
++++ gdm-2.17.2/config/locale.alias 2006-11-07 02:00:26.205764000 -0600
@@ -1,4 +1,4 @@
-# NOTE! This is a broken way to do things. Gdm currently reads languages ONLY
+# NOTE! This is a broken way to do things. GDM currently reads languages ONLY
# from this file. This is Broken(tm). This setup will be replaced in some
# future version to be replaced by some automatic detection of available
# locales. This file is not really a locale.alias file and the first word
-@@ -14,23 +14,26 @@
- #
- # - George
-
--Afrikaans af_ZA.UTF-8,af_ZA
--Albanian sq_AL.UTF-8,sq_AL
-+C(POSIX) C,POSIX
-+Afrikaans af_ZA.UTF-8,af_ZA
-+Albanian sq_AL.UTF-8,sq_AL
- Amharic am_ET.UTF-8,am_ET
- Arabic(Egypt) ar_EG.UTF-8,ar_EG
- Arabic(Lebanon) ar_LB.UTF-8,ar_LB
-+Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA
- Armenian hy_AM.UTF-8,hy_AM
- Azerbaijani az_AZ.UTF-8,az_AZ
- Azerbaijani(Iran) az_IR.UTF-8,az_IR
- Basque eu_ES.UTF-8,eu_ES
--Belarusian be_BY.UTF-8,be_BY
-+Belarusian be_BY.UTF-8,be_BY
- Bengali bn_BD.UTF-8,bn_BD
--Bengali(India) bn_IN.UTF-8,bn_IN
-+Bengali(India) bn_IN.UTF-8,bn_IN
- Bosnian bs_BA.UTF-8,bs_BA
- Breton br_FR.UTF-8,br_FR
- Bulgarian bg_BG.UTF-8,bg_BG
- Catalan ca_ES.UTF-8,ca_ES
- Chinese(ChinaMainland) zh_CN.UTF-8,zh_CN
-+Chinese(GB18030) zh_CN.GB18030
- Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK
- Chinese(Singapore) zh_SG.UTF-8,zh_SG
- Chinese(Taiwan) zh_TW.UTF-8,zh_TW
-@@ -38,35 +41,42 @@ Croatian hr_HR.UTF-8,hr_HR
- Czech cs_CZ.UTF-8,cs_CZ
- Danish da_DK.UTF-8,da_DK
- Dutch nl_NL.UTF-8,nl_NL
--English(USA) en_US.UTF-8,en_US
-+Dutch(Belgium) nl_BE.UTF-8,nl_BE
- English(Australia) en_AU.UTF-8,en_AU
--English(UK) en_GB.UTF-8,en_GB
- English(Canada) en_CA.UTF-8,en_CA
- English(Ireland) en_IE.UTF-8,en_IE
-+English(Malta) en_MT.UTF-8,en_MT
-+English(NewZealand) en_NZ.UTF-8,en_NZ
- English(SouthAfrica) en_ZA.UTF-8,en_ZA
-+English(UK) en_GB.UTF-8,en_GB
-+English(USA) en_US.UTF-8,en_US
- Esperanto eo.UTF-8,eo
- Estonian et_EE.UTF-8,et_EE
- Finnish fi_FI.UTF-8,fi_FI
- French fr_FR.UTF-8,fr_FR
- French(Belgium) fr_BE.UTF-8,fr_BE
-+French(Canada) fr_CA.UTF-8,fr_CA
-+French(Luxembourg) fr_LU.UTF-8,fr_LU
- French(Switzerland) fr_CH.UTF-8,fr_CH
- Galician gl_ES.UTF-8,gl_ES
- German de_DE.UTF-8,de_DE
- German(Austria) de_AT.UTF-8,de_AT
- German(Switzerland) de_CH.UTF-8,de_CH
-+German(Luxembourg) de_LU.UTF-8,de_LU
- Greek el_GR.UTF-8,el_GR
--Gujarati gu_IN.UTF-8,gu_IN
-+Greek(Cyprus) el_CY.UTF-8,el_CY
-+Gujarati gu_IN.UTF-8,gu_IN
- Hebrew he_IL.UTF-8,he_IL
- Hindi hi_IN.UTF-8,hi_IN
- Hungarian hu_HU.UTF-8,hu_HU
- Icelandic is_IS.UTF-8,is_IS
--Indonesian id_ID.UTF-8,id_ID
--Interlingua ia.UTF-8,ia
-+Indonesian id_ID.UTF-8,id_ID
-+Interlingua ia.UTF-8,ia
- Irish ga_IE.UTF-8,ga_IE
- Italian it_IT.UTF-8,it_IT
- Japanese ja_JP.UTF-8,ja_JP
- Kannada kn_IN.UTF-8,kn_IN
--Kinyarwanda rw_RW.UTF-8,rw_RW
-+Kinyarwanda rw_RW.UTF-8,rw_RW
- Korean ko_KR.UTF-8,ko_KR
- Latvian lv_LV.UTF-8,lv_LV
- Limburgish li_NL.UTF-8,li_NL
-@@ -74,13 +84,14 @@ Limburgish(Belgium) li_BE.UTF-8,li_BE
- Limburgish(Germany) li_DE.UTF-8,li_DE
- Lithuanian lt_LT.UTF-8,lt_LT
- Macedonian mk_MK.UTF-8,mk_MK
--Malayalam ml_IN.UTF-8,ml_IN
-+Malayalam ml_IN.UTF-8,ml_IN
- Malay ms_MY.UTF-8,ms_MY
-+Maltese mt_MT.UTF-8,mt_MT
- Maori mi_NZ.UTF-8,mi_NZ
- Marathi mr_IN.UTF-8,mr_IN
- Mongolian mn_MN.UTF-8,mn_MN
- Nepali ne_NP.UTF-8,ne_NP
--NorthernSotho nso_ZA.UTF-8,nso_ZA
-+NorthernSotho nso_ZA.UTF-8,nso_ZA
- Norwegian(bokmal) nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
- Norwegian(nynorsk) nn_NO.UTF-8,nn_NO
- Oriya or_IN.UTF-8,or_IN
-@@ -92,12 +103,29 @@ Portuguese pt_PT.UTF-8,pt_PT
+@@ -103,6 +103,8 @@
Romanian ro_RO.UTF-8,ro_RO
Russian ru_RU.UTF-8,ru_RU
Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
-+Serbian(Montenegro) sr_ME.UTF-8
-+Serbian(Serbia) sr_RS.UTF-8
-+Serbian(Bosnia) sh_BA.UTF-8,sh_BA
++Serbian(Montenegro) sr_ME.UTF-8
++Serbian(Serbia) sr_RS.UTF-8
+ Serbian(Bosnia) sh_BA.UTF-8,sh_BA
Serbian(Latin) sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn
Serbian(Jekavian) sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije
- Slovak sk_SK.UTF-8,sk_SK
- Slovenian sl_SI.UTF-8,sl_SI
- Spanish es_ES.UTF-8,es_ES
-+Spanish(Argentina) es_AR.UTF-8,es_AR
-+Spanish(Bolivia) es_BO.UTF-8,es_BO
-+Spanish(Chile) es_CL.UTF-8,es_CL
-+Spanish(Colombia) es_CO.UTF-8,es_CO
-+Spanish(CostaRica) es_CR.UTF-8,es_CR
-+Spanish(Ecuador) es_EC.UTF-8,es_EC
-+Spanish(Guatemala) es_GT.UTF-8,es_GT
- Spanish(Mexico) es_MX.UTF-8,es_MX
-+Spanish(Nicaragua) es_NI.UTF-8,es_NI
-+Spanish(Panama) es_PA.UTF-8,es_PA
-+Spanish(Peru) es_PE.UTF-8,es_PE
-+Spanish(Paraguay) es_PY.UTF-8,es_PY
-+Spanish(ElSalvador) es_SV.UTF-8,es_SV
-+Spanish(Uruguay) es_UY.UTF-8,es_UY
-+Spanish(Venezuela) es_VE.UTF-8,es_VE
- Swedish(Finland) sv_FI.UTF-8,sv_FI
- Swedish sv_SE.UTF-8,sv_SE
- Tagalog tl_PH.UTF-8,tl_PH
---- gdm-2.16.2/gui/gdmlanguages.c-orig 2006-11-07 02:57:33.876272000 -0600
-+++ gdm-2.16.2/gui/gdmlanguages.c 2006-11-07 02:59:27.047427000 -0600
-@@ -60,6 +60,8 @@ static Language languages [] = {
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Arabic (Lebanon)"), "ar_LB", NULL, 0 },
- /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Arabic (Saudi Arabia)"), "ar_SA", NULL, 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Armenian"), "hy_AM", "Հայերեն", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Azerbaijani"), "az_AZ", "Azərbaycanca", 0 },
-@@ -94,6 +96,8 @@ static Language languages [] = {
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Dutch"), "nl_NL", "Nederlands", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Dutch (Belgium)"), "nl_BE", "Nederlands (België)", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|English (USA)"), "en_US", "American English", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|English (Australia)"), "en_AU", "Australian English", 0 },
-@@ -108,6 +112,10 @@ static Language languages [] = {
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|English (South Africa)"), "en_ZA", "South African English", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|English (Malta)"), "en_MT", "Maltese English", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|English (New Zealand)"), "en_NZ", "New Zealand English", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Estonian"), "et_EE", "Eesti", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Finnish"), "fi_FI", "Suomi", 0 },
-@@ -116,6 +124,10 @@ static Language languages [] = {
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|French (Belgium)"), "fr_BE", "Français (Belgique)", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|French (Canada)"), "fr_CA", "Français (Canada)", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|French (Luxembourg)"), "fr_LU", "Français (Luxembourg)", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|French (Switzerland)"), "fr_CH", "Français (Suisse)", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Galician"), "gl_ES", "Galego", 0 },
-@@ -124,10 +136,14 @@ static Language languages [] = {
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|German (Austria)"), "de_AT", "Deutsch (Österreich)", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|German (Luxembourg)"), "de_LU", "Deutsch (Luxemburg)", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|German (Switzerland)"), "de_CH", "Deutsch (Schweiz)", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Greek"), "el_GR", "Ελληνικά", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Greek (Cyprus)"), "el_CY", "Ελληνικά (Κύπρος)", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Gujarati"), "gu_IN", "ગુજરાતી", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Hebrew"), "he_IL", "עברית", 0 },
-@@ -152,23 +168,25 @@ static Language languages [] = {
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Kannada"), "kn_IN", "ಕನ್ನಡ", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
-- /*Note translate the A-M to the A-M you used in the group label */
-- { N_("A-M|Kinyarwanda"), "rw_RW", "Kinyarwanda", 0 },
-+ { N_("A-M|Kinyarwanda"), "rw_RW", "Kinyarwanda", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Korean"), "ko_KR", "한국어", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Latvian"), "lv_LV", "Latviešu", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Lithuanian"), "lt_LT", "Lietuvių", 0 },
-- /*Note translate the A-M to the A-M you used in the group label */
-- { N_("A-M|Macedonian"), "mk_MK", NULL, 0 },
-- /*Note translate the A-M to the A-M you used in the group label */
-- { N_("A-M|Malay"), "ms_MY", "Bahasa Melayu", 0 },
-- /*Note translate the A-M to the A-M you used in the group label */
-- { N_("A-M|Malayalam"), "ml_IN", "മലയാളം", 0 },
-- /*Note translate the A-M to the A-M you used in the group label */
-- { N_("A-M|Marathi"), "mr_IN", NULL, 0 },
-- /*Note translate the A-M to the A-M you used in the group label */
-- { N_("A-M|Mongolian"), "mn_MN", "Монгол", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Macedonian"), "mk_MK", NULL, 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Malay"), "ms_MY", "Bahasa Melayu", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Malayalam"), "ml_IN", "മലയാളം", 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Maltese"), "mt_MT", NULL, 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Marathi"), "mr_IN", NULL, 0 },
-+ /*Note translate the A-M to the A-M you used in the group label */
-+ { N_("A-M|Mongolian"), "mn_MN", "Монгол", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Northern Sotho"), "nso_ZA", "Sesotho sa Leboa", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
-@@ -194,19 +212,53 @@ static Language languages [] = {
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Serbian"), "sr_YU", "српски", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
-- { N_("N-Z|Serbian"), "sr_CS", "српски", 0 },
-+ { N_("N-Z|Serbian (Serbia & Montenegro)"), "sr_CS", "српски", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Serbian (Montenegro)"), "sr_ME", "српски", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Serbian (Serbia)"), "sr_RS", "српски", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Serbian (Latin)"), "sr_CS@Latn", "srpski (latinica)", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Serbian (Jekavian)"), "sr_CS@ije", "српски (ијекавски)", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Serbian (Bosnia)"), "sh_BA", "srpski (Bosna i Hercegovina)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Slovak"), "sk_SK", "Slovenský", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Slovenian"), "sl_SI", "Slovenščina", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Spanish"), "es_ES", "Español", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
-- { N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (Mexico)", 0 },
-+ { N_("N-Z|Spanish (Argentina)"), "es_AR", "Español (Argentina)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Bolivia)"), "es_BO", "Español (Bolivia)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Chile)"), "es_CL", "Español (Chile)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Colombia)"), "es_CO", "Español (Colombia)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Costa Rica)"), "es_CR", "Español (Costa Rica)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Ecuador)"), "es_EC", "Español (Ecuador)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Guatemala)"), "es_GT", "Español (Guatemala)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (México)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Nicaragua)"), "es_NI", "Español (Nicaragua)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Panama)"), "es_PA", "Español (Panamá)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Peru)"), "es_PE", "Español (Perú)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Paraguay)"), "es_PY", "Español (Paraguay)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (El Salvador)"), "es_SV", "Español (El Salvador)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Uruguay)"), "es_UY", "Español (Uruguay)", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Spanish (Venezuela)"), "es_VE", "Español (Venezuela)", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Swedish"), "sv_SE", "Svenska", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
-@@ -228,9 +280,11 @@ static Language languages [] = {
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Welsh"), "cy_GB", "Cymraeg", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
-+ { N_("N-Z|Xhosa"), "xh_ZA", "isiXhosa", 0 },
-+ /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Yiddish"), "yi", "ייִדיש", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
-- { N_("N-Z|Zulu"), "zu_ZA", "IsiZulu", 0 },
-+ { N_("N-Z|Zulu"), "zu_ZA", "isiZulu", 0 },
- /* This is the POSIX/C locale for english, should really be in Other */
- { N_("Other|POSIX/C English"), "C", "POSIX/C English", 0 },
- { NULL, NULL }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-09-gdmsetup-launch-menu-tooltip.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,11 @@
+--- /export/home/jdsbuild/packages/BUILD/SUNWgnome-display-mgr-2.16.1/gdm-2.16.2/gui/gdmsetup.desktop.in.in 2006-04-17 19:38:19.000000000 +0100
++++ gdm-2.16.2/gui/gdmsetup.desktop.in.in 2006-11-15 17:04:06.400740000 +0000
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ _Name=Login Window
+ _GenericName=Login Window Preferences
+-_Comment=Configure the login window (GNOME Display Manager)
++_Comment=Configure GDM login window appearance and behavior
+ TryExec=@sbindir@/gdmsetup
+ Exec=gdmsetup
+ Icon=gdm-setup
--- a/patches/gdm-09-sun-branding-patch.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-diff -Nrup gdm-2.16.1/docs/C/gdm.xml ../SUNWgnome-display-mgr-2.16.1-patched/gdm-2.16.1/docs/C/gdm.xml
---- gdm-2.16.1/docs/C/gdm.xml 2006-10-03 00:34:00.000000000 +0200
-+++ ../SUNWgnome-display-mgr-2.16.1-patched/gdm-2.16.1/docs/C/gdm.xml 2006-10-26 17:27:08.379118000 +0200
-@@ -6209,6 +6209,19 @@ homogeneous="bool">
- directory as the theme <filename>.xml</filename> file in
- <filename><share>/gdm/themes/<theme_name></filename>.
- </para>
-+
-+ <para>
-+ Note that alternative image file can be specified using the altfile[n]
-+ property. GDM will use the last valid image filename specified.
-+ For example:
-+<screen>
-+<normal file="picture.png" altfile1="distribution-blah-image.png" altfile2="distribution-foo-image.png"/>
-+</screen>
-+ If <filename>distribution-foo-image.png</filename> is a valid image
-+ filename it will be used. Otherwise distribution-blah-image.png will
-+ be used if valid.
-+ </para>
-+
- </sect3>
-
- <sect3 id="listcoloronodes">
-diff -Nrup gdm-2.16.1/gui/greeter/greeter_parser.c ../SUNWgnome-display-mgr-2.16.1-patched/gdm-2.16.1/gui/greeter/greeter_parser.c
---- gdm-2.16.1/gui/greeter/greeter_parser.c 2006-08-03 04:32:39.000000000 +0200
-+++ ../SUNWgnome-display-mgr-2.16.1-patched/gdm-2.16.1/gui/greeter/greeter_parser.c 2006-10-26 17:27:08.381815000 +0200
-@@ -857,6 +857,37 @@ parse_state_file_pixmap (xmlNodePtr node
- xmlFree (prop);
- }
-
-+ {
-+ int i = 1;
-+ char *altfile_prop_name = g_strdup_printf ("altfile%d", i);
-+
-+ prop = xmlGetProp (node,(const xmlChar *) altfile_prop_name);
-+ while (prop)
-+ {
-+ char *filename = NULL;
-+ if (g_path_is_absolute ((char *) prop))
-+ filename = g_strdup ((char *) prop);
-+ else
-+ filename = g_build_filename (file_search_path,
-+ (char *) prop,
-+ NULL);
-+
-+ if (g_file_test (filename, G_FILE_TEST_EXISTS))
-+ {
-+ if (info->data.pixmap.files[state])
-+ g_free (info->data.pixmap.files[state]);
-+ info->data.pixmap.files[state] = filename;
-+ }
-+ xmlFree (prop);
-+ g_free (altfile_prop_name);
-+
-+ i++;
-+ altfile_prop_name = g_strdup_printf ("altfile%d", i);
-+ prop = xmlGetProp (node,(const xmlChar *) altfile_prop_name);
-+ }
-+ g_free (altfile_prop_name);
-+ }
-+
- prop = xmlGetProp (node,(const xmlChar *) "tint");
- if (prop)
- {
--- a/patches/gdm-10-fixfocus.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
---- gdm-2.16.2/gui/greeter/greeter_item_customlist.c-orig 2006-10-31 15:48:28.513942000 -0600
-+++ gdm-2.16.2/gui/greeter/greeter_item_customlist.c 2006-10-31 15:49:28.840475000 -0600
-@@ -460,6 +460,9 @@ setup_combo_customlist (GtkComboBox *com
- g_signal_connect (G_OBJECT (combo), "changed",
- G_CALLBACK (combo_selected), item);
-
-+ /* Make sure that focus never leaves username/password entry */
-+ gtk_combo_box_set_focus_on_click (combo, FALSE);
-+
- if (strcmp (item->id, "session") == 0)
- {
- populate_session (G_OBJECT (combo));
-@@ -532,6 +535,23 @@ list_selected (GtkTreeSelection *selecti
- }
- }
-
-+static gboolean custom_list_release_event (GtkWidget *widget,
-+ GdkEventSelection *event,
-+ gpointer user_data)
-+{
-+ GreeterItemInfo *entry_info = greeter_lookup_id ("user-pw-entry");
-+
-+ /* Make sure that focus never leaves username/password entry */
-+ if (entry_info && entry_info->item &&
-+ GNOME_IS_CANVAS_WIDGET (entry_info->item) &&
-+ GTK_IS_ENTRY (GNOME_CANVAS_WIDGET (entry_info->item)->widget))
-+ {
-+ GtkWidget *entry = GNOME_CANVAS_WIDGET (entry_info->item)->widget;
-+ gtk_widget_grab_focus (entry);
-+ }
-+ return FALSE;
-+}
-+
- /* Setup custom list style */
- static void
- setup_customlist (GtkWidget *tv, GreeterItemInfo *item)
-@@ -562,6 +582,10 @@ setup_customlist (GtkWidget *tv, Greeter
- NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tv), column);
-
-+ g_signal_connect (tv, "button_release_event",
-+ G_CALLBACK (custom_list_release_event),
-+ NULL);
-+
- if (strcmp (item->id, "session") == 0)
- {
- populate_session (G_OBJECT (tm));
--- a/patches/gdm-11-gdmsetup-launch-menu-tooltip.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- /export/home/jdsbuild/packages/BUILD/SUNWgnome-display-mgr-2.16.1/gdm-2.16.2/gui/gdmsetup.desktop.in.in 2006-04-17 19:38:19.000000000 +0100
-+++ gdm-2.16.2/gui/gdmsetup.desktop.in.in 2006-11-15 17:04:06.400740000 +0000
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Login Window
- _GenericName=Login Window Preferences
--_Comment=Configure the login window (GNOME Display Manager)
-+_Comment=Configure GDM login window appearance and behavior
- TryExec=@sbindir@/gdmsetup
- Exec=gdmsetup
- Icon=gdm-setup
--- a/patches/gnome-desktop-01-jds-about-branding.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff Fri Nov 24 16:56:15 2006 +0000
@@ -424,18 +424,18 @@
text = g_strdup_printf ("<big><b>%s</b></big>",
_("Brought to you by:"));
-diff -urN gnome-desktop-2.14.1.1/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.14.1.1-hacked/gnome-about/gnome-about.desktop.in.in
---- gnome-desktop-2.14.1.1/gnome-about/gnome-about.desktop.in.in 2006-04-11 00:48:42.000000000 +1200
-+++ gnome-desktop-2.14.1.1-hacked/gnome-about/gnome-about.desktop.in.in 2006-04-28 12:32:33.271037000 +1200
+diff -urN gnome-desktop-2.17.2/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.17.2-hacked/gnome-about/gnome-about.desktop.in.in
+--- gnome-desktop-2.17.2/gnome-about/gnome-about.desktop.in.in 2006-04-11 00:48:42.000000000 +1200
++++ gnome-desktop-2.17.2-hacked/gnome-about/gnome-about.desktop.in.in 2006-04-28 12:32:33.271037000 +1200
@@ -1,12 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=About GNOME
-_Comment=Learn more about GNOME
+_Name=About Java Desktop System
-+_Comment=Know more about Java Desktop System
++_Comment=Learn more about Java Desktop System
Exec=gnome-about
- Icon=stock_about
+ Icon=gnome-logo-icon-transparent
Terminal=false
Type=Application
-Categories=GNOME;GTK;Application;Core;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-games-01-array-init.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,181 @@
+--- gnome-games-2.17.1/dependencies/libggz/numberlist.c.orig 2006-10-19 16:03:41.668130100 +0100
++++ gnome-games-2.17.1/dependencies/libggz/numberlist.c 2006-10-19 16:04:20.778441500 +0100
+@@ -40,7 +40,10 @@
+
+ GGZNumberList ggz_numberlist_new(void)
+ {
+- GGZNumberList list = {values: 0, min: -1, max: -1};
++ GGZNumberList list;
++ list.values = 0;
++ list.min = -1;
++ list.max = -1;
+ return list;
+ }
+
+--- gnome-games-2.17.1/dependencies/ggzmod-ggz/ggzmod-ggz.c.orig 2006-10-23 16:43:58.643539600 +0100
++++ gnome-games-2.17.1/dependencies/ggzmod-ggz/ggzmod-ggz.c 2006-10-23 16:49:35.027332900 +0100
+@@ -417,9 +417,10 @@
+
+ static GGZSeat _ggzmod_ggz_get_seat(GGZMod *ggzmod, int num)
+ {
+- GGZSeat seat = {num: num,
+- type: GGZ_SEAT_NONE,
+- name: NULL};
++ GGZSeat seat;
++ seat.num = num,
++ seat.type = GGZ_SEAT_NONE,
++ seat.name = NULL;
+
+ if (num >= 0 && num < ggzmod->num_seats) {
+ GGZListEntry *entry;
+@@ -479,7 +480,9 @@
+
+ static GGZSpectatorSeat _ggzmod_ggz_get_spectator_seat(GGZMod * ggzmod, int num)
+ {
+- GGZSpectatorSeat seat = {num: num, name: NULL};
++ GGZSpectatorSeat seat;
++ seat.num = num;
++ seat.name = NULL;
+
+ if (num >= 0 && num < ggzmod->num_spectator_seats) {
+ GGZListEntry *entry;
+--- gnome-games-2.17.1/dependencies/ggzcore/game.c.orig 2006-10-23 16:55:39.720480600 +0100
++++ gnome-games-2.17.1/dependencies/ggzcore/game.c 2006-10-23 16:57:09.271272500 +0100
+@@ -240,7 +240,7 @@
+ void ggzcore_game_set_server_fd(GGZGame *game, unsigned int fd)
+ {
+ if (game)
+- return _ggzcore_game_set_server_fd(game, fd);
++ _ggzcore_game_set_server_fd(game, fd);
+ }
+
+
+@@ -744,9 +744,9 @@
+ */
+ static void abort_game(struct _GGZGame *game)
+ {
+- GGZTableLeaveEventData event_data = { reason:GGZ_LEAVE_NORMAL,
+- player:NULL
+- };
++ GGZTableLeaveEventData event_data;
++ event_data.reason = GGZ_LEAVE_NORMAL;
++ event_data.player = NULL;
+ GGZServer *server = game->server;
+ GGZRoom *room = _ggzcore_server_get_cur_room(server);
+
+--- gnome-games-2.17.1/dependencies/ggzcore/netxml.c.orig 2006-10-23 16:58:52.363325200 +0100
++++ gnome-games-2.17.1/dependencies/ggzcore/netxml.c 2006-10-23 16:59:42.020661900 +0100
+@@ -1227,7 +1227,8 @@
+ _ggzcore_room_set_table_leave_status(room, code);
+ else if (strcasecmp(action, "chat") == 0) {
+ if (code != E_OK) {
+- GGZErrorEventData error = { status:code };
++ GGZErrorEventData error;
++ error.status = code;
+
+ switch (code) {
+ case E_NOT_IN_ROOM:
+@@ -1272,7 +1273,8 @@
+ }
+ else if (strcasecmp(action, "admin") == 0) {
+ if (code != E_OK) {
+- GGZErrorEventData error = { status:code };
++ GGZErrorEventData error;
++ error.status = code;
+ snprintf(error.message,
+ sizeof(error.message),
+ "Admin action error");
+--- gnome-games-2.17.1/dependencies/ggzcore/room.c.orig 2006-10-23 17:02:00.364671900 +0100
++++ gnome-games-2.17.1/dependencies/ggzcore/room.c 2006-10-23 17:03:53.013175800 +0100
+@@ -866,10 +866,10 @@
+ void _ggzcore_room_add_chat(GGZRoom * room, GGZChatType type,
+ const char *name, const char *msg)
+ {
+- GGZChatEventData data = { type:type,
+- sender:name,
+- message:msg
+- };
++ GGZChatEventData data;
++ data.type = type;
++ data.sender = name;
++ data.message = msg;
+
+ ggz_debug(GGZCORE_DBG_ROOM, "Chat (%s) from %s",
+ ggz_chattype_to_string(type), name);
+@@ -890,7 +890,8 @@
+ if (status == E_OK) {
+ _ggzcore_room_event(room, GGZ_TABLE_LAUNCHED, NULL);
+ } else {
+- GGZErrorEventData error = { status:status };
++ GGZErrorEventData error;
++ error.status = status;
+
+ switch (status) {
+ case E_BAD_OPTIONS:
+@@ -1015,9 +1016,10 @@
+ void _ggzcore_room_set_table_leave(GGZRoom * room,
+ GGZLeaveType reason, const char *player)
+ {
+- GGZTableLeaveEventData event_data = { reason:reason,
+- player:player
+- };
++ GGZTableLeaveEventData event_data;
++ event_data.reason = reason;
++ event_data.player = player;
++
+ ggz_debug(GGZCORE_DBG_ROOM, "Player left table: %s (%s).",
+ ggz_leavetype_to_string(reason), player);
+ _ggzcore_server_set_table_leave_status(room->server, E_OK);
+--- gnome-games-2.17.1/dependencies/ggzmod/ggzmod.c.orig 2006-10-23 17:06:12.389891600 +0100
++++ gnome-games-2.17.1/dependencies/ggzmod/ggzmod.c 2006-10-23 17:09:29.841343300 +0100
+@@ -484,9 +484,10 @@
+
+ GGZSeat ggzmod_get_seat(GGZMod *ggzmod, int num)
+ {
+- GGZSeat seat = {num: num,
+- type: GGZ_SEAT_NONE,
+- name: NULL};
++ GGZSeat seat;
++ seat.num = num;
++ seat.type = GGZ_SEAT_NONE;
++ seat.name = NULL;
+
+ if (num >= 0 && num < ggzmod->num_seats) {
+ GGZListEntry *entry;
+@@ -500,7 +501,9 @@
+
+ GGZSpectatorSeat ggzmod_get_spectator_seat(GGZMod * ggzmod, int num)
+ {
+- GGZSpectatorSeat seat = {num: num, name: NULL};
++ GGZSpectatorSeat seat;
++ seat.num = num;
++ seat.name = NULL;
+
+ if (num >= 0 && num < ggzmod->num_spectator_seats) {
+ GGZListEntry *entry;
+@@ -527,9 +530,10 @@
+ /* Copy current seat to old_seat */
+ entry = ggz_list_search(ggzmod->seats, &seat);
+ if (!entry) {
+- GGZSeat myseat = {num:seat->num,
+- type:GGZ_SEAT_NONE,
+- name: NULL};
++ GGZSeat myseat;
++ myseat.num = seat->num;
++ myseat.type = GGZ_SEAT_NONE;
++ myseat.name = NULL;
+ old_seat = seat_copy(&myseat);
+ } else {
+ old_seat = ggz_list_get_data(entry);
+@@ -571,8 +575,9 @@
+ /* Copy current seat to old_seat */
+ entry = ggz_list_search(ggzmod->spectator_seats, seat);
+ if (!entry) {
+- GGZSpectatorSeat myseat = {num:seat->num,
+- name: NULL};
++ GGZSpectatorSeat myseat;
++ myseat.num = seat->num;
++ myseat.name = NULL;
+
+ old_seat = spectator_seat_copy(&myseat);
+ } else {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-games-02-ggz-function.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,28 @@
+--- gnome-games-2.17.1/dependencies/libggz/ggz.h.orig 2006-11-24 08:29:00.255847200 +0000
++++ gnome-games-2.17.1/dependencies/libggz/ggz.h 2006-11-24 08:31:48.712111900 +0000
+@@ -2,7 +2,7 @@
+ * @file ggz.h
+ * @author Brent M. Hendricks
+ * @date Fri Nov 2 23:32:17 2001
+- * $Id: ggz.h,v 1.1 2006/10/14 10:27:47 andreasr Exp $
++ * $Id: ggz.h,v 1.4 2006/11/06 21:18:53 andreasr Exp $
+ *
+ * Header file for ggz components lib
+ *
+@@ -53,12 +53,14 @@
+ #endif
+
+ #if defined __GNUC__ && (__GNUC__ >= 3)
+-# define _GGZFUNCTION_
++# define _GGZFUNCTION_ ""
++#elif defined(__sun)
++# define _GGZFUNCTION_ ""
+ #else
+ # ifndef __cplusplus
+ # define _GGZFUNCTION_ __FUNCTION__
+ # else
+-# define _GGZFUNCTION_
++# define _GGZFUNCTION_ ""
+ # endif
+ #endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-python-desktop-01-no_inline.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,11 @@
+--- gnome-python-desktop-2.17.1/gnomekeyring/gnomekeyringmodule.c.orig 2006-10-31 15:27:30.906862200 +0000
++++ gnome-python-desktop-2.17.1/gnomekeyring/gnomekeyringmodule.c 2006-10-31 15:27:36.206147400 +0000
+@@ -20,7 +20,7 @@
+ static PyObject *PyGKExc_CancelledError; /* GNOME_KEYRING_RESULT_CANCELLED */
+ static PyObject *PyGKExc_AlreadyExistsError; /* GNOME_KEYRING_RESULT_ALREADY_EXISTS */
+
+-inline PyObject *
++PyObject *
+ pygnomekeyring_result_to_exception(GnomeKeyringResult result)
+ {
+ switch(result)
--- a/patches/gnome-session-03-gnome-atom.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gnome-session-03-gnome-atom.diff Fri Nov 24 16:56:15 2006 +0000
@@ -1,6 +1,6 @@
-diff -urN gnome-session-2.16.1/gnome-session/main.c gnome-session-2.16.1-hacked/gnome-session/main.c
---- gnome-session-2.16.1/gnome-session/main.c 2006-10-23 09:02:34.940750000 +1300
-+++ gnome-session-2.16.1-hacked/gnome-session/main.c 2006-10-23 09:09:30.678510000 +1300
+diff -urN gnome-session-2.17.2/gnome-session/main.c gnome-session-2.17.2-hacked/gnome-session/main.c
+--- gnome-session-2.17.2/gnome-session/main.c 2006-10-23 09:02:34.940750000 +1300
++++ gnome-session-2.17.2-hacked/gnome-session/main.c 2006-10-23 09:09:30.678510000 +1300
@@ -21,6 +21,7 @@
#include <stdio.h>
@@ -9,7 +9,7 @@
#include <signal.h>
#include <stdlib.h>
#include <string.h>
-@@ -77,6 +78,8 @@
+@@ -78,6 +79,8 @@
gint suicide_delay = 10000;
gchar *session_name = NULL;
@@ -18,7 +18,7 @@
static const GOptionEntry options[] = {
{"choose-session", '\0', 0, G_OPTION_ARG_STRING, &session_name, N_("Specify a session name to load"), N_("NAME")},
-@@ -433,6 +436,10 @@
+@@ -431,6 +434,10 @@
g_free (display_str);
putenv (ep);
@@ -28,4 +28,4 @@
+
ignore (SIGPIPE);
- /* Need DISPLAY set */
+ gsm_set_up_legacy_proxy_environment ();
--- a/patches/gnome-session-05-gnome-about.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gnome-session-05-gnome-about.diff Fri Nov 24 16:56:15 2006 +0000
@@ -1,6 +1,6 @@
-diff -urN gnome-session-2.16.1/gnome-session/headers.h gnome-session-2.16.1-hacked/gnome-session/headers.h
---- gnome-session-2.16.1/gnome-session/headers.h 2006-07-27 00:46:36.000000000 +1200
-+++ gnome-session-2.16.1-hacked/gnome-session/headers.h 2006-10-23 09:16:01.512340000 +1300
+diff -urN gnome-session-2.17.2/gnome-session/headers.h gnome-session-2.17.2-hacked/gnome-session/headers.h
+--- gnome-session-2.17.2/gnome-session/headers.h 2006-07-27 00:46:36.000000000 +1200
++++ gnome-session-2.17.2-hacked/gnome-session/headers.h 2006-10-23 09:16:01.512340000 +1300
@@ -74,6 +74,9 @@
/* Assistive Technology support is turned on */
#define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility"
@@ -8,9 +8,9 @@
+/* Start gnome-about on first-time startup */
+#define ABOUT_PROMPT_KEY GSM_GCONF_CONFIG_PREFIX "/sun_extensions/viewed_about_jds_three"
+
- /* Convenience macros: */
- #define APPEND(List,Elt) ((List) = (g_slist_append ((List), (Elt))))
- #define PREPEND(List,Elt) ((List) = (g_slist_prepend ((List), (Elt))))
+ /* Proxy information */
+ #define HTTP_PROXY_PREFIX "/system/http_proxy"
+ #define HTTP_PROXY_KEY HTTP_PROXY_PREFIX "/use_http_proxy"
diff -urN gnome-session-2.16.1/gnome-session/main.c gnome-session-2.16.1-hacked/gnome-session/main.c
--- gnome-session-2.16.1/gnome-session/main.c 2006-10-23 09:10:12.663236000 +1300
+++ gnome-session-2.16.1-hacked/gnome-session/main.c 2006-10-23 09:16:01.513372000 +1300
--- a/patches/gnome-session-09-trusted-extensions.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gnome-session-09-trusted-extensions.diff Fri Nov 24 16:56:15 2006 +0000
@@ -249,8 +249,8 @@
gsm_set_verbose (TRUE);
@@ -486,13 +529,6 @@
- if (a_t_support)
- gsm_at_set_gtk_modules ();
+ gsm_at_set_gtk_modules ();
+ }
- goption_context = g_option_context_new (_("- Manage the GNOME session"));
- g_option_context_add_main_entries (goption_context, options, GETTEXT_PACKAGE);
--- a/patches/gnome-system-monitor-01-solaris.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gnome-system-monitor-01-solaris.diff Fri Nov 24 16:56:15 2006 +0000
@@ -14,15 +14,16 @@
}
-diff -Nrup gnome-system-monitor-2.16.1/src/callbacks.h gnome-system-monitor-2.16.1.mod/src/callbacks.h
---- gnome-system-monitor-2.16.1/src/callbacks.h 2005-07-13 22:35:04.000000000 +0800
-+++ gnome-system-monitor-2.16.1.mod/src/callbacks.h 2006-11-13 20:26:32.071324000 +0800
-@@ -25,64 +25,64 @@
+diff -Nrup gnome-system-monitor-2.17.2.1/src/callbacks.h gnome-system-monitor-2.17.2.1.mod/src/callbacks.h
+--- gnome-system-monitor-2.17.2.1/src/callbacks.h 2005-07-13 22:35:04.000000000 +0800
++++ gnome-system-monitor-2.17.2.1.mod/src/callbacks.h 2006-11-13 20:26:32.071324000 +0800
+@@ -25,65 +25,65 @@
#include "procman.h"
#include <libgnomevfs/gnome-vfs.h>
-void cb_show_memory_maps (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
-void cb_show_open_files (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
+-void cb_show_lsof(GtkAction *action, gpointer data) G_GNUC_INTERNAL;
-void cb_renice (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
-void cb_end_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
-void cb_kill_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
@@ -61,73 +62,74 @@
-void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
- gint num, gpointer data) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void cb_show_memory_maps (GtkAction *action, gpointer data);
-+G_GNUC_INTERNAL void cb_show_open_files (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL void cb_renice (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL void cb_end_process (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL void cb_kill_process (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL void cb_hide_process (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL void cb_show_hidden_processes (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL void cb_edit_preferences (GtkAction *action, gpointer data) ;
++G_GNUC_INTERNAL void cb_show_open_files (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_show_lsof(GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_renice (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_end_process (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_kill_process (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_hide_process (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_show_hidden_processes (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_edit_preferences (GtkAction *action, gpointer data);
+
-+G_GNUC_INTERNAL void cb_help_contents (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL void cb_about (GtkAction *action, gpointer data) ;
++G_GNUC_INTERNAL void cb_help_contents (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL void cb_about (GtkAction *action, gpointer data);
+
-+G_GNUC_INTERNAL void cb_app_exit (GtkAction *action, gpointer data) ;
-+G_GNUC_INTERNAL gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data) ;
++G_GNUC_INTERNAL void cb_app_exit (GtkAction *action, gpointer data);
++G_GNUC_INTERNAL gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data);
+
-+G_GNUC_INTERNAL void cb_end_process_button_pressed (GtkButton *button, gpointer data) ;
-+G_GNUC_INTERNAL void cb_logout (GtkButton *button, gpointer data) ;
++G_GNUC_INTERNAL void cb_end_process_button_pressed (GtkButton *button, gpointer data);
++G_GNUC_INTERNAL void cb_logout (GtkButton *button, gpointer data);
+
-+G_GNUC_INTERNAL void cb_info_button_pressed (GtkButton *button, gpointer user_data) ;
++G_GNUC_INTERNAL void cb_info_button_pressed (GtkButton *button, gpointer user_data);
+
-+G_GNUC_INTERNAL void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data) ;
-+G_GNUC_INTERNAL void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data) ;
-+G_GNUC_INTERNAL void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data) ;
-+G_GNUC_INTERNAL void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data) ;
-+G_GNUC_INTERNAL void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data) ;
-+G_GNUC_INTERNAL void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data) ;
-+G_GNUC_INTERNAL void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data) ;
++G_GNUC_INTERNAL void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data);
++G_GNUC_INTERNAL void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data);
++G_GNUC_INTERNAL void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data);
++G_GNUC_INTERNAL void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data);
++G_GNUC_INTERNAL void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data);
++G_GNUC_INTERNAL void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data);
++G_GNUC_INTERNAL void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data);
+
-+G_GNUC_INTERNAL void cb_row_selected (GtkTreeSelection *selection, gpointer data) ;
++G_GNUC_INTERNAL void cb_row_selected (GtkTreeSelection *selection, gpointer data);
+
-+G_GNUC_INTERNAL gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data) ;
++G_GNUC_INTERNAL gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data);
+G_GNUC_INTERNAL gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,
-+ gpointer data) ;
++ gpointer data);
+
+
+G_GNUC_INTERNAL void cb_change_current_page (GtkNotebook *nb,
-+ gint num, gpointer data) ;
++ gint num, gpointer data);
+G_GNUC_INTERNAL void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
-+ gint num, gpointer data) ;
++ gint num, gpointer data);
-gint cb_update_disks (gpointer data) G_GNUC_INTERNAL;
-gint cb_timeout (gpointer data) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL gint cb_update_disks (gpointer data) ;
-+G_GNUC_INTERNAL gint cb_timeout (gpointer data) ;
++G_GNUC_INTERNAL gint cb_update_disks (gpointer data);
++G_GNUC_INTERNAL gint cb_timeout (gpointer data);
-void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
+G_GNUC_INTERNAL void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
GnomeVFSVolume *vol,
- gpointer procdata) G_GNUC_INTERNAL;
-+ gpointer procdata) ;
++ gpointer procdata);
-void cb_radio_processes(GtkAction *action,
+G_GNUC_INTERNAL void cb_radio_processes(GtkAction *action,
GtkRadioAction *current,
- gpointer data) G_GNUC_INTERNAL;
-+ gpointer data) ;
++ gpointer data);
-void cb_kill_sigstop(GtkAction *action,
- gpointer data) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void cb_kill_sigstop(GtkAction *action,
-+ gpointer data) ;
++ gpointer data);
-void cb_kill_sigcont(GtkAction *action,
- gpointer data) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void cb_kill_sigcont(GtkAction *action,
-+ gpointer data) ;
++ gpointer data);
#endif /* _PROCMAN_CALLBACKS_H_ */
@@ -569,21 +571,21 @@
procdata->net_graph = net_graph;
-diff -Nrup gnome-system-monitor-2.16.1/src/interface.h gnome-system-monitor-2.16.1.mod/src/interface.h
---- gnome-system-monitor-2.16.1/src/interface.h 2005-03-17 22:23:42.000000000 +0800
-+++ gnome-system-monitor-2.16.1.mod/src/interface.h 2006-11-13 20:26:32.065343000 +0800
+diff -Nrup gnome-system-monitor-2.17.2.1/src/interface.h gnome-system-monitor-2.17.2.1.mod/src/interface.h
+--- gnome-system-monitor-2.17.2.1/src/interface.h 2005-03-17 22:23:42.000000000 +0800
++++ gnome-system-monitor-2.17.2.1.mod/src/interface.h 2006-11-13 20:26:32.065343000 +0800
@@ -25,9 +25,9 @@
#include "procman.h"
-void create_main_window (ProcData *data) G_GNUC_INTERNAL;
--void update_sensitivity (ProcData *data, gboolean sensitivity) G_GNUC_INTERNAL;
+-void update_sensitivity (ProcData *data) G_GNUC_INTERNAL;
-void do_popup_menu(ProcData *data, GdkEventButton *event) G_GNUC_INTERNAL;
-GtkWidget * make_title_label (const char *text) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL void create_main_window (ProcData *data) ;
-+G_GNUC_INTERNAL void update_sensitivity (ProcData *data, gboolean sensitivity) ;
-+G_GNUC_INTERNAL void do_popup_menu(ProcData *data, GdkEventButton *event) ;
-+G_GNUC_INTERNAL GtkWidget * make_title_label (const char *text) ;
++G_GNUC_INTERNAL void create_main_window (ProcData *data);
++G_GNUC_INTERNAL void update_sensitivity (ProcData *data);
++G_GNUC_INTERNAL void do_popup_menu(ProcData *data, GdkEventButton *event);
++G_GNUC_INTERNAL GtkWidget * make_title_label (const char *text);
#endif /* _PROCMAN_INTERFACE_H_ */
diff -Nrup gnome-system-monitor-2.16.1/src/load-graph.c gnome-system-monitor-2.16.1.mod/src/load-graph.c
@@ -796,34 +798,33 @@
#endif
-diff -Nrup gnome-system-monitor-2.16.1/src/procman.c gnome-system-monitor-2.16.1.mod/src/procman.c
---- gnome-system-monitor-2.16.1/src/procman.c 2006-09-17 18:05:19.000000000 +0800
-+++ gnome-system-monitor-2.16.1.mod/src/procman.c 2006-11-13 20:26:32.074531000 +0800
-@@ -107,7 +107,10 @@ timeouts_changed_cb (GConfClient *client
+diff -Nrup gnome-system-monitor-2.17.2.1/src/procman.c gnome-system-monitor-2.17.2.1.mod/src/procman.c
+--- gnome-system-monitor-2.17.2.1/src/procman.c 2006-09-17 18:05:19.000000000 +0800
++++ gnome-system-monitor-2.17.2.1.mod/src/procman.c 2006-11-13 20:26:32.074531000 +0800
+@@ -107,7 +107,10 @@
procdata->config.graph_update_interval = gconf_value_get_int (value);
procdata->config.graph_update_interval =
MAX (procdata->config.graph_update_interval,
- 250);
-+ /* The interval is too small, and in some low level machine,
-+ cause gconf can't work, so set its min value 1 sec*/
-+ /* 250);*/
-+ 1000);
++ /* The interval is too small, and in some low level machine,
++ cause gconf can't work, so set its min value 1 sec*/
++ /* 250);*/
++ 1000);
load_graph_change_speed(procdata->cpu_graph,
procdata->config.graph_update_interval);
load_graph_change_speed(procdata->mem_graph,
-@@ -356,7 +359,11 @@ procman_data_new (GConfClient *client)
+@@ -356,7 +359,10 @@
pd->config.width = CLAMP (pd->config.width, 50, swidth);
pd->config.height = CLAMP (pd->config.height, 50, sheight);
pd->config.update_interval = MAX (pd->config.update_interval, 1000);
- pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);
-+ /* The interval is too small, and in some low level machine,
++ /* The interval is too small, and in some low level machine,
+ cause gconf can't work, so set its min value 1 sec*/
-+ /*pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);*/
-+ pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 1000);
-+
++ /*pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);*/
++ pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 1000);
pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000);
pd->config.whose_process = CLAMP (pd->config.whose_process, 0, 2);
- pd->config.current_tab = CLAMP (pd->config.current_tab, 0, 2);
+ pd->config.current_tab = CLAMP(pd->config.current_tab,
diff -Nrup gnome-system-monitor-2.16.1/src/procman.h gnome-system-monitor-2.16.1.mod/src/procman.h
--- gnome-system-monitor-2.16.1/src/procman.h 2006-08-18 00:50:43.000000000 +0800
+++ gnome-system-monitor-2.16.1.mod/src/procman.h 2006-11-13 20:26:32.074782000 +0800
@@ -1112,19 +1113,10 @@
#endif /* _PROCMAN_SMOOTH_REFRESH */
-diff -Nrup gnome-system-monitor-2.16.1/src/util.h gnome-system-monitor-2.16.1.mod/src/util.h
---- gnome-system-monitor-2.16.1/src/util.h 2006-07-12 03:51:11.000000000 +0800
-+++ gnome-system-monitor-2.16.1.mod/src/util.h 2006-11-13 20:26:32.074021000 +0800
-@@ -5,7 +5,7 @@
- #include <libgnomevfs/gnome-vfs-utils.h>
- #include <stddef.h>
-
--void _procman_array_gettext_init(const char * strings[], size_t n) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL void _procman_array_gettext_init(const char * strings[], size_t n);
-
- #define PROCMAN_GETTEXT_ARRAY_INIT(A) G_STMT_START { \
- static gboolean is_init = FALSE; \
-@@ -19,21 +19,21 @@ if(!is_init) { \
+diff -Nrup gnome-system-monitor-2.17.2.1/src/util.h gnome-system-monitor-2.17.2.1.mod/src/util.h
+--- gnome-system-monitor-2.17.2.1/src/util.h 2006-07-12 03:51:11.000000000 +0800
++++ gnome-system-monitor-2.17.2.1.mod/src/util.h 2006-11-13 20:26:32.074021000 +0800
+@@ -9,21 +9,21 @@
#define PROCMAN_RCMP(X, Y) PROCMAN_CMP((Y), (X))
@@ -1145,12 +1137,12 @@
-gboolean
-load_symbols(const char *module, ...) G_GNUC_INTERNAL G_GNUC_NULL_TERMINATED;
+G_GNUC_INTERNAL gboolean
-+load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED;
++load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED;
-void
-procman_debug(const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
+G_GNUC_INTERNAL void
-+procman_debug(const char *format, ...) G_GNUC_PRINTF(1, 2);
++procman_debug(const char *format, ...) G_GNUC_PRINTF(1, 2);
#endif /* H_GNOME_SYSTEM_MONITOR_UTIL_1123178725 */
Binary file patches/gnome-themes-01-accessibility-icons.diff has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-themes-01-add-so8-a11y-icons.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,538 @@
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/Makefile.am 2006-11-08 16:58:41.888679000 +0000
+@@ -0,0 +1 @@
++SUBDIRS= apps mimetypes
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/Makefile.am 2006-11-08 16:58:41.897252000 +0000
+@@ -0,0 +1,28 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrast/16x16/apps/
++
++icon_DATA= \
++ staroffice-base.png \
++ staroffice-calc.png \
++ staroffice-draw.png \
++ staroffice-impress.png \
++ staroffice-main.png \
++ staroffice-math.png \
++ staroffice-printeradmin.png \
++ staroffice-writer.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++ done
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/symlinks.dat 2006-11-08 16:58:41.902107000 +0000
+@@ -0,0 +1,11 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-base.png: starsuite-base.png
++staroffice-calc.png: starsuite-calc.png
++staroffice-draw.png: starsuite-draw.png
++staroffice-impress.png: starsuite-impress.png
++staroffice-main.png: starsuite-main.png
++staroffice-math.png: starsuite-math.png
++staroffice-printeradmin.png: starsuite-printeradmin.png
++staroffice-writer.png: starsuite-writer.png
++
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/Makefile.am 2006-11-08 16:58:41.905127000 +0000
+@@ -0,0 +1,23 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrast/16x16/mimetypes/
++
++icon_DATA= \
++ staroffice-oasis-text.png \
++ staroffice-oasis-text-template.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++done
++
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/symlinks.dat 2006-11-08 16:58:41.907963000 +0000
+@@ -0,0 +1,9 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
++#
++staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
++#
++staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
++#
++staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/Makefile.am 2006-11-08 16:58:42.042781000 +0000
+@@ -0,0 +1 @@
++SUBDIRS= apps mimetypes
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/Makefile.am 2006-11-08 16:58:42.045910000 +0000
+@@ -0,0 +1,28 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrast/32x32/apps/
++
++icon_DATA= \
++ staroffice-base.png \
++ staroffice-calc.png \
++ staroffice-draw.png \
++ staroffice-impress.png \
++ staroffice-main.png \
++ staroffice-math.png \
++ staroffice-printeradmin.png \
++ staroffice-writer.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++ done
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/symlinks.dat 2006-11-08 16:58:42.048466000 +0000
+@@ -0,0 +1,11 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-base.png: starsuite-base.png
++staroffice-calc.png: starsuite-calc.png
++staroffice-draw.png: starsuite-draw.png
++staroffice-impress.png: starsuite-impress.png
++staroffice-main.png: starsuite-main.png
++staroffice-math.png: starsuite-math.png
++staroffice-printeradmin.png: starsuite-printeradmin.png
++staroffice-writer.png: starsuite-writer.png
++
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/Makefile.am 2006-11-08 16:58:42.051697000 +0000
+@@ -0,0 +1,23 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrast/32x32/mimetypes/
++
++icon_DATA= \
++ staroffice-oasis-text.png \
++ staroffice-oasis-text-template.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++done
++
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/symlinks.dat 2006-11-08 16:58:42.054546000 +0000
+@@ -0,0 +1,9 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
++#
++staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
++#
++staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
++#
++staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/Makefile.am 2006-11-08 16:02:49.173057000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/Makefile.am 2006-11-08 16:58:42.059029000 +0000
+@@ -3,3 +3,5 @@
+ indextheme_DATA = index.theme
+
+ EXTRA_DIST= $(indextheme_DATA)
++
++SUBDIRS= 16x16 32x32
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/Makefile.am 2006-11-08 16:58:42.063605000 +0000
+@@ -0,0 +1 @@
++SUBDIRS= apps mimetypes
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/Makefile.am 2006-11-08 16:58:42.066677000 +0000
+@@ -0,0 +1,28 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrastInverse/16x16/apps/
++
++icon_DATA= \
++ staroffice-base.png \
++ staroffice-calc.png \
++ staroffice-draw.png \
++ staroffice-impress.png \
++ staroffice-main.png \
++ staroffice-math.png \
++ staroffice-printeradmin.png \
++ staroffice-writer.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++ done
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/symlinks.dat 2006-11-08 16:58:42.352458000 +0000
+@@ -0,0 +1,11 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-base.png: starsuite-base.png
++staroffice-calc.png: starsuite-calc.png
++staroffice-draw.png: starsuite-draw.png
++staroffice-impress.png: starsuite-impress.png
++staroffice-main.png: starsuite-main.png
++staroffice-math.png: starsuite-math.png
++staroffice-printeradmin.png: starsuite-printeradmin.png
++staroffice-writer.png: starsuite-writer.png
++
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/Makefile.am 2006-11-08 16:58:42.355394000 +0000
+@@ -0,0 +1,23 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrastInverse/16x16/mimetypes/
++
++icon_DATA= \
++ staroffice-oasis-text.png \
++ staroffice-oasis-text-template.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++done
++
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat 2006-11-08 16:58:42.357664000 +0000
+@@ -0,0 +1,9 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
++#
++staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
++#
++staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
++#
++staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/Makefile.am 2006-11-08 16:58:42.360251000 +0000
+@@ -0,0 +1 @@
++SUBDIRS= apps mimetypes
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/Makefile.am 2006-11-08 16:58:42.363650000 +0000
+@@ -0,0 +1,28 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrastInverse/32x32/apps/
++
++icon_DATA= \
++ staroffice-base.png \
++ staroffice-calc.png \
++ staroffice-draw.png \
++ staroffice-impress.png \
++ staroffice-main.png \
++ staroffice-math.png \
++ staroffice-printeradmin.png \
++ staroffice-writer.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++ done
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/symlinks.dat 2006-11-08 16:58:42.365718000 +0000
+@@ -0,0 +1,11 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-base.png: starsuite-base.png
++staroffice-calc.png: starsuite-calc.png
++staroffice-draw.png: starsuite-draw.png
++staroffice-impress.png: starsuite-impress.png
++staroffice-main.png: starsuite-main.png
++staroffice-math.png: starsuite-math.png
++staroffice-printeradmin.png: starsuite-printeradmin.png
++staroffice-writer.png: starsuite-writer.png
++
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/Makefile.am 2006-11-08 16:58:42.368150000 +0000
+@@ -0,0 +1,23 @@
++NULL=
++
++icondir= $(datadir)/icons/HighContrastInverse/32x32/mimetypes/
++
++icon_DATA= \
++ staroffice-oasis-text.png \
++ staroffice-oasis-text-template.png \
++ $(NULL)
++
++EXTRA_DIST= $(icon_DATA) \
++ symlinks.dat
++
++install: install-am
++ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
++
++uninstall-symlinks:
++ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
++ if test -h $(DESTDIR)$(icondir)/$$p; then \
++ rm -f $(DESTDIR)$(icondir)/$$p; \
++ fi; \
++done
++
++uninstall-am: uninstall-iconDATA uninstall-symlinks
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat 2006-11-08 16:58:42.370451000 +0000
+@@ -0,0 +1,9 @@
++# NO BLANK LINES ALLOWED
++#
++staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
++#
++staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
++#
++staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
++#
++staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/Makefile.am 2006-11-08 16:02:49.184334000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/Makefile.am 2006-11-08 16:58:42.372679000 +0000
+@@ -3,3 +3,5 @@
+ indextheme_DATA = index.theme
+
+ EXTRA_DIST= $(indextheme_DATA)
++
++SUBDIRS= 16x16 32x32
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/Makefile.am 2006-11-08 16:05:57.544210000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/Makefile.am 2006-11-08 17:00:08.708197000 +0000
+@@ -77,6 +77,14 @@
+ panel-force-quit.png \
+ perfmeter.png \
+ star.png \
++ staroffice-base.png \
++ staroffice-calc.png \
++ staroffice-draw.png \
++ staroffice-impress.png \
++ staroffice-main.png \
++ staroffice-math.png \
++ staroffice-printeradmin.png \
++ staroffice-writer.png \
+ start-here.png \
+ window-capplet.png \
+ $(NULL)
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/symlinks.dat 2006-11-08 16:02:49.856150000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/symlinks.dat 2006-11-08 16:58:42.399465000 +0000
+@@ -33,4 +33,11 @@
+ evolution-1.4.png: evolution.png
+ #
+ # StarOffice
+-star.png: staroffice-writer.png staroffice-impress.png staroffice-calc.png
++staroffice-base.png: starsuite-base.png
++staroffice-calc.png: starsuite-calc.png
++staroffice-draw.png: starsuite-draw.png
++staroffice-impress.png: starsuite-impress.png
++staroffice-main.png: starsuite-main.png
++staroffice-math.png: starsuite-math.png
++staroffice-printeradmin.png: starsuite-printeradmin.png
++staroffice-writer.png: starsuite-writer.png
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:02:49.857794000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:58:42.402239000 +0000
+@@ -14,6 +14,8 @@
+ gnome-mime-application-x-executable.png \
+ gnome-mime-audio.png \
+ gnome-mime-video.png \
++ staroffice-oasis-text.png \
++ staroffice-oasis-text-template.png \
+ $(NULL)
+
+ EXTRA_DIST= $(icon_DATA) \
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:02:49.869865000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:58:42.405355000 +0000
+@@ -33,3 +33,12 @@
+ gnome-library.png: gnome-mime-application-x-sharedlib.png
+ #
+ gnome-mime-application-x-executable.png: gnome-mime-application-x-shellscript.png gnome-mime-text-x-csh.png gnome-mime-text-x-sh.png gnome-mime-text-x-zsh.png gnome-mime-text-x-python.png gnome-mime-application-x-python-bytecode.png gnome-mime-application-x-python.png
++#
++staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
++#
++staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
++#
++staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
++#
++staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png
++starsuite-oasis-web-template.png
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am 2006-11-08 16:06:43.187799000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am 2006-11-08 17:01:26.178690000 +0000
+@@ -77,6 +77,14 @@
+ panel-force-quit.png \
+ perfmeter.png \
+ star.png \
++ staroffice-base.png \
++ staroffice-calc.png \
++ staroffice-draw.png \
++ staroffice-impress.png \
++ staroffice-main.png \
++ staroffice-math.png \
++ staroffice-printeradmin.png \
++ staroffice-writer.png \
+ start-here.png \
+ window-capplet.png \
+ $(NULL)
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat 2006-11-08 16:02:50.664816000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat 2006-11-08 16:58:42.412578000 +0000
+@@ -33,4 +33,12 @@
+ evolution-1.4.png: evolution.png
+ #
+ # StarOffice
+-star.png: staroffice-writer.png staroffice-impress.png staroffice-calc.png
++staroffice-base.png: starsuite-base.png
++staroffice-calc.png: starsuite-calc.png
++staroffice-draw.png: starsuite-draw.png
++staroffice-impress.png: starsuite-impress.png
++staroffice-main.png: starsuite-main.png
++staroffice-math.png: starsuite-math.png
++staroffice-printeradmin.png: starsuite-printeradmin.png
++staroffice-writer.png: starsuite-writer.png
++
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:02:50.725288000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:58:42.414679000 +0000
+@@ -14,6 +14,8 @@
+ gnome-mime-application-x-executable.png \
+ gnome-mime-audio.png \
+ gnome-mime-video.png \
++ staroffice-oasis-text.png \
++ staroffice-oasis-text-template.png \
+ $(NULL)
+
+ EXTRA_DIST= $(icon_DATA) \
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat
+--- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:02:50.741276000 +0000
++++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:58:42.417769000 +0000
+@@ -33,3 +33,12 @@
+ gnome-library.png: gnome-mime-application-x-sharedlib.png
+ #
+ gnome-mime-application-x-executable.png: gnome-mime-application-x-shellscript.png gnome-mime-text-x-csh.png gnome-mime-text-x-sh.png gnome-mime-text-x-zsh.png gnome-mime-text-x-python.png gnome-mime-application-x-python-bytecode.png gnome-mime-application-x-python.png
++#
++staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
++#
++staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
++#
++staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
++#
++staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png
++starsuite-oasis-web-template.png
+diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/configure.in gnome-themes-2.16.1.1-patch-02/configure.in
+--- gnome-themes-2.16.1.1-patch-01/configure.in 2006-11-08 16:03:26.462014000 +0000
++++ gnome-themes-2.16.1.1-patch-02/configure.in 2006-11-08 16:58:42.422230000 +0000
+@@ -171,10 +171,22 @@
+ HighContrast/gtk-2.0/Makefile
+ HighContrast/gtk-2.0/gtkrc
+ HighContrast/icons/Makefile
++HighContrast/icons/16x16/Makefile
++HighContrast/icons/16x16/apps/Makefile
++HighContrast/icons/16x16/mimetypes/Makefile
++HighContrast/icons/32x32/Makefile
++HighContrast/icons/32x32/apps/Makefile
++HighContrast/icons/32x32/mimetypes/Makefile
+ HighContrastInverse/Makefile
++HighContrastInverse/icons/Makefile
++HighContrastInverse/icons/16x16/Makefile
++HighContrastInverse/icons/16x16/apps/Makefile
++HighContrastInverse/icons/16x16/mimetypes/Makefile
++HighContrastInverse/icons/32x32/Makefile
++HighContrastInverse/icons/32x32/apps/Makefile
++HighContrastInverse/icons/32x32/mimetypes/Makefile
+ HighContrastInverse/gtk-2.0/Makefile
+ HighContrastInverse/gtk-2.0/gtkrc
+-HighContrastInverse/icons/Makefile
+ LargePrint/Makefile
+ LargePrint/index.theme.in
+ LargePrint/gtk-2.0/Makefile
--- a/patches/gnome-themes-02-add-so8-a11y-icons.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,538 +0,0 @@
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/Makefile.am 2006-11-08 16:58:41.888679000 +0000
-@@ -0,0 +1 @@
-+SUBDIRS= apps mimetypes
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/Makefile.am 2006-11-08 16:58:41.897252000 +0000
-@@ -0,0 +1,28 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrast/16x16/apps/
-+
-+icon_DATA= \
-+ staroffice-base.png \
-+ staroffice-calc.png \
-+ staroffice-draw.png \
-+ staroffice-impress.png \
-+ staroffice-main.png \
-+ staroffice-math.png \
-+ staroffice-printeradmin.png \
-+ staroffice-writer.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+ done
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/apps/symlinks.dat 2006-11-08 16:58:41.902107000 +0000
-@@ -0,0 +1,11 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-base.png: starsuite-base.png
-+staroffice-calc.png: starsuite-calc.png
-+staroffice-draw.png: starsuite-draw.png
-+staroffice-impress.png: starsuite-impress.png
-+staroffice-main.png: starsuite-main.png
-+staroffice-math.png: starsuite-math.png
-+staroffice-printeradmin.png: starsuite-printeradmin.png
-+staroffice-writer.png: starsuite-writer.png
-+
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/Makefile.am 2006-11-08 16:58:41.905127000 +0000
-@@ -0,0 +1,23 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrast/16x16/mimetypes/
-+
-+icon_DATA= \
-+ staroffice-oasis-text.png \
-+ staroffice-oasis-text-template.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+done
-+
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/16x16/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/16x16/mimetypes/symlinks.dat 2006-11-08 16:58:41.907963000 +0000
-@@ -0,0 +1,9 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
-+#
-+staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/Makefile.am 2006-11-08 16:58:42.042781000 +0000
-@@ -0,0 +1 @@
-+SUBDIRS= apps mimetypes
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/Makefile.am 2006-11-08 16:58:42.045910000 +0000
-@@ -0,0 +1,28 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrast/32x32/apps/
-+
-+icon_DATA= \
-+ staroffice-base.png \
-+ staroffice-calc.png \
-+ staroffice-draw.png \
-+ staroffice-impress.png \
-+ staroffice-main.png \
-+ staroffice-math.png \
-+ staroffice-printeradmin.png \
-+ staroffice-writer.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+ done
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/apps/symlinks.dat 2006-11-08 16:58:42.048466000 +0000
-@@ -0,0 +1,11 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-base.png: starsuite-base.png
-+staroffice-calc.png: starsuite-calc.png
-+staroffice-draw.png: starsuite-draw.png
-+staroffice-impress.png: starsuite-impress.png
-+staroffice-main.png: starsuite-main.png
-+staroffice-math.png: starsuite-math.png
-+staroffice-printeradmin.png: starsuite-printeradmin.png
-+staroffice-writer.png: starsuite-writer.png
-+
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/Makefile.am 2006-11-08 16:58:42.051697000 +0000
-@@ -0,0 +1,23 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrast/32x32/mimetypes/
-+
-+icon_DATA= \
-+ staroffice-oasis-text.png \
-+ staroffice-oasis-text-template.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+done
-+
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/32x32/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/32x32/mimetypes/symlinks.dat 2006-11-08 16:58:42.054546000 +0000
-@@ -0,0 +1,9 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
-+#
-+staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrast/icons/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrast/icons/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrast/icons/Makefile.am 2006-11-08 16:02:49.173057000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrast/icons/Makefile.am 2006-11-08 16:58:42.059029000 +0000
-@@ -3,3 +3,5 @@
- indextheme_DATA = index.theme
-
- EXTRA_DIST= $(indextheme_DATA)
-+
-+SUBDIRS= 16x16 32x32
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/Makefile.am 2006-11-08 16:58:42.063605000 +0000
-@@ -0,0 +1 @@
-+SUBDIRS= apps mimetypes
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/Makefile.am 2006-11-08 16:58:42.066677000 +0000
-@@ -0,0 +1,28 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrastInverse/16x16/apps/
-+
-+icon_DATA= \
-+ staroffice-base.png \
-+ staroffice-calc.png \
-+ staroffice-draw.png \
-+ staroffice-impress.png \
-+ staroffice-main.png \
-+ staroffice-math.png \
-+ staroffice-printeradmin.png \
-+ staroffice-writer.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+ done
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/apps/symlinks.dat 2006-11-08 16:58:42.352458000 +0000
-@@ -0,0 +1,11 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-base.png: starsuite-base.png
-+staroffice-calc.png: starsuite-calc.png
-+staroffice-draw.png: starsuite-draw.png
-+staroffice-impress.png: starsuite-impress.png
-+staroffice-main.png: starsuite-main.png
-+staroffice-math.png: starsuite-math.png
-+staroffice-printeradmin.png: starsuite-printeradmin.png
-+staroffice-writer.png: starsuite-writer.png
-+
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/Makefile.am 2006-11-08 16:58:42.355394000 +0000
-@@ -0,0 +1,23 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrastInverse/16x16/mimetypes/
-+
-+icon_DATA= \
-+ staroffice-oasis-text.png \
-+ staroffice-oasis-text-template.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+done
-+
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/16x16/mimetypes/symlinks.dat 2006-11-08 16:58:42.357664000 +0000
-@@ -0,0 +1,9 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
-+#
-+staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/Makefile.am 2006-11-08 16:58:42.360251000 +0000
-@@ -0,0 +1 @@
-+SUBDIRS= apps mimetypes
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/Makefile.am 2006-11-08 16:58:42.363650000 +0000
-@@ -0,0 +1,28 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrastInverse/32x32/apps/
-+
-+icon_DATA= \
-+ staroffice-base.png \
-+ staroffice-calc.png \
-+ staroffice-draw.png \
-+ staroffice-impress.png \
-+ staroffice-main.png \
-+ staroffice-math.png \
-+ staroffice-printeradmin.png \
-+ staroffice-writer.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+ done
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/apps/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/apps/symlinks.dat 2006-11-08 16:58:42.365718000 +0000
-@@ -0,0 +1,11 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-base.png: starsuite-base.png
-+staroffice-calc.png: starsuite-calc.png
-+staroffice-draw.png: starsuite-draw.png
-+staroffice-impress.png: starsuite-impress.png
-+staroffice-main.png: starsuite-main.png
-+staroffice-math.png: starsuite-math.png
-+staroffice-printeradmin.png: starsuite-printeradmin.png
-+staroffice-writer.png: starsuite-writer.png
-+
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/Makefile.am 2006-11-08 16:58:42.368150000 +0000
-@@ -0,0 +1,23 @@
-+NULL=
-+
-+icondir= $(datadir)/icons/HighContrastInverse/32x32/mimetypes/
-+
-+icon_DATA= \
-+ staroffice-oasis-text.png \
-+ staroffice-oasis-text-template.png \
-+ $(NULL)
-+
-+EXTRA_DIST= $(icon_DATA) \
-+ symlinks.dat
-+
-+install: install-am
-+ $(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)
-+
-+uninstall-symlinks:
-+ list=`ls $(DESTDIR)$(icondir)`; for p in $$list; do \
-+ if test -h $(DESTDIR)$(icondir)/$$p; then \
-+ rm -f $(DESTDIR)$(icondir)/$$p; \
-+ fi; \
-+done
-+
-+uninstall-am: uninstall-iconDATA uninstall-symlinks
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/32x32/mimetypes/symlinks.dat 2006-11-08 16:58:42.370451000 +0000
-@@ -0,0 +1,9 @@
-+# NO BLANK LINES ALLOWED
-+#
-+staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
-+#
-+staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png starsuite-oasis-web-template.png
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastInverse/icons/Makefile.am 2006-11-08 16:02:49.184334000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastInverse/icons/Makefile.am 2006-11-08 16:58:42.372679000 +0000
-@@ -3,3 +3,5 @@
- indextheme_DATA = index.theme
-
- EXTRA_DIST= $(indextheme_DATA)
-+
-+SUBDIRS= 16x16 32x32
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/Makefile.am 2006-11-08 16:05:57.544210000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/Makefile.am 2006-11-08 17:00:08.708197000 +0000
-@@ -77,6 +77,14 @@
- panel-force-quit.png \
- perfmeter.png \
- star.png \
-+ staroffice-base.png \
-+ staroffice-calc.png \
-+ staroffice-draw.png \
-+ staroffice-impress.png \
-+ staroffice-main.png \
-+ staroffice-math.png \
-+ staroffice-printeradmin.png \
-+ staroffice-writer.png \
- start-here.png \
- window-capplet.png \
- $(NULL)
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/apps/symlinks.dat 2006-11-08 16:02:49.856150000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/apps/symlinks.dat 2006-11-08 16:58:42.399465000 +0000
-@@ -33,4 +33,11 @@
- evolution-1.4.png: evolution.png
- #
- # StarOffice
--star.png: staroffice-writer.png staroffice-impress.png staroffice-calc.png
-+staroffice-base.png: starsuite-base.png
-+staroffice-calc.png: starsuite-calc.png
-+staroffice-draw.png: starsuite-draw.png
-+staroffice-impress.png: starsuite-impress.png
-+staroffice-main.png: starsuite-main.png
-+staroffice-math.png: starsuite-math.png
-+staroffice-printeradmin.png: starsuite-printeradmin.png
-+staroffice-writer.png: starsuite-writer.png
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:02:49.857794000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:58:42.402239000 +0000
-@@ -14,6 +14,8 @@
- gnome-mime-application-x-executable.png \
- gnome-mime-audio.png \
- gnome-mime-video.png \
-+ staroffice-oasis-text.png \
-+ staroffice-oasis-text-template.png \
- $(NULL)
-
- EXTRA_DIST= $(icon_DATA) \
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:02:49.869865000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrint/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:58:42.405355000 +0000
-@@ -33,3 +33,12 @@
- gnome-library.png: gnome-mime-application-x-sharedlib.png
- #
- gnome-mime-application-x-executable.png: gnome-mime-application-x-shellscript.png gnome-mime-text-x-csh.png gnome-mime-text-x-sh.png gnome-mime-text-x-zsh.png gnome-mime-text-x-python.png gnome-mime-application-x-python-bytecode.png gnome-mime-application-x-python.png
-+#
-+staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
-+#
-+staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png
-+starsuite-oasis-web-template.png
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am 2006-11-08 16:06:43.187799000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/Makefile.am 2006-11-08 17:01:26.178690000 +0000
-@@ -77,6 +77,14 @@
- panel-force-quit.png \
- perfmeter.png \
- star.png \
-+ staroffice-base.png \
-+ staroffice-calc.png \
-+ staroffice-draw.png \
-+ staroffice-impress.png \
-+ staroffice-main.png \
-+ staroffice-math.png \
-+ staroffice-printeradmin.png \
-+ staroffice-writer.png \
- start-here.png \
- window-capplet.png \
- $(NULL)
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat 2006-11-08 16:02:50.664816000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/apps/symlinks.dat 2006-11-08 16:58:42.412578000 +0000
-@@ -33,4 +33,12 @@
- evolution-1.4.png: evolution.png
- #
- # StarOffice
--star.png: staroffice-writer.png staroffice-impress.png staroffice-calc.png
-+staroffice-base.png: starsuite-base.png
-+staroffice-calc.png: starsuite-calc.png
-+staroffice-draw.png: starsuite-draw.png
-+staroffice-impress.png: starsuite-impress.png
-+staroffice-main.png: starsuite-main.png
-+staroffice-math.png: starsuite-math.png
-+staroffice-printeradmin.png: starsuite-printeradmin.png
-+staroffice-writer.png: starsuite-writer.png
-+
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:02:50.725288000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/Makefile.am 2006-11-08 16:58:42.414679000 +0000
-@@ -14,6 +14,8 @@
- gnome-mime-application-x-executable.png \
- gnome-mime-audio.png \
- gnome-mime-video.png \
-+ staroffice-oasis-text.png \
-+ staroffice-oasis-text-template.png \
- $(NULL)
-
- EXTRA_DIST= $(icon_DATA) \
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat
---- gnome-themes-2.16.1.1-patch-01/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:02:50.741276000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/HighContrastLargePrintInverse/icons/48x48/mimetypes/symlinks.dat 2006-11-08 16:58:42.417769000 +0000
-@@ -33,3 +33,12 @@
- gnome-library.png: gnome-mime-application-x-sharedlib.png
- #
- gnome-mime-application-x-executable.png: gnome-mime-application-x-shellscript.png gnome-mime-text-x-csh.png gnome-mime-text-x-sh.png gnome-mime-text-x-zsh.png gnome-mime-text-x-python.png gnome-mime-application-x-python-bytecode.png gnome-mime-application-x-python.png
-+#
-+staroffice-oasis-text.png: staroffice-database.png staroffice-drawing.png staroffice-formula.png staroffice-master-document.png staroffice-presentation.png staroffice-spreadsheet.png staroffice-text.png staroffice-oasis-database.png staroffice-oasis-drawing.png staroffice-oasis-formula.png staroffice-oasis-master-document.png staroffice-oasis-presentation.png staroffice-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text.png: starsuite-database.png starsuite-drawing.png starsuite-formula.png starsuite-master-document.png starsuite-presentation.png starsuite-spreadsheet.png starsuite-text.png starsuite-oasis-text.png starsuite-oasis-database.png starsuite-oasis-drawing.png starsuite-oasis-formula.png starsuite-oasis-master-document.png starsuite-oasis-presentation.png starsuite-oasis-spreadsheet.png
-+#
-+staroffice-oasis-text-template.png: staroffice-drawing-template.png staroffice-presentation-template.png staroffice-spreadsheet-template.png staroffice-text-template.png staroffice-oasis-drawing-template.png staroffice-oasis-presentation-template.png staroffice-oasis-spreadsheet-template.png staroffice-oasis-web-template.png
-+#
-+staroffice-oasis-text-template.png: starsuite-drawing-template.png starsuite-presentation-template.png starsuite-spreadsheet-template.png starsuite-text-template.png starsuite-oasis-text-template.png starsuite-oasis-drawing-template.png starsuite-oasis-presentation-template.png starsuite-oasis-spreadsheet-template.png
-+starsuite-oasis-web-template.png
-diff -urN --ignore-space-change -Xdiff-excludes.txt gnome-themes-2.16.1.1-patch-01/configure.in gnome-themes-2.16.1.1-patch-02/configure.in
---- gnome-themes-2.16.1.1-patch-01/configure.in 2006-11-08 16:03:26.462014000 +0000
-+++ gnome-themes-2.16.1.1-patch-02/configure.in 2006-11-08 16:58:42.422230000 +0000
-@@ -171,10 +171,22 @@
- HighContrast/gtk-2.0/Makefile
- HighContrast/gtk-2.0/gtkrc
- HighContrast/icons/Makefile
-+HighContrast/icons/16x16/Makefile
-+HighContrast/icons/16x16/apps/Makefile
-+HighContrast/icons/16x16/mimetypes/Makefile
-+HighContrast/icons/32x32/Makefile
-+HighContrast/icons/32x32/apps/Makefile
-+HighContrast/icons/32x32/mimetypes/Makefile
- HighContrastInverse/Makefile
-+HighContrastInverse/icons/Makefile
-+HighContrastInverse/icons/16x16/Makefile
-+HighContrastInverse/icons/16x16/apps/Makefile
-+HighContrastInverse/icons/16x16/mimetypes/Makefile
-+HighContrastInverse/icons/32x32/Makefile
-+HighContrastInverse/icons/32x32/apps/Makefile
-+HighContrastInverse/icons/32x32/mimetypes/Makefile
- HighContrastInverse/gtk-2.0/Makefile
- HighContrastInverse/gtk-2.0/gtkrc
--HighContrastInverse/icons/Makefile
- LargePrint/Makefile
- LargePrint/index.theme.in
- LargePrint/gtk-2.0/Makefile
--- a/patches/gnome-themes-03-icon-name-mapping.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-themes-2.15.4/configure.in.orig 2006-07-21 18:21:30.138830000 +0100
-+++ gnome-themes-2.15.4/configure.in 2006-07-21 18:21:53.238660000 +0100
-@@ -43,7 +43,7 @@
-
- if test "x$have_utils" = "xyes"; then
- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
-- ICONMAP="$UTILS_PATH/icon-name-mapping"
-+ ICONMAP="icon-name-mapping"
- AC_SUBST(ICONMAP)
- AC_MSG_RESULT([yes])
- else
--- a/patches/gnome-utils-04-logview-plugin.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gnome-utils-04-logview-plugin.diff Fri Nov 24 16:56:15 2006 +0000
@@ -9290,40 +9290,6 @@
+ </chapter>
+
+</book>
-Index: gnome-utils/logview/help/ChangeLog
-===================================================================
-RCS file: /cvs/gnome/gnome-utils/logview/help/ChangeLog,v
-retrieving revision 1.7.2.1
-retrieving revision 1.7
-diff -u -p -r1.7.2.1 -r1.7
---- gnome-utils/logview/help/ChangeLog 14 Sep 2006 21:02:54 -0000 1.7.2.1
-+++ gnome-utils/logview/help/ChangeLog 18 Aug 2006 09:37:47 -0000 1.7
-@@ -1,11 +1,3 @@
--2006-09-14 Alessio Frusciante <[email protected]>
--
-- * it/it.po: Added Italian translation by
-- Andrea Zagli <[email protected]>.
-- * it/*.xml: Removed obsolete files.
-- * it/Makefile.am: Removed obsolete file.
-- * Makefile.am: added "it" (Italian) to DOC_LINGUAS.
--
- 2006-08-17 Christophe Bliard <[email protected]>
-
- * fr/fr.po: Added French translation.
-Index: gnome-utils/logview/help/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-utils/logview/help/Makefile.am,v
-retrieving revision 1.10.2.1
-retrieving revision 1.10
-diff -u -p -r1.10.2.1 -r1.10
---- gnome-utils/logview/help/Makefile.am 14 Sep 2006 21:02:54 -0000 1.10.2.1
-+++ gnome-utils/logview/help/Makefile.am 18 Aug 2006 09:37:47 -0000 1.10
-@@ -5,4 +5,4 @@ DOC_MODULE = gnome-system-log
- DOC_ENTITIES = legal.xml
- DOC_INCLUDES =
-
--DOC_LINGUAS = es fr it sv uk
-+DOC_LINGUAS = es fr sv uk
Index: gnome-utils/logview/help/it/Makefile.am
===================================================================
RCS file: gnome-utils/logview/help/it/Makefile.am
@@ -9382,361 +9348,6 @@
+ </resource>
+</omf>
\ No newline at end of file
-Index: gnome-utils/logview/help/it/it.po
-===================================================================
-RCS file: gnome-utils/logview/help/it/it.po
-diff -N gnome-utils/logview/help/it/it.po
---- gnome-utils/logview/help/it/it.po 14 Sep 2006 21:02:55 -0000 1.1.2.1
-+++ /dev/null 1 Jan 1970 00:00:00 -0000
-@@ -1,348 +0,0 @@
--# Italian translation of logview documentation.
--# Andrea Zagli <[email protected]>, 2006.
--#
--#
--msgid ""
--msgstr ""
--"Project-Id-Version: gnome-utils-logview-help-it 2.12\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-04-07 17:09+0200\n"
--"PO-Revision-Date: 2006-04-22 12:20+0200\n"
--"Last-Translator: Andrea Zagli <[email protected]>\n"
--"Language-Team: Italian <[email protected]>\n"
--"MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=UTF-8\n"
--"Content-Transfer-Encoding: 8bit"
--
--#. When image changes, this message will be marked fuzzy or untranslated for you.
--#. It doesn't matter what you translate it to: it's not used at all.
--#: ../C/gnome-system-log.xml:233(None)
--msgid "@@image: 'figures/syslog_window.png'; md5=82f6788bd75b851d229ddd8e24465b8f"
--msgstr "@@image: 'figures/syslog_window.png'; md5=c20ece0fe546e7756c7da93728b2d12f"
--
--#: ../C/gnome-system-log.xml:23(title)
--msgid "System Log Viewer Manual"
--msgstr "Manuale di System Log Viewer"
--
--#: ../C/gnome-system-log.xml:26(para)
--msgid "System Log Viewer is a graphical, menu-driven viewer that you can use to view and monitor your system log files."
--msgstr "System Log Viewer è un visualizzatore grafico che si può utilizzare per visualizzare e monitorare i proprio file di registri di sistema."
--
--#: ../C/gnome-system-log.xml:31(year)
--msgid "2003"
--msgstr "2003"
--
--#: ../C/gnome-system-log.xml:32(holder) ../C/gnome-system-log.xml:57(orgname)
--msgid "Sun Microsystems"
--msgstr "Sun Microsystems"
--
--#: ../C/gnome-system-log.xml:35(year) ../C/gnome-system-log.xml:146(date)
--msgid "2000"
--msgstr "2000"
--
--#: ../C/gnome-system-log.xml:36(holder)
--msgid "Judith Samson"
--msgstr "Judith Samson"
--
--#: ../C/gnome-system-log.xml:47(publishername) ../C/gnome-system-log.xml:66(orgname) ../C/gnome-system-log.xml:101(para) ../C/gnome-system-log.xml:111(para) ../C/gnome-system-log.xml:121(para) ../C/gnome-system-log.xml:131(para) ../C/gnome-system-log.xml:141(para) ../C/gnome-system-log.xml:151(para)
--msgid "GNOME Documentation Project"
--msgstr "Progetto di documentazione di GNOME"
--
--#: ../C/gnome-system-log.xml:2(para)
--msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
--msgstr "Questo documento può essere copiato, distribuito e/o modificato solo in conformità con i termini della GNU Free Documentation License (GFDL) Versione 1.1 o delle versioni successive pubblicate dalla Free Software Foundation senza sezioni invariabili, frontespizi e testi di copertina. Una copia della GFDL è disponibile su questo <ulink type=\"help\" url=\"ghelp:fdl\">collegamento</ulink> o nel file COPYING-DOCS distribuito con questo manuale."
--
--#: ../C/gnome-system-log.xml:12(para)
--msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
--msgstr "Questo manuale fa parte di una raccolta di manuali GNOME distribuita in conformità con la GFDL. Per poter distribuire questo manuale separatamente, è necessario inserirvi una copia della licenza, come descritto nella sezione 6 della licenza."
--
--#: ../C/gnome-system-log.xml:19(para)
--msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
--msgstr "Molti dei nomi usati dalle aziende per distinguere i propri prodotti e servizi sono rivendicati come marchi. Quando questi nomi compaiono nella documentazione di GNOME, e i partecipanti al GNOME Documentation Project sono consapevoli del loro utilizzo, essi vengono scritti in lettere maiuscole o con l'iniziale maiuscola."
--
--#: ../C/gnome-system-log.xml:35(para)
--msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
--msgstr "IL DOCUMENTO VIENE FORNITO SENZA GARANZIE DI ALCUN TIPO, ESPLICITE O IMPLICITE, INCLUSE, MA SENZA LIMITAZIONE, LE GARANZIE ATTESTANTI CHE IL DOCUMENTO O LE SUE VERSIONI MODIFICATE SIANO PRIVI DI DIFETTI, COMMERCIALIZZABILI, IDONEI A UN DETERMINATO SCOPO O CHE NON VIOLINO DIRITTI DI TERZI. SI DECLINA QUALUNQUE RESPONSABILITÀ RIGUARDO AI RISCHI INERENTI LA QUALITÀ, L'ACCURATEZZA E LE PRESTAZIONI DEL DOCUMENTO O DI UNA SUA VERSIONE MODIFICATA. QUALORA UN DOCUMENTO O UNA SUA VERSIONE MODIFICATA DOVESSERO PRESENTARE QUALUNQUE TIPO DI DIFETTO, IL COSTO DI EVENTUALI INTERVENTI DI ASSISTENZA, RIPARAZIONE O CORREZIONE SARÀ A CARICO DELL'UTENTE (NON DEL REDATTORE INIZIALE, DELL'AUTORE O DI ALTRI COLLABORATORI). QUESTA LIMITAZIONE DELLA GARANZIA COSTITUISCE PARTE ESSENZIALE DELLA LICENZA. L'USO DEL DOCUMENTO O DELLE SUE VERSIONI MODIFICATE È CONSENTITO SOLO ENTRO I TERMINI DI QUESTA LIMITAZIONE DELLA GARANZIA; E"
--
--#: ../C/gnome-system-log.xml:55(para)
--msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
--msgstr "IN·NESSUNA·CIRCOSTANZA·E·PER·NESSUNA·RAGIONE·LEGALE,·INCLUSI·I·PRINCIPI·DI·COLPA·(INCLUSA·LA·NEGLIGENZA),·ACCORDO·CONTRATTUALE·O·ALTRO,·SARÀ·POSSIBILE·CONSIDERARE·L'AUTORE,·IL·REDATTORE·INIZIALE,·GLI·ALTRI·COLLABORATORI,·QUALUNQUE·DISTRIBUTORE·DEL·DOCUMENTO·O·DI·UNA·SUA·VERSIONE·MODIFICATA·O·QUALUNQUE·FORNITORE·DELLE·PERSONE·CITATE,·RESPONSABILE·NEI·CONFRONTI·DI·QUALUNQUE·PERSONA·PER·DANNI·DIRETTI,·INDIRETTI,·SPECIALI,·INCIDENTALI·O·CONSEGUENTI·DI·QUALUNQUE·NATURA,·INCLUSI,·MA·SENZA·LIMITAZIONE,·I·DANNI·PER·PERDITA·DI·AVVIAMENTO,·INTERRUZIONE·DEL·LAVORO,·GUASTO·O·MALFUNZIONAMENTO·DEL·COMPUTER·O·QUALUNQUE·ALTRO·DANNO·O·PERDITA·DERIVANTE·O·CORRELATA·ALL'USO·DEL·DOCUMENTO·O·DI·UNA·SUA·VERSIONE·MODIFICATA,·ANCHE·QUALORA·LE·PERSONE·CITATE·FOSSERO·STATE·INFORMATE·DELLA·POSSIBILITÀ·DI·TALI·DANNI."
--
--#: ../C/gnome-system-log.xml:28(para)
--msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
--msgstr "QUESTO DOCUMENTO E LE SUE VERSIONI MODIFICATE VENGONO FORNITI IN BASE AI TERMINI DELLA GNU FREE DOCUMENTATION LICENSE, CON L'INTESA CHE:<placeholder-1/>"
--
--#: ../C/gnome-system-log.xml:54(firstname)
--msgid "Sun"
--msgstr "Sun"
--
--#: ../C/gnome-system-log.xml:55(surname)
--msgid "GNOME Documentation Team"
--msgstr "Team per la documentazione di GNOME"
--
--#: ../C/gnome-system-log.xml:58(email)
--msgid "[email protected]"
--msgstr "[email protected]"
--
--#: ../C/gnome-system-log.xml:63(firstname)
--msgid "Judith"
--msgstr "Judith"
--
--#: ../C/gnome-system-log.xml:64(surname)
--msgid "Samson"
--msgstr "Samson"
--
--#: ../C/gnome-system-log.xml:67(email)
--msgid "[email protected]"
--msgstr "[email protected]"
--
--#: ../C/gnome-system-log.xml:72(firstname)
--msgid "Vincent"
--msgstr "Vincent"
--
--#: ../C/gnome-system-log.xml:73(surname)
--msgid "Noel"
--msgstr "Noel"
--
--#: ../C/gnome-system-log.xml:75(email)
--msgid "[email protected]"
--msgstr "[email protected]"
--
--#: ../C/gnome-system-log.xml:95(revnumber)
--msgid "System Log Viewer Manual V2.4"
--msgstr "Manuale di System Log Viewer V2.4"
--
--#: ../C/gnome-system-log.xml:96(date)
--msgid "October 2005"
--msgstr "Ottobre 2005"
--
--#: ../C/gnome-system-log.xml:98(para)
--msgid "Vincent Noel <email>[email protected]</email>"
--msgstr "Vincent Noel <email>[email protected]</email>"
--
--#: ../C/gnome-system-log.xml:105(revnumber)
--msgid "System Log Viewer Manual V2.3"
--msgstr "Manuale di System Log Viewer V2.3"
--
--#: ../C/gnome-system-log.xml:106(date)
--msgid "October 2002"
--msgstr "Ottobre 2002"
--
--#: ../C/gnome-system-log.xml:108(para) ../C/gnome-system-log.xml:118(para) ../C/gnome-system-log.xml:128(para) ../C/gnome-system-log.xml:138(para)
--msgid "Sun GNOME Documentation Team <email>[email protected]</email>"
--msgstr "Team Sun per la documentazione di GNOME <email>[email protected]</email>"
--
--#: ../C/gnome-system-log.xml:115(revnumber)
--msgid "System Log Viewer Manual V2.2"
--msgstr "Manuale di System Log Viewer V2.2"
--
--#: ../C/gnome-system-log.xml:116(date)
--msgid "August 2002"
--msgstr "Agosto 2002"
--
--#: ../C/gnome-system-log.xml:125(revnumber)
--msgid "System Log Viewer Manual V2.1"
--msgstr "Manuale di System Log Viewer V2.1"
--
--#: ../C/gnome-system-log.xml:126(date)
--msgid "July 2002"
--msgstr "Luglio 2002"
--
--#: ../C/gnome-system-log.xml:135(revnumber)
--msgid "System Log Viewer Manual V2.0"
--msgstr "Manuale di System Log Viewer V2.0"
--
--#: ../C/gnome-system-log.xml:136(date)
--msgid "May 2002"
--msgstr "Maggio 2002"
--
--#: ../C/gnome-system-log.xml:145(revnumber)
--msgid "Logview Manual"
--msgstr "Manuale di Logview"
--
--#: ../C/gnome-system-log.xml:148(para)
--msgid "Judith Samson <email>[email protected]</email>"
--msgstr "Judith Samson <email>[email protected]</email>"
--
--#: ../C/gnome-system-log.xml:156(releaseinfo)
--msgid "This manual describes version 2.12 of System Log Viewer."
--msgstr "Questo manuale descrive la versione 2.12 di System Log Viewer."
--
--#: ../C/gnome-system-log.xml:159(title)
--msgid "Feedback"
--msgstr "Riscontri"
--
--#: ../C/gnome-system-log.xml:160(para)
--msgid "To report a bug or make a suggestion regarding the System Log Viewer application or this manual, follow the directions in the <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>."
--msgstr "Per segnalare un errore o inviare un suggerimento riguardo l'applicazione <application>System Log Viewer</application> o questo manuale, seguire le indicazioni nella <ulink url=\"ghelp:gnome-feedback\" type=\"help\">Pagina dei riscontri GNOME</ulink>."
--
--#: ../C/gnome-system-log.xml:170(primary)
--msgid "System Log Viewer"
--msgstr "System Log Viewer"
--
--#: ../C/gnome-system-log.xml:177(title)
--msgid "Introduction"
--msgstr "Introduzione"
--
--#: ../C/gnome-system-log.xml:179(para)
--msgid "<application>System Log Viewer</application> is a graphical, menu-driven viewer that you can use to view and monitor your system logs. <application>System Log Viewer</application> comes with a few functions that can help you manage your logs, including a calendar, log monitor and log statistics display."
--msgstr "<application>System Log Viewer</application> è un visualizzatore grafico che si può utilizzare per visualizzare e monitorare i registri di sistema. <application>System Log Viewer</application> è provvisto di alcune funzioni che possono aiutare a gestire i registri, incluso un calendario, il monitoraggio dei registri e la visualizzazione delle statistiche."
--
--#: ../C/gnome-system-log.xml:187(para)
--msgid "<application>System Log Viewer</application> is useful if you are new to system administration because it provides an easier, more user-friendly display of your logs than a text display of the log file. It is also useful for more experienced administrators, as it contains a calendar to help you locate trends and track problems, as well as a monitor to enable you to continuously monitor crucial logs."
--msgstr "<application>System Log Viewer</application> è utile se si è nuovi all'amministrazione di sistema perché fornisce una semplice e più amichevole visualizzazione dei registri rispetto a una visualizzazione testuale dei file di registro. È utile anche per amministratori con più esperienza, contenendo un calendario che aiuta a localizzare problemi di andamento, cosi' come per monitorare continuamente registri cruciali."
--
--#: ../C/gnome-system-log.xml:197(para)
--msgid "<application>System Log Viewer</application> is useful only to those who have access to the system log files, which generally requires root access."
--msgstr "<application>System Log Viewer</application> è utile solamente a chi ha accesso ai file dei registri di sistema, che in genere richiedono un accesso come root."
--
--#: ../C/gnome-system-log.xml:204(title)
--msgid "Getting Started"
--msgstr "Per iniziare"
--
--#: ../C/gnome-system-log.xml:206(para)
--msgid "You can start <application>System Log Viewer</application> in the following ways:"
--msgstr "Si può avviare <application>System Log Viewer</application> nei modi seguenti:"
--
--#: ../C/gnome-system-log.xml:210(term)
--msgid "<guimenu>Applications</guimenu> menu"
--msgstr "Menù <guimenu>Applicazioni</guimenu>"
--
--#: ../C/gnome-system-log.xml:212(para)
--msgid "Choose <menuchoice><guisubmenu>System Tools</guisubmenu><guimenuitem>System Log</guimenuitem></menuchoice>."
--msgstr "Scegliere <menuchoice><guisubmenu>Strumenti di sistema</guisubmenu><guimenuitem>Log di sistema</guimenuitem></menuchoice>."
--
--#: ../C/gnome-system-log.xml:216(term)
--msgid "Command line"
--msgstr "Linea di comando"
--
--#: ../C/gnome-system-log.xml:218(para)
--msgid "Type <command>gnome-system-log</command>, then press <keycap>Return</keycap>."
--msgstr "Digitare <command>gnome-system-log<command> e poi premere <keycap>Invio</keycap>-"
--
--#: ../C/gnome-system-log.xml:225(para)
--msgid "When you start <application>System Log Viewer</application>, the following window is displayed."
--msgstr "Quando si avvia <application>System Log Viewer</application>, viene visualizzata la seguente finestra."
--
--#: ../C/gnome-system-log.xml:229(title)
--msgid "System Log Viewer Window"
--msgstr "Finestra di System Log Viewer"
--
--#: ../C/gnome-system-log.xml:236(phrase)
--msgid "Shows System Log Viewer main window. Contains menubar, display area, scrollbars, and statusbar."
--msgstr "Finestra principale di System Log Viewer. Contiene barra del menù, area di visualizzazione, barre di scorrimento e barra di stato."
--
--#. ==== End of Figure ====
--#: ../C/gnome-system-log.xml:242(para)
--msgid "The first time you start <application>System Log Viewer</application>, the application displays several log files by default (such as <filename>/var/log/messages</filename>). Opened logs are listed on the left side of the application window. The log selected in this list is displayed in the main area of the application window."
--msgstr "La prima volta che si avvia <application>System Log Viewer</application>, l'applicazione visualizza, in modo predefinito, svariati file di registro (come <filename>/var/log/messages</filename>). I registri aperti sono elencati nella parte sinistra della finestra dell'applicazione. Il registro selezionato in questa lista è visualizzato nell'area principale della finestra dell'applicazione."
--
--#: ../C/gnome-system-log.xml:250(para)
--msgid "By default, <application>System Log Viewer</application> monitors every opened log, and any change appears automatically in the main window. See <xref linkend=\"syslog-monitor\"/> for more information."
--msgstr "In modo predefinito, <application>System Log Viewer</application> monitora ogni registro aperto, e ogni cambiamento appare automaticamente nella finestra principale. Vedere <xref·linkend=\"syslog-monitor\"/> per maggiori informazioni."
--
--#: ../C/gnome-system-log.xml:259(title)
--msgid "Usage"
--msgstr "Utilizzo"
--
--#: ../C/gnome-system-log.xml:262(title)
--msgid "To View a Log"
--msgstr "Visualizzare un registro"
--
--#: ../C/gnome-system-log.xml:263(para)
--msgid "To view a log, choose <menuchoice><guimenu>Log</guimenu><guimenuitem>Open</guimenuitem></menuchoice>. In the <guilabel>Open Log</guilabel> dialog, select the log that you want to open, then click <guibutton>Open</guibutton>. Use the scrollbars to scroll through the log."
--msgstr "Per visualizzare un registro, scegliere <menuchoice><guimenu>Log</guimenu><guimenuitem>Apri</guimenuitem></menuchoice>. Nel dialogo <guilabel>Apre un nuovo file di log</guilabel>, selezionare il registro che si vuole aprire e poi fare clic su <guibutton>Apri</guibutton>. Utilizzare le barre di scorrimento per scorrere attraverso il registro."
--
--#: ../C/gnome-system-log.xml:269(para)
--msgid "You can open as many logs as you want. <application>System Log Viewer</application> displays one log at a time in the <guilabel>System Log Viewer</guilabel> window. Opened logs are listed on the left side of the application window. The log selected in this list is displayed in the main area of the application window. To display another log already opened in <application>System Log Viewer</application>, select it in the log list."
--msgstr "Si possono aprire quanti registri si vogliono. <application>System Log Viewer</application> visualizza un registro alla volta nella finestra di <guilabel>System Log Viewer</guilabel>. I registri aperti sono elencati sul lato sinistro della finestra dell'applicazione. Il registro selezionato è visualizzato nell'area principale della finestra dell'applicazione. Per visualizzare un altro registro già aperto nel <application>System Log Viewer</application>, selezionarlo nella lista dei registri."
--
--#: ../C/gnome-system-log.xml:277(para)
--msgid "Note that <application>System Log Viewer</application> also lets you open zipped logs (whole filenames end in \".gz\")."
--msgstr "Si noti che <application>System Log Viewer</application> permette anche di aprire registri compressi (tutti i nomi di file che terminano in \".gz\")."
--
--#: ../C/gnome-system-log.xml:282(title)
--msgid "To Copy Log Lines to the Clipboard"
--msgstr "Copiare righe del registro negli appunti"
--
--#: ../C/gnome-system-log.xml:283(para)
--msgid "To copy one or more log lines to the clipboard, just select the lines in the main area and choose the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice> menu option. If you want to copy the entire log to the clipboard, select it entirely using the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice> menu option, then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice>."
--msgstr "Per copiare una o più righe del registro negli appunti, basta selezionare le righe nell'area principale e scegliere l'opzione di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Copia</guimenuitem></menuchoice>. Se si vuole copiare l'intero registro negli appunti, selezionarlo completamente utilizzando l'opzione di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Seleziona tutto</guimenuitem></menuchoice>, e poi scegliere <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Copia</guimenuitem></menuchoice>."
--
--#: ../C/gnome-system-log.xml:295(title)
--msgid "To Hide the Sidebar"
--msgstr "Nascondere il riquadro laterale"
--
--#: ../C/gnome-system-log.xml:296(para)
--msgid "To hide the left sidebar, which contains the log list and calendar, just select the <menuchoice><guimenu>View</guimenu><guimenuitem>Sidebar</guimenuitem></menuchoice> menu option."
--msgstr "Per nascondere il riquadro laterale a sinistra, che contiene la lista dei registri e il calendario, basta selezionare l'opzione di menù <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Riquadro laterale</guimenuitem></menuchoice>."
--
--#: ../C/gnome-system-log.xml:303(title)
--msgid "To Monitor Logs"
--msgstr "Monitorare i registri"
--
--#: ../C/gnome-system-log.xml:304(para)
--msgid "You can use <application>System Log Viewer</application> to monitor logs. By default, all logs opened in <application>System Log Viewer</application> are monitored for changes. If new lines are added to a log monitored by <application>System Log Viewer</application>, the log name will appear in bold in the log list. If the log is currently displayed in the main area, the new lines will appear automatically at the end of the log and, after five seconds, the log name will turn back to normal in the list."
--msgstr "Si può utilizzare <application>System Log Viewer</application> per monitorare i registri. In modo predefinito, tutti i registri aperti in <application>System Log Viewer</application> sono monitorati per i cambiamenti. Se nuove righe vengono aggiunte a un registro monitorato da <application>System Log Viewer</application>, il nome del registro apparirà in grassetto nella lista dei registri. Se il registro è correntemente visualizzato nell'area principale, le nuove righe appariranno automaticamente alla fine del registro e, dopo cinque secondi, il nome del registro nella lista ritornerà normale."
--
--#: ../C/gnome-system-log.xml:312(para)
--msgid "To stop monitoring a specific log, uncheck the <menuchoice><guimenu>Log</guimenu><guimenuitem>Monitor</guimenuitem></menuchoice> option. Check this option again to turn monitoring back on."
--msgstr "Per fermare il monitoraggio di un registro specifico, deselezionare l'opzione <menuchoice><guimenu>Log</guimenu><guimenuitem>Monitoraggio</guimenuitem></menuchoice>. Selezionare ancora questa opzione per riattivare il monitoraggio."
--
--#: ../C/gnome-system-log.xml:319(title)
--msgid "To Use the Calendar"
--msgstr "Usare il calendario"
--
--#: ../C/gnome-system-log.xml:320(para)
--msgid "By default, a calendar is displayed in the left side of the <application>System Log Viewer</application> window, under the log list. In this calendar, the dates present in the currently select log are displayed in bold. To jump to a particular date, select it in the calendar."
--msgstr "In modo predefinito, un calendario è visualizzato nel lato sinistro della finestra di <application>System Log Viewer</application>, sotto la lista dei registri. In questo calendario, le date presenti nel registro correntemente selezionato sono visualizzate in grassetto. Per saltare a una data particolare, selezionarla nel calendario."
--
--#: ../C/gnome-system-log.xml:325(para)
--msgid "To hide the calendar, uncheck the <menuchoice><guimenu>View</guimenu><guimenuitem>Calendar</guimenuitem></menuchoice> menu option."
--msgstr "Per nascondere il calendario, deselezionare l'opzione di menù <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Calendario</guimenuitem></menuchoice>."
--
--#: ../C/gnome-system-log.xml:331(title)
--msgid "To View Log Information"
--msgstr "Visualizzare le informazioni sul registro"
--
--#: ../C/gnome-system-log.xml:332(para)
--msgid "Log information are generally displayed in the status bar, including :"
--msgstr "Le informazioni del registro sono generalmente visualizzate nella barra di stato e includono:"
--
--#: ../C/gnome-system-log.xml:335(para)
--msgid "Number of lines in the log."
--msgstr "Numero di righe nel registro."
--
--#: ../C/gnome-system-log.xml:337(para)
--msgid "Size of the log in bytes."
--msgstr "Dimensione del registro in byte."
--
--#: ../C/gnome-system-log.xml:339(para)
--msgid "Date the log was last modified."
--msgstr "La data in cui il registro è stato modificato."
--
--#: ../C/gnome-system-log.xml:342(para)
--msgid "The status bar can be displayed or hidden using the <menuchoice><guimenu>View</guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice> option."
--msgstr "La barra di stato può essere visualizzata o nascosta usando l'opzione <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Barra di stato</guimenuitem></menuchoice>."
--
--#: ../C/gnome-system-log.xml:348(title)
--msgid "To Close a Log"
--msgstr "Chiudere un registro"
--
--#: ../C/gnome-system-log.xml:349(para)
--msgid "To close a log, choose <menuchoice><guimenu>Log</guimenu><guimenuitem>Close</guimenuitem></menuchoice>."
--msgstr "Per chiudere un registro, scegliere <menuchoice><guimenu>Log</guimenu><guimenuitem>Chiudi</guimenuitem></menuchoice>."
--
--#: ../C/gnome-system-log.xml:355(title)
--msgid "To Exit System Log Viewer"
--msgstr "Uscire da System Log Viewer"
--
--#: ../C/gnome-system-log.xml:356(para)
--msgid "To exit <application>System Log Viewer</application>, choose <menuchoice><guimenu>Log</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>."
--msgstr "Per uscire da <application>System Log Viewer</application>, scegliere <menuchoice><guimenu>Log</guimenu><guimenuitem>Esci</guimenuitem></menuchoice>."
--
--#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
--#: ../C/gnome-system-log.xml:0(None)
--msgid "translator-credits"
--msgstr "Andrea Zagli <[email protected]>, 2006"
--
Index: gnome-utils/logview/help/it/legal.xml
===================================================================
RCS file: gnome-utils/logview/help/it/legal.xml
@@ -11710,12 +11321,12 @@
--- gnome-utils/configure.in 2 Oct 2006 21:11:41 -0000 1.442.2.3
+++ gnome-utils/configure.in 13 Nov 2006 08:24:19 -0000
@@ -1,4 +1,4 @@
--AC_INIT([gnome-utils], [2.16.2],
+-AC_INIT([gnome-utils], [2.17.0],
+AC_INIT([gnome-utils], [2.17.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-utils])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE
-@@ -70,6 +70,7 @@ LIBGNOMEPRINT_REQUIRED=2.8.0
+@@ -70,6 +70,7 @@
LIBGNOMEPRINTUI_REQUIRED=2.8.0
LIBGTOP_REQUIRED=2.12.0
GNOMECANVAS_REQUIRED=2.10.2
@@ -11723,16 +11334,7 @@
dnl *****************************************
dnl libgnome, libgnomeui needed for all utils
-@@ -109,7 +110,7 @@ AC_SUBST(LIBGDICT_LIBS)
- # no API breakage past the API freeze.
- m4_define([gdict_major_version], [0])
- m4_define([gdict_minor_version], [10])
--m4_define([gdict_micro_version], [6])
-+m4_define([gdict_micro_version], [5])
- m4_define([gdict_version],
- [gdict_major_version().gdict_minor_version().gdict_micro_version()])
-
-@@ -415,6 +416,9 @@ AC_SUBST(GREP_COMMAND)
+@@ -415,6 +416,9 @@
dnl ********************
dnl logview checks
dnl ********************
@@ -11742,7 +11344,7 @@
dnl This is where the binary actually resides,
dnl not the console helper link
-@@ -425,7 +429,8 @@ else
+@@ -425,7 +429,8 @@
fi
EXPANDED_LOGVIEWDIR=`eval echo $LOGVIEWDIR_TMP`
AC_SUBST(EXPANDED_LOGVIEWDIR)
@@ -11752,14 +11354,7 @@
dnl ********************
dnl scrollkeeper checks
-@@ -467,11 +472,17 @@ po/Makefile.in
- baobab/Makefile
- baobab/data/Makefile
- baobab/pixmaps/Makefile
-+
-+
- baobab/src/Makefile
- baobab/help/Makefile
+@@ -474,6 +479,10 @@
logview/Makefile
logview/gnome-system-log-security
logview/help/Makefile
--- a/patches/gnome-volume-manager-04-fixlocaluser.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/gnome-volume-manager-04-fixlocaluser.diff Fri Nov 24 16:56:15 2006 +0000
@@ -1,14 +1,14 @@
---- gnome-volume-manager-2.15.0/src/manager.c-orig 2006-09-19 15:29:52.179060000 -0500
-+++ gnome-volume-manager-2.15.0/src/manager.c 2006-09-19 16:00:37.447083000 -0500
-@@ -3090,6 +3090,11 @@ gvm_local_user (void)
- struct utmp *utmp;
- const char *user;
- size_t ulen;
+--- gnome-volume-manager-2.17.0/src/manager.c-orig 2006-09-19 15:29:52.179060000 -0500
++++ gnome-volume-manager-2.17.0/src/manager.c 2006-09-19 16:00:37.447083000 -0500
+@@ -3185,6 +3185,11 @@
+ size_t n;
+ DIR *dir;
+ int vt;
+
+ /* This function is a hack and does not work on Solaris */
+#ifdef __sun
+ return TRUE;
+#endif
- user = g_get_user_name ();
- ulen = strlen (user);
+ if (local & LOCAL_USER_CHECKED)
+ return (local & LOCAL_USER_FOUND);
--- a/patches/libgnome-01-default-background.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/libgnome-01-default-background.diff Fri Nov 24 16:56:15 2006 +0000
@@ -1,14 +1,14 @@
diff -urN libgnome-2.10.0/configure.in libgnome-2.10.0-hacked/configure.in
---- libgnome-2.10.0/configure.in 2005-03-07 22:53:04.000000000 +1300
-+++ libgnome-2.10.0-hacked/configure.in 2005-04-26 18:14:10.233346976 +1200
-@@ -177,6 +177,7 @@
+--- libgnome-2.17.0/configure.in 2005-03-07 22:53:04.000000000 +1300
++++ libgnome-2.17.0-hacked/configure.in 2005-04-26 18:14:10.233346976 +1200
+@@ -207,6 +207,7 @@
libgnome/Makefile
monikers/Makefile
schemas/Makefile
+schemas/desktop_gnome_background.schemas
+ schemas/desktop_gnome_interface.schemas.in
gnome-data/Makefile
libgnome/libgnome-2.0.pc
- libgnome/libgnome-2.0-uninstalled.pc
diff -urN libgnome-2.10.0/schemas/desktop_gnome_background.schemas.in libgnome-2.10.0-hacked/schemas/desktop_gnome_background.schemas.in
--- libgnome-2.10.0/schemas/desktop_gnome_background.schemas.in 2003-10-28 03:49:19.000000000 +1300
+++ libgnome-2.10.0-hacked/schemas/desktop_gnome_background.schemas.in 2005-04-26 18:15:05.540938944 +1200
--- a/patches/libgnomeprint-01-Wall.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- libgnomeprint-2.12.0.orig/filters/Makefile.am 2005-09-20 14:40:03.059331000 +0100
-+++ libgnomeprint-2.12.0/filters/Makefile.am 2005-09-20 14:40:19.882422000 +0100
-@@ -1,6 +1,6 @@
- INCLUDES = \
- -I$(top_srcdir) \
-- $(LIBGNOMEPRINT_CFLAGS) -Wall \
-+ $(LIBGNOMEPRINT_CFLAGS) \
- -DGNOME_PRINT_MODULES_DIR="\"$(GNOME_PRINT_MODULES_DIR)\""
-
- plugindir = $(GNOME_PRINT_MODULES_DIR)/filters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgnomeprint-01-papi-print-dialog.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,112 @@
+diff -urN libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c
+--- libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c 2005-09-22 20:27:10.000000000 +0100
++++ ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c 2006-04-25 18:21:16.465274000 +0100
+@@ -392,10 +392,12 @@
+ gnome_print_transport_exists_by_name (const char *name)
+ {
+ GnomePrintTransport *trans;
++ GnomePrintConfig *config;
+
+ g_return_val_if_fail (name != NULL, FALSE);
+
+- trans = gnome_print_transport_new_from_module_name (name, NULL);
++ config = gnome_print_config_default ();
++ trans = gnome_print_transport_new(config);
+ if (trans != NULL) {
+ g_object_unref (trans);
+ return TRUE;
+diff -urN libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c
+--- libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2004-05-18 02:53:09.000000000 +0100
++++ ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2006-04-25 18:19:35.557131000 +0100
+@@ -153,9 +153,11 @@
+ g_free (transport->printer);
+ transport->printer = NULL;
+
+- papiAttributeListFree (transport->attributes);
+- transport->attributes = NULL;
+-
++ /* We do not free attributes here anymore because it is being freed by
++ papiJobFree() in the gp_transport_papi_close(). This happens
++ because transport->attributes is being passed to the lpd backend
++ as job in papiJobStreamOpen ().
++ */
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+
+@@ -181,6 +183,7 @@
+ return GNOME_PRINT_ERROR_UNKNOWN;
+ }
+
++g_print ("gp_transport_papi_construct: transport->printer is %s\n", value);
+ transport->printer = value;
+
+ status = papiServiceCreate (&service, transport->printer, NULL, NULL,
+@@ -191,18 +194,6 @@
+ }
+ transport->service = service;
+
+- value = (char *)gnome_print_config_get (gp_transport->config,
+- (unsigned char *)GNOME_PRINT_KEY_NUM_COPIES);
+- errno = 0;
+- valint = strtol ((char *)value, NULL, 10);
+- if (errno == 0)
+- papiAttributeListAddInteger (&attributes, PAPI_ATTR_EXCL,
+- "copies", valint);
+- else
+- papiAttributeListAddInteger (&attributes, PAPI_ATTR_EXCL,
+- "copies", 1);
+- g_free (value);
+-
+ /*
+ * We really ought to pull this value from somewhere. It probably will
+ * be "application/postscript" most of the time, but at least with
+@@ -339,11 +330,11 @@
+ (const papi_attribute_t **)transport->attributes, NULL,
+ (const char **)&filename, &job);
+
+- papiJobFree(job);
+-
+ if (status != PAPI_OK)
+ return GNOME_PRINT_ERROR_UNKNOWN;
+
++ papiJobFree(job);
++
+ return GNOME_PRINT_OK;
+ }
+
+diff -urN libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c
+--- libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c 2006-04-25 18:18:12.454945000 +0100
++++ ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c 2006-04-25 18:19:52.346914000 +0100
+@@ -45,7 +45,7 @@
+ #include <libgnomeprint/gpa/gpa-settings.h>
+
+ #define d(x)
+-#define GENERIC_PPD_FILE "file://localhost/usr/lib/lp/model/ppd/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
++#define GENERIC_PPD_FILE "file://localhost/usr/lib/lp/model/ppd/system/foomatic/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
+
+ /* Argument order: id, name */
+
+@@ -77,7 +77,11 @@
+ " </Option>"
+ " <Option Id=\"Job\">"
+ " <Option Id=\"NumCopies\" Type=\"String\" Default=\"1\"/>"
++" <Option Id=\"NonCollatedCopiesHW\" Type=\"String\" Default=\"true\"/>"
++" <Option Id=\"CollatedCopiesHW\" Type=\"String\" Default=\"false\"/>"
+ " <Option Id=\"Collate\" Type=\"String\" Default=\"false\"/>"
++" <Option Id=\"Duplex\" Type=\"String\" Default=\"false\"/>"
++" <Option Id=\"Tumble\" Type=\"String\" Default=\"false\"/>"
+ " <Option Id=\"PrintToFile\" Type=\"String\" Default=\"false\" Locked=\"true\"/>"
+ " <Option Id=\"FileName\" Type=\"String\" Default=\"\"/>"
+ " </Option>"
+@@ -686,6 +690,11 @@
+ return;
+ }
+
++ if (!printers) {
++ papiServiceDestroy (service);
++ return;
++ }
++
+ for (i = 0; printers[i] != NULL; i++)
+ ;
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgnomeprint-02-evince-crash.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,18 @@
+diff -urN libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c ../SUNWgnome-print-2.15.4.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c
+--- libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2006-08-09 14:11:47.360257000 +0100
++++ ../SUNWgnome-print-2.15.4.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2006-08-09 14:14:01.420682000 +0100
+@@ -323,12 +323,13 @@
+ GPTransportPAPI *transport;
+ papi_status_t status;
+ papi_job_t job = NULL;
++ const char *files [] = { filename, NULL };
+
+ transport = GP_TRANSPORT_PAPI (gp_transport);
+
+ status = papiJobSubmit (transport->service, transport->printer,
+ (const papi_attribute_t **)transport->attributes, NULL,
+- (const char **)&filename, &job);
++ files, &job);
+
+ if (status != PAPI_OK)
+ return GNOME_PRINT_ERROR_UNKNOWN;
--- a/patches/libgnomeprint-02-papi-print-dialog.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-diff -urN libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c
---- libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c 2005-09-22 20:27:10.000000000 +0100
-+++ ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/gnome-print-transport.c 2006-04-25 18:21:16.465274000 +0100
-@@ -392,10 +392,12 @@
- gnome_print_transport_exists_by_name (const char *name)
- {
- GnomePrintTransport *trans;
-+ GnomePrintConfig *config;
-
- g_return_val_if_fail (name != NULL, FALSE);
-
-- trans = gnome_print_transport_new_from_module_name (name, NULL);
-+ config = gnome_print_config_default ();
-+ trans = gnome_print_transport_new(config);
- if (trans != NULL) {
- g_object_unref (trans);
- return TRUE;
-diff -urN libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c
---- libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2004-05-18 02:53:09.000000000 +0100
-+++ ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2006-04-25 18:19:35.557131000 +0100
-@@ -153,9 +153,11 @@
- g_free (transport->printer);
- transport->printer = NULL;
-
-- papiAttributeListFree (transport->attributes);
-- transport->attributes = NULL;
--
-+ /* We do not free attributes here anymore because it is being freed by
-+ papiJobFree() in the gp_transport_papi_close(). This happens
-+ because transport->attributes is being passed to the lpd backend
-+ as job in papiJobStreamOpen ().
-+ */
- G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-
-@@ -181,6 +183,7 @@
- return GNOME_PRINT_ERROR_UNKNOWN;
- }
-
-+g_print ("gp_transport_papi_construct: transport->printer is %s\n", value);
- transport->printer = value;
-
- status = papiServiceCreate (&service, transport->printer, NULL, NULL,
-@@ -191,18 +194,6 @@
- }
- transport->service = service;
-
-- value = (char *)gnome_print_config_get (gp_transport->config,
-- (unsigned char *)GNOME_PRINT_KEY_NUM_COPIES);
-- errno = 0;
-- valint = strtol ((char *)value, NULL, 10);
-- if (errno == 0)
-- papiAttributeListAddInteger (&attributes, PAPI_ATTR_EXCL,
-- "copies", valint);
-- else
-- papiAttributeListAddInteger (&attributes, PAPI_ATTR_EXCL,
-- "copies", 1);
-- g_free (value);
--
- /*
- * We really ought to pull this value from somewhere. It probably will
- * be "application/postscript" most of the time, but at least with
-@@ -339,11 +330,11 @@
- (const papi_attribute_t **)transport->attributes, NULL,
- (const char **)&filename, &job);
-
-- papiJobFree(job);
--
- if (status != PAPI_OK)
- return GNOME_PRINT_ERROR_UNKNOWN;
-
-+ papiJobFree(job);
-+
- return GNOME_PRINT_OK;
- }
-
-diff -urN libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c
---- libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c 2006-04-25 18:18:12.454945000 +0100
-+++ ../SUNWgnome-print-2.14.0.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi.c 2006-04-25 18:19:52.346914000 +0100
-@@ -45,7 +45,7 @@
- #include <libgnomeprint/gpa/gpa-settings.h>
-
- #define d(x)
--#define GENERIC_PPD_FILE "file://localhost/usr/lib/lp/model/ppd/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
-+#define GENERIC_PPD_FILE "file://localhost/usr/lib/lp/model/ppd/system/foomatic/Generic/Generic-PostScript_Printer-Postscript.ppd.gz"
-
- /* Argument order: id, name */
-
-@@ -77,7 +77,11 @@
- " </Option>"
- " <Option Id=\"Job\">"
- " <Option Id=\"NumCopies\" Type=\"String\" Default=\"1\"/>"
-+" <Option Id=\"NonCollatedCopiesHW\" Type=\"String\" Default=\"true\"/>"
-+" <Option Id=\"CollatedCopiesHW\" Type=\"String\" Default=\"false\"/>"
- " <Option Id=\"Collate\" Type=\"String\" Default=\"false\"/>"
-+" <Option Id=\"Duplex\" Type=\"String\" Default=\"false\"/>"
-+" <Option Id=\"Tumble\" Type=\"String\" Default=\"false\"/>"
- " <Option Id=\"PrintToFile\" Type=\"String\" Default=\"false\" Locked=\"true\"/>"
- " <Option Id=\"FileName\" Type=\"String\" Default=\"\"/>"
- " </Option>"
-@@ -686,6 +690,11 @@
- return;
- }
-
-+ if (!printers) {
-+ papiServiceDestroy (service);
-+ return;
-+ }
-+
- for (i = 0; printers[i] != NULL; i++)
- ;
-
--- a/patches/libgnomeprint-03-evince-crash.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -urN libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c ../SUNWgnome-print-2.15.4.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c
---- libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2006-08-09 14:11:47.360257000 +0100
-+++ ../SUNWgnome-print-2.15.4.hacked/libgnomeprint-2.12.1/libgnomeprint/modules/papi/gnome-print-papi-transport.c 2006-08-09 14:14:01.420682000 +0100
-@@ -323,12 +323,13 @@
- GPTransportPAPI *transport;
- papi_status_t status;
- papi_job_t job = NULL;
-+ const char *files [] = { filename, NULL };
-
- transport = GP_TRANSPORT_PAPI (gp_transport);
-
- status = papiJobSubmit (transport->service, transport->printer,
- (const papi_attribute_t **)transport->attributes, NULL,
-- (const char **)&filename, &job);
-+ files, &job);
-
- if (status != PAPI_OK)
- return GNOME_PRINT_ERROR_UNKNOWN;
--- a/patches/libgnomeprint-04-g11n-filename.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
---- libgnomeprint-2.12.1/libgnomeprint/gnome-print-job.c.orig 2006-11-16 21:26:01.451594000 +0900
-+++ libgnomeprint-2.12.1/libgnomeprint/gnome-print-job.c 2006-11-16 21:27:38.675795000 +0900
-@@ -634,7 +634,11 @@ gnome_print_job_print (GnomePrintJob *jo
- nsheets = copies;
- }
-
-- npages = (lpages + job->priv->num_affines - 1) / job->priv->num_affines;
-+ if (job->priv->num_affines >= 1) {
-+ npages = (lpages + job->priv->num_affines - 1) / job->priv->num_affines;
-+ } else {
-+ npages = 0;
-+ }
- for (stack = 0; stack < nstacks; stack++) {
- gint page;
- for (page = 0; page < npages; page++) {
---- libgnomeprint-2.12.1/libgnomeprint/transports/gp-transport-file.c.orig 2006-11-16 21:30:07.891802000 +0900
-+++ libgnomeprint-2.12.1/libgnomeprint/transports/gp-transport-file.c 2006-11-16 21:33:01.881732000 +0900
-@@ -150,6 +150,7 @@ static gint
- gp_transport_file_open (GnomePrintTransport *transport)
- {
- GPTransportFile *tf;
-+ gchar *sys_filename = NULL;
-
- tf = GP_TRANSPORT_FILE (transport);
-
-@@ -158,7 +159,10 @@ gp_transport_file_open (GnomePrintTransp
- #if defined(G_OS_WIN32) && (defined(__MINGW32__) || defined _MSC_VER)
- tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, _S_IREAD | _S_IWRITE);
- #else
-- tf->fd = open (tf->name, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-+ sys_filename = g_filename_from_utf8 ((const gchar*)tf->name, -1, NULL, NULL, NULL);
-+ g_return_val_if_fail (sys_filename != NULL, GNOME_PRINT_ERROR_UNKNOWN);
-+ tf->fd = open (sys_filename, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-+ g_free (sys_filename);
- #endif
-
- if (tf->fd < 0) {
--- a/patches/metacity-05-raise-on-frame-click.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/metacity-05-raise-on-frame-click.diff Fri Nov 24 16:56:15 2006 +0000
@@ -170,9 +170,9 @@
MetaWindow*
meta_window_new (MetaDisplay *display,
Window xwindow,
-@@ -762,6 +776,8 @@ meta_window_new_with_attrs (MetaDisplay
- */
- unminimize_window_and_all_transient_parents (window);
+@@ -769,6 +769,8 @@
+ if (!display->display_opening)
+ unminimize_window_and_all_transient_parents (window);
+ meta_prefs_add_listener (prefs_changed_callback, window);
+
--- a/patches/metacity-10-trusted-extensions.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/metacity-10-trusted-extensions.diff Fri Nov 24 16:56:15 2006 +0000
@@ -1765,19 +1765,19 @@
int text_height,
MetaButtonState button_states[META_BUTTON_TYPE_LAST],
GdkPixbuf *mini_icon,
-@@ -745,7 +784,11 @@ void meta_theme_draw_frame (MetaTheme
+@@ -771,7 +771,11 @@
const MetaButtonLayout *button_layout,
MetaButtonState button_states[META_BUTTON_TYPE_LAST],
GdkPixbuf *mini_icon,
- GdkPixbuf *icon);
+ GdkPixbuf *icon
-+#ifdef HAVE_XTSOL
-+ ,MetaTrustedLabel *label
-+#endif
-+ );
++#ifdef HAVE_XTSOL
++ ,MetaTrustedLabel *label
++#endif
++ );
- void meta_theme_draw_menu_icon (MetaTheme *theme,
- GtkWidget *widget,
+ void meta_theme_get_frame_borders (MetaTheme *theme,
+ MetaFrameType type,
diff -Nrup metacity-2.16.3/src/trusted-pics.h ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted-pics.h
--- metacity-2.16.3/src/trusted-pics.h 1970-01-01 01:00:00.000000000 +0100
+++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/trusted-pics.h 2006-11-02 13:21:04.026656000 +0100
@@ -4079,3 +4079,5 @@
while (tmp != NULL)
{
meta_window_queue_calc_showing (tmp->data);
+--- theme.h.orig 2006-11-23 16:31:45.339642400 +0000
++++ theme.h 2006-11-23 16:33:45.526709500 +0000
--- a/patches/metacity-13-terminal-strict-focus.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-diff -urN metacity-2.16.3/src/window.c metacity-2.16.3-hacked/src/window.c
---- metacity-2.16.3/src/window.c 2006-10-03 10:04:44.000000000 +1300
-+++ metacity-2.16.3-hacked/src/window.c 2006-10-30 09:37:16.834922000 +1300
-@@ -1743,32 +1743,37 @@
- gboolean
- __window_is_terminal (MetaWindow *window)
- {
-- if (window == NULL || window->res_name == NULL)
-+ if (window == NULL || window->res_class == NULL)
- return FALSE;
-
-+ /*
-+ * Compare res_class, which is not user-settable, and thus theoretically
-+ * a more-reliable indication of term-ness.
-+ */
-+
- /* gnome-terminal -- if you couldn't guess */
-- if (strcmp (window->res_name, "gnome-terminal") == 0)
-+ if (strcmp (window->res_class, "Gnome-terminal") == 0)
- return TRUE;
- /* xterm, rxvt, aterm */
-- else if (strcmp (window->res_name, "XTerm") == 0)
-+ else if (strcmp (window->res_class, "XTerm") == 0)
- return TRUE;
- /* konsole, KDE's terminal program */
-- else if (strcmp (window->res_name, "Konsole") == 0)
-+ else if (strcmp (window->res_class, "Konsole") == 0)
- return TRUE;
- /* rxvt-unicode */
-- else if (strcmp (window->res_name, "URxvt") == 0)
-+ else if (strcmp (window->res_class, "URxvt") == 0)
- return TRUE;
- /* eterm */
-- else if (strcmp (window->res_name, "Eterm") == 0)
-+ else if (strcmp (window->res_class, "Eterm") == 0)
- return TRUE;
- /* KTerm -- some terminal not KDE based; so not like Konsole */
-- else if (strcmp (window->res_name, "KTerm") == 0)
-+ else if (strcmp (window->res_class, "KTerm") == 0)
- return TRUE;
- /* Multi-gnome-terminal */
-- else if (strcmp (window->res_name, "Multi-gnome-terminal") == 0)
-+ else if (strcmp (window->res_class, "Multi-gnome-terminal") == 0)
- return TRUE;
- /* mlterm ("multi lingual terminal emulator on X") */
-- else if (strcmp (window->res_name, "mlterm") == 0)
-+ else if (strcmp (window->res_class, "mlterm") == 0)
- return TRUE;
-
- return FALSE;
--- a/patches/totem-05-moz-plugin.diff Fri Nov 24 15:00:22 2006 +0000
+++ b/patches/totem-05-moz-plugin.diff Fri Nov 24 16:56:15 2006 +0000
@@ -1,6 +1,6 @@
---- totem-1.5.2/configure.in.orig 2006-08-15 14:44:25.839063000 +0100
-+++ totem-1.5.2/configure.in 2006-08-15 14:45:11.523836000 +0100
-@@ -264,7 +264,7 @@
+--- totem-2.17.3/configure.in.orig 2006-11-23 14:12:44.426259500 +0000
++++ totem-2.17.3/configure.in 2006-11-23 14:13:32.714980100 +0000
+@@ -225,7 +225,7 @@
AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
AM_CONDITIONAL(HAVE_GNOME, test x$HAVE_GNOME = "xyes")
@@ -9,7 +9,7 @@
EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS $EXTRA_BACKEND_LIBS"
AC_SUBST(EXTRA_GNOME_CFLAGS)
AC_SUBST(EXTRA_GNOME_LIBS)
-@@ -373,7 +373,7 @@
+@@ -323,7 +323,7 @@
gthread-2.0],
[],[ENABLE_MOZILLA=no])
@@ -18,23 +18,15 @@
AC_SUBST([BROWSER_PLUGIN_CFLAGS])
AC_SUBST([BROWSER_PLUGIN_LIBS])
---- totem-1.5.91/browser-plugin/totemPlugin.cpp.orig 2006-08-17 14:53:37.569235000 +0100
-+++ totem-1.5.91/browser-plugin/totemPlugin.cpp 2006-08-17 14:54:22.098898000 +0100
-@@ -337,7 +337,7 @@
- g_free (plugin->wait_for_svc);
+--- totem-2.17.3/browser-plugin/totemPlugin.cpp.orig 2006-08-17 14:53:37.569235000 +0100
++++ totem-2.17.3/browser-plugin/totemPlugin.cpp 2006-08-17 14:54:22.098898000 +0100
+@@ -31,6 +31,9 @@
+ #include <sys/wait.h>
+ #include <sys/poll.h>
+ #include <string.h>
++/* Include sys/types.h and signal.h for kill() on Solaris. */
++#include <sys/types.h>
++#include <signal.h>
- if (plugin->player_pid) {
-- kill (plugin->player_pid, SIGKILL);
-+ /*kill (plugin->player_pid, SIGKILL);*/
- g_spawn_close_pid (plugin->player_pid);
- plugin->player_pid = 0;
- }
-@@ -574,7 +574,7 @@
- }
+ #include <glib.h>
- if (plugin->player_pid) {
-- kill (plugin->player_pid, SIGKILL);
-+ /*kill (plugin->player_pid, SIGKILL);*/
- g_spawn_close_pid (plugin->player_pid);
- plugin->player_pid = 0;
- }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vino-02-disable-xsun.diff Fri Nov 24 16:56:15 2006 +0000
@@ -0,0 +1,52 @@
+--- vino-2.16.0/capplet/vino-preferences.c.orig 2006-11-16 18:25:16.404842000 +0800
++++ vino-2.16.0/capplet/vino-preferences.c 2006-11-16 18:35:14.352152000 +0800
+@@ -32,6 +32,8 @@
+ #include <libgnome/libgnome.h>
+ #include <libgnomeui/libgnomeui.h>
+
++#include <gdk/gdkx.h>
++
+ #ifdef VINO_ENABLE_KEYRING
+ #include <gnome-keyring.h>
+ #endif
+@@ -1071,9 +1073,40 @@
+ dialog->xml = NULL;
+ }
+
++gboolean
++check_xsun_running()
++{
++ GdkDisplay *display;
++ int min_keycodes, max_keycodes;
++
++ /* determine Xsun is running */
++ display = gdk_display_get_default ();
++ XDisplayKeycodes (GDK_DISPLAY_XDISPLAY (display), &min_keycodes, &max_keycodes);
++
++ if (max_keycodes == 254 )
++ return TRUE;
++ else
++ return FALSE;
++}
++
+ int
+ main (int argc, char **argv)
+ {
++ gtk_init (&argc, &argv);
++ if (check_xsun_running ())
++ {
++ GtkWidget *dialog;
++ dialog = gtk_message_dialog_new_with_markup(NULL, NULL,
++ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
++ _("<b> Unable to share your desktop</b>\n\n"
++ "You are running Xsun. This feature\n"
++ "is only available on Xorg."));
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++
++ return 1;
++ }
++
+ VinoPreferencesDialog dialog = { NULL, };
+
+ bindtextdomain (GETTEXT_PACKAGE, VINO_LOCALEDIR);
--- a/patches/vino-02-gnome-keyring.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,360 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/vino/configure.in,v
-retrieving revision 1.113
-diff -u -p -r1.113 configure.in
---- configure.in 10 Oct 2006 06:58:44 -0000 1.113
-+++ configure.in 17 Oct 2006 09:14:23 -0000
-@@ -47,6 +47,17 @@ PKG_CHECK_MODULES(VINO_SERVER, gtk+-x11-
-
- PKG_CHECK_MODULES(VINO_CAPPLET, gtk+-2.0 gconf-2.0 libglade-2.0 libgnomeui-2.0 >= 2.5.2)
-
-+dnl --enable-gnome-keyring=(yes|no)
-+AC_ARG_ENABLE(gnome-keyring,
-+ AC_HELP_STRING([--enable-gnome-keyring],
-+ [use gnome keyring for storing password [default=no]]),,
-+ enable_gnome_keyring=no)
-+if test "x$enable_gnome_keyring" = "xyes"; then
-+ PKG_CHECK_MODULES(VINO_KEYRING,
-+ gnome-keyring-1,
-+ AC_DEFINE(VINO_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
-+fi
-+
- dnl --enable-session-support=(yes|no)
- AC_ARG_ENABLE(session_support,
- [ --enable-session-support=[no/yes] build session management utility program [default=no]],,
-Index: capplet/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/vino/capplet/Makefile.am,v
-retrieving revision 1.3
-diff -u -p -r1.3 Makefile.am
---- capplet/Makefile.am 9 Nov 2004 16:58:45 -0000 1.3
-+++ capplet/Makefile.am 17 Oct 2006 09:14:23 -0000
-@@ -5,6 +5,7 @@ INCLUDES = \
- -DVINO_GLADEDIR=\""$(datadir)/gnome/vino"\" \
- -DVINO_ICONDIR=\""$(datadir)/pixmaps\"" \
- $(VINO_CAPPLET_CFLAGS) \
-+ $(VINO_KEYRING_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-
-@@ -17,6 +18,7 @@ vino_preferences_SOURCES = \
- $(NULL)
- vino_preferences_LDADD = \
- $(VINO_CAPPLET_LIBS) \
-+ $(VINO_KEYRING_LIBS) \
- $(X_LIBS) \
- $(NULL)
-
-Index: capplet/vino-preferences.c
-===================================================================
-RCS file: /cvs/gnome/vino/capplet/vino-preferences.c,v
-retrieving revision 1.5
-diff -u -p -r1.5 vino-preferences.c
---- capplet/vino-preferences.c 16 May 2005 13:14:57 -0000 1.5
-+++ capplet/vino-preferences.c 17 Oct 2006 09:14:24 -0000
-@@ -33,6 +33,10 @@
- #include <libgnomeui/libgnomeui.h>
- #include "vino-url.h"
-
-+#ifdef VINO_ENABLE_KEYRING
-+#include <gnome-keyring.h>
-+#endif
-+
- #define VINO_PREFS_DIR "/desktop/gnome/remote_access"
- #define VINO_PREFS_ENABLED VINO_PREFS_DIR "/enabled"
- #define VINO_PREFS_PROMPT_ENABLED VINO_PREFS_DIR "/prompt_enabled"
-@@ -63,6 +67,7 @@ typedef struct {
-
- guint listeners [N_LISTENERS];
- int n_listeners;
-+ int expected_listeners;
-
- guint use_password : 1;
- } VinoPreferencesDialog;
-@@ -237,6 +242,70 @@ vino_preferences_dialog_base64_unencode
- return retval;
- }
-
-+static char *
-+vino_preferences_dialog_get_password_from_keyring (VinoPreferencesDialog *dialog)
-+{
-+#ifdef VINO_ENABLE_KEYRING
-+ GnomeKeyringNetworkPasswordData *found_item;
-+ GnomeKeyringResult result;
-+ GList *matches;
-+ char *password;
-+
-+ matches = NULL;
-+
-+ result = gnome_keyring_find_network_password_sync (
-+ NULL, /* user */
-+ NULL, /* domain */
-+ "vino.local", /* server */
-+ NULL, /* object */
-+ "rfb", /* protocol */
-+ "vnc-password", /* authtype */
-+ 5900, /* port */
-+ &matches);
-+
-+ if (result != GNOME_KEYRING_RESULT_OK)
-+ return NULL;
-+
-+ g_assert (matches != NULL && matches->data != NULL);
-+
-+ found_item = (GnomeKeyringNetworkPasswordData *) matches->data;
-+
-+ password = g_strdup (found_item->password);
-+
-+ gnome_keyring_network_password_list_free (matches);
-+
-+ return password;
-+#else
-+ return NULL;
-+#endif
-+}
-+
-+static gboolean
-+vino_preferences_dialog_set_password_in_keyring (VinoPreferencesDialog *dialog,
-+ const char *password)
-+{
-+#ifdef VINO_ENABLE_KEYRING
-+ GnomeKeyringResult result;
-+ guint32 item_id;
-+
-+ result = gnome_keyring_set_network_password_sync (
-+ NULL, /* default keyring */
-+ NULL, /* user */
-+ NULL, /* domain */
-+ "vino.local", /* server */
-+ NULL, /* object */
-+ "rfb", /* protocol */
-+ "vnc-password", /* authtype */
-+ 5900, /* port */
-+ password, /* password */
-+ &item_id);
-+
-+ return result == GNOME_KEYRING_RESULT_OK;
-+#else
-+ return FALSE;
-+#endif
-+}
-+
- static void
- vino_preferences_dialog_update_for_allowed (VinoPreferencesDialog *dialog,
- gboolean allowed)
-@@ -580,6 +649,10 @@ vino_preferences_dialog_password_changed
- const char *password;
-
- password = gtk_entry_get_text (entry);
-+
-+ if (vino_preferences_dialog_set_password_in_keyring (dialog, password))
-+ return;
-+
- if (!password || !password [0])
- {
- gconf_client_unset (dialog->client, VINO_PREFS_VNC_PASSWORD, NULL);
-@@ -599,8 +672,8 @@ vino_preferences_dialog_password_changed
- static void
- vino_preferences_dialog_setup_password_entry (VinoPreferencesDialog *dialog)
- {
-- char *password_b64;
-- char *password;
-+ char *password;
-+ gboolean password_in_keyring;
-
- dialog->password_entry = glade_xml_get_widget (dialog->xml, "password_entry");
- g_assert (dialog->password_entry != NULL);
-@@ -608,15 +681,26 @@ vino_preferences_dialog_setup_password_e
- dialog->password_box = glade_xml_get_widget (dialog->xml, "password_box");
- g_assert (dialog->password_box != NULL);
-
-- password_b64 = gconf_client_get_string (dialog->client, VINO_PREFS_VNC_PASSWORD, NULL);
-- password = vino_preferences_dialog_base64_unencode (password_b64);
-+ password_in_keyring = TRUE;
-+
-+ if (!(password = vino_preferences_dialog_get_password_from_keyring (dialog)))
-+ {
-+ char *password_b64;
-+
-+ password_b64 = gconf_client_get_string (dialog->client, VINO_PREFS_VNC_PASSWORD, NULL);
-+
-+ password = vino_preferences_dialog_base64_unencode (password_b64);
-+
-+ g_free (password_b64);
-+
-+ password_in_keyring = FALSE;
-+ }
-
- if (password)
- {
- gtk_entry_set_text (GTK_ENTRY (dialog->password_entry), password);
- }
-
-- g_free (password_b64);
- g_free (password);
-
- g_signal_connect (dialog->password_entry, "changed",
-@@ -624,18 +708,25 @@ vino_preferences_dialog_setup_password_e
-
- gtk_widget_set_sensitive (dialog->password_box, dialog->use_password);
-
-- if (!gconf_client_key_is_writable (dialog->client, VINO_PREFS_VNC_PASSWORD, NULL))
-+ if (!password_in_keyring)
- {
-- gtk_widget_set_sensitive (dialog->password_box, FALSE);
-- gtk_widget_show (dialog->writability_warning);
-+ if (!gconf_client_key_is_writable (dialog->client, VINO_PREFS_VNC_PASSWORD, NULL))
-+ {
-+ gtk_widget_set_sensitive (dialog->password_box, FALSE);
-+ gtk_widget_show (dialog->writability_warning);
-+ }
-+
-+ dialog->listeners [dialog->n_listeners] =
-+ gconf_client_notify_add (dialog->client,
-+ VINO_PREFS_VNC_PASSWORD,
-+ (GConfClientNotifyFunc) vino_preferences_vnc_password_notify,
-+ dialog, NULL, NULL);
-+ dialog->n_listeners++;
-+ }
-+ else
-+ {
-+ dialog->expected_listeners--;
- }
--
-- dialog->listeners [dialog->n_listeners] =
-- gconf_client_notify_add (dialog->client,
-- VINO_PREFS_VNC_PASSWORD,
-- (GConfClientNotifyFunc) vino_preferences_vnc_password_notify,
-- dialog, NULL, NULL);
-- dialog->n_listeners++;
- }
-
- static void
-@@ -870,6 +961,8 @@ vino_preferences_dialog_init (VinoPrefer
- const char *glade_file;
- gboolean allowed;
-
-+ dialog->expected_listeners = N_LISTENERS;
-+
- if (g_file_test (VINO_GLADE_FILE, G_FILE_TEST_EXISTS))
- glade_file = VINO_GLADE_FILE;
- else
-@@ -909,7 +1002,7 @@ vino_preferences_dialog_init (VinoPrefer
- vino_preferences_dialog_setup_password_toggle (dialog);
- vino_preferences_dialog_setup_password_entry (dialog);
-
-- g_assert (dialog->n_listeners == N_LISTENERS);
-+ g_assert (dialog->n_listeners == dialog->expected_listeners);
-
- vino_preferences_dialog_update_for_allowed (dialog, allowed);
-
-Index: server/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/vino/server/Makefile.am,v
-retrieving revision 1.6
-diff -u -p -r1.6 Makefile.am
---- server/Makefile.am 13 Jan 2006 12:12:54 -0000 1.6
-+++ server/Makefile.am 17 Oct 2006 09:14:24 -0000
-@@ -6,6 +6,7 @@ INCLUDES = \
- -I$(top_srcdir)/server/libvncserver \
- $(VINO_SERVER_CFLAGS) \
- $(VINO_DEBUG_CFLAGS) \
-+ $(VINO_KEYRING_CFLAGS) \
- $(VINO_HTTP_CFLAGS) \
- $(AVAHI_CFLAGS) \
- $(LIBGNUTLS_CFLAGS) \
-@@ -21,6 +22,7 @@ libexec_PROGRAMS = vino-server
-
- vino_server_LDADD = \
- $(VINO_SERVER_LIBS) \
-+ $(VINO_KEYRING_LIBS) \
- $(AVAHI_LIBS) \
- $(LIBGNUTLS_LIBS) \
- $(LIBGCRYPT_LIBS) \
-Index: server/vino-server.c
-===================================================================
-RCS file: /cvs/gnome/vino/server/vino-server.c,v
-retrieving revision 1.16
-diff -u -p -r1.16 vino-server.c
---- server/vino-server.c 13 Oct 2006 08:48:29 -0000 1.16
-+++ server/vino-server.c 17 Oct 2006 09:14:24 -0000
-@@ -37,6 +37,10 @@
- #include "vino-enums.h"
- #include <sys/poll.h>
-
-+#ifdef VINO_ENABLE_KEYRING
-+#include <gnome-keyring.h>
-+#endif
-+
- /* If an authentication attempt failes, delay the next
- * authentication attempt for 5 seconds.
- */
-@@ -447,6 +451,44 @@ vino_server_defer_client_auth (VinoServe
- client);
- }
-
-+static char *
-+vino_server_get_password_from_keyring (VinoServer *server)
-+{
-+#ifdef VINO_ENABLE_KEYRING
-+ GnomeKeyringNetworkPasswordData *found_item;
-+ GnomeKeyringResult result;
-+ GList *matches;
-+ char *password;
-+
-+ matches = NULL;
-+
-+ result = gnome_keyring_find_network_password_sync (
-+ NULL, /* user */
-+ NULL, /* domain */
-+ "vino.local", /* server */
-+ NULL, /* object */
-+ "rfb", /* protocol */
-+ "vnc-password", /* authtype */
-+ 5900, /* port */
-+ &matches);
-+
-+ if (result != GNOME_KEYRING_RESULT_OK)
-+ return NULL;
-+
-+ g_assert (matches != NULL && matches->data != NULL);
-+
-+ found_item = (GnomeKeyringNetworkPasswordData *) matches->data;
-+
-+ password = g_strdup (found_item->password);
-+
-+ gnome_keyring_network_password_list_free (matches);
-+
-+ return password;
-+#else
-+ return NULL;
-+#endif
-+}
-+
- static enum rfbNewClientAction
- vino_server_auth_client (VinoServer *server,
- VinoServerClientInfo *client,
-@@ -459,13 +501,16 @@ vino_server_auth_client (VinoServer
- if (!(server->priv->auth_methods & VINO_AUTH_VNC))
- goto auth_failed;
-
-- if (!server->priv->vnc_password)
-- goto auth_failed;
--
-- if (!(password = vino_base64_unencode (server->priv->vnc_password)))
-+ if (!(password = vino_server_get_password_from_keyring (server)))
- {
-- g_warning ("Failed to base64 unencode VNC password\n");
-- goto auth_failed;
-+ if (!server->priv->vnc_password)
-+ goto auth_failed;
-+
-+ if (!(password = vino_base64_unencode (server->priv->vnc_password)))
-+ {
-+ g_warning ("Failed to base64 unencode VNC password\n");
-+ goto auth_failed;
-+ }
- }
-
- rfb_client = client->rfb_client;
--- a/patches/vino-03-xgl.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-Index: server/vino-fb.c
-===================================================================
-RCS file: /cvs/gnome/vino/server/vino-fb.c,v
-retrieving revision 1.10
-diff -u -r1.10 vino-fb.c
---- server/vino-fb.c 25 Jul 2005 09:50:22 -0000 1.10
-+++ server/vino-fb.c 9 May 2006 21:06:59 -0000
-@@ -582,16 +582,33 @@
- gdk_error_trap_push ();
-
- /* Copy the damaged pixels from the server */
-- XCopyArea (vfb->priv->xdisplay,
-- GDK_WINDOW_XWINDOW (vfb->priv->root_window),
-- vfb->priv->fb_pixmap,
-- vfb->priv->xdamage_copy_gc,
-- damage->x,
-- damage->y,
-- damage->width,
-- damage->height,
-- damage->x,
-- damage->y);
-+ if (vfb->priv->use_x_shm)
-+ {
-+ XCopyArea (vfb->priv->xdisplay,
-+ GDK_WINDOW_XWINDOW (vfb->priv->root_window),
-+ vfb->priv->fb_pixmap,
-+ vfb->priv->xdamage_copy_gc,
-+ damage->x,
-+ damage->y,
-+ damage->width,
-+ damage->height,
-+ damage->x,
-+ damage->y);
-+ }
-+ else
-+ {
-+ XGetSubImage (vfb->priv->xdisplay,
-+ GDK_WINDOW_XWINDOW (vfb->priv->root_window),
-+ damage->x,
-+ damage->y,
-+ damage->width,
-+ damage->height,
-+ AllPlanes,
-+ ZPixmap,
-+ vfb->priv->fb_image,
-+ damage->x,
-+ damage->y);
-+ }
- XSync (vfb->priv->xdisplay, False);
-
- if ((error = gdk_error_trap_pop ()))
-@@ -793,13 +810,16 @@
- if (vfb->priv->fb_image)
- {
- #ifdef HAVE_XSHM
-- vfb->priv->fb_pixmap = XShmCreatePixmap (vfb->priv->xdisplay,
-- GDK_WINDOW_XWINDOW (vfb->priv->root_window),
-- vfb->priv->fb_image->data,
-- &vfb->priv->fb_image_x_shm_info,
-- vfb->priv->fb_image->width,
-- vfb->priv->fb_image->height,
-- vfb->priv->fb_image->depth);
-+ if (vfb->priv->use_x_shm)
-+ {
-+ vfb->priv->fb_pixmap = XShmCreatePixmap (vfb->priv->xdisplay,
-+ GDK_WINDOW_XWINDOW (vfb->priv->root_window),
-+ vfb->priv->fb_image->data,
-+ &vfb->priv->fb_image_x_shm_info,
-+ vfb->priv->fb_image->width,
-+ vfb->priv->fb_image->height,
-+ vfb->priv->fb_image->depth);
-+ }
- #endif
- if (vfb->priv->fb_pixmap == None)
- {
-@@ -838,6 +858,15 @@
-
- #ifdef HAVE_XSHM
- vfb->priv->use_x_shm = XShmQueryExtension (vfb->priv->xdisplay) != False;
-+ if (vfb->priv->use_x_shm)
-+ {
-+ int major, minor;
-+ Bool shared_pixmaps;
-+
-+ XShmQueryVersion (vfb->priv->xdisplay, &major, &minor, &shared_pixmaps);
-+ if (!shared_pixmaps)
-+ vfb->priv->use_x_shm = FALSE;
-+ }
- #endif
-
- g_signal_connect_swapped (vfb->priv->screen, "size-changed",
--- a/patches/vino-04-ipv6-remove-dead-code.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,665 +0,0 @@
---- vino-2.16.0.old/server/libvncserver/rfb/rfb.h 2005-05-19 22:43:29.000000000 +0800
-+++ vino-2.16.0/server/libvncserver/rfb/rfb.h 2006-10-27 20:41:22.050825000 +0800
-@@ -49,69 +49,11 @@
- #include <netinet/in.h>
- #endif
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
--#include <pthread.h>
--#if 0 /* debugging */
--#define LOCK(mutex) (rfbLog("%s:%d LOCK(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex)), pthread_mutex_lock(&(mutex)))
--#define UNLOCK(mutex) (rfbLog("%s:%d UNLOCK(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex)), pthread_mutex_unlock(&(mutex)))
--#define MUTEX(mutex) pthread_mutex_t (mutex)
--#define INIT_MUTEX(mutex) (rfbLog("%s:%d INIT_MUTEX(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex)), pthread_mutex_init(&(mutex),NULL))
--#define TINI_MUTEX(mutex) (rfbLog("%s:%d TINI_MUTEX(%s)\n",__FILE__,__LINE__,#mutex), pthread_mutex_destroy(&(mutex)))
--#define TSIGNAL(cond) (rfbLog("%s:%d TSIGNAL(%s)\n",__FILE__,__LINE__,#cond), pthread_cond_signal(&(cond)))
--#define WAIT(cond,mutex) (rfbLog("%s:%d WAIT(%s,%s)\n",__FILE__,__LINE__,#cond,#mutex), pthread_cond_wait(&(cond),&(mutex)))
--#define COND(cond) pthread_cond_t (cond)
--#define INIT_COND(cond) (rfbLog("%s:%d INIT_COND(%s)\n",__FILE__,__LINE__,#cond), pthread_cond_init(&(cond),NULL))
--#define TINI_COND(cond) (rfbLog("%s:%d TINI_COND(%s)\n",__FILE__,__LINE__,#cond), pthread_cond_destroy(&(cond)))
--#define IF_PTHREADS(x) x
--#else
--#define LOCK(mutex) pthread_mutex_lock(&(mutex));
--#define UNLOCK(mutex) pthread_mutex_unlock(&(mutex));
--#define MUTEX(mutex) pthread_mutex_t (mutex)
--#define INIT_MUTEX(mutex) pthread_mutex_init(&(mutex),NULL)
--#define TINI_MUTEX(mutex) pthread_mutex_destroy(&(mutex))
--#define TSIGNAL(cond) pthread_cond_signal(&(cond))
--#define WAIT(cond,mutex) pthread_cond_wait(&(cond),&(mutex))
--#define COND(cond) pthread_cond_t (cond)
--#define INIT_COND(cond) pthread_cond_init(&(cond),NULL)
--#define TINI_COND(cond) pthread_cond_destroy(&(cond))
--#define IF_PTHREADS(x) x
--#endif
--#else
- #define LOCK(mutex)
- #define UNLOCK(mutex)
--#define MUTEX(mutex)
--#define INIT_MUTEX(mutex)
--#define TINI_MUTEX(mutex)
--#define TSIGNAL(cond)
--#define WAIT(cond,mutex) this_is_unsupported
--#define COND(cond)
--#define INIT_COND(cond)
--#define TINI_COND(cond)
--#define IF_PTHREADS(x)
--#endif
-
- /* end of stuff for autoconf */
-
--/* if you use pthreads, but don't define LIBVNCSERVER_HAVE_LIBPTHREAD, the structs
-- get all mixed up. So this gives a linker error reminding you to compile
-- the library and your application (at least the parts including rfb.h)
-- with the same support for pthreads. */
--#if 0
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
--#ifdef HAVE_LIBZ
--#define rfbInitServer rfbInitServerWithPthreadsAndZRLE
--#else
--#define rfbInitServer rfbInitServerWithPthreadsButWithoutZRLE
--#endif
--#else
--#ifdef HAVE_LIBZ
--#define rfbInitServer rfbInitServerWithoutPthreadsButWithZRLE
--#else
--#define rfbInitServer rfbInitServerWithoutPthreadsAndZRLE
--#endif
--#endif
--#endif
--
- struct _rfbClientRec;
- struct _rfbScreenInfo;
- struct rfbCursor;
-@@ -224,11 +166,6 @@
- */
- AuthenticatedClientHookPtr authenticatedClientHook;
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- MUTEX(cursorMutex);
-- rfbBool backgroundLoop;
--#endif
--
- } rfbScreenInfo, *rfbScreenInfoPtr;
-
-
-@@ -274,10 +211,6 @@
- rfbBool useTLS;
- #endif
- char *host;
--
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- pthread_t client_thread;
--#endif
- /* Possible client states: */
- enum {
- RFB_PROTOCOL_VERSION, /* establishing protocol version */
-@@ -411,21 +344,6 @@
- struct _rfbClientRec *prev;
- struct _rfbClientRec *next;
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- /* whenever a client is referenced, the refCount has to be incremented
-- and afterwards decremented, so that the client is not cleaned up
-- while being referenced.
-- Use the functions rfbIncrClientRef(cl) and rfbDecrClientRef(cl);
-- */
-- int refCount;
-- MUTEX(refCountMutex);
-- COND(deleteCond);
--
-- MUTEX(outputMutex);
-- MUTEX(updateMutex);
-- COND(updateCond);
--#endif
--
- #ifdef HAVE_LIBZ
- void* zrleData;
- #endif
-@@ -474,8 +392,6 @@
- extern int WriteExact(rfbClientPtr cl, const char *buf, int len);
- extern void rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen);
- extern void rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec);
--extern int rfbConnect(rfbScreenInfoPtr rfbScreen, char* host, int port);
--extern int ConnectToTcpAddr(char* host, int port);
- extern int ListenOnTCPPort(int port);
-
- /* rfbserver.c */
-@@ -493,9 +409,6 @@
- extern rfbClientPtr rfbClientIteratorNext(rfbClientIteratorPtr iterator);
- extern void rfbReleaseClientIterator(rfbClientIteratorPtr iterator);
-
--extern void rfbIncrClientRef(rfbClientPtr cl);
--extern void rfbDecrClientRef(rfbClientPtr cl);
--
- extern void rfbNewClientConnection(rfbScreenInfoPtr rfbScreen,int sock);
- extern rfbClientPtr rfbNewClient(rfbScreenInfoPtr rfbScreen,int sock);
- extern void rfbClientConnectionGone(rfbClientPtr cl);
-@@ -667,12 +580,6 @@
-
- extern void rfbScreenCleanup(rfbScreenInfoPtr screenInfo);
-
--/* functions to accept/refuse a client that has been put on hold
-- by a NewClientHookPtr function. Must not be called in other
-- situations. */
--extern void rfbStartOnHoldClient(rfbClientPtr cl);
--extern void rfbRefuseOnHoldClient(rfbClientPtr cl);
--
- /* call one of these two functions to service the vnc clients.
- usec are the microseconds the select on the fds waits.
- if you are using the event loop, set this to some value > 0, so the
---- vino-2.16.0.old/server/libvncserver/sockets.c 2004-07-12 20:17:52.000000000 +0800
-+++ vino-2.16.0/server/libvncserver/sockets.c 2006-10-27 20:37:24.170383000 +0800
-@@ -84,13 +84,6 @@
-
- #include <errno.h>
-
--#ifdef USE_LIBWRAP
--#include <syslog.h>
--#include <tcpd.h>
--int allow_severity=LOG_INFO;
--int deny_severity=LOG_WARNING;
--#endif
--
- /*#ifndef WIN32
- int max(int i,int j) { return(i<j?j:i); }
- #endif
-@@ -172,13 +165,10 @@
- void
- rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
- {
-- struct sockaddr_in addr;
-- size_t addrlen = sizeof(addr);
- const int one = 1;
- int sock;
-
-- if ((sock = accept(rfbScreen->rfbListenSock,
-- (struct sockaddr *)&addr, &addrlen)) < 0) {
-+ if ((sock = accept(rfbScreen->rfbListenSock, NULL, NULL)) < 0) {
- rfbLogPerror("rfbCheckFds: accept");
- return;
- }
-@@ -198,18 +188,6 @@
- return;
- }
-
--#ifdef USE_LIBWRAP
-- if(!hosts_ctl("vnc",STRING_UNKNOWN,inet_ntoa(addr.sin_addr),
-- STRING_UNKNOWN)) {
-- rfbLog("Rejected connection from client %s\n",
-- inet_ntoa(addr.sin_addr));
-- close(sock);
-- return;
-- }
--#endif
--
-- rfbLog("Got connection from client %s\n", inet_ntoa(addr.sin_addr));
--
- rfbNewClient(rfbScreen,sock);
- }
-
-@@ -287,54 +265,10 @@
- close(cl->sock);
- cl->sock = -1;
- }
-- TSIGNAL(cl->updateCond);
- UNLOCK(cl->updateMutex);
- }
-
-
--/*
-- * rfbConnect is called to make a connection out to a given TCP address.
-- */
--
--int
--rfbConnect(rfbScreen, host, port)
-- rfbScreenInfoPtr rfbScreen;
-- char *host;
-- int port;
--{
-- int sock;
-- int one = 1;
--
-- rfbLog("Making connection to client on host %s port %d\n",
-- host,port);
--
-- if ((sock = ConnectToTcpAddr(host, port)) < 0) {
-- rfbLogPerror("connection failed");
-- return -1;
-- }
--
--#ifndef WIN32
-- if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
-- rfbLogPerror("fcntl failed");
-- close(sock);
-- return -1;
-- }
--#endif
--
-- if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-- (char *)&one, sizeof(one)) < 0) {
-- rfbLogPerror("setsockopt failed");
-- close(sock);
-- return -1;
-- }
--
-- /* AddEnabledDevice(sock); */
-- FD_SET(sock, &rfbScreen->allFds);
-- rfbScreen->maxFd = max(sock,rfbScreen->maxFd);
--
-- return sock;
--}
--
- #ifdef HAVE_GNUTLS
- static int
- ReadExactOverTLS(rfbClientPtr cl, char* buf, int len, int timeout)
-@@ -569,37 +503,3 @@
-
- return sock;
- }
--
--int
--ConnectToTcpAddr(host, port)
-- char *host;
-- int port;
--{
-- struct hostent *hp;
-- int sock;
-- struct sockaddr_in addr;
--
-- memset(&addr, 0, sizeof(addr));
-- addr.sin_family = AF_INET;
-- addr.sin_port = htons(port);
--
-- if ((addr.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE)
-- {
-- if (!(hp = gethostbyname(host))) {
-- errno = EINVAL;
-- return -1;
-- }
-- addr.sin_addr.s_addr = *(unsigned long *)hp->h_addr;
-- }
--
-- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-- return -1;
-- }
--
-- if (connect(sock, (struct sockaddr *)&addr, (sizeof(addr))) < 0) {
-- close(sock);
-- return -1;
-- }
--
-- return sock;
--}
---- vino-2.16.0.old/server/libvncserver/main.c 2005-05-19 22:43:29.000000000 +0800
-+++ vino-2.16.0/server/libvncserver/main.c 2006-10-27 20:37:24.172343000 +0800
-@@ -34,10 +34,6 @@
- #include <signal.h>
- #include <time.h>
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
--MUTEX(logMutex);
--#endif
--
- int rfbEnableLogging=1;
-
- #ifdef WORDS_BIGENDIAN
-@@ -130,9 +126,6 @@
- #if 0
- /* TODO: is this needed? Or does it mess up deferring? */
- /* while(!sraRgnEmpty(cl->copyRegion)) */ {
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- if(!cl->screen->backgroundLoop)
--#endif
- {
- sraRegionPtr updateRegion = sraRgnCreateRgn(cl->modifiedRegion);
- sraRgnOr(updateRegion,cl->copyRegion);
-@@ -146,7 +139,6 @@
- } else {
- sraRgnOr(cl->modifiedRegion,copyRegion);
- }
-- TSIGNAL(cl->updateCond);
- UNLOCK(cl->updateMutex);
- }
-
-@@ -202,7 +194,6 @@
- while((cl=rfbClientIteratorNext(iterator))) {
- LOCK(cl->updateMutex);
- sraRgnOr(cl->modifiedRegion,modRegion);
-- TSIGNAL(cl->updateCond);
- UNLOCK(cl->updateMutex);
- }
-
-@@ -229,131 +220,6 @@
- sraRgnDestroy(region);
- }
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
--static void *
--clientOutput(void *data)
--{
-- rfbClientPtr cl = (rfbClientPtr)data;
-- rfbBool haveUpdate;
-- sraRegion* updateRegion;
--
-- while (1) {
-- haveUpdate = false;
-- while (!haveUpdate) {
-- if (cl->sock == -1) {
-- /* Client has disconnected. */
-- return NULL;
-- }
-- LOCK(cl->updateMutex);
-- haveUpdate = FB_UPDATE_PENDING(cl);
-- if(!haveUpdate) {
-- updateRegion = sraRgnCreateRgn(cl->modifiedRegion);
-- haveUpdate = sraRgnAnd(updateRegion,cl->requestedRegion);
-- sraRgnDestroy(updateRegion);
-- }
-- UNLOCK(cl->updateMutex);
--
-- if (!haveUpdate) {
-- WAIT(cl->updateCond, cl->updateMutex);
-- UNLOCK(cl->updateMutex); /* we really needn't lock now. */
-- }
-- }
--
-- /* OK, now, to save bandwidth, wait a little while for more
-- updates to come along. */
-- usleep(cl->screen->rfbDeferUpdateTime * 1000);
--
-- /* Now, get the region we're going to update, and remove
-- it from cl->modifiedRegion _before_ we send the update.
-- That way, if anything that overlaps the region we're sending
-- is updated, we'll be sure to do another update later. */
-- LOCK(cl->updateMutex);
-- updateRegion = sraRgnCreateRgn(cl->modifiedRegion);
-- UNLOCK(cl->updateMutex);
--
-- /* Now actually send the update. */
-- rfbIncrClientRef(cl);
-- rfbSendFramebufferUpdate(cl, updateRegion);
-- rfbDecrClientRef(cl);
--
-- sraRgnDestroy(updateRegion);
-- }
--
-- return NULL;
--}
--
--static void *
--clientInput(void *data)
--{
-- rfbClientPtr cl = (rfbClientPtr)data;
-- pthread_t output_thread;
-- pthread_create(&output_thread, NULL, clientOutput, (void *)cl);
--
-- while (1) {
-- rfbProcessClientMessage(cl);
-- if (cl->sock == -1) {
-- /* Client has disconnected. */
-- break;
-- }
-- }
--
-- /* Get rid of the output thread. */
-- LOCK(cl->updateMutex);
-- TSIGNAL(cl->updateCond);
-- UNLOCK(cl->updateMutex);
-- IF_PTHREADS(pthread_join(output_thread, NULL));
--
-- rfbClientConnectionGone(cl);
--
-- return NULL;
--}
--
--static void*
--listenerRun(void *data)
--{
-- rfbScreenInfoPtr rfbScreen=(rfbScreenInfoPtr)data;
-- int client_fd;
-- struct sockaddr_in peer;
-- rfbClientPtr cl;
-- size_t len;
--
-- len = sizeof(peer);
--
-- /* TODO: this thread wont die by restarting the server */
-- while ((client_fd = accept(rfbScreen->rfbListenSock,
-- (struct sockaddr*)&peer, &len)) >= 0) {
-- cl = rfbNewClient(rfbScreen,client_fd);
-- len = sizeof(peer);
--
-- if (cl && !cl->onHold )
-- rfbStartOnHoldClient(cl);
-- }
-- return(NULL);
--}
--
--void
--rfbStartOnHoldClient(rfbClientPtr cl)
--{
-- pthread_create(&cl->client_thread, NULL, clientInput, (void *)cl);
--}
--
--#else
--
--void
--rfbStartOnHoldClient(rfbClientPtr cl)
--{
-- cl->onHold = FALSE;
--}
--
--#endif
--
--void
--rfbRefuseOnHoldClient(rfbClientPtr cl)
--{
-- rfbCloseClient(cl);
-- rfbClientConnectionGone(cl);
--}
--
- void
- defaultPtrAddEvent(int buttonMask, int x, int y, rfbClientPtr cl)
- {
-@@ -441,8 +307,6 @@
- {
- rfbScreenInfoPtr rfbScreen=malloc(sizeof(rfbScreenInfo));
-
-- INIT_MUTEX(logMutex);
--
- if(width&3)
- rfbErr("WARNING: Width (%d) is not a multiple of 4. VncViewer has problems with that.\n",width);
-
-@@ -492,9 +356,6 @@
- rfbScreen->cursorX=rfbScreen->cursorY=rfbScreen->underCursorBufferLen=0;
- rfbScreen->underCursorBuffer=NULL;
- rfbScreen->cursor = &myCursor;
-- INIT_MUTEX(rfbScreen->cursorMutex);
--
-- IF_PTHREADS(rfbScreen->backgroundLoop = FALSE);
-
- rfbScreen->rfbDeferUpdateTime=5;
- rfbScreen->maxRectsPerUpdate=50;
-@@ -562,7 +423,6 @@
- if (cl->useNewFBSize)
- cl->newFBSizePending = TRUE;
-
-- TSIGNAL(cl->updateCond);
- UNLOCK(cl->updateMutex);
- }
- rfbReleaseClientIterator(iterator);
-@@ -585,7 +445,6 @@
- #define FREE_IF(x) if(rfbScreen->x) free(rfbScreen->x)
- FREE_IF(colourMap.data.bytes);
- FREE_IF(underCursorBuffer);
-- TINI_MUTEX(rfbScreen->cursorMutex);
- if(rfbScreen->cursor)
- rfbFreeCursor(rfbScreen->cursor);
- free(rfbScreen);
-@@ -669,17 +528,8 @@
- void rfbRunEventLoop(rfbScreenInfoPtr rfbScreen, long usec, rfbBool runInBackground)
- {
- if(runInBackground) {
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- pthread_t listener_thread;
--
-- rfbScreen->backgroundLoop = TRUE;
--
-- pthread_create(&listener_thread, NULL, listenerRun, rfbScreen);
-- return;
--#else
- rfbErr("Can't run in background, because I don't have PThreads!\n");
- return;
--#endif
- }
-
- if(usec<0)
---- vino-2.16.0.old/server/libvncserver/rfbserver.c 2004-07-12 20:17:52.000000000 +0800
-+++ vino-2.16.0/server/libvncserver/rfbserver.c 2006-10-27 20:43:43.182809000 +0800
-@@ -61,31 +61,6 @@
- static void rfbProcessClientProtocolVersion(rfbClientPtr cl);
- static void rfbProcessClientNormalMessage(rfbClientPtr cl);
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
--void rfbIncrClientRef(rfbClientPtr cl)
--{
-- LOCK(cl->refCountMutex);
-- cl->refCount++;
-- UNLOCK(cl->refCountMutex);
--}
--
--void rfbDecrClientRef(rfbClientPtr cl)
--{
-- LOCK(cl->refCountMutex);
-- cl->refCount--;
-- if(cl->refCount<=0) /* just to be sure also < 0 */
-- TSIGNAL(cl->deleteCond);
-- UNLOCK(cl->refCountMutex);
--}
--#else
--void rfbIncrClientRef(rfbClientPtr cl) {}
--void rfbDecrClientRef(rfbClientPtr cl) {}
--#endif
--
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
--MUTEX(rfbClientListMutex);
--#endif
--
- struct rfbClientIterator {
- rfbClientPtr next;
- rfbScreenInfoPtr screen;
-@@ -101,7 +76,6 @@
- exit(1);
- }
- rfbScreen->rfbClientHead = NULL;
-- INIT_MUTEX(rfbClientListMutex);
- }
-
- rfbClientIteratorPtr
-@@ -117,12 +91,6 @@
- rfbClientPtr
- rfbClientIteratorHead(rfbClientIteratorPtr i)
- {
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- if(i->next != 0) {
-- rfbDecrClientRef(i->next);
-- rfbIncrClientRef(i->screen->rfbClientHead);
-- }
--#endif
- LOCK(rfbClientListMutex);
- i->next = i->screen->rfbClientHead;
- UNLOCK(rfbClientListMutex);
-@@ -137,25 +105,15 @@
- i->next = i->screen->rfbClientHead;
- UNLOCK(rfbClientListMutex);
- } else {
-- IF_PTHREADS(rfbClientPtr cl = i->next);
- i->next = i->next->next;
-- IF_PTHREADS(rfbDecrClientRef(cl));
- }
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- while(i->next && i->next->sock<0)
-- i->next = i->next->next;
-- if(i->next)
-- rfbIncrClientRef(i->next);
--#endif
--
- return i->next;
- }
-
- void
- rfbReleaseClientIterator(rfbClientIteratorPtr iterator)
- {
-- IF_PTHREADS(if(iterator->next) rfbDecrClientRef(iterator->next));
- free(iterator);
- }
-
-@@ -232,10 +190,6 @@
- FD_SET(sock,&(rfbScreen->allFds));
- rfbScreen->maxFd = max(sock,rfbScreen->maxFd);
-
-- INIT_MUTEX(cl->outputMutex);
-- INIT_MUTEX(cl->refCountMutex);
-- INIT_COND(cl->deleteCond);
--
- cl->state = RFB_PROTOCOL_VERSION;
-
- cl->readyForSetColourMapEntries = FALSE;
-@@ -254,9 +208,6 @@
- cl->modifiedRegion =
- sraRgnCreateRect(0,0,rfbScreen->width,rfbScreen->height);
-
-- INIT_MUTEX(cl->updateMutex);
-- INIT_COND(cl->updateCond);
--
- cl->requestedRegion = sraRgnCreate();
-
- cl->format = cl->screen->rfbServerFormat;
-@@ -265,7 +216,6 @@
-
- LOCK(rfbClientListMutex);
-
-- IF_PTHREADS(cl->refCount = 0);
- cl->next = rfbScreen->rfbClientHead;
- cl->prev = NULL;
- if (rfbScreen->rfbClientHead)
-@@ -356,17 +306,6 @@
- FreeZrleData(cl);
- #endif
-
--#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-- if(cl->screen->backgroundLoop != FALSE)
-- do {
-- LOCK(cl->refCountMutex);
-- i=cl->refCount;
-- UNLOCK(cl->refCountMutex);
-- if(i>0)
-- WAIT(cl->deleteCond,cl->refCountMutex);
-- } while(i>0);
--#endif
--
- if(cl->sock>=0)
- FD_CLR(cl->sock,&(cl->screen->allFds));
-
-@@ -401,12 +340,6 @@
-
- if (cl->translateLookupTable) free(cl->translateLookupTable);
-
-- TINI_COND(cl->updateCond);
-- TINI_MUTEX(cl->updateMutex);
--
-- LOCK(cl->outputMutex);
-- TINI_MUTEX(cl->outputMutex);
--
- rfbPrintStats(cl);
-
- free(cl);
-@@ -878,7 +811,6 @@
- sraRgnOr(cl->modifiedRegion,tmpRegion);
- sraRgnSubtract(cl->copyRegion,tmpRegion);
- }
-- TSIGNAL(cl->updateCond);
- UNLOCK(cl->updateMutex);
-
- sraRgnDestroy(tmpRegion);
--- a/patches/vino-05-ipv6-use-getaddrinfo.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-Index: vino/capplet/vino-preferences.c
-===================================================================
---- vino.orig/capplet/vino-preferences.c 2006-10-17 10:00:26.000000000 +0100
-+++ vino.orig/capplet/vino-preferences.c 2006-10-17 10:00:26.000000000 +0100
-@@ -775,18 +775,27 @@ vino_preferences_dialog_setup_icons (Vin
- static char *
- vino_preferences_get_local_hostname (void)
- {
-- static char local_host [NI_MAXHOST] = { 0, };
-+ static char local_host [NI_MAXHOST] = { 0, };
-+ struct addrinfo hints;
-+ struct addrinfo *results;
-+ char *retval;
-
-- if (gethostname (local_host, NI_MAXHOST) != -1)
-- {
-- struct hostent *host;
--
-- host = gethostbyname (local_host);
-+ if (gethostname (local_host, NI_MAXHOST) == -1)
-+ return NULL;
-
-- return g_strdup (host ? host->h_name : local_host);
-- }
-+ memset (&hints, 0, sizeof (hints));
-+ hints.ai_flags = AI_CANONNAME;
-+
-+ results = NULL;
-+ if (getaddrinfo (local_host, NULL, &hints, &results) != 0)
-+ return NULL;
-+
-+ retval = g_strdup (results ? results->ai_canonname : local_host);
-+
-+ if (results)
-+ freeaddrinfo (results);
-
-- return NULL;
-+ return retval;
- }
-
- static char *
--- a/patches/vino-06-ipv6-use-inet-ntop.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-Index: vino/server/libvncserver/rfbserver.c
-===================================================================
---- vino.orig/server/libvncserver/rfbserver.c 2006-10-20 10:21:57.000000000 +0100
-+++ vino.orig/server/libvncserver/rfbserver.c 2006-10-20 10:21:57.000000000 +0100
-@@ -118,6 +118,51 @@ rfbReleaseClientIterator(rfbClientIterat
- }
-
-
-+static char *
-+rfbSockaddrToHostname(struct sockaddr *addr)
-+{
-+ char buf_in[INET_ADDRSTRLEN];
-+ char buf_in6[INET_ADDRSTRLEN];
-+ void *src;
-+ char *buf;
-+ int buflen;
-+
-+ /*
-+ * Need to handle 3 cases:
-+ * 1) IPv4 address
-+ * 2) IPv4-mapped IPv6 address
-+ * 3) IPv6 address
-+ */
-+
-+ if (addr->sa_family == AF_INET) {
-+ struct sockaddr_in *addr_in;
-+
-+ addr_in = (struct sockaddr_in *) addr;
-+
-+ src = &addr_in->sin_addr;
-+ buf = buf_in;
-+ buflen = sizeof (buf_in);
-+
-+ } else /* if (addr->sa_family == AF_INET6) */ {
-+ struct sockaddr_in6 *addr_in6;
-+
-+ addr_in6 = (struct sockaddr_in6 *) addr;
-+
-+ if (IN6_IS_ADDR_V4MAPPED (&addr_in6->sin6_addr))
-+ src = &(addr_in6->sin6_addr.s6_addr[12]);
-+ else
-+ src = &addr_in6->sin6_addr;
-+
-+ buf = buf_in6;
-+ buflen = sizeof (buf_in6);
-+ }
-+
-+ if (inet_ntop(addr->sa_family, src, buf, buflen) == NULL)
-+ return NULL;
-+
-+ return strdup(buf);
-+}
-+
- /*
- * rfbNewClientConnection is called from sockets.c when a new connection
- * comes in.
-@@ -161,7 +206,10 @@ rfbNewClient(rfbScreenInfoPtr rfbScreen,
- int one=1;
-
- getpeername(sock, (struct sockaddr *)&addr, &addrlen);
-- cl->host = strdup(inet_ntoa(addr.sin_addr));
-+
-+ cl->host = rfbSockaddrToHostname ((struct sockaddr *) &addr);
-+
-+ rfbLog("Got connection from client %s\n", cl->host);
-
- rfbLog(" other clients:\n");
- iterator = rfbGetClientIterator(rfbScreen);
--- a/patches/vino-07-ipv6-configure-check.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-Index: vino/configure.in
-===================================================================
---- vino.orig/configure.in 2006-10-20 10:55:40.000000000 +0100
-+++ vino.orig/configure.in 2006-10-20 10:55:40.000000000 +0100
-@@ -244,6 +244,30 @@ dnl End of libvncserver stuff
- dnl
-
-
-+dnl
-+dnl Check for IPv6 support
-+dnl
-+AC_MSG_CHECKING([checking for IPv6 support])
-+AC_ARG_ENABLE(ipv6,
-+ AC_HELP_STRING([--enable-ipv6],
-+ [Enable ipv6 support [default=yes]]),,
-+ enable_ipv6=yes)
-+if test "x$enable_ipv6" = "xyes"; then
-+ AC_TRY_COMPILE([
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-+ ],[
-+ socket(AF_INET6, SOCK_STREAM, 0);
-+ ], have_ipv6=yes, have_ipv6=no)
-+
-+ if test "x$have_ipv6" = "xyes"; then
-+ AC_DEFINE(ENABLE_IPV6, [], [Define to enable IPv6 support])
-+ fi
-+else
-+ have_ipv6=no
-+fi
-+AC_MSG_RESULT($have_ipv6)
-+
- dnl --enable-debug=(yes|minimum|no)
- AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum)
- if test "$enable_debug" = "yes"; then
--- a/patches/vino-08-ipv6-create-ipv6-socket.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
---- vino-2.16.0.old/server/libvncserver/rfb/rfb.h 2006-11-07 21:53:23.035257000 +0800
-+++ vino-2.16.0/server/libvncserver/rfb/rfb.h 2006-11-07 21:55:06.163532000 +0800
-@@ -112,6 +112,7 @@
- char rfbThisHost[255];
-
- rfbBool autoPort;
-+ rfbBool localOnly;
- int rfbPort;
- SOCKET rfbListenSock;
- int maxSock;
-@@ -392,7 +393,7 @@
- extern int WriteExact(rfbClientPtr cl, const char *buf, int len);
- extern void rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen);
- extern void rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec);
--extern int ListenOnTCPPort(int port);
-+extern int ListenOnTCPPort(int port, rfbBool localOnly);
-
- /* rfbserver.c */
-
---- vino-2.16.0.old/server/libvncserver/sockets.c 2006-11-07 21:53:23.036271000 +0800
-+++ vino-2.16.0/server/libvncserver/sockets.c 2006-11-07 21:54:03.941308000 +0800
-@@ -132,7 +132,7 @@
- rfbLog("Autoprobing TCP port \n");
-
- for (i = 5900; i < 6000; i++) {
-- if ((rfbScreen->rfbListenSock = ListenOnTCPPort(i)) >= 0) {
-+ if ((rfbScreen->rfbListenSock = ListenOnTCPPort(i, rfbScreen->localOnly)) >= 0) {
- rfbScreen->rfbPort = i;
- break;
- }
-@@ -151,7 +151,7 @@
- else if(rfbScreen->rfbPort>0) {
- rfbLog("Listening for VNC connections on TCP port %d\n", rfbScreen->rfbPort);
-
-- if ((rfbScreen->rfbListenSock = ListenOnTCPPort(rfbScreen->rfbPort)) < 0) {
-+ if ((rfbScreen->rfbListenSock = ListenOnTCPPort(rfbScreen->rfbPort, rfbScreen->localOnly)) < 0) {
- rfbLogPerror("ListenOnTCPPort");
- return;
- }
-@@ -471,28 +471,48 @@
- }
-
- int
--ListenOnTCPPort(port)
-+ListenOnTCPPort(port, localOnly)
- int port;
-+ rfbBool localOnly;
- {
-- struct sockaddr_in addr;
-- int sock;
-+ int sock = -1;
- int one = 1;
-+ struct sockaddr_in addr_in;
-+ struct sockaddr *addr;
-+ socklen_t addrlen;
-+
-+#ifdef ENABLE_IPV6
-+ struct sockaddr_in6 addr_in6;
-+ memset(&addr_in6, 0, sizeof(addr_in6));
-+ addr_in6.sin6_family = AF_INET6;
-+ addr_in6.sin6_port = htons(port);
-+ addr_in6.sin6_addr = localOnly ? in6addr_loopback : in6addr_any;
-
-- memset(&addr, 0, sizeof(addr));
-- addr.sin_family = AF_INET;
-- addr.sin_port = htons(port);
-- /* addr.sin_addr.s_addr = interface.s_addr; */
-- addr.sin_addr.s_addr = INADDR_ANY;
-+ addr = (struct sockaddr *)&addr_in6;
-+ addrlen = sizeof(addr_in6);
-
-- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-- return -1;
-+ sock = socket(AF_INET6, SOCK_STREAM, 0);
-+#endif
-+
-+ if (sock < 0) {
-+ if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-+ return -1;
-+
-+ memset(&addr_in, 0, sizeof(addr_in));
-+ addr_in.sin_family = AF_INET;
-+ addr_in.sin_port = htons(port);
-+ addr_in.sin_addr.s_addr = localOnly ? htonl(INADDR_LOOPBACK) : htonl(INADDR_ANY);
-+
-+ addr = (struct sockaddr *)&addr_in;
-+ addrlen = sizeof(addr_in);
- }
-+
- if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
- (char *)&one, sizeof(one)) < 0) {
- close(sock);
- return -1;
- }
-- if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-+ if (bind(sock, addr, addrlen) < 0) {
- close(sock);
- return -1;
- }
--- a/patches/vino-09-ipv6-create-ipv6-http-socket.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-Index: vino/server/vino-http.c
-===================================================================
---- vino.orig/server/vino-http.c 2006-10-20 10:51:23.000000000 +0100
-+++ vino.orig/server/vino-http.c 2006-10-20 10:51:23.000000000 +0100
-@@ -589,10 +589,15 @@ start_probing_at (int rfb_port)
- static void
- vino_http_create_listening_socket (VinoHTTP *http)
- {
-- struct sockaddr_in saddr;
-- int sock;
-- int opt;
-- int http_port;
-+#ifdef ENABLE_IPV6
-+ struct sockaddr_in6 saddr_in6;
-+#endif
-+ struct sockaddr_in saddr_in;
-+ struct sockaddr *saddr;
-+ socklen_t saddr_len;
-+ int sock;
-+ int opt;
-+ int http_port;
-
- if (http->priv->io_watch)
- g_source_remove (http->priv->io_watch);
-@@ -608,10 +613,33 @@ vino_http_create_listening_socket (VinoH
-
- http->priv->http_port = 0;
-
-- if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
-+ sock = -1;
-+
-+#ifdef ENABLE_IPV6
-+ sock = socket (AF_INET6, SOCK_STREAM, 0);
-+
-+ memset (&saddr_in6, 0, sizeof (struct sockaddr_in6));
-+ saddr_in6.sin6_family = AF_INET6;
-+ saddr_in6.sin6_addr = in6addr_any;
-+
-+ saddr = (struct sockaddr *) &saddr_in6;
-+ saddr_len = sizeof (saddr_in6);
-+#endif
-+
-+ if (sock < 0)
- {
-- g_warning ("Error creating socket: %s\n", g_strerror (errno));
-- return;
-+ if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
-+ {
-+ g_warning ("Error creating socket: %s\n", g_strerror (errno));
-+ return;
-+ }
-+
-+ memset (&saddr_in, 0, sizeof (struct sockaddr_in));
-+ saddr_in.sin_family = AF_INET;
-+ saddr_in.sin_addr.s_addr = htonl (INADDR_ANY);
-+
-+ saddr = (struct sockaddr *) &saddr_in;
-+ saddr_len = sizeof (saddr_in);
- }
-
- opt = 1;
-@@ -636,12 +664,14 @@ vino_http_create_listening_socket (VinoH
-
- while (http_port <= VINO_HTTP_MAX_PORT)
- {
-- memset (&saddr, 0, sizeof (struct sockaddr_in));
-- saddr.sin_family = AF_INET;
-- saddr.sin_port = htons (http_port);
-- saddr.sin_addr.s_addr = htonl (INADDR_ANY);
-+#ifdef ENABLE_IPV6
-+ if (saddr->sa_family == AF_INET6)
-+ ((struct sockaddr_in6 *) saddr)->sin6_port = htons (http_port);
-+ else
-+#endif
-+ ((struct sockaddr_in *) saddr)->sin_port = htons (http_port);
-
-- if (bind (sock, (struct sockaddr *) &saddr, sizeof (struct sockaddr_in)) == 0 )
-+ if (bind (sock, saddr, saddr_len) == 0 )
- break;
-
- dprintf (HTTP, "Failed to probe port %d: %s\n", http_port, g_strerror (errno));
--- a/patches/vino-10-a11y-theme-icons.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-Index: vino-gnome-2-16/capplet/vino-preferences.c
-===================================================================
-RCS file: /cvs/gnome/vino/capplet/vino-preferences.c,v
-retrieving revision 1.5
-retrieving revision 1.5.6.1
-diff -u -r1.5 -r1.5.6.1
---- vino-gnome-2-16/capplet/vino-preferences.c 16 May 2005 13:14:57 -0000 1.5
-+++ vino-gnome-2-16/capplet/vino-preferences.c 23 Oct 2006 10:55:27 -0000 1.5.6.1
-@@ -641,44 +641,21 @@
- static void
- vino_preferences_dialog_setup_icons (VinoPreferencesDialog *dialog)
- {
--#define ICON_SIZE_STANDARD 48
--
-- GnomeIconTheme *icon_theme;
-- char *icon_path;
-+ gtk_window_set_icon_name (GTK_WINDOW (dialog->dialog), "gnome-remote-desktop");
-
- dialog->sharing_icon = glade_xml_get_widget (dialog->xml, "sharing_icon");
- g_assert (dialog->sharing_icon != NULL);
-
-+ gtk_image_set_from_icon_name (GTK_IMAGE (dialog->sharing_icon),
-+ "gnome-remote-desktop",
-+ GTK_ICON_SIZE_DIALOG);
-+
- dialog->security_icon = glade_xml_get_widget (dialog->xml, "security_icon");
- g_assert (dialog->security_icon != NULL);
-
-- icon_theme = gnome_icon_theme_new ();
-- gnome_icon_theme_set_allow_svg (icon_theme, TRUE);
--
-- icon_path = gnome_icon_theme_lookup_icon (icon_theme,
-- "gnome-remote-desktop",
-- ICON_SIZE_STANDARD,
-- NULL, NULL);
-- if (icon_path)
-- {
-- gtk_window_set_icon_from_file (GTK_WINDOW (dialog->dialog), icon_path, NULL);
-- gtk_image_set_from_file (GTK_IMAGE (dialog->sharing_icon), icon_path);
-- g_free (icon_path);
-- }
--
-- icon_path = gnome_icon_theme_lookup_icon (icon_theme,
-- "gnome-lockscreen",
-- ICON_SIZE_STANDARD,
-- NULL, NULL);
-- if (icon_path)
-- {
-- gtk_image_set_from_file (GTK_IMAGE (dialog->security_icon), icon_path);
-- g_free (icon_path);
-- }
--
-- g_object_unref (icon_theme);
--
--#undef ICON_SIZE_STANDARD
-+ gtk_image_set_from_icon_name (GTK_IMAGE (dialog->security_icon),
-+ "gnome-lockscreen",
-+ GTK_ICON_SIZE_DIALOG);
- }
-
- static char *
--- a/patches/vino-11-a11y-selectable-label.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-Index: vino-head/capplet/vino-preferences.c
-===================================================================
-RCS file: /cvs/gnome/vino/capplet/vino-preferences.c,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -r1.9 -r1.10
---- vino-head/capplet/vino-preferences.c 27 Oct 2006 08:23:38 -0000 1.9
-+++ vino-head/capplet/vino-preferences.c 27 Oct 2006 08:26:52 -0000 1.10
-@@ -31,7 +31,6 @@
- #include <gconf/gconf-client.h>
- #include <libgnome/libgnome.h>
- #include <libgnomeui/libgnomeui.h>
--#include "vino-url.h"
-
- #ifdef VINO_ENABLE_KEYRING
- #include <gnome-keyring.h>
-@@ -64,6 +63,7 @@
- GtkWidget *password_toggle;
- GtkWidget *password_box;
- GtkWidget *password_entry;
-+ GtkTooltips *tips;
-
- guint listeners [N_LISTENERS];
- int n_listeners;
-@@ -663,8 +663,8 @@
- command = vino_preferences_dialog_get_server_command (dialog);
- mailto = vino_preferences_dialog_construct_mailto (dialog, command);
-
-- gtk_label_set_text (GTK_LABEL (dialog->url_label), command);
-- vino_url_set_address (VINO_URL (dialog->url_label), mailto);
-+ gtk_button_set_label (GTK_BUTTON (dialog->url_label), command);
-+ gtk_link_button_set_uri (GTK_LINK_BUTTON (dialog->url_label), mailto);
-
- g_free (command);
- g_free (mailto);
-@@ -698,6 +698,35 @@
- }
-
- static void
-+vino_preferences_dialog_uri_hook (GtkLinkButton *button,
-+ const gchar *link,
-+ gpointer user_data)
-+{
-+ GError *error;
-+ GdkScreen *screen;
-+
-+ screen = gtk_widget_get_screen (GTK_WIDGET (button));
-+
-+ error = NULL;
-+ if (!gnome_url_show_on_screen (link, screen, &error))
-+ {
-+ /* FIXME better error handling!
-+ * What best to do? For the specific case
-+ * in this preferences dialog we want to be
-+ * able to pop up a dialog with the error
-+ * but also the vino URL as a selectable
-+ * label.
-+ *
-+ * Maybe chain this up to the caller?
-+ */
-+
-+ g_warning ("Failed to show URL '%s': %s\n",
-+ link, error->message);
-+ g_error_free (error);
-+ }
-+}
-+
-+static void
- vino_preferences_dialog_setup_url_labels (VinoPreferencesDialog *dialog)
- {
- char *command;
-@@ -723,13 +752,18 @@
- command = vino_preferences_dialog_get_server_command (dialog);
- mailto = vino_preferences_dialog_construct_mailto (dialog, command);
-
-- dialog->url_label = vino_url_new (mailto, command,
-- _("Send this command by email"));
-+ gtk_link_button_set_uri_hook (vino_preferences_dialog_uri_hook, NULL, NULL);
-+
-+ dialog->url_label = gtk_link_button_new_with_label (mailto, command);
-+
-+ dialog->tips = gtk_tooltips_new ();
-+ gtk_tooltips_set_tip (dialog->tips, dialog->url_label,
-+ _("Send this command by email"), NULL);
-+ g_object_ref_sink (dialog->tips);
-+
- g_free (command);
- g_free (mailto);
-
-- gtk_misc_set_alignment (GTK_MISC (dialog->url_label), 0.0, 0.0);
--
- gtk_box_pack_start (GTK_BOX (dialog->url_labels_box),
- dialog->url_label,
- FALSE, FALSE, 0);
-@@ -852,6 +886,10 @@
- if (dialog->mailto)
- g_free (dialog->mailto);
- dialog->mailto = NULL;
-+
-+ if (dialog->tips)
-+ g_object_unref (dialog->tips);
-+ dialog->tips = NULL;
-
- if (dialog->client)
- {
--- a/patches/vino-12-disable-xsun.diff Fri Nov 24 15:00:22 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
---- vino-2.16.0/capplet/vino-preferences.c.orig 2006-11-16 18:25:16.404842000 +0800
-+++ vino-2.16.0/capplet/vino-preferences.c 2006-11-16 18:35:14.352152000 +0800
-@@ -32,6 +32,8 @@
- #include <libgnome/libgnome.h>
- #include <libgnomeui/libgnomeui.h>
-
-+#include <gdk/gdkx.h>
-+
- #ifdef VINO_ENABLE_KEYRING
- #include <gnome-keyring.h>
- #endif
-@@ -1071,9 +1073,40 @@
- dialog->xml = NULL;
- }
-
-+gboolean
-+check_xsun_running()
-+{
-+ GdkDisplay *display;
-+ int min_keycodes, max_keycodes;
-+
-+ /* determine Xsun is running */
-+ display = gdk_display_get_default ();
-+ XDisplayKeycodes (GDK_DISPLAY_XDISPLAY (display), &min_keycodes, &max_keycodes);
-+
-+ if (max_keycodes == 254 )
-+ return TRUE;
-+ else
-+ return FALSE;
-+}
-+
- int
- main (int argc, char **argv)
- {
-+ gtk_init (&argc, &argv);
-+ if (check_xsun_running ())
-+ {
-+ GtkWidget *dialog;
-+ dialog = gtk_message_dialog_new_with_markup(NULL, NULL,
-+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-+ _("<b> Unable to share your desktop</b>\n\n"
-+ "You are running Xsun. This feature\n"
-+ "is only available on Xorg."));
-+ gtk_dialog_run (GTK_DIALOG (dialog));
-+ gtk_widget_destroy (dialog);
-+
-+ return 1;
-+ }
-+
- VinoPreferencesDialog dialog = { NULL, };
-
- bindtextdomain (GETTEXT_PACKAGE, VINO_LOCALEDIR);
--- a/totem.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/totem.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,12 +10,12 @@
Name: totem
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.2
+Version: 2.17.3
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Totem Multimedia Player
-Source: http://ftp.gnome.org/pub/GNOME/sources/totem/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/totem/2.17/%{name}-%{version}.tar.bz2
Patch1: totem-01-use-jmplay-for-wav-mp3.diff
Patch2: totem-02-menu-entry.diff
Patch3: totem-03-uninstalled-pc.diff
@@ -138,6 +138,9 @@
%{_includedir}/totem/*
%changelog
+* Thu Nov 23 2006 - [email protected]
+- Bump to 2.17.3.
+
* Tue Oct 03 2006 - [email protected]
- Remove 'rm' lines from %install as the files listed are not installed.
--- a/vino.spec Fri Nov 24 15:00:22 2006 +0000
+++ b/vino.spec Fri Nov 24 16:56:15 2006 +0000
@@ -10,27 +10,15 @@
Name: vino
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.0
+Version: 2.17.2
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Remote Desktop
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
Patch1: vino-01-fix-a11y-hang.diff
-Patch2: vino-02-gnome-keyring.diff
-Patch3: vino-03-xgl.diff
-Patch4: vino-04-ipv6-remove-dead-code.diff
-Patch5: vino-05-ipv6-use-getaddrinfo.diff
-Patch6: vino-06-ipv6-use-inet-ntop.diff
-Patch7: vino-07-ipv6-configure-check.diff
-Patch8: vino-08-ipv6-create-ipv6-socket.diff
-Patch9: vino-09-ipv6-create-ipv6-http-socket.diff
-# date:2006-11-06 bugster:6491224 bugzilla:345394 owner:halton type:bugfix
-Patch10: vino-10-a11y-theme-icons.diff
-# date:2006-11-06 bugster:6491221 bugzilla:338043 owner:halton type:bugfix
-Patch11: vino-11-a11y-selectable-label.diff
# date:2006-11-16 bugster:6493868 owner:halton type:bugfix
-Patch12: vino-12-disable-xsun.diff
+Patch2: vino-02-disable-xsun.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
Autoreqprov: on
@@ -60,17 +48,7 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+%patch2 -p1
%build
@@ -134,6 +112,16 @@
%config %{_sysconfdir}/gconf/schemas/*
%changelog
+* Thu Nov 23 2006 - [email protected]
+- Remove upstream patches, 02-a11y-theme-icons and 03-a11y-selectable-label.
+ Renumber remainder.
+
+* Thu Nov 23 2006 - [email protected]
+- Bump to 2.17.2. Remove 8 upstream patches: 02-gnome-keyring, 03-xgl,
+ 04-ipv6-remove-dead-code, 05-ipv6-use-getaddrinfo, 06-ipv6-use-inet-ntop,
+ 07-ipv6-configure-check, 08-ipv6-create-ipv6-socket,
+ 09-ipv6-create-ipv6-http-socket.
+
* Fri Nov 17 2006 - [email protected]
- Change patch owner to opensolaris id.