From d4898409df0b9ba0dd9de2a2a019c01d95d55268 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 07:42:11 +0000 Subject: main/gnutls: upgrade to 2.10.5 --- main/gnutls/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD index b3a944b4d..54a0b2b25 100644 --- a/main/gnutls/APKBUILD +++ b/main/gnutls/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason # Maintainer: Natanael Copa pkgname=gnutls -pkgver=2.10.4 +pkgver=2.10.5 pkgrel=0 pkgdesc="A library which provides a secure connection" url="http://www.gnu.org/software/gnutls/" @@ -31,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="4e1517084018a8b1fdc96daabea40528 gnutls-2.10.4.tar.bz2" +md5sums="1b032e07ccd22f71a5df78aa73bd91f2 gnutls-2.10.5.tar.bz2" -- cgit v1.2.3 From 0bc0559d6eca1981236fdab61dfed72fca61ac85 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 07:54:18 +0000 Subject: testing/txt2man: new aport Convert flat ASCII text to man page format http://mvertes.free.fr/txt2man/ --- testing/txt2man/APKBUILD | 42 ++++++++++++++++++++++++++++++++++++++++ testing/txt2man/fixbashism.patch | 14 ++++++++++++++ testing/txt2man/makefile.patch | 23 ++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 testing/txt2man/APKBUILD create mode 100644 testing/txt2man/fixbashism.patch create mode 100644 testing/txt2man/makefile.patch diff --git a/testing/txt2man/APKBUILD b/testing/txt2man/APKBUILD new file mode 100644 index 000000000..72079b72f --- /dev/null +++ b/testing/txt2man/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Natanael Copa +# Maintainer: Natanael Copa +pkgname=txt2man +pkgver=1.5.6 +pkgrel=0 +pkgdesc="Convert flat ASCII text to man page format" +url="http://mvertes.free.fr/txt2man/" +arch="noarch" +license="GPLv2+" +depends="gawk" +makedepends= +install="" +subpackages="$pkgname-doc" +source="http://mvertes.free.fr/download/txt2man-$pkgver.tar.gz + fixbashism.patch + makefile.patch" + +_builddir="$srcdir"/txt2man-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + make +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" prefix=/usr mandir=/usr/share/man \ + install || return 1 +} + +md5sums="f301b3dc1872fab1b7740f9f69ff281b txt2man-1.5.6.tar.gz +586f2e01dde9ef07a2734866797f8646 fixbashism.patch +311fe2373e54b15eda845467ce68cd72 makefile.patch" diff --git a/testing/txt2man/fixbashism.patch b/testing/txt2man/fixbashism.patch new file mode 100644 index 000000000..f31059d88 --- /dev/null +++ b/testing/txt2man/fixbashism.patch @@ -0,0 +1,14 @@ +--- ./bookman.orig ++++ ./bookman +@@ -83,9 +83,9 @@ + shift $(($OPTIND - 1)) + date=${date:-$(date +'%d %B %Y')} + +-[[ $1 ]] || set -- $(while read; do echo $REPLY; done) ++[ -n "$1" ] || set -- $(while read REPLY; do echo $REPLY; done) + +-[[ $outfile ]] && post="$post >$outfile" ++[ -n "$outfile" ] && post="$post >$outfile" + + { + # Compute table of content from postscript output. diff --git a/testing/txt2man/makefile.patch b/testing/txt2man/makefile.patch new file mode 100644 index 000000000..617d4b0d2 --- /dev/null +++ b/testing/txt2man/makefile.patch @@ -0,0 +1,23 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -1,5 +1,7 @@ + # Makefile + prefix ?= /usr/local ++bindir ?= $(prefix)/bin ++mandir ?= $(prefix)/share/man + version = txt2man-1.5.6 + BIN = src2man bookman txt2man + MAN1 = src2man.1 txt2man.1 bookman.1 +@@ -7,9 +9,9 @@ + all: $(MAN1) + + install: $(MAN1) +- mkdir -p $(prefix)/bin $(prefix)/man/man1 +- cp $(BIN) $(prefix)/bin/ +- cp $(MAN1) $(prefix)/man/man1 ++ mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 ++ cp $(BIN) $(DESTDIR)$(bindir) ++ cp $(MAN1) $(DESTDIR)$(mandir)/man1 + + clean: + rm -f *.1 *.txt *.ps *.pdf *.html -- cgit v1.2.3 From 3b27406f6446fa5a45aa181030a80dcf9a75ed6f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 09:45:49 +0000 Subject: testing/printproto: new aport X11 print extension wire protocol http://xorg.freedesktop.org/ --- testing/printproto/APKBUILD | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 testing/printproto/APKBUILD diff --git a/testing/printproto/APKBUILD b/testing/printproto/APKBUILD new file mode 100644 index 000000000..dc1c0b415 --- /dev/null +++ b/testing/printproto/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Natanael Copa +pkgname=printproto +pkgver=1.0.5 +pkgrel=0 +pkgdesc="X11 print extension wire protocol" +url="http://xorg.freedesktop.org/" +arch="noarch" +license="custom" +depends="" +depends_dev="util-macros" +makedepends="$depends_dev" +source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="99d0e25feea2fead7d8325b7000b41c3 printproto-1.0.5.tar.bz2" -- cgit v1.2.3 From 234770f435ed442173c4be1def3303f638780892 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 09:46:21 +0000 Subject: testing/libxp: new aport X.Org X11 libXp runtime library http://www.x.org needed by java --- testing/libxp/APKBUILD | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 testing/libxp/APKBUILD diff --git a/testing/libxp/APKBUILD b/testing/libxp/APKBUILD new file mode 100644 index 000000000..ff2b4cb9b --- /dev/null +++ b/testing/libxp/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Natanael Copa +# Maintainer: Natanael Copa +pkgname=libxp +pkgver=1.0.1 +pkgrel=0 +pkgdesc="X.Org X11 libXp runtime library" +url="http://www.x.org" +arch="all" +license="MIT" +depends= +depends_dev="util-macros libx11-dev libxext-dev libxau-dev printproto" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-dev $pkgname-doc" +source="http://xorg.freedesktop.org/releases/individual/lib/libXp-$pkgver.tar.bz2" + +_builddir="$srcdir"/libXp-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="7ae1d63748e79086bd51a633da1ff1a9 libXp-1.0.1.tar.bz2" -- cgit v1.2.3 From eb5c88aa7df348afb8b8f14bfe4cad4f2a9bcf8e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 10:57:22 +0000 Subject: main/abuild: upgrade to 2.7.4 --- main/abuild/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index e6efcd2ec..5dee5b234 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.7.3 +pkgver=2.7.4 pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2 @@ -37,4 +37,4 @@ package() { install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles } -md5sums="b1e1f1deb38311dbbe94eefaaa731872 abuild-2.7.3.tar.bz2" +md5sums="b39a68e836b8873307cf6617f1bfeb23 abuild-2.7.4.tar.bz2" -- cgit v1.2.3 From 82661f3ad03b571dcabbe9328dd9bd9c8ae3d1b8 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 15:31:44 +0000 Subject: main/icu: upgrade to 4.6.1 --- main/icu/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD index efd23b7b3..837ff25da 100644 --- a/main/icu/APKBUILD +++ b/main/icu/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa pkgname=icu -pkgver=4.6 +pkgver=4.6.1 # convert x.y.z to x_y_z _x=${pkgver%%.*} _ver=${pkgver%.*} # _ver=x.y _y=${_ver#*.} _z=${pkgver##*.} -_ver=${_y}_${_z} +_ver=${_x}_${_y}_${_z} pkgrel=0 pkgdesc="International Components for Unicode library" @@ -57,5 +57,5 @@ package() { install -Dm644 "$srcdir"/icu/license.html \ "$pkgdir"/usr/share/licenses/icu/license.html } -md5sums="43e56b71c407be5154de681eaa646a4a icu4c-4_6-src.tgz +md5sums="da64675d85f0c2191cef93a8cb5eea88 icu4c-4_6_1-src.tgz e729eb08687b042e40df572932cbf9ce icu-ccache.patch" -- cgit v1.2.3 From a430e9b11fa6a32d82236225bf1ddddf9d27bf82 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 15:51:48 +0000 Subject: main/libdrm: upgrade to 2.4.24 --- main/libdrm/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD index 51728ec1c..60580e929 100644 --- a/main/libdrm/APKBUILD +++ b/main/libdrm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=libdrm -pkgver=2.4.23 -pkgrel=1 +pkgver=2.4.24 +pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="http://dri.freedesktop.org/" arch="all" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="7577ff36ec364d88fae466d4f7fc5fc6 libdrm-2.4.23.tar.bz2" +md5sums="8d802bf3b368f9fac0d7d17516a9436f libdrm-2.4.24.tar.bz2" -- cgit v1.2.3 From f4c2836b57ed822e7b41f666e8f37d491e55941f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 15:54:40 +0000 Subject: main/libxt: upgrade to 1.1.1 --- main/libxt/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/libxt/APKBUILD b/main/libxt/APKBUILD index 06ec43b66..1d6af53eb 100644 --- a/main/libxt/APKBUILD +++ b/main/libxt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=libxt -pkgver=1.0.9 +pkgver=1.1.1 pkgrel=0 pkgdesc="X11 toolkit intrinsics library" url="http://xorg.freedesktop.org/" @@ -25,4 +25,4 @@ package() { cd "$srcdir"/libXt-$pkgver make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="8a414f8f2327aaa616ca2dcac1f5d8c3 libXt-1.0.9.tar.bz2" +md5sums="eb22c0a1f172b06b97a3f5ae89768412 libXt-1.1.1.tar.bz2" -- cgit v1.2.3 From fed2e7e073bc8cfd72b71987f9f04fc050d348f0 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Mar 2011 15:55:18 +0000 Subject: main/midori: upgrade to 0.3.3 --- main/midori/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD index af450ac10..03bf5159b 100644 --- a/main/midori/APKBUILD +++ b/main/midori/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=midori -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=0 pkgdesc="A lightweight web browser based on Gtk WebKit" url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -48,4 +48,4 @@ package() { # PAX does not like the JIT paxctl -c -m -p "$pkgdir"/usr/bin/midori } -md5sums="99d9f0b936e7052b41c3d1e7a7d7d672 midori-0.3.2.tar.bz2" +md5sums="e1262cc7cc0c1773c331ab794480f037 midori-0.3.3.tar.bz2" -- cgit v1.2.3 From 1ac53c1d3b0de5eaf8135a7ffcb3ad5be7665219 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 17 Mar 2011 13:15:51 +0000 Subject: main/acf-lib: upgrade to 0.2.1 --- main/acf-lib/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD index b375f4c48..4ef0415e3 100644 --- a/main/acf-lib/APKBUILD +++ b/main/acf-lib/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask # Maintainer: Ted Trask pkgname=acf-lib -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=0 pkgdesc="Lua libraries for ACF" url="http://git.alpinelinux.org/cgit/acf-lib" arch="noarch" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="ed6f4d717ecada03e3bc193a0a550d9d acf-lib-0.2.0.tar.bz2" +md5sums="c120e66d542c67c8d9a06dad310f7ccc acf-lib-0.2.1.tar.bz2" -- cgit v1.2.3 From b8d2cfa10f3b739e02e8d834549b4ed20b14a676 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 17 Mar 2011 13:30:52 +0000 Subject: main/acf-alpine-baselayout: upgrade to 0.8.0 --- main/acf-alpine-baselayout/APKBUILD | 17 ++++---------- .../busybox-1.18-compat.patch | 27 ---------------------- 2 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 main/acf-alpine-baselayout/busybox-1.18-compat.patch diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD index 6ba1032a5..0d507973a 100644 --- a/main/acf-alpine-baselayout/APKBUILD +++ b/main/acf-alpine-baselayout/APKBUILD @@ -1,25 +1,18 @@ # Contributor: Ted Trask # Maintainer: Ted Trask pkgname=acf-alpine-baselayout -pkgver=0.7.3 -pkgrel=5 +pkgver=0.8.0 +pkgrel=0 pkgdesc="A web-based system administration interface for alpine-baselayout" url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout" arch="noarch" license="GPL-2" -depends="acf-core lua lua-json4 lua-posix procps" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 - busybox-1.18-compat.patch" - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 < "$srcdir"/busybox-1.18-compat.patch -} +depends="acf-core lua lua-json4 lua-posix" +source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="b462fa1ff228f3552c2eea2d0a4fed96 acf-alpine-baselayout-0.7.3.tar.bz2 -5445216b479bdd4800cf960aef933a67 busybox-1.18-compat.patch" +md5sums="59d428712072fd286ec651ca185de205 acf-alpine-baselayout-0.8.0.tar.bz2" diff --git a/main/acf-alpine-baselayout/busybox-1.18-compat.patch b/main/acf-alpine-baselayout/busybox-1.18-compat.patch deleted file mode 100644 index ddeae946b..000000000 --- a/main/acf-alpine-baselayout/busybox-1.18-compat.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 96aa7d8650f4de9f1d009e10d45df01d5e7a1331 Mon Sep 17 00:00:00 2001 -From: William Pitcock -Date: Mon, 21 Feb 2011 10:11:48 -0600 -Subject: [PATCH] health model: work with procps and busybox 1.18 - ---- - health-model.lua | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/health-model.lua b/health-model.lua -index 2749e2a..bb70073 100644 ---- a/health-model.lua -+++ b/health-model.lua -@@ -49,8 +49,8 @@ get_system = function (self) - system.version = cfe({ value=indexver or fs.read_file("/etc/alpine-release") or "Unknown", label="Version" }) - system.timezone = cfe({ value=date.what_tz(), label="Time Zone" }) - system.uname = cfe({ value=querycmd("uname -a"), label="UName" }) -- system.memory = cfe({ value=querycmd("free"), label="Memory usage" }) -- system.memory.used = getpercentage(querycmd("free"), "Total:", 3, 4) -+ system.memory = cfe({ value=querycmd("free -o -t"), label="Memory usage" }) -+ system.memory.used = getpercentage(querycmd("free -o -t"), "Total:", 3, 4) - return cfe({ type="group", value=system }) - end - --- -1.7.4.1 - -- cgit v1.2.3 From a61b3d5c23ebad4f68274bab5f2637c6647438e4 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 17 Mar 2011 13:39:15 +0000 Subject: main/acf-skins: upgrade to 0.4.0 --- main/acf-skins/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD index 6b077682e..af1e3d151 100644 --- a/main/acf-skins/APKBUILD +++ b/main/acf-skins/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask # Maintainer: Ted Trask pkgname=acf-skins -pkgver=0.3.0 -pkgrel=2 +pkgver=0.4.0 +pkgrel=0 pkgdesc="Skins for ACF" url="http://git.alpinelinux.org/cgit/acf-skins" arch="noarch" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="65e77c8f46cd25d10cbe20e22dab3b9d acf-skins-0.3.0.tar.bz2" +md5sums="a4f82ab1b428ccd43db3c7f076e53fb4 acf-skins-0.4.0.tar.bz2" -- cgit v1.2.3 From 16457ebd182ffcf5fd55af6aaf415e8a79c8a5fd Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 17 Mar 2011 14:37:39 +0000 Subject: main/acf-alpine-baselayout: upgrade to 0.8.1 --- main/acf-alpine-baselayout/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD index 0d507973a..eb02f0fdd 100644 --- a/main/acf-alpine-baselayout/APKBUILD +++ b/main/acf-alpine-baselayout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask # Maintainer: Ted Trask pkgname=acf-alpine-baselayout -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=0 pkgdesc="A web-based system administration interface for alpine-baselayout" url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout" @@ -15,4 +15,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="59d428712072fd286ec651ca185de205 acf-alpine-baselayout-0.8.0.tar.bz2" +md5sums="b5db0e519b6254c3120efeec4175f0fd acf-alpine-baselayout-0.8.1.tar.bz2" -- cgit v1.2.3 From 6a19f9fb66ed68fa1420b3c7963ec2efc057e865 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 19:00:18 -0500 Subject: main/sqlite: enable SQLITE_ENABLE_UNLOCK_NOTIFY feature --- main/sqlite/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD index 861d1ff2f..f1f5abd76 100644 --- a/main/sqlite/APKBUILD +++ b/main/sqlite/APKBUILD @@ -6,7 +6,7 @@ _y=${pkgver%.*} _y=${_y#*.} _z=${pkgver##*.} _ver=${_x}0${_y}0${_z}00 -pkgrel=0 +pkgrel=1 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" arch="all" @@ -26,7 +26,7 @@ prepare() { build() { cd "$_builddir" export LTLINK_EXTRAS="-ldl" - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_SECURE_DELETE -Iext/fts3" + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY -Iext/fts3" ./configure --prefix=/usr \ --enable-threadsafe \ --enable-load-extension \ -- cgit v1.2.3 From 0314b8125e186c9ec8cbacb8cf8c53ec32da5415 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 20:46:09 -0500 Subject: main/hunspell: downgrade to 1.2.11 --- main/hunspell/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD index e9dbdd7aa..0a1c2acfe 100644 --- a/main/hunspell/APKBUILD +++ b/main/hunspell/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=hunspell -pkgver=1.3.1 -pkgrel=2 +pkgver=1.2.11 +pkgrel=3 pkgdesc="Spell checker and morphological analyzer library and program" url="http://hunspell.sourceforge.net/" arch="all" @@ -24,4 +24,4 @@ package() { make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="9ed97fce60a9a65852402248a6659492 hunspell-1.3.1.tar.gz" +md5sums="8f57cdc4db091d69e1f682ed4d8ab282 hunspell-1.2.11.tar.gz" -- cgit v1.2.3 From 56b3e818912ac0ccc294efea6fca3a5d07d19fd6 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 20:46:25 -0500 Subject: main/xulrunner: upgrade to 2.0_rc1 --- main/xulrunner/APKBUILD | 39 +++++++++++++--------- main/xulrunner/enable-x86_64-tracemonkey.patch | 12 ------- ...-portability-cluelessness-libpr0n-edition.patch | 16 ++++----- main/xulrunner/gecko-c99math.patch | 11 ++++++ main/xulrunner/ipc-chromium-execinfo.patch | 25 +++++++------- main/xulrunner/mozconfig | 1 + main/xulrunner/mozilla-pkgconfig.patch | 4 +-- main/xulrunner/mozjs-c99math.patch | 24 ++++++++++++- main/xulrunner/xpcom-execinfo.patch | 23 +++++++++++++ main/xulrunner/xulrunner-png14.patch | 11 ------ 10 files changed, 105 insertions(+), 61 deletions(-) create mode 100644 main/xulrunner/gecko-c99math.patch create mode 100644 main/xulrunner/xpcom-execinfo.patch delete mode 100644 main/xulrunner/xulrunner-png14.patch diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index 7fbc3889a..cfcef0527 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -1,7 +1,8 @@ # Contributor: William Pitcock # Maintainer: William Pitcock pkgname=xulrunner -pkgver=1.9.2.15 +pkgver=2.0_rc1 +_ffoxver=4.0rc1 pkgrel=0 pkgdesc="runtime environment for xul-based applications" url="http://developer.mozilla.org/en/XULRunner" @@ -26,20 +27,23 @@ depends_dev="nspr-dev startup-notification-dev sqlite-dev libidl-dev - fts-dev" + fts-dev + mesa-dev" makedepends="$depends_dev autoconf2.13 python zip + yasm autoconf automake libtool" install="" subpackages="$pkgname-dev" -source="http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${pkgver}/source/${pkgname}-${pkgver}.source.tar.bz2 +# http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${pkgver}/source/${pkgname}-${pkgver}.source.tar.bz2 +source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2 mozconfig @@ -47,16 +51,19 @@ source="http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${pkgver} fix-xulrunner-launcher.patch mozilla-pkgconfig.patch - xulrunner-png14.patch + ipc-chromium-execinfo.patch + + xulrunner-mozalloc.patch xulrunner-version.patch - mozjs-c99math.patch + xpcom-execinfo.patch - ipc-chromium-execinfo.patch + mozjs-c99math.patch + gecko-c99math.patch fix-mozilla-portability-cluelessness-libpr0n-edition.patch" -_xulrunner_version="${pkgver%.*}" +_xulrunner_version="2.0" _builddir="${srcdir}/mozilla-${_xulrunner_version}" prepare() { local i @@ -102,13 +109,15 @@ dev() { mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include } -md5sums="09c688b5dabe45f23c653af24d3abfe4 xulrunner-1.9.2.15.source.tar.bz2 -d0908177f4c3879817f5dc7287cbb2b2 mozconfig -faecc31fd371db93311109117f6bcc40 enable-x86_64-tracemonkey.patch +md5sums="511828dcc226f38602c6c67bd192ef40 firefox-4.0rc1.source.tar.bz2 +d7a79ba952885c05cc41789faad30bba mozconfig +78291eb2cd97553d8fd76306c52d40f1 enable-x86_64-tracemonkey.patch 86d33a17286131d9ef4cdfb35ee56f1f fix-xulrunner-launcher.patch -d839d1c4ef736e6d89ccf91b23b965a4 mozilla-pkgconfig.patch -39e3c85c80f7897ac463e7fe7ad9a343 xulrunner-png14.patch +02c23dc4ebd88e445533314716331818 mozilla-pkgconfig.patch +60cb07e288889dd5b1b882eecc9f6e86 ipc-chromium-execinfo.patch +d38ecbb7bb31032d3e1ced8939e26abd xulrunner-mozalloc.patch 371303c5bdc4fa0d955d14521b93b69d xulrunner-version.patch -03b73ac11442a26a978c53a6c114ef2b mozjs-c99math.patch -ac1c3725167eb26c89d62b1818810ee4 ipc-chromium-execinfo.patch -7123ec519e3a4d2c8d07369065a61dc7 fix-mozilla-portability-cluelessness-libpr0n-edition.patch" +b349739dcac45f3cc0ccaf2943abf6ed xpcom-execinfo.patch +b187440207e773e9be606594d2c99216 mozjs-c99math.patch +aacbb29e1448f9af6697e8a885b9bbfa gecko-c99math.patch +d18eb944a7a5275a1837b2a536689186 fix-mozilla-portability-cluelessness-libpr0n-edition.patch" diff --git a/main/xulrunner/enable-x86_64-tracemonkey.patch b/main/xulrunner/enable-x86_64-tracemonkey.patch index f4e1da036..30cccf2e3 100644 --- a/main/xulrunner/enable-x86_64-tracemonkey.patch +++ b/main/xulrunner/enable-x86_64-tracemonkey.patch @@ -11,15 +11,3 @@ arm*-*) ENABLE_JIT=1 NANOJIT_ARCH=ARM -@@ -2488,7 +2492,10 @@ - i?86-*) - AC_DEFINE(AVMPLUS_IA32) - ;; -- -+x86_64*-*) -+ AC_DEFINE(AVMPLUS_AMD64) -+ AC_DEFINE(AVMPLUS_64BIT) -+ ;; - arm*-*) - AC_DEFINE(AVMPLUS_ARM) - ;; diff --git a/main/xulrunner/fix-mozilla-portability-cluelessness-libpr0n-edition.patch b/main/xulrunner/fix-mozilla-portability-cluelessness-libpr0n-edition.patch index 4fc112a07..33ba8ef6d 100644 --- a/main/xulrunner/fix-mozilla-portability-cluelessness-libpr0n-edition.patch +++ b/main/xulrunner/fix-mozilla-portability-cluelessness-libpr0n-edition.patch @@ -1,14 +1,14 @@ ---- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h -+++ mozilla-1.9.2/gfx/qcms/qcmstypes.h -@@ -7,9 +7,9 @@ +--- mozilla-2.0.orig/gfx/qcms/qcmstypes.h ++++ mozilla-2.0/gfx/qcms/qcmstypes.h +@@ -7,9 +7,8 @@ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */ -#if defined (__SVR4) && defined (__sun) -+#if 1 - /* int_types.h gets included somehow, so avoid redefining the types differently */ +-/* int_types.h gets included somehow, so avoid redefining the types differently */ -#include ++#if 1 +#include - #else - typedef PRInt8 int8_t; - typedef PRUint8 uint8_t; + #elif defined (_AIX) + #include + #elif !defined(ANDROID) diff --git a/main/xulrunner/gecko-c99math.patch b/main/xulrunner/gecko-c99math.patch new file mode 100644 index 000000000..cdb846442 --- /dev/null +++ b/main/xulrunner/gecko-c99math.patch @@ -0,0 +1,11 @@ +--- mozilla-2.0.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp ++++ mozilla-2.0/content/canvas/src/nsCanvasRenderingContext2D.cpp +@@ -159,7 +159,7 @@ + // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. + return !!_finite(d); + #else +- return finite(d); ++ return isfinite(d); + #endif + } + diff --git a/main/xulrunner/ipc-chromium-execinfo.patch b/main/xulrunner/ipc-chromium-execinfo.patch index 48fc1c6a3..4bbc143d8 100644 --- a/main/xulrunner/ipc-chromium-execinfo.patch +++ b/main/xulrunner/ipc-chromium-execinfo.patch @@ -1,14 +1,14 @@ ---- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc -+++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc -@@ -6,7 +6,6 @@ - #include "base/debug_util.h" - - #include +--- mozilla-2.0.orig/ipc/chromium/src/base/debug_util_posix.cc ++++ mozilla-2.0/ipc/chromium/src/base/debug_util_posix.cc +@@ -12,7 +12,6 @@ + #include + #include + #ifndef ANDROID -#include - #include - #include - #include -@@ -114,6 +113,7 @@ + #include + #endif + +@@ -116,6 +115,7 @@ } StackTrace::StackTrace() { @@ -16,7 +16,7 @@ const int kMaxCallers = 256; void* callers[kMaxCallers]; -@@ -128,11 +128,14 @@ +@@ -134,12 +134,15 @@ } else { trace_.resize(0); } @@ -26,8 +26,9 @@ void StackTrace::PrintBacktrace() { +#if 0 fflush(stderr); + #ifndef ANDROID backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO); +#endif + #endif } - void StackTrace::OutputToStream(std::ostream* os) { diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig index 90b0bea4c..54786a303 100644 --- a/main/xulrunner/mozconfig +++ b/main/xulrunner/mozconfig @@ -30,6 +30,7 @@ ac_add_options --disable-crashreporter ac_add_options --enable-safe-browsing ac_add_options --enable-startup-notification ac_add_options --enable-extensions=default +ac_add_options --enable-jemalloc export LIBS="-lfts" export BUILD_OFFICIAL=1 diff --git a/main/xulrunner/mozilla-pkgconfig.patch b/main/xulrunner/mozilla-pkgconfig.patch index 9331e0489..5c8bd0fd6 100644 --- a/main/xulrunner/mozilla-pkgconfig.patch +++ b/main/xulrunner/mozilla-pkgconfig.patch @@ -6,7 +6,7 @@ diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in mozilla- Description: Static library for version-independent embedding of the Mozilla runtime Version: %MOZILLA_VERSION% +Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue + Libs: -L${sdkdir}/lib -lxpcomglue -ldl Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in mozilla-1.9.2/xulrunner/installer/libxul.pc.in --- mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in 2010-01-21 05:31:27.000000000 +0200 @@ -55,6 +55,6 @@ diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in mozilla-1.9.2/ @@ -7,4 +7,4 @@ Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lmozjs + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% -Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE +Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/main/xulrunner/mozjs-c99math.patch b/main/xulrunner/mozjs-c99math.patch index ce05c1796..fdf346e49 100644 --- a/main/xulrunner/mozjs-c99math.patch +++ b/main/xulrunner/mozjs-c99math.patch @@ -5,7 +5,29 @@ return _finite(d); #else - return finite(d); -+ return __finite(d); ++ return isfinite(d); + #endif + } + +--- mozilla-2.0.orig/js/src/ctypes/CTypes.cpp ++++ mozilla-2.0/js/src/ctypes/CTypes.cpp +@@ -464,7 +464,7 @@ + #ifdef WIN32 + return _finite(f) != 0; + #else +- return finite(f); ++ return isfinite(f); + #endif + } + +--- mozilla-2.0.orig/content/base/public/nsContentUtils.h ++++ mozilla-2.0/content/base/public/nsContentUtils.h +@@ -1942,7 +1942,7 @@ + #ifdef WIN32 + return _finite(f); + #else +- return finite(f); ++ return isfinite(f); #endif } diff --git a/main/xulrunner/xpcom-execinfo.patch b/main/xulrunner/xpcom-execinfo.patch new file mode 100644 index 000000000..1fe320967 --- /dev/null +++ b/main/xulrunner/xpcom-execinfo.patch @@ -0,0 +1,23 @@ +--- mozilla-2.0.orig/xpcom/threads/nsThread.cpp ++++ mozilla-2.0/xpcom/threads/nsThread.cpp +@@ -54,7 +54,9 @@ + && defined(_GNU_SOURCE) + # define MOZ_CANARY + # include +-# include ++# if !defined(__UCLIBC__) ++# include ++# endif + # include + # include + # include "nsXULAppAPI.h" +@@ -562,7 +564,9 @@ + const char msg[29] = "event took too long to run:\n"; + // use write to be safe in the signal handler + write(Canary::sOutputFD, msg, sizeof(msg)); ++#if !defined(__UCLIBC__) + backtrace_symbols_fd(array, backtrace(array, 30), Canary::sOutputFD); ++#endif + } + + #endif diff --git a/main/xulrunner/xulrunner-png14.patch b/main/xulrunner/xulrunner-png14.patch deleted file mode 100644 index be80e30f9..000000000 --- a/main/xulrunner/xulrunner-png14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 -+++ b/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 -@@ -135,7 +135,7 @@ - - // initialize - mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -+ NULL, - ErrorCallback, - ErrorCallback); - if (! mPNG) -- cgit v1.2.3 From 442e19f35604b902e2674dd546a4737028af4e95 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 20:51:05 -0500 Subject: main/xulrunner: add missing patch --- main/xulrunner/xulrunner-mozalloc.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 main/xulrunner/xulrunner-mozalloc.patch diff --git a/main/xulrunner/xulrunner-mozalloc.patch b/main/xulrunner/xulrunner-mozalloc.patch new file mode 100644 index 000000000..31027a23e --- /dev/null +++ b/main/xulrunner/xulrunner-mozalloc.patch @@ -0,0 +1,11 @@ +--- mozilla-2.0.orig/memory/mozalloc/mozalloc.cpp ++++ mozilla-2.0/memory/mozalloc/mozalloc.cpp +@@ -237,7 +237,7 @@ + return 0; + + #if defined(MOZ_MEMORY) +- return malloc_usable_size(ptr); ++ return 0; + #elif defined(XP_MACOSX) + return malloc_size(ptr); + #elif defined(XP_WIN) -- cgit v1.2.3 From 43bdefc957063b0c352f5efc9ec41be27b50b2ef Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 21:19:58 -0500 Subject: main/xulrunner: fix up package() --- main/xulrunner/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index cfcef0527..6f7de22a8 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -92,7 +92,7 @@ build() { package() { cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1 msg "Setting up compatibility symlinks..." ln -sf /usr/lib/xulrunner-${_xulrunner_version}/libxul.so "${pkgdir}"/usr/lib/libxul.so -- cgit v1.2.3 From 0da10637a7613c4783554fbdc83ebb90bb4288c0 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 21:20:20 -0500 Subject: main/xulrunner: temporary disable to force hunspell downgrade on buildservers --- main/xulrunner/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index 6f7de22a8..bccd41887 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -6,7 +6,7 @@ _ffoxver=4.0rc1 pkgrel=0 pkgdesc="runtime environment for xul-based applications" url="http://developer.mozilla.org/en/XULRunner" -arch="all" +arch="" license="GPL LGPL MPL" depends= depends_dev="nspr-dev -- cgit v1.2.3 From 221de65d4f416cd8276d292f7510d36e76a70a8d Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 21:23:54 -0500 Subject: main/xulrunner: fix up xulrunner-dev --- main/xulrunner/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index bccd41887..ac6a6f8f3 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -63,8 +63,8 @@ source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver} fix-mozilla-portability-cluelessness-libpr0n-edition.patch" -_xulrunner_version="2.0" -_builddir="${srcdir}/mozilla-${_xulrunner_version}" +_xulrunner_version="1.9.2" +_builddir="${srcdir}/mozilla-2.0" prepare() { local i -- cgit v1.2.3 From 81d84a99f8aee46915a729a2b74cf3b51395f2eb Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 21:26:37 -0500 Subject: main/xulrunner: reenable build --- main/xulrunner/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index ac6a6f8f3..76cb7b477 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -6,7 +6,7 @@ _ffoxver=4.0rc1 pkgrel=0 pkgdesc="runtime environment for xul-based applications" url="http://developer.mozilla.org/en/XULRunner" -arch="" +arch="all" license="GPL LGPL MPL" depends= depends_dev="nspr-dev -- cgit v1.2.3 From 4c0d21a3246cf676872911d7839548414f88a150 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 21:52:25 -0500 Subject: main/xulrunner: fix up libmozalloc bollocks --- main/xulrunner/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index 76cb7b477..677f92be4 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -3,7 +3,7 @@ pkgname=xulrunner pkgver=2.0_rc1 _ffoxver=4.0rc1 -pkgrel=0 +pkgrel=1 pkgdesc="runtime environment for xul-based applications" url="http://developer.mozilla.org/en/XULRunner" arch="all" @@ -97,7 +97,7 @@ package() { msg "Setting up compatibility symlinks..." ln -sf /usr/lib/xulrunner-${_xulrunner_version}/libxul.so "${pkgdir}"/usr/lib/libxul.so ln -sf /usr/lib/xulrunner-${_xulrunner_version}/libxpcom.so "${pkgdir}"/usr/lib/libxpcom.so - ln -sf /usr/lib/xulrunner-${_xulrunner_version}/libmozjs.so "${pkgdir}"/usr/lib/libmozjs.so + ln -sf /usr/lib/xulrunner-${_xulrunner_version}/libmozalloc.so "${pkgdir}"/usr/lib/libmozalloc.so } dev() { -- cgit v1.2.3 From b4bd23a34506acce8841423c4ed191c30cb8720a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 22:13:45 -0500 Subject: main/firefox: upgrade to 4.0_rc1 --- main/firefox/APKBUILD | 24 +++++++++++++----------- main/firefox/firefox-defaults.patch | 14 ++++---------- main/firefox/firefox-version.patch | 10 +++++----- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index a4381be0e..aa3ff650c 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -1,8 +1,9 @@ # Contributor: William Pitcock # Maintainer: William Pitcock pkgname=firefox -pkgver=3.6.15 -_xulver=1.9.2.15 +pkgver=4.0_rc1 +_pkgver=4.0rc1 +_xulver=2.0_rc1 pkgrel=3 pkgdesc="firefox web browser (unofficial branding)" url="http://www.firefox.com" @@ -34,21 +35,23 @@ makedepends="xulrunner-dev>=${_xulver} python zip + yasm autoconf automake libtool" install="" subpackages="" -source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${pkgver}.source.tar.bz2 +source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${_pkgver}.source.tar.bz2 mozconfig - firefox-agent.patch + firefox-defaults.patch firefox-version.patch + firefox.desktop firefox-safe.desktop" -_xulrunner_version="${_xulver%.*}" +_xulrunner_version="2.0" _builddir="${srcdir}/mozilla-${_xulrunner_version}" prepare() { local i @@ -77,19 +80,18 @@ build() { package() { cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1 install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 ${srcdir}/mozilla-1.9.2/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png + install -m644 ${srcdir}/mozilla-2.0/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/firefox.desktop install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop } -md5sums="fcf8042948d91f1f3d9c33599b79cf35 firefox-3.6.15.source.tar.bz2 +md5sums="511828dcc226f38602c6c67bd192ef40 firefox-4.0rc1.source.tar.bz2 7938f0054456f3767d2427dff137ab34 mozconfig -f437e94acff8f810991271ef4677d859 firefox-agent.patch -1807651225b021e043154f8bba715a19 firefox-defaults.patch -92c11c66dd69b03f214002fededd1fc8 firefox-version.patch +475a0870730c88f48158a4d4ca9812d0 firefox-defaults.patch +0e296aabf8c2b5fd5ef5b3a989bab03a firefox-version.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" diff --git a/main/firefox/firefox-defaults.patch b/main/firefox/firefox-defaults.patch index d3cdb473a..cce60cd5d 100644 --- a/main/firefox/firefox-defaults.patch +++ b/main/firefox/firefox-defaults.patch @@ -1,11 +1,3 @@ -diff -Nur mozilla-1.9.2.old//browser/branding/unofficial/locales/browserconfig.properties mozilla-1.9.2/browser/branding/unofficial/locales/browserconfig.properties ---- mozilla-1.9.2.old//browser/branding/unofficial/locales/browserconfig.properties 2010-04-14 01:21:35.000000000 +0300 -+++ mozilla-1.9.2/browser/branding/unofficial/locales/browserconfig.properties 2010-04-20 23:55:32.036959438 +0300 -@@ -1,3 +1,3 @@ - # Do NOT localize or otherwise change these values --browser.startup.homepage=http://www.mozilla.org/projects/namoroka/ -+browser.startup.homepage=http://www.google.com/firefox - diff -Nur mozilla-1.9.2.old//browser/branding/unofficial/pref/firefox-branding.js mozilla-1.9.2/browser/branding/unofficial/pref/firefox-branding.js --- mozilla-1.9.2.old//browser/branding/unofficial/pref/firefox-branding.js 2010-04-14 01:21:35.000000000 +0300 +++ mozilla-1.9.2/browser/branding/unofficial/pref/firefox-branding.js 2010-04-20 23:55:01.290102941 +0300 @@ -14,15 +6,17 @@ diff -Nur mozilla-1.9.2.old//browser/branding/unofficial/pref/firefox-branding.j -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); +pref("startup.homepage_override_url","http://www.mozilla.com/%APP%/%VERSION%/whatsnew/"); +pref("startup.homepage_welcome_url","http://www.mozilla.com/%APP%/%VERSION%/firstrun/"); + pref("browser.panorama.welcome_url", "http://www.mozilla.com/firefox/panorama/"); // The time interval between checks for a new version (in seconds) // nightly=8 hours, official=24 hours - pref("app.update.interval", 28800); @@ -14,7 +14,7 @@ pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); - // Release notes URL + // Release notes and vendor URLs -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); +-pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/"); +pref("app.releaseNotesURL", "http://www.mozilla.com/%APP%/%VERSION%/releasenotes/"); ++pref("app.vendorURL", "http://www.mozilla.com/%APP%/"); // Search codes belong only in builds with official branding pref("browser.search.param.yahoo-fr", ""); diff --git a/main/firefox/firefox-version.patch b/main/firefox/firefox-version.patch index a7f3740c7..2b1aeb41d 100644 --- a/main/firefox/firefox-version.patch +++ b/main/firefox/firefox-version.patch @@ -1,11 +1,11 @@ ---- mozilla-1.9.1/browser/installer/Makefile.in.ver 2009-07-18 13:32:35.000000000 +0200 -+++ mozilla-1.9.1/browser/installer/Makefile.in 2009-07-18 13:33:12.000000000 +0200 +--- mozilla-2.0.orig/browser/installer/Makefile.in 2009-07-18 13:32:35.000000000 +0200 ++++ mozilla-2.0/browser/installer/Makefile.in 2009-07-18 13:33:12.000000000 +0200 @@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk +MOZ_APP_VERSION="3.6" + - NO_PKG_FILES = \ - $(MOZ_APP_NAME)-config \ - $(MOZ_APP_NAME)-bin.elf \ + include $(topsrcdir)/config/rules.mk + + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in -- cgit v1.2.3 From ded5ce1d44fbbc94a1a6740f8f32f9d1f27841f1 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 17 Mar 2011 22:19:54 -0500 Subject: main/firefox: use new omni.jar stuff --- main/firefox/APKBUILD | 4 ++-- main/firefox/mozconfig | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index aa3ff650c..2e6a382b6 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox pkgver=4.0_rc1 _pkgver=4.0rc1 _xulver=2.0_rc1 -pkgrel=3 +pkgrel=0 pkgdesc="firefox web browser (unofficial branding)" url="http://www.firefox.com" arch="all" @@ -90,7 +90,7 @@ package() { } md5sums="511828dcc226f38602c6c67bd192ef40 firefox-4.0rc1.source.tar.bz2 -7938f0054456f3767d2427dff137ab34 mozconfig +d1ec45f9d953a868483094cce2b3eff5 mozconfig 475a0870730c88f48158a4d4ca9812d0 firefox-defaults.patch 0e296aabf8c2b5fd5ef5b3a989bab03a firefox-version.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop diff --git a/main/firefox/mozconfig b/main/firefox/mozconfig index e6ec2d1c2..e68be73fa 100644 --- a/main/firefox/mozconfig +++ b/main/firefox/mozconfig @@ -25,6 +25,7 @@ ac_add_options --disable-updater ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2 ac_add_options --enable-safe-browsing ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --enable-chrome-format=jar export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -- cgit v1.2.3 From af6da52dc2893b7708e2dbdcb2e33540e618e512 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 18 Mar 2011 00:57:36 -0500 Subject: main/firefox: restore firefox 3 tab behaviour (tabs at bottom as default) --- main/firefox/APKBUILD | 4 +++- .../firefox-restore-fx3-tab-behaviour-as-default.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 main/firefox/firefox-restore-fx3-tab-behaviour-as-default.patch diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index 2e6a382b6..3618aea8d 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox pkgver=4.0_rc1 _pkgver=4.0rc1 _xulver=2.0_rc1 -pkgrel=0 +pkgrel=1 pkgdesc="firefox web browser (unofficial branding)" url="http://www.firefox.com" arch="all" @@ -45,6 +45,7 @@ subpackages="" source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${_pkgver}.source.tar.bz2 mozconfig + firefox-restore-fx3-tab-behaviour-as-default.patch firefox-defaults.patch firefox-version.patch @@ -91,6 +92,7 @@ package() { md5sums="511828dcc226f38602c6c67bd192ef40 firefox-4.0rc1.source.tar.bz2 d1ec45f9d953a868483094cce2b3eff5 mozconfig +7cddbb1c76b9038ad1d85311dda81c95 firefox-restore-fx3-tab-behaviour-as-default.patch 475a0870730c88f48158a4d4ca9812d0 firefox-defaults.patch 0e296aabf8c2b5fd5ef5b3a989bab03a firefox-version.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop diff --git a/main/firefox/firefox-restore-fx3-tab-behaviour-as-default.patch b/main/firefox/firefox-restore-fx3-tab-behaviour-as-default.patch new file mode 100644 index 000000000..a9102a65b --- /dev/null +++ b/main/firefox/firefox-restore-fx3-tab-behaviour-as-default.patch @@ -0,0 +1,11 @@ +--- mozilla-2.0.orig/browser/base/content/browser.xul ++++ mozilla-2.0/browser/base/content/browser.xul +@@ -470,7 +470,7 @@ + #else + iconsize="large" + #endif +- tabsontop="true" ++ tabsontop="false" + persist="tabsontop"> + + Date: Fri, 18 Mar 2011 01:37:37 -0500 Subject: main/firefox: add world's crummiest statusbar --- main/firefox/APKBUILD | 4 ++- main/firefox/firefox-restore-status-bar.patch | 37 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 main/firefox/firefox-restore-status-bar.patch diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index 3618aea8d..f5167f423 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox pkgver=4.0_rc1 _pkgver=4.0rc1 _xulver=2.0_rc1 -pkgrel=1 +pkgrel=2 pkgdesc="firefox web browser (unofficial branding)" url="http://www.firefox.com" arch="all" @@ -46,6 +46,7 @@ source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver mozconfig firefox-restore-fx3-tab-behaviour-as-default.patch + firefox-restore-status-bar.patch firefox-defaults.patch firefox-version.patch @@ -93,6 +94,7 @@ package() { md5sums="511828dcc226f38602c6c67bd192ef40 firefox-4.0rc1.source.tar.bz2 d1ec45f9d953a868483094cce2b3eff5 mozconfig 7cddbb1c76b9038ad1d85311dda81c95 firefox-restore-fx3-tab-behaviour-as-default.patch +a153133cfe74ce269e1e80925e48544c firefox-restore-status-bar.patch 475a0870730c88f48158a4d4ca9812d0 firefox-defaults.patch 0e296aabf8c2b5fd5ef5b3a989bab03a firefox-version.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop diff --git a/main/firefox/firefox-restore-status-bar.patch b/main/firefox/firefox-restore-status-bar.patch new file mode 100644 index 000000000..f492abb59 --- /dev/null +++ b/main/firefox/firefox-restore-status-bar.patch @@ -0,0 +1,37 @@ +--- mozilla-2.0.orig/browser/base/content/browser.xul ++++ mozilla-2.0/browser/base/content/browser.xul +@@ -992,12 +992,18 @@ + contentcontextmenu="contentAreaContextMenu" + autocompletepopup="PopupAutoComplete" + onclick="return contentAreaClick(event, false);"/> +- + +