Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4cb38cdb93c163c7092ae9d9123ff8d10f64b252)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4cb38cdb93c163c7092ae9d9123ff8d10f64b252)
  • Date: Sun, 26 Oct 2008 12:06:22 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

dev/null |binary
utils/sunbird/002_firefox-libdeps.patch | 19 ++++
utils/sunbird/010_visibility-gcc-4.2.patch | 12 ++
utils/sunbird/016_firefox-nss-3.12-asneeded.patch | 27 ++++++
utils/sunbird/090_xul-gcc4.3.patch | 71
+++++++++++++++++
utils/sunbird/DEPENDS | 1
utils/sunbird/DETAILS | 2
utils/sunbird/HISTORY | 8 +
utils/sunbird/PRE_BUILD | 6 +
utils/sunbird/lightning-sunbird-0.8-source.tar.bz2.sig | 0
utils/sunbird/lightning-sunbird-0.9-source.tar.bz2.sig |binary
11 files changed, 144 insertions(+), 2 deletions(-)

New commits:
commit a58e14d4d303d854e178bb029430ecbacdf4f8a2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/sunbird: updated to 0.9

diff --git a/utils/sunbird/002_firefox-libdeps.patch
b/utils/sunbird/002_firefox-libdeps.patch
new file mode 100644
index 0000000..c71ac5b
--- /dev/null
+++ b/utils/sunbird/002_firefox-libdeps.patch
@@ -0,0 +1,19 @@
+# Linking issue with pango
+#
+# https://bugzilla.mozilla.org/show_bug.cgi?id=344821
+
+--- mozilla/layout/build/Makefile.in.orig 2006-07-16 00:24:51.000000000
+1000
++++ mozilla/layout/build/Makefile.in 2006-07-16 00:35:51.000000000 +1000
+@@ -213,6 +213,12 @@
+ $(NULL)
+ endif
+
++ifdef MOZ_ENABLE_CANVAS
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS)
++endif
++endif
++
+ ifdef NS_TRACE_MALLOC
+ EXTRA_DSO_LIBS += tracemalloc
+ endif
diff --git a/utils/sunbird/010_visibility-gcc-4.2.patch
b/utils/sunbird/010_visibility-gcc-4.2.patch
new file mode 100644
index 0000000..ca07601
--- /dev/null
+++ b/utils/sunbird/010_visibility-gcc-4.2.patch
@@ -0,0 +1,12 @@
+--- configure.in.orig 2007-10-12 20:39:27.000000000 +0200
++++ configure.in 2007-10-12 20:40:49.000000000 +0200
+@@ -2657,8 +2657,7 @@
+ ])
+ if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
+ "$ac_cv_have_visibility_class_bug" = "no"; then
+- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include
$(topsrcdir)/config/gcc_hidden.h'
+- WRAP_SYSTEM_INCLUDES=1
++ VISIBILITY_FLAGS='-fvisibility=hidden'
+ else
+ VISIBILITY_FLAGS='-fvisibility=hidden'
+ fi # have visibility pragma bug
diff --git a/utils/sunbird/016_firefox-nss-3.12-asneeded.patch
b/utils/sunbird/016_firefox-nss-3.12-asneeded.patch
new file mode 100644
index 0000000..b835fc3
--- /dev/null
+++ b/utils/sunbird/016_firefox-nss-3.12-asneeded.patch
@@ -0,0 +1,27 @@
+# Fix a FTBFS with system libnss (caused by bad linking order with libcrmf)
+# by Fabien Tassin <fta AT sofaraway.org>
+
+Index: seamonkey-1.1.4/configure.in
+===================================================================
+--- seamonkey-1.1.4.orig/configure.in
++++ seamonkey-1.1.4/configure.in
+@@ -3735,17 +3735,17 @@
+ [ --with-system-nss Use system installed NSS],
+ _USE_SYSTEM_NSS=1 )
+
+ if test -n "$_USE_SYSTEM_NSS"; then
+ AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+ fi
+
+ if test -n "$MOZ_NATIVE_NSS"; then
+- NSS_LIBS="$NSS_LIBS -lcrmf"
++ NSS_LIBS=" -lcrmf $NSS_LIBS"
+ else
+ NSS_CFLAGS='-I$(DIST)/public/nss'
+ NSS_DEP_LIBS='\\\
+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \\\
+ $(DIST)/lib/$(DLL_PREFIX)smime'$NSS_VERSION'$(DLL_SUFFIX) \\\
+ $(DIST)/lib/$(DLL_PREFIX)ssl'$NSS_VERSION'$(DLL_SUFFIX) \\\
+ $(DIST)/lib/$(DLL_PREFIX)nss'$NSS_VERSION'$(DLL_SUFFIX) \\\
+ $(DIST)/lib/$(DLL_PREFIX)softokn'$NSS_VERSION'$(DLL_SUFFIX)'
+
diff --git a/utils/sunbird/090_xul-gcc4.3.patch
b/utils/sunbird/090_xul-gcc4.3.patch
new file mode 100644
index 0000000..e5ca0ff
--- /dev/null
+++ b/utils/sunbird/090_xul-gcc4.3.patch
@@ -0,0 +1,71 @@
+http://lists.opensuse.org/opensuse-commit/2007-11/msg00823.html
+
+diff -Naur mozilla-orig/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
+--- mozilla-orig/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 2006-05-20
11:20:48.000000000 -0600
++++ mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 2008-01-06
22:13:39.000000000 -0600
+@@ -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 @@
+
+ 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 -Naur mozilla-orig/modules/libpr0n/encoders/png/nsPNGEncoder.h
mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h
+--- mozilla-orig/modules/libpr0n/encoders/png/nsPNGEncoder.h 2006-05-20
11:20:49.000000000 -0600
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h 2008-01-06
22:11:36.000000000 -0600
+@@ -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 @@
+
+ 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 -Naur mozilla-orig/modules/libpr0n/public/imgIEncoder.idl
mozilla/modules/libpr0n/public/imgIEncoder.idl
+--- mozilla-orig/modules/libpr0n/public/imgIEncoder.idl 2006-05-20
11:20:49.000000000 -0600
++++ mozilla/modules/libpr0n/public/imgIEncoder.idl 2008-01-06
22:15:40.000000000 -0600
+@@ -96,6 +96,6 @@
+ [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); */
+ };
+
diff --git a/utils/sunbird/DEPENDS b/utils/sunbird/DEPENDS
index 64b0fe6..5a9f12c 100755
--- a/utils/sunbird/DEPENDS
+++ b/utils/sunbird/DEPENDS
@@ -1,7 +1,6 @@
depends atk &&
depends fontconfig '--enable-xft --disable-freetype2' &&
depends g++ &&
-depends GECKO &&
depends gtk+2 '--enable-default-toolkit=gtk2' &&
depends glib2 &&
depends JDK &&
diff --git a/utils/sunbird/DETAILS b/utils/sunbird/DETAILS
index e7ded8a..78968c2 100755
--- a/utils/sunbird/DETAILS
+++ b/utils/sunbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=sunbird
- VERSION=0.8
+ VERSION=0.9
SOURCE=lightning-$SPELL-$VERSION-source.tar.bz2

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/calendar/$SPELL/releases/${VERSION}/source/${SOURCE}
SOURCE_GPG="gurus.gpg:$SOURCE.sig"
diff --git a/utils/sunbird/HISTORY b/utils/sunbird/HISTORY
index 196c537..48598d1 100644
--- a/utils/sunbird/HISTORY
+++ b/utils/sunbird/HISTORY
@@ -1,3 +1,10 @@
+2008-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS, PRE_BUILD, 002_firefox-libdeps.patch,
+ 010_visibility-gcc-4.2.patch,
+ 016_firefox-nss-3.12-asneeded.patch, 090_xul-gcc4.3.patch:
+ updated to 0.9, added patches from gentoo to make this beast
+ compile, removed dependency on GECKO
+
2008-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PRE_BUILD: updated to 0.8
* gcc43.patch: removed
@@ -49,3 +56,4 @@
* desktop/sunbird.desktop, BUILD, HISTORY, mozconfig, PRE_BUILD,
DEPENDS, DETAILS: created spell

