--- a/ChangeLog Fri May 11 12:50:41 2012 +0000
+++ b/ChangeLog Fri May 11 21:19:28 2012 +0000
@@ -1,3 +1,124 @@
+2012-05-04 Brian Cameron <[email protected]>
+
+ * specs/SUNWpyatspi.spec: Bump to 2.4.0.
+ * specs/SUNWpulseaudio.spec, base-specs/pulseaudio.spec: Build fixes
+ for sparc.
+ * specs/SUNWdconf.spec, patches/dconf-01-compile.diff: Bump to 0.12.1.
+ Fix packaging.
+ * specs/SUNWat-spi2-core.spec, patches/at-spi2-core-01-configure.diff:
+ Bump to 2.4.1. Rework patch.
+ * specs/SUNWat-spi2-atk.spec: Bump to 2.4.0.
+ * base-specs/at-spi.spec: Bump to 1.32.0.
+ * patches/at-spi-07-warn-once.diff: Add patch needed to build.
+ * base-specs/atk.spec, patches/atk-01-libtool.diff: Remove patch no
+ longer needed.
+ * base-specs/libgail-gnome.spec: Bump to 1.20.4.
+ * base-specs/java-atk-wrapper.spec,
+ specs/SUNWgnome-remote-desktop.spec: Make work with the latest
+ autotools.
+ * base-specs/gtk3-engines.spec: Add -lm to LDFLAGS.
+ * base-specs/libbonobo.spec: Bump to 2.32.1.
+ * base-specs/libbonoboui.spec: Bump to 2.24.5.
+ * base-specs/GConf.spec: Bump to 3.2.5.
+ * patches/GConf-08-cleanup-libs.diff: Remove patch no longer needed.
+ * specs/SUNWgnome-desktop-prefs.spec: Update packaging.
+ * base-specs/control-center.spec: Bump to 3.4.1
+ * base-specs/gnome-settings-daemon.spec: Bump to 3.4.1.
+ * patches/gnome-settings-daemon-12-dependencies.diff,
+ patches/gnome-settings-daemon-14-mapfile.diff,
+ patches/gnome-settings-daemon-15-libm.diff,
+ patches/control-center-13-mapfile.diff,
+ patches/control-center-14-static.diff: Add patches needed to build
+ * patches/gnome-settings-daemon-12-no-pnp.diff,
+ patches/gnome-settings-daemon-14-upower.diff,
+ patches/control-center-12-libtool.diff: Remove patches no longer
+ needed.
+ * patches/gnome-settings-daemon-13-uninstalled-pc.diff: Rework.
+ * base-specs/desktop-file-utils.spec: Bump to 0.20.
+ * patches/desktop-file-utils-01-preserve-file-perm.diff: Rework.
+ * specs/SUNWgnome-wm.spec, base-specs/metacity.spec: Bump to 2.34.3,
+ update packaging.
+ * base-specs/libgnomeui.spec: Bump to 2.24.5.
+ * patches/libgnomeui-03-math.diff: Add patch needed to build.
+ * base-specs/libgweather.spec: Bump to 3.4.1.
+ * base-specs/libgnome.spec: Bump to 2.32.1.
+ * base-specs/libgnomekbd.spec: Bump to 3.4.0.2.
+ * patches/libgnomekbd-01-compile-makefile.diff: Reowkr.
+ * base-specs/libnotify.spec: Bump to 0.7.5.
+ * specs/SUNWgnome-panel.spec, specs/SUNWgnome-applets.spec:
+ Update packaging, fix Requires/BuildRequires.
+ * base-specs/gnome-panel.spec, base-specs/gnome-desktop.spec: Bump to
+ 3.4.1.
+ * base-specs/gnome-menus.spec, base-specs/libwnck.spec: Bump to 3.4.0.
+ * base-specs/notification-daemon.spec: Bump to 0.7.4.
+ * patches/notification-daemon-01-libtool.diff: Remove patch no longer
+ needed.
+ * patches/gnome-panel-20-polkit.diff: Add patch needed to build.
+ * patches/libwnck-02-libtool.diff, patches/gnome-panel-20-libtool.diff:
+ Remove patches no longer needed.
+ * base-specs/gnome-applets.spec: Bump to 3.4.1.
+ * patches/gnome-applets-01-disable-drivemount.diff: Rework.
+ * base-specs/gnome-session.spec: Bump to 3.4.1.
+ * patches/gnome-session-26-libtool.diff: Remove patch no longer needed.
+ * specs/SUNWgnome-themes-standard.spec: Bump to 3.4.1.
+ * base-specs/gnome-icon-theme-symbolic.spec,
+ base-specs/gnome-icon-theme.spec: Bump to 3.4.0.
+ * specs/SUNWgsettings-schemas.spec: Bump to 3.4.1.
+ * specs/SUNWgnome-file-mgr.spec: Fix packaging and Requires.
+ * base-specs/nautilus.spec: Bump to 3.4.1.
+ * patches/nautilus-17-void-return.diff: Add patch needed to build.
+ * patches/nautilus-03-ftp-rename.diff,
+ patches/nautilus-07-lockdown.diff, patches/nautilus-16-libxml.diff:
+ Rework.
+ * specs/SUNWaccountsservice.spec,
+ patches/accountsservice-01-polkit.diff: Bump to 0.6.15, rework patch.
+ * specs/SUNWgnome-dialog.spec, base-specs/zenity.spec: Update to 3.4.0
+ and fix packaging.
+ * specs/SUNWgnome-terminal.spec: Fix packaging.
+ * base-specs/vte.spec: Bump to 0.32.1.
+ * patches/vte-01-libtool.diff: Remove patch no longer needed.
+ * patches/vte-01-configure.diff: Rework.
+ * base-specs/gnome-terminal.spec: Bump to 3.4.1.1.
+ * specs/SUNWespeak.spec: Bump to 1.46.0.5
+ * patches/espeak-01-makefile.diff, espeak-02-Wall.diff: Rework.
+ * patches/espeak-02-samplerate.diff: Remove patch no longer needed.
+ * copyright/SUNWgnome-display-mgr.copyright: Update.
+
+2012-05-04 Brian Cameron <[email protected]>
+
+ * base-specs/libgnomeui.spec, patches/libgnomeui-03-math.diff:
+ Bump to 2.24.5. Add patch needed to build.
+ * base-specs/libgweather.spec: Bump to 3.4.1.
+ * base-specs/java-atk-wrapper.spec: Call newer build tools.
+ * base-specs/libgnomekbd.spec,
+ patches/libgnomekbd-01-compile-makefile.diff: Bump to 3.4.0.2.
+ Rework patch.
+ * base-specs/libnotify.spec: Bump to 0.7.5.
+ * base-specs/libgnome.spec: Bump to 2.32.1.
+ * base-specs/libgail-gnome.spec: Bump 1.20.4.
+ * specs/SUNWpulseaudio.spec, base-specs/pulseaudio.spec: Now set
+ optimization -xO2 on sparc to fix CR #7166622.
+ * base-specs/libbonoboui.spec: Bump to 2.24.5.
+ * base-specs/gnome-icon-theme-symbolic.spec: Bump to 3.4.0.
+ * base-specs/gnome-icon-theme.spec: Bump to 3.4.0.
+ * base-specs/at-spi.spec, patches/at-spi2-core-01-configure.diff,
+ patches/at-spi-07-warn-once.diff: Bump to 1.32.0, rework patch 1 and
+ add patch 7 from s11u1 branch.
+ * specs/SUNWgnome-themes-standard.spec: Bump to 3.4.1.
+ * specs/SUNWgsettings-schemas.spec: Bump to 3.2.1.
+ * specs/SUNWpyatspi.spec: Bump to 2.4.0.
+ * specs/SUNWdconf.spec, patches/dconf-01-compile.diff: Bump to 0.12.1
+ and update patch.
+ * specs/SUNWat-spi2-core.spec: Bump to 2.4.1.
+ * specs/SUNWat-spi2-atk.spec: Bump to 2.4.0.
+ * specs/SUNWespeak.spec, patches/espeak-01-makefile.diff: Bump to
+ 1.46.05. Rework patch.
+ * patches/espeak-02-samplerate.diff: Removed patch no longer needed to
+ build.
+ * specs/SUNWgnome-panel.spec, specs/SUNWgnome-remote-desktop.spec,
+ specs/SUNWgnome-pdf-viewer.spec: No longer set echo and RM.
+ * copyright/SUNWgnome-display-mgr.copyright: Update.
+
2012-05-03 Brian Cameron <[email protected]>
* base-specs/gnome-common.spec: Bump to 2.34.0.
--- a/base-specs/GConf.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/GConf.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package GConf
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,12 @@
License: LGPL v2
Group: System/Libraries/GNOME
Provides: GConf
-Version: 3.2.0
+Version: 3.2.5
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Configuration Framework
-Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -37,6 +37,7 @@
Patch6: GConf-06-pkg-config.diff
#owner:migi date:2011-01-13 type:feature
Patch7: GConf-07-multi-user-desktop-optimization.diff
+Patch8: GConf-08-ldap.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -81,12 +82,14 @@
%endif
%patch1 -p1
-%patch2 -p1
+# Patch 2 seems to be upstream.
+#%patch2 -p1
#%patch3 -p1
%patch4 -p1
%patch5 -p1
#%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
%ifos linux
@@ -179,6 +182,8 @@
%{_mandir}/man3/*
%changelog
+* Tue May 08 2012 - [email protected]
+- Bump to 3.2.5.
* Fri Sep 30 2011 - [email protected]
- Bump to 3.2.0.
* Thu Sep 08 2011 - [email protected]
--- a/base-specs/at-spi.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/at-spi.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package at-spi
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,12 +13,12 @@
Name: at-spi
License: LGPL v2
Group: System/Libraries
-Version: 1.30.1
+Version: 1.32.0
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Assistive Technology Service Provider Interface
-Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.30/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.32/%{name}-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -34,6 +34,8 @@
Patch5: at-spi-05-x-error-handlers.diff
# date:2011-06-22 owner:liyuan type:bug bugster:7057247
Patch6: at-spi-06-gnome-session.diff
+# date:2011-11-08 owner:liyuan type:bug bugster:7105039
+Patch7: at-spi-07-warn-once.diff
URL: http://developer.gnome.org/projects/gap/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -81,6 +83,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
%ifos linux
@@ -108,7 +111,7 @@
automake -a -c -f
autoconf
CFLAGS="%optflags"
-LDFLAGS="%{_ldflags}"
+LDFLAGS="%{_ldflags} -lm"
./configure --prefix=%{_prefix} \
--libdir=%{_libdir} \
--bindir=%{_bindir} \
@@ -168,8 +171,12 @@
%{_mandir}/man3/*
%changelog
+* Fri May 04 2012 - [email protected]
+- Bump to 1.32.0.
* Web Jun 22 2011 - [email protected]
- Add at-spi-06-gnome-session.diff.
+* Tue Nov 08 2011 - [email protected]
+- Add at-spi-07-warn-once.diff.
* Fri May 28 2010 - [email protected]
- Add at-spi-04-custom-g-main-context.diff to fix doo 15964.
* Mon Apr 26 2010 - [email protected]
--- a/base-specs/atk.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/atk.spec Fri May 11 21:19:28 2012 +0000
@@ -19,7 +19,6 @@
Vendor: Gnome Community
Summary: ATK - Accesibility Toolkit Libraries
Source: http://ftp.gnome.org/pub/GNOME/sources/atk/2.4/%{name}-%{version}.tar.xz
-Patch1: atk-01-libtool.diff
URL: http://www.gtk.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -45,7 +44,6 @@
%prep
%setup -q
-%patch1 -p1
%build
%ifos linux
--- a/base-specs/control-center.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/control-center.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package control-center.
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -15,12 +15,12 @@
Name: gnome-control-center
License: GPL
Group: System/GUI/GNOME
-Version: 3.2.1
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: The GNOME control center for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.2/gnome-control-center-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.4/gnome-control-center-%{version}.tar.xz
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%ifnarch sparc
Source2: visual-effects-images.tar.bz2
@@ -52,10 +52,12 @@
Patch10: control-center-10-gconf-schema.diff
# date:2011-06-15 owner:stephen type:bug bugster:6992823
Patch11: control-center-11-keyboard-help-action.diff
-# date:2011-07-06 owner:yippi type:branding
-Patch12: control-center-12-libtool.diff
# date:2011-07-07 owner:yippi type:branding
-Patch13: control-center-13-optional-dependencies.diff
+Patch12: control-center-12-optional-dependencies.diff
+# date:2012-05-09 owner:yippi type:feature
+Patch13: control-center-13-mapfile.diff
+# date:2012-05-09 owner:yippi type:bug
+Patch14: control-center-14-static.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -133,6 +135,7 @@
#%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%build
%ifos linux
@@ -165,9 +168,9 @@
bash -x %SOURCE3 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS -I .
+aclocal-1.11 $ACLOCAL_FLAGS -I .
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/X11/share/include" \
@@ -235,6 +238,8 @@
%{_libdir}/*.so
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/desktop-file-utils.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/desktop-file-utils.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package desktop-file-utils
#
-# Copyright (c) 2010 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,12 @@
Name: desktop-file-utils
License: GPLv2
Group: Development/Tools/Other
-Version: 0.17
+Version: 0.20
Release: 1
Distribution: Java Desktop System
Vendor: freedesktop.org
Summary: Desktop file utilities
-Source: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.bz2
+Source: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -58,6 +58,8 @@
%{_datadir}
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 0.20.
* Wed Oct 27 2010 - [email protected]
- Bump to 0.17.
* Thu Apr 15 2010 - [email protected]
--- a/base-specs/gnome-applets.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-applets.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-applets
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,12 +12,12 @@
Name: gnome-applets
License: GPL
Group: System/GUI/GNOME
-Version: 3.2.1
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Applets
-Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz
#owner:gman date:2005-05-11 type:branding
Patch1: gnome-applets-01-disable-drivemount.diff
#owner:gman date:2005-05-11 type:branding
@@ -84,9 +84,9 @@
%build
export PYTHON=/usr/bin/python%{default_python_version}
libtoolize --force
-aclocal $ACLOCAL_FLAGS -I ./m4
+aclocal-1.11 $ACLOCAL_FLAGS -I ./m4
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
autoconf
# Set LIBGWEATHER info as the gweather.pc file has been removed. The interface
@@ -147,6 +147,8 @@
%{_datadir}/pixmaps/*
%changelog
+* Wed May 02 2012 - [email protected]
+- Bump to 3.4.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/gnome-desktop.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-desktop.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-desktop
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,12 @@
Name: gnome-desktop
License: LGPLv2
Group: System/Libraries/GNOME
-Version: 3.2.0
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Desktop Library
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
Source1: blueprint-extra-icons.tar.bz2
Source2: gnome-feedback.xml
Source3: sun-gnome-version.xml
@@ -123,10 +123,10 @@
bash -x %SOURCE8 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS -I ./m4
+aclocal-1.11 $ACLOCAL_FLAGS -I ./m4
autoconf
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
%ifos solaris
release_version="GNOME %{version} Desktop"
@@ -189,6 +189,8 @@
%{_libdir}/libgnome-desktop-2.so
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.1.
* Fri Sep 30 2011 - [email protected]
- Bump to 3.2.0.
* Tue Sep 13 2011 - [email protected]
--- a/base-specs/gnome-icon-theme-symbolic.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-icon-theme-symbolic.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-icon-theme-symbolic
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011,2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,12 +13,12 @@
License: GPL v2
Group: System/GUI/GNOME
BuildArchitectures: noarch
-Version: 3.2.1
+Version: 3.4.0
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Icon Themes
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -75,6 +75,8 @@
%{_libdir}/pkgconfig/gnome-icon-theme.pc
%changelog
+* Fri May 04 2012 - [email protected]
+- Bump to 3.4.0.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/gnome-icon-theme.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-icon-theme.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-icon-theme
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,12 +13,12 @@
License: GPL v2
Group: System/GUI/GNOME
BuildArchitectures: noarch
-Version: 3.2.1
+Version: 3.4.0
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Icon Themes
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
%if %option_with_sun_branding
Source3: branded-throbber.tar.gz
Source4: sun_java.png
@@ -101,6 +101,8 @@
%{_libdir}/pkgconfig/gnome-icon-theme.pc
%changelog
+* Fri May 04 2012 - [email protected]
+- Bump to 3.4.0.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/gnome-menus.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-menus.spec Fri May 11 21:19:28 2012 +0000
@@ -1,6 +1,6 @@
# spec file for package gnome-menus
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,12 +12,12 @@
Name: gnome-menus
License: GPLv2, LGPLv2
Group: System/GUI/GNOME
-Version: 3.2.0
+Version: 3.4.0
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Implementation of Desktop Menu Specification for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
@@ -112,8 +112,8 @@
bash -x %SOURCE2 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS -I m4
-automake -a -c -f
+aclocal-1.11 $ACLOCAL_FLAGS -I m4
+automake-1.11 -a -c -f
autoconf
export LDFLAGS="%_ldflags -lsecdb -lsocket -lnsl -ltsol"
./configure --prefix=%{_prefix} \
@@ -168,6 +168,8 @@
%{_includedir}/gnome-menus/*
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.0.
* Fri Sep 30 2011 - [email protected]
- Bump to 3.2.0.
* Thu Sep 08 2011 - [email protected]
--- a/base-specs/gnome-panel.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-panel.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-panel
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,12 @@
Name: gnome-panel
License: GPLv2,LGPLv2
Group: System/GUI/GNOME
-Version: 3.2.1
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: The GNOME Panel
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/3.2/gnome-panel-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/3.4/gnome-panel-%{version}.tar.xz
%if %option_with_sun_branding
Source1: gnome-main-menu.png
%endif
@@ -83,8 +83,7 @@
# date:2011-06-21 type:branding owner:gheet bugster:7042459,6957745
Patch18: gnome-panel-18-fix-doc.diff
Patch19: gnome-panel-19-fix-l10n-doc.diff
-# date:2011-10-04 type:bug owner:bug
-Patch20: gnome-panel-20-libtool.diff
+Patch20: gnome-panel-20-polkit.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/gnome-panel
@@ -166,7 +165,7 @@
#%patch16 -p1
#%patch17 -p1
#%patch18 -p1
-%patch19 -p1
+#%patch19 -p1
%patch20 -p1
cp %SOURCE3 icons
@@ -208,8 +207,8 @@
bash -x %SOURCE8 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS
-automake -a -c -f
+aclocal-1.11 $ACLOCAL_FLAGS
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS" \
@@ -286,6 +285,8 @@
%{_mandir}/man3/*
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/gnome-session.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-session.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-session
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,12 @@
Name: gnome-session
License: GPLv2
Group: System/GUI/GNOME
-Version: 3.2.1
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Session Manager for the GNOME Desktop
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
Source2: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source3: l10n-configure.sh
@@ -77,9 +77,7 @@
# date:2011-03-29 type:feature owner:yippi bugster:7026714,7049116
Patch25: gnome-session-25-no-warning.diff
# date:2011-07-06 type:feature owner:yippi
-Patch26: gnome-session-26-libtool.diff
-# date:2011-07-06 type:feature owner:yippi
-Patch27: gnome-session-27-upower.diff
+Patch26: gnome-session-26-upower.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -133,7 +131,6 @@
%patch24 -p1
%patch25 -p1
%patch26 -p1
-%patch27 -p1
%build
%ifos linux
@@ -162,9 +159,9 @@
bash -x %SOURCE3 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS -I .
+aclocal-1.11 $ACLOCAL_FLAGS -I .
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
@@ -207,6 +204,8 @@
%{_libdir}/compiz-by-default
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/gnome-settings-daemon.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-settings-daemon.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-settings-daemon.
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -15,12 +15,12 @@
Name: gnome-settings-daemon
License: GPL v2, some code uses LGPL v2
Group: System/GUI/GNOME
-Version: 3.2.1
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: The GNOME Settings Daemon
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.2/gnome-settings-daemon-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.4/gnome-settings-daemon-%{version}.tar.xz
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -49,15 +49,13 @@
# date:2011-02-14 owner:migi type:bug doo:14557
Patch11: gnome-settings-daemon-11-animations-uses-gconf.diff
# date:2011-06-07 owner:yippi type:bug
-Patch12: gnome-settings-daemon-12-no-pnp.diff
+Patch12: gnome-settings-daemon-12-dependencies.diff
# date:2011-06-07 owner:yippi type:bug
Patch13: gnome-settings-daemon-13-uninstalled-pc.diff
# date:2011-08-24 owner:yippi type:feature
-Patch14: gnome-settings-daemon-14-upower.diff
-# date:2011-08-24 owner:yippi type:feature
-Patch15: gnome-settings-daemon-15-mapfile.diff
+Patch14: gnome-settings-daemon-14-mapfile.diff
# date:2011-08-24 owner:yippi type:bug
-Patch16: gnome-settings-daemon-16-libm.diff
+Patch15: gnome-settings-daemon-15-libm.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -118,7 +116,7 @@
#%endif
#%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
#%patch4 -p1
#%patch5 -p1
%patch6 -p1
@@ -131,7 +129,6 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
# Rename dir so that #include does not have to change on gnome-control-center.
# Combines with patch mv-src-dir.diff (see bugzilla 511820).
@@ -162,9 +159,9 @@
bash -x %SOURCE1 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS -I .
+aclocal-1.11 $ACLOCAL_FLAGS -I .
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/X11/share/include" \
@@ -173,7 +170,8 @@
--datadir=%{_datadir} \
--libexecdir=%{_libexecdir} \
--sysconfdir=%{_sysconfdir} \
- --disable-packagekit
+ --disable-packagekit \
+ --disable-gudev
make -j $CPUS
%install
@@ -232,6 +230,8 @@
%{_libdir}/*.so
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/gnome-terminal.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gnome-terminal.spec Fri May 11 21:19:28 2012 +0000
@@ -14,12 +14,12 @@
Name: gnome-terminal
License: GPL v2, LGPL v2
Group: System/GUI/GNOME
-Version: 3.2.1
+Version: 3.4.1.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Terminal
-Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
@@ -132,6 +132,8 @@
%{_mandir}/man1/*
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.1.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Tue Oct 04 2011 - [email protected]
--- a/base-specs/gtk3-engines.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/gtk3-engines.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
-# spec file for package gtk2-engines
+# spec file for package gtk3-engines
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -56,7 +56,7 @@
automake -a -c -f
autoconf
export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%_ldflags -lm"
./configure --prefix=%{_prefix} \
--libdir=%{_libdir}
make -j $CPUS
@@ -83,6 +83,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog -n gtk2-engines
+* Fri May 11 2012 - [email protected]
+- Add -lm to LDFLAGS.
* Thu Jul 07 2011 - [email protected]
- Created with 2.91.1.
--- a/base-specs/java-atk-wrapper.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/java-atk-wrapper.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package java-atk-wrapper
#
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -40,9 +40,10 @@
%patch1 -p1
%build
-aclocal
+libtoolize --force
+aclocal-1.11
autoconf
-automake -a -c -f
+automake-1.11 -a -c -f
CFLAGS="%optflags"
LDFLAGS="%{_ldflags}"
%define java_home /usr/java
@@ -71,6 +72,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri May 04 2012 - [email protected]
+- Use newer autotools.
* Wed Nov 10 2010 - [email protected]
- Bump to 0.30.4.
* Mon Nov 8 2010 - [email protected]
--- a/base-specs/libbonobo.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libbonobo.spec Fri May 11 21:19:28 2012 +0000
@@ -13,12 +13,12 @@
Name: libbonobo
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.24.3
+Version: 2.32.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Bonobo Base Library
-Source: http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.24/libbonobo-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.32/libbonobo-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -165,6 +165,8 @@
%{_mandir}/man3/*
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 2.32.1.
* Sat Apr 3 2010 - [email protected]
- Bump to 2.24.3.
* Wed Sep 23 2009 - [email protected]
--- a/base-specs/libbonoboui.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libbonoboui.spec Fri May 11 21:19:28 2012 +0000
@@ -1,19 +1,18 @@
#
# spec file for package libbonoboui
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
%define owner padraig
#
-
%define OSR LFI#105446 (gnome Exec. summary):n/a
Name: libbonoboui
License: LGPLv2
Group: System/Libraries/GNOME
-Version: 2.24.4
+Version: 2.24.5
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
@@ -133,6 +132,8 @@
%{_mandir}/man3/*.gz
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 2.24.5.
* Wed Oct 27 2010 - [email protected]
- Bump to 2.24.4.
* Mon Apr 12 2010 - [email protected]
--- a/base-specs/libgail-gnome.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libgail-gnome.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package libgail-gnome
#
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,7 +13,7 @@
Name: libgail-gnome
License: LGPL v2
Group: System/Libraries/GNOME
-Version: 1.20.3
+Version: 1.20.4
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
@@ -93,6 +93,8 @@
%{_libdir}/pkgconfig
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 1.20.4.
* Wed Jan 19 2011 - <[email protected]>
- Set License to LGPL v2
* Wed Oct 27 2010 - [email protected]
--- a/base-specs/libgnome.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libgnome.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package libgnome
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,12 +13,12 @@
Name: libgnome
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.30.0
-Release: 5
+Version: 2.32.1
+Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Base Library
-Source: http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.30/libgnome-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.32/libgnome-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -202,6 +202,8 @@
%{_mandir}/man7/*
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 2.32.1.
* Thu Jul 28 2011 - [email protected]
- Bugster 6228681. Enable keyboard accessibility by default.
* Wed Dec 15 2010 - [email protected]
--- a/base-specs/libgnomekbd.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libgnomekbd.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package libgnomekbd
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,13 +11,13 @@
Name: libgnomekbd
License: LGPLv2+
Group: System/Libraries/GNOME
-Version: 3.2.0
+Version: 3.4.0.2
Release: 1
Distribution: Java Desktop System
Vendor: http://www.gnome.org
Summary: A keyboard configuration library
URL: http://gswitchit.sourceforge.net
-Source: http://download.gnome.org/sources/libgnomekbd/3.2/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/libgnomekbd/3.4/%{name}-%{version}.tar.xz
# date:2010-08-02 owner:ja208388 type:bug
Patch1: libgnomekbd-01-compile-makefile.diff
# date:2011-05-06 owner:gheet type:bug bugster:7022446
@@ -109,6 +109,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 3.4.0.2.
* Fri Sep 30 2011 - [email protected]
- Bump to 3.2.0.
* Sat Aug 06 2011 - [email protected]
--- a/base-specs/libgnomeui.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libgnomeui.spec Fri May 11 21:19:28 2012 +0000
@@ -1,19 +1,18 @@
#
# spec file for package libgnomeui
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
%define owner padraig
#
-
%define OSR LFI#105446 (gnome Exec. summary):n/a
Name: libgnomeui
License: LGPL v2
Group: System/Libraries/GNOME
-Version: 2.24.4
+Version: 2.24.5
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
@@ -22,6 +21,7 @@
# date:2004-10-28 bugzilla:129668 owner:padraig type:bug
Patch1: libgnomeui-01-icon-a11y.diff
Patch2: libgnomeui-02-module-sections.diff
+Patch3: libgnomeui-03-math.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -69,6 +69,7 @@
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%ifos linux
@@ -137,6 +138,8 @@
%{_mandir}/man3/*
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 2.24.5.
* Wed Oct 27 2010 - [email protected]
- Bump to 2.24.4.
* Mon Apr 12 2010 - [email protected]
--- a/base-specs/libgweather.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libgweather.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package libgweather
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,12 @@
Name: libgweather
License: GPLv2
Group: System/GUI/GNOME
-Version: 3.2.0
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Library to access weather information from online services
-Source: http://ftp.gnome.org/pub/GNOME/sources/libgweather/3.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/libgweather/3.4/%{name}-%{version}.tar.xz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -45,9 +45,9 @@
#libtoolize --force
intltoolize --force --copy --automake
-aclocal $ACLOCAL_FLAGS -I m4
+aclocal-1.11 $ACLOCAL_FLAGS -I m4
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS" \
@@ -71,8 +71,9 @@
%clean
rm -rf $RPM_BUILD_ROOT
-
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 3.4.1.
* Fri Sep 30 2011 - [email protected]
- Bump to 3.2.0.
* Wed Jul 06 2011 - [email protected]
--- a/base-specs/libnotify.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libnotify.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package libnotify
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,7 +12,7 @@
%define OSR 5892:0.4
Name: libnotify
-Version: 0.7.4
+Version: 0.7.5
Release: 1
Summary: libnotify is a notification system for the GNOME desktop environment.
@@ -21,7 +21,7 @@
URL: http://www.galago-project.org/news/index.php
Distribution: java-desktop-system
Vendor: Galago
-Source: http://download.gnome.org/sources/libnotify/0.7/libnotify-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/libnotify/0.7/libnotify-%{version}.tar.xz
# date:2009-01-20 owner:jedy type:feature bugid:176
Patch1: libnotify-01-uninstalled-pc.diff
@@ -83,6 +83,8 @@
%{_datadir}/gtk-doc/*
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 0.7.5.
* Thu Sep 08 2011 - [email protected]
- Bump to 0.7.4.
* Wed Jul 06 2011 - [email protected]
--- a/base-specs/libwnck.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/libwnck.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package libwnck
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,20 +14,18 @@
Name: libwnck
License: LGPLv2
Group: System/Libraries/GNOME
-Version: 3.2.0
+Version: 3.4.0
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Window Navigator Construction Kit Library
-Source: http://ftp.gnome.org/pub/GNOME/sources/libwnck/3.2/libwnck-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/libwnck/3.4/libwnck-%{version}.tar.xz
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
%endif
#owner:niall date:2006-10-11 type:feature
Patch1: libwnck-01-trusted-extensions.diff
-#owner:yippi date:2011-10-04 type:bug
-Patch2: libwnck-02-libtool.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -66,7 +64,6 @@
cd po-sun; gmake; cd ..
%endif
#%patch1 -p1
-%patch2 -p1
%build
%ifos linux
@@ -89,8 +86,8 @@
%endif
gtkdocize
-aclocal $ACLOCAL_FLAGS
-automake -a -c -f
+aclocal-1.11 $ACLOCAL_FLAGS
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS" \
@@ -121,6 +118,8 @@
%{_datadir}/gtk-doc
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.0.
* Fri Sep 30 2011 - [email protected]
- Bump to 3.2.0.
* Thu Sep 08 2011 - [email protected]
--- a/base-specs/metacity.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/metacity.spec Fri May 11 21:19:28 2012 +0000
@@ -14,12 +14,12 @@
Name: metacity
License: GPL v2
Group: System/GUI/GNOME
-Version: 2.34.1
+Version: 2.34.3
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: GNOME Window Manager
-Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.34/metacity-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.34/metacity-%{version}.tar.xz
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
@@ -86,7 +86,7 @@
%patch7 -p1
%patch8 -p1
#%patch9 -p1
-%patch10 -p1
+#%patch10 -p1
%patch11 -p1
#%patch12 -p1
@@ -166,6 +166,8 @@
%{_mandir}/man1/*
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 2.34.3.
* Thu Jul 07 2011 - [email protected]
- Bump to 2.34.1.
* Sat Apr 03 2010 - [email protected]
--- a/base-specs/nautilus.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/nautilus.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package nautilus
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,13 +13,13 @@
Name: nautilus
License: GPL
Group: Productivity/File utilities
-Version: 3.2.1
+Version: 3.4.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: The GNOME Filemanager
URL: http://www.gnome.org
-Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus/3.2/nautilus-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus/3.4/nautilus-%{version}.tar.xz
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
# NOTE: If the version is bumped the new tarball must be uploaded to the
# Sun Download Center. Contact GNOME RE for assistance.
@@ -61,6 +61,8 @@
Patch15: nautilus-15-rename-places.diff
#owner: yippi date:2011-07-07 type:branding
Patch16: nautilus-16-libxml.diff
+#owner: yippi date:2012-05-09 type:bug
+Patch17: nautilus-17-void-return.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/nautilus2
@@ -141,13 +143,14 @@
%patch6 -p1
%patch7 -p1
#%patch8 -p1 ## not porting this patch until gvfs acl code is ready.
-%patch9 -p1
+#%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch13 -p1
+#%patch13 -p1
#%patch14 -p1
-%patch15 -p1
+#%patch15 -p1
%patch16 -p1
+%patch17 -p1
cp %SOURCE4 icons
cp %SOURCE5 icons
@@ -191,9 +194,9 @@
bash -x %SOURCE3 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS -I .
+aclocal-1.11 $ACLOCAL_FLAGS -I .
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
autoconf
EXTRA_CORE_MODULES="gnome-vfs-2.0 libgnomeui-2.0" \
CFLAGS="$RPM_OPT_FLAGS" \
@@ -249,6 +252,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/base-specs/notification-daemon.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/notification-daemon.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package notificatioin-daemon
#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,7 +11,7 @@
%define OSR 5892:0.4
Name: notification-daemon
-Version: 0.7.2
+Version: 0.7.4
Release: 1
Summary: A notification daemon for the GNOME desktop environment.
@@ -20,11 +20,10 @@
URL: http://www.galago-project.org/news/index.php
Distribution: java-desktop-system
Vendor: Galago
-Source: http://download.gnome.org/sources/notification-daemon/0.7/notification-daemon-%version.tar.bz2
+Source: http://download.gnome.org/sources/notification-daemon/0.7/notification-daemon-%version.tar.xz
# date:2008-11-13 owner:dkenny type:bug bugster:6752569
#Patch1: notification-daemon-01-resize.diff
# date:2011-07-06 owner:yippi type:branding
-Patch1: notification-daemon-01-libtool.diff
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -49,7 +48,7 @@
%prep
%setup -q
-%patch1 -p1
+#%patch1 -p1
%build
%ifos linux
@@ -97,6 +96,8 @@
%{_datadir}/locale/nl
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 0.7.4.
* Thu Sep 15 2011 - [email protected]
- Bump to 0.7.2.
* Wed Jul 06 2011 - [email protected]
--- a/base-specs/pulseaudio.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/pulseaudio.spec Fri May 11 21:19:28 2012 +0000
@@ -66,7 +66,6 @@
# headers are delivered there on Solaris.
#
export CPPFLAGS="-xc99"
-export CFLAGS="%optflags -xc99 -I/usr/include/gc -KPIC"
export LDFLAGS="$SOLARIS_PULSE_LDFLAGS"
autoreconf --force --install
@@ -104,6 +103,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri May 04 2012 - Brian Cameron <[email protected]>
+- Now set optimization -xO2 on sparc to fix CR #7166622.
* Thu Oct 20 2011 - Brian Cameron <[email protected]>
- Bump to 1.1.
* Thu Oct 06 2011 - Brian Cameron <[email protected]>
--- a/base-specs/vte.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/vte.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package vte
#
-# Copyright 2010 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,20 +13,16 @@
Name: vte
License: LGPL v2
Group: System/Libraries
-Version: 0.30.1
+Version: 0.32.1
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Terminal Emulation Widget Library
-Source: http://download.gnome.org/sources/%{name}/0.30/%{name}-%{version}.tar.bz2
-# date:2011-10-04 owner:yippi type:bug
-Patch1: vte-01-libtool.diff
+Source: http://download.gnome.org/sources/%{name}/0.32/%{name}-%{version}.tar.xz
# date:2010-04-07 owner:yippi type:bug bugzilla:616001
-Patch2: vte-02-configure.diff
+Patch1: vte-01-configure.diff
#owner:stephen date:2011-05-19 type:branding bugster:7030662
-Patch3: vte-03-copy-paste-keys.diff
-#owner:yippi date:2011-10-05 type:bug bugzilla:661121
-Patch4: vte-04-void-return.diff
+Patch2: vte-02-copy-paste-keys.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -55,8 +51,6 @@
%setup -q
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
export PYTHON="/usr/bin/python%{default_python_version}"
@@ -73,9 +67,9 @@
libtoolize --force
gtkdocize
-aclocal $ACLOCAL_FLAGS -I .
+aclocal-1.11 $ACLOCAL_FLAGS -I .
autoheader
-automake -a -c -f
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS" \
@@ -139,6 +133,8 @@
%{_libdir}/python%{default_python_version}/vendor-packages/gtk-2.0/vtemodule.so
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump ot 0.32.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 0.30.1.
* Tue Oct 04 2011 - [email protected]
--- a/base-specs/zenity.spec Fri May 11 12:50:41 2012 +0000
+++ b/base-specs/zenity.spec Fri May 11 21:19:28 2012 +0000
@@ -1,7 +1,7 @@
#
# spec file for package zenity
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,12 +13,12 @@
Name: zenity
License: LGPL
Group: System/GUI/GNOME
-Version: 3.2.0
+Version: 3.4.0
Release: 1
Distribution: Java Desktop System
Vendor: Gnome Community
Summary: Show graphical dialog boxes from scripts
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.4/%{name}-%{version}.tar.xz
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -54,7 +54,7 @@
%prep
%setup -q
-%patch1 -p1
+#%patch1 -p1
#%patch2 -p1
%build
@@ -76,8 +76,8 @@
bash -x %SOURCE1 --enable-copyright
%endif
-aclocal $ACLOCAL_FLAGS
-automake -a -c -f
+aclocal-1.11 $ACLOCAL_FLAGS
+automake-1.11 -a -c -f
autoconf
CFLAGS="$RPM_OPT_FLAGS" \
./configure \
@@ -112,6 +112,8 @@
%{_mandir}/man1/*
%changelog
+* Wed May 09 2012 - [email protected]
+- Bump to 3.4.0.
* Wed Oct 05 2011 - [email protected]
- Bump to 3.2.0.
* Thu May 12 2011 - [email protected]
--- a/copyright/SUNWgnome-display-mgr.copyright Fri May 11 12:50:41 2012 +0000
+++ b/copyright/SUNWgnome-display-mgr.copyright Fri May 11 21:19:28 2012 +0000
@@ -1,100 +1,905 @@
-Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+
+Name: %{gdm.name}
+Version: %{gdm.version}
+
+Oracle Internal Tracking Number: 8505
+
+ GNU GENERAL PUBLIC LICENSE
+
+ Version 2, June 1991
+
+
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+
+ of this license document, but changing it is not allowed.
+
+
+
+ Preamble
+
+
+
+ The licenses for most software are designed to take away your
+
+freedom to share and change it. By contrast, the GNU General Public
+
+License is intended to guarantee your freedom to share and change free
+
+software--to make sure the software is free for all its users. This
+
+General Public License applies to most of the Free Software
+
+Foundation's software and to any other program whose authors commit to
+
+using it. (Some other Free Software Foundation software is covered by
+
+the GNU Library General Public License instead.) You can apply it to
+
+your programs, too.
+
+
+
+ When we speak of free software, we are referring to freedom, not
+
+price. Our General Public Licenses are designed to make sure that you
+
+have the freedom to distribute copies of free software (and charge for
+
+this service if you wish), that you receive source code or can get it
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
+if you want it, that you can change the software or use pieces of it
+
+in new free programs; and that you know you can do these things.
+
+
+
+ To protect your rights, we need to make restrictions that forbid
+
+anyone to deny you these rights or to ask you to surrender the rights.
+
+These restrictions translate to certain responsibilities for you if you
+
+distribute copies of the software, or if you modify it.
+
+
+
+ For example, if you distribute copies of such a program, whether
+
+gratis or for a fee, you must give the recipients all the rights that
+
+you have. You must make sure that they, too, receive or can get the
+
+source code. And you must show them these terms so they know their
+
+rights.
+
---------------------------------------------------------------------
+
+ We protect your rights with two steps: (1) copyright the software, and
+
+(2) offer you this license which gives you legal permission to copy,
+
+distribute and/or modify the software.
+
+
+
+ Also, for each author's protection and ours, we want to make certain
+
+that everyone understands that there is no warranty for this free
-Licensing and copyright information for %{name}:
+software. If the software is modified by someone else and passed on, we
+
+want its recipients to know that what they have is not the original, so
+
+that any problems introduced by others will not reflect on the original
+
+authors' reputations.
+
+
+
+ Finally, any free program is threatened constantly by software
+
+patents. We wish to avoid the danger that redistributors of a free
- License: GNU General Public License Version 2
- License: GNU Library General Public License Version 2
- License: GNU Lesser General Public License Version 2
- License: MIT License
-
- You can find more information in the following directory:
- %{_pkg_docdir}
+program will individually obtain patent licenses, in effect making the
+
+program proprietary. To prevent this, we have made it clear that any
+
+patent must be licensed for everyone's free use or not licensed at all.
+
+
+
+ The precise terms and conditions for copying, distribution and
+
+modification follow.
+
+
+
+
+ GNU GENERAL PUBLIC LICENSE
+
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+
+
+ 0. This License applies to any program or other work which contains
+
+a notice placed by the copyright holder saying it may be distributed
+
+under the terms of this General Public License. The "Program", below,
+
+refers to any such program or work, and a "work based on the Program"
+
+means either the Program or any derivative work under copyright law:
+
+that is to say, a work containing the Program or a portion of it,
+
+either verbatim or with modifications and/or translated into another
+
+language. (Hereinafter, translation is included without limitation in
+
+the term "modification".) Each licensee is addressed as "you".
+
+
+
+Activities other than copying, distribution and modification are not
+
+covered by this License; they are outside its scope. The act of
+
+running the Program is not restricted, and the output from the Program
+
+is covered only if its contents constitute a work based on the
+
+Program (independent of having been made by running the Program).
+
+Whether that is true depends on what the Program does.
+
- COPYING.bz2: GNU GPL
- AUTHORS: List of authors of %{gdm.name}
- NEWS.bz2: List of the most important changes in %{gdm.name}
- ChangeLog.bz2: List of all changes and authors of %{gdm.name}
- po/ChangeLog.bz2: List of all changes and authors of %{gdm.name}
- README: More information about %{gdm.name}
+
+ 1. You may copy and distribute verbatim copies of the Program's
+
+source code as you receive it, in any medium, provided that you
+
+conspicuously and appropriately publish on each copy an appropriate
+
+copyright notice and disclaimer of warranty; keep intact all the
+
+notices that refer to this License and to the absence of any warranty;
+
+and give any other recipients of the Program a copy of this License
+
+along with the Program.
+
+
+
+You may charge a fee for the physical act of transferring a copy, and
+
+you may at your option offer warranty protection in exchange for a fee.
+
+
+
+ 2. You may modify your copy or copies of the Program or any portion
+
+of it, thus forming a work based on the Program, and copy and
- ---
+distribute such modifications or work under the terms of Section 1
+
+above, provided that you also meet all of these conditions:
+
+
+
+ a) You must cause the modified files to carry prominent notices
+
+ stating that you changed the files and the date of any change.
+
+
+
+ b) You must cause any work that you distribute or publish, that in
- Some code uses this MIT license:
+ whole or in part contains or is derived from the Program or any
+
+ part thereof, to be licensed as a whole at no charge to all third
+
+ parties under the terms of this License.
+
- Copyright (c) 2007 David Zeuthen <[email protected]>
- Copyright (c) 2007 William Jon McCann <[email protected]>
+
+ c) If the modified program normally reads commands interactively
+
+ when run, you must cause it, when started running for such
+
+ interactive use in the most ordinary way, to print or display an
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+ announcement including an appropriate copyright notice and a
+
+ notice that there is no warranty (or else, saying that you provide
+
+ a warranty) and that users may redistribute the program under
+
+ these conditions, and telling the user how to view a copy of this
+
+ License. (Exception: if the Program itself is interactive but
+
+ does not normally print such an announcement, your work based on
+
+ the Program is not required to print an announcement.)
+
+
+
+
+These requirements apply to the modified work as a whole. If
+
+identifiable sections of that work are not derived from the Program,
+
+and can be reasonably considered independent and separate works in
+
+themselves, then this License, and its terms, do not apply to those
+
+sections when you distribute them as separate works. But when you
+
+distribute the same sections as part of a whole which is a work based
+
+on the Program, the distribution of the whole must be on the terms of
+
+this License, whose permissions for other licensees extend to the
+
+entire whole, and thus to each and every part regardless of who wrote it.
+
+
+
+Thus, it is not the intent of this section to claim rights or contest
+
+your rights to work written entirely by you; rather, the intent is to
+
+exercise the right to control the distribution of derivative or
+
+collective works based on the Program.
+
+
+
+In addition, mere aggregation of another work not based on the Program
+
+with the Program (or with a work based on the Program) on a volume of
+
+a storage or distribution medium does not bring the other work under
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+the scope of this License.
+
+
+
+ 3. You may copy and distribute the Program (or a work based on it,
+
+under Section 2) in object code or executable form under the terms of
+
+Sections 1 and 2 above provided that you also do one of the following:
+
+
+
+ a) Accompany it with the complete corresponding machine-readable
+
+ source code, which must be distributed under the terms of Sections
+
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+
+
+ b) Accompany it with a written offer, valid for at least three
+
+ years, to give any third party, for a charge no more than your
+
+ cost of physically performing source distribution, a complete
+
+ machine-readable copy of the corresponding source code, to be
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ distributed under the terms of Sections 1 and 2 above on a medium
+
+ customarily used for software interchange; or,
+
+
+
+ c) Accompany it with the information you received as to the offer
+
+ to distribute corresponding source code. (This alternative is
+
+ allowed only for noncommercial distribution and only if you
+
+ received the program in object code or executable form with such
- ---
+ an offer, in accord with Subsection b above.)
+
+
+
+The source code for a work means the preferred form of the work for
+
+making modifications to it. For an executable work, complete source
+
+code means all the source code for all modules it contains, plus any
+
+associated interface definition files, plus the scripts used to
+
+control compilation and installation of the executable. However, as a
- The GDM MD5 code uses this zlib/libpng license:
+special exception, the source code distributed need not include
+
+anything that is normally distributed (in either source or binary
+
+form) with the major components (compiler, kernel, and so on) of the
+
+operating system on which the executable runs, unless that component
+
+itself accompanies the executable.
+
+
- gdm-md5.c md5 implementation (based on L Peter Deutsch implementation)
+If distribution of executable or object code is made by offering
+
+access to copy from a designated place, then offering equivalent
+
+access to copy the source code from the same place counts as
+
+distribution of the source code, even though third parties are not
+
+compelled to copy the source along with the object code.
+
+
+
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
- Copyright (C) 2003 Red Hat Inc.
- Copyright (C) 1999, 2000 Aladdin Enterprises. All rights reserved.
+except as expressly provided under this License. Any attempt
+
+otherwise to copy, modify, sublicense or distribute the Program is
+
+void, and will automatically terminate your rights under this License.
+
+However, parties who have received copies, or rights, from you under
+
+this License will not have their licenses terminated so long as such
+
+parties remain in full compliance.
+
+
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
+ 5. You are not required to accept this License, since you have not
+
+signed it. However, nothing else grants you permission to modify or
+
+distribute the Program or its derivative works. These actions are
+
+prohibited by law if you do not accept this License. Therefore, by
+
+modifying or distributing the Program (or any work based on the
+
+Program), you indicate your acceptance of this License to do so, and
+
+all its terms and conditions for copying, distributing or modifying
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
+the Program or works based on it.
+
+
+
+ 6. Each time you redistribute the Program (or any work based on the
+
+Program), the recipient automatically receives a license from the
+
+original licensor to copy, distribute or modify the Program subject to
+
+these terms and conditions. You may not impose any further
+
+restrictions on the recipients' exercise of the rights granted herein.
+
+You are not responsible for enforcing compliance by third parties to
+
+this License.
+
+
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+
+infringement or for any other reason (not limited to patent issues),
+
+conditions are imposed on you (whether by court order, agreement or
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+otherwise) that contradict the conditions of this License, they do not
+
+excuse you from the conditions of this License. If you cannot
+
+distribute so as to satisfy simultaneously your obligations under this
+
+License and any other pertinent obligations, then as a consequence you
+
+may not distribute the Program at all. For example, if a patent
+
+license would not permit royalty-free redistribution of the Program by
+
+all those who receive copies directly or indirectly through you, then
- L. Peter Deutsch
- [email protected]
+the only way you could satisfy both it and this License would be to
+
+refrain entirely from distribution of the Program.
+
+
+
+If any portion of this section is held invalid or unenforceable under
+
+any particular circumstance, the balance of the section is intended to
+
+apply and the section as a whole is intended to apply in other
+
+circumstances.
+
- Independent implementation of MD5 (RFC 1321).
+It is not the purpose of this section to induce you to infringe any
+
+patents or other property right claims or to contest validity of any
+
+such claims; this section has the sole purpose of protecting the
+
+integrity of the free software distribution system, which is
+
+implemented by public license practices. Many people have made
+
+generous contributions to the wide range of software distributed
+
+through that system in reliance on consistent application of that
+
+system; it is up to the author/donor to decide if he or she is willing
+
+to distribute software through any other system and a licensee cannot
+
+impose that choice.
+
+
+
+This section is intended to make thoroughly clear what is believed to
+
+be a consequence of the rest of this License.
+
+
+
+
+ 8. If the distribution and/or use of the Program is restricted in
+
+certain countries either by patents or by copyrighted interfaces, the
+
+original copyright holder who places the Program under this License
+
+may add an explicit geographical distribution limitation excluding
+
+those countries, so that distribution is permitted only in or among
+
+countries not thus excluded. In such case, this License incorporates
+
+the limitation as if written in the body of this License.
+
+
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+
+of the General Public License from time to time. Such new versions will
+
+be similar in spirit to the present version, but may differ in detail to
+
+address new problems or concerns.
+
+
+
+Each version is given a distinguishing version number. If the Program
+
+specifies a version number of this License which applies to it and "any
+
+later version", you have the option of following the terms and conditions
+
+either of that version or of any later version published by the Free
+
+Software Foundation. If the Program does not specify a version number of
+
+this License, you may choose any version ever published by the Free Software
+
+Foundation.
+
+
+
+ 10. If you wish to incorporate parts of the Program into other free
+
+programs whose distribution conditions are different, write to the author
+
+to ask for permission. For software which is copyrighted by the Free
+
+Software Foundation, write to the Free Software Foundation; we sometimes
+
+make exceptions for this. Our decision will be guided by the two goals
+
+of preserving the free status of all derivatives of our free software and
+
+of promoting the sharing and reuse of software generally.
+
+
+
+ NO WARRANTY
+
+
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+
+REPAIR OR CORRECTION.
+
+
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
- This code implements the MD5 Algorithm defined in RFC 1321.
- It is derived directly from the text of the RFC and not from the
- reference implementation.
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+
+POSSIBILITY OF SUCH DAMAGES.
+
+
+
+ END OF TERMS AND CONDITIONS
+
+
+
+
+ How to Apply These Terms to Your New Programs
+
+
+
+ If you develop a new program, and you want it to be of the greatest
+
+possible use to the public, the best way to achieve this is to make it
+
+free software which everyone can redistribute and change under these terms.
+
+
+
+ To do so, attach the following notices to the program. It is safest
+
+to attach them to the start of each source file to most effectively
+
+convey the exclusion of warranty; and each file should have at least
+
+the "copyright" line and a pointer to where the full notice is found.
+
+
+
+ <one line to give the program's name and a brief idea of what it does.>
+
+ Copyright (C) <year> <name of author>
+
+
+
+ This program is free software; you can redistribute it and/or modify
+
+ it under the terms of the GNU General Public License as published by
+
+ the Free Software Foundation; either version 2 of the License, or
+
+ (at your option) any later version.
+
+
+
+ This program is distributed in the hope that it will be useful,
+
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+
+ GNU General Public License for more details.
+
+
+
+ You should have received a copy of the GNU General Public License
+
+ along with this program; if not, write to the Free Software
+
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+
+
+If the program is interactive, make it output a short notice like this
+
+when it starts in an interactive mode:
+
+
+
+ Gnomovision version 69, Copyright (C) year name of author
+
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+
+ This is free software, and you are welcome to redistribute it
+
+ under certain conditions; type `show c' for details.
+
+
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+
+parts of the General Public License. Of course, the commands you use may
+
+be called something other than `show w' and `show c'; they could even be
+
+mouse-clicks or menu items--whatever suits your program.
+
+
+
+You should also get your employer (if you work as a programmer) or your
+
+school, if any, to sign a "copyright disclaimer" for the program, if
+
+necessary. Here is a sample; alter the names:
+
+
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- The original and principal author of md5.c is L. Peter Deutsch
- <[email protected]>.
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+
+
+ <signature of Ty Coon>, 1 April 1989
+
+ Ty Coon, President of Vice
+
+
+
+This General Public License does not permit incorporating your program into
+
+proprietary programs. If your program is a subroutine library, you may
+
+consider it more useful to permit linking proprietary applications with the
+
+library. If this is what you want to do, use the GNU Library General
+
+Public License instead of this License.
+
+
+
+---
+
+
+
+Some code is licensed under the LGPLv2 or later license:
+
+
+
+ Copyright (C) 1999, 2001-2002 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library.
+
+
+
+ The GNU C Library is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Library General Public License as
+
+ published by the Free Software Foundation; either version 2 of the
+
+ License, or (at your option) any later version.
+
+
+
+ The GNU C Library is distributed in the hope that it will be useful,
+
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+
+ Library General Public License for more details.
+
+
+
+ You should have received a copy of the GNU Library General Public
+
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+
+ Boston, MA 02111-1307, USA.
+
+
+
+---
+
+
+
+or with this LGPLv2.1 or later license:
+
+
+
+ The GNU C Library is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+
+ License as published by the Free Software Foundation; either
+
+ version 2.1 of the License, or (at your option) any later version.
+
+
+
+ The GNU C Library is distributed in the hope that it will be useful,
+
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+
+ Lesser General Public License for more details.
+
+
+
+ You should have received a copy of the GNU Lesser General Public
+
+ License along with the GNU C Library; if not, write to the Free
+
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+
+ 02111-1307 USA.
+
+
+
+
+
+---
+
+
+
+Some code uses this MIT license:
+
+
+
+ Copyright (c) 2007 David Zeuthen <[email protected]>
- ---
+ Copyright (c) 2007 William Jon McCann <[email protected]>
+
+
+
+ Permission is hereby granted, free of charge, to any person
+
+ obtaining a copy of this software and associated documentation
+
+ files (the "Software"), to deal in the Software without
+
+ restriction, including without limitation the rights to use,
+
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+
+ copies of the Software, and to permit persons to whom the
+
+ Software is furnished to do so, subject to the following
+
+ conditions:
+
+
+
+ The above copyright notice and this permission notice shall be
+
+ included in all copies or substantial portions of the Software.
+
+
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+
+ OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+---
+
+
+
+The GDM MD5 code uses this zlib/libpng license:
+
+
+
+ gdm-md5.c md5 implementation (based on L Peter Deutsch implementation)
+
+
- The sources of gdm-%{gdm.version} were downloaded
- from %{gdm.SOURCE0.url}
+ Copyright (C) 2003 Red Hat Inc.
+
+ Copyright (C) 1999, 2000 Aladdin Enterprises. All rights reserved.
+
+
+
+ This software is provided 'as-is', without any express or implied
+
+ warranty. In no event will the authors be held liable for any damages
+
+ arising from the use of this software.
+
+
+
+ Permission is granted to anyone to use this software for any purpose,
+
+ including commercial applications, and to alter it and redistribute it
+
+ freely, subject to the following restrictions:
+
+
+
+ 1. The origin of this software must not be misrepresented; you must not
+
+ claim that you wrote the original software. If you use this software
+
+ in a product, an acknowledgment in the product documentation would be
+
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+
+
+
+ L. Peter Deutsch
+
+ [email protected]
+
+
+
+
+
+ Independent implementation of MD5 (RFC 1321).
+
+
+
+ This code implements the MD5 Algorithm defined in RFC 1321.
+
+ It is derived directly from the text of the RFC and not from the
+
+ reference implementation.
+
+
+ The original and principal author of md5.c is L. Peter Deutsch
+
+ <[email protected]>.
--- a/patches/GConf-08-cleanup-libs.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-diff -urN GConf-2.31.1/configure.in ../../SUNWgnome-config-2.31.1.hacked/i386/GConf-2.31.1/configure.in
---- GConf-2.31.1/configure.in 2011-03-10 16:01:09.193252830 +0000
-+++ ../../SUNWgnome-config-2.31.1.hacked/i386/GConf-2.31.1/configure.in 2011-03-11 14:48:35.264352716 +0000
-@@ -142,11 +142,13 @@
- [Enable GTK+ support (for gconf-sanity-check) @<:@default=auto@:>@]),
- , enable_gtk=auto)
-
-+PKGCONFIG_MODULES_GCONF='glib-2.0 > 2.14.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0 dbus-1 >= 1.0.0'
- PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gthread-2.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0 dbus-1 >= 1.0.0 dbus-glib-1 >= 0.74'
- PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0"
- PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.14.0"
- PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.0 libxml-2.0"
-
-+PKG_CHECK_MODULES(DEPENDENT_GCONF, $PKGCONFIG_MODULES_GCONF)
- PKG_CHECK_MODULES(DEPENDENT, $PKGCONFIG_MODULES)
- PKG_CHECK_MODULES(DEPENDENT_WITH_XML, $PKGCONFIG_MODULES_WITH_XML)
-
-@@ -167,6 +169,7 @@
-
- AM_CONDITIONAL(GTK, [test "x$HAVE_GTK" != "xno"])
-
-+AC_SUBST(DEPENDENT_GCONF_LIBS)
- AC_SUBST(DEPENDENT_LIBS)
- AC_SUBST(DEPENDENT_CFLAGS)
- AC_SUBST(DEPENDENT_WITH_XML_LIBS)
-diff -urN GConf-2.31.1/gconf/Makefile.am ../../SUNWgnome-config-2.31.1.hacked/i386/GConf-2.31.1/gconf/Makefile.am
---- GConf-2.31.1/gconf/Makefile.am 2010-04-17 00:33:26.000000000 +0100
-+++ ../../SUNWgnome-config-2.31.1.hacked/i386/GConf-2.31.1/gconf/Makefile.am 2011-03-11 14:49:05.626381743 +0000
-@@ -118,7 +118,7 @@
-
- libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
-
--libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
-+libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_GCONF_LIBS)
-
- -include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
--- a/patches/accountsservice-01-polkit.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/accountsservice-01-polkit.diff Fri May 11 21:19:28 2012 +0000
@@ -1,9 +1,9 @@
---- accountsservice-0.6.12/src/util.c-orig 2011-07-09 15:44:16.535636909 -0500
-+++ accountsservice-0.6.12/src/util.c 2011-07-09 15:55:01.895793937 -0500
+--- accountsservice-0.6.15/src/util.c-orig 2012-05-10 18:07:00.402732206 -0500
++++ accountsservice-0.6.15/src/util.c 2012-05-10 18:07:36.471823338 -0500
@@ -26,6 +26,7 @@
#include <sys/stat.h>
+ #include <sys/wait.h>
#include <fcntl.h>
- #include <wait.h>
+#include <unistd.h>
#include <grp.h>
@@ -126,8 +126,8 @@
+#ifdef HAVE_POLKIT
PolkitSubject *subject;
PolkitSubject *process;
- GError *error;
-@@ -281,4 +340,7 @@ get_caller_uid (DBusGMethodInvocation *c
+
+@@ -272,4 +331,7 @@ get_caller_uid (DBusGMethodInvocation *c
g_object_unref (process);
return TRUE;
@@ -135,9 +135,9 @@
+ return TRUE;
+#endif
}
---- accountsservice-0.6.12/src/daemon.c-orig 2011-07-09 15:41:26.383365256 -0500
-+++ accountsservice-0.6.12/src/daemon.c 2011-07-09 15:49:42.280369620 -0500
-@@ -40,7 +40,9 @@
+--- accountsservice-0.6.15/src/daemon.c-orig 2012-05-10 18:06:53.610798033 -0500
++++ accountsservice-0.6.15/src/daemon.c 2012-05-10 18:08:27.894077014 -0500
+@@ -43,7 +43,9 @@
#include <gio/gio.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -147,8 +147,8 @@
#include "daemon.h"
#include "daemon-glue.h"
-@@ -111,7 +113,11 @@ struct DaemonPrivate {
- guint ck_history_id;
+@@ -114,7 +116,11 @@ struct DaemonPrivate {
+ guint reload_id;
guint autologin_id;
+#if HAVE_POLKIT
@@ -159,17 +159,23 @@
};
static void daemon_finalize (GObject *object);
-@@ -817,7 +823,9 @@ register_accounts_daemon (Daemon *daemon
+@@ -731,6 +737,7 @@ register_accounts_daemon (Daemon *daemon
DBusError dbus_error;
GError *error = NULL;
+#if HAVE_POLKIT
- daemon->priv->authority = polkit_authority_get ();
+ daemon->priv->authority = polkit_authority_get_sync (NULL, &error);
+
+ if (daemon->priv->authority == NULL) {
+@@ -740,6 +747,7 @@ register_accounts_daemon (Daemon *daemon
+ }
+ goto error;
+ }
+#endif
- error = NULL;
daemon->priv->bus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-@@ -1174,6 +1182,7 @@ daemon_create_user (Daemon
+ if (daemon->priv->bus_connection == NULL) {
+@@ -1080,6 +1088,7 @@ daemon_create_user (Daemon
data->real_name = g_strdup (real_name);
data->account_type = account_type;
@@ -177,7 +183,7 @@
daemon_local_check_auth (daemon,
NULL,
"org.freedesktop.accounts.user-administration",
-@@ -1182,6 +1191,7 @@ daemon_create_user (Daemon
+@@ -1088,6 +1097,7 @@ daemon_create_user (Daemon
context,
data,
(GDestroyNotify)create_data_free);
@@ -185,7 +191,7 @@
return TRUE;
}
-@@ -1288,6 +1298,7 @@ check_auth_data_free (CheckAuthData *dat
+@@ -1196,6 +1206,7 @@ check_auth_data_free (CheckAuthData *dat
g_free (data);
}
@@ -193,7 +199,7 @@
static void
check_auth_cb (PolkitAuthority *authority,
GAsyncResult *res,
-@@ -1329,6 +1340,7 @@ check_auth_cb (PolkitAuthority *authorit
+@@ -1237,6 +1248,7 @@ check_auth_cb (PolkitAuthority *authorit
check_auth_data_free (data);
}
@@ -201,7 +207,7 @@
void
daemon_local_check_auth (Daemon *daemon,
-@@ -1341,8 +1353,10 @@ daemon_local_check_auth (Daemon
+@@ -1249,8 +1261,10 @@ daemon_local_check_auth (Daemon
GDestroyNotify destroy_notify)
{
CheckAuthData *data;
@@ -212,7 +218,7 @@
data = g_new0 (CheckAuthData, 1);
data->daemon = g_object_ref (daemon);
-@@ -1353,6 +1367,7 @@ daemon_local_check_auth (Daemon
+@@ -1261,6 +1275,7 @@ daemon_local_check_auth (Daemon
data->data = authorized_cb_data;
data->destroy_notify = destroy_notify;
@@ -220,7 +226,7 @@
subject = polkit_system_bus_name_new (dbus_g_method_get_sender (context));
flags = POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE;
-@@ -1368,6 +1383,13 @@ daemon_local_check_auth (Daemon
+@@ -1276,6 +1291,13 @@ daemon_local_check_auth (Daemon
data);
g_object_unref (subject);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/at-spi-07-warn-once.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,51 @@
+--- at-spi-1.30.1/atk-bridge/bridge.c 2011-11-08 11:47:43.268908925 +0800
++++ at-spi-1.30.1/atk-bridge/bridge.c.mod 2011-11-08 11:53:20.932340393 +0800
+@@ -288,12 +288,17 @@
+ spi_atk_bridge_do_registration (void)
+ {
+ CORBA_Environment ev;
++ static gboolean warned_no_registryd = FALSE;
+
+ CORBA_exception_init(&ev);
+
+ if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL)
+ {
+- g_warning ("Could not locate registry");
++ if (!warned_no_registryd)
++ {
++ warned_no_registryd = TRUE;
++ g_warning ("Could not locate registry");
++ }
+ return FALSE;
+ }
+
+@@ -403,6 +408,7 @@
+ unsigned char *data = NULL;
+ unsigned long nitems;
+ unsigned long leftover;
++ static gboolean warned_no_registryd = FALSE;
+ if (!bridge_display)
+ bridge_display = XOpenDisplay (spi_display_name ());
+
+@@ -413,8 +419,11 @@
+ (long)BUFSIZ, False,
+ (Atom) 31, &actual_type, &actual_format,
+ &nitems, &leftover, &data);
+- if (data == NULL)
+- g_warning (_("AT_SPI_REGISTRY was not started at session startup."));
++ if ((data == NULL) && !warned_no_registryd)
++ {
++ warned_no_registryd = TRUE;
++ g_warning (_("AT_SPI_REGISTRY was not started at session startup."));
++ }
+
+ return (gchar *) data;
+
+@@ -449,7 +458,6 @@
+ }
+ else
+ {
+- g_warning ("IOR not set.");
+ registry = CORBA_OBJECT_NIL;
+ }
+
--- a/patches/at-spi2-core-01-configure.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/at-spi2-core-01-configure.diff Fri May 11 21:19:28 2012 +0000
@@ -9,23 +9,3 @@
AC_PROG_CC
LT_INIT([disable-static])
---- at-spi2-core-2.2.1/atspi/atspi-collection.c-orig 2011-10-24 12:30:13.543035893 -0500
-+++ at-spi2-core-2.2.1/atspi/atspi-collection.c 2011-10-24 12:30:57.166197022 -0500
-@@ -187,7 +187,7 @@ atspi_collection_get_matches_to (AtspiCo
- AtspiMatchRule *rule,
- AtspiCollectionSortOrder sortby,
- AtspiCollectionTreeTraversalType tree,
-- gboolean restrict,
-+ gboolean at_restrict,
- gint count,
- gboolean traverse,
- GError **error)
-@@ -196,7 +196,7 @@ atspi_collection_get_matches_to (AtspiCo
- DBusMessage *reply;
- dbus_int32_t d_sortby = sortby;
- dbus_int32_t d_tree = tree;
-- dbus_bool_t d_restrict = restrict;
-+ dbus_bool_t d_restrict = at_restrict;
- dbus_int32_t d_count = count;
- dbus_bool_t d_traverse = traverse;
-
--- a/patches/atk-01-libtool.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- atk-2.0.1/configure.ac-orig 2011-07-06 00:27:07.917362791 -0500
-+++ atk-2.0.1/configure.ac 2011-07-06 00:27:41.565852019 -0500
-@@ -88,8 +88,7 @@ dnl ====================================
- AC_PROG_CC
-
- # Initialize libtool
--LT_PREREQ([2.2])
--LT_INIT([disable-static win32-dll])
-+AC_PROG_LIBTOOL
-
- AC_CHECK_FUNCS(bind_textdomain_codeset)
-
--- a/patches/control-center-12-libtool.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- gnome-control-center-3.1.3/configure.ac-orig 2011-07-07 13:06:58.348670596 -0500
-+++ gnome-control-center-3.1.3/configure.ac 2011-07-07 13:07:25.408237183 -0500
-@@ -16,8 +16,7 @@ AM_PROG_CC_C_O
- AC_HEADER_STDC
-
- # Initialize libtool
--LT_PREREQ([2.2])
--LT_INIT
-+AC_PROG_LIBTOOL
-
- # .so version for libgnome-control-center
- LIBGNOMECONTROLCENTER_CURRENT=1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-12-optional-dependencies.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,270 @@
+--- gnome-control-center-3.4.1/configure.ac-orig 2012-05-09 16:32:37.913852566 -0500
++++ gnome-control-center-3.4.1/configure.ac 2012-05-09 16:41:12.639884956 -0500
+@@ -96,24 +96,70 @@ PKG_CHECK_MODULES(BACKGROUND_PANEL, $COM
+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
++
++PKG_CHECK_MODULES(POLKIT,
++ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
++ have_polkit=yes,
++ have_polkit=no)
++if test "x$have_polkit" = "xyes" ; then
++ AC_DEFINE(BUILD_INFO_PANEL, [], [Define if we have polkit])
++ AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
++fi
++AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)
++AC_SUBST(HAVE_POLKIT)
++AM_CONDITIONAL(BUILD_INFO_PANEL, test x$have_polkit = xyes)
++AC_SUBST(BUILD_INFO_PANEL)
++AC_SUBST(POLKIT_CFLAGS)
++AC_SUBST(POLKIT_LIBS)
++
+ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0)
+-PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0
+- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
++PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0)
+ PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
+-PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
+- gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
+-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
++
++PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL,
++ $COMMON_MODULES goa-1.0 goa-backend-1.0,
++ have_goa=yes,
++ have_goa=no)
++if test "x$have_goa" = "xyes" ; then
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS_PANEL, [], [Define if we have goa])
++fi
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS_PANEL, test x$have_goa = xyes)
++AC_SUBST(BUILD_HAVE_ONLINE_ACCOUNTS_PANEL)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
++
++PKG_CHECK_MODULES(POWER_PANEL,
++ $COMMON_MODULES upower-glib >= 0.9.1,
++ have_upower_glib=yes,
++ have_upower_glib=no)
++if test "x$have_upower_glib" = "xyes" ; then
++ AC_DEFINE(BUILD_POWER_PANEL, [], [Define if we have upower_glib])
++fi
++AM_CONDITIONAL(BUILD_POWER_PANEL, test x$have_upower_glib = xyes)
++AC_SUBST(HAVE_POWER_PANEL)
++AC_SUBST(POWER_PANEL_CFLAGS)
++AC_SUBST(POWER_PANEL_LIBS)
++
++PKG_CHECK_MODULES(COLOR_PANEL,
++ $COMMON_MODULES colord >= 0.1.8,
++ have_colord=yes,
++ have_colord=no)
++if test "x$have_colord" = "xyes" ; then
++ AC_DEFINE(BUILD_COLOR_PANEL, [], [Define if we have colord])
++fi
++AM_CONDITIONAL(BUILD_COLOR_PANEL, test x$have_colord = xyes)
++AC_SUBST(BUILD_COLOR_PANEL)
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
++PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES)
++
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+ libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+ PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
+@@ -123,14 +169,9 @@ PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_M
+ gsettings-desktop-schemas >= $SCHEMAS_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES gsettings-desktop-schemas >= $SCHEMAS_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
+- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+ gnome-desktop-3.0
+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+ $SYSTEMD)
+-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+
+ GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
+ AC_SUBST(GDESKTOP_PREFIX)
+--- gnome-control-center-3.4.1/panels/region/gnome-region-panel-system.c-orig 2012-05-09 16:32:50.816234726 -0500
++++ gnome-control-center-3.4.1/panels/region/gnome-region-panel-system.c 2012-05-09 16:33:17.526645031 -0500
+@@ -25,7 +25,9 @@
+
+ #include <string.h>
+
++#if HAVE_POLKIT
+ #include <polkit/polkit.h>
++#endif
+
+ #include <glib/gi18n.h>
+
+@@ -440,6 +442,7 @@ setup_system (GtkBuilder *dialog)
+ GDBusConnection *bus;
+ GtkWidget *button;
+
++#if HAVE_POLKIT
+ localed_permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-locale", NULL, NULL, NULL);
+ if (localed_permission == NULL) {
+ GtkWidget *tab_widget, *notebook;
+@@ -456,6 +459,7 @@ setup_system (GtkBuilder *dialog)
+ g_signal_connect (localed_permission, "notify",
+ G_CALLBACK (on_permission_changed), dialog);
+ on_permission_changed (localed_permission, NULL, dialog);
++#endif
+
+
+ button = WID ("copy_settings_button");
+--- gnome-control-center-3.4.1/panels/Makefile.am-orig 2012-05-09 16:31:42.353458814 -0500
++++ gnome-control-center-3.4.1/panels/Makefile.am 2012-05-09 16:34:17.988556913 -0500
+@@ -2,19 +2,14 @@ SUBDIRS= \
+ common \
+ background \
+ screen \
+- power \
+- color \
+ display \
+ mouse \
+- online-accounts \
+ region \
+- info \
+ sound \
+ keyboard \
+ universal-access \
+ user-accounts \
+- datetime \
+- wacom
++ datetime
+
+ if BUILD_PRINTERS
+ SUBDIRS += printers
+@@ -28,4 +23,20 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_POWER_PANEL
++SUBDIRS += printers
++endif
++
++if BUILD_COLOR_PANEL
++SUBDIRS += color
++endif
++
++if BUILD_ONLINE_ACCOUNTS_PANEL
++SUBDIRS += online-accounts
++endif
++
++if BUILD_INFO_PANEL
++SUBDIRS += info
++endif
++
+ -include $(top_srcdir)/git.mk
+--- gnome-control-center-3.4.1/panels/printers/pp-new-printer-dialog.c-orig 2012-05-09 16:31:57.064203558 -0500
++++ gnome-control-center-3.4.1/panels/printers/pp-new-printer-dialog.c 2012-05-09 16:33:17.508751889 -0500
+@@ -22,6 +22,7 @@
+
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <locale.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+--- gnome-control-center-3.4.1/panels/user-accounts/um-user-panel.c-orig 2012-05-09 16:32:21.774110208 -0500
++++ gnome-control-center-3.4.1/panels/user-accounts/um-user-panel.c 2012-05-09 16:35:20.217482883 -0500
+@@ -31,7 +31,9 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#if HAVE_POLKIT
+ #include <polkit/polkit.h>
++#endif
+
+ #ifdef HAVE_CHEESE
+ #include <gst/gst.h>
+@@ -1213,10 +1215,12 @@ setup_main_window (UmUserPanelPrivate *d
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (change_fingerprint), d);
+
++#ifdef HAVE_POLKIT
+ d->permission = (GPermission *)polkit_permission_new_sync ("org.freedesktop.accounts.user-administration", NULL, NULL, NULL);
+ g_signal_connect (d->permission, "notify",
+ G_CALLBACK (on_permission_changed), d);
+ on_permission_changed (d->permission, NULL, d);
++#endif
+
+ button = get_widget (d, "add-user-toolbutton");
+ names[0] = "changes-allow-symbolic";
+--- gnome-control-center-3.4.1/panels/user-accounts/um-utils.c-orig 2012-05-09 16:32:30.608736900 -0500
++++ gnome-control-center-3.4.1/panels/user-accounts/um-utils.c 2012-05-09 16:33:17.521907119 -0500
+@@ -445,6 +445,7 @@ down_arrow (GtkStyleContext *context,
+ }
+
+
++# define UT_NAMESIZE 32
+ #define MAXNAMELEN (UT_NAMESIZE - 1)
+
+ static gboolean
+--- gnome-control-center-3.4.1/panels/datetime/cc-datetime-panel.c-orig 2012-05-09 16:31:31.282312544 -0500
++++ gnome-control-center-3.4.1/panels/datetime/cc-datetime-panel.c 2012-05-09 16:33:50.026738532 -0500
+@@ -34,7 +34,9 @@
+ #include <libintl.h>
+
+ #include <libgnome-desktop/gnome-wall-clock.h>
++#if HAVE_POLKIT
+ #include <polkit/polkit.h>
++#endif
+
+ /* FIXME: This should be "Etc/GMT" instead */
+ #define DEFAULT_TZ "Europe/London"
+@@ -1091,6 +1093,7 @@ cc_date_time_panel_init (CcDateTimePanel
+ }
+ /* We ignore UTC <--> LocalRTC changes at the moment */
+
++#ifdef HAVE_POLKIT
+ /* add the lock button */
+ priv->permission = polkit_permission_new_sync ("org.gnome.controlcenter.datetime.configure", NULL, NULL, NULL);
+ if (priv->permission == NULL)
+@@ -1103,6 +1106,7 @@ cc_date_time_panel_init (CcDateTimePanel
+ g_signal_connect (priv->permission, "notify",
+ G_CALLBACK (on_permission_changed), self);
+ on_permission_changed (priv->permission, NULL, self);
++#endif
+ }
+
+ void
+--- gnome-control-center-3.4.1/panels/printers/cc-printers-panel.c-orig 2012-05-09 17:57:45.172168535 -0500
++++ gnome-control-center-3.4.1/panels/printers/cc-printers-panel.c 2012-05-09 17:58:59.686709206 -0500
+@@ -24,7 +24,9 @@
+ #include <string.h>
+ #include <glib/gi18n-lib.h>
+ #include <glib/gstdio.h>
++#ifdef HAVE_POLKIT
+ #include <polkit/polkit.h>
++#endif
+ #include <gdesktop-enums.h>
+
+ #include <cups/cups.h>
+@@ -2664,9 +2666,14 @@ cc_printers_panel_init (CcPrintersPanel
+ cc_editable_entry_set_selectable (CC_EDITABLE_ENTRY (widget), TRUE);
+
+
++#if HAVE_POLKIT
+ /* Add unlock button */
+ priv->permission = (GPermission *)polkit_permission_new_sync (
+ "org.opensuse.cupspkhelper.mechanism.all-edit", NULL, NULL, NULL);
++#else
++ priv->permission = NULL;
++#endif
++
+ if (priv->permission != NULL)
+ {
+ g_signal_connect (priv->permission, "notify",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-13-mapfile.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,54 @@
+--- gnome-control-center-3.4.1/configure.ac-orig 2012-05-09 17:39:43.544632251 -0500
++++ gnome-control-center-3.4.1/configure.ac 2012-05-09 17:40:10.048314097 -0500
+@@ -272,7 +272,7 @@ AC_SUBST(PANEL_CFLAGS)
+ PANEL_LIBS=""
+ AC_SUBST(PANEL_LIBS)
+
+-PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
++PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)' -Wl,-M,../../mapfile-cc"
+ AC_SUBST(PANEL_LDFLAGS)
+
+ dnl ==============================================
+--- /dev/null 2012-05-09 17:50:06.000000000 -0500
++++ gnome-control-center-3.4.1/mapfile-cc 2012-05-09 17:43:45.432003395 -0500
+@@ -0,0 +1,40 @@
++# CDDL HEADER START
++#
++# The contents of this file are subject to the terms of the
++# Common Development and Distribution License (the "License").
++# You may not use this file except in compliance with the License.
++#
++# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
++# or http://www.opensolaris.org/os/licensing.
++# See the License for the specific language governing permissions
++# and limitations under the License.
++#
++# When distributing Covered Code, include this CDDL HEADER in each
++# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
++# If applicable, add the following below this CDDL HEADER, with the
++# fields enclosed by brackets "[]" replaced with your own identifying
++# information: Portions Copyright [yyyy] [name of copyright owner]
++#
++# CDDL HEADER END
++#
++# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
++# Use is subject to license terms.
++#
++# ident "@(#)mapfile-libsqlite3 1.4 09/06/05 SMI"
++#
++# Defines the public interface to SQLite3
++#
++{
++ global:
++ cc_editable_entry_get_type = FUNCTION extern;
++ cc_editable_entry_get_text = FUNCTION extern;
++ cc_editable_entry_set_editable = FUNCTION extern;
++ cc_editable_entry_set_selectable = FUNCTION extern;
++ cc_editable_entry_set_text = FUNCTION extern;
++ cc_strength_bar_set_fraction = FUNCTION extern;
++ cc_panel_get_type = FUNCTION extern;
++ cc_panel_get_shell = FUNCTION extern;
++ cc_shell_get_toplevel = FUNCTION extern;
++ cc_shell_set_active_panel_from_id = FUNCTION extern;
++ cc_strength_bar_get_type = FUNCTION extern;
++};
--- a/patches/control-center-13-optional-dependencies.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,283 +0,0 @@
---- gnome-control-center-3.1.3/panels/datetime/cc-datetime-panel.c-orig 2011-07-07 15:52:10.490933043 -0500
-+++ gnome-control-center-3.1.3/panels/datetime/cc-datetime-panel.c 2011-07-07 15:52:48.281752269 -0500
-@@ -31,7 +31,9 @@
- #include <string.h>
- #include <stdlib.h>
- #include <libintl.h>
-+#if HAVE_POLKIT
- #include <polkit/polkit.h>
-+#endif
-
- /* FIXME: This should be "Etc/GMT" instead */
- #define DEFAULT_TZ "Europe/London"
-@@ -1039,6 +1039,7 @@ cc_date_time_panel_init (CcDateTimePanel
-
- queue_clock_update (self);
-
-+#ifdef HAVE_POLKIT
- /* add the lock button */
- priv->permission = polkit_permission_new_sync ("org.gnome.settingsdaemon.datetimemechanism.configure", NULL, NULL, NULL);
- if (priv->permission == NULL)
-@@ -1051,6 +1052,7 @@ cc_date_time_panel_init (CcDateTimePanel
- g_signal_connect (priv->permission, "notify",
- G_CALLBACK (on_permission_changed), self);
- on_permission_changed (priv->permission, NULL, self);
-+#endif
- }
-
- void
---- gnome-control-center-3.1.3/panels/Makefile.am-orig 2011-07-07 15:20:24.773352846 -0500
-+++ gnome-control-center-3.1.3/panels/Makefile.am 2011-07-07 15:43:08.735970546 -0500
-@@ -2,15 +2,10 @@ SUBDIRS= \
- common \
- background \
- screen \
-- power \
-- color \
- display \
- media \
- mouse \
-- online-accounts \
- region \
-- info \
-- sound \
- keyboard \
- universal-access \
- user-accounts \
-@@ -24,4 +19,24 @@ if BUILD_NETWORK
- SUBDIRS += network
- endif
-
-+if BUILD_POWER_PANEL
-+SUBDIRS += printers
-+endif
-+
-+if BUILD_COLOR_PANEL
-+SUBDIRS += color
-+endif
-+
-+if BUILD_ONLINE_ACCOUNTS_PANEL
-+SUBDIRS += online-accounts
-+endif
-+
-+if BUILD_INFO_PANEL
-+SUBDIRS += info
-+endif
-+
-+if BUILD_SOUND_PANEL
-+SUBDIRS += sound
-+endif
-+
- -include $(top_srcdir)/git.mk
---- gnome-control-center-3.1.3/panels/printers/pp-new-printer-dialog.c-orig 2011-07-07 15:53:36.090394307 -0500
-+++ gnome-control-center-3.1.3/panels/printers/pp-new-printer-dialog.c 2011-07-07 15:57:28.063571217 -0500
-@@ -22,6 +22,7 @@
-
- #include <unistd.h>
- #include <stdlib.h>
-+#include <locale.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-
---- gnome-control-center-3.1.3/panels/printers/cc-printers-panel.c-orig 2011-07-07 15:57:41.760021245 -0500
-+++ gnome-control-center-3.1.3/panels/printers/cc-printers-panel.c 2011-07-07 15:58:08.196386036 -0500
-@@ -24,7 +24,9 @@
- #include <string.h>
- #include <glib/gi18n-lib.h>
- #include <glib/gstdio.h>
-+#if HAVE_POLKIT
- #include <polkit/polkit.h>
-+#endif
- #include <dbus/dbus-glib.h>
- #include <gdesktop-enums.h>
-
-@@ -2572,6 +2572,7 @@ cc_printers_panel_init (CcPrintersPanel
- cc_editable_entry_set_selectable (CC_EDITABLE_ENTRY (widget), TRUE);
-
-
-+#ifdef HAVE_POLKIT
- /* Add unlock button */
- priv->permission = (GPermission *)polkit_permission_new_sync (
- "org.opensuse.cupspkhelper.mechanism.all-edit", NULL, NULL, NULL);
-@@ -2585,6 +2586,7 @@ cc_printers_panel_init (CcPrintersPanel
- g_warning ("Your system does not have the cups-pk-helper's policy \
- \"org.opensuse.cupspkhelper.mechanism.all-edit\" installed. \
- Please check your installation");
-+#endif
-
- gtk_style_context_get_background_color (gtk_widget_get_style_context (top_widget),
- GTK_STATE_FLAG_NORMAL,
---- gnome-control-center-3.1.3/panels/user-accounts/um-user-panel.c-orig 2011-07-07 15:50:08.133704429 -0500
-+++ gnome-control-center-3.1.3/panels/user-accounts/um-user-panel.c 2011-07-07 15:51:03.619112468 -0500
-@@ -31,7 +31,9 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-+#ifdef HAVE_POLKIT
- #include <polkit/polkit.h>
-+#endif
- #include <dbus/dbus-glib-bindings.h>
-
- #ifdef HAVE_CHEESE
-@@ -1190,10 +1190,12 @@ setup_main_window (UmUserPanelPrivate *d
- g_signal_connect (button, "clicked",
- G_CALLBACK (change_fingerprint), d);
-
-+#ifdef HAVE_POLKIT
- d->permission = (GPermission *)polkit_permission_new_sync ("org.freedesktop.accounts.user-administration", NULL, NULL, NULL);
- g_signal_connect (d->permission, "notify",
- G_CALLBACK (on_permission_changed), d);
- on_permission_changed (d->permission, NULL, d);
-+#endif
-
- button = get_widget (d, "add-user-toolbutton");
- names[0] = "changes-prevent-symbolic";
---- gnome-control-center-3.1.3/panels/user-accounts/um-utils.c-orig 2011-07-07 15:45:41.137719830 -0500
-+++ gnome-control-center-3.1.3/panels/user-accounts/um-utils.c 2011-07-07 15:48:02.810232389 -0500
-@@ -445,6 +445,7 @@ down_arrow (GtkStyleContext *context,
- }
-
-
-+# define UT_NAMESIZE 32
- #define MAXNAMELEN (UT_NAMESIZE - 1)
-
- static gboolean
---- gnome-control-center-3.1.3/configure.ac-orig 2011-07-07 14:22:48.939934543 -0500
-+++ gnome-control-center-3.1.3/configure.ac 2011-07-07 16:09:46.657240213 -0500
-@@ -92,34 +92,92 @@ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES
- PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES dbus-glib-1
-- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
-+
-+PKG_CHECK_MODULES(POLKIT,
-+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
-+ have_polkit=yes,
-+ have_polkit=no)
-+if test "x$have_polkit" = "xyes" ; then
-+ AC_DEFINE(BUILD_INFO_PANEL, [], [Define if we have polkit])
-+ AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
-+fi
-+AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)
-+AC_SUBST(HAVE_POLKIT)
-+AM_CONDITIONAL(BUILD_INFO_PANEL, test x$have_polkit = xyes)
-+AC_SUBST(BUILD_INFO_PANEL)
-+AC_SUBST(POLKIT_CFLAGS)
-+AC_SUBST(POLKIT_LIBS)
-+
- PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES dbus-glib-1 gnome-desktop-3.0 >= 3.1.0)
--PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0
-- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-+PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0)
- PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES gconf-2.0 x11)
- PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
--PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
--PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES dbus-glib-1
-- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-+
-+PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL,
-+ $COMMON_MODULES goa-1.0 goa-backend-1.0
-+ goa-gobject-1 >= $POLKIT_REQUIRED_VERSION,
-+ have_goa=yes,
-+ have_goa=no)
-+if test "x$have_goa" = "xyes" ; then
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS_PANEL, [], [Define if we have goa])
-+fi
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS_PANEL, test x$have_goa = xyes)
-+AC_SUBST(BUILD_HAVE_ONLINE_ACCOUNTS_PANEL)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
-+
-+PKG_CHECK_MODULES(POWER_PANEL,
-+ $COMMON_MODULES upower-glib >= 0.9.1,
-+ have_upower_glib=yes,
-+ have_upower_glib=no)
-+if test "x$have_upower_glib" = "xyes" ; then
-+ AC_DEFINE(BUILD_POWER_PANEL, [], [Define if we have upower_glib])
-+fi
-+AM_CONDITIONAL(BUILD_POWER_PANEL, test x$have_upower_glib = xyes)
-+AC_SUBST(HAVE_POWER_PANEL)
-+AC_SUBST(POWER_PANEL_CFLAGS)
-+AC_SUBST(POWER_PANEL_LIBS)
-+
-+PKG_CHECK_MODULES(COLOR_PANEL,
-+ $COMMON_MODULES colord >= 0.1.8,
-+ have_colord=yes,
-+ have_colord=no)
-+if test "x$have_colord" = "xyes" ; then
-+ AC_DEFINE(BUILD_COLOR_PANEL, [], [Define if we have colord])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR_PANEL, test x$have_colord = xyes)
-+AC_SUBST(BUILD_COLOR_PANEL)
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
-+PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES dbus-glib-1)
-+
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
-- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
- PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
--PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
-- libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
-- libpulse >= $PA_REQUIRED_VERSION
-- libpulse-mainloop-glib >= $PA_REQUIRED_VERSION
-- gconf-2.0)
-+
-+PKG_CHECK_MODULES(SOUND_PANEL,
-+ $COMMON_MODULES libxml-2.0
-+ libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
-+ libpulse >= $PA_REQUIRED_VERSION
-+ libpulse-mainloop-glib >= $PA_REQUIRED_VERSION
-+ gconf-2.0,
-+ have_pulse=yes,
-+ have_pulse=no)
-+if test "x$have_pulse" = "xyes" ; then
-+ AC_DEFINE(BUILD_SOUND_PANEL, [], [Define if we have libpulse])
-+fi
-+AM_CONDITIONAL(BUILD_SOUND_PANEL, test x$have_pulse = xyes)
-+AC_SUBST(BUILD_SOUND_PANEL)
-+AC_SUBST(SOUND_PANEL_CFLAGS)
-+AC_SUBST(SOUND_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES gconf-2.0)
- PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES dbus-glib-1
-- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- gnome-desktop-3.0
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
---- gnome-control-center-3.1.90/panels/region/gnome-region-panel-system.c-orig 2011-09-02 18:02:05.007731037 -0500
-+++ gnome-control-center-3.1.90/panels/region/gnome-region-panel-system.c 2011-09-02 18:03:04.892822596 -0500
-@@ -25,7 +25,9 @@
-
- #include <string.h>
-
-+#if HAVE_POLKIT
- #include <polkit/polkit.h>
-+#endif
-
- #include <glib/gi18n.h>
-
-@@ -415,6 +417,7 @@ setup_system (GtkBuilder *dialog)
- GDBusConnection *bus;
- GtkWidget *button;
-
-+#if HAVE_POLKIT
- localed_permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-locale", NULL, NULL, NULL);
- if (localed_permission == NULL) {
- GtkWidget *tab_widget, *notebook;
-@@ -431,6 +434,7 @@ setup_system (GtkBuilder *dialog)
- g_signal_connect (localed_permission, "notify",
- G_CALLBACK (on_permission_changed), dialog);
- on_permission_changed (localed_permission, NULL, dialog);
-+#endif
-
-
- button = WID ("copy_settings_button");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-14-static.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,38 @@
+--- gnome-control-center-3.4.1/panels/universal-access/zoom-options.c-orig 2012-05-09 17:55:05.361725894 -0500
++++ gnome-control-center-3.4.1/panels/universal-access/zoom-options.c 2012-05-09 17:55:24.481450368 -0500
+@@ -46,9 +46,9 @@ struct _ZoomOptionsPrivate
+
+ G_DEFINE_TYPE (ZoomOptions, zoom_options, G_TYPE_OBJECT);
+
+-inline void set_active (GtkWidget* toggle, gboolean sense);
+-inline gboolean get_active (GtkWidget* toggle);
+-inline void set_sensitive (GtkWidget *widget, gboolean sense);
++static inline void set_active (GtkWidget* toggle, gboolean sense);
++static inline gboolean get_active (GtkWidget* toggle);
++static inline void set_sensitive (GtkWidget *widget, gboolean sense);
+
+ static void set_enable_screen_part_ui (GtkWidget *widget, ZoomOptionsPrivate *priv);
+ static void mouse_tracking_notify_cb (GSettings *settings, const gchar *key, ZoomOptionsPrivate *priv);
+@@ -58,19 +58,19 @@ static void xhairs_length_add_marks (Gtk
+
+ /* Utilties to save on line length */
+
+-inline void
++static inline void
+ set_active (GtkWidget* toggle, gboolean sense)
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), sense);
+ }
+
+-inline gboolean
++static inline gboolean
+ get_active (GtkWidget* toggle)
+ {
+ return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));
+ }
+
+-inline void
++static inline void
+ set_sensitive (GtkWidget *widget, gboolean sense)
+ {
+ gtk_widget_set_sensitive (widget, sense);
--- a/patches/dconf-01-compile.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/dconf-01-compile.diff Fri May 11 21:19:28 2012 +0000
@@ -1,8 +1,8 @@
--- dconf-0.7.5/bin/Makefile.am-orig 2011-07-06 17:25:42.470164797 -0500
+++ dconf-0.7.5/bin/Makefile.am 2011-07-06 17:26:04.082865862 -0500
@@ -1,5 +1,4 @@
--AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings
--CFLAGS += -Wno-error
+-AM_CFLAGS = -Wall -Wmissing-prototypes -Wwrite-strings
+-CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable
+AM_CFLAGS = -xc99
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/engine -I$(top_srcdir)/client -I$(top_srcdir)/gvdb $(gio_CFLAGS)
@@ -32,7 +32,7 @@
AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
--CFLAGS += -Wno-error
+-CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable
dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
@@ -56,7 +56,7 @@
+++ dconf-0.7.5/client/Makefile.am 2011-07-06 17:25:30.722128730 -0500
@@ -1,5 +1,4 @@
-AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -D__dconf_h__ -fPIC -DPIC
--CFLAGS += -Wno-error
+-CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable
+AM_CFLAGS = -xc99 -D__dconf_h__ -fPIC -DPIC
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
@@ -69,3 +69,14 @@
libexec_PROGRAMS = dconf-service
+--- dconf-0.12.1/configure.ac-orig 2012-05-03 16:25:41.700885856 -0500
++++ dconf-0.12.1/configure.ac 2012-05-03 16:25:47.452351034 -0500
+@@ -5,7 +5,7 @@ AC_INIT([dconf],
+
+ AC_CONFIG_SRCDIR([configure.ac])
+ AC_CONFIG_MACRO_DIR([m4])
+-AC_CONFIG_AUX_DIR([aux])
++#AC_CONFIG_AUX_DIR([aux])
+ AC_CONFIG_HEADERS([config.h])
+
+ AM_INIT_AUTOMAKE([1.11 -Wno-portability no-dist-gzip dist-xz])
--- a/patches/desktop-file-utils-01-preserve-file-perm.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/desktop-file-utils-01-preserve-file-perm.diff Fri May 11 21:19:28 2012 +0000
@@ -9,20 +9,20 @@
#include <glib.h>
#include <glib/gi18n.h>
-@@ -313,6 +314,7 @@
+@@ -320,6 +321,7 @@ sync_database (const char *dir, GError *
GError *sync_error;
char *temp_cache_file, *cache_file;
FILE *tmp_file;
+ struct group *bingrp;
+ GList *keys, *key;
temp_cache_file = NULL;
- sync_error = NULL;
-@@ -329,6 +331,9 @@
-
+@@ -345,6 +347,9 @@ sync_database (const char *dir, GError *
+ g_list_free (keys);
fclose (tmp_file);
+ bingrp= getgrnam ("bin");
-+ chown (temp_cache_file, 0, bingrp->gr_gid);
++ chown (temp_cache_file, 0, bingrp->gr_gid);
+
cache_file = g_build_filename (dir, CACHE_FILENAME, NULL);
if (rename (temp_cache_file, cache_file) < 0)
--- a/patches/espeak-01-makefile.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/espeak-01-makefile.diff Fri May 11 21:19:28 2012 +0000
@@ -1,6 +1,6 @@
--- espeak-1.37-source/src/Makefile-orig 2008-08-08 20:04:39.001556000 -0500
+++ espeak-1.37-source/src/Makefile 2008-08-08 20:04:42.246443000 -0500
-@@ -15,7 +15,7 @@ LIB_VERSION = 1
+@@ -16,7 +16,7 @@ LIB_VERSION = 1
LIBTAG = $(LIB_VERSION).$(RELEASE)
# Use SONAME_OPT=-Wl,h, on Solaris
@@ -9,7 +9,7 @@
# Use EXTRA_LIBS=-lm on Solaris
EXTRA_LIBS =
-@@ -60,15 +60,15 @@ libespeak_SOURCES = speak_lib.cpp compil
+@@ -83,15 +83,15 @@ libespeak_SOURCES = speak_lib.cpp compil
SRCS1=$(speak_SOURCES)
OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
@@ -28,12 +28,12 @@
CXXFLAGS=-O2
-@@ -92,7 +92,7 @@ x_%.o: %.cpp
+@@ -114,7 +114,7 @@ x_%.o: %.cpp
-I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
$(LIB_NAME): $(OBJS2)
-- $(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
-+ $(CXX) -G $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
-
- $(STATIC_LIB_NAME): $(OBJS2)
- $(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)
+- $(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \
++ $(CXX) $(LDFLAGS) -G $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \
+ $(OBJS2) $(LIBS2)
+ mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
+ $(LN_SF) $(LIB_NAME).$(LIBTAG) $(LIB_NAME).$(LIB_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/espeak-02-Wall.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,20 @@
+--- espeak-1.44.05-source/src/Makefile-orig 2012-05-04 14:17:53.329647349 -0500
++++ espeak-1.44.05-source/src/Makefile 2012-05-04 14:18:07.373815352 -0500
+@@ -99,7 +99,7 @@ CXXFLAGS=-O2
+ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
+
+ .cpp.o:
+- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
++ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -pedantic -I. -c -fno-exceptions $<
+
+ $(BIN_NAME): $(OBJS1)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS1) $(LIBS1)
+@@ -110,7 +110,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
+
+
+ x_%.o: %.cpp
+- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fpic -fvisibility=hidden -pedantic \
++ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -fpic -fvisibility=hidden -pedantic \
+ -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
+
+ $(LIB_NAME): $(OBJS2)
--- a/patches/espeak-02-samplerate.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- espeak-1.44.05-source/src/wave_sada.cpp-orig 2010-10-27 23:38:38.475656462 -0500
-+++ espeak-1.44.05-source/src/wave_sada.cpp 2010-10-27 23:40:35.828458218 -0500
-@@ -63,6 +63,8 @@ static uint32_t total_samples_skipped;
- //
- static uint32_t last_play_position=0;
-
-+static int wave_samplerate;
-+
- //>
- // wave_init
- //
--- a/patches/espeak-03-Wall.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- espeak-1.44.05-source/src/Makefile.Wall 2010-12-28 18:29:28.427254082 +1300
-+++ espeak-1.44.05-source/src/Makefile 2010-12-28 18:30:10.907033496 +1300
-@@ -77,7 +77,7 @@
- mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
-
- .cpp.o:
-- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
-+ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -I. -c $<
-
- $(BIN_NAME): $(OBJS1)
- $(CXX) -o $@ $(OBJS1) $(LIBS1)
-@@ -88,7 +88,7 @@
-
-
- x_%.o: %.cpp
-- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -fvisibility=hidden -pedantic \
-+ $(CXX) $(CXXFLAGS) $(USE_AUDIO) \
- -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
-
- $(LIB_NAME): $(OBJS2)
--- a/patches/gnome-applets-01-disable-drivemount.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/gnome-applets-01-disable-drivemount.diff Fri May 11 21:19:28 2012 +0000
@@ -1,14 +1,14 @@
--- gnome-applets-2.25.4/Makefile.am.orig 2009-01-07 05:24:37.000000000 +0000
+++ gnome-applets-2.25.4/Makefile.am 2009-01-27 15:45:15.337142728 +0000
-@@ -39,7 +39,6 @@
+@@ -38,7 +38,6 @@ endif
always_built_SUBDIRS = \
charpick \
- drivemount \
geyes \
mini-commander \
- gkb-new \
-@@ -63,7 +62,6 @@
+ stickynotes \
+@@ -61,7 +60,6 @@ SUBDIRS = \
DIST_SUBDIRS = \
po \
modemlights \
--- a/patches/gnome-panel-20-libtool.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- gnome-panel-3.2.0/configure.ac-orig 2011-10-04 01:06:08.098510768 -0500
-+++ gnome-panel-3.2.0/configure.ac 2011-10-04 01:06:20.052671679 -0500
-@@ -22,8 +22,7 @@ AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
-
- GNOME_MAINTAINER_MODE_DEFINES
-
--LT_PREREQ([2.2.6])
--LT_INIT([dlopen disable-static])
-+AC_PROG_LIBTOOL
-
- IT_PROG_INTLTOOL([0.40.6])
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-panel-20-polkit.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,56 @@
+--- gnome-panel-3.4.1/configure.ac-orig 2012-05-09 11:49:37.101576007 -0500
++++ gnome-panel-3.4.1/configure.ac 2012-05-09 11:50:23.272049608 -0500
+@@ -149,10 +149,22 @@ PKG_CHECK_MODULES(TZ, gio-2.0 >= $GLIB_R
+ AC_SUBST(TZ_CFLAGS)
+ AC_SUBST(TZ_LIBS)
+
+-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1)
++PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED)
+ AC_SUBST(CLOCK_CFLAGS)
+ AC_SUBST(CLOCK_LIBS)
+
++PKG_CHECK_MODULES(POLKIT,
++ polkit-gobject-1,
++ have_polkit=yes,
++ have_polkit=no)
++if test "x$have_polkit" = "xyes" ; then
++ AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
++fi
++AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)
++AC_SUBST(HAVE_POLKIT)
++AC_SUBST(POLKIT_CFLAGS)
++AC_SUBST(POLKIT_LIBS)
++
+ DBUS_REQUIRED=1.1.2
+ NETWORK_MANAGER_REQUIRED=0.6
+
+--- gnome-panel-3.4.1/applets/clock/set-timezone.c-orig 2012-05-09 13:00:17.369915353 -0500
++++ gnome-panel-3.4.1/applets/clock/set-timezone.c 2012-05-09 13:01:42.624255743 -0500
+@@ -23,7 +23,9 @@
+ #endif
+
+ #include <gio/gio.h>
++#ifdef HAVE_POLKIT
+ #include <polkit/polkit.h>
++#endif
+
+ #include "set-timezone.h"
+
+@@ -62,6 +64,7 @@ get_system_bus (GError **error)
+ static int
+ can_set (Cache *cache, const gchar *method_name)
+ {
++#if HAVE_POLKIT
+ guint64 now = g_get_monotonic_time ();
+
+ if (now - cache->stamp > (CACHE_VALIDITY_SEC * 1000000))
+@@ -102,6 +105,9 @@ can_set (Cache *cache, const gchar *meth
+ }
+
+ return cache->value;
++#else
++ return 0;
++#endif
+ }
+
+ gint
--- a/patches/gnome-session-26-libtool.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- gnome-session-3.1.3/configure.ac-orig 2011-07-07 01:55:57.965577588 -0500
-+++ gnome-session-3.1.3/configure.ac 2011-07-07 01:56:38.963619002 -0500
-@@ -16,8 +16,7 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genma
- PKG_PROG_PKG_CONFIG()
-
- # Initialize libtool
--LT_PREREQ([2.2.6])
--LT_INIT([dlopen disable-static])
-+AC_PROG_LIBTOOL
-
- GNOME_MAINTAINER_MODE_DEFINES
- GNOME_COMPILE_WARNINGS([maximum])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-session-26-upower.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,178 @@
+--- gnome-session-3.1.3/configure.ac-orig 2011-07-07 05:57:21.376232163 -0500
++++ gnome-session-3.1.3/configure.ac 2011-07-07 05:59:35.847970574 -0500
+@@ -51,10 +51,21 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-3.0 >= $GTK3_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- upower-glib >= $UPOWER_REQUIRED
+ json-glib-1.0 >= $JSON_GLIB_REQUIRED
+ )
+
++PKG_CHECK_MODULES(UPOWER_GLIB,
++ upower-glib >= $UPOWER_REQUIRED,
++ have_upower_glib=yes,
++ have_upower_glib=no)
++if test "x$have_upower_glib" = "xyes" ; then
++ AC_DEFINE(HAVE_UPOWER_GLIB, [], [Define if we have upower_glib])
++fi
++AM_CONDITIONAL(HAVE_UPOWER_GLIB, test x$have_upower_glib = xyes)
++AC_SUBST(HAVE_UPOWER_GLIB)
++AC_SUBST(UPOWER_GLIB_CFLAGS)
++AC_SUBST(UPOWER_GLIB_LIBS)
++
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+ glib-2.0 >= $GLIB_REQUIRED
+ gtk+-3.0 >= $GTK3_REQUIRED
+--- gnome-session-3.1.3/gnome-session/gsm-logout-dialog.c-orig 2011-07-07 06:02:02.990133427 -0500
++++ gnome-session-3.1.3/gnome-session/gsm-logout-dialog.c 2011-07-07 06:05:51.272311123 -0500
+@@ -27,7 +27,9 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+
++#if HAVE_UPOWER_GLIB
+ #include <upower.h>
++#endif
+
+ #include "gsm-logout-dialog.h"
+ #include "gsm-system.h"
+@@ -52,7 +54,11 @@ struct _GsmLogoutDialogPrivate
+ {
+ GsmDialogLogoutType type;
+
++#if HAVE_UPOWER_GLIB
+ UpClient *up_client;
++#else
++ gpointer *up_client;
++#endif
+ GsmSystem *system;
+
+ int timeout;
+@@ -144,7 +150,11 @@ gsm_logout_dialog_init (GsmLogoutDialog
+ gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+ gtk_window_stick (GTK_WINDOW (logout_dialog));
+
++#if HAVE_UPOWER
+ logout_dialog->priv->up_client = up_client_new ();
++#else
++ logout_dialog->priv->up_client = NULL;
++#endif
+
+ logout_dialog->priv->system = gsm_get_system ();
+
+@@ -181,13 +191,21 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ static gboolean
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
++#if HAVE_UPOWER_GLIB
+ return up_client_get_can_suspend (logout_dialog->priv->up_client);
++#else
++ return FALSE;
++#endif
+ }
+
+ static gboolean
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
++#if HAVE_UPOWER_GLIB
+ return up_client_get_can_hibernate (logout_dialog->priv->up_client);
++#else
++ return FALSE;
++#endif
+ }
+
+ static gboolean
+--- gnome-session-3.1.3/gnome-session/main.c-orig 2011-07-07 06:06:10.314939481 -0500
++++ gnome-session-3.1.3/gnome-session/main.c 2011-07-07 06:13:03.202799979 -0500
+@@ -31,9 +31,6 @@
+ #include <glib/gi18n.h>
+ #include <glib.h>
+ #include <gdk/gdkx.h>
+-#include <gtk/gtklabel.h>
+-#include <gtk/gtkvbox.h>
+-#include <gtk/gtkprogressbar.h>
+ #include <gtk/gtk.h>
+
+ #include <dbus/dbus.h>
+@@ -311,10 +308,10 @@ gsm_wait_for_unfinished_postrun ()
+
+ gtk_container_add (GTK_CONTAINER (window), vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+- gtk_box_pack_start_defaults (GTK_BOX (vbox), label);
++ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+ gtk_progress_bar_pulse (GTK_PROGRESS_BAR (progress));
+ func_ref = g_timeout_add (100, postrun_progress_update, progress);
+- gtk_box_pack_start_defaults (GTK_BOX (vbox), progress);
++ gtk_box_pack_start (GTK_BOX (vbox), progress, TRUE, TRUE, 0);
+
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+
+--- gnome-session-3.1.3/gnome-session/gsm-manager.c-orig 2011-07-07 06:06:44.402323550 -0500
++++ gnome-session-3.1.3/gnome-session/gsm-manager.c 2011-07-07 06:09:08.566526684 -0500
+@@ -38,7 +38,9 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
++#if HAVE_UPOWER_GLIB
+ #include <upower.h>
++#endif
+
+ #include <gtk/gtk.h> /* for logout dialog */
+
+@@ -154,7 +156,11 @@ struct GsmManagerPrivate
+ gboolean dbus_disconnected : 1;
+
+ /* Interface with other parts of the system */
++#if HAVE_UPOWER_GLIB
+ UpClient *up_client;
++#else
++ gpointer up_client;
++#endif
+
+ GsmShell *shell;
+ guint shell_end_session_dialog_canceled_id;
+@@ -1114,7 +1120,9 @@ manager_attempt_hibernate (GsmManager *m
+ GError *error;
+ gboolean ret;
+
++#if HAVE_UPOWER_GLIB
+ can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
++
+ if (can_hibernate) {
+
+ /* lock the screen before we suspend */
+@@ -1128,6 +1136,7 @@ manager_attempt_hibernate (GsmManager *m
+ g_error_free (error);
+ }
+ }
++#endif
+ }
+
+ static void
+@@ -1137,6 +1146,7 @@ manager_attempt_suspend (GsmManager *man
+ GError *error;
+ gboolean ret;
+
++#if HAVE_UPOWER_GLIB
+ can_suspend = up_client_get_can_suspend (manager->priv->up_client);
+ if (can_suspend) {
+
+@@ -1151,6 +1161,7 @@ manager_attempt_suspend (GsmManager *man
+ g_error_free (error);
+ }
+ }
++#endif
+ }
+
+ static void
+@@ -2780,7 +2791,11 @@ gsm_manager_init (GsmManager *manager)
+ NULL,
+ NULL, NULL);
+
++#if HAVE_UPOWER_GLIB
+ manager->priv->up_client = up_client_new ();
++#else
++ manager->priv->up_client = NULL;
++#endif
+
+ manager->priv->shell = gsm_get_shell ();
+ }
--- a/patches/gnome-session-27-upower.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
---- gnome-session-3.1.3/configure.ac-orig 2011-07-07 05:57:21.376232163 -0500
-+++ gnome-session-3.1.3/configure.ac 2011-07-07 05:59:35.847970574 -0500
-@@ -51,10 +51,21 @@ PKG_CHECK_MODULES(GNOME_SESSION,
- gio-2.0 >= $GLIB_REQUIRED
- gtk+-3.0 >= $GTK3_REQUIRED
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED
-- upower-glib >= $UPOWER_REQUIRED
- json-glib-1.0 >= $JSON_GLIB_REQUIRED
- )
-
-+PKG_CHECK_MODULES(UPOWER_GLIB,
-+ upower-glib >= $UPOWER_REQUIRED,
-+ have_upower_glib=yes,
-+ have_upower_glib=no)
-+if test "x$have_upower_glib" = "xyes" ; then
-+ AC_DEFINE(HAVE_UPOWER_GLIB, [], [Define if we have upower_glib])
-+fi
-+AM_CONDITIONAL(HAVE_UPOWER_GLIB, test x$have_upower_glib = xyes)
-+AC_SUBST(HAVE_UPOWER_GLIB)
-+AC_SUBST(UPOWER_GLIB_CFLAGS)
-+AC_SUBST(UPOWER_GLIB_LIBS)
-+
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
- glib-2.0 >= $GLIB_REQUIRED
- gtk+-3.0 >= $GTK3_REQUIRED
---- gnome-session-3.1.3/gnome-session/gsm-logout-dialog.c-orig 2011-07-07 06:02:02.990133427 -0500
-+++ gnome-session-3.1.3/gnome-session/gsm-logout-dialog.c 2011-07-07 06:05:51.272311123 -0500
-@@ -27,7 +27,9 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-
-+#if HAVE_UPOWER_GLIB
- #include <upower.h>
-+#endif
-
- #include "gsm-logout-dialog.h"
- #include "gsm-consolekit.h"
-@@ -52,7 +54,11 @@ struct _GsmLogoutDialogPrivate
- {
- GsmDialogLogoutType type;
-
-+#if HAVE_UPOWER_GLIB
- UpClient *up_client;
-+#else
-+ gpointer *up_client;
-+#endif
- GsmConsolekit *consolekit;
-
- int timeout;
-@@ -144,7 +150,11 @@ gsm_logout_dialog_init (GsmLogoutDialog
- gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
- gtk_window_stick (GTK_WINDOW (logout_dialog));
-
-+#if HAVE_UPOWER
- logout_dialog->priv->up_client = up_client_new ();
-+#else
-+ logout_dialog->priv->up_client = NULL;
-+#endif
-
- logout_dialog->priv->consolekit = gsm_get_consolekit ();
-
-@@ -184,13 +194,21 @@ gsm_logout_dialog_destroy (GsmLogoutDial
- static gboolean
- gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
- {
-+#if HAVE_UPOWER_GLIB
- return up_client_get_can_suspend (logout_dialog->priv->up_client);
-+#else
-+ return FALSE;
-+#endif
- }
-
- static gboolean
- gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
- {
-+#if HAVE_UPOWER_GLIB
- return up_client_get_can_hibernate (logout_dialog->priv->up_client);
-+#else
-+ return FALSE;
-+#endif
- }
-
- static gboolean
---- gnome-session-3.1.3/gnome-session/main.c-orig 2011-07-07 06:06:10.314939481 -0500
-+++ gnome-session-3.1.3/gnome-session/main.c 2011-07-07 06:13:03.202799979 -0500
-@@ -31,9 +31,6 @@
- #include <glib/gi18n.h>
- #include <glib.h>
- #include <gdk/gdkx.h>
--#include <gtk/gtklabel.h>
--#include <gtk/gtkvbox.h>
--#include <gtk/gtkprogressbar.h>
- #include <gtk/gtk.h>
-
- #include <dbus/dbus.h>
-@@ -311,10 +308,10 @@ gsm_wait_for_unfinished_postrun ()
-
- gtk_container_add (GTK_CONTAINER (window), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-- gtk_box_pack_start_defaults (GTK_BOX (vbox), label);
-+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
- gtk_progress_bar_pulse (GTK_PROGRESS_BAR (progress));
- func_ref = g_timeout_add (100, postrun_progress_update, progress);
-- gtk_box_pack_start_defaults (GTK_BOX (vbox), progress);
-+ gtk_box_pack_start (GTK_BOX (vbox), progress, TRUE, TRUE, 0);
-
- gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-
---- gnome-session-3.1.3/gnome-session/gsm-manager.c-orig 2011-07-07 06:06:44.402323550 -0500
-+++ gnome-session-3.1.3/gnome-session/gsm-manager.c 2011-07-07 06:09:08.566526684 -0500
-@@ -38,7 +38,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
-+#if HAVE_UPOWER_GLIB
- #include <upower.h>
-+#endif
-
- #include <gtk/gtk.h> /* for logout dialog */
-
-@@ -154,7 +156,11 @@ struct GsmManagerPrivate
- gboolean dbus_disconnected : 1;
-
- /* Interface with other parts of the system */
-+#if HAVE_UPOWER_GLIB
- UpClient *up_client;
-+#else
-+ gpointer up_client;
-+#endif
-
- GsmShell *shell;
- guint shell_end_session_dialog_canceled_id;
-@@ -1114,7 +1120,9 @@ manager_attempt_hibernate (GsmManager *m
- GError *error;
- gboolean ret;
-
-+#if HAVE_UPOWER_GLIB
- can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
-+
- if (can_hibernate) {
-
- /* lock the screen before we suspend */
-@@ -1128,6 +1136,7 @@ manager_attempt_hibernate (GsmManager *m
- g_error_free (error);
- }
- }
-+#endif
- }
-
- static void
-@@ -1137,6 +1146,7 @@ manager_attempt_suspend (GsmManager *man
- GError *error;
- gboolean ret;
-
-+#if HAVE_UPOWER_GLIB
- can_suspend = up_client_get_can_suspend (manager->priv->up_client);
- if (can_suspend) {
-
-@@ -1151,6 +1161,7 @@ manager_attempt_suspend (GsmManager *man
- g_error_free (error);
- }
- }
-+#endif
- }
-
- static void
-@@ -2780,7 +2791,11 @@ gsm_manager_init (GsmManager *manager)
- NULL,
- NULL, NULL);
-
-+#if HAVE_UPOWER_GLIB
- manager->priv->up_client = up_client_new ();
-+#else
-+ manager->priv->up_client = NULL;
-+#endif
-
- manager->priv->shell = gsm_get_shell ();
- }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-settings-daemon-12-dependencies.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,198 @@
+--- gnome-settings-daemon-3.4.1/configure.ac-orig 2012-05-09 15:46:48.200471749 -0500
++++ gnome-settings-daemon-3.4.1/configure.ac 2012-05-09 16:05:00.905688064 -0500
+@@ -103,15 +103,15 @@ dnl - Check for gnome-desktop
+ dnl ---------------------------------------------------------------------------
+ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+
+-dnl ---------------------------------------------------------------------------
+-dnl - Check for LCMS2
+-dnl ---------------------------------------------------------------------------
+-PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no)
+-if test x$have_new_lcms = xyes; then
+- AC_DEFINE(HAVE_NEW_LCMS,1,[Got new lcms2])
+-else
+- PKG_CHECK_MODULES(LCMS, lcms2)
+-fi
++#dnl ---------------------------------------------------------------------------
++#dnl - Check for LCMS2
++#dnl ---------------------------------------------------------------------------
++#PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no)
++#if test x$have_new_lcms = xyes; then
++# AC_DEFINE(HAVE_NEW_LCMS,1,[Got new lcms2])
++#else
++# PKG_CHECK_MODULES(LCMS, lcms2)
++#fi
+
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for libnotify
+@@ -200,17 +200,17 @@ dnl ------------------------------------
+
+ PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra])
+
+-dnl ---------------------------------------------------------------------------
+-dnl - color
+-dnl ---------------------------------------------------------------------------
+-
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++#dnl ---------------------------------------------------------------------------
++#dnl - color
++#dnl ---------------------------------------------------------------------------
++#
++#PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom
+ dnl ---------------------------------------------------------------------------
+
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++#PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
+
+ dnl ==============================================
+ dnl PackageKit section
+@@ -292,7 +292,18 @@ dnl ====================================
+ # ---------------------------------------------------------------------------
+ # UPower
+ # ---------------------------------------------------------------------------
+-PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED_VERSION libcanberra-gtk3)
++PKG_CHECK_MODULES(UPOWER_GLIB,
++ upower-glib >= $UPOWER_REQUIRED_VERSION libcanberra-gtk3,
++ have_upower_glib=yes,
++ have_upower_glib=no)
++if test "x$have_upower_glib" = "xyes" ; then
++ AC_DEFINE(HAVE_UPOWER_GLIB, [], [Define if we have upower_glib])
++fi
++AM_CONDITIONAL(HAVE_UPOWER_GLIB, test x$have_upower_glib = xyes)
++AC_SUBST(HAVE_UPOWER_GLIB)
++AC_SUBST(UPOWER_GLIB_CFLAGS)
++AC_SUBST(UPOWER_GLIB_LIBS)
++
+ if test x$enable_gudev != xno; then
+ PKG_CHECK_MODULES(BACKLIGHT_HELPER,
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
+@@ -512,7 +523,6 @@ echo "
+ Maintainer mode: ${USE_MAINTAINER_MODE}
+
+ Session tracking: ${SESSION_TRACKING}
+- LCMS DICT support: ${have_new_lcms}
+
+ Libnotify support: ${have_libnotify}
+ PackageKit support: ${have_packagekit}
+--- gnome-settings-daemon-3.4.1/plugins/Makefile.am-orig 2012-05-09 15:46:53.739080021 -0500
++++ gnome-settings-daemon-3.4.1/plugins/Makefile.am 2012-05-09 15:59:49.467860816 -0500
+@@ -6,16 +6,13 @@ enabled_plugins = \
+ automount \
+ background \
+ clipboard \
+- color \
+ cursor \
+ dummy \
+- power \
+ housekeeping \
+ keyboard \
+ media-keys \
+ mouse \
+ sound \
+- wacom \
+ xrandr \
+ xsettings \
+ $(NULL)
+--- gnome-settings-daemon-3.4.1/plugins/print-notifications/Makefile.am-orig 2012-05-09 16:20:43.689208890 -0500
++++ gnome-settings-daemon-3.4.1/plugins/print-notifications/Makefile.am 2012-05-09 16:22:25.243764824 -0500
+@@ -25,7 +25,7 @@ libprint_notifications_la_LDFLAGS = \
+
+ libprint_notifications_la_LIBADD = \
+ $(CUPS_LIBS) \
+- $(SETTINGS_PLUGIN_LIBS)
++ $(SETTINGS_PLUGIN_LIBS) $(LIBNOTIFY_LIBS)
+
+ plugin_in_files = \
+ print-notifications.gnome-settings-plugin.in
+--- gnome-settings-daemon-3.4.1/plugins/xrandr/gsd-xrandr-manager.c-orig 2012-05-09 16:18:37.665859617 -0500
++++ gnome-settings-daemon-3.4.1/plugins/xrandr/gsd-xrandr-manager.c 2012-05-09 16:19:53.534620761 -0500
+@@ -38,7 +38,9 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
++#if HAVE_UPOWER_GLIB
+ #include <libupower-glib/upower.h>
++#endif
+ #include <X11/Xatom.h>
+
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+@@ -104,7 +106,9 @@ struct GsdXrandrManagerPrivate
+ GnomeRRScreen *rw_screen;
+ gboolean running;
+
++#if HAVE_UPOWER_GLIB
+ UpClient *upower_client;
++#endif
+ gboolean laptop_lid_is_closed;
+
+ GSettings *settings;
+@@ -461,8 +465,10 @@ apply_configuration_from_filename (GsdXr
+ }
+ }
+
++#if HAVE_UPOWER_GLIB
+ if (up_client_get_lid_is_closed (priv->upower_client))
+ turn_off_laptop_display_in_configuration (priv->rw_screen, config);
++#endif
+
+ gnome_rr_config_ensure_primary (config);
+ success = gnome_rr_config_apply_with_time (config, priv->rw_screen, timestamp, error);
+@@ -850,7 +856,11 @@ config_is_all_off (GnomeRRConfig *config
+ static gboolean
+ laptop_lid_is_closed (GsdXrandrManager *manager)
+ {
++#if HAVE_UPOWER_GLIB
+ return up_client_get_lid_is_closed (manager->priv->upower_client);
++#else
++ return FALSE;
++#endif
+ }
+
+ static gboolean
+@@ -1927,6 +1937,7 @@ turn_off_laptop_display (GsdXrandrManage
+ g_object_unref (config);
+ }
+
++#if HAVE_UPOWER_GLIB
+ static void
+ power_client_changed_cb (UpClient *client, gpointer data)
+ {
+@@ -1953,7 +1964,7 @@ power_client_changed_cb (UpClient *clien
+ use_stored_configuration_or_auto_configure_outputs (manager, GDK_CURRENT_TIME);
+ }
+ }
+-
++#endif
+ gboolean
+ gsd_xrandr_manager_start (GsdXrandrManager *manager,
+ GError **error)
+@@ -1976,10 +1987,12 @@ gsd_xrandr_manager_start (GsdXrandrManag
+
+ g_signal_connect (manager->priv->rw_screen, "changed", G_CALLBACK (on_randr_event), manager);
+
++#if HAVE_UPOWER_GLIB
+ manager->priv->upower_client = up_client_new ();
+ manager->priv->laptop_lid_is_closed = up_client_get_lid_is_closed (manager->priv->upower_client);
+ g_signal_connect (manager->priv->upower_client, "changed",
+ G_CALLBACK (power_client_changed_cb), manager);
++#endif
+
+ log_msg ("State of screen at startup:\n");
+ log_screen (manager->priv->rw_screen);
+@@ -2025,11 +2038,13 @@ gsd_xrandr_manager_stop (GsdXrandrManage
+ manager->priv->rw_screen = NULL;
+ }
+
++#if HAVE_UPOWER_GLIB
+ if (manager->priv->upower_client != NULL) {
+ g_signal_handlers_disconnect_by_data (manager->priv->upower_client, manager);
+ g_object_unref (manager->priv->upower_client);
+ manager->priv->upower_client = NULL;
+ }
++#endif
+
+ if (manager->priv->introspection_data) {
+ g_dbus_node_info_unref (manager->priv->introspection_data);
--- a/patches/gnome-settings-daemon-12-no-pnp.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
---- gnome-settings-daemon-3.1.3/plugins/Makefile.am-orig 2011-07-06 22:46:49.721721914 -0500
-+++ gnome-settings-daemon-3.1.3/plugins/Makefile.am 2011-07-06 22:46:54.732517690 -0500
-@@ -6,7 +6,6 @@ enabled_plugins = \
- automount \
- background \
- clipboard \
-- color \
- cursor \
- datetime \
- dummy \
---- gnome-settings-daemon-3.1.3/configure.ac-orig 2011-07-06 22:49:24.159078844 -0500
-+++ gnome-settings-daemon-3.1.3/configure.ac 2011-07-06 22:49:39.465472031 -0500
-@@ -21,7 +21,6 @@ AC_STDC_HEADERS
- AC_PROG_CXX
- AM_PROG_CC_C_O
- AC_PROG_LIBTOOL
--AC_PATH_PNPIDS
-
- AC_HEADER_STDC
-
-@@ -115,11 +114,6 @@ dnl ------------------------------------
- PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-
- dnl ---------------------------------------------------------------------------
--dnl - Check for colord
--dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
--
--dnl ---------------------------------------------------------------------------
- dnl - Check for libcanberra
- dnl ---------------------------------------------------------------------------
- PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3,
-@@ -128,15 +122,15 @@ PKG_CHECK_MODULES(LIBCANBERRA, libcanber
- [have_libcanberra=false])
- AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xtrue")
-
--dnl ---------------------------------------------------------------------------
--dnl - Check for LCMS2
--dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no)
--if test x$have_new_lcms = xyes; then
-- AC_DEFINE(HAVE_NEW_LCMS,1,[Got new lcms2])
--else
-- PKG_CHECK_MODULES(LCMS, lcms2)
--fi
-+#dnl ---------------------------------------------------------------------------
-+#dnl - Check for LCMS2
-+#dnl ---------------------------------------------------------------------------
-+#PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no)
-+#if test x$have_new_lcms = xyes; then
-+# AC_DEFINE(HAVE_NEW_LCMS,1,[Got new lcms2])
-+#else
-+# PKG_CHECK_MODULES(LCMS, lcms2)
-+#fi
-
- dnl ---------------------------------------------------------------------------
- dnl - Check for libnotify
-@@ -623,5 +617,4 @@ ${NSS_DATABASE:+\
- System nssdb: ${NSS_DATABASE}
- }\
- Profiling support: ${enable_profiling}
-- pnp.ids filename: ${ac_with_pnpids}
- "
--- a/patches/gnome-settings-daemon-13-uninstalled-pc.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/gnome-settings-daemon-13-uninstalled-pc.diff Fri May 11 21:19:28 2012 +0000
@@ -1,9 +1,9 @@
---- gnome-settings-daemon-3.1.3/data/gnome-settings-daemon-uninstalled.pc.in-orig 2011-07-07 17:21:52.358527129 -0500
-+++ gnome-settings-daemon-3.1.3/data/gnome-settings-daemon-uninstalled.pc.in 2011-07-07 17:23:15.634457176 -0500
+--- gnome-settings-daemon-3.4.1/data/gnome-settings-daemon-uninstalled.pc.in-orig 2012-05-09 18:03:43.499385146 -0500
++++ gnome-settings-daemon-3.4.1/data/gnome-settings-daemon-uninstalled.pc.in 2012-05-09 18:03:59.168875339 -0500
@@ -8,5 +8,5 @@ Name: gnome-settings-daemon
Description: Utility library for accessing gnome-settings-daemon over DBUS
- Requires: glib-2.0 dbus-1 dbus-glib-1
+ Requires: glib-2.0
Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-settings-daemon.la
-+Libs: ${pc_top_builddir}/${pcfiledir}/../gnome-settings-daemon/libgsd-profile.la
++Libs: ${pc_top_builddir}/${pcfiledir}/../gnome-settings-daemon/libgsd.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/..
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-settings-daemon-14-mapfile.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,44 @@
+--- gnome-settings-daemon-3.1.5/configure.ac-orig 2011-08-24 09:18:29.710425446 -0500
++++ gnome-settings-daemon-3.1.5/configure.ac 2011-08-24 09:18:58.492535062 -0500
+@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(SETTINGS_PLUGIN,
+ x11
+ )
+
+-GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
++GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined -Wl,-M,../../mapfile-gsd"
+ case $host_os in
+ darwin*)
+ GSD_PLUGIN_LDFLAGS="${GSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/gnome-settings-daemon/gnome-settings-daemon"
+--- /dev/null 2011-08-24 09:21:19.000000000 -0500
++++ gnome-settings-daemon-3.1.5/mapfile-gsd 2011-08-23 16:00:23.238440669 -0500
+@@ -0,0 +1,30 @@
++# CDDL HEADER START
++#
++# The contents of this file are subject to the terms of the
++# Common Development and Distribution License (the "License").
++# You may not use this file except in compliance with the License.
++#
++# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
++# or http://www.opensolaris.org/os/licensing.
++# See the License for the specific language governing permissions
++# and limitations under the License.
++#
++# When distributing Covered Code, include this CDDL HEADER in each
++# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
++# If applicable, add the following below this CDDL HEADER, with the
++# fields enclosed by brackets "[]" replaced with your own identifying
++# information: Portions Copyright [yyyy] [name of copyright owner]
++#
++# CDDL HEADER END
++#
++# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
++# Use is subject to license terms.
++#
++# ident "@(#)mapfile-libsqlite3 1.4 09/06/05 SMI"
++#
++# Defines the public interface to SQLite3
++#
++{
++ global:
++ gnome_settings_plugin_get_type = FUNCTION extern;
++};
--- a/patches/gnome-settings-daemon-14-upower.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
---- gnome-settings-daemon-3.1.4/configure.ac-orig 2011-08-07 10:05:01.072994698 -0500
-+++ gnome-settings-daemon-3.1.4/configure.ac 2011-08-07 10:06:07.306266011 -0500
-@@ -371,7 +371,17 @@ dnl ====================================
- # ---------------------------------------------------------------------------
- # UPower
- # ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1)
-+PKG_CHECK_MODULES(UPOWER_GLIB,
-+ upower-glib >= 0.9.1,
-+ have_upower_glib=yes,
-+ have_upower_glib=no)
-+if test "x$have_upower_glib" = "xyes" ; then
-+ AC_DEFINE(HAVE_UPOWER_GLIB, [], [Define if we have upower_glib])
-+fi
-+AM_CONDITIONAL(HAVE_UPOWER_GLIB, test x$have_upower_glib = xyes)
-+AC_SUBST(HAVE_UPOWER_GLIB)
-+AC_SUBST(UPOWER_GLIB_CFLAGS)
-+AC_SUBST(UPOWER_GLIB_LIBS)
-
- # ---------------------------------------------------------------------------
- # PolicyKit
---- gnome-settings-daemon-3.1.4/plugins/Makefile.am-orig 2011-10-21 02:09:15.776791165 -0500
-+++ gnome-settings-daemon-3.1.4/plugins/Makefile.am 2011-10-21 02:09:53.540769249 -0500
-@@ -9,7 +9,6 @@ enabled_plugins = \
- cursor \
- datetime \
- dummy \
-- power \
- housekeeping \
- keybindings \
- keyboard \
-@@ -23,6 +22,12 @@ enabled_plugins = \
-
- disabled_plugins = $(NULL)
-
-+if HAVE_UPOWER_GLIB
-+enabled_plugins += power
-+else
-+disabled_plugins += power
-+endif
-+
- if BUILD_GCONF_BRIDGE
- enabled_plugins += gconf
- else
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-settings-daemon-15-libm.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon-3.1.90/plugins/mouse/Makefile.am-orig 2011-09-02 17:50:25.041850759 -0500
++++ gnome-settings-daemon-3.1.90/plugins/mouse/Makefile.am 2011-09-02 17:50:31.945240204 -0500
+@@ -23,7 +23,7 @@ libmouse_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+ libmouse_la_LDFLAGS = \
+- $(GSD_PLUGIN_LDFLAGS)
++ $(GSD_PLUGIN_LDFLAGS) -lm
+
+ libmouse_la_LIBADD = \
+ $(MOUSE_LIBS) \
--- a/patches/gnome-settings-daemon-15-mapfile.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
---- gnome-settings-daemon-3.1.5/configure.ac-orig 2011-08-24 09:18:29.710425446 -0500
-+++ gnome-settings-daemon-3.1.5/configure.ac 2011-08-24 09:18:58.492535062 -0500
-@@ -81,7 +81,7 @@ PKG_CHECK_MODULES(BACKLIGHT_HELPER,
- gio-2.0 >= $GIO_REQUIRED_VERSION
- )
-
--GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
-+GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined -Wl,-M,../../mapfile-gsd"
- case $host_os in
- darwin*)
- GSD_PLUGIN_LDFLAGS="${GSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/gnome-settings-daemon/gnome-settings-daemon"
---- /dev/null 2011-08-24 09:21:19.000000000 -0500
-+++ gnome-settings-daemon-3.1.5/mapfile-gsd 2011-08-23 16:00:23.238440669 -0500
-@@ -0,0 +1,30 @@
-+# CDDL HEADER START
-+#
-+# The contents of this file are subject to the terms of the
-+# Common Development and Distribution License (the "License").
-+# You may not use this file except in compliance with the License.
-+#
-+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-+# or http://www.opensolaris.org/os/licensing.
-+# See the License for the specific language governing permissions
-+# and limitations under the License.
-+#
-+# When distributing Covered Code, include this CDDL HEADER in each
-+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-+# If applicable, add the following below this CDDL HEADER, with the
-+# fields enclosed by brackets "[]" replaced with your own identifying
-+# information: Portions Copyright [yyyy] [name of copyright owner]
-+#
-+# CDDL HEADER END
-+#
-+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-+# Use is subject to license terms.
-+#
-+# ident "@(#)mapfile-libsqlite3 1.4 09/06/05 SMI"
-+#
-+# Defines the public interface to SQLite3
-+#
-+{
-+ global:
-+ gnome_settings_plugin_get_type = FUNCTION extern;
-+};
--- a/patches/gnome-settings-daemon-16-libm.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-settings-daemon-3.1.90/plugins/mouse/Makefile.am-orig 2011-09-02 17:50:25.041850759 -0500
-+++ gnome-settings-daemon-3.1.90/plugins/mouse/Makefile.am 2011-09-02 17:50:31.945240204 -0500
-@@ -23,7 +23,7 @@ libmouse_la_CFLAGS = \
- $(AM_CFLAGS)
-
- libmouse_la_LDFLAGS = \
-- $(GSD_PLUGIN_LDFLAGS)
-+ $(GSD_PLUGIN_LDFLAGS) -lm
-
- libmouse_la_LIBADD = \
- $(MOUSE_LIBS) \
--- a/patches/libgnomekbd-01-compile-makefile.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/libgnomekbd-01-compile-makefile.diff Fri May 11 21:19:28 2012 +0000
@@ -1,16 +1,5 @@
---- libgnomekbd-3.0.0/capplet/Makefile.am-orig 2011-07-06 21:56:27.454390998 -0500
-+++ libgnomekbd-3.0.0/capplet/Makefile.am 2011-07-06 21:56:32.301056162 -0500
-@@ -11,7 +11,7 @@ Desktop_in_files = gkbd-indicator-plugin
- desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-
- gkbd_indicator_plugins_capplet_CFLAGS = \
-- -I$(top_srcdir) -Wall \
-+ -I$(top_srcdir) \
- $(GCONF_CFLAGS) \
- $(GTK_CFLAGS) \
- $(LIBXKLAVIER_CFLAGS) \
---- libgnomekbd-3.0.0/test/Makefile.am-orig 2011-07-06 21:56:13.326212350 -0500
-+++ libgnomekbd-3.0.0/test/Makefile.am 2011-07-06 21:56:18.267538065 -0500
+--- libgnomekbd-3.4.0.2/test/Makefile.am-orig 2012-05-04 12:29:53.888573660 -0500
++++ libgnomekbd-3.4.0.2/test/Makefile.am 2012-05-04 12:29:59.997036636 -0500
@@ -2,7 +2,7 @@ noinst_PROGRAMS = gkbd-indicator-test \
gkbd-keyboard-drawing-test \
gkbd-status-test
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgnomeui-03-math.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,11 @@
+--- libgnomeui-2.24.5/libgnomeui/Makefile.am-orig 2012-05-03 21:33:33.637119224 -0500
++++ libgnomeui-2.24.5/libgnomeui/Makefile.am 2012-05-03 21:33:57.721945284 -0500
+@@ -249,7 +249,7 @@ libgnomeui_2_la_LDFLAGS = \
+ libgnomeui_2_la_LIBADD = \
+ $(LIBGNOMEUI_LIBS) \
+ $(SM_LIBS) \
+- $(X11_LIBS)
++ $(X11_LIBS) -lm
+
+ LDADD = \
+ libgnomeui-2.la $(LIBGNOMEUI_LIBS)
--- a/patches/libwnck-02-libtool.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- libwnck-3.2.0/configure.ac-orig 2011-10-04 00:45:27.047917014 -0500
-+++ libwnck-3.2.0/configure.ac 2011-10-04 00:46:30.682441999 -0500
-@@ -42,8 +42,7 @@ AC_SUBST(WNCK_MAJOR_VERSION)
- AC_SUBST(WNCK_MINOR_VERSION)
- AC_SUBST(WNCK_MICRO_VERSION)
-
--LT_PREREQ([2.2.6])
--LT_INIT([dlopen disable-static])
-+AC_PROG_LIBTOOL
-
- IT_PROG_INTLTOOL([0.40.6])
-
--- a/patches/nautilus-03-ftp-rename.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/nautilus-03-ftp-rename.diff Fri May 11 21:19:28 2012 +0000
@@ -7,10 +7,10 @@
+#include "nautilus-file-private.h"
+#include "nautilus-file.h"
+
- #include <eel/eel-gtk-extensions.h>
- #include <eel/eel-gtk-macros.h>
- #include <eel/eel-string.h>
-@@ -649,9 +652,17 @@
+ #include <eel/eel-vfs-extensions.h>
+ #include <gio/gio.h>
+ #include <glib/gi18n.h>
+@@ -646,9 +649,17 @@ nautilus_bookmark_uri_known_not_to_exist
{
char *path_name;
gboolean exists;
--- a/patches/nautilus-07-lockdown.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/nautilus-07-lockdown.diff Fri May 11 21:19:28 2012 +0000
@@ -42,15 +42,15 @@
G_CALLBACK (async_data_preference_changed_callback),
--- nautilus-3.1.3/libnautilus-private/nautilus-file.c.orig 2011-07-20 10:28:46.132094358 +0100
+++ nautilus-3.1.3/libnautilus-private/nautilus-file.c 2011-07-20 10:32:12.597624478 +0100
-@@ -45,6 +45,7 @@
- #include "nautilus-thumbnails.h"
- #include "nautilus-vfs-file.h"
+@@ -47,6 +47,7 @@
+ #include "nautilus-file-undo-operations.h"
+ #include "nautilus-file-undo-manager.h"
#include "nautilus-saved-search-file.h"
+#include "nautilus-lockdown.h"
#include <eel/eel-debug.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
-@@ -3319,6 +3320,7 @@ nautilus_file_should_show (NautilusFile
+@@ -3335,6 +3336,7 @@ nautilus_file_should_show (NautilusFile
return TRUE;
} else {
return (show_hidden || (!nautilus_file_is_hidden_file (file) && !is_file_hidden (file))) &&
@@ -539,7 +539,7 @@
+#endif /* __NAUTILUS_LOCKDOWN_H__ */
--- nautilus-3.1.3/src/nautilus-view.c.orig 2011-07-20 12:13:03.112995621 +0100
+++ nautilus-3.1.3/src/nautilus-view.c 2011-07-20 12:16:08.990810763 +0100
-@@ -294,6 +294,7 @@
+@@ -296,6 +296,7 @@ static void unschedule_display_of_pe
static void disconnect_model_handlers (NautilusView *view);
static void metadata_for_directory_as_file_ready_callback (NautilusFile *file,
gpointer callback_data);
@@ -547,15 +547,15 @@
static void metadata_for_files_in_directory_ready_callback (NautilusDirectory *directory,
GList *files,
gpointer callback_data);
-@@ -2595,6 +2596,7 @@
+@@ -2562,6 +2563,7 @@ nautilus_view_init (NautilusView *view)
g_signal_connect_swapped (nautilus_window_state,
"changed::" NAUTILUS_WINDOW_STATE_START_WITH_STATUS_BAR,
G_CALLBACK (nautilus_view_display_selection_info), view);
-+ nautilus_lockdown_notify_add (lockdown_changed_callback, view);
- }
-
- static void
-@@ -2707,6 +2709,7 @@
++ nautilus_lockdown_notify_add (lockdown_changed_callback, view);
+
+ manager = nautilus_file_undo_manager_get ();
+ g_signal_connect_object (manager, "undo-changed",
+@@ -2683,6 +2685,7 @@ nautilus_view_finalize (GObject *object)
g_signal_handlers_disconnect_by_func (gnome_lockdown_preferences,
schedule_update_menus, view);
@@ -563,7 +563,7 @@
unschedule_pop_up_location_context_menu (view);
if (view->details->location_popup_event != NULL) {
-@@ -9139,6 +9142,15 @@
+@@ -9112,6 +9115,15 @@ metadata_for_files_in_directory_ready_ca
finish_loading_if_all_metadata_loaded (view);
}
@@ -686,17 +686,17 @@
{
--- nautilus-3.1.3/src/nautilus-window.c.orig 2011-07-20 12:20:56.154446450 +0100
+++ nautilus-3.1.3/src/nautilus-window.c 2011-07-20 12:23:54.684091436 +0100
-@@ -655,6 +655,7 @@
+@@ -617,6 +617,7 @@ nautilus_window_constructed (GObject *se
- slot = nautilus_window_open_slot (window->details->active_pane, 0);
+ slot = nautilus_window_pane_open_slot (window->details->active_pane, 0);
nautilus_window_set_active_slot (window, slot);
+ nautilus_window_menus_lockdown_notify_add (window);
}
static void
-@@ -756,6 +757,8 @@
-
- g_object_unref (window->details->ui_manager);
+@@ -726,6 +727,8 @@ nautilus_window_finalize (GObject *objec
+ /* nautilus_window_close() should have run */
+ g_assert (window->details->panes == NULL);
+ nautilus_window_menus_lockdown_notify_remove(window);
+
@@ -808,9 +808,9 @@
#define NAUTILUS_PREFERENCES_SHOW_DESKTOP "show-desktop-icons"
--- nautilus-3.1.3/src/nautilus-window-private.h.orig 2011-06-28 14:41:41.000000000 +0100
+++ nautilus-3.1.3/src/nautilus-window-private.h 2011-07-20 13:22:02.919610157 +0100
-@@ -174,6 +174,8 @@ void nautilus_window_remov
+@@ -159,6 +159,8 @@ void nautilus_window_initi
+ void nautilus_window_finalize_menus (NautilusWindow *window);
- void nautilus_window_remove_bookmarks_menu_items (NautilusWindow *window);
void nautilus_window_update_show_hide_menu_items (NautilusWindow *window);
+void nautilus_window_menus_lockdown_notify_add (NautilusWindow *window);
+void nautilus_window_menus_lockdown_notify_remove (NautilusWindow *window);
--- a/patches/nautilus-16-libxml.diff Fri May 11 12:50:41 2012 +0000
+++ b/patches/nautilus-16-libxml.diff Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
@@ -6,7 +6,7 @@ m4_define(glib_minver, 2
m4_define(gnome_desktop_minver, 3.0.0)
m4_define(pango_minver, 1.28.3)
- m4_define(gtk_minver, 3.1.6)
+ m4_define(gtk_minver, 3.3.17)
-m4_define(xml_minver, 2.7.8)
+m4_define(xml_minver, 2.7.6)
m4_define(exif_minver, 0.6.20)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nautilus-17-void-return.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,26 @@
+--- nautilus-3.4.1/libnautilus-private/nautilus-file-undo-operations.c-orig 2012-05-09 19:17:48.885648401 -0500
++++ nautilus-3.4.1/libnautilus-private/nautilus-file-undo-operations.c 2012-05-09 19:18:55.949338007 -0500
+@@ -257,9 +257,9 @@ nautilus_file_undo_info_get_strings (Nau
+ gchar **redo_label,
+ gchar **redo_description)
+ {
+- return NAUTILUS_FILE_UNDO_INFO_CLASS (G_OBJECT_GET_CLASS (self))->strings_func (self,
+- undo_label, undo_description,
+- redo_label, redo_description);
++ NAUTILUS_FILE_UNDO_INFO_CLASS (G_OBJECT_GET_CLASS (self))->strings_func (self,
++ undo_label, undo_description,
++ redo_label, redo_description);
+ }
+
+ static void
+--- nautilus-3.4.1/src/nautilus-view.c-orig 2012-05-09 19:20:01.932460944 -0500
++++ nautilus-3.4.1/src/nautilus-view.c 2012-05-09 19:20:17.482522801 -0500
+@@ -2142,7 +2142,7 @@ sort_directories_first_changed_callback
+
+ if (preference_value != view->details->sort_directories_first) {
+ view->details->sort_directories_first = preference_value;
+- return NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->sort_directories_first_changed (view);
++ NAUTILUS_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->sort_directories_first_changed (view);
+ }
+ }
+
--- a/patches/notification-daemon-01-libtool.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- notification-daemon-0.7.1/configure.ac-orig 2011-07-06 13:25:29.174814918 -0500
-+++ notification-daemon-0.7.1/configure.ac 2011-07-06 13:25:58.552096261 -0500
-@@ -61,9 +61,7 @@ AC_TYPE_SIZE_T
- dnl ---------------------------------------------------------------------------
- dnl Initialize Libtool
- dnl ---------------------------------------------------------------------------
--LT_PREREQ([2.2.6])
--LT_INIT
--
-+AC_PROG_LIBTOOL
-
- dnl ---------------------------------------------------------------------------
- dnl i18n stuff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vte-01-configure.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,11 @@
+--- vte-0.22.5/configure.in-orig 2010-04-07 18:02:09.412286645 -0500
++++ vte-0.22.5/configure.in 2010-04-07 18:02:17.857283149 -0500
+@@ -146,7 +146,7 @@ CC_CHECK_CFLAGS_APPEND([ \
+ -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
+ -Wdeclaration-after-statement -Wold-style-definition \
+ -Wno-missing-field-initializers -Wno-unused-parameter \
+- -fno-common -Wno-switch-enum])
++ -Wno-switch-enum])
+
+ ##########################################################
+ # Check for -Bsymbolic-functions linker flag used to avoid
--- a/patches/vte-01-libtool.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- vte-0.30.0/configure.in-orig 2011-10-04 23:55:41.939840046 -0500
-+++ vte-0.30.0/configure.in 2011-10-04 23:55:50.985805474 -0500
-@@ -66,9 +66,7 @@ AM_PROG_CC_C_O
- AC_PROG_SED
-
- # Initialize libtool
--LT_PREREQ([2.2])
--LT_INIT
--
-+AC_PROG_LIBTOOL
-
- ################################################################################
- # i18n
--- a/patches/vte-02-configure.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- vte-0.22.5/configure.in-orig 2010-04-07 18:02:09.412286645 -0500
-+++ vte-0.22.5/configure.in 2010-04-07 18:02:17.857283149 -0500
-@@ -152,7 +152,7 @@ MAYBE_WARN="-Wall -Wextra \
- -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
- -Wdeclaration-after-statement -Wold-style-definition \
- -Wno-missing-field-initializers -Wno-unused-parameter \
---fno-common -Wno-switch-enum"
-+-Wno-switch-enum"
-
- # invalidate cached value if MAYBE_WARN has changed
- if test "x$vte_cv_warn_maybe" != "x$MAYBE_WARN"; then
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vte-02-copy-paste-keys.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,16 @@
+diff -urN vte.orig/src/vte.c vte.new/src/vte.c
+--- vte.orig/src/vte.c 2011-05-20 11:09:40.653834969 +0100
++++ vte.new/src/vte.c 2011-05-20 11:10:11.113623701 +0100
+@@ -12851,9 +12851,9 @@ vte_terminal_class_init(VteTerminalClass
+ binding_set = gtk_binding_set_by_class(klass);
+
+ /* Bind Copy, Paste, Cut keys */
+- gtk_binding_entry_add_signal(binding_set, GDK_KEY (F16), 0, "copy-clipboard",0);
+- gtk_binding_entry_add_signal(binding_set, GDK_KEY (F18), 0, "paste-clipboard", 0);
+- gtk_binding_entry_add_signal(binding_set, GDK_KEY (F20), 0, "copy-clipboard",0);
++ gtk_binding_entry_add_signal(binding_set, GDK_KEY (Copy), 0, "copy-clipboard",0);
++ gtk_binding_entry_add_signal(binding_set, GDK_KEY (Paste), 0, "paste-clipboard", 0);
++ gtk_binding_entry_add_signal(binding_set, GDK_KEY (Cut), 0, "copy-clipboard",0);
+
+ process_timer = g_timer_new ();
+
--- a/patches/vte-03-copy-paste-keys.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -urN vte.orig/src/vte.c vte.new/src/vte.c
---- vte.orig/src/vte.c 2011-05-20 11:09:40.653834969 +0100
-+++ vte.new/src/vte.c 2011-05-20 11:10:11.113623701 +0100
-@@ -12851,9 +12851,9 @@ vte_terminal_class_init(VteTerminalClass
- binding_set = gtk_binding_set_by_class(klass);
-
- /* Bind Copy, Paste, Cut keys */
-- gtk_binding_entry_add_signal(binding_set, GDK_KEY (F16), 0, "copy-clipboard",0);
-- gtk_binding_entry_add_signal(binding_set, GDK_KEY (F18), 0, "paste-clipboard", 0);
-- gtk_binding_entry_add_signal(binding_set, GDK_KEY (F20), 0, "copy-clipboard",0);
-+ gtk_binding_entry_add_signal(binding_set, GDK_KEY (Copy), 0, "copy-clipboard",0);
-+ gtk_binding_entry_add_signal(binding_set, GDK_KEY (Paste), 0, "paste-clipboard", 0);
-+ gtk_binding_entry_add_signal(binding_set, GDK_KEY (Cut), 0, "copy-clipboard",0);
-
- process_timer = g_timer_new ();
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vte-03-void-return.diff Fri May 11 21:19:28 2012 +0000
@@ -0,0 +1,20 @@
+--- vte-0.30.0/src/vte.c-orig 2011-10-05 00:05:58.598942571 -0500
++++ vte-0.30.0/src/vte.c 2011-10-05 00:06:24.232849441 -0500
+@@ -9246,7 +9246,7 @@ vte_terminal_determine_colors (VteTermin
+ gboolean highlight,
+ guint *fore, guint *back)
+ {
+- return vte_terminal_determine_colors_internal (terminal, cell,
++ vte_terminal_determine_colors_internal (terminal, cell,
+ highlight, FALSE,
+ fore, back);
+ }
+@@ -9257,7 +9257,7 @@ vte_terminal_determine_cursor_colors (Vt
+ gboolean highlight,
+ guint *fore, guint *back)
+ {
+- return vte_terminal_determine_colors_internal (terminal, cell,
++ vte_terminal_determine_colors_internal (terminal, cell,
+ highlight, TRUE,
+ fore, back);
+ }
--- a/patches/vte-04-void-return.diff Fri May 11 12:50:41 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- vte-0.30.0/src/vte.c-orig 2011-10-05 00:05:58.598942571 -0500
-+++ vte-0.30.0/src/vte.c 2011-10-05 00:06:24.232849441 -0500
-@@ -9246,7 +9246,7 @@ vte_terminal_determine_colors (VteTermin
- gboolean highlight,
- guint *fore, guint *back)
- {
-- return vte_terminal_determine_colors_internal (terminal, cell,
-+ vte_terminal_determine_colors_internal (terminal, cell,
- highlight, FALSE,
- fore, back);
- }
-@@ -9257,7 +9257,7 @@ vte_terminal_determine_cursor_colors (Vt
- gboolean highlight,
- guint *fore, guint *back)
- {
-- return vte_terminal_determine_colors_internal (terminal, cell,
-+ vte_terminal_determine_colors_internal (terminal, cell,
- highlight, TRUE,
- fore, back);
- }
--- a/specs/SUNWaccountsservice.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWaccountsservice.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): accountsservice
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -15,9 +15,9 @@
IPS_package_name: library/xdg/accountsservice
Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Sessions
Summary: Accounts Service
-Version: 0.6.12
+Version: 0.6.15
License: LGPL v2.1
-Source: http://www.freedesktop.org/software/accountsservice/accountsservice-%version.tar.bz2
+Source: http://www.freedesktop.org/software/accountsservice/accountsservice-%version.tar.xz
Source1: accountsservice.xml
Source2: svc-accountsservice
Patch1: accountsservice-01-polkit.diff
@@ -68,8 +68,8 @@
export LDFLAGS="%{_ldflags}"
libtoolize --force
-aclocal $ACLOCAL_FLAGS
-automake -a -c -f
+aclocal-1.11 $ACLOCAL_FLAGS
+automake-1.11 -a -c -f
autoconf
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
@@ -149,5 +149,7 @@
%endif
%changelog
+* Thu May 10 2012 - Brian Cameron <[email protected]>
+- Bump to 0.6.15.
* Sat Jul 09 2011 - Brian Cameron <[email protected]>
- Created with 0.6.12.
--- a/specs/SUNWat-spi2-atk.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWat-spi2-atk.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): at-spi2-atk
#
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -16,8 +16,8 @@
Meta(info.classification): %{classification_prefix}:Applications/Universal Access
License: LGPL v2, MIT/X
Summary: Accessibility implementation on D-Bus for GNOME
-Version: 2.2.1
-Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-atk/2.2/at-spi2-atk-%{version}.tar.bz2
+Version: 2.4.0
+Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-atk/2.4/at-spi2-atk-%{version}.tar.xz
Patch1: at-spi2-atk-01-configure.diff
SUNW_BaseDir: %{_basedir}
SUNW_Copyright: %{name}.copyright
@@ -107,6 +107,8 @@
%endif
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 2.4.0.
* Mon Oct 24 2011 - [email protected]
- Bump to 2.2.1.
* Mon Aug 15 2011 - [email protected]
--- a/specs/SUNWat-spi2-core.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWat-spi2-core.spec Fri May 11 21:19:28 2012 +0000
@@ -1,9 +1,9 @@
#
-# spec file for package SUNWat-spi2
+# spec file for package SUNWat-spi2-core
#
# includes module(s): at-spi2-core
#
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -16,8 +16,8 @@
Meta(info.classification): %{classification_prefix}:Applications/Universal Access
License: LGPL v2, MIT/X
Summary: Accessibility implementation on D-Bus
-Version: 2.2.1
-Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.2/at-spi2-core-%{version}.tar.bz2
+Version: 2.4.1
+Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.4/at-spi2-core-%{version}.tar.xz
SUNW_BaseDir: %{_basedir}
SUNW_Copyright: %{name}.copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -105,6 +105,8 @@
%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
%changelog
+* Thu May 03 2012 - [email protected]
+- Bump to 2.4.1.
* Mon Oct 24 2011 - [email protected]
- Bump to 2.2.1.
* Mon Aug 15 2011 - [email protected]
--- a/specs/SUNWdconf.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWdconf.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): dconf
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011,2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -15,9 +15,9 @@
IPS_package_name: gnome/config/dconf
Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Sessions
Summary: DConf
-Version: 0.10.0
+Version: 0.12.1
License: LGPL v2.1
-Source: http://ftp.gnome.org/pub/GNOME/sources/dconf/0.10/dconf-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/dconf/0.12/dconf-%{version}.tar.xz
Patch1: dconf-01-compile.diff
SUNW_BaseDir: %{_basedir}
SUNW_Copyright: %{name}.copyright
@@ -73,6 +73,9 @@
export CFLAGS="%optflags"
export LDFLAGS="%{_ldflags}"
+touch README AUTHORS ChangeLog
+aclocal-1.11 $ACLOCAL_FLAGS -I ./m4
+automake-1.11 -a -c -f
./configure --prefix=%{_prefix} \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
@@ -117,6 +120,17 @@
%{_datadir}/dbus-1
%{_datadir}/dconf-editor
%{_datadir}/glib-2.0
+%dir %attr (0755, root, other) %{_datadir}/icons
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32/apps/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/apps/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/64x64/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/64x64/apps/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/128x128/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/128x128/apps/
+%{_datadir}/icons/hicolor/*/apps/*
%dir %attr (0755, root, other) %{_docdir}
%files root
@@ -144,6 +158,8 @@
%endif
%changelog
+* Thu May 03 2012 - Brian Cameron <[email protected]>
+- Bump to 0.12.1.
* Fri Sep 30 2011 - Brian Cameron <[email protected]>
- Bump to 0.10.0.
* Thu Aug 18 2011 - Brian Cameron <[email protected]>
--- a/specs/SUNWespeak.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWespeak.spec Fri May 11 21:19:28 2012 +0000
@@ -14,22 +14,20 @@
%define src_url http://downloads.sourceforge.net/%{src_name}
# remember to update the Version tag but make sure it's IPS compliant,
# so no leading 0-s allowed. 1.44.05 should be 1.44.0.5
-%define tarball_version 1.44.05
+%define tarball_version 1.46.02
Name: SUNWespeak
IPS_package_name: library/speech/espeak
Meta(info.classification): %{classification_prefix}:Applications/Universal Access
Summary: eSpeak - compact open source software speech synthesizer
-Version: 1.45.05
+Version: 1.46.0.5
License: GPL v3
Source: %{src_url}/%{src_name}-%{tarball_version}-source.zip
Source1: %{name}-manpages-0.1.tar.gz
# date:2008-08-15 owner:ww36193 type:bug
Patch1: espeak-01-makefile.diff
-# date:2010-10-27 owner:yippi type:bug
-Patch2: espeak-02-samplerate.diff
# date:2010-12-28 owner:liyuan type:bug
-Patch3: espeak-03-Wall.diff
+Patch2: espeak-02-Wall.diff
SUNW_BaseDir: %{_basedir}
SUNW_Copyright: %{name}.copyright
BuildRoot: %{_tmppath}/%{name}-%{tarball_version}-build
@@ -60,7 +58,6 @@
%setup -q -n %{src_name}-%{tarball_version}-source
%patch1 -p1
%patch2 -p1
-%patch3 -p1
gzcat %SOURCE1 | tar xf -
%build
@@ -106,6 +103,8 @@
%{_includedir}
%changelog
+* Fri May 04 2012 - [email protected]
+- Bump to 1.46.02.
* Tue Oct 04 2011 - [email protected]
- Bump to 1.45.05.
* Tue Jul 26 2011 - [email protected]
--- a/specs/SUNWgnome-applets.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-applets.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-applets, gnome-netstatus, deskbar-applet
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -35,7 +35,7 @@
BuildRequires: SUNWgnome-vfs-devel
BuildRequires: SUNWgnome-panel-devel
BuildRequires: SUNWgnome-python26-desktop-devel
-BuildRequires: SUNWpython26-setuptools
+BuildRequires: library/python-2/setuptools-26
BuildRequires: release/name
BuildRequires: SUNWarc
BuildRequires: SUNWevolution-data-server-devel
@@ -221,7 +221,7 @@
%restart_fmri icon-cache gconf-cache
%files
-%doc -d gnome-applets-%{gapplets.version} README stickynotes/README cpufreq/README geyes/README mini-commander/README trashapplet/README gkb-new/README null_applet/README AUTHORS gweather/AUTHORS cpufreq/AUTHORS geyes/AUTHORS multiload/AUTHORS mini-commander/AUTHORS drivemount/AUTHORS gkb-new/AUTHORS accessx-status/AUTHORS mixer/AUTHORS modemlights/AUTHORS COPYING-DOCS accessx-status/COPYING COPYING MAINTAINERS
+%doc -d gnome-applets-%{gapplets.version} README stickynotes/README cpufreq/README geyes/README mini-commander/README trashapplet/README null_applet/README AUTHORS gweather/AUTHORS cpufreq/AUTHORS geyes/AUTHORS multiload/AUTHORS mini-commander/AUTHORS drivemount/AUTHORS accessx-status/AUTHORS mixer/AUTHORS modemlights/AUTHORS COPYING-DOCS accessx-status/COPYING COPYING MAINTAINERS
%doc(bzip2) -d gnome-applets-%{gapplets.version} ChangeLog NEWS geyes/NEWS mini-commander/NEWS
#%doc gnome-netstatus-%{gnetstatus.version}/README
#%doc gnome-netstatus-%{gnetstatus.version}/NEWS
@@ -289,7 +289,6 @@
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/pixmaps/*
-%{_datadir}/xmodmap
%dir %attr (0755, root, other) %{_datadir}/gnome
%{_datadir}/gnome/help/geyes/C
--- a/specs/SUNWgnome-desktop-prefs.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-desktop-prefs.spec Fri May 11 21:19:28 2012 +0000
@@ -186,7 +186,6 @@
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so*
%{_libdir}/gnome-settings-daemon-3.0
%{_libexecdir}/control-center-1
%{_libexecdir}/gnome-settings-daemon
@@ -201,8 +200,6 @@
%{_datadir}/dbus-1
%{_datadir}/GConf
%{_datadir}/glib-2.0
-%dir %attr (0755, root, other) %{_datadir}/gnome
-%{_datadir}/gnome/help/control-center/C
%{_datadir}/gnome-control-center
%{_datadir}/gnome-settings-daemon
%{_datadir}/gnome-settings-daemon-3.0
@@ -246,8 +243,6 @@
#PulseAudio
%{_datadir}/icons/hicolor/48x48/devices/audio-headset.svg
-%{_datadir}/omf/control-center/control-center-C.omf
-
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
%{_mandir}/*/*
@@ -281,8 +276,6 @@
%defattr (-, root, sys)
%attr (0755, root, sys) %dir %{_sysconfdir}
%{_sysconfdir}/xdg
-%dir %attr (0755, root, bin) %{_sysconfdir}/dbus-1
-%dir %attr (0755, root, bin) %{_sysconfdir}/dbus-1/system.d
%{_sysconfdir}/gnome-settings-daemon
%if %build_l10n
@@ -296,6 +289,8 @@
%endif
%changelog
+* Fri May 11 2012 - [email protected]
+- Update packaging after updating to 3.4.1.
* Tue Jul 12 2011 - [email protected]
- Fix packaging for gnome-settings-daemon 3.1.3 and gnome-control-center 3.1.3
release.
--- a/specs/SUNWgnome-dialog.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-dialog.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): zenity
#
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -74,7 +74,6 @@
%dir %attr (0755, root, other) %{_datadir}/gnome
%dir %attr (0755, root, other) %{_datadir}/doc
%{_datadir}/gnome/help/zenity/C
-%{_datadir}/omf/zenity/*-C.omf
%{_datadir}/zenity
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
@@ -86,9 +85,10 @@
%dir %attr (0755, root, other) %{_datadir}/gnome
%attr (-, root, other) %{_datadir}/locale
%{_datadir}/gnome/help/zenity/[a-z]*
-%{_datadir}/omf/zenity/zenity-[a-z]*.omf
%changelog
+* Fri May 11 2012 - [email protected]
+- Fix packaging after updating to 3.4.0.
* Fri Apr 3 2009 - [email protected]
- stop using postrun
* Fri Sep 19 2008 - [email protected]
@@ -155,5 +155,3 @@
* Mon Mar 01 2004 - <[email protected]>
- define PERL5LIB.
-
-
--- a/specs/SUNWgnome-file-mgr.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-file-mgr.spec Fri May 11 21:19:28 2012 +0000
@@ -4,7 +4,7 @@
# includes module(s): nautilus, gnome-mount,
# gnome-volume-manager
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -34,44 +34,30 @@
%include default-depend.inc
%include gnome-incorporation.inc
-BuildRequires: SUNWgnome-common-devel
-BuildRequires: SUNWglib3-devel
-BuildRequires: SUNWgtk3-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWlibrsvg-devel
-BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWlibexif-devel
-BuildRequires: SUNWlibpopt-devel
-BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-vfs-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-panel-devel
-BuildRequires: SUNWlibunique-devel
-BuildRequires: SUNWgtk-doc
-BuildRequires: SUNWlibgnome-keyring
-Requires: SUNWgtk3
-Requires: SUNWgnome-file-mgr-root
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-vfs
-Requires: SUNWgnome-config
-Requires: SUNWgnome-panel
-Requires: SUNWgnome-audio
-Requires: SUNWgnome-component
-Requires: SUNWlibunique
-Requires: SUNWlibexif
-Requires: SUNWlibms
-Requires: SUNWlibpopt
-Requires: SUNWlibrsvg
+BuildRequires: developer/gnome/gettext
+BuildRequires: library/glib2
+BuildRequires: library/desktop/gtk3
+BuildRequires: library/gnome/gnome-component
+BuildRequires: image/library/librsvg
+BuildRequires: gnome/gnome-audio
+BuildRequires: image/library/libexif
+BuildRequires: library/popt
+BuildRequires: library/gnome/gnome-libs
+BuildRequires: library/gnome/gnome-vfs
+BuildRequires: gnome/config/gconf
+BuildRequires: gnome/gnome-panel
+BuildRequires: library/libunique
+BuildRequires: developer/documentation-tool/gtk-doc
+BuildRequires: library/gnome/gnome-keyring
+Requires: gnome/gnome-audio
+Requires: library/gnome/gnome-component
+Requires: library/popt
+Requires: image/library/librsvg
BuildRequires: runtime/perl-512
-Requires: SUNWbzip
-Requires: SUNWzlib
-Requires: SUNWlxml
-Requires: SUNWzfsr
-Requires: SUNWdesktop-cache
-Requires: SUNWuiu8
-%if %with_hal
-Requires: SUNWhal
-%endif
+Requires: compress/bzip2
+Requires: library/zlib
+Requires: service/gnome/desktop-cache
+Requires: system/library/iconv/utf-8
%package root
Summary: %{summary} - / filesystem
@@ -201,8 +187,6 @@
%{_datadir}/gir-1.0
%{_datadir}/icons/hicolor/scalable/apps/nautilus.svg
%{_datadir}/nautilus
-%dir %attr (0755, root, other) %{_datadir}/pixmaps
-%{_datadir}/pixmaps/*
%dir %attr (0755, root, root) %{_datadir}/mime
%dir %attr (0755, root, root) %{_datadir}/mime/packages
%{_datadir}/mime/packages/*
@@ -233,6 +217,8 @@
%attr (-, root, other) %{_datadir}/locale
%changelog
+* Fri May 11 2012 - [email protected]
+- Fix packaging after bumping nautilus to 3.4.1. Fix Requires.
* Tue Jul 12 2011 - [email protected]
- Fix packaging for nautilus 3.1.3 and nautilus-open-terminal 0.19 releases.
* Wed Nov 10 2010 - [email protected]
--- a/specs/SUNWgnome-panel.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-panel.spec Fri May 11 21:19:28 2012 +0000
@@ -4,7 +4,7 @@
# includes module(s): libwnck, notification-daemon,
# gnome-desktop, gnome-menus, gnome-panel
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -31,79 +31,67 @@
%include default-depend.inc
%include gnome-incorporation.inc
BuildRequires: x11/trusted/libxtsol
-BuildRequires: SUNWlibglade-devel
-BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-vfs-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-doc-utils
-BuildRequires: SUNWlibpopt-devel
-BuildRequires: SUNWpng-devel
+BuildRequires: library/desktop/libglade
+BuildRequires: library/gnome/gnome-libs
+BuildRequires: gnome/config/gconf
+BuildRequires: library/gnome/gnome-vfs
+BuildRequires: library/gnome/gnome-component
+BuildRequires: developer/gnome/gnome-doc-utils
+BuildRequires: library/popt
+BuildRequires: image/library/libpng
BuildRequires: release/name
-BuildRequires: SUNWarc
-BuildRequires: SUNWevolution-data-server-devel
-BuildRequires: SUNWiso-codes-devel
-BuildRequires: SUNWdbus-devel
-BuildRequires: SUNWlxml-devel
-BuildRequires: SUNWlxml-python26
-BuildRequires: SUNWlibrsvg-devel
-BuildRequires: SUNWlibsexy-devel
-BuildRequires: SUNWpython26-setuptools
-BuildRequires: SUNWgtk-doc
-BuildRequires: SUNWlibnotify
-BuildRequires: SUNWgobject-introspection
-BuildRequires: SUNWuiu8
-BuildRequires: SUNWlibgnome-keyring
-BuildRequires: SUNWlibgweather
+BuildRequires: developer/library/lint
+BuildRequires: library/desktop/evolution-data-server
+BuildRequires: data/iso-codes
+BuildRequires: system/library/libdbus
+BuildRequires: library/libxml2
+BuildRequires: library/python-2/libxml2-26
+BuildRequires: image/library/librsvg
+BuildRequires: library/desktop/libsexy
+BuildRequires: library/python-2/setuptools-26
+BuildRequires: developer/documentation-tool/gtk-doc
+BuildRequires: library/libnotify
+BuildRequires: library/desktop/gobject/gobject-introspection
+BuildRequires: system/library/iconv/utf-8
+BuildRequires: library/gnome/gnome-keyring
+BuildRequires: library/desktop/libgweather
+Requires: library/desktop/libglade
+Requires: library/desktop/libsexy
+Requires: library/gnome/gnome-libs
+Requires: gnome/config/gconf
+Requires: library/gnome/gnome-vfs
+Requires: library/libxml2
+Requires: library/gnome/gnome-component
+Requires: library/popt
+Requires: system/library/math
+Requires: image/library/librsvg
+Requires: image/library/libpng
+Requires: service/gnome/desktop-cache
+Requires: library/desktop/evolution-data-server
+Requires: data/iso-codes
+Requires: system/library/libdbus
+Requires: runtime/python-26
+Requires: library/libnotify
+Requires: library/desktop/xdg/libcanberra
+Requires: library/desktop/libxklavier
+# FIXME: circular dep
+# BuildRequires: SUNWgnome-python26
+BuildRequires: gnome/trusted/libgnometsol
+%ifarch i386
+Requires: x11/keyboard/data-xkb
+BuildRequires: x11/keyboard/data-xkb
+%endif
+
BuildRequires: SUNWgsettings-schemas-devel
BuildRequires: SUNWdconf-devel
-Requires: SUNWlibglade
-Requires: SUNWlibsexy
-Requires: SUNWgnome-panel-root
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-config
-Requires: SUNWgnome-vfs
-Requires: SUNWlxml
-Requires: SUNWgnome-component
-Requires: SUNWlibpopt
-Requires: SUNWlibms
-Requires: SUNWlibrsvg
-Requires: SUNWpng
-Requires: SUNWdesktop-cache
-Requires: SUNWevolution-data-server
-Requires: SUNWiso-codes
-Requires: SUNWdbus
-Requires: SUNWPython26
-Requires: SUNWlibnotify
-Requires: SUNWlibcanberra
-Requires: SUNWlibxklavier
-Requires: SUNWgsettings-schemas
-Requires: SUNWdconf
-# FIXME: circular dep
-# BuildRequires: SUNWgnome-python26
-BuildRequires: SUNWtgnome-tsol-libs-devel
-%ifarch i386
-Requires: SUNWxorg-xkb
-BuildRequires: SUNWxorg-xkb
-%endif
%package root
Summary: %{summary} - / filesystem
SUNW_BaseDir: /
-%include default-depend.inc
-%include gnome-incorporation.inc
%package devel
Summary: %{summary} - development files
SUNW_BaseDir: %{_basedir}
-%include default-depend.inc
-%include gnome-incorporation.inc
-Requires: SUNWgnome-libs-devel
-Requires: SUNWgnome-panel
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-config
-Requires: SUNWgnome-component
-Requires: SUNWlibglade
%package l10n
Summary: %{summary} - l10n files
@@ -122,12 +110,6 @@
gzcat %SOURCE0 | tar xf -
%build
-# There seems to be an issue with the version of libtool that GStreamer is
-# now using. The libtool script uses the echo and RM variables but does not
-# define them, so setting them here addresses this.
-export echo="/usr/bin/echo"
-export RM="/usr/bin/rm -f"
-
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
export SED=/usr/gnu/bin/sed
@@ -150,12 +132,6 @@
%gpanel.build -d %name-%version
%install
-# There seems to be an issue with the version of libtool that GStreamer is
-# now using. The libtool script uses the echo and RM variables but does not
-# define them, so setting them here addresses this.
-export echo="/usr/bin/echo"
-export RM="/usr/bin/rm -f"
-
rm -rf $RPM_BUILD_ROOT
%lwnck.install -d %name-%version
@@ -301,9 +277,12 @@
%{_datadir}/gnome/help/[e-z]*/[a-z]*
%{_datadir}/omf/*/*-[a-z][a-z].omf
%{_datadir}/omf/*/*-[a-z][a-z]_[A-Z][A-Z].omf
+%{_datadir}/omf/gpl/[email protected]
%{_datadir}/omf/gpl/gpl-nds.omf
%changelog
+* Fri May 04 2012 - [email protected]
+- Now use newer autotools.
* Mon Aug 08 2011 - [email protected]
- Delete -I, -L, & -R flags for long-obsolete /usr/openwin paths
* Tue Jul 12 2011 - [email protected]
--- a/specs/SUNWgnome-remote-desktop.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-remote-desktop.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): vino, realvnc-java-client
#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -77,12 +77,6 @@
gzcat %SOURCE1 | tar xf -
%build
-# There seems to be an issue with the version of libtool that GStreamer is
-# now using. The libtool script uses the echo and RM variables but does not
-# define them, so setting them here addresses this.
-export echo="/usr/bin/echo"
-export RM="/usr/bin/rm"
-
export PKG_CONFIG_PATH=%{_pkg_config_path}
export CFLAGS="%optflags -I%{_includedir} -I/usr/sfw/include"
export RPM_OPT_FLAGS="$CFLAGS"
@@ -90,26 +84,14 @@
%vino.build -d %name-%version
-unset echo
-unset RM
-
%if %option_with_java
%rjc.build -d %name-%version
%endif
%install
-# There seems to be an issue with the version of libtool that GStreamer is
-# now using. The libtool script uses the echo and RM variables but does not
-# define them, so setting them here addresses this.
-export echo="/usr/bin/echo"
-export RM="/usr/bin/rm"
-
rm -rf $RPM_BUILD_ROOT
%vino.install -d %name-%version
-unset echo
-unset RM
-
%if %option_with_java
# install vnc client
cd %{name}-%{version}
@@ -171,6 +153,8 @@
%{_sysconfdir}/xdg/autostart/vino-server.desktop
%changelog
+* Fri May 04 2012 - [email protected]
+- Now use newer autotools.
* Wed Mar 31 2010 - [email protected]
- Add %SUNW_Pkg %IPS_package_name
* Mon Jul 27 2009 - [email protected]
@@ -262,5 +246,3 @@
* Thu Apr 15 2004 - [email protected]
- Created
-
-
--- a/specs/SUNWgnome-terminal.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-terminal.spec Fri May 11 21:19:28 2012 +0000
@@ -138,7 +138,6 @@
%{_datadir}/gnome/help/*/C
%{_datadir}/gnome-terminal
%{_datadir}/omf/*/*-C.omf
-%{_datadir}/vte
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
@@ -171,6 +170,8 @@
%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
%changelog
+* Fri May 11 2012 - [email protected]
+- Update packaging after updating vte to 0.32.1 and gnome-terminal to 3.4.1.1.
* Mon Feb 13 2012 - [email protected]
- Update Requires and BuildRequires to be IPS package names.
* Tue Jun 08 2010 - [email protected]
@@ -285,5 +286,3 @@
- install gconf schemas at end of install stage.
- run rm -Rf during clean stage.
-
-
--- a/specs/SUNWgnome-themes-standard.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-themes-standard.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-themes-standard
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011,2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -15,9 +15,9 @@
IPS_package_name: gnome/theme/gnome-icon-theme-standard
Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Theming
Summary: Standard GNOME themes
-Version: 3.2.1
+Version: 3.4.1
License: LGPL v2.1
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/3.2/gnome-themes-standard-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/3.4/gnome-themes-standard-%{version}.tar.xz
# date:2011-07-14 owner:yippi type:bug bugzilla:654714
SUNW_BaseDir: %{_basedir}
SUNW_Copyright: %{name}.copyright
@@ -117,6 +117,8 @@
%endif
%changelog
+* Fri May 04 2012 - [email protected]
+- Bump to 3.4.1.
* Wed Oct 19 2011 - [email protected]
- Bump to 3.2.1.
* Fri Sep 30 2011 - [email protected]
--- a/specs/SUNWgnome-wm.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgnome-wm.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): metacity
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -46,12 +46,6 @@
Requires: SUNWdesktop-cache
Requires: SUNWlibcanberra
-%package root
-Summary: %{summary} - / filesystem
-SUNW_BaseDir: /
-%include default-depend.inc
-%include desktop-incorporation.inc
-
%package devel
Summary: %{summary} - development files
SUNW_BaseDir: %{_basedir}
@@ -129,6 +123,8 @@
%dir %attr (0755, root, other) %{_datadir}/gnome
%dir %attr(0755, root, bin) %{_datadir}/gnome/wm-properties
%{_datadir}/applications/*
+%{_datadir}/GConf/*
+%{_datadir}/glib-2.0/*
%{_datadir}/gnome/wm-properties/*
%{_datadir}/gnome/help/*
%{_datadir}/metacity/icons
@@ -160,11 +156,6 @@
%{_libdir}/pkgconfig/*
%{_prefix}/demo/jds/bin/metacity-window-demo
-%files root
-%defattr (-, root, sys)
-%attr (0755, root, sys) %dir %{_sysconfdir}
-%{_sysconfdir}/gconf/schemas/metacity.schemas
-
%files l10n
%defattr (-, root, bin)
%dir %attr (0755, root, sys) %{_datadir}
--- a/specs/SUNWgsettings-schemas.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWgsettings-schemas.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gsettings-desktop-schemas
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011,2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -15,9 +15,9 @@
IPS_package_name: gnome/config/gsettings-schemas
Meta(info.classification): %{classification_prefix}:Applications/Configuration and Preferences
Summary: GSettings Desktop Schemas
-Version: 3.2.0
+Version: 3.4.1
License: LGPL v2.1
-Source: http://ftp.gnome.org/pub/GNOME/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gsettings-desktop-schemas/3.4/gsettings-desktop-schemas-%{version}.tar.xz
SUNW_BaseDir: %{_basedir}
SUNW_Copyright: %{name}.copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -85,8 +85,11 @@
%files
%defattr (-, root, bin)
%doc AUTHORS COPYING ChangeLog NEWS README
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/girepository-1.0
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/GConf
+%{_datadir}/gir-1.0
%{_datadir}/glib-2.0
%dir %attr (0755, root, other) %{_docdir}
@@ -105,6 +108,8 @@
%endif
%changelog
+* Fri May 04 2012 - Brian Cameron <[email protected]>
+- Bump to 3.2.1.
* Fri Sep 30 2011 - Brian Cameron <[email protected]>
- Bump to 3.2.0.
* Tue Sep 13 2011 - Brian Cameron <[email protected]>
--- a/specs/SUNWpulseaudio.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWpulseaudio.spec Fri May 11 21:19:28 2012 +0000
@@ -88,8 +88,18 @@
gzcat %SOURCE0 | tar xf -
%build
+# Use no higher than -xO2 on sparc.
+#
+%ifarch sparc
+export PA_OPTFLAGS64=`/usr/bin/echo %optflags64 | /usr/gnu/bin/sed -e 's/-xO./-xO2/'`
+export PA_OPTFLAGS=`/usr/bin/echo %optflags | /usr/gnu/bin/sed -e 's/-xO./-xO2/'`
+%else
+export PA_OPTFLAGS64=`/usr/bin/echo %optflags64`
+export PA_OPTFLAGS=`/usr/bin/echo %optflags`
+%endif
+
%ifarch amd64 sparcv9
-
+export CFLAGS="$PA_OPTFLAGS64 -xc99 -I/usr/include/gc -KPIC"
export SOLARIS_PULSE_ARGS="--disable-avahi"
# Need to add -Wl,-z,now and -Wl,-z-nodelete and remove -Wl,-zignore for
@@ -106,6 +116,7 @@
# Now build 32-bit.
#
+export CFLAGS="$PA_OPTFLAGS -xc99 -I/usr/include/gc -KPIC"
export SOLARIS_PULSE_ARGS=""
%if %debug_build
@@ -219,6 +230,8 @@
%endif
%changelog
+* Fri May 04 2012 - Brian Cameron <[email protected]>
+- Now set optimization -xO2 on sparc to fix CR #7166622.
* Thu May 03 2012 - Brian Cameron <[email protected]>
- Fix packaging to add qpaeq and add BuildRequires on library/fftw-3.
* Sun Oct 02 2011 - Brian Cameron <[email protected]>
--- a/specs/SUNWpyatspi.spec Fri May 11 12:50:41 2012 +0000
+++ b/specs/SUNWpyatspi.spec Fri May 11 21:19:28 2012 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): pyatspi
#
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -17,8 +17,8 @@
License: LGPL v2, MIT/X
Vendor: Gnome Community
Summary: Python bindings for accessibility implementation on D-Bus for GNOME
-Version: 2.2.1
-Source: http://ftp.gnome.org/pub/GNOME/sources/pyatspi/2.2/pyatspi-%{version}.tar.bz2
+Version: 2.4.0
+Source: http://ftp.gnome.org/pub/GNOME/sources/pyatspi/2.4/pyatspi-%{version}.tar.xz
Patch1: pyatspi-01-configure.diff
SUNW_BaseDir: %{_basedir}
SUNW_Copyright: %{name}.copyright
@@ -99,6 +99,8 @@
%{_libdir}/python2.6/vendor-packages/*
%changelog
+* Fri May 04 2012 - [email protected]
+- Bump to 2.4.0.
* Mon Oct 24 2011 - [email protected]
- Bump to 2.2.1.
* Mon Aug 15 2011 - [email protected]