Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f3e2ea738f775763b82410047af0db2d99fe073
commit 1f3e2ea738f775763b82410047af0db2d99fe073 Author: Michel Hermier <herm...@frugalware.org> Date: Mon Dec 21 10:38:26 2009 +0100 xulrunner-1.9.1.4-1-i686 * Bump version. diff --git a/source/xlib/xulrunner/FrugalBuild b/source/xlib/xulrunner/FrugalBuild index 6561d77..8c8f4a8 100644 --- a/source/xlib/xulrunner/FrugalBuild +++ b/source/xlib/xulrunner/FrugalBuild @@ -3,54 +3,124 @@ # Contributor: AlexExtreme <a...@alex-smith.me.uk> pkgname=xulrunner -pkgver=1.8.1.3 -pkgrel=5 +pkgver=1.9.1.4 +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=('gtk+2>=2.16.2-2' 'libidl' 'nss>=3.12') +depends=('alsa-lib' 'bzip2' 'cairo' 'curl' 'dbus-glib' 'gtk+2' 'libidl' 'libpng>=1.2.41-2' 'libstdc++' 'nss' 'nspr' 'sqlite3' 'wireless_tools') makedepends=('zip' 'pkgconfig') groups=('xlib') -options=('scriptlet') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/?C=M;O=D'|grep -m1 'releases/[0-9]'|sed 's/.*s\/\(.*\)/\/\1/;s/\///g'" -source=(http://frugalware.org/~alex/tarballs/xulrunner/$pkgname-$pkgver-source.tar.bz2 \ - xulrunner-1.8.1.3-bug310924.patch xulrunner-1.8.1.3-bug325644.patch newer_nss.patch mozconfig \ - xulrunner-1.8.1.3-bug478843.patch) -signatures=(${source[0]}.asc '' '' '' '' '') -unset MAKEFLAGS -_F_cd_path="mozilla" +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" '' '') build() { - Fcd - Fpatchall - # x86_64 fixes - [ "${CARCH}" = "x86_64" ] && echo "ac_cv_visibility_pragma=no" >> $Fsrcdir/mozconfig + unset MAKEFLAGS - # Get our optimization flags in - sed "s/#OPTIMIZE#/${CFLAGS}/g" $Fsrcdir/mozconfig > .mozconfig || Fdie + Fcd mozilla-1.9.1 # Fix buggy default DPI setting - sed -i '/layout.css.dpi/s/-1/72/' modules/libpref/src/init/all.js || Fdie +# 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 + + export MOZILLA_OFFICIAL=1 + export BUILD_OFFICIAL=1 + + Fpatchall + +# --disable-jsd \ +# --disable-logging \ +# --disable-profilesharing \ +# --with-default-mozilla-five-home=/usr \ # Build it - make -f client.mk build || Fdie - Fmakeinstall DISTDIR=$Fdestdir + ac_cv_visibility_pragma=no Fmake \ + --disable-activex \ + --disable-activex-scripting \ + --disable-debug \ + --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 + # Get rid of versions in path names. Fmv /usr/include/$pkgname-$pkgver /usr/include/$pkgname Fmv /usr/lib/$pkgname-$pkgver /usr/lib/$pkgname + Fmv /usr/lib/$pkgname-devel-$pkgver /usr/lib/$pkgname-devel Fmv /usr/share/idl/$pkgname-$pkgver /usr/share/idl/$pkgname Fln $pkgname /usr/include/$pkgname-$pkgver Fln $pkgname /usr/lib/$pkgname-$pkgver + Fln $pkgname-devel /usr/lib/$pkgname-devel-$pkgver Fln $pkgname /usr/share/idl/$pkgname-$pkgver - Frm /usr/bin/defaults + # and in pkgconfig .pc files + 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 - # nss and nspr aren't built, remove stuff for them - Frm /usr/lib/pkgconfig/xulrunner-ns{s,pr}.pc - Frm /usr/share/aclocal + # Install menu file. +# Ffile /usr/share/applications/$pkgname.desktop - # Remove versioned directories from .pc files - sed -i -e "s/xulrunner-${pkgver}/xulrunner/" $Fdestdir/usr/lib/pkgconfig/*.pc || Fdie + # Change the default icons +# Fln /usr/lib/$pkgname/icons /usr/lib/$pkgname/chrome/icons/default } # optimization OK diff --git a/source/xlib/xulrunner/mozconfig b/source/xlib/xulrunner/mozconfig deleted file mode 100644 index f53106a..0000000 --- a/source/xlib/xulrunner/mozconfig +++ /dev/null @@ -1,38 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-debug -ac_add_options --disable-gnomevfs -ac_add_options --disable-installer -ac_add_options --disable-javaxpcom -ac_add_options --disable-long-long-warning -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-tests -ac_add_options --disable-toolkit-xlib -ac_add_options --disable-toolkit-qt -ac_add_options --disable-toolkit-gtk -ac_add_options --disable-xprint -ac_add_options --enable-canvas -ac_add_options --enable-crypto -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-extensions=default,cookie,permissions -ac_add_options --enable-ldap -ac_add_options --enable-optimize="#OPTIMIZE#" -ac_add_options --enable-pango -ac_add_options --enable-single-profile -ac_add_options --enable-strip -ac_add_options --enable-svg -ac_add_options --enable-svg-renderer=cairo -ac_add_options --enable-system-cairo -ac_add_options --enable-toolkit-gtk2 -ac_add_options --enable-xft -ac_add_options --prefix=/usr -ac_add_options --with-default-mozilla-five-home=/usr -ac_add_options --with-pthreads -ac_add_options --with-system-jpeg -ac_add_options --with-system-mng -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-png -ac_add_options --with-system-zlib diff --git a/source/xlib/xulrunner/mozilla-gcc44.patch b/source/xlib/xulrunner/mozilla-gcc44.patch new file mode 100644 index 0000000..adbeabf --- /dev/null +++ b/source/xlib/xulrunner/mozilla-gcc44.patch @@ -0,0 +1,30 @@ +--- mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc.orig 2009-06-10 00:17:41.000000000 +0200 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc 2009-06-10 00:17:52.000000000 +0200 +@@ -33,6 +33,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <stdio.h> + + #include <cassert> + #include <cstdlib> +--- mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc.orig 2009-06-10 00:18:06.000000000 +0200 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc 2009-06-10 00:18:19.000000000 +0200 +@@ -41,6 +41,7 @@ + #include <cstdlib> + #include <ctime> + #include <string.h> ++#include <stdio.h> + + #include "common/linux/file_id.h" + #include "client/linux/handler/linux_thread.h" +--- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc.orig 2009-06-10 00:15:23.000000000 +0200 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2009-06-10 00:16:06.000000000 +0200 +@@ -45,6 +45,7 @@ + #include <functional> + #include <vector> + #include <string.h> ++#include <stdio.h> + + #include "common/linux/dump_symbols.h" + #include "common/linux/file_id.h" diff --git a/source/xlib/xulrunner/mozilla-locale.patch b/source/xlib/xulrunner/mozilla-locale.patch new file mode 100644 index 0000000..1b20d37 --- /dev/null +++ b/source/xlib/xulrunner/mozilla-locale.patch @@ -0,0 +1,11 @@ +--- mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 ++++ mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 +@@ -890,7 +890,7 @@ + pref("intl.charset.detector", "chrome://global/locale/intl.properties"); + pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); + pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); +-pref("intl.locale.matchOS", false); ++pref("intl.locale.matchOS", true); + // fallback charset list for Unicode conversion (converting from Unicode) + // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) + // for ISO-8859-1 diff --git a/source/xlib/xulrunner/newer_nss.patch b/source/xlib/xulrunner/newer_nss.patch deleted file mode 100644 index 58660e6..0000000 --- a/source/xlib/xulrunner/newer_nss.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: mozilla/security/manager/ssl/src/nsKeygenHandler.cpp -=================================================================== ---- mozilla.orig/security/manager/ssl/src/nsKeygenHandler.cpp 2005-07-20 15:31:22.000000000 -0400 -+++ mozilla/security/manager/ssl/src/nsKeygenHandler.cpp 2007-11-12 18:10:29.000000000 -0500 -@@ -75,6 +75,15 @@ - { nsnull, 0 }, - }; - -+DERTemplate SECAlgorithmIDTemplate[] = { -+ { DER_SEQUENCE, -+ 0, NULL, sizeof(SECAlgorithmID) }, -+ { DER_OBJECT_ID, -+ offsetof(SECAlgorithmID,algorithm), }, -+ { DER_OPTIONAL | DER_ANY, -+ offsetof(SECAlgorithmID,parameters), }, -+ { 0, } -+}; - - DERTemplate CERTSubjectPublicKeyInfoTemplate[] = { - { DER_SEQUENCE, -@@ -95,16 +104,6 @@ - { 0, } - }; - --DERTemplate SECAlgorithmIDTemplate[] = { -- { DER_SEQUENCE, -- 0, NULL, sizeof(SECAlgorithmID) }, -- { DER_OBJECT_ID, -- offsetof(SECAlgorithmID,algorithm), }, -- { DER_OPTIONAL | DER_ANY, -- offsetof(SECAlgorithmID,parameters), }, -- { 0, } --}; -- - const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = { - { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) }, - { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) }, diff --git a/source/xlib/xulrunner/xulrunner.key b/source/xlib/xulrunner/xulrunner.key new file mode 100644 index 0000000..ba0452e --- /dev/null +++ b/source/xlib/xulrunner/xulrunner.key @@ -0,0 +1,71 @@ +This file contains the PGP keys of various developers that work on +Mozilla and its subprojects (such as Firefox and Thunderbird). + +Please don't use these keys for email unless you have asked the owner +because some keys are only used for code signing. + +Please realize that this file itself or the public key servers may be +compromised. You are encouraged to validate the authenticity of these keys in +an out-of-band manner. + +Mozilla users: pgp < KEY +Mozilla developers: + (pgpk -ll <your name> && pgpk -xa <your name>) >> KEY + or + (gpg --fingerprint --list-sigs <your name> \ + && gpg --armor --export <your name>) >> KEY + +Mozilla developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + +pub 1024D/812347DD 2007-07-17 [expires: 2011-07-20] + Key fingerprint = 8D6F 1BA4 A340 4DDB 3F2F D080 7447 4499 8123 47DD +uid Mozilla Software Releases <relea...@mozilla.org> +sig 3 812347DD 2009-07-20 Mozilla Software Releases <relea...@mozilla.org> +sub 1024D/17785FE8 2007-07-17 [expires: 2011-07-20] +sig 812347DD 2009-07-20 Mozilla Software Releases <relea...@mozilla.org> +sub 2048g/1B0EC2E7 2007-07-17 [expires: 2011-07-20] +sig 812347DD 2009-07-20 Mozilla Software Releases <relea...@mozilla.org> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.7 (Darwin) + +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 +=1rD4 +-----END PGP PUBLIC KEY BLOCK----- _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
