Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=7838c07fcd2a0963abaa88bfe57b87336f682e44
commit 7838c07fcd2a0963abaa88bfe57b87336f682e44 Author: bouleetbil <[email protected]> Date: Sun Sep 18 13:26:32 2011 +0200 xulrunner-6.0.2-1-x86_64 *version bump diff --git a/source/xlib/xulrunner/FrugalBuild b/source/xlib/xulrunner/FrugalBuild index 14ca78b..ec803aa 100644 --- a/source/xlib/xulrunner/FrugalBuild +++ b/source/xlib/xulrunner/FrugalBuild @@ -3,100 +3,39 @@ # Contributor: AlexExtreme <[email protected]> pkgname=xulrunner -pkgver=1.9.2 -pkgrel=5 +pkgver=6.0.2 +pkgrel=1 pkgdesc="XULRunner is a Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications that are as rich as Firefox and Thunderbird." url="http://developer.mozilla.org/en/docs/XULRunner"; -depends=('libxml2>=2.7.8' 'alsa-lib' 'bzip2' 'cairo>=1.8.10-2' 'curl' 'dbus-glib' 'gtk+2>=2.20.0-2' 'libidl' 'libnotify>=0.4.5-3' 'libpng>=1.4.1' 'libstdc++' 'nss' 'nspr' 'sqlite3' 'wireless_tools') -makedepends=('zip' 'pkgconfig') +depends=('libxml2>=2.7.8' 'alsa-lib' 'bzip2' 'cairo>=1.8.10-2' 'curl' 'dbus-glib' 'gtk+2>=2.20.0-2' 'libidl' 'libnotify>=0.4.5-3' \ + 'libpng>=1.4.1' 'libstdc++' 'nss' 'nspr' 'sqlite3' 'wireless_tools' 'libevent' 'startup-notification' 'libvpx') +makedepends=('zip' 'pkgconfig' 'yasm' 'hunspell') groups=('xlib') archs=('i686' 'x86_64' 'ppc' 'arm') up2date="Flastarchive ftp://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/"; up2date=("echo $pkgver") -source=(ftp://ftp.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2 \ - mozilla-gcc44.patch \ - mozilla-locale.patch) -signatures=("${source[0]}.asc" '' '') +source=(ftp://ftp.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2 ipc.diff curl.diff build.diff buildsbrk.diff mozconfig) +signatures=("${source[0]}.asc" '' '' '' '' '') build() { unset MAKEFLAGS + cp mozconfig mozilla-release/.mozconfig || Fdie - Fcd mozilla-1.9.2 + Fcd mozilla-release - Fsed 'png_voidp_NULL' 'NULL' modules/libpr0n/encoders/png/nsPNGEncoder.cpp - - # Fix buggy default DPI setting -# sed -i '/layout.css.dpi/s/-1/72/' modules/libpref/src/init/all.js || Fdie - - # Let jars get compressed. - Fsed '\-0' '\-9' config/make-jars.pl - - # Let xullrunner have autocomplete xfce componant (for thunderbird) -# Fsed '$(MOZ_THUNDERBIRD)' 1 xpfe/components/Makefile.in -# Fsed 'EXTRA_DSO_LDOPTS +=' 'EXTRA_DSO_LDOPTS = $(LIBS_DIR)' xpfe/components/autocomplete/src/Makefile.in + if [ "$CARCH" == "x86_64" ] ; then + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + fi export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 + export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" Fpatchall -# --disable-jsd \ -# --disable-logging \ -# --disable-profilesharing \ -# --with-default-mozilla-five-home=/usr \ - - # Build it - ac_cv_visibility_pragma=no Fmake \ - --disable-activex \ - --disable-activex-scripting \ - --disable-debug \ - --disable-crashreporter \ - --disable-installer \ - --disable-javaxpcom \ - --disable-pedantic \ - --disable-tests \ - --disable-toolkit-gtk \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-xprint \ - --enable-application=xulrunner \ - --enable-canvas \ - --enable-crypto \ - --enable-default-toolkit=cairo-gtk2 \ - --enable-extensions=cookie,default,permissions \ - --enable-image-decoders=all \ - --enable-image-encoders=all \ - --enable-ipv6 \ - --enable-ldap \ - --enable-mathml \ - --enable-necko-protocols=all \ - --enable-optimize="${CFLAGS}" \ - --enable-pango \ - --enable-safe-browsing \ - --enable-single-profile \ - --enable-strip \ - --enable-svg \ - --enable-toolkit-cairo-gtk2 \ - --enable-xft \ - --enable-xinerama \ - --enable-xpfe-components \ - --enable-xsl \ - --enable-xterm-updates \ - --with-distribution-id=Frugalware \ - --with-pthreads \ - --with-system-bz2 \ - --with-system-cairo \ - --with-system-jpeg \ - --with-system-lcms \ - --with-system-mng \ - --with-system-nspr \ - --with-system-nss \ - --with-system-png \ - --with-system-sqlite \ - --with-system-zlib - - # Does not use Fmakeinstall here because DESDIR is not found in root Makefile - Fexec make DESTDIR="$Fdestdir" install + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || Fdie + make -j1 -f client.mk DESTDIR="${Fdestdir}" install || Fdie # Get rid of versions in path names. Fmv /usr/include/$pkgname-$pkgver /usr/include/$pkgname @@ -114,19 +53,6 @@ build() { Fsed "$pkgname-$pkgver" "$pkgname" $Fdestdir/usr/lib/pkgconfig/*.pc Fsed "$pkgname-devel-$pkgver" "$pkgname-devel" $Fdestdir/usr/lib/pkgconfig/*.pc - # create symlink nss headers to OOo -# Fln /usr/include/nss3 /usr/include/$pkgname/nss - - # Install icon for the menu file. -# Fmkdir /usr/share/pixmaps/ -# Fln /usr/lib/$pkgname/icons/mozicon128.png /usr/share/pixmaps/$pkgname.png - - # Install menu file. -# Ffile /usr/share/applications/$pkgname.desktop - - # Change the default icons -# Fln /usr/lib/$pkgname/icons /usr/lib/$pkgname/chrome/icons/default - Fmkdir etc/ld.so.conf.d echo "/usr/lib/xulrunner" > ${Fdestdir}/etc/ld.so.conf.d/xulrunner.conf diff --git a/source/xlib/xulrunner/build.diff b/source/xlib/xulrunner/build.diff new file mode 100644 index 0000000..11988fc --- /dev/null +++ b/source/xlib/xulrunner/build.diff @@ -0,0 +1,24 @@ +diff -up mozilla-central/security/manager/Makefile.in.build mozilla-central/security/manager/Makefile.in +--- mozilla-central/security/manager/Makefile.in.build 2010-08-06 03:09:27.000000000 +0200 ++++ mozilla-central/security/manager/Makefile.in 2010-08-16 10:49:10.000000000 +0200 +@@ -181,7 +181,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= + DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) + DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 + DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 +-DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 + DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)" + ifndef MOZ_NATIVE_SQLITE + DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3 +diff -up mozilla-central/security/manager/ssl/src/Makefile.in.build mozilla-central/security/manager/ssl/src/Makefile.in +--- mozilla-central/security/manager/ssl/src/Makefile.in.build 2010-08-06 03:09:17.000000000 +0200 ++++ mozilla-central/security/manager/ssl/src/Makefile.in 2010-08-16 10:46:22.000000000 +0200 +@@ -113,8 +113,6 @@ CSRCS += md4.c + + EXTRA_DEPS = $(NSS_DEP_LIBS) + +-DEFINES += -DNSS_ENABLE_ECC +- + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's + LOCAL_INCLUDES += $(NSS_CFLAGS) + diff --git a/source/xlib/xulrunner/buildsbrk.diff b/source/xlib/xulrunner/buildsbrk.diff new file mode 100644 index 0000000..e0e0c14 --- /dev/null +++ b/source/xlib/xulrunner/buildsbrk.diff @@ -0,0 +1,25 @@ +diff -up mozilla-central/js/src/shell/js.cpp.sbrk mozilla-central/js/src/shell/js.cpp +--- mozilla-central/js/src/shell/js.cpp.sbrk 2010-07-20 20:52:15.000000000 -0400 ++++ mozilla-central/js/src/shell/js.cpp 2010-07-28 10:21:51.905606001 -0400 +@@ -1118,7 +1118,7 @@ GC(JSContext *cx, uintN argc, jsval *vp) + char buf[256]; + JS_snprintf(buf, sizeof(buf), "before %lu, after %lu, break %08lx\n", + (unsigned long)preBytes, (unsigned long)cx->runtime->gcBytes, +-#ifdef HAVE_SBRK ++#if 0 + (unsigned long)sbrk(0) + #else + 0 +diff -up mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk mozilla-central/js/src/xpconnect/shell/xpcshell.cpp +--- mozilla-central/js/src/xpconnect/shell/xpcshell.cpp.sbrk 2010-07-20 20:52:20.000000000 -0400 ++++ mozilla-central/js/src/xpconnect/shell/xpcshell.cpp 2010-07-28 10:20:36.878606001 -0400 +@@ -540,7 +540,7 @@ GC(JSContext *cx, JSObject *obj, uintN a + JS_GC(cx); + fprintf(gOutFile, "before %lu, after %lu, break %08lx\n", + (unsigned long)preBytes, (unsigned long)rt->gcBytes, +-#if defined(XP_UNIX) && !defined(__SYMBIAN32__) ++#if 0 //defined(XP_UNIX) && !defined(__SYMBIAN32__) + (unsigned long)sbrk(0) + #else + 0 + diff --git a/source/xlib/xulrunner/curl.diff b/source/xlib/xulrunner/curl.diff new file mode 100644 index 0000000..d1eb57e --- /dev/null +++ b/source/xlib/xulrunner/curl.diff @@ -0,0 +1,45 @@ +diff -up mozilla-release/config/system-headers.old mozilla-release/config/system-headers +--- mozilla-release/config/system-headers.old 2011-06-15 23:57:19.000000000 +0200 ++++ mozilla-release/config/system-headers 2011-06-24 11:03:04.725787684 +0200 +@@ -207,7 +207,6 @@ ctime + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +diff -up mozilla-release/js/src/config/system-headers.old mozilla-release/js/src/config/system-headers +--- mozilla-release/js/src/config/system-headers.old 2011-06-15 23:57:28.000000000 +0200 ++++ mozilla-release/js/src/config/system-headers 2011-06-24 11:05:09.305688350 +0200 +@@ -207,7 +207,6 @@ ctime + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +diff -up mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc.old mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +--- mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc.old 2011-06-15 23:57:55.000000000 +0200 ++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc 2011-06-24 11:02:26.854732204 +0200 +@@ -33,7 +33,6 @@ + #include <dlfcn.h> + #include <curl/curl.h> + #include <curl/easy.h> +-#include <curl/types.h> + + namespace { + +diff -up mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc.old mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc +--- mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc.old 2011-06-15 23:57:55.000000000 +0200 ++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc 2011-06-24 11:02:08.801845273 +0200 +@@ -29,7 +29,6 @@ + + #include <curl/curl.h> + #include <curl/easy.h> +-#include <curl/types.h> + #include <dlfcn.h> + + #include <iostream> + diff --git a/source/xlib/xulrunner/ipc.diff b/source/xlib/xulrunner/ipc.diff new file mode 100644 index 0000000..421c857 --- /dev/null +++ b/source/xlib/xulrunner/ipc.diff @@ -0,0 +1,61 @@ +diff -up mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc mozilla-release/ipc/chromium/src/base/data_pack.cc +--- mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2011-08-11 23:41:01.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/base/data_pack.cc 2011-08-16 10:05:26.325449386 +0200 +@@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path + bool DataPack::Get(uint32_t resource_id, StringPiece* data) { + // It won't be hard to make this endian-agnostic, but it's not worth + // bothering to do right now. +-#if defined(__BYTE_ORDER) +- // Linux check +- COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN, +- datapack_assumes_little_endian); +-#elif defined(__BIG_ENDIAN__) +- // Mac check +- #error DataPack assumes little endian +-#endif ++#warning DoTheRightThingMakingThisEndianAgnostic! + + DataPackEntry* target = reinterpret_cast<DataPackEntry*>( + bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_, +diff -up mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc mozilla-release/ipc/chromium/src/build/build_config.h +--- mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc 2011-08-11 23:41:01.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/build/build_config.h 2011-08-16 10:07:23.093899409 +0200 +@@ -57,9 +57,24 @@ + #define ARCH_CPU_ARMEL 1 + #define ARCH_CPU_32_BITS 1 + #define WCHAR_T_IS_UNSIGNED 1 ++#elif defined(__powerpc64__) ++#define ARCH_CPU_PPC64 1 ++#define ARCH_CPU_64_BITS 1 + #elif defined(__ppc__) || defined(__powerpc__) + #define ARCH_CPU_PPC 1 + #define ARCH_CPU_32_BITS 1 ++#elif defined(__s390x__) ++#define ARCH_CPU_S390X 1 ++#define ARCH_CPU_64_BITS 1 ++#elif defined(__s390__) ++#define ARCH_CPU_S390 1 ++#define ARCH_CPU_32_BITS 1 ++#elif defined(__sparc__) && !defined(__arch64) ++#define ARCH_CPU_SPARC 1 ++#define ARCH_CPU_32_BITS 1 ++#elif defined(__sparc__) && defined(__arch64) ++#define ARCH_CPU_SPARC64 1 ++#define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h + #endif +diff -up mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h +--- mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc 2011-08-11 23:41:01.000000000 +0200 ++++ mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h 2011-08-16 10:05:26.326449206 +0200 +@@ -219,7 +219,8 @@ struct ParamTraits<unsigned long> { + } + }; + +-#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))) ++// Although s390 is a 32-bit system it defines size_t as unsigned long ++#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && (defined(ARCH_CPU_64_BITS) || defined(ARCH_CPU_S390)))) + // There size_t is a synonym for |unsigned long| ... + template <> + struct ParamTraits<size_t> { + diff --git a/source/xlib/xulrunner/mozconfig b/source/xlib/xulrunner/mozconfig new file mode 100644 index 0000000..184a3b2 --- /dev/null +++ b/source/xlib/xulrunner/mozconfig @@ -0,0 +1,57 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-cairo +ac_add_options --with-system-libvpx +ac_add_options --with-pthreads + +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-safe-browsing +ac_add_options --enable-extensions=default +ac_add_options --enable-startup-notification +ac_add_options --enable-pango +ac_add_options --enable-svg +ac_add_options --enable-canvas +ac_add_options --enable-smil +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-shared-js +ac_add_options --enable-url-classifier + +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-xterm-updates +ac_add_options --enable-printing +ac_add_options --enable-xinerama + +ac_add_options --disable-javaxpcom +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-xprint +ac_add_options --disable-mochitest +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-pedantic + +ac_add_options --enable-gio +ac_add_options --disable-gnomevfs +ac_add_options --disable-gconf +ac_add_options --enable-libnotify + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
