From 342100843ef3e4379443c526403fac1b1cb6416a Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 Dec 2011 23:14:57 +0000 Subject: Mon Dec 26 23:14:57 UTC 2011 --- community/jack2/PKGBUILD | 32 +- community/linphone/PKGBUILD | 10 +- community/redis/PKGBUILD | 6 +- community/setconf/PKGBUILD | 16 +- extra/gcin/PKGBUILD | 6 +- extra/icedtea-web-java7/PKGBUILD | 36 +- extra/icedtea-web/PKGBUILD | 25 +- extra/mediastreamer/PKGBUILD | 25 +- extra/ntp/PKGBUILD | 10 +- extra/ortp/PKGBUILD | 15 +- ~lukeshu/iceweasel-libre-current/PKGBUILD | 124 +++++++ .../iceweasel-libre-current/arch-linux-wiki.xml | 12 + .../iceweasel-libre-current/duck-duck-go-lite.xml | 8 + .../iceweasel-libre-current/duck-duck-go-ssl.xml | 8 + ~lukeshu/iceweasel-libre-current/iceweasel.install | 21 ++ .../iceweasel-libre-current/internet-archive.xml | 12 + ~lukeshu/iceweasel-libre-current/jamendo-en.xml | 12 + ~lukeshu/iceweasel-libre-current/libre.patch | 391 +++++++++++++++++++++ .../iceweasel-libre-current/logless-search.xml | 8 + ~lukeshu/iceweasel-libre-current/mozconfig | 39 ++ .../mozilla-firefox-1.0-lang.patch | 12 + ~lukeshu/iceweasel-libre-current/region.properties | 23 ++ .../scroogle-ssl-english.xml | 14 + .../xulrunner-copy-stub.patch | 11 + ~lukeshu/iceweasel-libre-current/yacy.xml | 9 + ~lukeshu/xml2rfc/PKGBUILD | 35 ++ 26 files changed, 809 insertions(+), 111 deletions(-) create mode 100644 ~lukeshu/iceweasel-libre-current/PKGBUILD create mode 100644 ~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml create mode 100644 ~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml create mode 100644 ~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml create mode 100644 ~lukeshu/iceweasel-libre-current/iceweasel.install create mode 100644 ~lukeshu/iceweasel-libre-current/internet-archive.xml create mode 100644 ~lukeshu/iceweasel-libre-current/jamendo-en.xml create mode 100644 ~lukeshu/iceweasel-libre-current/libre.patch create mode 100644 ~lukeshu/iceweasel-libre-current/logless-search.xml create mode 100644 ~lukeshu/iceweasel-libre-current/mozconfig create mode 100644 ~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch create mode 100644 ~lukeshu/iceweasel-libre-current/region.properties create mode 100644 ~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml create mode 100644 ~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch create mode 100644 ~lukeshu/iceweasel-libre-current/yacy.xml create mode 100644 ~lukeshu/xml2rfc/PKGBUILD diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index c6b75a3b4..9507e7317 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60072 2011-12-04 18:08:53Z schiv $ +# $Id: PKGBUILD 61228 2011-12-25 08:59:30Z schiv $ # Maintainer: Ray Rashif # Contributor: Daniele Paolella # Contributor: Philipp Überbacher @@ -8,18 +8,18 @@ pkgbase=jack2 pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack -pkgver=1.9.7 -pkgrel=3 +pkgver=1.9.8 +pkgrel=1 arch=('i686' 'x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') makedepends=('python2' 'doxygen' 'libffado' 'libsamplerate' 'dbus-core' 'celt') -source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2" +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" '99-audio.conf' '40-hpet-permissions.rules') -md5sums=('9759670feecbd43eeccf1c0f743ec199' +md5sums=('1dd2ff054cab79dfc11d134756f27165' 'ae65b7c9ebe0fff6c918ba9d97ae342d' '471aad533ff56c5d3cbbf65ce32cadef') @@ -40,7 +40,7 @@ _isbuild() { } build() { - cd "$srcdir" + cd "$srcdir/$_tarname-$pkgver" # fix doxygen building sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript @@ -68,19 +68,17 @@ build() { } package_jack2() { - ! _isbuild jack2 && return + ! _isbuild jack2 && return 0 pkgdesc="The next-generation JACK with SMP support" - depends=('libsamplerate') + depends=('libsamplerate' 'celt') optdepends=('libffado: FireWire support' - 'celt: NetJACK2 driver' 'dbus-core: jackdbus' 'python2: jack_control') conflicts=('jack') - provides=('jack' 'jack-audio-connection-kit' - 'jackmp' 'jackdmp' 'jackdbus') + provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') - cd "$srcdir/$_tarname-$pkgver" + cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver" python2 waf install --destdir="$pkgdir" @@ -97,18 +95,16 @@ package_jack2() { } package_jack2-dbus() { - ! _isbuild jack2-dbus && return + ! _isbuild jack2-dbus && return 0 pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" - depends=('libsamplerate' 'dbus-core') + depends=('libsamplerate' 'celt' 'dbus-core') optdepends=('libffado: FireWire support' - 'celt: NetJACK2 driver' 'python2: jack_control') conflicts=('jack' 'jack2') - provides=('jack' 'jack2' 'jack-audio-connection-kit' - 'jackmp' 'jackdmp' 'jackdbus') + provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') - cd "$srcdir/$_tarname-dbus-$pkgver" + cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver" python2 waf install --destdir="$pkgdir" diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 66da29a14..6680f0732 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 61187 2011-12-23 22:08:05Z spupykin $ +# $Id: PKGBUILD 61230 2011-12-25 16:57:49Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Darwin Bautista pkgname=linphone pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64') url="http://www.linphone.org/index.php/eng" license=('GPL') depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils' - 'libpulse' 'libxv') -# 'mediastreamer' 'ortp') + 'libpulse' 'libxv' 'mediastreamer' 'ortp') makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite') optdepends=('pulseaudio') options=('!libtool' '!emptydirs') -conflicts=('ortp' 'mediastreamer') source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz") md5sums=('ad89cd6030a131f2b17ea50eb6f4c6f2') @@ -26,7 +24,7 @@ build() { ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \ --enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \ --libexecdir=/usr/lib/$pkgname \ - --disable-external-mediastreamer --disable-external-ortp + --enable-external-mediastreamer --enable-external-ortp make } diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index e81aad219..44788d319 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59579 2011-11-28 12:47:33Z spupykin $ +# $Id: PKGBUILD 61232 2011-12-25 17:05:47Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan-Erik Rediger # Contributor: nofxx .com> pkgname=redis -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('8aec2c38b7d70956688cbfe3a99495fa' +md5sums=('babeb1a1d05281b5e00ca0a519cfc3f9' '9726d06d0a0c60cb5d55a31b3dc1e55d' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index ba7b6d89a..ab8c8cddc 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 59692 2011-11-29 12:22:12Z arodseth $ +# $Id: PKGBUILD 61248 2011-12-26 01:05:59Z arodseth $ # Maintainer: Alexander Rødseth pkgname=setconf -pkgver=0.2 -pkgrel=8 -pkgdesc="A utility to easily change settings in Makefiles and other configuration files" +pkgver=0.3 +pkgrel=1 +pkgdesc="Utility to easily change settings in Makefiles and other configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" license=('GPL') depends=('pcre' 'gc') makedepends=('shedskin>=0.1.2') -md5sums=('ccd0ca9527d8406d5393d77a6a56686b') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") +sha256sums=('94d37bcc74d59dfa60770308e2ab3b669dc2e0716a23fda584bf71cf037f1183') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,10 +23,8 @@ package() { cd "$srcdir/$pkgname-$pkgver" install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$pkgname.1.gz" \ - "$pkgdir/usr/share/man/man1/$pkgname.1.gz" - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } # vim:set ts=2 sw=2 et: diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 68698540a..283dac499 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145630 2011-12-24 17:43:03Z bisson $ +# $Id: PKGBUILD 145643 2011-12-26 03:52:35Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andreas Radke # Contributor: damir pkgname=gcin -pkgver=2.6.6 +pkgver=2.6.7 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=('ef2ba1af83ce5f25cf54a7d3e84a5739d3a9e5e0' +sha1sums=('aae215a830783a97a007e75487d57314b0ee205a' '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70') install=install diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index d5424ed9e..076ebcaab 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,42 +4,23 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.1.4 -#_date=20110925 -#pkgrel=0.${_date}.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'xulrunner') -source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz - http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz - #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz - icedtea-web-1.1.4-npapi-fix.patch) -md5sums=('1ed24b7e58da26471187dfae80b020b6' - '81ac36e05ea1b55f1580bdb28c24f4db') +makedepends=('jdk7-openjdk' 'zip' 'gtk' 'npapi-sdk' 'rhino' 'junit') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +md5sums=('1ed24b7e58da26471187dfae80b020b6') + _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk -mksource() { - mkdir /tmp/${pkgbase}-${_date} - pushd /tmp/${pkgbase}-${_date} - hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date} - rm -rf ${pkgbase}-${_date}/.hg* - tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz * - popd -} - build() { - cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + cd "${srcdir}"/icedtea-web* . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - #autoreconf --force --install - - # fix build with Xulrunner 8 - patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch - ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ --with-jdk-home=${_jvmdir} @@ -47,7 +28,7 @@ build() { } check() { - cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" + cd "${srcdir}"/icedtea-web* make -k check } @@ -88,8 +69,7 @@ package_icedtea-web-java7-doc() { pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}" -# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib + cd "${srcdir}"/icedtea-web* make DESTDIR="${pkgdir}" install-data-local # remove javaws about and man page rm -rf ${pkgdir}/usr/lib diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index f2e20860c..e63f555f8 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,28 +1,22 @@ -# $Id: PKGBUILD 142413 2011-11-09 05:54:47Z andyrtr $ +# $Id: PKGBUILD 145641 2011-12-25 14:34:47Z andyrtr $ # Maintainer: Andreas Radke pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') pkgver=1.1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('openjdk6' 'zip' 'xulrunner') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - icedtea-web-1.1.4-npapi-fix.patch) -md5sums=('1ed24b7e58da26471187dfae80b020b6' - '81ac36e05ea1b55f1580bdb28c24f4db') +makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +md5sums=('1ed24b7e58da26471187dfae80b020b6') -build() { _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk +build() { cd "$srcdir/$pkgname-$pkgver" - - # fix build with Xulrunner 8 - patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch - ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make @@ -40,9 +34,6 @@ package_icedtea-web() { depends=('openjdk6' 'gtk2' 'desktop-file-utils') install=$pkgname.install - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - cd "$srcdir/$pkgname-$pkgver" # possible make target (see bottom of Makefile.am: install-exec-local install-data-local make DESTDIR="$pkgdir" install-exec-local install-data-local @@ -73,11 +64,7 @@ package_icedtea-web-doc() { pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - cd "$srcdir/$pkgbase-$pkgver" -# install -m755 -d $pkgdir/${_jvmdir}/jre/lib make DESTDIR="$pkgdir" install-data-local # remove javaws about and man page rm -rf ${pkgdir}/usr/lib diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 3c3b7637a..1f81cc302 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,30 +1,27 @@ -# $Id: PKGBUILD 142632 2011-11-12 17:15:28Z ibiru $ +# $Id: PKGBUILD 145637 2011-12-25 11:01:07Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Sergej Pupykin # Contributor: Adrià Arrufat pkgname=mediastreamer -pkgver=2.7.3 -pkgrel=4 +pkgver=2.8.0 +pkgrel=1 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') -makedepends=('cmake' 'automoc4') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "disable-v4l1.patch") -md5sums=('5213307f557d86aa648f1a53a885138c' - '7ee15689eed1adbdcf0ddab8fadca34a') +depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') +makedepends=('intltool') +#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('79f6e4d927ebf15e9967511d8a88ce74') options=('!libtool') build() { - cd "${srcdir}"/$pkgname-$pkgver/ - patch -p2 -i "${srcdir}"/disable-v4l1.patch - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/mediastreamer/ + cd "${srcdir}"/$pkgname-$pkgver + ./autogen.sh + ./configure --prefix=/usr make } diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index dd7707d9f..f72d52b7a 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143934 2011-11-30 21:30:13Z andrea $ +# $Id: PKGBUILD 145633 2011-12-25 10:45:15Z bisson $ # Maintainer: Gaetan Bisson # Contributor: kevin pkgname=ntp -pkgver=4.2.6.p4 -_realver=4.2.6p4 -pkgrel=2 +pkgver=4.2.6.p5 +_realver=4.2.6p5 +pkgrel=1 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -18,7 +18,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" 'ntpdate' 'ntp.conf' 'ntpd.conf') -sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' +sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' '97b41b8bc34f259f4e525ab2e58707c9724e72e2' '63572457586379aa6bf75b6e899e71d651e643f4' 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e' diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD index ca983cbd3..714abfcc5 100644 --- a/extra/ortp/PKGBUILD +++ b/extra/ortp/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 117400 2011-04-01 15:13:40Z andrea $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 145635 2011-12-25 10:59:41Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino # Contributor: Jaroslaw Swierczynski # Contributor: William Rea pkgname=ortp -pkgver=0.16.5 +pkgver=0.18.0 pkgrel=1 pkgdesc="A Real-time Transport Protocol (RTP) library" arch=('i686' 'x86_64') url="http://www.linphone.org/index.php/eng/code_review/ortp" license=('LGPL') -depends=('openssl') +depends=('glibc') options=('!libtool') -source=("http://ftp.cc.uoc.gr/mirrors/nongnu.org/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz") -md5sums=('94546901d14b85f97342f4ecf39489b1') +#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz") +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('cc319356d2b548e5777feef90ae23bac') build() { cd ${srcdir}/${pkgname}-${pkgver} + ./autogen.sh ./configure --prefix=/usr make } diff --git a/~lukeshu/iceweasel-libre-current/PKGBUILD b/~lukeshu/iceweasel-libre-current/PKGBUILD new file mode 100644 index 000000000..b09d42d90 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/PKGBUILD @@ -0,0 +1,124 @@ +# Maintainer: Henry Jensen +# Contributor: Luke Shumaker + +_pkgname=iceweasel +_pkgver=9.0 +_debver=9.0.1 +_debrel='1~bpo60+1' # bpo=backport (from sid to sqeeze) +_repo_url=http://mozilla.debian.net/pool/iceweasel-release/i/iceweasel + +pkgname=$_pkgname-libre-current +pkgver=${_debver}.${_debrel} +pkgrel=1 + +pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." +arch=('i586' 'i686' 'x86_64') +url="http://www.geticeweasel.org/" +license=('GPL2' 'MPL' 'LGPL') +depends=('desktop-file-utils') +makedepends=('zip' 'pkg-config' 'diffutils' 'python' 'wireless_tools' 'yasm' 'mesa' 'quilt') +provides=("${_pkgname}") +conflicts=('firefox' 'icecat' "${_pkgname}") +replaces=('firefox' 'icecat') +install=iceweasel.install +source=("${_repo_url}/iceweasel_${_debver}.orig.tar.bz2" + "${_repo_url}/iceweasel_${_debver}-${_debrel}.debian.tar.gz" + mozconfig + libre.patch + # Search engines + arch-linux-wiki.xml + internet-archive.xml + jamendo-en.xml + logless-search.xml + scroogle-ssl-english.xml + yacy.xml + duck-duck-go-ssl.xml + duck-duck-go-lite.xml + # 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 iceweasel_${_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 "${_pkgname}-${_debver}" + mv debian "${_pkgname}-${_debver}" + cd "${_pkgname}-${_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 "${_pkgname}-${_debver}" "${_pkgname}-${pkgver}" + + msg2 "Applying Parabola/ConnochaetOS patches..." + 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 + + + msg2 "Removing proprietary and anti-privacy search engines" + rm -f ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml + msg2 "And provide better ones..." + install -m755 -d ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/ + install -m644 ${srcdir}/*.xml ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/ + rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver} + rm -rvf ${pkgdir}/usr/include + +} + +md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d' + '8846b9cce4ce7a82ec9995510efce867' + '5e2574eef71ee1437e2f8e7481c67893' + '9609e77182cc300e3fe9d4b0c7e7efb4' + '3403175087e584a8c5e840cc62310cd9' + '462c68585461f8cdc23c93c46f6ee4cf' + '2d492295c4308f9bba9ece28d8b3af2d' + '937ac0e5392b060d93bd33e761fbfa51' + 'cf97082e77e3ef5f1bd74b1db9329965' + '24528ca3f7f1e1a0ba735231aa3ac1de' + 'c5f00b6b24222aacd5a749d1f59c4d24' + 'e1bda0854de7d764f7401c81bb82b5ef' + 'bd5db57c23c72a02a489592644f18995' + 'a485a2b5dc544a8a2bd40c985d2e5813' + 'f1c76e7e244257856a386ca2de69bdf0') diff --git a/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml new file mode 100644 index 000000000..9e21b92e2 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml @@ -0,0 +1,12 @@ + +Arch Linux Wiki +searches on the arch linux wiki +UTF-8 +data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG8SURBVDiNjZM/iBNBFMZ/MzvJunfmYFfwtjgbEzk4jhSKoNa2goiNaGXhCaYRDAiHNlprcYuVhaCNWIj4BxSusBJRhNtDRTF6nCkWPUQMJJe4s2PhBhIvE/yaebz3vY/fDIwwxmBTGMX7JwtSNRbmX9g8yrr9V+ccISYAa4CwEey6sbpDCJpFR6rZwJ19fLzyeZRP2pIni3LBU3IbGNVJs/M2nzXAU3K3pySeknTS7OTZZ+v+fwccuvPhqOuIV64Sy56S9LTxm796i6O8W95g3633xcBTDWOYSY35kRl8bYzwHNkqFWX5/rHy97EEgafqEwU54yqBMQRdnYnf2rCps1JHm0tjCeZuvpvaE7hrG+3U/9rq0dPDdK4jWlOuU1k9PfdtJMGmzupvkrbf+NntLz8A7vbnXW1KG530wkiCMIp3Ag1gez57lNSqR/LZbeBU3m8D5aRWTf4luDywDPBwoH6anwb4AtSHrhBGcRk4w7A+DdRv+8SAC9wbCgCuAoW8XgOuAR8HAprAdWAdqADLYRSfABDTSyt7gdfAE+BKUqu+ZIzCKD4ILAKHgXkxvbRyEXie1KrWHzcm6MAfcSib4f24CrwAAAAASUVORK5CYII= +7 +http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.xml +http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.png +http://wiki.archlinux.org/index.php/Main_Page + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml new file mode 100644 index 000000000..3142d3410 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml @@ -0,0 +1,8 @@ + +Duck Duck Go (Lite) +Search Duck Duck Go (Lite) +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml new file mode 100644 index 000000000..4fb1391ab --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml @@ -0,0 +1,8 @@ + +Duck Duck Go (SSL) +Search Duck Duck Go (SSL) +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/iceweasel.install b/~lukeshu/iceweasel-libre-current/iceweasel.install new file mode 100644 index 000000000..376600ec2 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/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/~lukeshu/iceweasel-libre-current/internet-archive.xml b/~lukeshu/iceweasel-libre-current/internet-archive.xml new file mode 100644 index 000000000..1556a2d8c --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/internet-archive.xml @@ -0,0 +1,12 @@ + +Internet Archive +Search www.archive.org +ISO-8859-1 +data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7 +7 +http://mycroft.mozdev.org/update.php/id0/archive.src +http://mycroft.mozdev.org/update.php/id0/archive.gif +http://www.archive.org/ + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/jamendo-en.xml b/~lukeshu/iceweasel-libre-current/jamendo-en.xml new file mode 100644 index 000000000..91d6df6e4 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/jamendo-en.xml @@ -0,0 +1,12 @@ + +Jamendo (en) +Search Jamendo.com English site for downloadable Creative Commons music +UTF-8 +data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg== +7 +http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml +http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico +http://www.jamendo.com/en + + + \ No newline at end of file diff --git a/~lukeshu/iceweasel-libre-current/libre.patch b/~lukeshu/iceweasel-libre-current/libre.patch new file mode 100644 index 000000000..e29e22a67 --- /dev/null +++ b/~lukeshu/iceweasel-libre-current/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;"/> + + +- ++ +