Mailinglist Archive: opensuse-commit (857 mails)
| < Previous | Next > |
commit MozillaSunbird
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 13 Nov 2007 21:25:47 +0100
- Message-id: <20071113202548.091D86780DE@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package MozillaSunbird
checked in at Tue Nov 13 21:25:47 CET 2007.
--------
--- MozillaSunbird/MozillaSunbird.changes 2007-09-06 00:41:05.000000000
+0200
+++ /mounts/work_src_done/STABLE/MozillaSunbird/MozillaSunbird.changes
2007-11-13 18:50:12.831709000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 13 17:52:50 CET 2007 - maw@xxxxxxx
+
+- Add sunbird-gcc4.3-fixes.patch
+- Add visibility.patch.
+
+-------------------------------------------------------------------
New:
----
sunbird-gcc4.3-fixes.patch
visibility.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaSunbird.spec ++++++
--- /var/tmp/diff_new_pack.A15977/_old 2007-11-13 21:23:27.000000000 +0100
+++ /var/tmp/diff_new_pack.A15977/_new 2007-11-13 21:23:27.000000000 +0100
@@ -14,11 +14,11 @@
BuildRequires: fdupes gcc-c++ libgnomeui-devel libidl-devel orbit-devel
update-desktop-files zip
BuildRequires: mozilla-nspr-devel unzip
BuildRequires: mozilla-nss-devel
-License: GPL v2 or later, LGPL v2 or later
+License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE
(MPL/NPL)
Version: 0.5
-Release: 23
+Release: 54
Summary: Mozilla's Calendar Application
-URL: http://www.mozilla.org/projects/calendar/
+Url: http://www.mozilla.org/projects/calendar/
Group: Productivity/Office/Organizers
Source: sunbird-%{version}-source.tar.bz2
Source1: sunbird.desktop
@@ -27,6 +27,8 @@
Patch8: abuild.patch
Patch9: locale.patch
### Patch10: undefined-ops.patch
+Patch11: sunbird-gcc4.3-fixes.patch
+Patch12: visibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: libstdc++ fileutils textutils /bin/sh
%define _unpackaged_files_terminate_build 0
@@ -81,6 +83,8 @@
%patch8 -p1
%patch9
### %patch10 -p0
+%patch11 -p1
+%patch12
%build
export MOZ_BUILD_DATE=%{releasedate}
@@ -176,9 +180,7 @@
%if %suse_version > 1020
# Some sites use different partitions for /usr/(lib|lib64) and /usr/share.
Since you
# can't create hardlinks across partitions, we'll do this more than once.
-
%fdupes $RPM_BUILD_ROOT/%progdir
-
%fdupes $RPM_BUILD_ROOT/%{_datadir}
%endif
@@ -248,8 +250,10 @@
%files translations -f %{_tmppath}/translations.list
%defattr(-,root,root)
-
%changelog
+* Tue Nov 13 2007 - maw@xxxxxxx
+- Add sunbird-gcc4.3-fixes.patch
+- Add visibility.patch.
* Thu Sep 06 2007 - maw@xxxxxxx
- Don't run %%fdupes on directories where multiple partitions
are liable to be mounted.
++++++ sunbird-gcc4.3-fixes.patch ++++++
diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
index 8a63354..b2d1e5a 100644
--- a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
+++ b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
@@ -39,8 +39,10 @@
#include "imgIEncoder.h"
#ifdef MOZILLA_1_8_BRANCH
#define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
+#ifndef NS_DECL_IMGIENCODER
#define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
#endif
+#endif
// needed for JPEG library
#include <stdio.h>
@@ -69,6 +71,14 @@ public:
nsJPEGEncoder();
+ NS_IMETHOD InitFromData(const PRUint8* aData,
+ PRUint32 aLength, // (unused, req'd by JS)
+ PRUint32 aWidth,
+ PRUint32 aHeight,
+ PRUint32 aStride,
+ PRUint32 aInputFormat,
+ const nsAString& aOutputOptions);
+
private:
~nsJPEGEncoder();
diff --git a/modules/libpr0n/encoders/png/nsPNGEncoder.h
b/modules/libpr0n/encoders/png/nsPNGEncoder.h
index ff85949..83766f1 100644
--- a/modules/libpr0n/encoders/png/nsPNGEncoder.h
+++ b/modules/libpr0n/encoders/png/nsPNGEncoder.h
@@ -38,8 +38,10 @@
#include "imgIEncoder.h"
#ifdef MOZILLA_1_8_BRANCH
#define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
+#ifndef NS_DECL_IMGIENCODER
#define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
#endif
+#endif
#include <png.h>
@@ -63,6 +65,14 @@ public:
nsPNGEncoder();
+ NS_IMETHOD InitFromData(const PRUint8* aData,
+ PRUint32 aLength, // (unused, req'd by JS)
+ PRUint32 aWidth,
+ PRUint32 aHeight,
+ PRUint32 aStride,
+ PRUint32 aInputFormat,
+ const nsAString& aOutputOptions);
+
private:
~nsPNGEncoder();
diff --git a/modules/libpr0n/public/imgIEncoder.idl
b/modules/libpr0n/public/imgIEncoder.idl
index 120b3bf..562bf42 100755
--- a/modules/libpr0n/public/imgIEncoder.idl
+++ b/modules/libpr0n/public/imgIEncoder.idl
@@ -96,6 +96,6 @@ interface nsIFile;
[scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)]
interface imgIEncoder : nsISupports
{
- void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile
aImageFile);
+ /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out
nsIFile aImageFile); */
};
++++++ visibility.patch ++++++
From: Wolfgang Rosenauer <stark@xxxxxxx>
Subject: disable visibility feature
References:
https://bugzilla.novell.com/show_bug.cgi?id=83908
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
because of a gcc bug it's not possible to build with that
feature at the moment
Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -7949,7 +7949,7 @@ EOF
if ${CC-cc} -Werror -S conftest.c -o conftest.s
/dev/null 2>&1; thenif egrep '\.(hidden|extern_private).*foo_hidden'
conftest.s >/dev/null; then
if ! egrep '\.(hidden|extern_private).*foo_default'
conftest.s > /dev/null; then
- ac_cv_visibility_pragma=yes
+ ac_cv_visibility_pragma=no
fi
fi
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |