--- a/ChangeLog Tue Jan 20 20:59:19 2009 +0000
+++ b/ChangeLog Wed Jan 21 01:25:19 2009 +0000
@@ -1,3 +1,37 @@
+2009-01-20 Brian Cameron <[email protected]>
+
+ * SUNWgnome-panel.spec, base-specs/libnotify.spec,
+ patches/libnotify-01-uninstalled-pc.diff: Add patch to add
+ uninstalled pc file and update PKG_CONFIG_PATH in top-level spec so
+ that it finds libnotify.
+ * SUNWgnome-media-player.spec, base-specs/totem-pl-parser.spec,
+ base-specs/totem.spec, patches/totem-05-libsocket.diff: Bump
+ totem to 2.25.3 and totem-pl-parser.spec to 2.25.1.
+ * patches/totem-pl-parser-01-ignore-cdda.diff,
+ patches/totem-01-remove-unsupported-format.diff,
+ patches/totem-04-web-plugin.diff: Rework.
+ * patches/totem-05-avoid-plugin-coredump.diff: Remove upstream patch.
+ * patches/totem-06-function.diff: Add new patch so totem compiles.
+ * SUNWgnome-cd-burner.spec, base-specs/nautilus-cd-burner.spec,
+ patches/nautilus-cd-burner-01-always-use-cdrecord-on-solaris.diff:
+ Bump to 2.25.3, rework patch.
+ * SUNWgnome-terminal.spec, base-specs/gnome-terminal.spec: Bump to
+ 2.25.5
+ * patches/gnome-terminal-02-aa-no-xrender.diff: Remove upstream patch.
+ * patches/gnome-terminal-02-gthread.diff: Add new patch.
+ * base-specs/gnome-python-desktop.spec: Bump to 2.25.1
+ * base-specs/GConf.spec: Bump to 2.25.0.
+ * base-specs/sound-juicer.spec: Bump to 2.25.1.
+ * patches/sound-juicer-01-menu-entry.diff: Rework.
+ * base-specs/file-roller.spec: Bump to 2.25.2.
+ * base-specs/libwnck.spec: Bump to 2.25.5.
+ * base-specs/gnome-media.spec, patches/gnome-media-04-fixcrash.diff:
+ Bump to 2.25.1. Remove upstream patch.
+ * base-specs/gucharmap.spec, patches/gucharmap-02-gthread.diff:
+ Bump to 2.24.3. Add patch needed for building.
+ * base-specs/gconf-editor.spec: Bump to 2.24.1.
+ * base-specs/zenity.spec: Bump to 2.24.1.
+
2009-01-20 Brian Cameron <[email protected]>
* SUNWgnome-media.spec, base-specs/gst.spec,
--- a/SUNWgnome-cd-burner.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/SUNWgnome-cd-burner.spec Wed Jan 21 01:25:19 2009 +0000
@@ -131,6 +131,7 @@
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/nautilus-cd-burner.desktop
%{_datadir}/applications/nautilus-cd-burner-open-iso.desktop
+%{_datadir}/gtk-doc
%attr (-, root, other) %{_datadir}/icons
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
@@ -157,6 +158,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Fix packaging after bumping to 2.25.3.
* Fri Feb 01 2008 - [email protected]
- Remove %{_sysconfdir}/gnome-vfs-2.0/modules as they are no longer delivered.
* Fri Jan 11 2008 - [email protected]
--- a/SUNWgnome-media-player.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/SUNWgnome-media-player.spec Wed Jan 21 01:25:19 2009 +0000
@@ -141,8 +141,6 @@
rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/lib*.la
rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/lib*.a
-rm $RPM_BUILD_ROOT%{_libdir}/firefox/plugins/lib*.la
-rm $RPM_BUILD_ROOT%{_libdir}/firefox/plugins/lib*.a
rm $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/lib*.la
rm $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/lib*.a
@@ -265,22 +263,34 @@
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/16x16
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/16x16/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/16x16/devices
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/22x22
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/22x22/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/22x22/devices
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/devices
%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/32x32/devices
%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/48x48/devices
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/scalable
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/scalable/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/scalable/devices
%attr (-, root, other) %{_datadir}/icons/hicolor/16x16/apps/*
+%attr (-, root, other) %{_datadir}/icons/hicolor/16x16/devices/*
%attr (-, root, other) %{_datadir}/icons/hicolor/22x22/apps/*
+%attr (-, root, other) %{_datadir}/icons/hicolor/22x22/devices/*
%attr (-, root, other) %{_datadir}/icons/hicolor/24x24/apps/*
+%attr (-, root, other) %{_datadir}/icons/hicolor/24x24/devices/*
%attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps/*
+%attr (-, root, other) %{_datadir}/icons/hicolor/32x32/devices/*
%attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps/*
+%attr (-, root, other) %{_datadir}/icons/hicolor/48x48/devices/*
%attr (-, root, other) %{_datadir}/icons/hicolor/scalable/apps/*
+%attr (-, root, other) %{_datadir}/icons/hicolor/scalable/devices/*
%{_datadir}/omf/rhythmbox/*-C.omf
%{_datadir}/omf/totem/*-C.omf
%{_datadir}/rhythmbox
@@ -318,6 +328,8 @@
%endif
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Fix packaging after bumping totem-pl-parser to 2.25.1 and totem to 2.25.3.
* Fri Dec 05 2008 - [email protected]
- Add attributes for icons in packaging.
* Thu Sep 18 2008 - [email protected]
--- a/SUNWgnome-panel.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/SUNWgnome-panel.spec Wed Jan 21 01:25:19 2009 +0000
@@ -114,7 +114,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH="../gnome-desktop-%{gdesktop.version}/libgnome-desktop:../libwnck-%{lwnck.version}:../gnome-menus-%{gnome_menus.version}/libmenu:../libgweather-%{libgweather.version}/libgweather:../gnome-panel-%{gpanel.version}/libpanel-applet"
+export PKG_CONFIG_PATH="../libnotify-%{libnotify.version}:../gnome-desktop-%{gdesktop.version}/libgnome-desktop:../libwnck-%{lwnck.version}:../gnome-menus-%{gnome_menus.version}/libmenu:../libgweather-%{libgweather.version}/libgweather:../gnome-panel-%{gpanel.version}/libpanel-applet"
export CFLAGS="%optflags -I/usr/sfw/include -I/usr/openwin/share/include -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
@@ -396,7 +396,9 @@
%endif
%changelog
-* Tue Jan 20 2008 - [email protected]
+* Tue Jan 20 2009 - [email protected]
+- Update PKG_CONFIG_PATH so it finds libnotify uninstalled pc file.
+* Tue Jan 20 2009 - [email protected]
- Ship new files from notification-daemon.
* Wed Dec 10 2008 - [email protected]
- Removed non-exist libgweather/ChangeLog
--- a/SUNWgnome-terminal.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/SUNWgnome-terminal.spec Wed Jan 21 01:25:19 2009 +0000
@@ -160,7 +160,6 @@
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
-%{_libdir}/bonobo/servers/*.server
%attr (-, root, bin) %{_libdir}/python*
%attr (0711, root, bin) %{_libexecdir}/gnome-pty-helper
%dir %attr (0755, root, sys) %{_datadir}
@@ -226,6 +225,8 @@
%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Fix packaging after bumping gnome-terminal to 2.25.5.
* Sat Dec 27 2008 - [email protected]
- Add -I/usr/gnu/include in CFLAGS.
* Fri Dec 26 2008 - [email protected]
--- a/base-specs/GConf.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/GConf.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,12 +11,12 @@
License: LGPL
Group: System/Libraries/GNOME
Provides: GConf
-Version: 2.24.0
+Version: 2.25.0
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Configuration Framework
-Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/2.24/GConf-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/2.25/GConf-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -94,6 +94,7 @@
sh %SOURCE1 --enable-copyright
%endif
+libtoolize --force
aclocal
autoheader
autoconf
@@ -158,6 +159,8 @@
%{_mandir}/man3/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.0.
* Fri Oct 10 2008 - [email protected]
- Add patch GConf-04-user-specific-dbus so D-Bus is restarted without
DBUS_SESSION_BUS_ADDRESS set if the effective user id looking to connect is
--- a/base-specs/file-roller.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/file-roller.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,12 +11,12 @@
Name: file-roller
License: GPL
Group: System/GUI/GNOME
-Version: 2.24.0
+Version: 2.25.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: An archive manager for GNOME
-Source: http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.24/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/file-roller/2.25/%{name}-%{version}.tar.bz2
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
Source2: l10n-configure.sh
%if %build_l10n
@@ -114,8 +114,6 @@
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
-
-rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/libnautilus-fileroller.a
rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/libnautilus-fileroller.la
%clean
@@ -142,6 +140,8 @@
%{_datadir}/pixmaps/*.png
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.2
* Mon Sep 29 2008 - [email protected]
- Correct download URL
* Sat Sep 27 2008 - [email protected]
--- a/base-specs/gnome-media.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/gnome-media.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,12 +11,12 @@
Name: gnome-media
Summary: GNOME Multimedia
Group: System/GUI/GNOME
-Version: 2.24.0.1
+Version: 2.25.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
License: LGPL v2, GPL v2, FDL 1.1
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
@@ -32,8 +32,6 @@
Patch2: gnome-media-02-supportdevices.diff
#owner:jerrytan date:2007-02-06 type:bug bugzilla:387400
Patch3: gnome-media-03-removenewbutton.diff
-#owner:yippi date:2009-01-06 type:bug doo:5677 bugzilla:566856
-Patch4: gnome-media-04-fixcrash.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_docdir}
@@ -76,7 +74,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%ifos linux
@@ -164,6 +161,8 @@
%{_mandir}/man5/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.1. Remove upstream patch gnome-media-04-fixcrash.diff.
* Tue Jan 06 2008 - [email protected]
- Add patch gnome-media-04-fixcrash.diff to fix crashing issue. Fixes doo
bug #5677.
--- a/base-specs/gnome-python-desktop.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/gnome-python-desktop.spec Wed Jan 21 01:25:19 2009 +0000
@@ -10,12 +10,12 @@
Name: gnome-python-desktop
License: GPL
Group: System/Library
-Version: 2.24.0
+Version: 2.25.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Python bindings for various GNOME desktop libraries
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -110,6 +110,8 @@
%{_datadir}/gtk-doc
%changelog -n gnome-python-desktop
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.1.
* Mon Sep 29 2008 - [email protected]
- Bump to 2.24.0.
* Tue Sep 02 2008 - [email protected]
--- a/base-specs/gnome-terminal.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/gnome-terminal.spec Wed Jan 21 01:25:19 2009 +0000
@@ -14,20 +14,19 @@
# DO NOT BUMP TO 2.25.x until we have EggSMClient is available
# Please refer to http://live.gnome.org/SessionManagement/EggSMClient
# and http://svn.gnome.org/viewvc/gnome-terminal?view=revision&revision=3072
-Version: 2.24.0
+Version: 2.25.5
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Terminal
-Source: http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
%endif
#owner:yippi date:2006-05-04 type:branding
Patch1: gnome-terminal-01-menu-entry.diff
-#owner:yippi date:2008-09-17 type:bug bugzilla:552726
-Patch2: gnome-terminal-02-aa-no-xrender.diff
+Patch2: gnome-terminal-02-gthread.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -130,6 +129,9 @@
%{_mandir}/man1/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.5. Remove upstream patch gnome-terminal-02-aa-no-xrender.diff.
+ Add patch gnome-terminal-02-gthread.diff needed for code to compile.
* Wed Sep 24 2008 - [email protected]
- Bump to 2.24.0.
- Rework gnome-terminal-01-menu-entry.diff.
--- a/base-specs/gucharmap.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/gucharmap.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,7 +11,7 @@
Name: gucharmap
License: GPL
Group: System/GUI/GNOME
-Version: 2.24.0
+Version: 2.24.3
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -20,6 +20,7 @@
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
# date:2006-06-06 owner:gman type:branding
Patch1: gucharmap-01-menu-entry.diff
+Patch2: gucharmap-02-gthread.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -51,6 +52,7 @@
cd po-sun; make; cd ..
%endif
%patch1 -p1
+%patch2 -p1
%build
%ifos linux
@@ -64,6 +66,7 @@
CPUS=1
fi
+libtoolize --force
aclocal $ACLOCAL_FLAGS -I m4
automake --add-missing
autoconf
@@ -113,138 +116,97 @@
%{_datadir}/gnome/help/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.24.3. Add patch gucharmap-02-gthread.diff.
* Sat Sep 27 2008 - [email protected]
- Bump to 2.24.0.
-
* Mon Aug 01 2008 - [email protected]
- Bump to 2.23.91.
-
* Tue Aug 05 2008 - [email protected]
- Bump to 2.23.6.
-
* Tue Jun 17 2008 - [email protected]
- Bump to 2.23.4. Call aclocal/automake to get patched intltool.m4.
-
* Tue Mar 11 2008 - [email protected]
- Call aclocal to get patched intltool.m4.
-
* Mon Mar 10 2008 - [email protected]
- Bump to 2.22.0.
-
* Wed Jan 30 2008 - [email protected]
- Bump to 2.21.90.
-
* Tue Jan 15 2008 - [email protected]
- Bump to 2.21.5.
-
* Tue Dec 18 2007 - [email protected]
- Bump to 2.21.4.
-
* Tue Dec 04 2007 - [email protected]
- Bump to 2.21.3.
-
* Wed Sep 19 2007 - [email protected]
- Bump to 1.10.1.
-
* Tue Mar 13 2007 - [email protected]
- Bump to 1.10.0.
-
* Wed Feb 28 2007 - [email protected]
- Remove patch 02-gnome-doc-utils-ver since g-d-u is upgrade to 0.9.x.
-
* Fri Feb 16 2007 - [email protected]
- Add patch, 02-gnome-doc-utils-ver, to allow building with gnome-doc-utils
0.8.0. gnome-doc-utils 0.9.0 doesn't build on Solaris - waiting for docbook
updates.
-
* Thu Feb 15 2007 - [email protected]
- Bump to 1.9.0.
-
* Tue Feb 13 2007 - [email protected]
- Add l10n tarball.
-
* Tue Sep 05 2006 - [email protected]
- Bump to 1.8.0.
-
* Wed Jul 26 2006 - [email protected]
- Bump to 1.7.0.
-
* Fri Jun 01 2006 - [email protected]
- Add menu entry for gucharmap.
-
* Mon Mar 13 2006 - [email protected]
- Bump to 1.6.0.
-
* Sun Feb 26 2006 - [email protected]
- Bump to 1.5.3.
-
* Tue Feb 14 2006 - [email protected]
- Bump to 1.5.2.
-
* Sun Jan 29 2006 - [email protected]
- Bump to 1.5.1
-
* Tue Jan 03 2006 - [email protected]
- Bump to 1.5.0.
-
* Tue Nov 29 2005 - laca.com
- remove javahelp stuff
-
* Tue Sep 27 2005 - [email protected]
- Bump to 1.4.4
-
* Wed May 18 2005 - [email protected]
- Bump to 1.4.3
-
* Fri Jan 14 2005 - [email protected]
- Updated l10n help tarball for cinnabar-linux
-
* Fri Nov 12 2004 - [email protected]
- Updated l10n help tarball and patch
-
* Thu Oct 28 2004 - [email protected]
- Updated l10n help tarball and added pt_BR
-
* Wed Aug 25 2004 - [email protected]
- Added l10n help contents with patch
-
* Thu Aug 05 2004 - [email protected]
- Integrated 0.3 docs tarball from [email protected]
-
* Thu Jul 08 2004 - [email protected]
- Updated l10n content to gucharmap-l10n-po-1.2.tar.bz2
-
* Wed Jul 07 2004 - [email protected]
- port to rpm4
-
* Wed Jul 07 2004 - [email protected]
- added "-j $CPUS" to make to speed up builds
-
* Fri Jun 11 2004 - [email protected]
- Integrated 0.2 docs tarball from [email protected]
-
* Wed May 12 2004 - [email protected]
- Updated l10n content to gucharmap-l10n-po-1.1.tar.bz2
-
* Sun Apr 18 2004 - [email protected]
- enable javahelp conversion on Solaris
-
* Thu Apr 15 2004 - [email protected]
- Bump to 1.4.1
-
* Thu Apr 01 2004 - [email protected]
- Javahelp conversion
-
* Mon Mar 29 2004 - [email protected]
- Updated l10n content to gucharmap-l10n-po-1.0.tar.bz2
-
* Tue Mar 16 2004 - [email protected]
- Bump to 1.3.2
-
* Tue Mar 16 2004 - [email protected]
- Remove online help and .desktop patches since
they're upstream.
-
* Mon Feb 23 2004 - [email protected]
- Bump to 1.3.0
- Re-apply patch 01-menu-name-description.diff
@@ -253,31 +215,24 @@
04-add_help.diff
05-help_make.diff
06-l10n-online-help.diff
-
From QS and into one patch
02-add-l10n-help.diff
* Wed Dec 17 2003 - [email protected]
- Bump to 1.2.0
-
* Fri Oct 31 2003 - [email protected]
- Remove the Sun Supported keyword since we're
removing Extras menu.
-
* Fri Oct 13 2003 - [email protected]
- Update to 1.0.0
-
* Thu Aug 14 2003 - <[email protected]>
- remove *.a, *.la
-
* Fri Aug 08 2003 - [email protected]
- Add and remove some mnemonics
-
* Fri Jul 25 2003 - [email protected]
- Add libgnomeui to Requires
-
* Thu Jul 10 2003 - [email protected]
- Add a patch to add a menu description and
remove the 'Unicode' part of the menu name.
-
* Tue Jul 01 2003 - [email protected]
- Initial Sun release
+
--- a/base-specs/libnotify.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/libnotify.spec Wed Jan 21 01:25:19 2009 +0000
@@ -19,6 +19,7 @@
Distribution: java-desktop-system
Vendor: Sun Microsystems, Inc.
Source: http://www.galago-project.org/files/releases/source/libnotify/libnotify-%{version}.tar.bz2
+Patch1: libnotify-01-uninstalled-pc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,6 +36,7 @@
%prep
%setup -q
+%patch1 -p1
%build
%ifos linux
@@ -76,6 +78,8 @@
%{_datadir}/gtk-doc/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Add libnotify-01-uninstalled-pc.diff.
* Wed Dec 03 2008 - [email protected]
- Bump to 0.4.5.
* Thu Mar 25 2007 - [email protected]
--- a/base-specs/libwnck.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/libwnck.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,12 +11,12 @@
Name: libwnck
License: GPL
Group: System/Libraries/GNOME
-Version: 2.24.0
+Version: 2.25.5
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Window Navigator Construction Kit Library
-Source: http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.24/libwnck-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.25/libwnck-%{version}.tar.bz2
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
@@ -116,6 +116,8 @@
%{_datadir}/gtk-doc
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.5.
* Sat Sep 27 2008 - [email protected]
- Bump to 2.24.0.
* Wed Sep 10 2008 - [email protected]
--- a/base-specs/nautilus-cd-burner.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/nautilus-cd-burner.spec Wed Jan 21 01:25:19 2009 +0000
@@ -10,12 +10,12 @@
Name: nautilus-cd-burner
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.24.0
+Version: 2.25.3
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: nautilus-cd-burner is an extension to Nautilus that makes it easy to write files to a CD burner.
-Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.24/nautilus-cd-burner-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.25/nautilus-cd-burner-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -135,6 +135,8 @@
%{_libdir}/pkgconfig/libnautilus-burn.pc
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.3.
* Tue Oct 21 2008 - [email protected]
- Change the type of patch 4 to branding.
* Sat Sep 27 2008 - [email protected]
--- a/base-specs/sound-juicer.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/sound-juicer.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,12 +11,12 @@
Name: sound-juicer
License: GPL v2, LGPL v2
Group: System/GUI/GNOME
-Version: 2.24.0
+Version: 2.25.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: CD ripping tool
-Source: http://ftp.gnome.org/pub/GNOME/sources/sound-juicer/2.24/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/sound-juicer/2.25/%{name}-%{version}.tar.bz2
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
@@ -118,6 +118,8 @@
%{_datadir}/sound-juicer
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.1.
* Thu Sep 25 2008 - [email protected]
- Bump to 2.24.0.
* Tue Sep 09 2008 - [email protected]
--- a/base-specs/totem-pl-parser.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/totem-pl-parser.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,15 +11,12 @@
Name: totem-pl-parser
License: LGPL v2
Group: System/GUI/GNOME
-Version: 2.24.0
+Version: 2.25.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Totem Multimedia Player
-Source: http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.24/%{name}-%{version}.tar.bz2
-
-#owner:jerrytan date:2008-11-27 type:branding
-Patch1: totem-pl-parser-01-ignore-cdda.diff
+Source: http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.25/%{name}-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
@@ -50,7 +47,6 @@
%prep
%setup -q
-%patch1 -p1
%build
%ifos linux
@@ -127,6 +123,8 @@
%{_includedir}/totem/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.1. Remove upstream patch totem-pl-parser-01-ignore-cdda.diff.
* Wed Sep 24 2008 - [email protected]
- Bump to 2.24.0.
* Mon Sep 01 2008 - [email protected]
--- a/base-specs/totem.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/totem.spec Wed Jan 21 01:25:19 2009 +0000
@@ -11,12 +11,12 @@
Name: totem
License: GPL v2, LGPL v2, BSD
Group: System/GUI/GNOME
-Version: 2.24.0
+Version: 2.25.3
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Totem Multimedia Player
-Source: http://ftp.gnome.org/pub/GNOME/sources/totem/2.24/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/totem/2.25/%{name}-%{version}.tar.bz2
Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
%if %build_l10n
Source2: l10n-configure.sh
@@ -29,10 +29,9 @@
Patch3: totem-03-browserplugin.diff
#owner:jyu_mit date:2008-04-25 type:branding
Patch4: totem-04-web-plugin.diff
-#owner:jerrytan date:2008-09-22 type:bug bugster:6747269 bugzilla:552462
-Patch5: totem-05-avoid-plugin-coredump.diff
#owner:davelam date:2008-12-25 type:bug bugzilla:N/A
-Patch6: totem-06-libsocket.diff
+Patch5: totem-05-libsocket.diff
+Patch6: totem-06-function.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -165,6 +164,9 @@
%{_includedir}/totem/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.25.3. Remove upstream patch totem-05-avoid-plugin-coredump.diff.
+ Add patch totem-06-function.diff.
* Tue Nov 04 2008 - [email protected]
- Backout fix for bug #6227253. This changed totem's help file to point to
sample_apps_info.xml since totem previously did not have its own docs.
--- a/base-specs/zenity.spec Tue Jan 20 20:59:19 2009 +0000
+++ b/base-specs/zenity.spec Wed Jan 21 01:25:19 2009 +0000
@@ -10,7 +10,7 @@
Name: zenity
License: LGPL
Group: System/GUI/GNOME
-Version: 2.24.0
+Version: 2.24.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -110,6 +110,8 @@
%{_mandir}/man1/*
%changelog
+* Tue Jan 20 2009 - [email protected]
+- Bump to 2.24.1.
* Wed Jan 07 2009 - [email protected]
- Add patch to fix focus-on-map bug : 6757658 / bugzilla : 561131
* Wed Sep 24 2008 - [email protected]
--- a/patches/gnome-media-04-fixcrash.diff Tue Jan 20 20:59:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-media-2.24.0.1/grecord/src/gsr-window.c-orig 2009-01-06 18:26:10.788827000 -0600
-+++ gnome-media-2.24.0.1/grecord/src/gsr-window.c 2009-01-06 18:25:16.802546000 -0600
-@@ -2342,7 +2342,7 @@ gsr_window_init (GSRWindow *window)
-
- atk_object_add_relationship (gtk_widget_get_accessible (GTK_WIDGET (priv->input)),
- ATK_RELATION_LABELLED_BY,
-- gtk_widget_get_accessible (GTK_WIDGET (label)));
-+ gtk_widget_get_accessible (GTK_WIDGET (priv->input_label)));
-
- /* choose profile */
- hbox = gtk_hbox_new (FALSE, 12);
--- a/patches/gnome-terminal-02-aa-no-xrender.diff Tue Jan 20 20:59:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-terminal-2.23.91/src/gnome-terminal.schemas.in-orig 2008-09-17 23:17:10.310448000 -0500
-+++ gnome-terminal-2.23.91/src/gnome-terminal.schemas.in 2008-09-17 23:17:38.017454000 -0500
-@@ -583,7 +583,7 @@
- <applyto>/apps/gnome-terminal/profiles/Default/no_aa_without_render</applyto>
- <owner>gnome-terminal</owner>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>Whether to disable anti-aliasing without the X RENDER extension</short>
- <long>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-terminal-02-gthread.diff Wed Jan 21 01:25:19 2009 +0000
@@ -0,0 +1,10 @@
+--- gnome-terminal-2.25.5/configure.ac-orig 2009-01-20 16:33:17.343541000 -0600
++++ gnome-terminal-2.25.5/configure.ac 2009-01-20 16:33:55.517218000 -0600
+@@ -48,6 +48,7 @@ VTE_REQUIRED=0.19.1
+ PKG_CHECK_MODULES([TERM],
+ [vte >= $VTE_REQUIRED
+ glib-2.0 >= $GLIB_REQUIRED
++ gthread-2.0 >= $GLIB_REQUIRED
+ gio-2.0
+ gtk+-2.0 >= $GTK_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gucharmap-02-gthread.diff Wed Jan 21 01:25:19 2009 +0000
@@ -0,0 +1,11 @@
+--- gucharmap-2.24.3/configure.ac-orig 2009-01-20 15:14:31.276369000 -0600
++++ gucharmap-2.24.3/configure.ac 2009-01-20 15:14:57.011070000 -0600
+@@ -77,7 +77,7 @@ AM_CONDITIONAL(OS_WIN32, test "x$os_win3
+
+ GLIB_REQUIRED=2.16.3
+ GTK_REQUIRED=2.13.6
+-PKG_CHECK_MODULES([GTK],[glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED])
++PKG_CHECK_MODULES([GTK],[glib-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED])
+
+ GLIB_GENMARSHAL="$($PKG_CONFIG --variable=glib_genmarshal glib-2.0)"
+ AC_SUBST([GLIB_GENMARSHAL])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libnotify-01-uninstalled-pc.diff Wed Jan 21 01:25:19 2009 +0000
@@ -0,0 +1,21 @@
+--- libnotify-0.4.5/configure.ac-orig 2009-01-20 17:39:42.592468000 -0600
++++ libnotify-0.4.5/configure.ac 2009-01-20 17:39:58.251226000 -0600
+@@ -132,6 +132,7 @@ AC_CONFIG_FILES([
+ Makefile
+ docs/Makefile
+ docs/reference/Makefile
++libnotify-uninstalled.pc
+ libnotify.pc
+ libnotify/Makefile
+ tests/Makefile
+--- /dev/null 2009-01-20 17:41:02.000000000 -0600
++++ libnotify-0.4.5/libnotify-uninstalled.pc.in 2009-01-20 17:39:35.092677000 -0600
+@@ -0,0 +1,8 @@
++
++Name: libnotify
++Description: Notifications Library
++Requires:
++Version: @VERSION@
++Libs: ${pc_top_builddir}/${pcfiledir}/libnotify/libnotify.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}
++
--- a/patches/nautilus-cd-burner-01-always-use-cdrecord-on-solaris.diff Tue Jan 20 20:59:19 2009 +0000
+++ b/patches/nautilus-cd-burner-01-always-use-cdrecord-on-solaris.diff Wed Jan 21 01:25:19 2009 +0000
@@ -1,7 +1,7 @@
diff -urN SUNWgnome-cd-burner-2.22.0/nautilus-cd-burner-2.22.0/configure.in ncdb.new/configure.in
--- SUNWgnome-cd-burner-2.22.0/nautilus-cd-burner-2.22.0/configure.in 2007-02-26 21:45:11.000000000 +0000
+++ ncdb.new/configure.in 2007-04-02 11:40:29.515466000 +0100
-@@ -56,6 +56,16 @@
+@@ -56,6 +56,14 @@ AC_CHECK_FUNC(mkdtemp,
AM_CONDITIONAL(MKDTEMP_MISSING, test x$mkdtemp_missing = xtrue)
dnl ===========================================================================
@@ -13,10 +13,8 @@
+esac
+
+dnl ===========================================================================
-+
-+dnl ===========================================================================
dnl Minimum versions of the libraries
- GLIB_REQUIRED=2.15.4
+ GLIB_REQUIRED=2.17.4
GTK_REQUIRED=2.5.4
diff -urN SUNWgnome-cd-burner-2.21.5/nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c ncdb.new/src/nautilus-burn-recorder.c
--- SUNWgnome-cd-burner-2.21.5/nautilus-cd-burner-2.21.5/src/nautilus-burn-recorder.c 2007-01-07 17:34:30.000000000 +0000
--- a/patches/sound-juicer-01-menu-entry.diff Tue Jan 20 20:59:19 2009 +0000
+++ b/patches/sound-juicer-01-menu-entry.diff Wed Jan 21 01:25:19 2009 +0000
@@ -1,8 +1,7 @@
---- sound-juicer-2.23.0/data/sound-juicer.desktop.in.in.orig 2008-06-05 15:12:42.528974223 +0100
-+++ sound-juicer-2.23.0/data/sound-juicer.desktop.in.in 2008-06-05 15:13:49.245250032 +0100
-@@ -1,7 +1,11 @@
+--- sound-juicer-2.25.1/data/sound-juicer.desktop.in.in-orig 2009-01-20 15:28:44.965944000 -0600
++++ sound-juicer-2.25.1/data/sound-juicer.desktop.in.in 2009-01-20 15:29:21.107734000 -0600
+@@ -1,6 +1,10 @@
[Desktop Entry]
- Encoding=UTF-8
-_Name=Audio CD Extractor
-_Comment=Copy music from your CDs
+# SUN_BRANDING
--- a/patches/totem-01-remove-unsupported-format.diff Tue Jan 20 20:59:19 2009 +0000
+++ b/patches/totem-01-remove-unsupported-format.diff Wed Jan 21 01:25:19 2009 +0000
@@ -1,20 +1,19 @@
-diff -ruN totem-2.23.91.orig/data/mime-type-list.txt totem-2.23.91/data/mime-type-list.txt
---- totem-2.23.91.orig/data/mime-type-list.txt 2008-09-01 20:44:34.283787179 +0100
-+++ totem-2.23.91/data/mime-type-list.txt 2008-09-01 20:47:35.482490427 +0100
-@@ -3,52 +3,34 @@
+diff -ruN totem-2.25.2.orig/data/mime-type-list.txt totem-2.25.2/data/mime-type-list.txt
+--- totem-2.25.2.orig/data/mime-type-list.txt 2008-09-01 20:44:34.283787179 +0100
++++ totem-2.25.2/data/mime-type-list.txt 2008-09-01 20:47:35.482490427 +0100
+@@ -3,11 +3,9 @@ application/ram
application/sdp
application/smil
application/smil+xml
-application/vnd.rn-realmedia
--application/x-extension-m4a
--application/x-extension-mp4
+ application/x-extension-m4a
+ application/x-extension-mp4
application/x-flac
-application/x-flash-video
application/x-matroska
application/x-netshow-channel
application/x-ogg
--application/x-quicktime-media-link
- application/x-quicktimeplayer
+@@ -16,7 +14,6 @@ application/x-quicktimeplayer
application/x-shorten
application/x-smil
application/xspf+xml
@@ -22,26 +21,15 @@
audio/ac3
audio/AMR
audio/AMR-WB
- audio/basic
- audio/midi
--audio/mp4
--audio/mpeg
--audio/mpegurl
+@@ -27,7 +24,6 @@ audio/mpeg
+ audio/mpegurl
audio/ogg
- audio/vnd.rn-realaudio
+ audio/prs.sid
+-audio/vnd.rn-realaudio
audio/x-ape
audio/x-flac
audio/x-it
--audio/x-m4a
- audio/x-matroska
- audio/x-mod
- audio/x-mp3
--audio/x-mpeg
--audio/x-mpegurl
--audio/x-ms-asf
--audio/x-ms-asx
--audio/x-ms-wax
- audio/x-ms-wma
+@@ -44,12 +40,8 @@ audio/x-ms-wma
audio/x-musepack
audio/x-pn-aiff
audio/x-pn-au
@@ -49,36 +37,11 @@
-audio/x-pn-realaudio-plugin
audio/x-pn-wav
audio/x-pn-windows-acm
- audio/x-realaudio
+-audio/x-realaudio
-audio/x-real-audio
audio/x-sbc
audio/x-scpls
audio/x-speex
-@@ -58,24 +40,19 @@
- audio/x-vorbis
- audio/x-vorbis+ogg
- audio/x-xm
--image/vnd.rn-realpix
- image/x-pict
- misc/ultravox
- text/google-video-pointer
- text/x-google-video-pointer
--video/3gpp
- video/dv
- video/fli
- video/flv
- video/mp4
- video/mp4v-es
- video/mpeg
--video/msvideo
- video/ogg
--video/quicktime
- video/vivo
- video/vnd.divx
--video/vnd.rn-realvideo
- video/vnd.vivo
- video/x-anim
- video/x-avi
--- totem-2.24.0-orig/data/handlers.sh Fri Sep 19 13:43:46 2008
+++ totem-2.24.0/data/handlers.sh Wed Oct 8 17:02:54 2008
@@ -29,7 +29,12 @@
--- a/patches/totem-04-web-plugin.diff Tue Jan 20 20:59:19 2009 +0000
+++ b/patches/totem-04-web-plugin.diff Wed Jan 21 01:25:19 2009 +0000
@@ -1,16 +1,12 @@
-diff -ruN totem-2.23.91.orig/browser-plugin/totemPlugin.cpp totem-2.23.91/browser-plugin/totemPlugin.cpp
---- totem-2.23.91.orig/browser-plugin/totemPlugin.cpp 2008-09-01 20:56:32.786152648 +0100
-+++ totem-2.23.91/browser-plugin/totemPlugin.cpp 2008-09-01 20:58:05.071665581 +0100
-@@ -97,12 +97,8 @@
- { "application/annodex", "anx", NULL },
- { "audio/annodex", "axa", NULL },
- { "video/annodex", "axv", NULL },
-- { "video/mpeg", "mpg, mpeg, mpe", NULL },
+diff -ruN totem-2.25.3.orig/browser-plugin/totemPlugin.cpp totem-2.25.3/browser-plugin/totemPlugin.cpp
+--- totem-2.25.3.orig/browser-plugin/totemPlugin.cpp 2008-09-01 20:56:32.786152648 +0100
++++ totem-2.25.3/browser-plugin/totemPlugin.cpp 2008-09-01 20:58:05.071665581 +0100
+@@ -126,8 +126,6 @@ static const totemPluginMimeEntry kMimeT
{ "audio/wav", "wav", NULL },
{ "audio/x-wav", "wav", NULL },
-- { "audio/mpeg", "mp3", NULL },
+ { "audio/mpeg", "mp3", NULL },
- { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
- { "video/flv", "flv", "application/x-flash-video" },
{ "application/x-totem-plugin", "", "Totem Multimedia plugin" },
- #elif defined(TOTEM_GMP_PLUGIN)
- { "application/x-mplayer2", "avi, wma, wmv", "video/x-msvideo" },
+ #else
+ #error Unknown plugin type
--- a/patches/totem-05-avoid-plugin-coredump.diff Tue Jan 20 20:59:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- totem-2.24.0/browser-plugin/totem-plugin-viewer.c.old 2008/09/29 12:47:27 5730
-+++ totem-2.24.0/browser-plugin/totem-plugin-viewer.c 2008/09/29 15:13:57 5734
-@@ -721,7 +721,10 @@
- emb->is_browser_stream = (is_browser_stream != FALSE);
- emb->href_uri = NULL;
-
-- g_print ("totem_embedded_set_uri uri %s base %s => resolved %s\n", uri, base_uri, emb->current_uri);
-+ if (uri != NULL)
-+ g_print ("totem_embedded_set_uri uri %s base %s => resolved %s\n", uri, base_uri, emb->current_uri);
-+ else
-+ g_print ("Emptying current_uri\n");
-
- g_free (old_uri);
- g_free (old_base);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/totem-05-libsocket.diff Wed Jan 21 01:25:19 2009 +0000
@@ -0,0 +1,12 @@
+--- totem-2.25.1/configure.in.ori 2008-12-25 10:32:33.970705504 +0000
++++ totem-2.25.1/configure.in 2008-12-25 10:33:47.798717675 +0000
+@@ -271,6 +271,9 @@ PKG_CHECK_EXISTS([
+ $ISO_CODES
+ gnome-icon-theme >= $GNOMEICON_REQS])
+
++dnl Check for bind in libsocket (needed on Solaris)
++AC_CHECK_LIB(socket, bind)
++
+ dnl *************************
+ dnl X11 related functionality
+ dnl *************************
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/totem-06-function.diff Wed Jan 21 01:25:19 2009 +0000
@@ -0,0 +1,13 @@
+--- totem-2.25.3/src/eggfileformatchooser.c-orig 2009-01-20 15:45:11.189614000 -0600
++++ totem-2.25.3/src/eggfileformatchooser.c 2009-01-20 15:46:17.240213000 -0600
+@@ -5,6 +5,10 @@
+ #include <string.h>
+ #include <ctype.h>
+
++#ifndef __FUNCTION__
++#define __FUNCTION__ __func__
++#endif
++
+ typedef struct _EggFileFormatSearch EggFileFormatSearch;
+
+ enum
--- a/patches/totem-06-libsocket.diff Tue Jan 20 20:59:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- totem-2.24.0/configure.in.ori 2008-12-25 10:32:33.970705504 +0000
-+++ totem-2.24.0/configure.in 2008-12-25 10:33:47.798717675 +0000
-@@ -258,6 +258,9 @@
- GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
- AC_SUBST(GTK_LIBS)
-
-+dnl Check for bind in libsocket (needed on Solaris)
-+AC_CHECK_LIB(socket, bind)
-+
- dnl *************************
- dnl X11 related functionality
- dnl *************************
--- a/patches/totem-pl-parser-01-ignore-cdda.diff Tue Jan 20 20:59:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- totem-pl-parser-2.24.0/plparse/totem-pl-parser.c.old 2008-11-27 16:34:18.178690000 +0800
-+++ totem-pl-parser-2.24.0/plparse/totem-pl-parser.c 2008-11-27 16:35:03.775786000 +0800
-@@ -1415,9 +1415,10 @@
-
- if (g_file_has_uri_scheme (file, "mms") != FALSE
- || g_file_has_uri_scheme (file, "rtsp") != FALSE
-+ || g_file_has_uri_scheme (file, "cdda") != FALSE
- || g_file_has_uri_scheme (file, "icy") != FALSE
- || g_file_has_uri_scheme (file, "pnm") != FALSE) {
-- DEBUG(file, g_print ("URL '%s' is MMS, RTSP, PNM or ICY, not a playlist\n", uri));
-+ DEBUG(file, g_print ("URL '%s' is MMS, RTSP,CDDA, PNM or ICY, not a playlist\n", uri));
- return TOTEM_PL_PARSER_RESULT_UNHANDLED;
- }
-