From b3288f94e625603d6b5b23740b721287e75eead7 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 27 Dec 2011 23:14:54 +0000 Subject: Tue Dec 27 23:14:54 UTC 2011 --- community/aria2/PKGBUILD | 6 +- community/calc/PKGBUILD | 11 +- community/choqok/PKGBUILD | 4 +- community/couchdb/PKGBUILD | 10 +- community/couchdb/rc-script.patch | 54 ++- community/gluon/PKGBUILD | 3 +- community/stunnel/PKGBUILD | 18 +- community/stunnel/stunnel.install | 32 +- community/stunnel/stunnel.rc.d | 30 +- community/stunnel/stunnel.tmpfiles.conf | 1 + extra/attica/PKGBUILD | 10 +- extra/gcin/PKGBUILD | 6 +- extra/k9copy/PKGBUILD | 9 +- extra/kdebase-runtime/PKGBUILD | 4 +- extra/kdebindings-perlqt/PKGBUILD | 7 +- extra/kdebindings-smokekde/PKGBUILD | 4 +- extra/kdelibs/PKGBUILD | 4 +- extra/kdeplasma-addons/PKGBUILD | 4 +- extra/vpnc/PKGBUILD | 25 +- kde-unstable/kdebase-runtime/PKGBUILD | 4 +- kde-unstable/kdebindings-perlqt/PKGBUILD | 6 +- kde-unstable/kdebindings-smokekde/PKGBUILD | 4 +- kde-unstable/kdelibs/PKGBUILD | 4 +- kde-unstable/kdeplasma-addons/PKGBUILD | 4 +- libre/thunderbird-libre/PKGBUILD | 6 +- libre/unzip-libre/PKGBUILD | 50 +++ libre/unzip-libre/SRCBUILD | 33 ++ libre/unzip-libre/match.patch | 472 +++++++++++++++++++++ mozilla-testing/icecat-i18n/Makefile | 33 ++ mozilla-testing/icecat-i18n/PKGBUILD | 127 ++++++ mozilla-testing/icecat/PKGBUILD | 122 ++++++ mozilla-testing/icecat/icecat-safe.desktop | 78 ++++ mozilla-testing/icecat/icecat.desktop | 78 ++++ mozilla-testing/icecat/icecat.install | 13 + mozilla-testing/icecat/libre.patch | 66 +++ mozilla-testing/icecat/mozconfig | 92 ++++ mozilla-testing/icecat/mozconfig.default | 70 +++ mozilla-testing/icecat/mozconfig.old | 85 ++++ mozilla-testing/icecat/parabola.patch | 22 + mozilla-testing/iceweasel-i18n/Makefile | 36 ++ mozilla-testing/iceweasel-i18n/PKGBUILD | 57 +++ mozilla-testing/iceweasel/PKGBUILD | 135 ++++++ mozilla-testing/iceweasel/iceweasel.install | 21 + mozilla-testing/iceweasel/libre.patch | 391 +++++++++++++++++ mozilla-testing/iceweasel/mozconfig | 39 ++ .../iceweasel/mozilla-firefox-1.0-lang.patch | 12 + mozilla-testing/iceweasel/region.properties | 23 + .../iceweasel/xulrunner-copy-stub.patch | 11 + mozilla-testing/mozilla-searchplugins/PKGBUILD | 40 ++ .../mozilla-searchplugins/duck-duck-go-lite.xml | 8 + .../mozilla-searchplugins/duck-duck-go-ssl.xml | 8 + .../mozilla-searchplugins/internet-archive.xml | 12 + .../mozilla-searchplugins/jamendo-en.xml | 12 + .../mozilla-searchplugins/logless-search.xml | 8 + .../mozilla-searchplugins/scroogle-ssl-english.xml | 14 + .../mozilla-searchplugins/wikipedia.xml | 15 + mozilla-testing/mozilla-searchplugins/yacy.xml | 9 + social/ahcpd/PKGBUILD | 27 ++ testing/graphicsmagick/PKGBUILD | 55 +++ testing/ntp/PKGBUILD | 62 +++ testing/ntp/install | 19 + testing/ntp/ntp.conf | 23 + testing/ntp/ntpd | 47 ++ testing/ntp/ntpd.conf | 5 + testing/ntp/ntpdate | 29 ++ ~fauno/afew/LICENSE | 15 + ~fauno/afew/PKGBUILD | 29 ++ ~fauno/afew/SRCBUILD | 36 ++ ~fauno/dbacl/PKGBUILD | 32 ++ ~lukeshu/android-udev/Makefile | 8 +- 70 files changed, 2727 insertions(+), 122 deletions(-) create mode 100644 community/stunnel/stunnel.tmpfiles.conf create mode 100644 libre/unzip-libre/PKGBUILD create mode 100644 libre/unzip-libre/SRCBUILD create mode 100644 libre/unzip-libre/match.patch create mode 100644 mozilla-testing/icecat-i18n/Makefile create mode 100644 mozilla-testing/icecat-i18n/PKGBUILD create mode 100644 mozilla-testing/icecat/PKGBUILD create mode 100644 mozilla-testing/icecat/icecat-safe.desktop create mode 100644 mozilla-testing/icecat/icecat.desktop create mode 100644 mozilla-testing/icecat/icecat.install create mode 100644 mozilla-testing/icecat/libre.patch create mode 100644 mozilla-testing/icecat/mozconfig create mode 100644 mozilla-testing/icecat/mozconfig.default create mode 100644 mozilla-testing/icecat/mozconfig.old create mode 100644 mozilla-testing/icecat/parabola.patch create mode 100644 mozilla-testing/iceweasel-i18n/Makefile create mode 100644 mozilla-testing/iceweasel-i18n/PKGBUILD create mode 100644 mozilla-testing/iceweasel/PKGBUILD create mode 100644 mozilla-testing/iceweasel/iceweasel.install create mode 100644 mozilla-testing/iceweasel/libre.patch create mode 100644 mozilla-testing/iceweasel/mozconfig create mode 100644 mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch create mode 100644 mozilla-testing/iceweasel/region.properties create mode 100644 mozilla-testing/iceweasel/xulrunner-copy-stub.patch create mode 100644 mozilla-testing/mozilla-searchplugins/PKGBUILD create mode 100644 mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml create mode 100644 mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml create mode 100644 mozilla-testing/mozilla-searchplugins/internet-archive.xml create mode 100644 mozilla-testing/mozilla-searchplugins/jamendo-en.xml create mode 100644 mozilla-testing/mozilla-searchplugins/logless-search.xml create mode 100644 mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml create mode 100644 mozilla-testing/mozilla-searchplugins/wikipedia.xml create mode 100644 mozilla-testing/mozilla-searchplugins/yacy.xml create mode 100644 social/ahcpd/PKGBUILD create mode 100644 testing/graphicsmagick/PKGBUILD create mode 100644 testing/ntp/PKGBUILD create mode 100644 testing/ntp/install create mode 100644 testing/ntp/ntp.conf create mode 100755 testing/ntp/ntpd create mode 100644 testing/ntp/ntpd.conf create mode 100755 testing/ntp/ntpdate create mode 100644 ~fauno/afew/LICENSE create mode 100644 ~fauno/afew/PKGBUILD create mode 100644 ~fauno/afew/SRCBUILD create mode 100644 ~fauno/dbacl/PKGBUILD diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 0fb4e866b..f0f41709f 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: Daniel J Griffiths pkgname=aria2 -pkgver=1.13.0 -pkgrel=2 +pkgver=1.14.0 +pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -md5sums=('b86a5bd4a94e465a58656f71b48c90b9') +md5sums=('577b3b5f19c28de4451cd1a32de76eeb') build() { cd aria2-${pkgver} diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD index 911d7facb..129fa3fc9 100644 --- a/community/calc/PKGBUILD +++ b/community/calc/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 37217 2011-01-12 14:33:47Z spupykin $ +# $Id: PKGBUILD 61256 2011-12-26 12:59:57Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=calc -pkgver=2.12.4.3 +pkgver=2.12.4.4 pkgrel=1 pkgdesc="console calculator" arch=(i686 x86_64) url="http://www.isthe.com/chongo/tech/comp/calc/" license=('GPL') depends=(glibc) -source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) -md5sums=('d95dccde71cc8d920af0f8375e85e9c8') +#source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) +source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2) +md5sums=('1ad16a9304df7137cd8626a1f50b6aae') build() { cd $srcdir/calc-$pkgver @@ -53,5 +54,5 @@ EOF make -j1 make T=$pkgdir install - mv $pkgdir/usr/bin/cscript $startdir/pkg/usr/share/calc/ + mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/ } diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index 558018682..9109daf32 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58036 2011-11-05 17:31:00Z plewis $ +# $Id: PKGBUILD 61252 2011-12-26 11:59:59Z andrea $ # Maintainer: Peter Richard Lewis # Contributor: Andrea Scarpino # Contributor: Emanuele Rossi @@ -6,7 +6,7 @@ pkgname=choqok pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url="http://choqok.gnufolks.org/" license=('GPL') diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index a9d309c7b..8c405a625 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58574 2011-11-15 15:35:36Z spupykin $ +# $Id: PKGBUILD 61260 2011-12-26 21:33:37Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Previous Contributor: Michael Fellinger pkgname=couchdb pkgver=1.2.0 -pkgrel=1git20111115 +pkgrel=2git20111115 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" @@ -21,7 +21,7 @@ backup=('etc/couchdb/local.ini' source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz" "rc-script.patch") md5sums=('b4236a36a473e3a1c81e7548de194c47' - '559b5e1483c3fb3e4327a9c58181a46c') + '8a3b1a1ff98a6411827ad991db7a355b') build() { cd "$srcdir/apache-$pkgname-$pkgver" @@ -30,14 +30,14 @@ build() { sed -i 's|-ljs|-lmozjs185|' configure [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make - patch etc/init/couchdb <$srcdir/rc-script.patch + patch -R etc/init/couchdb <$srcdir/rc-script.patch } package() { cd "$srcdir/apache-$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 etc/default/couchdb $pkgdir/etc/conf.d/couchdb + install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index ef7be39df..1dd723ffc 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,40 +1,40 @@ ---- couchdb.orig 2011-11-15 19:06:16.000000000 +0400 -+++ couchdb 2011-11-15 19:08:24.000000000 +0400 -@@ -1,4 +1,6 @@ --#!/bin/sh -e -+#!/bin/bash -+. /etc/rc.conf -+. /etc/rc.d/functions +--- couchdb 2011-12-27 01:21:59.000000000 +0400 ++++ couchdb.my 2011-12-27 01:21:18.000000000 +0400 +@@ -1,6 +1,4 @@ +-#!/bin/bash +-. /etc/rc.conf +-. /etc/rc.d/functions ++#!/bin/sh -e # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy of -@@ -29,7 +31,7 @@ +@@ -31,7 +29,7 @@ NAME=couchdb SCRIPT_NAME=`basename $0` COUCHDB=/usr/bin/couchdb --CONFIGURATION_FILE=/etc/default/couchdb -+CONFIGURATION_FILE=/etc/conf.d/couchdb +-CONFIGURATION_FILE=/etc/conf.d/couchdb ++CONFIGURATION_FILE=/etc/default/couchdb RUN_DIR=/var/run/couchdb LSB_LIBRARY=/lib/lsb/init-functions -@@ -42,16 +44,14 @@ +@@ -44,14 +42,16 @@ fi log_daemon_msg () { -- # Dummy function to be replaced by LSB library. -- -- echo $@ -+ stat_busy $@ +- stat_busy $@ ++ # Dummy function to be replaced by LSB library. ++ ++ echo $@ } log_end_msg () { -- # Dummy function to be replaced by LSB library. -- ++ # Dummy function to be replaced by LSB library. ++ if test "$1" != "0"; then -- echo "Error with $DESCRIPTION: $NAME" -+ stat_fail -+ else -+ stat_done +- stat_fail +- else +- stat_done ++ echo "Error with $DESCRIPTION: $NAME" fi return $1 } @@ -42,8 +42,16 @@ command="$command $COUCHDB_OPTIONS" fi if test -n "$COUCHDB_USER"; then -- if su $COUCHDB_USER -c "$command"; then -+ if su $COUCHDB_USER -s /bin/bash -c "$command"; then +- if su $COUCHDB_USER -s /bin/bash -c "$command"; then ++ if su $COUCHDB_USER -c "$command"; then return $SCRIPT_OK else return $SCRIPT_ERROR +@@ -84,7 +84,6 @@ + # Start Apache CouchDB as a background process. + + mkdir -p "$RUN_DIR" +- chown -R $COUCHDB_USER "$RUN_DIR" + command="$COUCHDB -b" + if test -n "$COUCHDB_STDOUT_FILE"; then + command="$command -o $COUCHDB_STDOUT_FILE" diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD index 88aaacd92..b16442551 100644 --- a/community/gluon/PKGBUILD +++ b/community/gluon/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 61254 2011-12-26 12:01:45Z andrea $ # Maintainer: Sven-Hendrik Haase # Contributor: Ivan Sichmann Freitas pkgname=gluon pkgver=0.71.0 _pkgver=0.71 -pkgrel=2 +pkgrel=3 pkgdesc="A free and open source platform for creating and distributing games" arch=('i686' 'x86_64') url="http://gluon.gamingfreedom.org/" diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 17296a913..a501645fb 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60289 2011-12-08 23:55:42Z lfleischer $ +# $Id: PKGBUILD 61258 2011-12-26 17:36:12Z dreisner $ # Maintainer: Kaiting Chen # Contributor: Daniel J Griffiths # Contributor: Kevin Piche pkgname=stunnel pkgver=4.50 -pkgrel=1 +pkgrel=3 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64') url="http://www.stunnel.org" @@ -15,11 +15,14 @@ install=$pkgname.install options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' - 'stunnel.rc.d') + 'stunnel.rc.d' + 'stunnel.tmpfiles.conf') + md5sums=('d68b4565294496a8bdf23c728a679f53' 'ea9e85daef0cc96ce21649901b3514f7' 'f15398497e10e080c2406d2fc541660c' - 'cb647c71ff4cb1e035b6e515d5f13ebf') + 'cb647c71ff4cb1e035b6e515d5f13ebf' + '2e065a39998e57727ee79887bbd1751e') build() { cd "$srcdir/$pkgname-$pkgver" @@ -46,9 +49,14 @@ package() { install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" install -Dm755 "$srcdir/stunnel.rc.d" "$pkgdir/etc/rc.d/stunnel" + install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" + + # move systemd service into place + install -dm755 "$pkgdir/lib/systemd/system" + mv "tools/stunnel.service" "$pkgdir/lib/systemd/system/" sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ - -e "s:nobody:stunnel:g" -e "s:nogroup:stunnel:g" \ + -e "s:no\(body\|group\):stunnel:g" \ -i "$pkgdir/etc/stunnel/stunnel.conf-sample" } diff --git a/community/stunnel/stunnel.install b/community/stunnel/stunnel.install index f7bbbffcb..d9998e4da 100644 --- a/community/stunnel/stunnel.install +++ b/community/stunnel/stunnel.install @@ -1,35 +1,31 @@ post_install() { # add stunnel group - if [ ! `grep stunnel /etc/group` ]; then - groupadd -g 16 stunnel &>/dev/null + if ! getent group stunnel >/dev/null 2>&1; then + groupadd -g 16 stunnel fi # add stunnel user - id stunnel &>/dev/null || \ + if ! getent passwd stunnel >/dev/null 2>&1; then useradd -u 16 -g stunnel -d /var/run/stunnel -s /bin/false stunnel - + fi + # create chroot dir if necessary. if [ ! -d /var/run/stunnel ]; then - install -d -m 770 -o stunnel -g stunnel /var/run/stunnel + install -dm770 -o stunnel -g stunnel /var/run/stunnel fi - - cat << EOF - -NOTE ----- -Copy /etc/stunnel/stunnel.conf-sample to /etc/stunnel/stunnel.conf -& edit it to match your setup before invoking the daemon (/etc/rc.d/stunnel). - -EOF } post_upgrade() { - post_install $1 + post_install "$@" } pre_remove() { # remove users & groups - userdel stunnel &> /dev/null - groupdel stunnel &> /dev/null - rm -rf /var/run/stunnel + if getent passwd stunnel >/dev/null 2>&1; then + userdel stunnel + fi + + if getent group stunnel >/dev/null 2>&1; then + groupdel stunnel + fi } diff --git a/community/stunnel/stunnel.rc.d b/community/stunnel/stunnel.rc.d index 15816abe8..ee67e20ce 100644 --- a/community/stunnel/stunnel.rc.d +++ b/community/stunnel/stunnel.rc.d @@ -3,26 +3,35 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/bin/stunnel` +pidfile=/var/run/stunnel.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + case "$1" in start) stat_busy "Starting stunnel" - [ -z "$PID" ] && /usr/bin/stunnel - if [ $? -gt 0 ]; then - stat_fail - else + if [[ -z $PID ]] && /usr/bin/stunnel; then add_daemon stunnel stat_done + else + stat_fail + exit 1 fi ;; stop) stat_busy "Stopping stunnel" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else + if [[ $PID ]] && kill $PID &>/dev/null; then rm_daemon stunnel stat_done + else + stat_fail + exit 1 fi ;; restart) @@ -31,6 +40,5 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac -exit 0 diff --git a/community/stunnel/stunnel.tmpfiles.conf b/community/stunnel/stunnel.tmpfiles.conf new file mode 100644 index 000000000..f118e68a0 --- /dev/null +++ b/community/stunnel/stunnel.tmpfiles.conf @@ -0,0 +1 @@ +d /var/run/stunnel 0770 stunnel stunnel - diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index 4135c242f..0ec114468 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 142782 2011-11-15 06:11:07Z andrea $ +# $Id: PKGBUILD 145659 2011-12-26 12:00:10Z andrea $ # Maintainer: Andrea Scarpino pkgname=attica -pkgver=0.2.9 +pkgver=0.3.0 pkgrel=1 -pkgdesc='A library to access Open Collaboration Service providers' +pkgdesc='A Qt library that implements the Open Collaboration Services API' arch=('i686' 'x86_64') -url='http://www.kde.org' +url='https://projects.kde.org/projects/kdesupport/attica' license=('LGPL') depends=('qt') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7dadb6ca7dec09f89d41cd868ea6dc39') +md5sums=('5a77f678422e7a52e3a3abb2d7ad0499') build() { cd "${srcdir}" diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 283dac499..b6ceaa864 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145643 2011-12-26 03:52:35Z bisson $ +# $Id: PKGBUILD 145680 2011-12-27 03:33:44Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andreas Radke # Contributor: damir pkgname=gcin -pkgver=2.6.7 +pkgver=2.6.8 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('aae215a830783a97a007e75487d57314b0ee205a' +sha1sums=('4f8c002fb28ae9342adc9232c6d101270b910395' '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70') install=install diff --git a/extra/k9copy/PKGBUILD b/extra/k9copy/PKGBUILD index ee0699e14..dc547f447 100644 --- a/extra/k9copy/PKGBUILD +++ b/extra/k9copy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143762 2011-11-29 00:20:34Z giovanni $ +# $Id: PKGBUILD 145676 2011-12-26 22:21:16Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Stefano Zamprogno pkgname=k9copy -pkgver=2.3.7 -pkgrel=2 +pkgver=2.3.8 +pkgrel=1 pkgdesc="A small utility which allows the copy of DVD under Linux" arch=('i686' 'x86_64') url="http://k9copy.sourceforge.net" @@ -13,13 +13,12 @@ depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor') makedepends=('automoc4' 'cmake') install=k9copy.install source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz") -md5sums=('bbfda2937f5027d31495df67dc29efa4') +md5sums=('584f6cc50f28befbeb0d5c1ec9476456') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop - sed -i -e "s:CODEC_TYPE_VIDEO:AVMEDIA_TYPE_VIDEO:g" src/import/k9avidecode.cpp cmake -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index c7e92d573..3828fa1d7 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144615 2011-12-08 09:18:15Z andrea $ +# $Id: PKGBUILD 145651 2011-12-26 11:44:37Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-runtime pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 8da5065ee..eb2c7111a 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 144627 2011-12-08 09:18:32Z andrea $ +# $Id: PKGBUILD 145672 2011-12-26 14:44:55Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlqt pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdebindings-smokeqt') +depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") sha1sums=('b4b3d8ce2b08af62202f5ae79fe57bde60dd9a85') @@ -20,6 +20,7 @@ build() { cd build cmake ../perlqt-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index bc29119ac..2a2fe59d5 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144625 2011-12-08 09:18:30Z andrea $ +# $Id: PKGBUILD 145652 2011-12-26 11:44:48Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokekde pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" arch=('i686' 'x86_64') diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index ec5e724c2..b3b8fc901 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145327 2011-12-21 20:47:05Z andrea $ +# $Id: PKGBUILD 145657 2011-12-26 12:00:06Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdelibs pkgver=4.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 41bb90716..be01860fc 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144737 2011-12-08 09:21:34Z andrea $ +# $Id: PKGBUILD 145653 2011-12-26 11:44:57Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -73,7 +73,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.7.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index 1e1228bba..ae8a08765 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142551 2011-11-12 00:27:55Z dreisner $ +# $Id: PKGBUILD 145645 2011-12-26 07:05:40Z dreisner $ # Maintainer: Dave Reisner # Contributor: Thomas Baechler pkgname=vpnc _vpncver=0.5.3 -pkgver=$_vpncver.svn472 +pkgver=$_vpncver.svn481 pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" @@ -15,25 +15,30 @@ arch=('i686' 'x86_64') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('51c350341ad4e7f8efbba19810b138a3' +md5sums=('42edf29f8b9f05cd2e708d5130deb770' 'a3f4e0cc682f437e310a1c86ae198e45') mktarball() { + [[ -d tarball ]] || mkdir tarball + + pushd tarball + svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk - pushd trunk - _svnrev=$(svn info | awk '/^Revision:/ { print $2 }') - popd + _svnrev=$(cd trunk >/dev/null; svn info | awk '/^Revision:/ { print $2 }') git clone git://git.infradead.org/users/dwmw2/vpnc-scripts.git cp vpnc-scripts/vpnc-script trunk/ find trunk/ -type d -name .svn -exec rm -rf {} + mv trunk "$pkgname-$_vpncver.svn$_svnrev" - tar cJf "$pkgname-$_vpncver.svn$_svnrev"{.tar.xz,} + tar cJf "../$pkgname-$_vpncver.svn$_svnrev.tar.xz" "$pkgname-$_vpncver.svn$_svnrev/" + + popd + rm -rf tarball } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" # Build hybrid support sed -i 's|^#OPENSSL|OPENSSL|g' Makefile @@ -41,11 +46,11 @@ build() { # fix resolvconf location for community/openresolv sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-script - make PREFIX=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" PREFIX=/usr install diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD index f6dc8aab2..22632374f 100644 --- a/kde-unstable/kdebase-runtime/PKGBUILD +++ b/kde-unstable/kdebase-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145476 2011-12-22 22:32:28Z andrea $ +# $Id: PKGBUILD 145661 2011-12-26 12:22:21Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-runtime pkgver=4.7.95 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD index 4c56d79fe..9c33036ae 100644 --- a/kde-unstable/kdebindings-perlqt/PKGBUILD +++ b/kde-unstable/kdebindings-perlqt/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 145483 2011-12-22 22:36:28Z andrea $ +# $Id: PKGBUILD 145671 2011-12-26 14:42:16Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlqt pkgver=4.7.95 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdebindings-smokeqt') +depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") sha1sums=('f596a5b04544a66cb681d77d4b45185a1a373e26') diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD index 7e6ba510e..5aa979bdb 100644 --- a/kde-unstable/kdebindings-smokekde/PKGBUILD +++ b/kde-unstable/kdebindings-smokekde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145482 2011-12-22 22:35:54Z andrea $ +# $Id: PKGBUILD 145663 2011-12-26 12:26:11Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokekde pkgver=4.7.95 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" arch=('i686' 'x86_64') diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD index e231b2882..da14bb45f 100644 --- a/kde-unstable/kdelibs/PKGBUILD +++ b/kde-unstable/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145566 2011-12-23 08:37:19Z andrea $ +# $Id: PKGBUILD 145655 2011-12-26 11:58:35Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdelibs pkgver=4.7.95 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index b55613964..3bbd178f3 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145543 2011-12-22 23:14:31Z andrea $ +# $Id: PKGBUILD 145665 2011-12-26 12:35:54Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -75,7 +75,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.7.95 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index a018b87a6..9ac8350ce 100644 --- a/libre/thunderbird-libre/PKGBUILD +++ b/libre/thunderbird-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 145298 2011-12-21 14:25:49Z ibiru $ # Contributor: Alexander Baldeck # Contributor: Dale Blount # Contributor: Anders Bostrom pkgname=thunderbird-libre -pkgver=8.0 +pkgver=9.0 pkgrel=1 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc thunderbird-3.0-lang.patch thunderbird-install-dir.patch channel-prefs.js) -md5sums=('332f60036aebdce7dec6ee2b1af4941d' +md5sums=('681bdf6362945b59b2bec23f8aecc7e7' 'ca98c2bf1017b33e19dae22fdcef2e73' 'af3e5b344d2edf1c7d61bb0a5a96de9a' '25b6fe16ac24cd5c852213e5c1adb272' diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD new file mode 100644 index 000000000..20c3885f9 --- /dev/null +++ b/libre/unzip-libre/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ +# Maintainer: Thayer Williams +# Contributor: Douglas Soares de Andrade +# Contributor: Robson Peixoto + +_pkgname=unzip +pkgname=unzip-libre +pkgver=6.0 +pkgrel=5 +pkgdesc="Unpacks .zip archives such as those made by PKZIP" +arch=('i686' 'x86_64') +url="http://www.info-zip.org/" +license=('custom') +depends=('bzip2' 'bash') +provides=("${_pkgname}=${pkgver}") +conflicts=("${_pkgname}") +replaces=("${_pkgname}") +source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz") + + +build() { + cd ${srcdir}/${_pkgname}${pkgver/./} + + # set CFLAGS -- from Debian + export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ + -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ + -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ + -DUSE_BZIP2 -DNATIVE" + + # make -- from Debian + make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ + D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips + +} + +package(){ + cd ${srcdir}/${_pkgname}${pkgver/./} + + # install -- from Debian + make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install + + # install the license file + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE + + # fix manpage location + mkdir -p ${pkgdir}/usr/share + mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ +} + +md5sums=('8e8a774e2006617d8787d095bb78c78a') diff --git a/libre/unzip-libre/SRCBUILD b/libre/unzip-libre/SRCBUILD new file mode 100644 index 000000000..a9ada936b --- /dev/null +++ b/libre/unzip-libre/SRCBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ +# Maintainer: Thayer Williams +# Contributor: Douglas Soares de Andrade +# Contributor: Robson Peixoto + +_pkgname=unzip +pkgname=unzip-libre +pkgver=6.0 +pkgrel=5 +pkgdesc="Unpacks .zip archives such as those made by PKZIP" +arch=('any') +url="http://www.info-zip.org/" +license=('custom') +depends=('bzip2' 'bash') +source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' +# from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch + 'match.patch') +md5sums=('62b490407489521db863b523a7f86375' + 'e6d9f0c204c2abe6a57dc5e1637d5140') + +build() { + cd ${srcdir}/${_pkgname}${pkgver/./} + + patch -Np0 -i ${srcdir}/match.patch +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${SRCDEST} + + mv ${srcdir}/${_pkgname}${pkgver/./} ${pkgdir}/ + +} diff --git a/libre/unzip-libre/match.patch b/libre/unzip-libre/match.patch new file mode 100644 index 000000000..6ba65fee0 --- /dev/null +++ b/libre/unzip-libre/match.patch @@ -0,0 +1,472 @@ +--- match.c 2011-09-07 23:00:58.037644003 +0200 ++++ match.final.c 2011-09-07 23:32:19.433644002 +0200 +@@ -27,16 +27,14 @@ + + --------------------------------------------------------------------------- + +- Copyright on recmatch() from Zip's util.c (although recmatch() was almost +- certainly written by Mark Adler...ask me how I can tell :-) ): ++ Copyright on recmatch() from Zip's util.c ++ Copyright (c) 1990-2005 Info-ZIP. All rights reserved. + +- Copyright (C) 1990-1992 Mark Adler, Richard B. Wales, Jean-loup Gailly, +- Kai Uwe Rommel and Igor Mandrichenko. ++ See the accompanying file LICENSE, version 2004-May-22 or later ++ for terms of use. ++ If, for some reason, both of these files are missing, the Info-ZIP license ++ also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html + +- Permission is granted to any individual or institution to use, copy, +- or redistribute this software so long as all of the original files are +- included unmodified, that it is not sold for profit, and that this copy- +- right notice is retained. + + --------------------------------------------------------------------------- + +@@ -53,7 +51,7 @@ + + A set is composed of characters or ranges; a range looks like ``character + hyphen character'' (as in 0-9 or A-Z). [0-9a-zA-Z_] is the minimal set of +- characters allowed in the [..] pattern construct. Other characters are ++ characters ALlowed in the [..] pattern construct. Other characters are + allowed (i.e., 8-bit characters) if your system will support them. + + To suppress the special syntactic significance of any of ``[]*?!^-\'', in- +@@ -101,8 +99,32 @@ + # define WILDCHAR '?' + # define BEG_RANGE '[' + # define END_RANGE ']' ++# define WILDCHR_SINGLE '?' ++# define DIRSEP_CHR '/' ++# define WILDCHR_MULTI '*' + #endif + ++#ifdef WILD_STOP_AT_DIR ++ int wild_stop_at_dir = 1; /* default wildcards do not include / in matches */ ++#else ++ int wild_stop_at_dir = 0; /* default wildcards do include / in matches */ ++#endif ++ ++ ++ ++/* ++ * case mapping functions. case_map is used to ignore case in comparisons, ++ * to_up is used to force upper case even on Unix (for dosify option). ++ */ ++#ifdef USE_CASE_MAP ++# define case_map(c) upper[(c) & 0xff] ++# define to_up(c) upper[(c) & 0xff] ++#else ++# define case_map(c) (c) ++# define to_up(c) ((c) >= 'a' && (c) <= 'z' ? (c)-'a'+'A' : (c)) ++#endif /* USE_CASE_MAP */ ++ ++ + #if 0 /* GRR: add this to unzip.h someday... */ + #if !(defined(MSDOS) && defined(DOSWILD)) + #ifdef WILD_STOP_AT_DIR +@@ -114,8 +136,8 @@ + int ignore_case __WDLPRO)); + #endif + #endif /* 0 */ +-static int recmatch OF((ZCONST uch *pattern, ZCONST uch *string, +- int ignore_case __WDLPRO)); ++static int recmatch OF((ZCONST char *, ZCONST char *, ++ int)); + static char *isshexp OF((ZCONST char *p)); + static int namecmp OF((ZCONST char *s1, ZCONST char *s2)); + +@@ -154,192 +176,236 @@ + } + dospattern[j-1] = '\0'; /* nuke the end "." */ + } +- j = recmatch((uch *)dospattern, (uch *)string, ignore_case __WDL); ++ j = recmatch(dospattern, string, ignore_case); + free(dospattern); + return j == 1; + } else + #endif /* MSDOS && DOSWILD */ +- return recmatch((uch *)pattern, (uch *)string, ignore_case __WDL) == 1; ++ return recmatch(pattern, string, ignore_case) == 1; + } + + + +-static int recmatch(p, s, ic __WDL) +- ZCONST uch *p; /* sh pattern to match */ +- ZCONST uch *s; /* string to which to match it */ +- int ic; /* true for case insensitivity */ +- __WDLDEF /* directory sepchar for WildStopAtDir mode, or 0 */ ++static int recmatch(p, s, cs) ++ZCONST char *p; /* sh pattern to match */ ++ZCONST char *s; /* string to match it to */ ++int cs; /* flag: force case-sensitive matching */ + /* Recursively compare the sh pattern p with the string s and return 1 if +- * they match, and 0 or 2 if they don't or if there is a syntax error in the +- * pattern. This routine recurses on itself no more deeply than the number +- * of characters in the pattern. */ ++ they match, and 0 or 2 if they don't or if there is a syntax error in the ++ pattern. This routine recurses on itself no deeper than the number of ++ characters in the pattern. */ + { +- unsigned int c; /* pattern char or start of range in [-] loop */ ++ int c; /* pattern char or start of range in [-] loop */ ++ /* Get first character, the pattern for new recmatch calls follows */ ++ /* borrowed from Zip's global.c */ ++ int no_wild = 0; ++ int allow_regex=1; ++ /* This fix provided by akt@m5.dion.ne.jp for Japanese. ++ See 21 July 2006 mail. ++ It only applies when p is pointing to a doublebyte character and ++ things like / and wildcards are not doublebyte. This probably ++ should not be needed. */ + +- /* Get first character, the pattern for new recmatch calls follows */ +- c = *p; INCSTR(p); ++#ifdef _MBCS ++ if (CLEN(p) == 2) { ++ if (CLEN(s) == 2) { ++ return (*p == *s && *(p+1) == *(s+1)) ? ++ recmatch(p + 2, s + 2, cs) : 0; ++ } else { ++ return 0; ++ } ++ } ++#endif /* ?_MBCS */ + +- /* If that was the end of the pattern, match if string empty too */ +- if (c == 0) +- return *s == 0; ++ c = *POSTINCSTR(p); + +- /* '?' (or '%') matches any character (but not an empty string). */ +- if (c == WILDCHAR) +-#ifdef WILD_STOP_AT_DIR +- /* If uO.W_flag is non-zero, it won't match '/' */ +- return (*s && (!sepc || *s != (uch)sepc)) +- ? recmatch(p, s + CLEN(s), ic, sepc) : 0; +-#else +- return *s ? recmatch(p, s + CLEN(s), ic) : 0; +-#endif ++ /* If that was the end of the pattern, match if string empty too */ ++ if (c == 0) ++ return *s == 0; ++ ++ /* '?' (or '%' or '#') matches any character (but not an empty string) */ ++ if (c == WILDCHR_SINGLE) { ++ if (wild_stop_at_dir) ++ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0; ++ else ++ return *s ? recmatch(p, s + CLEN(s), cs) : 0; ++ } + +- /* '*' matches any number of characters, including zero */ ++ /* WILDCHR_MULTI ('*') matches any number of characters, including zero */ + #ifdef AMIGA +- if (c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */ +- c = '*', p++; ++ if (!no_wild && c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */ ++ c = WILDCHR_MULTI, p++; + #endif /* AMIGA */ +- if (c == '*') { +-#ifdef WILD_STOP_AT_DIR +- if (sepc) { +- /* check for single "*" or double "**" */ +-# ifdef AMIGA +- if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */ +- c = '*', p++; +- if (c != '*') { +-# else /* !AMIGA */ +- if (*p != '*') { +-# endif /* ?AMIGA */ +- /* single "*": this doesn't match the dirsep character */ +- for (; *s && *s != (uch)sepc; INCSTR(s)) +- if ((c = recmatch(p, s, ic, sepc)) != 0) +- return (int)c; +- /* end of pattern: matched if at end of string, else continue */ +- if (*p == '\0') +- return (*s == 0); +- /* continue to match if at sepc in pattern, else give up */ +- return (*p == (uch)sepc || (*p == '\\' && p[1] == (uch)sepc)) +- ? recmatch(p, s, ic, sepc) : 2; +- } +- /* "**": this matches slashes */ +- ++p; /* move p behind the second '*' */ +- /* and continue with the non-W_flag code variant */ +- } +-#endif /* WILD_STOP_AT_DIR */ ++ if (!no_wild && c == WILDCHR_MULTI) ++ { ++ if (wild_stop_at_dir) { ++ /* Check for an immediately following WILDCHR_MULTI */ ++# ifdef AMIGA ++ if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */ ++ c = WILDCHR_MULTI, p++; ++ if (c != WILDCHR_MULTI) { ++# else /* !AMIGA */ ++ if (*p != WILDCHR_MULTI) { ++# endif /* ?AMIGA */ ++ /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */ ++ for (; *s && *s != DIRSEP_CHR; INCSTR(s)) ++ if ((c = recmatch(p, s, cs)) != 0) ++ return c; ++ /* end of pattern: matched if at end of string, else continue */ + if (*p == 0) +- return 1; +- if (isshexp((ZCONST char *)p) == NULL) { +- /* Optimization for rest of pattern being a literal string: +- * If there are no other shell expression chars in the rest +- * of the pattern behind the multi-char wildcard, then just +- * compare the literal string tail. +- */ +- ZCONST uch *srest; +- +- srest = s + (strlen((ZCONST char *)s) - strlen((ZCONST char *)p)); +- if (srest - s < 0) +- /* remaining literal string from pattern is longer than rest +- * of test string, there can't be a match +- */ +- return 0; +- else +- /* compare the remaining literal pattern string with the last +- * bytes of the test string to check for a match +- */ ++ return (*s == 0); ++ /* continue to match if at DIRSEP_CHR in pattern, else give up */ ++ return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR)) ++ ? recmatch(p, s, cs) : 2; ++ } ++ /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */ ++ p++; /* move p past the second WILDCHR_MULTI */ ++ /* continue with the normal non-WILD_STOP_AT_DIR code */ ++ } /* wild_stop_at_dir */ ++ ++ /* Not wild_stop_at_dir */ ++ if (*p == 0) ++ return 1; ++ if (!isshexp((char *)p)) ++ { ++ /* optimization for rest of pattern being a literal string */ ++ ++ /* optimization to handle patterns like *.txt */ ++ /* if the first char in the pattern is '*' and there */ ++ /* are no other shell expression chars, i.e. a literal string */ ++ /* then just compare the literal string at the end */ ++ ++ ZCONST char *srest; ++ ++ srest = s + (strlen(s) - strlen(p)); ++ if (srest - s < 0) ++ /* remaining literal string from pattern is longer than rest of ++ test string, there can't be a match ++ */ ++ return 0; ++ else ++ /* compare the remaining literal pattern string with the last bytes ++ of the test string to check for a match */ + #ifdef _MBCS +- { +- ZCONST uch *q = s; ++ { ++ ZCONST char *q = s; + +- /* MBCS-aware code must not scan backwards into a string from +- * the end. +- * So, we have to move forward by character from our well-known +- * character position s in the test string until we have +- * advanced to the srest position. +- */ +- while (q < srest) +- INCSTR(q); +- /* In case the byte *srest is a trailing byte of a multibyte +- * character in the test string s, we have actually advanced +- * past the position (srest). +- * For this case, the match has failed! +- */ +- if (q != srest) +- return 0; +- return ((ic +- ? namecmp((ZCONST char *)p, (ZCONST char *)q) +- : strcmp((ZCONST char *)p, (ZCONST char *)q) +- ) == 0); +- } ++ /* MBCS-aware code must not scan backwards into a string from ++ * the end. ++ * So, we have to move forward by character from our well-known ++ * character position s in the test string until we have advanced ++ * to the srest position. ++ */ ++ while (q < srest) ++ INCSTR(q); ++ /* In case the byte *srest is a trailing byte of a multibyte ++ * character, we have actually advanced past the position (srest). ++ * For this case, the match has failed! ++ */ ++ if (q != srest) ++ return 0; ++ return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0); ++ } + #else /* !_MBCS */ +- return ((ic +- ? namecmp((ZCONST char *)p, (ZCONST char *)srest) +- : strcmp((ZCONST char *)p, (ZCONST char *)srest) +- ) == 0); ++ return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0); + #endif /* ?_MBCS */ +- } else { +- /* pattern contains more wildcards, continue with recursion... */ +- for (; *s; INCSTR(s)) +- if ((c = recmatch(p, s, ic __WDL)) != 0) +- return (int)c; +- return 2; /* 2 means give up--match will return false */ +- } + } +- +- /* Parse and process the list of characters and ranges in brackets */ +- if (c == BEG_RANGE) { +- int e; /* flag true if next char to be taken literally */ +- ZCONST uch *q; /* pointer to end of [-] group */ +- int r; /* flag true to match anything but the range */ +- +- if (*s == 0) /* need a character to match */ +- return 0; +- p += (r = (*p == '!' || *p == '^')); /* see if reverse */ +- for (q = p, e = 0; *q; INCSTR(q)) /* find closing bracket */ +- if (e) +- e = 0; +- else +- if (*q == '\\') /* GRR: change to ^ for MS-DOS, OS/2? */ +- e = 1; +- else if (*q == END_RANGE) +- break; +- if (*q != END_RANGE) /* nothing matches if bad syntax */ +- return 0; +- for (c = 0, e = (*p == '-'); p < q; INCSTR(p)) { +- /* go through the list */ +- if (!e && *p == '\\') /* set escape flag if \ */ +- e = 1; +- else if (!e && *p == '-') /* set start of range if - */ +- c = *(p-1); +- else { +- unsigned int cc = Case(*s); +- +- if (*(p+1) != '-') +- for (c = c ? c : *p; c <= *p; c++) /* compare range */ +- if ((unsigned)Case(c) == cc) /* typecast for MSC bug */ +- return r ? 0 : recmatch(q + 1, s + 1, ic __WDL); +- c = e = 0; /* clear range, escape flags */ +- } +- } +- return r ? recmatch(q + CLEN(q), s + CLEN(s), ic __WDL) : 0; +- /* bracket match failed */ ++ else ++ { ++ /* pattern contains more wildcards, continue with recursion... */ ++ for (; *s; INCSTR(s)) ++ if ((c = recmatch(p, s, cs)) != 0) ++ return c; ++ return 2; /* 2 means give up--shmatch will return false */ + } ++ } + +- /* if escape ('\\'), just compare next character */ +- if (c == '\\' && (c = *p++) == 0) /* if \ at end, then syntax error */ +- return 0; ++#ifndef VMS /* No bracket matching in VMS */ ++ /* Parse and process the list of characters and ranges in brackets */ ++ if (!no_wild && allow_regex && c == '[') ++ { ++ int e; /* flag true if next char to be taken literally */ ++ ZCONST char *q; /* pointer to end of [-] group */ ++ int r; /* flag true to match anything but the range */ ++ ++ if (*s == 0) /* need a character to match */ ++ return 0; ++ p += (r = (*p == '!' || *p == '^')); /* see if reverse */ ++ for (q = p, e = 0; *q; q++) /* find closing bracket */ ++ if (e) ++ e = 0; ++ else ++ if (*q == '\\') ++ e = 1; ++ else if (*q == ']') ++ break; ++ if (*q != ']') /* nothing matches if bad syntax */ ++ return 0; ++ for (c = 0, e = *p == '-'; p < q; p++) /* go through the list */ ++ { ++ if (e == 0 && *p == '\\') /* set escape flag if \ */ ++ e = 1; ++ else if (e == 0 && *p == '-') /* set start of range if - */ ++ c = *(p-1); ++ else ++ { ++ uch cc = (cs ? (uch)*s : case_map((uch)*s)); ++ uch uc = (uch) c; ++ if (*(p+1) != '-') ++ for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++) ++ /* compare range */ ++ if ((cs ? uc : case_map(uc)) == cc) ++ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs); ++ c = e = 0; /* clear range, escape flags */ ++ } ++ } ++ return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0; ++ /* bracket match failed */ ++ } ++#endif /* !VMS */ + +- /* just a character--compare it */ +-#ifdef QDOS +- return QMatch(Case((uch)c), Case(*s)) ? +- recmatch(p, s + CLEN(s), ic __WDL) : 0; +-#else +- return Case((uch)c) == Case(*s) ? +- recmatch(p, s + CLEN(s), ic __WDL) : 0; +-#endif ++ /* If escape ('\'), just compare next character */ ++ if (!no_wild && c == '\\') ++ if ((c = *p++) == '\0') /* if \ at end, then syntax error */ ++ return 0; ++ ++#ifdef VMS ++ /* 2005-11-06 SMS. ++ Handle "..." wildcard in p with "." or "]" in s. ++ */ ++ if ((c == '.') && (*p == '.') && (*(p+ CLEN( p)) == '.') && ++ ((*s == '.') || (*s == ']'))) ++ { ++ /* Match "...]" with "]". Continue after "]" in both. */ ++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ ++ /* Else, look for a reduced match in s, until "]" in or end of s. */ ++ for (; *s && (*s != ']'); INCSTR(s)) ++ if (*s == '.') ++ /* If reduced match, then continue after "..." in p, "." in s. */ ++ if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0) ++ return (int)c; ++ ++ /* Match "...]" with "]". Continue after "]" in both. */ ++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ ++ /* No reduced match. Quit. */ ++ return 2; ++ } ++ ++#endif /* def VMS */ ++ ++ /* Just a character--compare it */ ++ return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ? ++ recmatch(p, s + CLEN(s), cs) : 0; ++} + +-} /* end function recmatch() */ + + + ++/*************************************************************************************************/ + static char *isshexp(p) + ZCONST char *p; + /* If p is a sh expression, a pointer to the first special character is diff --git a/mozilla-testing/icecat-i18n/Makefile b/mozilla-testing/icecat-i18n/Makefile new file mode 100644 index 000000000..5dd818e62 --- /dev/null +++ b/mozilla-testing/icecat-i18n/Makefile @@ -0,0 +1,33 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - grep +# - pacman +# - sed +# - wget + +pkgver=9.0.1 + +default: PHONY all +all: PHONY PKGBUILD +.PRECIOUS: PKGBUILD + +index.html: Makefile + rm -f $@ + wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ +langpacks.txt: index.html Makefile + egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ +PKGBUILD: langpacks.txt Makefile + sed \ + -e 's/^pkgver=.*/pkgver=$(pkgver)/' \ + -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \ + -e '/md5sums/,$$d' \ + $@ > $@.$$$$ && \ + makepkg -g >> $@.$$$$ && \ + mv $@.$$$$ $@ + +clean: PHONY + rm -f index.html langpacks.txt *.xpi + +.PHONY: PHONY FORCE diff --git a/mozilla-testing/icecat-i18n/PKGBUILD b/mozilla-testing/icecat-i18n/PKGBUILD new file mode 100644 index 000000000..117d6a6bf --- /dev/null +++ b/mozilla-testing/icecat-i18n/PKGBUILD @@ -0,0 +1,127 @@ +# Maintainer: fauno +# Contributor: Figue +# Based on firefox-i18n package + +# When updating to a newer upstream release: +# - Edit pkgver= in Makefile. +# - Run 'make'. It will take care of everything else for you. + +_langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) + +pkgbase='icecat-i18n' +pkgname=($(for lang in ${_langpacks[@]} + do echo icecat-i18n-$lang | tr A-Z a-z + done)) +_pkgver=9.0 +pkgver=9.0.1 +pkgrel=1 +pkgdesc="Language packs for GNUzilla IceCat." +arch=('any') +license=('MPL') +url="http://www.gnu.org/software/gnuzilla/" +depends=("icecat=${pkgver}") +source=($(for lang in ${_langpacks[@]} + do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi + done)) +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +build() { + cd "${srcdir}" +} + +_path="/usr/lib/icecat-$_pkgver/extensions/" + +for lang in ${_langpacks[@]} +do + eval " +package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + +md5sums=('20e67c29a5e666c102b04a1e60b7f5a6' + 'f2bb72158cd9a9e26d682dcdff297e86' + '31daa3abbe40461f5292b6521ba45179' + '38ed2043b03f27bf9c6c30956c90f0af' + 'c263a1d5a3560c9a4538561ebe1bd332' + '9e19e7a56922d3df37844067d6c59a23' + '665ae571412f563f562c556cb6790bca' + '598725cd42bad8beec856525cd9d85c0' + '3e45f1097a1453ef6f3615d5826ff508' + '8388434818c995ae50b977d2e7f36996' + 'fa0afac9df234a977fd8da2905c0eda2' + '258d9b993065f3860c2f8d79ed86aa20' + 'dadeb5e0e03ac6c4a58104ae60c4214a' + '17edd78ea185761e3ac1ab69947aa483' + '6544c77cb37f97e1eb5c9180902f9767' + '579a5a4f3a98f47cba481242faece354' + '7a47d59e8a90b852a852d3d8182636e3' + '5e5f806e1f6f386dddd32136a9ea0c44' + '5985bb817858d6fffad0158df60b926b' + '9a9048af47cf7e1eff4a901287321cbf' + 'ecf628acf988b4efee254f5dd43ed839' + '0879552d267febf40ab51a25fd56e126' + 'd0054611a7cb17f265bbbb2145fa24fd' + '86dc6ac2c9fa2d891449dc0fee74925d' + '672433eda992ca42468ce736fb679233' + '7c1722a1a7b36259b170c601122a025b' + 'd315044c39fa8e3e404355a12a065cf2' + '2e498d9076b814887f0da334fda1e289' + 'b4c42b439c3db8e77e53f2c0e03197cb' + '1c356d82117d92d19474ab0a6c804c6b' + 'bb2a2bc43106be951ef51b62719f1213' + 'eda3b14c45b3dd6cc95f93b5fa0fd6cf' + '5521ad4ab8cdf1f8863fc0f454c02ee2' + '38f8d1533f7d1a6123eb80555e719f6f' + '14bb8cf18b6d24f103da376c5d8580b5' + '1d0ea799b72c59b9a6922d66c84e63d2' + '57a457aaa98d7d93667cfce913632976' + '90d589d5cd4d199f579e882c1b1e9287' + 'a0d354fb2b69828777642ef5abd0e963' + 'cce959f03a6357ee7a1d2efc6c6af309' + '4c9b695d540fb5289600a089e2972aca' + 'f4e3330139f500b0e37207bd00ad7e81' + 'e41ca6ea7716bec98956a4138bb091ce' + 'd59931f40b6e62dc2899eff46da2ac1e' + 'b21a2c345c8c74d8c4da80273aecd083' + '147357710c4712439c646f18b27bf4d0' + 'f90e382593e105ff697145338162c64e' + 'c6517c6002fe56527b7a773b8060f553' + '52bd84145281204c23b3c608a597f9e8' + 'e79089b54a3c8401afc7fbd48565d373' + 'ce49b2490566964e786e2f8c03560bb8' + 'ec943a3e4e531f8295f03131f2056053' + '99ea4eaae77a8c680949e673ef5ff1b7' + '74f4139ea78aee64c054468d5cf5528b' + 'efbd2c801479fbfd82d3da168e582a67' + '490f7390148623d6e6805aa04c8dc6f3' + '5b51ca012f369e61d505d4f05342b1a7' + '90a9774bfe34428b915bda7f5701e8d9' + '784924bb0615debf3eba37ea9edced69' + 'b2be9f59bdf8c2d0e35a4ab2e944f73e' + '5607205459f9db6d229235070e45e866' + '396231537b4e51b15fa8c781deb27988' + '96274f3f8a2bb807f79e896e28132f58' + 'a31bc07e9bd969665dcf6fe99ac89415' + '29bb94f65797299ca5355f0cb64142aa' + '9f0d68e0fa81beb81a3f905118f02c55' + 'af200de2fc6126e10e73d81dd05047ea' + '60b7717d3306e2fb18b22804719d0fd2' + '15c789baa59d27786d6d1d4c4a7a24ee' + '48841ff67fee9f3e1f1ee8ff485a1bbc' + '77af86e85548ec10486d23c6e2436d46' + '3e6bee3482370be47fd3128f468b806f' + '36d41a4885ebf5d04548a9c38e2d2e9c' + 'fea6e7c1c9f743e348ee5409e0182693' + 'ddea2e6de27762f1ad505e6c43a87349' + '759c0a37cc97aac128b52ec14bc86bb6' + 'bc2e3922c92c3b4fe49fae5ef46a7f7b' + '0a6e0092e9c052b8571ba09bd40b6d4a' + 'db1c3a4581fc893deba60322350593fb' + 'b79bdfa5ef8c65de1787fe1be6c48afa' + 'e4878942c64c3b6da87a84bd87918511' + '77e7b5d62449d5be99865c8ba43183b8' + '878ab3f21c1ae1fef8eb1198ee3e9af6') diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD new file mode 100644 index 000000000..af040596a --- /dev/null +++ b/mozilla-testing/icecat/PKGBUILD @@ -0,0 +1,122 @@ +# Maintainer: Figue +# Contributor: Figue +# Contributor (Parabola): fauno +# Contributor (Parabola): vando +# Contributor (Parabola): Luke Shumaker +# Thank you very much to the older contributors: +# Contributor: evr +# Contributor: Muhammad 'MJ' Jassim + +# If you are updating this package, don't forget to update the version number in +# the value for 'browser.dictionaries.download.url' in 'libre.patch' + +pkgname=icecat +_pkgver=9.0 +pkgver=9.0.1 +pkgrel=1 +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/gnuzilla/" +license=('MPL' 'GPL' 'LGPL') +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'libidl2' + 'mesa' + 'p7zip-libre' + 'pkg-config' + 'python2' + 'wireless_tools' + 'xorg-server-xvfb' + 'yasm' + 'zip' +) +options=(!buildflags !distcc) +install=icecat.install +source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz + mozconfig + mozconfig.old + mozconfig.default + libre.patch + parabola.patch + icecat.desktop + icecat-safe.desktop) + +build() { + ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR + cd "${srcdir}/${pkgname}-${pkgver}" + + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff + patch -Np1 -i "$srcdir/parabola.patch" # Parabola settings + + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in + + export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR" + export PYTHON="/usr/bin/python2" + + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + kill $! || true +} + +package() { + ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR + cd "${srcdir}/${pkgname}-${pkgver}" + + make -j1 -f client.mk DESTDIR="$pkgdir" install + + msg2 "Finishing..." + install -m755 -d "${pkgdir}/usr/share/pixmaps" + install -m644 browser/branding/unofficial/default48.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + + install -m755 -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/icecat.desktop" "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/icecat-safe.desktop" "${pkgdir}/usr/share/applications" + + ln -s "${pkgname}-${pkgver}" "${pkgdir}/usr/lib/${pkgname}-${_pkgver}" # WHY???!!! + ln -s "${pkgname}-${_pkgver}" "${pkgdir}/usr/lib/${pkgname}" + + rm -rf "${pkgdir}${ICECATDIR}/"{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell "${pkgdir}${ICECATDIR}/dictionaries" + ln -sf /usr/share/hyphen "${pkgdir}${ICECATDIR}/hyphenation" + ln -sf /usr/lib/mozilla/plugins "${pkgdir}${ICECATDIR}/plugins" + ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}${ICECATDIR}/searchplugins" + + # We don't want the development stuff + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/${pkgname}-devel-${pkgver}" + rm -rf "${pkgdir}/usr/share/idl" + + # Workaround for now: + # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf "${ICECATDIR}/${pkgname}-bin" "${pkgdir}${ICECATDIR}/$pkgname" +} + +md5sums=('a135581da2fd2845f268d7ca91054c06' + '9c0cd5b45a3c4b04b872b6a900f62286' + '0e5057d9427c6cd5e2f3b78fe34f50d9' + '44959606e4a704e68a913e73fc941926' + '07e65752416e615fe04ce586bc58f86b' + '037b44b6e07d7115e0fb221d67b94272' + 'e81ad01dbc16ba28bf92ba4b7c309ca7' + 'd93fe402b87cd000a869e1fd6badc6c9') diff --git a/mozilla-testing/icecat/icecat-safe.desktop b/mozilla-testing/icecat/icecat-safe.desktop new file mode 100644 index 000000000..87acc970c --- /dev/null +++ b/mozilla-testing/icecat/icecat-safe.desktop @@ -0,0 +1,78 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/icecat -safe-mode %u +Icon=icecat +Type=Application +Terminal=false +MultipleArgs=false +Name=GNU IceCat - Safe Mode +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +MimeType=text/html +StartupNotify=false +Categories=Application;Network; diff --git a/mozilla-testing/icecat/icecat.desktop b/mozilla-testing/icecat/icecat.desktop new file mode 100644 index 000000000..8a7cad93d --- /dev/null +++ b/mozilla-testing/icecat/icecat.desktop @@ -0,0 +1,78 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/icecat %u +Icon=icecat +Type=Application +Terminal=false +MultipleArgs=false +Name=GNU IceCat +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +MimeType=text/html +StartupNotify=false +Categories=Application;Network; diff --git a/mozilla-testing/icecat/icecat.install b/mozilla-testing/icecat/icecat.install new file mode 100644 index 000000000..c1fe8284a --- /dev/null +++ b/mozilla-testing/icecat/icecat.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/mozilla-testing/icecat/libre.patch b/mozilla-testing/icecat/libre.patch new file mode 100644 index 000000000..c5f59d858 --- /dev/null +++ b/mozilla-testing/icecat/libre.patch @@ -0,0 +1,66 @@ +--- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-26 23:11:39.000000000 -0500 ++++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-26 23:12:15.000000000 -0500 +@@ -74,7 +76,7 @@ + pref("extensions.update.autoUpdateDefault", true); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/9.0.1/"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -876,7 +878,7 @@ + pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); + + // base url for the wifi geolocation network provider +-pref("geo.wifi.uri", "https://www.google.com/loc/json"); ++pref("geo.wifi.uri", "http://geomena.org"); + pref("geo.wifi.protocol", 0); + + // Whether to use a panel that looks like an OS X sheet for customization +--- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 07:34:23.000000000 -0500 ++++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 19:59:04.000000000 -0500 +@@ -1,27 +1,19 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Duck Duck Go (SSL) + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo ++browser.search.order.1=Duck Duck Go (SSL) ++browser.search.order.2=Duck Duck Go (Lite) + +-# This is the default set of web based feed handlers shown in the reader +-# selection UI +-browser.contentHandlers.types.0.title=Bloglines +-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s +-browser.contentHandlers.types.1.title=My Yahoo +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.2.title=Google +-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s + + # Keyword URL (for location bar searches) +-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= ++keyword.URL=https://duckduckgo.com/?q= + + # URL for site-specific search engines + # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site + # to be searched and the user's search query. Place them in the appropriate location + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +--- icecat-9.0.1.orig/browser/app/Makefile.in 2011-12-27 00:22:26.000000000 -0500 ++++ icecat-9.0.1/browser/app/Makefile.in 2011-12-27 00:23:10.000000000 -0500 +@@ -269,7 +269,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) + endif + endif + diff --git a/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig new file mode 100644 index 000000000..5a04038be --- /dev/null +++ b/mozilla-testing/icecat/mozconfig @@ -0,0 +1,92 @@ +# We are building the browser +ac_add_options --enable-application=browser +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +# Branding +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial + +# GNUzilla things +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Operating system things +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --with-pthreads + +ac_add_options --enable-toolkit-cairo-gtk2 +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-svg-renderer=cairo + +ac_add_options --disable-toolkit-qt + +ac_add_options --enable-system-cairo +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-system-bz2 +ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-png +ac_add_options --with-system-zlib + +ac_add_options --enable-freetype2 +ac_add_options --enable-pango +ac_add_options --enable-startup-notification + + +# Enable/Disable web technologies +ac_add_options --enable-canvas +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-smil +ac_add_options --enable-svg + +# Enable/Disable "user-y" features +ac_add_options --enable-extensions="default spellcheck" + +ac_add_options --disable-safe-browsing +ac_add_options --enable-url-classifier +ac_add_options --disable-chatzilla +ac_add_options --disable-accessibility +ac_add_options --disable-calendar +ac_add_options --disable-composer + +# Enable/Disable "system-y" features +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-updater + +ac_add_options --disable-gnomevfs +ac_add_options --disable-javaxpcom +ac_add_options --enable-gio +ac_add_options --enable-libnotify +ac_add_options --enable-printing +ac_add_options --enable-xinerama +ac_add_options --enable-xterm-updates + +# Build settings +ac_add_options --disable-mochitest +ac_add_options --disable-pedantic +ac_add_options --disable-static +ac_add_options --disable-tests +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-optimize +ac_add_options --enable-strip + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default new file mode 100644 index 000000000..21aaa0edd --- /dev/null +++ b/mozilla-testing/icecat/mozconfig.default @@ -0,0 +1,70 @@ +# This is a better commented version of the default .mozconfig from 9.0.1 + +# We are building the browser +ac_add_options --enable-application=browser +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +# Branding +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial + +# GNUzilla things +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Operating system things +ac_add_options --prefix=/usr/local +#ac_add_options --with-default-mozilla-five-home=/usr/local/lib +#ac_add_options --with-pthreads + +ac_add_options --enable-toolkit-cairo-gtk2 +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-svg-renderer=cairo + +ac_add_options --disable-toolkit-qt + +ac_add_options --disable-system-cairo +ac_add_options --with-system-jpeg +#ac_add_options --with-system-png +ac_add_options --with-system-zlib + +ac_add_options --enable-freetype2 +ac_add_options --enable-pango + +# Enable/Disable web technologies +ac_add_options --enable-crypto +#ac_add_options --enable-postscript +ac_add_options --enable-svg +ac_add_options --enable-xft + +# Enable/Disable "user-y" features +ac_add_options --enable-extensions="default spellcheck" + +ac_add_options --disable-chatzilla +ac_add_options --disable-accessibility +ac_add_options --disable-calendar +ac_add_options --disable-composer + +# Enable/Disable "system-y" features +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-updater + +#ac_add_options --disable-jsd +#ac_add_options --disable-libxul +ac_add_options --disable-ipc +ac_add_options --disable-ldap +ac_add_options --disable-mailnews +ac_add_options --disable-negotiateauth +ac_add_options --disable-profilesharing +ac_add_options --disable-xinerama +ac_add_options --disable-xprint + +# Build settings +ac_add_options --disable-elf-dynstr-gc +ac_add_options --disable-mochitest +ac_add_options --disable-tests +ac_add_options --enable-optimize="-pipe -O3" +ac_add_options --enable-strip diff --git a/mozilla-testing/icecat/mozconfig.old b/mozilla-testing/icecat/mozconfig.old new file mode 100644 index 000000000..3ae3e1c2e --- /dev/null +++ b/mozilla-testing/icecat/mozconfig.old @@ -0,0 +1,85 @@ +# This is a better commented version of the .mozconfig used by the Parabola +# package < v9 + +# We are building the browser +. $topsrcdir/browser/config/mozconfig + +# Branding +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial + +# GNUzilla things +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Operating system things +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --with-pthreads + +ac_add_options --enable-default-toolkit=cairo-gtk2 + + +ac_add_options --enable-system-cairo +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --with-system-bz2 +ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-png +ac_add_options --with-system-zlib + +ac_add_options --enable-pango +ac_add_options --enable-startup-notification + + +# Enable/Disable web technologies +ac_add_options --enable-canvas +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-smil +ac_add_options --enable-svg + +# Enable/Disable "user-y" features +ac_add_options --enable-extensions=default + +ac_add_options --disable-safe-browsing +ac_add_options --enable-url-classifier + +# Enable/Disable "system-y" features +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --disable-update + +ac_add_options --disable-gnomevfs +ac_add_options --disable-javaxpcom +ac_add_options --enable-gio +ac_add_options --enable-libnotify +ac_add_options --enable-printing +ac_add_options --enable-xinerama +ac_add_options --enable-xterm-updates + +# Build settings +ac_add_options --disable-mochitest +ac_add_options --disable-pedantic +ac_add_options --disable-static +ac_add_options --disable-tests +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-optimize +ac_add_options --enable-strip + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/mozilla-testing/icecat/parabola.patch b/mozilla-testing/icecat/parabola.patch new file mode 100644 index 000000000..b8000c3ea --- /dev/null +++ b/mozilla-testing/icecat/parabola.patch @@ -0,0 +1,22 @@ +diff -ru icecat-9.0.1.orig/browser/app/profile/firefox.js icecat-9.0.1/browser/app/profile/firefox.js +--- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-27 00:11:30.000000000 -0500 ++++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-27 00:11:39.000000000 -0500 +@@ -48,6 +48,8 @@ + #endif + #endif + ++pref("general.startup.browser", true); ++ + pref("browser.chromeURL","chrome://browser/content/"); + pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul"); + +@@ -487,6 +489,9 @@ + pref("browser.gesture.twist.left", ""); + pref("browser.gesture.tap", "cmd_fullZoomReset"); + ++// Use LANG environment variable to choose locale ++pref("intl.locale.matchOS", true); ++ + // 0=lines, 1=pages, 2=history , 3=text size + #ifdef XP_MACOSX + // On OS X, if the wheel has one axis only, shift+wheel comes through as a diff --git a/mozilla-testing/iceweasel-i18n/Makefile b/mozilla-testing/iceweasel-i18n/Makefile new file mode 100644 index 000000000..a0a767c3d --- /dev/null +++ b/mozilla-testing/iceweasel-i18n/Makefile @@ -0,0 +1,36 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - pacman +# - sed + +default: PHONY all +all: PHONY + $(MAKE) clean + $(MAKE) PKGBUILD +.PRECIOUS: PKGBUILD + +PKGBUILD.g: Makefile + sed \ + -e '/This line is here/,$$d' \ + -e 's/^pkgname=/_pkgname=/' \ + PKGBUILD > $@ + echo 'pkgname=foo' >> $@ + echo 'package() { exit 0; }' >> $@ + makepkg -gp $@ >> $@ +langpacks.txt: PKGBUILD.g Makefile + makepkg -dp $< + ls src/*/upstream | sed 's/\.xpi//' > $@ +PKGBUILD: langpacks.txt Makefile + sed \ + -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \ + -e '/md5sums/,$$d' \ + $@ > $@.$$$$ && \ + makepkg -g >> $@.$$$$ && \ + mv $@.$$$$ $@ + +clean: PHONY + rm -f PKGBUILD.g langpacks.txt + +.PHONY: PHONY FORCE diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD new file mode 100644 index 000000000..45555b019 --- /dev/null +++ b/mozilla-testing/iceweasel-i18n/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Luke Shumaker + +# When updating to a newer upstream release: +# - Update pkgver= and _deb*= below. +# - Run "make". This will do everything else for you. + +# We're getting this from Debian Sid +_debname=iceweasel-l10n +_debver=9.0+debian +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=(af ak ar ast as be bg bn-BD bn-IN br bs ca cs cy da de dz-BT el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa-IR fa fi fr fur-IT fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja ka kk kn ko ku lg lt lv mai mk ml mn mr nb-NO ne-NP nl nn-NO nso oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) + +pkgbase=iceweasel-i18n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=9.0 +pkgver=${_debver}.${_debrel} +pkgrel=1 + + +pkgdesc="Language packs for Debian Iceweasel." +arch=('any') +url="http://www.geticeweasel.org/" +license=('MPL') +depends=("iceweasel=${_pkgver}") +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz") +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +build() { + cd "${srcdir}" + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + cd "${_debname}-${_debver}" + patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff" +} + +_path="/usr/lib/iceweasel-${_pkgver}/extensions" + +# This line is here for auto-regeneration purposes. DO NOT EDIT! + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + +md5sums=('d0dc0653b9d7642e6d346b54fb1782ae' + '493920a716fa40daeb5bd8cdfdbfe6a6') diff --git a/mozilla-testing/iceweasel/PKGBUILD b/mozilla-testing/iceweasel/PKGBUILD new file mode 100644 index 000000000..992476d43 --- /dev/null +++ b/mozilla-testing/iceweasel/PKGBUILD @@ -0,0 +1,135 @@ +# Maintainer: Luke Shumaker +# Contributor: Henry Jensen + +# We're getting this from Debian Sid +_debname=iceweasel +_debver=9.0.1 +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=iceweasel +pkgname=iceweasel +_pkgver=9.0 +pkgver=${_debver}.${_debrel} +pkgrel=1 + +pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." +arch=('i586' 'i686' 'x86_64' 'mips64el') +url="http://www.geticeweasel.org/" +license=('GPL2' 'MPL' 'LGPL') +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'libidl2' + 'mesa' + 'p7zip-libre' + 'pkg-config' + 'python2' + 'quilt' + 'wireless_tools' + 'yasm' + 'zip' +) +options=(!buildflags !distcc) +install=iceweasel.install +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + mozconfig + libre.patch + # Default configuration + mozilla-firefox-1.0-lang.patch + xulrunner-copy-stub.patch + region.properties) + +build() { + msg2 "Applying Debian patches..." + cd "${srcdir}" + # 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}" + quilt push -a + find .pc -name .timestamp -delete # why isn't --no-timestamps doing this? + + # This will make life more sane + cd "${srcdir}" + ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}" + + msg2 "Starting normal build..." + cd "${srcdir}/${_pkgname}-${pkgver}/" + patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch" + patch -p1 -i "${srcdir}/libre.patch" + + cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ + + msg2 "Starting build..." + + cp "${srcdir}/mozconfig" .mozconfig + #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + ./configure + #touch config* + make MOZ_MAKE_FLAGS="${MAKEFLAGS}" + + msg2 "Build complete" +} + +package() { + + cd "${srcdir}/${_pkgname}-${pkgver}/" + #make -j1 -f client.mk DESTDIR="${pkgdir}" install + make install DESTDIR="${pkgdir}" + + msg2 "Finishing..." + + install -m755 -d ${pkgdir}/usr/share/applications + install -m755 -d ${pkgdir}/usr/share/pixmaps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps + + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1 + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png + install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg + + + rm -rf ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins + ln -sf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins + + rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver} + rm -rvf ${pkgdir}/usr/include + +} + +md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d' + '6cde9fe38df1434fdcc0f3a078b0238e' + '5e2574eef71ee1437e2f8e7481c67893' + '9609e77182cc300e3fe9d4b0c7e7efb4' + 'bd5db57c23c72a02a489592644f18995' + 'a485a2b5dc544a8a2bd40c985d2e5813' + 'f1c76e7e244257856a386ca2de69bdf0') diff --git a/mozilla-testing/iceweasel/iceweasel.install b/mozilla-testing/iceweasel/iceweasel.install new file mode 100644 index 000000000..376600ec2 --- /dev/null +++ b/mozilla-testing/iceweasel/iceweasel.install @@ -0,0 +1,21 @@ +#[ "${ICDIR}" = "" ] && ICECATDIR="/usr/lib/icecat" +post_install () { + echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session" + echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/iceweasel* directories" + update-desktop-database -q +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} + +#op=$1 +#shift + +#$op $* diff --git a/mozilla-testing/iceweasel/libre.patch b/mozilla-testing/iceweasel/libre.patch new file mode 100644 index 000000000..e29e22a67 --- /dev/null +++ b/mozilla-testing/iceweasel/libre.patch @@ -0,0 +1,391 @@ +diff -urN iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-21 12:55:22.404066176 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 12:55:28.116066178 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -235,7 +235,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -325,7 +325,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -564,7 +564,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:35.104062780 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // The first character after a period must be alphabetic. + +-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); ++pref("keyword.URL", "http://duckduckgo.com/?q="); + pref("keyword.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js +--- iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-16 20:29:37.000000000 +0000 ++++ iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:43.184062783 +0000 +@@ -47,7 +47,7 @@ + // SYNTAX HINTS: dashes are delimiters. Use underscores instead. + // The first character after a period must be alphabetic. + +-pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); ++pref("keyword.URL", "http://duckduckgo.com/?q="); + pref("keyword.enabled", false); + pref("general.useragent.locale", "chrome://global/locale/intl.properties"); + pref("general.useragent.compatMode.firefox", false); +diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browser/app/profile/firefox.js +--- iceweasel-9.0-orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000 ++++ iceweasel-9.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000 +@@ -57,10 +57,10 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", ""); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -234,7 +234,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:blank"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -324,7 +324,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -563,7 +563,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/browser/base/content/syncSetup.js +--- iceweasel-9.0-orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000 +@@ -59,7 +59,7 @@ + // Broader than we'd like, but after this changed from api-secure.recaptcha.net + // we had no choice. At least we only do this for the duration of setup. + // See discussion in Bugs 508112 and 653307. +-const RECAPTCHA_DOMAIN = "https://www.google.com"; ++const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com"; + + Cu.import("resource://services-sync/main.js"); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties +--- iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google ++browser.search.order.1=DuckDuckGo + browser.search.order.2=Yahoo + browser.search.order.3=Bing + +@@ -17,7 +17,7 @@ + # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site + # to be searched and the user's search query. Place them in the appropriate location + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in +--- iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000 +@@ -11,14 +11,12 @@ +

@bookmarks_toolbarfolder@

+
@bookmarks_toolbarfolder_description@ +

+-

@getting_started@ +-
@latest_headlines@ ++
ConnochaetOS +

+

@firefox_heading@

+

+-

@firefox_help@ +-
@firefox_customize@ +-
@firefox_community@ +-
@firefox_about@ ++
Free Software Foundation ++
LibrePlanet ++
Free addons +

+

+diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html +--- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +@@ -143,7 +143,7 @@ +

+

+ <a> anchor
+- <a> a + href ++ <a> a + href +

+

+ <abbr> abbr - extended text when mouseover.
+diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul +--- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 ++++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 +@@ -301,6 +301,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + + +- ++ +