--- a/ChangeLog Sat Dec 04 21:59:36 2010 +0000
+++ b/ChangeLog Tue Dec 07 21:59:21 2010 +0000
@@ -1,3 +1,37 @@
+2010-12-07 Brian Cameron <[email protected]>
+
+ * SFEesound.spec, base-specs/esound.spec, patches/esound-01-build.diff:
+ Added.
+ * SFEsongbird.spec, ext-sources/nspr-nss-config,
+ patches/songbird-01-cpp-template.diff,
+ patches/songbird-02-taglib.diff,
+ patches/songbird-03-remap-pixman-functions.diff,
+ patches/songbird-05-build.diff,
+ patches/songbird-04-startup-script.diff,
+ patches/songbird-06-donot-delay-stopping-realplayer.diff,
+ patches/songbird-07-xulrunner-elif.diff,
+ patches/songbird-08-runpath.diff
+ patches/songbird-09-system-nss-nspr.diff
+ patches/songbird-10-moz-nss-nspr.diff
+ patches/songbird-11-use-sun-cc.diff
+ patches/songbird-12-using-bash.diff
+ patches/songbird-13-type-cast.diff
+ patches/songbird-14-check-readable-core.diff: Added.
+ * patches/songbird-02-taglib.diff: Updated
+ * patches/songbird-01-menu-item.diff: Removed.
+ * SFEquick-lounge-applet.spec, base-specs/quick-lounge-applet.spec:
+ Added.
+ * SFEmoovida.spec, SFEmoovida-plugins.spec,
+ base-specs/moovida.spec
+ base-specs/moovida-plugins-good.spec,
+ base-specs/moovida-plugins-bad.spec,
+ patches/moovida-04-pidof.diff,
+ patches/moovida-plugins-bad-01-rm-plugins.diff: Updated to latest
+ from spec-files.
+ * SFElibpigment.spec,
+ SFElibpigment-python26.spec,
+ base-specs/libpigment-python.spec: Added.
+
2010-12-04 Milan Jurik <[email protected]>
* SFEwebalizer.spec: bump to 2.23 and GeoIP support added
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEesound.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,132 @@
+#
+# spec file for package SFEesound
+#
+# includes module(s): gnome-audio
+#
+# Copyright (c) 2004, 2010, 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.
+#
+#
+%include Solaris.inc
+
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use esound_64 = esound.spec
+%endif
+
+%include base.inc
+%use esound = esound.spec
+
+Name: SUNWesound
+IPS_package_name: gnome/esound
+Meta(info.classification): %{classification_prefix}:System/Multimedia Libraries
+Summary: GNOME audio support framework
+Version: %{default_pkg_version}
+SUNW_BaseDir: %{_basedir}
+License: LGPL v2, , MIT, Sun Public Domain, binaries use GPL v2
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%include default-depend.inc
+BuildRequires: SUNWgnome-common-devel
+BuildRequires: SUNWaudh
+Requires: SUNWlibms
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%esound_64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir %name-%version/%base_arch
+%esound.prep -d %name-%version/%base_arch
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+%ifarch amd64 sparcv9
+%esound_64.build -d %name-%version/%_arch64
+%endif
+
+%esound.build -d %name-%version/%base_arch
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%ifarch amd64 sparcv9
+%esound_64.install -d %name-%version/%_arch64
+
+rm $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*a
+rm $RPM_BUILD_ROOT%{_prefix}/lib/esd
+%endif
+
+%esound.install -d %name-%version/%base_arch
+
+rm $RPM_BUILD_ROOT%{_libdir}/lib*a
+rm $RPM_BUILD_ROOT%{_bindir}/{esdfilt,esdloop}
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/esd
+%ifarch amd64 sparcv9
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%{_libexecdir}/lib*.so*
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+
+%files root
+%defattr (0644, root, sys)
+%attr (0755, root, sys) %dir %{_sysconfdir}
+%{_sysconfdir}/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/esd-config
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_bindir}/%{_arch64}
+%{_bindir}/%{_arch64}/esd-config
+%endif
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*
+%endif
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/aclocal
+%{_datadir}/aclocal/*
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Created.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibpigment-python26.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,97 @@
+#
+# spec file for package SFEpigment-python
+#
+# includes module(s): pigment-python
+#
+# Copyright (c) 2009, 2010, 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.
+#
+#
+# bugdb: https://code.fluendo.com/pigment/trac/
+#
+%include Solaris.inc
+%define pythonver 2.6
+
+%use pypigment= libpigment-python.spec
+
+Name: SFElibpigment-python26
+IPS_package_name: library/python-2/python-pigment-26
+Meta(info.classification): %{classification_prefix}:System/Multimedia Libraries
+Vendor: Sun Microsystems, Inc.
+Summary: Pigment user interface library with embedded multimedia
+Version: %{pypigment.version}
+License: LGPL v2.1
+SUNW_BaseDir: %{_basedir}
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: SUNWPython26-devel
+BuildRequires: SUNWgnome-common-devel
+BuildRequires: SUNWgnome-media-devel
+BuildRequires: SUNWgnome-python26-libs-devel
+BuildRequires: SUNWgst-python26
+BuildRequires: SFElibpigment-devel
+BuildRequires: SUNWpython26-setuptools
+Requires: SUNWgnome-media
+Requires: SUNWgnome-python26-libs
+Requires: SFElibpigment
+Requires: SUNWgst-python26
+
+%description
+pigment python binding for python %{pythonver}
+
+%include default-depend.inc
+
+%prep
+
+rm -rf %name-%version
+mkdir -p %name-%version
+%pypigment.prep -d %name-%version
+
+%build
+%pypigment.build -d %name-%version
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%pypigment.install -d %name-%version
+rm -rf $RPM_BUILD_ROOT/usr/share/pigment-python
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%doc -d %{pypigment.name}-%{pypigment.version} README AUTHORS
+%doc(bzip2) -d %{pypigment.name}-%{pypigment.version} NEWS COPYING ChangeLog
+%defattr(-,root,bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{pythonver}/vendor-packages/_pgmgtkmodule.so
+%{_libdir}/python%{pythonver}/vendor-packages/_pgmmodule.so
+%{_libdir}/python%{pythonver}/vendor-packages/_pgmimagingmodule.so
+%{_libdir}/python%{pythonver}/vendor-packages/pgm
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/doc
+#%{_datadir}/pigment-python
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Migrate to SFE.
+* Thu Feb 12 2009 Brian Cameron <[email protected]>
+- created 2.6 version based on SUNWlibpigment-python.spec.
+* Tus Nov 11 2008 Jerry Tan <[email protected]>
+- Bump to 0.3.9
+* Tue Sep 30 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.8.
+* Wed Sep 17 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.7.
+* Thu Sep 11 2008 Jerry Yu <[email protected]>
+- Bump to 0.3.6.
+* Thu Jul 31 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.5.
+* Wed Jul 23 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.4.
+* Wed Mar 19 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.3
+* Wed Feb 06 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.2.
+* Wed Jan 16 2008 Brian Cameron <[email protected]>
+- Created.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibpigment.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,146 @@
+#
+# spec file for package SFElibpigment
+#
+# includes module(s): pigment
+#
+# Copyright (c) 2008, 2010, 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 OSR 9492:0.3.6
+
+#
+# bugdb: https://code.fluendo.com/pigment/trac/
+#
+%define version 0.3.17
+
+%include Solaris.inc
+
+Summary: Pigment user interface library with embedded multimedia
+Name: SFElibpigment
+IPS_package_name: library/desktop/pigment
+Meta(info.classification): %{classification_prefix}:System/Multimedia Libraries
+License: LGPL v2.1
+Vendor: fluendo.com
+Version: %{version}
+URL: https://core.fluendo.com/pigment/trac
+Source0: http://elisa.fluendo.com/static/download/pigment/pigment-%{version}.tar.bz2
+SUNW_BaseDir: %{_basedir}
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: SUNWgtk2-devel
+BuildRequires: SUNWgnome-common-devel
+BuildRequires: SUNWgnome-media-devel
+Requires: SUNWgtk2
+Requires: SUNWgnome-media
+
+BuildRequires: SUNWxorg-mesa
+Requires: SUNWxorg-mesa
+
+%include default-depend.inc
+
+%description
+Pigment is a library designed to easily build user interfaces
+with embedded multimedia. Its design allows to use it on several
+platforms, thanks to a plugin system allowing to choose the underlying
+graphical API. Pigment is the rendering engine of Elisa, the Fluendo
+Media Center project.
+
+%package devel
+Group: Development/Tools
+Summary: Development headers for Pigment
+Requires: %name
+
+%prep
+%setup -q -n pigment-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+aclocal $ACLOCAL_FLAGS -I ./common/m4
+gtkdocize
+autoheader
+automake -a -c -f
+autoconf
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir}
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -r $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -r $RPM_BUILD_ROOT/%{_libdir}/*.a
+rm -r $RPM_BUILD_ROOT/%{_libdir}/pigment-0.3/%{version}/*.la
+rm -r $RPM_BUILD_ROOT/%{_libdir}/pigment-0.3/%{version}/*.a
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%doc README AUTHORS
+%doc(bzip2) NEWS COPYING ChangeLog
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/doc
+%defattr(-,root,bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{_libdir}/pigment-0.3/%{version}/lib*.so*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_datadir}/gtk-doc
+%dir %attr (0755, root, bin) %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/*
+
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Migrated to SFE.
+* Sat Apr 24 2010 - [email protected]
+- Obsoleted useless macro 'name'.
+* Fri Jan 09 2009 - [email protected]
+- Add SUNWglrt and SUNWxorg-mesa as dependencies. Fixes bug
+ #6791253.
+* Wed Nov 12 2008 Jerry Tan <[email protected]>
+- Bump to 0.3.12
+* Mon Oct 13 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.11.
+* Tue Sep 30 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.10.
+* Wed Sep 17 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.9. Remove upstream patch pigment-01-m4.diff.
+* Thu Sep 10 2008 Jerry Yu <[email protected]>
+- Bump to 0.3.8.
+- Add patch pigment-01-m4.diff.
+* Thu Jul 31 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.7.
+* Wed Jul 23 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.6.
+* Wed Mar 19 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.5.
+* Wed Feb 06 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.4.
+* Wed Jan 16 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.3. Remove upstream patch.
+* Fri Oct 05 2007 Brian Cameron <[email protected]>
+- Bump to 0.3.2
+* Sun Aug 05 2007 Brian Cameron <[email protected]>
+- Bump to 0.3.1
+* Tue Jul 10 2007 Brian Cameron <[email protected]>
+- Create spec file.
--- a/SFEmoovida-plugins.spec Sat Dec 04 21:59:36 2010 +0000
+++ b/SFEmoovida-plugins.spec Tue Dec 07 21:59:21 2010 +0000
@@ -7,19 +7,22 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Owner: yippi
+%define owner yippi
#
# bugdb: https://bugs.launchpad.net/elisa
#
%include Solaris.inc
-%define pythonver 2.6
+%define default_python_version 2.6
%use moovida_plugins_good = moovida-plugins-good.spec
%use moovida_plugins_bad = moovida-plugins-bad.spec
Name: SFEmoovida-plugins
+IPS_package_name: desktop/media-player/moovida/moovida-plugins
+Meta(info.classification): %{classification_prefix}:Applications/Sound and Video
License: GPL v3, MIT
+Vendor: Sun Microsystems, Inc.
Summary: Media center plugins
Version: %{default_pkg_version}
SUNW_BaseDir: %{_basedir}
@@ -36,21 +39,21 @@
BuildRequires: SUNWimagick
BuildRequires: SUNWsqlite3
BuildRequires: SUNWgnome-python26-extras
-BuildRequires: SUNWlibpigment-devel
+BuildRequires: SFElibpigment-devel
BuildRequires: SUNWpython26-simplejson
BuildRequires: SUNWpython26-pyopenssl
BuildRequires: SUNWpython26-setuptools
Requires: SFEmoovida
Requires: SUNWgnome-media
Requires: SUNWimagick
-Requires: SUNWPython
+Requires: SUNWPython26
Requires: SUNWsqlite3
Requires: SUNWPython26-extra
Requires: SUNWdbus-python26
Requires: SUNWgnome-python26-extras
Requires: SUNWgst-python26
-Requires: SUNWlibpigment
-Requires: SUNWlibpigment-python26
+Requires: SFElibpigment
+Requires: SFElibpigment-python26
Requires: SUNWpython26-imaging
Requires: SUNWpython26-pyopenssl
Requires: SUNWpython26-setuptools
@@ -70,8 +73,9 @@
%if %build_l10n
%package l10n
+IPS_package_name: desktop/media-player/moovida/moovida-plugins/l10n
Summary: %{summary} - l10n files
-SUNW_BaseDir: %{_basedir}
+SUNW_BaseDir(relocate_from:%{_prefix}): %{_dto_il10n_basedir}
%include default-depend.inc
Requires: %{name}
%endif
@@ -90,18 +94,18 @@
%moovida_plugins_good.install -d %name-%version
%moovida_plugins_bad.install -d %name-%version
-# move to vendor-packages
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
-mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
- $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
-rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+# move to verndor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/* \
+ $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages
%if %build_l10n
%else
# REMOVE l10n FILES
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-rm -rf $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/elisa/plugins/[a-z]*/i18n
+rm -rf $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages/elisa/plugins/[a-z]*/i18n
%endif
%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
@@ -119,9 +123,9 @@
%files
%defattr(-,root,bin)
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/python%{pythonver}/vendor-packages/elisa
-%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*-py%{pythonver}.egg-info
-%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*-py%{pythonver}-nspkg.pth
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa_plugin_*-py%{default_python_version}.egg-info
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa_plugin_*-py%{default_python_version}-nspkg.pth
%dir %attr (0755, root, sys) %{_datadir}
%if %build_l10n
@@ -135,5 +139,7 @@
%endif
%changelog
+* Mon Oct 12 2009 - [email protected]
+- Now use %{default_python_version}.
* Wed Jul 15 2009 - [email protected]
-- Created
+- Created.
--- a/SFEmoovida.spec Sat Dec 04 21:59:36 2010 +0000
+++ b/SFEmoovida.spec Tue Dec 07 21:59:21 2010 +0000
@@ -3,28 +3,29 @@
#
# includes modules: moovida
#
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2010, 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.
#
-# Owner: yippi
+%define owner yippi
#
# bugdb: https://bugs.launchpad.net/elisa
#
%include Solaris.inc
-%define pythonver 2.6
+%use moovida = moovida.spec
-%use moovida = moovida.spec
+%define default_python_version 2.6
Name: SFEmoovida
+IPS_package_name: desktop/media-player/moovida
+Meta(info.classification): %{classification_prefix}:Applications/Sound and Video
License: GPL v3, MIT
+Vendor: Sun Microsystems, Inc.
Summary: Media center written in Python
-Version: %{default_pkg_version}
+Version: %{moovida.version}
SUNW_BaseDir: %{_basedir}
-%ifnarch sparc
-# these packages are only available on x86
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -34,20 +35,20 @@
BuildRequires: SUNWimagick
BuildRequires: SUNWsqlite3
BuildRequires: SUNWgnome-python26-extras
-BuildRequires: SUNWlibpigment-devel
+BuildRequires: SFElibpigment-devel
BuildRequires: SUNWpython26-simplejson
BuildRequires: SUNWpython26-pyopenssl
BuildRequires: SUNWpython26-setuptools
Requires: SUNWgnome-media
Requires: SUNWimagick
-Requires: SUNWPython
+Requires: SUNWPython26
Requires: SUNWsqlite3
Requires: SUNWPython26-extra
Requires: SUNWdbus-python26
Requires: SUNWgnome-python26-extras
Requires: SUNWgst-python26
-Requires: SUNWlibpigment
-Requires: SUNWlibpigment-python26
+Requires: SFElibpigment
+Requires: SFElibpigment-python26
Requires: SUNWpython26-imaging
Requires: SUNWpython26-pyopenssl
Requires: SUNWpython26-setuptools
@@ -64,14 +65,6 @@
cards by using OpenGL APIs. You can watch movies, listen to music
and view pictures with Moovida.
-%if %build_l10n
-%package l10n
-Summary: %{summary} - l10n files
-SUNW_BaseDir: %{_basedir}
-%include default-depend.inc
-Requires: %{name}
-%endif
-
%prep
rm -rf %name-%version
mkdir %name-%version
@@ -87,11 +80,14 @@
export PYTHONPATH=%{_builddir}/%name-%version/elisa-%{elisa.version}:$PYTHONPATH
mv $RPM_BUILD_ROOT%{_bindir}/elisa $RPM_BUILD_ROOT%{_bindir}/moovida
-# move to vendor-packages
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
-mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
- $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
-rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+# move to verndor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages/* \
+ $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/site-packages
+
+# Do not ship mobile desktop file.
+rm $RPM_BUILD_ROOT%{_datadir}/applications/moovida-mobile.desktop
%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
@@ -110,9 +106,9 @@
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/python%{pythonver}/vendor-packages/elisa
-%{_libdir}/python%{pythonver}/vendor-packages/elisa-*-py%{pythonver}.egg-info
-%{_libdir}/python%{pythonver}/vendor-packages/elisa-*-py%{pythonver}-nspkg.pth
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa-*-py%{default_python_version}.egg-info
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa-*-py%{default_python_version}-nspkg.pth
%doc -d elisa-%{moovida.version} AUTHORS
%doc(bzip2) -d elisa-%{moovida.version} COPYING README
%doc(bzip2) -d elisa-%{moovida.version} LICENSE.GPL
@@ -131,17 +127,10 @@
%dir %attr (0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
-%if %build_l10n
-%files l10n
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
-%endif
-
-# endif for "ifnarch sparc"
-%endif
%changelog
+* Mon Oct 12 2009 - [email protected]
+- Now use %{default_python_version}.
* Wed May 27 2009 - [email protected]
- Move elisa spec files to moovida spec files.
* Fri Apr 3 2009 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEquick-lounge-applet.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,125 @@
+#
+# spec file for package SFEquick-lounge-applet
+#
+# Copyright 2009 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+#
+%include Solaris.inc
+%use qlounge = quick-lounge-applet.spec
+
+Name: SUNWquick-lounge-applet
+IPS_package_name: gnome/applet/quick-lounge-applet
+Meta(info.classification): %{classification_prefix}:Applications/Panels and Applets
+Summary: GNOME Quick Lounge applet
+Version: %{default_pkg_version}
+SUNW_BaseDir: %{_basedir}
+License: %{deskbar_applet.license}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+BuildRequires: SUNWgtk2-devel
+BuildRequires: SUNWlibart-devel
+BuildRequires: SUNWlibglade-devel
+BuildRequires: SUNWgnome-media
+BuildRequires: SUNWgnome-media-devel
+BuildRequires: SUNWgnome-character-map-devel
+BuildRequires: SUNWgnome-doc-utils
+BuildRequires: SUNWgnome-vfs-devel
+BuildRequires: SUNWgnome-panel-devel
+BuildRequires: SUNWgnome-python26-desktop-devel
+BuildRequires: SUNWpython26-setuptools
+BuildRequires: SUNWsolnm
+BuildRequires: SUNWarc
+BuildRequires: SUNWevolution-data-server-devel
+Requires: SUNWgtk2
+Requires: SUNWgnome-python26-desktop
+Requires: SUNWgnome-character-map
+Requires: SUNWgnome-panel
+Requires: SUNWgnome-libs
+Requires: SUNWgnome-config
+Requires: SUNWgnome-vfs
+Requires: SUNWgnome-component
+Requires: SUNWlibpopt
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%if %build_l10n
+%package l10n
+IPS_package_name: system/display-manager/gdm/l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir(relocate_from:%{_prefix}): %{_gnome_il10n_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+%qlounge.prep -d %name-%version
+
+%build
+%qlounge.build -d %name-%version
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%qlounge.install -d %name-%version
+
+chmod 0644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/C/*.xml
+
+# Never install English locales because should support full functions
+# on English locales as same as Solaris. See SUNWzz-gnome-l10n.spec.
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/en_GB
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale
+rm -r $RPM_BUILD_ROOT%{_datadir}/gnome/help/[e-z]*/[a-z]*
+%endif
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%restart_fmri icon-cache gconf-cache
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/bonobo/servers/GNOME_QuickLoungeApplet_Factory.server
+%{_libexecdir}/quick-lounge-applet
+%dir %attr(0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/gnome
+%{_datadir}/gnome/help/quick-lounge/C
+%{_datadir}/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
+%dir %attr (-, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor
+%{_datadir}/icons/hicolor/48x48/apps/quick-lounge*
+%{_datadir}/quick-lounge-applet
+
+%files root
+%defattr(-, root, sys)
+%dir %attr(0755, root, sys) %{_sysconfdir}
+%{_sysconfdir}/gconf/schemas/quick-lounge.schemas
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%dir %attr (0755, root, other) %{_datadir}/gnome
+%{_datadir}/gnome/help/[a-c]*/[a-z]*
+%{_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
+%endif
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Created.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEsongbird.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,404 @@
+#
+# spec file for package SFEsongbird
+#
+# includes module(s): songbird
+#
+# Copyright 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%include Solaris.inc
+
+%define OSR 10735:1.x
+
+%if %option_with_debug
+%define build_type debug
+%else
+%define build_type release
+%endif
+
+Name: SFEsongbird
+IPS_package_name: desktop/media-player/songbird
+Meta(info.classification): %{classification_prefix}:Applications/Sound and Video
+Summary: The desktop media player mashed-up with the Web.
+Version: 1.4.3
+Vendor: getsongbird.com
+Source: http://download.songbirdnest.com/source/Songbird%{version}-1438.tar.bz2
+Source1: http://download.songbirdnest.com/source/Songbird%{version}-1438-vendor.tar.bz2
+Source2: nspr-nss-config
+
+# date:2009-03-31 type:branding
+# The patch will be removed when the apache C++ standard library is integrated.
+Patch1: songbird-01-cpp-template.diff
+# date:2008-07-16 type:bug
+# bugzilla.songbirdnest.com 7800. The patch was backed out as it breaks Windows build.
+Patch2: songbird-02-taglib.diff
+# date:2008-06-25 type:bug
+# bugzilla.mozilla.org 440714
+Patch3: songbird-03-remap-pixman-functions.diff
+# date:2009-01-07 type:branding
+Patch4: songbird-04-startup-script.diff
+# date:2009-03-31 type:bug
+# bugzilla.songbirdnest.com 16898
+Patch5: songbird-05-build.diff
+# date:2008-09-08 type:bug
+# bugster:6724471 bugzilla:451007
+Patch6: songbird-06-donot-delay-stopping-realplayer.diff
+# ginnchen date:2009-01-15 type:bug
+# bugzilla.mozilla.org 455670
+Patch8: songbird-08-runpath.diff
+# ginnchen date:2009-05-21 type:branding
+Patch9: songbird-09-system-nss-nspr.diff
+# date:2009-10-23 type:bug d.o.o 12202
+Patch10: songbird-10-moz-nss-nspr.diff
+# date:2009-10-23 type:bug d.o.o 12038
+Patch11: songbird-11-use-sun-cc.diff
+# date:2009-10-30 type:bug d.o.o 12317
+Patch12: songbird-12-using-bash.diff
+# date:2010-01-11 type:bug
+Patch13: songbird-13-type-cast.diff
+# date:2010-04-28 type:bug:bug d.o.o 15069
+Patch14: songbird-14-check-readable-core.diff
+
+URL: http://www.songbirdnest.com/
+SUNW_BaseDir: %{_basedir}
+License: GPL v2.1/LGPL v2.1/Public Domain
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+#####################################
+## Package Requirements Section ##
+#####################################
+
+%include default-depend.inc
+Requires: SUNWgtk2
+Requires: SUNWfontconfig
+Requires: SUNWfreetype2
+Requires: SUNWgnome-config
+Requires: SUNWgnome-libs
+Requires: SUNWgnome-media
+Requires: SUNWgnome-vfs
+Requires: SUNWlibC
+Requires: SUNWlibms
+Requires: SUNWlibmsr
+Requires: SUNWsqlite3
+Requires: SUNWjpg
+Requires: SUNWpng
+Requires: SUNWmlib
+Requires: SUNWzlib
+Requires: SUNWpr
+BuildRequires: SUNWgtk2-devel
+
+# Songbird depends on Firefox's plugins.
+Requires: SUNWfirefox
+
+BuildRequires: SUNWgnome-media-devel
+BuildRequires: SUNWgnome-config-devel
+BuildRequires: SUNWgnome-libs-devel
+BuildRequires: SUNWgnome-vfs-devel
+BuildRequires: SUNWgnome-component-devel
+BuildRequires: SUNWbzip
+BuildRequires: SUNWgtar
+BuildRequires: SUNWcmake
+
+%description
+Songbird is a free software media player and web browser, designed to
+catalyze and champion a diverse, open Media Web.
+
+%prep
+%setup -q -n %name-%version -c -a1
+
+rm -rf Songbird%{version}/dependencies/vendor
+mv Songbird%{version}-vendor Songbird%{version}/dependencies/vendor
+
+mkdir -p build/checkout/solaris-%{base_arch}
+mkdir -p build/solaris-%{base_arch}
+
+cd Songbird%{version}
+%patch1 -p1
+%patch2 -p1
+%patch4 -p1
+%patch5 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+cd dependencies/vendor/xulrunner/mozilla
+%patch3 -p1
+%patch6 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+# Build the vendor library (taglib)
+export LDFLAGS="-norunpath"
+cd Songbird%{version}/dependencies/vendor/taglib
+export SB_VENDOR_BUILD_ROOT=%{_builddir}/%name-%version/build
+/usr/gnu/bin/make -f Makefile.songbird %{build_type}
+cd ../../../../
+
+# Move compiled taglib into the dependecies area
+cd build/solaris-%{base_arch}
+mkdir ../../Songbird%{version}/dependencies/solaris-%{base_arch}
+mv taglib ../../Songbird%{version}/dependencies/solaris-%{base_arch}
+cd ../../Songbird%{version}
+
+LDFLAGS="-norunpath -z ignore -R'\$\$ORIGIN:\$\$ORIGIN/..'"
+export LDFLAGS
+
+export CFLAGS="-xlibmil"
+export CXXFLAGS="-D__FUNCTION__=__func__ -xlibmil -xlibmopt -features=tmplrefstatic -features=tmplife,extensions -lCrun -lCstd"
+%if %option_with_debug
+%else
+%ifarch sparc
+export CFLAGS="$CFLAGS -xO5"
+export CXXFLAGS="$CXXFLAGS -xO5"
+%else
+export CFLAGS="$CFLAGS -xO4"
+export CXXFLAGS="$CXXFLAGS -xO4"
+%endif
+%endif
+
+cd dependencies/vendor/xulrunner/mozilla
+# Build XULRunner
+cat << "EOF" > .mozconfig
+MOZILLA_OFFICIAL=1
+export MOZILLA_OFFICIAL
+
+BUILD_OFFICIAL=1
+export BUILD_OFFICIAL
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/compiled/xulrunner
+ac_add_options --prefix=%{_prefix}
+ac_add_options --libdir=%{_libdir}
+ac_add_options --mandir=%{_mandir}
+ac_add_options --enable-application=xulrunner
+ac_add_options --with-xulrunner-stub-name=songbird-bin
+%if %option_with_debug
+ac_add_options --enable-debug
+ac_add_options --disable-optimize
+ac_add_options --enable-tests
+%else
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-tests
+%endif
+ac_add_options --disable-auto-deps
+ac_add_options --disable-crashreporter
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-updater
+ac_add_options --enable-dtrace
+ac_add_options --enable-system-cairo
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --enable-system-sqlite
+ac_add_options --with-system-jpeg
+ac_add_options --disable-installer
+ac_add_options --enable-extensions=default,inspector,venkman
+ac_add_options --enable-jemalloc
+
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_DEBUG_SYMBOLS=1
+EOF
+
+mkdir -p compiled/xulrunner
+
+cp %{SOURCE2} compiled/xulrunner
+chmod +x compiled/xulrunner/nspr-nss-config
+export NSPR_CONFIG=$PWD/compiled/xulrunner/nspr-nss-config\ nspr
+export NSS_CONFIG=$PWD/compiled/xulrunner/nspr-nss-config\ nss
+
+make -f client.mk build_all
+
+# Package XULRunner
+cd ../../../..
+
+mkdir -p dependencies/solaris-%{base_arch}/mozilla/%build_type
+mkdir -p dependencies/solaris-%{base_arch}/xulrunner/%build_type
+
+cd tools/scripts
+chmod +x make-mozilla-sdk.sh
+chmod +x make-xulrunner-tarball.sh
+./make-mozilla-sdk.sh ../../dependencies/vendor/xulrunner/mozilla ../../dependencies/vendor/xulrunner/mozilla/compiled/xulrunner ../../dependencies/solaris-%{base_arch}/mozilla/%build_type
+./make-xulrunner-tarball.sh ../../dependencies/vendor/xulrunner/mozilla/compiled/xulrunner/dist/bin ../../dependencies/solaris-%{base_arch}/xulrunner/%build_type xulrunner.tar.gz
+
+cd ../../
+echo ac_add_options --with-media-core=gstreamer-system > songbird.config
+echo ac_add_options --enable-breakpad=no >> songbird.config
+
+export SB_ENABLE_MOZBROWSER_CHECK=
+export SB_DISABLE_DEPENDENT_PKG_MGMT=1
+export SB_DISABLE_PKG_AUTODEPS=1
+
+# Build Songbird
+%if %option_with_debug
+%else
+export SB_ENABLE_INSTALLER=1
+export SONGBIRD_OFFICIAL=1
+%endif
+
+export LDFLAGS="$LDFLAGS -R'\$\$ORIGIN/../xulrunner'"
+
+export CFLAGS="$CFLAGS -I%{_includedir}/mps"
+export CXXFLAGS="$CXXFLAGS -I%{_includedir}/mps"
+export LDFLAGS="$LDFLAGS -L%{_libdir}/mps -R%{_libdir}/mps"
+
+export SB_ENABLE_JARS=1
+export LD=CC
+export PATH=/usr/gnu/bin:$PATH
+
+%if %option_with_debug
+make -f songbird.mk debug
+cp ./app/branding/songbird-512.png compiled/dist
+%else
+make -f songbird.mk
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+cd %{_builddir}/%name-%version/Songbird%{version}/compiled
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+cp -R dist $RPM_BUILD_ROOT%{_libdir}/songbird
+
+# Remove unnecessary libraries/tools
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/libjemalloc.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/mangle
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/mozilla-xremote-client
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/nsinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/regxpcom
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/shlibsign
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/ssltunnel
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/updater.ini
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/xp*
+rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner/xulrunner*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/xulrunner/plugins
+
+# Make use of Firefox's plugins
+rmdir $RPM_BUILD_ROOT%{_libdir}/songbird/plugins
+ln -s ../firefox/plugins $RPM_BUILD_ROOT%{_libdir}/songbird/
+
+mv $RPM_BUILD_ROOT%{_libdir}/songbird/songbird-512.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mv $RPM_BUILD_ROOT%{_libdir}/songbird/songbird.desktop $RPM_BUILD_ROOT%{_datadir}/applications
+ln -s ../lib/songbird/songbird $RPM_BUILD_ROOT%{_bindir}/songbird
+
+#install man page
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+cd %{_builddir}/%name-%version/Songbird%{version}/sun-manpages
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%doc(bzip2) -d Songbird%{version} LICENSE
+%dir %attr (0755, root, other) %{_datadir}/doc
+%defattr(-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/songbird
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/songbird
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/songbird.desktop
+%dir %attr (0755, root, other) %{_datadir}/pixmaps
+%{_datadir}/pixmaps/*.png
+%dir %attr (0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Migrated to SFE.
+* Wen Apl 28 2010 - [email protected]
+- Add patch songbird-14-check-readable-core.diff to fix d.0.0:15069
+* Fri Oct 30 2009 - [email protected]
+- Add patch songbird-12-using-bash.diff
+* Fri Oct 23 2009 - [email protected]
+- Add patch songbird-10-moz-nss-nspr.diff and songbird-11-use-sun-cc.diff
+* Fri Aug 28 2009 - [email protected]
+- Change owner to jouby
+* Thu Jul 30 2009 - [email protected]
+- Fix for packaging (songbird-512.png).
+* Mon Jul 27 2009 - [email protected]
+- Use GNU make to build the vendor library and enable system sqlite.
+ Fix d.o.o bug #10284 for the missing image.
+* Wed Jul 01 2009 - [email protected]
+- Update to include $ORIGIN/../xulrunner to Songbird runtime path.
+* Tue Jun 23 2009 - [email protected]
+- Bump to 1.2.0. Rework build.diff to fix the 1.2.0 build failure.
+* Tue Jun 02 2009 - [email protected]
+- Bump to 1.1.2.
+ Use system NSS NSPR libraries by default (from firefox.spec by Ginn Chen).
+ Remove patch system-sqlite.diff and wait for the system sqlite to upgrade.
+ Add patch xulrunner-elif.diff for bugzilla #478843.
+* Tue Mar 31 2009 - [email protected]
+- Bump to 1.1.1 and fix bugster CR#6819948.
+ Remove patches: songbird-01-taglib-build.diff, songbird-05-1.0.0-build.diff.
+ Add patches: songbird-01-cpp-template.diff, songbird-05-1.0.0-build.diff.
+* Thu Jan 15 2009 - [email protected]
+- Fix the RPATH and RUNPATH for XULRunner.
+ bugster bug: 6786843.
+* Wed Jan 07 2009 - [email protected]
+- Bump to 1.0.0.
+ Update source tarball links and depend on SUNWcmake.
+ Enable system cairo and sqlite, build taglib with the new build script.
+ Remove patches: menu-item.diff, system-zlib-for-taglib.diff and
+ build-system.diff. Add patches: taglib-build.diff, startup-script.diff,
+ 1.0.0-build.diff and system-sqlite.diff.
+ Create link to Firefox's plugins directory to share all the plugins.
+ Fix certificate authority issue. d.o.o bugzilla #4576.
+* Fri Sep 19 2008 - [email protected]
+- Add option to LDFLAGS to avoid redundant RPATH and RUNPATH.
+ bugster bug: 6748456.
+* Fri Sep 12 2008 - [email protected]
+- Add %doc to %files for new copyright.
+* Mon Sep 08 2008 - [email protected]
+- remove unnecessary patch songbird-06-no-nss-nspr.diff.
+ copy ginn's gecko patch songbird-06-donot-delay-stopping-realplayer.diff
+ from Firefox to fix realplayer plugin issue.
+* Mon Sep 08 2008 - [email protected]
+- add patch songbird-06-no-nss-nspr.diff to make Songbird use Firefox's
+ nss/nspr.
+* Fri Aug 22 2008 - [email protected]
+- bump to 0.7.0.
+ add new patch songbird-05-build-system.diff.
+ update patch songbird-03-remap-pixman-functions.diff.
+* Wed Aug 20 2008 - [email protected]
+- add new manpage into the package.
+ replace %debug_build with pre-defined %option_with_debug.
+ sync songbird-01-menu-item.diff with the up-streamed one.
+* Mon Aug 11 2008 - [email protected]
+- update the link to source tarball.
+ add the placeholder for Songbird's copyright.
+* Sat Jul 26 2008 - [email protected]
+- bump to 0.6.1.
+ add Package Requirements Section.
+ add patch songbird-03-remap-pixman-functions.diff to fix songbird crash.
+ add patch songbird-04-system-zlib-for-taglib.diff to build taglib with
+ system zlib.
+* Wed Jun 18 2008 - [email protected]
+- Merge with alfred's SFEsongbird-06.spec (yay 0.6)
+* Fri May 09 2008 - [email protected]
+- cmake is needed for building taglib
+- gawk is needed for building Songbird
+* Mon Apr 21 2008 - [email protected]
+- add support for SPARC platform.
+* Sun Apr 13 2008 - [email protected]
+- add option --without-vendor-binary. use the vendor binary by default
+ to speed the build process.
+* Thu Apr 10 2008 - [email protected]
+- created
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/esound.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,85 @@
+#
+# spec file for package esound
+#
+# Copyright (c) 2007, 2010, 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 yippi
+#
+
+%define OSR LFI#105446 (gnome Exec. summary):n/a
+
+Name: esound
+License: LGPL v2
+Group: System/Library/GNOME
+Version: 0.2.41
+Release: 1
+Distribution: Java Desktop System
+Vendor: Gnome Community
+Summary: esound - The Enlightened Sound Daemon
+Source: http://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-%{version}.tar.bz2
+Patch1: esound-01-build.diff
+URL: http://www.tux.org/~ricdude/overview.html
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Docdir: %{_defaultdocdir}/%{name}
+Autoreqprov: on
+Requires: audiofile
+
+%description
+The Enlightened Sound Daemon (ESD or EsounD) is the sound server for
+Enlightenment and GNOME. It mixes several sound streams into one for output.
+It can also manage network-transparent audio.
+
+%prep
+%setup -q
+%patch1 -p1
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+ CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+ CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+%if %debug_build
+%define debug_opt --enable-debugging
+%else
+%define debug_opt --disable-debugging
+%endif
+
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I .
+autoconf
+automake -a -c -f
+./configure --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --with-esd-dir=%{_prefix}/lib \
+ --libdir=%{_libdir} \
+ --bindir=%{_bindir} \
+ --libexecdir=%{_prefix}/lib \
+ --disable-audiofiletest \
+ --mandir=%{_mandir} %{debug_opt}
+make -j$CPUS
+
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, root)
+%{_bindir}/*
+%{_libdir}/*
+%{_sysconfdir}/*
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Created.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/libpigment-python.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,108 @@
+#
+# spec file for package pigment-python
+#
+# includes module(s): pigment-python
+#
+# Copyright (c) 2008, 2010, 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 yippi
+#
+# bugdb: https://code.fluendo.com/pigment/trac/
+#
+%{?!pythonver:%define pythonver 2.6}
+%define OSR 9492:0.3.6
+
+Name: pigment-python
+Summary: Python interfaces for pigment
+Vendor: fluendo.com
+Version: 0.3.12
+License: LGPL v2.1
+URL: https://core.fluendo.com/pigment/trac
+Source0: http://elisa.fluendo.com/static/download/pigment/pigment-python-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+Python interfaces for pigment. Pigment is a library designed to easily
+build user interfaces with embedded multimedia. Its design allows to use
+it on several platforms, thanks to a plugin system allowing to choose
+the underlying graphical API. Pigment is the rendering engine of Elisa,
+the Fluendo Media Center project.
+
+%prep
+%setup -q -n pigment-python-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export PYTHON=/usr/bin/python%{pythonver}
+libtoolize --copy --force
+aclocal $ACLOCAL_FLAGS
+autoheader
+automake -a -c -f
+autoconf
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir}
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.pyo" -exec rm -f {} ';'
+
+# move to vendor-packages
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages
+mv $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/* \
+ $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/vendor-packages/
+rmdir $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{pythonver}/vendor-packages/*.la
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%doc README AUTHORS
+%doc(bzip2) NEWS COPYING ChangeLog
+%defattr(-,root,bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/python%{pythonver}/vendor-packages/_pgmgtkmodule.so
+%{_libdir}/python%{pythonver}/vendor-packages/_pgmmodule.so
+%{_libdir}/python%{pythonver}/vendor-packages/_pgmimagingmodule.so
+%{_libdir}/python%{pythonver}/vendor-packages/pgm
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/pigment-python
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Migrate to SFE.
+* Tue Oct 13 2009 - Brian Cameron <[email protected]>
+- Do not install .pyo files.
+* Tue Nov 11 2008 Jerry Tan <[email protected]>
+- Bump to 0.3.9
+* Tue Sep 30 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.8.
+* Wed Sep 17 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.7.
+* Thu Sep 11 2008 Jerry Yu <[email protected]>
+- Bump to 0.3.6.
+* Thu Jul 31 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.5.
+* Wed Jul 23 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.4.
+* Wed Mar 19 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.3
+* Wed Feb 06 2008 Brian Cameron <[email protected]>
+- Bump to 0.3.2.
+* Wed Jan 16 2008 Brian Cameron <[email protected]>
+- Created.
--- a/base-specs/moovida-plugins-bad.spec Sat Dec 04 21:59:36 2010 +0000
+++ b/base-specs/moovida-plugins-bad.spec Tue Dec 07 21:59:21 2010 +0000
@@ -1,27 +1,29 @@
#
# spec file for package moovida-plugins-bad
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2010, 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.
#
-# Owner: yippi
+%define owner yippi
+
+%define OSR 12197:1.0.1
+
#
-# bugdb: https://bugs.launchpad.net/moovida
+# bugdb: http://bugs.launchpad.net/moovida/+bug/
#
-%{?!pythonver:%define pythonver 2.6}
-
Name: moovida-plugins-bad
-License: MIT
+License: GPL v3
+Vendor: moovidia.com
Summary: Bad plugins for Moovida
URL: http://www.moovida.com/
-Version: 1.0.6
+Version: 1.0.9
Source: http://www.moovida.com/media/public/%{name}-%{version}.tar.gz
# Refer to spec file to see reasons why we disable some plugins.
#date:2008-10-24 owner:yippi type:branding
Patch1: moovida-plugins-bad-01-rm-plugins.diff
-#date:2009-03-19 owner:yippi type:bug bugid:345633
+#date:2009-03-19 owner:yippi type:bug bugzilla:345633
Patch2: moovida-plugins-bad-02-exit.diff
# We remove the following plugins:
@@ -51,19 +53,19 @@
python setup.py build_po
%install
-python%{pythonver} setup.py install --root=$RPM_BUILD_ROOT
+python%{default_python_version} setup.py install --root=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/elisa/plugins/__init__.py
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/elisa/plugins/__init__.pyc
+rm -f $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/elisa/plugins/__init__.py
+rm -f $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/elisa/plugins/__init__.pyc
# l10n source files
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/__init__.py
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/__init__.pyc
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/messages.pot
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/[_a-zA-Z]*/LC_MESSAGES/*.po
+rm -f $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/__init__.py
+rm -f $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/__init__.pyc
+rm -f $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/messages.pot
+rm -f $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/[_a-zA-Z]*/LC_MESSAGES/*.po
# Move python dir to /usr/share/locale
-for FROM_DIR in $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/[_a-zA-Z]*
+for FROM_DIR in $RPM_BUILD_ROOT%{_libdir}/python%{default_python_version}/[a-z]*-packages/elisa/plugins/[a-z]*/i18n/[_a-zA-Z]*
do
if [ ! -d $FROM_DIR/LC_MESSAGES ] ; then
continue
@@ -86,10 +88,18 @@
%files
%defattr(-,root,bin)
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/python%{pythonver}/vendor-packages/elisa
-%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*-nspkg.pth
-%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa_plugin_*-nspkg.pth
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Tue Dec 08 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.9.
+* Wed Nov 04 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.8.
+* Mon Nov 02 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.7.
+* Mon Oct 12 2009 Brian Cameron <[email protected]>
+- Now use %{default_python_version}.
* Wed Jul 15 2009 Brian Cameron <[email protected]>
- Created with version 1.0.5.
--- a/base-specs/moovida-plugins-good.spec Sat Dec 04 21:59:36 2010 +0000
+++ b/base-specs/moovida-plugins-good.spec Tue Dec 07 21:59:21 2010 +0000
@@ -1,20 +1,24 @@
#
# spec file for package moovida-plugins-good
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2010, 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.
#
-# Owner: yippi
+%define owner yippi
+
+%define OSR 12197:1.0.1
+
+#
+# bugdb: http://bugs.launchpad.net/moovida/+bug/
#
-%{?!pythonver:%define pythonver 2.6}
-
Name: moovida-plugins-good
-License: MIT
+License: GPL v3
+Vendor: moovidia.com
Summary: Good plugins for Moovida
URL: http://www.moovida.com/
-Version: 1.0.6
+Version: 1.0.9
Source: http://www.moovida.com/media/public/%{name}-%{version}.tar.gz
#date:2008-10-24 owner:yippi type:branding
# We remove winscreensaver plugin since it only works on the Windows platform.
@@ -31,7 +35,7 @@
%build
%install
-python%{pythonver} setup.py install --root=$RPM_BUILD_ROOT
+python%{default_python_version} setup.py install --root=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -39,11 +43,19 @@
%files
%defattr(-,root,bin)
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/python%{pythonver}/vendor-packages/elisa
-%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*-nspkg.pth
-%{_libdir}/python%{pythonver}/vendor-packages/elisa_plugin_*.egg-info
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa_plugin_*-nspkg.pth
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa_plugin_*.egg-info
%changelog
+* Tue Dec 08 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.9.
+* Wed Nov 04 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.8.
+* Mon Nov 02 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.7.
+* Mon Oct 12 2009 Brian Cameron <[email protected]>
+- Now use %{default_python_version}.
* Thu Aug 06 2009 Brian Cameron <[email protected]>
- Bump to version 1.0.6, and remove upstream patch.
* Wed Jul 15 2009 Brian Cameron <[email protected]>
--- a/base-specs/moovida.spec Sat Dec 04 21:59:36 2010 +0000
+++ b/base-specs/moovida.spec Tue Dec 07 21:59:21 2010 +0000
@@ -1,7 +1,7 @@
#
# spec file for package moovida
#
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# Copyright (c) 2008, 2010, 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.
#
@@ -10,26 +10,28 @@
#
# application/ogg ogg
#
-# Owner: yippi
+%define owner yippi
+
+%define OSR 12197:1.0.1
+
#
-# bugdb: https://bugs.launchpad.net/elisa
+# bugdb: http://bugs.launchpad.net/moovida/+bug/
#
-%{?!pythonver:%define pythonver 2.6}
-
Name: moovida
-License: GPL v3, MIT
+License: GPL v3, MIT, BSD, PSF, LGPL v2.1, GPL v2
+Vendor: moovidia.com
Summary: Media center written in Python
URL: http://www.moovida.com/
-Version: 1.0.6
+Version: 1.0.9
Source: http://www.moovida.com/media/public/%{name}-%{version}.tar.gz
-#date:2008-12-01 owner:fujiwara type:feature bugid:249822
+#date:2008-12-01 owner:fujiwara type:feature bugzilla:249822
Patch1: moovida-01-g11n-localedir.diff
#date:2009-03-03 owner:yippi type:feature
Patch2: moovida-02-noautoupdate.diff
#date:2008-11-26 owner:yippi type:branding
Patch3: moovida-03-manpage.diff
-#date:2009-08-06 owner:yippi type:bug bugid:400134
+#date:2009-08-06 owner:yippi type:bug bugzilla:400134
Patch4: moovida-04-pidof.diff
#date:2009-08-07 owner:yippi type:branding
Patch5: moovida-05-desktop.diff
@@ -52,7 +54,7 @@
%build
%install
-python%{pythonver} setup.py install --root=$RPM_BUILD_ROOT
+python%{default_python_version} setup.py install --root=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -62,11 +64,17 @@
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/elisa
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/python%{pythonver}/vendor-packages/elisa
-%{_libdir}/python%{pythonver}/vendor-packages/elisa-*-py%{pythonver}.egg-info
-%{_libdir}/python%{pythonver}/vendor-packages/elisa-*-py%{pythonver}-nspkg.pth
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa-*-py%{default_python_version}.egg-info
+%{_libdir}/python%{default_python_version}/vendor-packages/elisa-*-py%{default_python_version}-nspkg.pth
%changelog
+* Tue Dec 08 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.9.
+* Wed Nov 02 2009 Brian Cameron <[email protected]>
+- Bump to 1.0.8.
+* Mon Oct 12 2009 Brian Cameron <[email protected]>
+- Now use %{default_python_version}.
* Thu Aug 06 2009 Brian Cameron <[email protected]>
- Update to 1.0.6 and remove upstream patches.
* Tue Jul 21 2009 Brian Cameron <[email protected]>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/quick-lounge-applet.spec Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,118 @@
+#
+# spec file for package quick-lounge-applet
+#
+# Copyright (c) 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%define OSR LFI#105446 (gnome Exec. summary):n/a
+
+Name: quick-lounge-applet
+License: GPL
+Group: Productivity/Graphics/Viewers
+Version: 2.14.0
+Release: 2
+Distribution: Java Desktop System
+Vendor: Gnome Community
+Summary: Quick Lounge Panel Applet
+Source: http://ftp.gnome.org/pub/GNOME/sources/quick-lounge-applet/2.14/%{name}-%{version}.tar.bz2
+%if %build_l10n
+Source1: l10n-configure.sh
+%endif
+URL: http://www.gnome.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Docdir: %{_defaultdocdir}/quick-lounge-applet
+Autoreqprov: on
+
+%define gnome_vfs_version 2.4.0
+%define libgnome_version 2.4.0
+%define libgnomeui_version 2.4.0.1
+%define gnome_panel_version 2.4.0
+%define gnome_desktop_version 2.4.0
+%define gnome_menus_version 2.12.0
+
+Requires: gnome-vfs >= %{gnome_vfs_version}
+Requires: libgnome >= %{libgnome_version}
+Requires: libgnomeui >= %{libgnomeui_version}
+Requires: gnome-panel >= %{gnome_panel_version}
+Requires: gnome-desktop >= %{gnome_desktop_version}
+Requires: gnome-menus >= %{gnome_menus_version}
+BuildRequires: gnome-vfs-devel >= %{gnome_vfs_version}
+BuildRequires: libgnome-devel >= %{libgnome_version}
+BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
+BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
+
+%description
+Quick Lounge Applet allows you to group launchers on your panel.
+
+%prep
+%setup -q
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+ CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+ CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+libtoolize --force
+intltoolize --force --copy --automake
+
+%if %build_l10n
+bash -x %SOURCE1 --enable-copyright
+%endif
+
+aclocal $ACLOCAL_FLAGS
+automake -a -c -f
+autoconf
+
+CFLAGS="$RPM_OPT_FLAGS" \
+ ./configure \
+ --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --libexecdir=%{_libexecdir} \
+ --localstatedir=/var/lib
+make -j $CPUS
+
+%install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make -i install DESTDIR=$RPM_BUILD_ROOT
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+rm -rf $RPM_BUILD_ROOT/var
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="quick-lounge.schemas"
+for S in $SCHEMAS; do
+ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
+done
+
+%files
+%doc AUTHORS COPYING ChangeLog NEWS README
+%defattr (-, root, root)
+%{_datadir}/pixmaps/*.png
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
+%{_datadir}/gnome-2.0/ui/*
+%{_datadir}/quick-lounge/*
+%{_sysconfdir}/gconf/schemas/*.schemas
+%{_libdir}/bonobo/servers/*
+%{_datadir}/gnome/help/quick-lounge/*
+%{_datadir}/omf/%{name}/*.omf
+%{_libexecdir}/*
+
+%changelog
+* Tue Dec 07 2010 - [email protected]
+- Created.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/nspr-nss-config Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# This is a wrapper of pkg-config to simulate nspr-config/nss-config.
+# Usage: nspr-nss-config nspr [--version] [--libs] [--cflags]
+# or nspr-nss-config nss [--version] [--libs] [--cflags]
+
+if test $# -eq 0; then
+ exit 1
+fi
+
+program_name=$1
+shift
+
+if test "$program_name" != "nspr" && test "$program_name" != "nss"; then
+ exit 1
+fi
+
+while test $# -gt 0; do
+ case $1 in
+ --version)
+ echo_version=yes
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ esac
+ shift
+done
+
+if test "$echo_version" = "yes"; then
+ # use sed to append .0 if it doesn't have micro version
+ pkg-config $program_name --modversion | sed 's/^\([0-9]*\)\.\([0-9]*\)$/\1.\2.0/'
+
+fi
+
+if test "$echo_cflags" = "yes"; then
+ pkg-config $program_name --cflags
+fi
+
+if test "$echo_libs" = "yes"; then
+ echo -R/usr/lib/mps `pkg-config $program_name --libs`
+fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/esound-01-build.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,24 @@
+--- esound-0.2.41/configure.ac-orig 2010-12-06 20:35:50.086328194 -0600
++++ esound-0.2.41/configure.ac 2010-12-06 20:36:41.670341832 -0600
+@@ -211,7 +211,9 @@ if test "x$enable_local_sound" = "xyes";
+ CPPFLAGS="$CPPFLAGS -I/usr/include/mme"
+ AC_CHECK_HEADERS(mme/mme_api.h)
+ CPPFLAGS="$xCPPFLAGS"
+- AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
++ dnl Comment this out as the macro is not found and we don't enable sound.
++ dnl AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
++ HAVE_ARTS=no
+
+ dnl Define the driver needed based on the first header file found
+
+@@ -416,7 +418,9 @@ int deny_severity = LOG_WARNING;],
+ LIBS="$esound_save_LIBS"
+ fi
+
+-AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
++dnl This macro is not in gnome-compiler-flags.m4. This option is invalid on
++dnl Solaris anyway.
++dnl AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
+
+ # set | sort; # just for double checking the script...
+
--- a/patches/moovida-04-pidof.diff Sat Dec 04 21:59:36 2010 +0000
+++ b/patches/moovida-04-pidof.diff Tue Dec 07 21:59:21 2010 +0000
@@ -1,5 +1,5 @@
---- elisa-1.0.6/elisa/core/utils/misc.py-orig 2009-08-06 11:25:58.307494000 -0500
-+++ elisa-1.0.6/elisa/core/utils/misc.py 2009-08-06 11:26:55.181318000 -0500
+--- elisa-1.0.6/elisa/core/utils/misc.py-orig 2009-09-29 19:21:20.219682862 -0500
++++ elisa-1.0.6/elisa/core/utils/misc.py 2009-09-29 19:22:43.403454681 -0500
@@ -25,6 +25,7 @@ reasonnably small.
import platform
import os, re
@@ -8,7 +8,7 @@
from twisted.trial.unittest import SkipTest
-@@ -209,17 +210,30 @@ def get_os_name():
+@@ -209,17 +210,33 @@ def get_os_name():
else:
return platform.system().lower()
@@ -38,13 +38,16 @@
+ stderr=subprocess.STDOUT,
+ stdout=subprocess.PIPE,
+ close_fds=True).communicate()[0]
++ except Exception, e:
++ output = ""
++
+ finally:
+ lock.release()
+
return [int(pid) for pid in output.split()]
def get_user_desktop_name():
-@@ -255,7 +269,7 @@ def get_user_desktop_name():
+@@ -255,7 +272,7 @@ def get_user_desktop_name():
'xfwm4': 'xfce',
}
for prog, name in progs.iteritems():
--- a/patches/moovida-plugins-bad-01-rm-plugins.diff Sat Dec 04 21:59:36 2010 +0000
+++ b/patches/moovida-plugins-bad-01-rm-plugins.diff Tue Dec 07 21:59:21 2010 +0000
@@ -1,5 +1,5 @@
---- elisa-plugins-bad-1.0.6/setup.py-orig 2009-08-06 11:06:36.126927000 -0500
-+++ elisa-plugins-bad-1.0.6/setup.py 2009-08-06 11:07:42.287873000 -0500
+--- elisa-plugins-bad-1.0.9/setup.py-orig 2009-12-08 18:13:57.671090759 -0600
++++ elisa-plugins-bad-1.0.9/setup.py 2009-12-08 18:14:35.902782687 -0600
@@ -4,9 +4,7 @@ from setup_bundle import setup
# List of plugins to be packaged in the 'bad' bundle
bad_plugins = ['amazon',
@@ -10,17 +10,10 @@
'database',
'discogs',
'dvd',
-@@ -14,18 +12,13 @@ bad_plugins = ['amazon',
- 'filtered_shares',
- 'gstreamer',
- 'http_client',
-- 'ipod',
-- 'osso',
- 'pigment',
+@@ -21,11 +19,8 @@ bad_plugins = ['amazon',
'poblesec',
'rss',
'search',
- 'shelf',
- 'smbwin32',
'themoviedb',
'thetvdb',
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-01-cpp-template.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,56 @@
+Index: Songbird1.1/components/mediacore/gstreamer/src/sbGStreamerMediacore.cpp
+===================================================================
+--- Songbird1.1/components/mediacore/gstreamer/src/sbGStreamerMediacore.cpp (revision 13119)
++++ Songbird1.1/components/mediacore/gstreamer/src/sbGStreamerMediacore.cpp (working copy)
+@@ -454,7 +454,7 @@
+ /* Add each filter, followed by an audioconvert. The first-added filter ends
+ * last in the pipeline, so we iterate in reverse.
+ */
+- std::vector<GstElement *>::const_reverse_iterator it = mAudioFilters.rbegin(),
++ std::vector<GstElement *>::reverse_iterator it = mAudioFilters.rbegin(),
+ end = mAudioFilters.rend();
+ for ( ; it != end; ++it)
+ {
+Index: Songbird1.1/components/mediacore/base/src/sbMediacoreVotingChain.cpp
+===================================================================
+--- Songbird1.1/components/mediacore/base/src/sbMediacoreVotingChain.cpp (revision 13119)
++++ Songbird1.1/components/mediacore/base/src/sbMediacoreVotingChain.cpp (working copy)
+@@ -127,8 +127,8 @@
+
+ nsAutoLock lock(mLock);
+
+- votingmap_t::const_reverse_iterator cit = mResults.rbegin();
+- votingmap_t::const_reverse_iterator endCit = mResults.rend();
++ votingmap_t::reverse_iterator cit = mResults.rbegin();
++ votingmap_t::reverse_iterator endCit = mResults.rend();
+
+ for(; cit != endCit; ++cit) {
+ rv = mutableArray->AppendElement((*cit).second, PR_FALSE);
+@@ -152,8 +152,8 @@
+
+ nsAutoLock lock(mLock);
+
+- votingmap_t::const_reverse_iterator cit = mResults.rbegin();
+- votingmap_t::const_reverse_iterator endCit = mResults.rend();
++ votingmap_t::reverse_iterator cit = mResults.rbegin();
++ votingmap_t::reverse_iterator endCit = mResults.rend();
+ for(; cit != endCit; ++cit) {
+ if((*cit).second == aMediacore) {
+ *_retval = (*cit).first;
+Index: Songbird1.1/components/mediacore/manager/src/sbMediacoreShuffleSequenceGenerator.cpp
+===================================================================
+--- Songbird1.1/components/mediacore/manager/src/sbMediacoreShuffleSequenceGenerator.cpp (revision 13119)
++++ Songbird1.1/components/mediacore/manager/src/sbMediacoreShuffleSequenceGenerator.cpp (working copy)
+@@ -86,10 +86,10 @@
+ std::srand(std::clock());
+
+ // Randomly sample the pool to populate the sequence.
+- random_shuffle(pool.begin(), pool.end());
++ std::random_shuffle(pool.begin(), pool.end());
+
+ // Copy into the return array
+- copy(pool.begin(), pool.end(), *aSequence);
++ std::copy(pool.begin(), pool.end(), *aSequence);
+
+ return NS_OK;
+ }
--- a/patches/songbird-01-menu-item.diff Sat Dec 04 21:59:36 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Index: songbird0.6/app/branding/songbird.desktop
-===================================================================
---- songbird0.6/app/branding/songbird.desktop (revision 0)
-+++ songbird0.6/app/branding/songbird.desktop (revision 0)
-@@ -0,0 +1,10 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Name=Songbird
-+Comment=The desktop media player mashed-up with the Web
-+Exec=songbird
-+Icon=songbird.png
-+Terminal=false
-+Type=Application
-+Categories=Application;AudioVideo;
-+StartupNotify=true
--- a/patches/songbird-02-taglib.diff Sat Dec 04 21:59:36 2010 +0000
+++ b/patches/songbird-02-taglib.diff Tue Dec 07 21:59:21 2010 +0000
@@ -1,5 +1,5 @@
---- dependencies/vendor/taglib/taglib/ape/apetag.h.orig Wed Jun 18 15:40:12 2008
-+++ dependencies/vendor/taglib/taglib/ape/apetag.h Wed Jun 18 15:40:16 2008
+--- Songbird0.6/dependencies/vendor/taglib/taglib/ape/apetag.h.orig Wed Jul 16 16:24:02 2008
++++ Songbird0.6/dependencies/vendor/taglib/taglib/ape/apetag.h Wed Jul 16 16:23:46 2008
@@ -49,7 +49,7 @@
*
* \see APE::Tag::itemListMap()
@@ -9,3 +9,14 @@
//! An APE tag implementation
+--- Songbird1.4-vendor/dependencies/vendor/taglib/taglib/m4a/mp4file.cpp.orig 2010-01-05 13:17:49.269849989 -0800
++++ Songbird1.4-vendor/dependencies/vendor/taglib/taglib/m4a/mp4file.cpp 2010-01-05 13:18:11.272785153 -0800
+@@ -46,6 +46,8 @@
+
+ using namespace TagLib;
+
++#define __FUNCTION__ __FILE__ + __LINE__
++
+ class MP4::File::FilePrivate
+ {
+ public:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-03-remap-pixman-functions.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,124 @@
+--- firefox/gfx/cairo/libpixman/src/Makefile.in.orig 2008-08-19 17:51:55.451507774 +0800
++++ firefox/gfx/cairo/libpixman/src/Makefile.in 2008-08-19 17:52:34.386161547 +0800
+@@ -48,14 +48,11 @@
+ LIBRARY_NAME = mozlibpixman
+ LIBXUL_LIBRARY = 1
+
+-ifndef MOZ_ENABLE_LIBXUL
+-VISIBILITY_FLAGS =
+-endif
+-
+ ifdef GNU_CC
+ MODULE_OPTIMIZE_FLAGS = -O2
+ else
+ ifeq ($(OS_ARCH),SunOS)
++VISIBILITY_FLAGS = "-xldscope=hidden"
+ MODULE_OPTIMIZE_FLAGS = -xO5
+ endif
+ ifeq ($(OS_ARCH),WINNT)
+@@ -106,7 +103,7 @@
+ DEFINES += -DUSE_MMX
+ endif
+
+-EXPORTS = pixman.h pixman-remap.h pixman-version.h
++EXPORTS = pixman.h pixman-version.h
+
+ LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../../cairo/src
+
+--- firefox/gfx/cairo/cairo/src/cairo-rename.h.orig 2008-08-19 17:51:48.915263715 +0800
++++ firefox/gfx/cairo/cairo/src/cairo-rename.h 2008-08-19 17:52:05.779870983 +0800
+@@ -355,4 +355,9 @@
+ #define pixman_add_trapezoids _moz_pixman_add_trapezoids
+ #define pixman_rasterize_trapezoid _moz_pixman_rasterize_trapezoid
+ #define pixman_transform_point_3d _moz_pixman_transform_point_3d
++#define pixman_format_supported_destination _moz_pixman_format_supported_destination
++#define pixman_format_supported_source _moz_pixman_format_supported_source
++#define pixman_image_set_source_clipping _moz_pixman_image_set_source_clipping
++#define pixman_version _moz_pixman_version
++#define pixman_version_string _moz_pixman_version_string
+
+diff --git a/gfx/cairo/libpixman/src/pixman-remap.h b/gfx/cairo/libpixman/src/pixman-remap.h
+deleted file mode 100644
+--- a/gfx/cairo/libpixman/src/pixman-remap.h
++++ /dev/null
+@@ -1,61 +0,0 @@
+-#define pixman_transform_point_3d _moz_pixman_transform_point_3d
+-#define pixman_region_set_static_pointers _moz_pixman_region_set_static_pointers
+-#define pixman_region_init _moz_pixman_region_init
+-#define pixman_region_init_rect _moz_pixman_region_init_rect
+-#define pixman_region_init_with_extents _moz_pixman_region_init_with_extents
+-#define pixman_region_fini _moz_pixman_region_fini
+-#define pixman_region_translate _moz_pixman_region_translate
+-#define pixman_region_copy _moz_pixman_region_copy
+-#define pixman_region_intersect _moz_pixman_region_intersect
+-#define pixman_region_union _moz_pixman_region_union
+-#define pixman_region_union_rect _moz_pixman_region_union_rect
+-#define pixman_region_subtract _moz_pixman_region_subtract
+-#define pixman_region_inverse _moz_pixman_region_inverse
+-#define pixman_region_contains_point _moz_pixman_region_contains_point
+-#define pixman_region_contains_rectangle _moz_pixman_region_contains_rectangle
+-#define pixman_region_not_empty _moz_pixman_region_not_empty
+-#define pixman_region_extents _moz_pixman_region_extents
+-#define pixman_region_n_rects _moz_pixman_region_n_rects
+-#define pixman_region_rectangles _moz_pixman_region_rectangles
+-#define pixman_region_equal _moz_pixman_region_equal
+-#define pixman_region_selfcheck _moz_pixman_region_selfcheck
+-#define pixman_region_reset _moz_pixman_region_reset
+-#define pixman_region_init_rects _moz_pixman_region_init_rects
+-#define pixman_blt _moz_pixman_blt
+-#define pixman_fill _moz_pixman_fill
+-#define pixman_image_create_solid_fill _moz_pixman_image_create_solid_fill
+-#define pixman_image_create_linear_gradient _moz_pixman_image_create_linear_gradient
+-#define pixman_image_create_radial_gradient _moz_pixman_image_create_radial_gradient
+-#define pixman_image_create_conical_gradient _moz_pixman_image_create_conical_gradient
+-#define pixman_image_create_bits _moz_pixman_image_create_bits
+-#define pixman_image_ref _moz_pixman_image_ref
+-#define pixman_image_unref _moz_pixman_image_unref
+-#define pixman_image_set_clip_region _moz_pixman_image_set_clip_region
+-#define pixman_image_set_has_client_clip _moz_pixman_image_set_has_client_clip
+-#define pixman_image_set_transform _moz_pixman_image_set_transform
+-#define pixman_image_set_repeat _moz_pixman_image_set_repeat
+-#define pixman_image_set_filter _moz_pixman_image_set_filter
+-#define pixman_image_set_filter_params _moz_pixman_image_set_filter_params
+-#define pixman_image_set_alpha_map _moz_pixman_image_set_alpha_map
+-#define pixman_image_set_component_alpha _moz_pixman_image_set_component_alpha
+-#define pixman_image_set_accessors _moz_pixman_image_set_accessors
+-#define pixman_image_set_indexed _moz_pixman_image_set_indexed
+-#define pixman_image_get_data _moz_pixman_image_get_data
+-#define pixman_image_get_width _moz_pixman_image_get_width
+-#define pixman_image_get_height _moz_pixman_image_get_height
+-#define pixman_image_get_stride _moz_pixman_image_get_stride
+-#define pixman_image_get_depth _moz_pixman_image_get_depth
+-#define pixman_image_fill_rectangles _moz_pixman_image_fill_rectangles
+-#define pixman_compute_composite_region _moz_pixman_compute_composite_region
+-#define pixman_image_composite _moz_pixman_image_composite
+-#define pixman_sample_ceil_y _moz_pixman_sample_ceil_y
+-#define pixman_sample_floor_y _moz_pixman_sample_floor_y
+-#define pixman_edge_step _moz_pixman_edge_step
+-#define pixman_edge_init _moz_pixman_edge_init
+-#define pixman_line_fixed_edge_init _moz_pixman_line_fixed_edge_init
+-#define pixman_rasterize_edges _moz_pixman_rasterize_edges
+-#define pixman_add_traps _moz_pixman_add_traps
+-#define pixman_add_trapezoids _moz_pixman_add_trapezoids
+-#define pixman_rasterize_trapezoid _moz_pixman_rasterize_trapezoid
+-#define pixman_transform_point_3d _moz_pixman_transform_point_3d
+-
+--- firefox/toolkit/library/libxul-rules.mk.orig Wed Aug 27 13:42:31 2008
++++ firefox/toolkit/library/libxul-rules.mk Wed Aug 27 13:43:03 2008
+@@ -43,6 +43,7 @@
+ $(LCMS_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(NSS_LIBS) \
++ $(MOZ_CAIRO_LIBS) \
+ $(NULL)
+
+ ifdef MOZ_NATIVE_ZLIB
+@@ -89,8 +90,6 @@
+ EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
+ endif
+
+-EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
+-
+ export:: dlldeps.cpp
+
+ dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-04-startup-script.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,20 @@
+--- Songbird1.0.0/installer/linux/songbird.sh.orig 2009-01-07 18:33:02.528779259 +0800
++++ Songbird1.0.0/installer/linux/songbird.sh 2009-01-07 18:35:32.162491459 +0800
+@@ -44,6 +44,7 @@
+ MOZ_APPRUNNER_NAME="./mozilla-bin"
+ MOZ_VIEWER_NAME="./viewer"
+ MOZ_PROGRAM=""
++MOZ_LIBDIR=/usr/lib/songbird
+
+ exitcode=0
+ #
+@@ -304,6 +305,9 @@
+ if [ -x "$MOZ_DIST_BIN/$MOZ_DEFAULT_NAME" ]
+ then
+ MOZ_PROGRAM=$MOZ_DIST_BIN/$MOZ_DEFAULT_NAME
++ elif [ -x "$MOZ_LIBDIR/$MOZ_DEFAULT_NAME" ]
++ then
++ MOZ_PROGRAM=$MOZ_LIBDIR/$MOZ_DEFAULT_NAME
+ ##
+ ## Try mozilla-bin
+ ##
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-05-build.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,333 @@
+--- Songbird1.2.0/components/library/localdatabase/src/sbLocalDatabaseLibrary.cpp.orig 2009-06-19 17:17:02.665263203 +0800
++++ Songbird1.2.0/components/library/localdatabase/src/sbLocalDatabaseLibrary.cpp 2009-06-19 17:00:14.981000458 +0800
+@@ -153,6 +153,22 @@
+ */
+ template<class V, typename T>
+ PLDHashOperator PR_CALLBACK
++CopyInterfaceHashtableEntry(const nsAString& aKey,
++ T* aData,
++ void* aUserData)
++{
++ nsInterfaceHashtableMT<V, T> *newHash =
++ reinterpret_cast<nsInterfaceHashtableMT<V, T>*>(aUserData);
++
++ NS_ASSERTION(newHash->IsInitialized(), "copying to uninitialized hashtable!");
++
++ PRBool success = newHash->Put(aKey, aData);
++
++ return success ? PL_DHASH_NEXT : PL_DHASH_STOP;
++}
++
++template<class V, typename T>
++PLDHashOperator PR_CALLBACK
+ CopyInterfaceHashtableEntry(typename V::KeyType aKey,
+ T* aData,
+ void* aUserData)
+--- Songbird1.2.0/configure.ac.orig 2009-07-21 15:16:47.922634217 +0800
++++ Songbird1.2.0/configure.ac 2009-07-21 15:17:25.328753707 +0800
+@@ -876,7 +876,8 @@
+
+ CFLAGS="$CFLAGS $SUN_COMPILER_FLAGS"
+ CXXFLAGS="$CXXFLAGS $SUN_COMPILER_FLAGS"
+- LDFLAGS_DLL="-G -z defs -library=Cstd,Crun -lc"
++ LDFLAGS="-L\$(topsrcdir)/$OBJDIRNAME/$DISTDIRNAME$XULRUNNERDIR $LDFLAGS"
++ LDFLAGS_DLL="-G -library=Cstd,Crun -lc"
+ LDFLAGS_BIN=""
+ USING_RANLIB=1
+ fi
+--- Songbird1.4/components/library/localdatabase/src/sbLocalDatabaseDiffingService.cpp.orig 2009-10-13 15:03:01.406389802 -0700
++++ Songbird1.4/components/library/localdatabase/src/sbLocalDatabaseDiffingService.cpp 2009-10-13 15:08:29.361060496 -0700
+@@ -442,14 +442,14 @@
+ }
+ // Check if the duration is the same in seconds, that's good enough
+ else if (propertyId.EqualsLiteral(SB_PROPERTY_DURATION)) {
+- PRUint32 const sourceDuration = propertyValue.ToInteger(&rv, 10);
++ PRUint64 const sourceDuration = nsString_ToUint64(propertyValue, &rv);
+ if (NS_SUCCEEDED(rv)) {
+ PRUint64 const destDuration =
+ nsString_ToUint64(propertyDestinationValue, &rv);
+ // If the duration was parsed and the difference less than a second
+ // then treat it as unchanged
+ if (NS_SUCCEEDED(rv)
+- && abs(sourceDuration - destDuration) < PR_USEC_PER_SEC) {
++ && labs(sourceDuration - destDuration) < PR_USEC_PER_SEC) {
+ continue;
+ }
+ }
+--- /dev/null 2009-10-13 17:30:01.000000000 -0700
++++ Songbird1.4/tools/scripts/make-mozilla-sdk.sh 2009-10-13 17:31:12.426790472 -0700
+@@ -0,0 +1,200 @@
++#!/bin/sh
++
++# bin_files are relative to $objdir/dist/bin/
++bin_files="regxpcom*
++ xpidl*
++ xpt_dump*
++ xpt_link*
++ mozcrt19*
++"
++
++# lib_files are relative to $objdir/dist/lib/
++lib_files="*js3250.*
++ *plc4.*
++ *plds4.*
++ *nspr4.*
++ *unicharutil_external_s.*
++ *xpcom.*
++ *xpcomglue_s.*
++ *mozjs*
++ *mozcrt19*
++ *xul*
++ *smime3*
++ *ssl3*
++ *nss3*
++ *nssutil3*
++ *sqlite3*
++"
++
++# symbol_files are relative to $objdir
++symbol_files="intl/unicharutil/util/nsunicharutils.pdb
++ intl/unicharutil/util/unicharutil_external_s.pdb
++ js/src/js3250.pdb
++ toolkit/library/xul.pdb
++ xpcom/glue/nsarrayenumerator.pdb
++ xpcom/glue/nsarrayutils.pdb
++ xpcom/glue/nsautolock.pdb
++ xpcom/glue/nscategorycache.pdb
++ xpcom/glue/nscomarray.pdb
++ xpcom/glue/nscomponentmanagerutils.pdb
++ xpcom/glue/nscomptr.pdb
++ xpcom/glue/nscrtglue.pdb
++ xpcom/glue/nsenumeratorutils.pdb
++ xpcom/glue/nsgenericfactory.pdb
++ xpcom/glue/nsid.pdb
++ xpcom/glue/nsiinterfacerequestorutils.pdb
++ xpcom/glue/nsisupportsimpl.pdb
++ xpcom/glue/nsmemory.pdb
++ xpcom/glue/nsquicksort.pdb
++ xpcom/glue/nsstringapi.pdb
++ xpcom/glue/nstarray.pdb
++ xpcom/glue/nsthashtable.pdb
++ xpcom/glue/nsthreadutils.pdb
++ xpcom/glue/nsvoidarray.pdb
++ xpcom/glue/nsweakreference.pdb
++ xpcom/glue/pldhash.pdb
++ xpcom/glue/xpcomglue_s.pdb
++ xpcom/stub/xpcom.pdb
++ xulrunner/app/xulrunner.pdb
++ xulrunner/stub/xulrunner-stub.pdb
++ memory/jemalloc/mozcrt19*.pdb
++ memory/jemalloc/libc*.pdb
++"
++
++# update_bin_files are relative to $objdir/dist/host/bin/
++update_bin_files="*mar*
++ *bsdiff*
++"
++
++# update_script_files are relative to $srcdir/tools/update-packaging/
++update_script_files="common.sh
++ make_full_update.sh
++ make_incremental_update.sh
++ unwrap_full_update.pl
++"
++
++# build_scripts are relative to $srcdir
++build_script_files="build/cygwin-wrapper
++ build/autoconf/acoutput-fast.pl
++ build/autoconf/make-makefile
++ build/macosx/universal/fix-buildconfig
++ build/macosx/universal/unify
++ build/package/mac_osx/make-diskimage
++ build/package/mac_osx/mozilla.dsstore
++ config/build-list.pl
++ config/configobj.py
++ config/make-jars.pl
++ config/mozLock.pm
++ config/preprocessor.pl
++ config/printconfigsetting.py
++"
++
++# breakpad script files are relative to $srcdir
++breakpad_script_files="toolkit/crashreporter/tools/symbolstore.py
++ toolkit/crashreporter/tools/upload_symbols.sh
++"
++
++# windows breakpad binary files are relative to $srcdir
++breakpad_bin_files_win="toolkit/crashreporter/tools/win32/dump_syms.exe"
++
++# other breakpad binary files are relative to $objdir/dist/host/bin/
++breakpad_bin_files_nix="dump_syms"
++
++notice() {
++ echo $* 1>&2
++}
++
++if [ $# != 3 ]; then
++ notice "usage: make-mozilla-sdk.sh [mozilla-src-dir] [mozilla-obj-dir] [songbird-sdk-dir]"
++ exit 1
++fi
++
++MAKE=make
++CP=cp
++case `uname -s` in
++ CYGWIN*|MINGW*)
++ is_windows="1"
++ ;;
++ SunOS)
++ MAKE=gmake
++ if [ -x /usr/gnu/bin/cp ]; then
++ CP=/usr/gnu/bin/cp
++ fi
++ ;;
++esac
++
++relsrcdir="$1"
++temp1=`dirname "$relsrcdir"`
++temp2=`basename "$relsrcdir"`
++srcdir="`cd \"$temp1\" 2>/dev/null && pwd || echo \"$temp1\"`/$temp2"
++
++relobjdir="$2"
++temp1=`dirname "$relobjdir"`
++temp2=`basename "$relobjdir"`
++objdir="`cd \"$temp1\" 2>/dev/null && pwd || echo \"$temp1\"`/$temp2"
++
++distdir="$objdir/dist"
++
++relsdkdir="$3"
++temp1=`dirname "$relsdkdir"`
++temp2=`basename "$relsdkdir"`
++sdkdir="`cd \"$temp1\" 2>/dev/null && pwd || echo \"$temp1\"`/$temp2"
++
++mkdir -p "$sdkdir"
++
++# build in bsdiff to enable partial update patches (binary diffs)
++if test -d "$objdir"/other-licenses/bsdiff; then
++ notice "making bsdiff..."
++ cd "$objdir"/other-licenses/bsdiff && $MAKE
++fi
++
++notice "copying binary files..."
++cd "$sdkdir" && mkdir -p bin
++cd "$distdir/bin" && $CP -Lfp $bin_files "$sdkdir/bin"
++cd "$distdir/host/bin" && $CP -Lfp $update_bin_files "$sdkdir/bin"
++
++# breakpad binaries differ by platform
++if test -n "$is_windows"; then
++cd "$srcdir" && $CP -Lfp $breakpad_bin_files_win "$sdkdir/bin"
++else
++cd "$distdir/host/bin" && $CP -Lfp $breakpad_bin_files_nix "$sdkdir/bin"
++fi
++
++notice "copying library files..."
++cd "$sdkdir" && mkdir -p lib
++# some os don't have all these files, so silence errors
++cd "$distdir/lib" && $CP -Lfp $lib_files "$sdkdir/lib" 2>/dev/null
++
++notice "copying symbol files..."
++# some os don't have these files, so silence errors
++cd "$objdir" && $CP -Lfp $symbol_files "$sdkdir/lib" 2>/dev/null
++
++notice "copying include files..."
++cd "$sdkdir" && mkdir -p include
++cd "$distdir/include" && $CP -RLfp * "$sdkdir/include"
++
++notice "copying idl files..."
++cd "$sdkdir" && mkdir -p idl
++cd "$distdir/idl" && $CP -Lfp * "$sdkdir/idl"
++
++notice "copying frozen sdk..."
++cd "$sdkdir" && mkdir -p frozen
++cd "$distdir/sdk" && $CP -RLfp * "$sdkdir/frozen"
++
++notice "copying scripts..."
++cd "$sdkdir" && mkdir -p scripts
++cd "$srcdir" && $CP -Lfp $build_script_files "$sdkdir/scripts"
++if test -d "$srcdir"/tools/update-packaging; then
++ cd "$srcdir/tools/update-packaging" && $CP -Lfp $update_script_files "$sdkdir/scripts"
++fi
++cd "$srcdir" && $CP -Lfp $breakpad_script_files "$sdkdir/scripts"
++
++notice "performing post-processing..."
++
++# bump WINVER and _WIN32_WINNT to 0x501 on windows
++if test -n "$is_windows"; then
++cd "$sdkdir/include" && perl -p -i.bak -e 's/WINVER 0x500/WINVER 0x501/g;s/_WIN32_WINNT 0x500/_WIN32_WINNT 0x501/g' ./mozilla-config.h
++cd "$sdkdir/include" && rm -f ./mozilla-config.h.bak
++fi
++
++notice "done."
+--- /dev/null 2009-10-13 17:30:01.000000000 -0700
++++ Songbird1.4/tools/scripts/make-xulrunner-tarball.sh 2009-10-13 17:31:18.727150507 -0700
+@@ -0,0 +1,49 @@
++#!/bin/sh
++
++# Ugh. So stupid.
++# Mac OS 10.4, which is what's on the buildbots, uses bash 2.05,
++# which doesn't have a builtin version of which. It calls /usr/bin/which, which
++# will stupidly 1. Not use proper return values (so the "which foo &&
++# do_something" construct fails), and 2. print everything to stderr, no matter
++# what, so doing cute tricks like test -z `which gtar 2>/dev/null` don't work
++# either.
++#
++# We know OS X has tar, so just ignore gtar detection on the mac... for now...
++#
++
++TAR=tar
++if [ `uname` != "Darwin" ]; then
++ which gtar 2>&1 >/dev/null && \
++ TAR=gtar
++fi
++
++notice() {
++ echo $* 1>&2
++}
++
++if [ $# != 3 ]; then
++ notice "usage: make-xulrunner-tarball.sh [mozilla-bin-dir] [songbird-tarball-dest-dir] [target-tarball-name]"
++ exit 1
++fi
++
++srcdir="$1"
++temp1=`dirname "$srcdir"`
++temp2=`basename "$srcdir"`
++bindir="`cd \"$temp1\" 2>/dev/null && pwd || echo \"$temp1\"`/$temp2"
++
++destdir="$2"
++temp1=`dirname "$destdir"`
++temp2=`basename "$destdir"`
++tarballdir="`cd \"$temp1\" 2>/dev/null && pwd || echo \"$temp1\"`/$temp2"
++
++tarballname="$3"
++
++tarball="$tarballdir/$tarballname"
++
++echo cd "$bindir"
++cd "$bindir"
++
++notice "creating tarball in dest..."
++$TAR czvhf $tarball *
++
++notice "done."
+--- Songbird1.4/dependencies/Makefile.in.orig 2009-10-13 17:33:24.833397734 -0700
++++ Songbird1.4/dependencies/Makefile.in 2009-10-13 17:33:36.594695901 -0700
+@@ -494,7 +494,7 @@
+
+ ## See comment above about, re: the specifics of this export::'s logic.
+ export::
+- $(TAR) -j -x -p -f $(XULRUNNER_DIR)/xulrunner.tar.bz2 -C $(SONGBIRD_XULRUNNERDIR)
++ $(TAR) -z -x -p -f $(XULRUNNER_DIR)/xulrunner.tar.gz -C $(SONGBIRD_XULRUNNERDIR)
+ $(RM) -r $(SONGBIRD_XR_EXTENSIONS)
+ ifneq (1,$(SONGBIRD_OFFICIAL))
+ $(MV) $(XULRUNNER_EXTENSION_DIRS) $(SONGBIRD_EXTENSIONSDIR)
+--- Songbird1.4/extensions/Makefile.in.orig 2009-10-13 17:42:44.121204363 -0700
++++ Songbird1.4/extensions/Makefile.in 2009-10-13 17:42:32.577792349 -0700
+@@ -45,7 +45,7 @@
+ DEFAULT_EXTENSIONS += ipod
+ endif
+ else
+- DEFAULT_EXTENSIONS += ipod
++ #DEFAULT_EXTENSIONS += ipod
+ endif
+
+ # AlbumArt is not on the list because it's used internally by the bird, so
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-06-donot-delay-stopping-realplayer.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,18 @@
+--- firefox/layout/generic/nsObjectFrame.cpp.orig 2008-08-19 18:05:29.971589219 +0800
++++ firefox/layout/generic/nsObjectFrame.cpp 2008-08-19 18:02:21.477682134 +0800
+@@ -1772,10 +1772,13 @@
+ static PRBool
+ DoDelayedStop(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)
+ {
+- // Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524).
++ // Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524),
++ // RealPlayer/Helix (bug 451007).
+ if (aDelayedStop &&
+ !::MatchPluginName(aInstanceOwner, "QuickTime") &&
+- !::MatchPluginName(aInstanceOwner, "Flip4Mac")) {
++ !::MatchPluginName(aInstanceOwner, "Flip4Mac") &&
++ !::MatchPluginName(aInstanceOwner, "RealPlayer") &&
++ !::MatchPluginName(aInstanceOwner, "Helix")) {
+ nsCOMPtr<nsIRunnable> evt = new nsStopPluginRunnable(aInstanceOwner);
+ NS_DispatchToCurrentThread(evt);
+ return PR_TRUE;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-07-xulrunner-elif.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,12 @@
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -1421,7 +1421,7 @@
+ if (NS_FAILED(rv))
+ return rv;
+
+-#elif
++#else
+ #error Oops, you need platform-specific code here
+ #endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-08-runpath.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,22 @@
+--- mozilla/configure.in.orig 2009-01-15 15:24:39.461817320 +0800
++++ mozilla/configure.in 2009-01-15 15:24:51.386246743 +0800
+@@ -2425,7 +2425,7 @@
+ MOZ_MEMORY=1
+ if test -z "$GNU_CC"; then
+ NS_USE_NATIVE=1
+- MOZ_FIX_LINK_PATHS='-R $(LIBXUL_DIST)/bin'
++ MOZ_FIX_LINK_PATHS=
+ AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
+
+ if test "$CPU_ARCH" != "sparc"; then
+--- mozilla/configure.orig 2009-01-15 15:24:57.847935053 +0800
++++ mozilla/configure 2009-01-15 15:25:58.110667291 +0800
+@@ -7033,7 +7033,7 @@
+ MOZ_MEMORY=1
+ if test -z "$GNU_CC"; then
+ NS_USE_NATIVE=1
+- MOZ_FIX_LINK_PATHS='-R $(LIBXUL_DIST)/bin'
++ MOZ_FIX_LINK_PATHS=
+ cat >> confdefs.h <<\EOF
+ #define NSCAP_DISABLE_DEBUG_PTR_TYPES 1
+ EOF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-09-system-nss-nspr.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,91 @@
+--- a/security/nss/lib/crmf/cmmfchal.c Thu May 21 15:04:02 2009
++++ b/security/nss/lib/crmf/cmmfchal.c Wed May 20 17:58:31 2009
+@@ -38,7 +38,7 @@
+ #include "cmmf.h"
+ #include "cmmfi.h"
+ #include "sechash.h"
+-#include "genname.h"
++#include "../certdb/genname.h"
+ #include "pk11func.h"
+ #include "cert.h"
+ #include "secitem.h"
+--- a/security/manager/Makefile.in Thu May 21 15:02:44 2009
++++ b/security/manager/Makefile.in Thu May 21 15:02:07 2009
+@@ -82,7 +82,12 @@
+ $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+ $(NULL)
+ endif
++else
++ifeq ($(OS_ARCH), SunOS)
++SDK_LIBS = \
++ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
+ endif
++endif
+
+ # Default
+ HAVE_FREEBL_LIBS = 1
+@@ -251,7 +256,13 @@
+ $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+ endif
+ touch $@
++else
++ifeq ($(OS_ARCH), SunOS)
++ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
++ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
++ touch $@
+ endif
++endif
+
+ GARBAGE += .nss.cleaned
+
+@@ -328,7 +339,13 @@
+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
+ endif
++else
++ifeq ($(OS_ARCH), SunOS)
++ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
++ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS)
++ $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
+ endif
++endif
+ ifndef MOZ_NATIVE_NSS
+ # NSS installs headers to dist/public and we want them in dist/include
+ $(NSINSTALL) -D $(DIST)/include/nss
+@@ -409,7 +426,12 @@
+ $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+ $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+ endif
++else
++ifeq ($(OS_ARCH), SunOS)
++ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
++ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
+ endif
++endif
+
+ echo-requires-recursive::
+ $(MAKE) -C boot $@
+--- a/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:39:37 2009
++++ b/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:52:06 2009
+@@ -812,6 +812,7 @@
+ const char *possible_ckbi_locations[] = {
+ NS_XPCOM_CURRENT_PROCESS_DIR,
+ NS_GRE_DIR,
++ (const char *)-1, // This special value means: /usr/lib/mps
+ 0 // This special value means:
+ // search for ckbi in the directories on the shared
+ // library/DLL search path
+@@ -821,8 +822,12 @@
+ nsCOMPtr<nsILocalFile> mozFile;
+ char *fullLibraryPath = nsnull;
+
+- if (!possible_ckbi_locations[il])
++ if (possible_ckbi_locations[il] == (const char *)-1)
+ {
++ fullLibraryPath = PR_GetLibraryName("/usr/lib/mps", "nssckbi");
++ }
++ else if (!possible_ckbi_locations[il])
++ {
+ fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
+ }
+ else
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-10-moz-nss-nspr.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,26 @@
+--- mozilla/configure.old 2009-10-21 11:28:52.962446000 +0800
++++ mozilla/configure 2009-10-21 11:29:20.700428000 +0800
+@@ -11996,17 +11996,17 @@
+ NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+
+ nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ cut -d'.' -f1`
+ nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ cut -d'.' -f2`
+ nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ cut -d'.' -f3`
+ min_nspr_major_version=`echo $min_nspr_version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ cut -d'.' -f1`
+ min_nspr_minor_version=`echo $min_nspr_version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ cut -d'.' -f2`
+ min_nspr_micro_version=`echo $min_nspr_version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ cut -d'.' -f3`
+ if test "$nspr_config_major_version" -ne "$min_nspr_major_version"; then
+ no_nspr="yes"
+ elif test "$nspr_config_major_version" -eq "$min_nspr_major_version" &&
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-11-use-sun-cc.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,15 @@
+--- Songbird1.2.0/dependencies/vendor/songbird-vendor-defs.mk.old 2009-10-22 14:44:12.292113000 +0800
++++ Songbird1.2.0/dependencies/vendor/songbird-vendor-defs.mk 2009-10-22 14:45:34.228633000 +0800
+@@ -180,6 +180,12 @@
+ SB_CXX = cl
+ SB_LD = link
+ SB_OBJDUMP = objdump
++else
++ifeq (SunOS,$(SB_VENDOR_ARCH))
++ SB_CC = cc
++ SB_CXX = CC
++ SB_LD = CC
++endif
+ endif
+ endif
+ endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-12-using-bash.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,8 @@
+--- Songbird1.2.0/installer/linux/songbird.sh.old 2009-10-30 13:41:55.455399000 +0800
++++ Songbird1.2.0/installer/linux/songbird.sh 2009-10-30 13:42:03.519194000 +0800
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # ***** BEGIN LICENSE BLOCK *****
+ # Version: MPL 1.1/GPL 2.0/LGPL 2.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-13-type-cast.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,24 @@
+--- Songbird1.4.3/components/devices/device/src/sbDeviceStatusHelper.h.old 2010-01-11 16:02:12.297414000 +0800
++++ Songbird1.4.3/components/devices/device/src/sbDeviceStatusHelper.h 2010-01-11 16:07:41.630588000 +0800
+@@ -225,8 +225,8 @@
+ mStatus->OperationStart(mOperation,
+ mRequest->batchIndex,
+ mRequest->batchCount,
+- IsItemOp(mOperation) ? mRequest->list : nsnull,
+- IsItemOp(mOperation) ? mRequest->item : nsnull);
++ IsItemOp(mOperation) ? mRequest->list : nsCOMPtr<sbIMediaList>(nsnull),
++ IsItemOp(mOperation) ? mRequest->item : nsCOMPtr<sbIMediaItem>(nsnull));
+
+ if (IsItemOp(mOperation)) {
+ // Update item status
+@@ -252,8 +252,8 @@
+ mStatus->OperationStart(mOperation,
+ 0,
+ aBatchCount,
+- IsItemOp(mOperation) ? mRequest->list : nsnull,
+- IsItemOp(mOperation) ? mRequest->item : nsnull);
++ IsItemOp(mOperation) ? mRequest->list : nsCOMPtr<sbIMediaList>(nsnull),
++ IsItemOp(mOperation) ? mRequest->item : nsCOMPtr<sbIMediaItem>(nsnull));
+
+ if (IsItemOp(mOperation)) {
+ // Update item status
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/songbird-14-check-readable-core.diff Tue Dec 07 21:59:21 2010 +0000
@@ -0,0 +1,23 @@
+diff --git a/installer/linux/songbird.sh b/installer/linux/songbird.sh
+index ece9dbb..a325ed9 100755
+--- a/installer/linux/songbird.sh
++++ b/installer/linux/songbird.sh
+@@ -158,7 +158,7 @@ moz_run_program()
+ if [ "$DEBUG_CORE_FILES" ]
+ then
+ crc_old=
+- if [ -f core ]
++ if [ -f core -a -r core ]
+ then
+ crc_old=`$crc_prog core | awk '{print $1;}' `
+ fi
+@@ -170,7 +170,7 @@ moz_run_program()
+ exitcode=$?
+ if [ "$DEBUG_CORE_FILES" ]
+ then
+- if [ -f core ]
++ if [ -f core -a -r core ]
+ then
+ crc_new=`$crc_prog core | awk '{print $1;}' `
+ fi
+