From fa3fb08b58f31f70b23250a098f2841903bec1aa Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 15 Apr 2012 20:53:05 +0200 Subject: Add xulrunner-libre using IceWeasel's source. Many changes are based on iceweasel-libre and icedove-libre PKGBUILDs and source files. --- libre/xulrunner-libre/PKGBUILD | 99 +++++++++++++++++++++++++++ libre/xulrunner-libre/gcc47.patch | 44 ++++++++++++ libre/xulrunner-libre/mozconfig | 34 +++++++++ libre/xulrunner-libre/mozilla-pkgconfig.patch | 40 +++++++++++ 4 files changed, 217 insertions(+) create mode 100644 libre/xulrunner-libre/PKGBUILD create mode 100644 libre/xulrunner-libre/gcc47.patch create mode 100644 libre/xulrunner-libre/mozconfig create mode 100644 libre/xulrunner-libre/mozilla-pkgconfig.patch (limited to 'libre/xulrunner-libre') diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD new file mode 100644 index 000000000..4d39c9116 --- /dev/null +++ b/libre/xulrunner-libre/PKGBUILD @@ -0,0 +1,99 @@ +# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $ +# Maintainer: Jan de Groot +# Contributor: Alexander Baldeck + +# With many changes from iceweasel-libre. + +# We're getting this from Debian Sid +_debname=iceweasel +_debver=11.0 +_debrel=2 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=xulrunner +pkgname=xulrunner-libre +pkgver=${_debver}.${_debrel} +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64' 'mips64el') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" + mozconfig + mozilla-pkgconfig.patch + gcc47.patch) +options=('!emptydirs') +conflicts=('xulrunner') +provides=("xulrunner=${_debver}") +replaces=('xulrunner-oss' 'xulrunner') +md5sums=('01d9d18909ca9fff2483d8fd779a0f89' + '59349da94b095fe0623d09ce75696766' + 'f407208a750cdc9bea3a6a3a3e42dd89' + '6277c508cf24a78c596decae2e568997' + '27271ce647a83906ef7a24605e840d61' + 'aeaf587f7a962ebcc81515e1f1706cd1') + +dpkg-source() { + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_debname}-${_debver}" + mv debian "${_debname}-${_debver}" + cd "${_debname}-${_debver}" + +# Doesn't apply and seems unimportant + rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true + + quilt push -a + find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? + cd .. +} + +build() { +# Don't run this if we're using -e +if [ $NOEXTRACT -eq 0 ]; then + msg2 "Applying Debian patches..." + cd "${srcdir}" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + + msg2 "Starting normal build..." + mv "${_debname}-${_debver}" "$srcdir/mozilla-release" + cd "$srcdir/mozilla-release" + + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/gcc47.patch" +fi + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver}" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver}/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver}/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-${_debver}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/header.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/typelib.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpidl.py" +} diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch new file mode 100644 index 000000000..5bdd36c6f --- /dev/null +++ b/libre/xulrunner-libre/gcc47.patch @@ -0,0 +1,44 @@ +--- mozilla-release.orig/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300 +@@ -8,7 +8,7 @@ + #include + #endif + #include +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(OS_POSIX) + #include + #endif + +--- mozilla-release.orig/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "eintr_wrapper.h" + #include "base/logging.h" + +--- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300 +@@ -5,6 +5,7 @@ + #include "base/file_util.h" + + #include ++#include + + #include + #include + +--- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300 +@@ -8,6 +8,7 @@ + #include + #endif + #include ++#include + #ifdef ANDROID + #include + #else + diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig new file mode 100644 index 000000000..d6cc06648 --- /dev/null +++ b/libre/xulrunner-libre/mozconfig @@ -0,0 +1,34 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +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 --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/libre/xulrunner-libre/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE -- cgit v1.2.3 From 469d2fceb324ac9dcf8f3559bb137e49e10a5cb3 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Tue, 17 Apr 2012 21:07:47 +0200 Subject: Disable jemalloc in mips64el xulrunner-libre. --- libre/xulrunner-libre/PKGBUILD | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libre/xulrunner-libre') diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 4d39c9116..0b66880dc 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -68,6 +68,9 @@ if [ $NOEXTRACT -eq 0 ]; then cp "$srcdir/mozconfig" .mozconfig + # Fails, claiming the page size to have changed. + [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig + #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" patch -Np1 -i "$srcdir/gcc47.patch" -- cgit v1.2.3 From a1e50fec714d1caf43a82d39ef0e29ccf9e0f4d2 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 29 Apr 2012 22:02:40 -0300 Subject: xulrunner-libre-12.0.3-1: updating version --- libre/xulrunner-libre/PKGBUILD | 14 +++--- libre/xulrunner-libre/gcc47.patch | 89 +++++++++++++++++++++++++++------------ libre/xulrunner-libre/mozconfig | 6 ++- 3 files changed, 73 insertions(+), 36 deletions(-) (limited to 'libre/xulrunner-libre') diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 0b66880dc..af4b45aae 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -6,8 +6,8 @@ # We're getting this from Debian Sid _debname=iceweasel -_debver=11.0 -_debrel=2 +_debver=12.0 +_debrel=3 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,12 +31,12 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('01d9d18909ca9fff2483d8fd779a0f89' - '59349da94b095fe0623d09ce75696766' - 'f407208a750cdc9bea3a6a3a3e42dd89' - '6277c508cf24a78c596decae2e568997' +md5sums=('b45f57bfe21b0e6db4f0683e794917cb' + '2b66fb2e51631ef3b07de89ef9d17d0c' + '552adcf5da3b07757e7fe29c8bd2ec2d' + 'f2f4f4a573f549e8b494e33b3ad226bc' '27271ce647a83906ef7a24605e840d61' - 'aeaf587f7a962ebcc81515e1f1706cd1') + '5a8563f8fda7ad30405c86764267a19c') dpkg-source() { # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch index 5bdd36c6f..5cea6769d 100644 --- a/libre/xulrunner-libre/gcc47.patch +++ b/libre/xulrunner-libre/gcc47.patch @@ -1,44 +1,77 @@ ---- mozilla-release.orig/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300 -@@ -8,7 +8,7 @@ - #include - #endif - #include --#if defined(ANDROID) -+#if defined(ANDROID) || defined(OS_POSIX) - #include - #endif ---- mozilla-release.orig/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300 -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "eintr_wrapper.h" - #include "base/logging.h" +# HG changeset patch +# User Martin Stránský +# Date 1328886461 -3600 +# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349 +# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049 +Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin ---- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300 -@@ -5,6 +5,7 @@ +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + #include "base/file_util.h" #include ++#if defined(ANDROID) || defined(OS_POSIX) +#include ++#endif #include #include - ---- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200 -+++ mozilla-release/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300 -@@ -8,6 +8,7 @@ + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include + #include ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ #include #endif #include -+#include #ifdef ANDROID #include #else + #include + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { + diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig index d6cc06648..34c5a6137 100644 --- a/libre/xulrunner-libre/mozconfig +++ b/libre/xulrunner-libre/mozconfig @@ -15,11 +15,12 @@ ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo +#ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman ac_add_options --with-pthreads # Features +ac_add_options --disable-safe-browsing ac_add_options --enable-startup-notification ac_add_options --enable-gio @@ -32,3 +33,6 @@ ac_add_options --disable-installer # Optimization ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 -- cgit v1.2.3