+002_firefox-libdeps.patch 010_visibility-gcc-4.2.patch
016_firefox-nss-3.12-asneeded.patch 090_xul-gcc4.3.patch
diff --git a/utils/sunbird/PRE_BUILD b/utils/sunbird/PRE_BUILD
index 98e402f..901b274 100755
--- a/utils/sunbird/PRE_BUILD
+++ b/utils/sunbird/PRE_BUILD
@@ -1,9 +1,15 @@
default_pre_build &&
+cd $SOURCE_DIRECTORY/security &&
+ln -s nss nss-fips &&
cd $SOURCE_DIRECTORY &&

patch -p0 < $SCRIPT_DIRECTORY/000_add-missing-LDFLAGS.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/002_firefox-libdeps.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/010_visibility-gcc-4.2.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/016_firefox-nss-3.12-asneeded.patch &&
patch -p1 < $SCRIPT_DIRECTORY/032_firefox-2.0_ppc64-1.patch &&
patch -p1 < $SCRIPT_DIRECTORY/033_firefox-2.0_ppc_powerpc.patch &&
patch -p1 < $SCRIPT_DIRECTORY/050_respect-host-variable.patch &&
patch -p1 < $SCRIPT_DIRECTORY/055_firefox-2.0_gfbsd-pthreads.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/090_xul-gcc4.3.patch &&
patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
diff --git a/utils/sunbird/lightning-sunbird-0.8-source.tar.bz2.sig
b/utils/sunbird/lightning-sunbird-0.8-source.tar.bz2.sig
deleted file mode 100644
index 2fa6efe..0000000
Binary files a/utils/sunbird/lightning-sunbird-0.8-source.tar.bz2.sig and
/dev/null differ
diff --git a/utils/sunbird/lightning-sunbird-0.9-source.tar.bz2.sig
b/utils/sunbird/lightning-sunbird-0.9-source.tar.bz2.sig
new file mode 100644
index 0000000..9c65eff
Binary files /dev/null and
b/utils/sunbird/lightning-sunbird-0.9-source.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4cb38cdb93c163c7092ae9d9123ff8d10f64b252), Florian Franzmann, 10/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page