Author: glen Date: Sun Feb 28 01:08:21 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.9
---- Files affected: packages/mozilla-sunbird: mozilla-sunbird.spec (1.28 -> 1.29) , elif.patch (NONE -> 1.1) (NEW), libpng14.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mozilla-sunbird/mozilla-sunbird.spec diff -u packages/mozilla-sunbird/mozilla-sunbird.spec:1.28 packages/mozilla-sunbird/mozilla-sunbird.spec:1.29 --- packages/mozilla-sunbird/mozilla-sunbird.spec:1.28 Sat Feb 27 23:00:08 2010 +++ packages/mozilla-sunbird/mozilla-sunbird.spec Sun Feb 28 02:08:15 2010 @@ -16,15 +16,17 @@ Summary: Mozilla Sunbird - standalone calendar application Summary(pl.UTF-8): Mozilla Sunbird - samodzielny kalendarz Name: mozilla-sunbird -Version: 0.8 -Release: 3 +Version: 0.9 +Release: 1 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2 -# Source0-md5: b432234e9a2b04710543df72ed88e383 +# Source0-md5: 7757ffefd4a30bcc1497b93b3dc6c0ce Source1: %{name}.sh Source2: %{name}.desktop Patch0: mozilla-install.patch +Patch1: libpng14.patch +Patch2: elif.patch URL: http://www.mozilla.org/projects/sunbird/ %{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: automake @@ -77,6 +79,8 @@ %setup -q -c cd mozilla %patch0 -p1 +%patch1 -p2 +%patch2 -p1 %build cd mozilla @@ -233,9 +237,11 @@ %{_datadir}/%{name}/js %{_datadir}/%{name}/res %dir %{_datadir}/%{name}/extensions + # the signature of the default theme %{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{_datadir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} +%{_datadir}/%{name}/extensions/[email protected] %{_pixmapsdir}/%{name}.png %{_desktopdir}/%{name}.desktop @@ -255,6 +261,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.29 2010/02/28 01:08:15 glen +- up to 0.9 + Revision 1.28 2010/02/27 22:00:08 glen - release 3 ================================================================ Index: packages/mozilla-sunbird/elif.patch diff -u /dev/null packages/mozilla-sunbird/elif.patch:1.1 --- /dev/null Sun Feb 28 02:08:21 2010 +++ packages/mozilla-sunbird/elif.patch Sun Feb 28 02:08:15 2010 @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp 2007-11-08 06:56:25.000000000 -0500 ++++ mozilla.new/toolkit/xre/nsAppRunner.cpp 2009-05-16 14:31:45.000000000 -0400 +@@ -1370,7 +1370,7 @@ XRE_GetBinaryPath(const char* argv0, nsI + if (NS_FAILED(rv)) + return rv; + +-#elif ++#else + #error Oops, you need platform-specific code here + #endif + ================================================================ Index: packages/mozilla-sunbird/libpng14.patch diff -u /dev/null packages/mozilla-sunbird/libpng14.patch:1.1 --- /dev/null Sun Feb 28 02:08:21 2010 +++ packages/mozilla-sunbird/libpng14.patch Sun Feb 28 02:08:15 2010 @@ -0,0 +1,15 @@ +--- mozilla-sunbird-0.9/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp~ 2006-05-20 20:20:49.000000000 +0300 ++++ mozilla-sunbird-0.9/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-02-28 02:12:13.773101510 +0200 +@@ -111,9 +111,9 @@ + + // initialize + png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, +- png_error_ptr_NULL, +- png_error_ptr_NULL); ++ NULL, ++ NULL, ++ NULL); + if (! png_ptr) + return NS_ERROR_OUT_OF_MEMORY; + png_info* info_ptr = png_create_info_struct(png_ptr); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-sunbird/mozilla-sunbird.spec?r1=1.28&r2=1.29&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
