summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/claws-mail-libre/PKGBUILD96
-rw-r--r--libre/claws-mail-libre/claws-mail.install15
-rwxr-xr-xlibre/clementine-libre/PKGBUILD8
-rwxr-xr-xlibre/clementine-libre/remove-and-disable-spotify.patch8
-rwxr-xr-xlibre/cups-filters-libre/PKGBUILD8
-rwxr-xr-xlibre/hplip-libre/PKGBUILD42
-rw-r--r--libre/hplip-libre/cups-1.6-buildfix.diff392
-rwxr-xr-xlibre/iceape-i18n/PKGBUILD4
-rwxr-xr-xlibre/iceape-libre/PKGBUILD2
-rwxr-xr-xlibre/iceape-libre/libre.patch67
-rwxr-xr-xlibre/icecat/PKGBUILD4
-rwxr-xr-xlibre/icecat/libre.patch133
-rwxr-xr-xlibre/iceweasel-i18n/PKGBUILD182
-rw-r--r--[-rwxr-xr-x]libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch0
-rwxr-xr-xlibre/iceweasel-libre/PKGBUILD10
-rwxr-xr-xlibre/iceweasel-libre/libre.patch24
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD2
-rw-r--r--libre/mozilla-searchplugins/PKGBUILD10
-rw-r--r--libre/mozilla-searchplugins/duckduckgo-html.xml8
-rw-r--r--libre/mozilla-searchplugins/duckduckgo-lite.xml8
-rw-r--r--libre/tokyocabinet/PKGBUILD9
-rw-r--r--[-rwxr-xr-x]libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch0
-rwxr-xr-xlibre/xulrunner-libre/PKGBUILD17
-rw-r--r--libre/xulrunner-libre/shared-libs.patch12
24 files changed, 766 insertions, 295 deletions
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
new file mode 100644
index 000000000..38533f59b
--- /dev/null
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=claws-mail
+pkgname=claws-mail-libre
+pkgflag=-libre
+pkgver=3.9.0
+pkgrel=1
+pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+license=GPL3
+url="http://www.$pkgbase.org"
+depends=(
+ db
+ dbus-glib
+ desktop-file-utils
+ enchant
+ gnutls
+ gpgme
+ gtk2
+ hicolor-icon-theme
+ 'libetpan>=1.1'
+ libsm
+ startup-notification
+)
+makedepends=(
+ bogofilter
+ compface
+ spamassassin
+ valgrind
+)
+optdepends=(
+ 'python2: needed for some tools'
+ 'perl: needed for some tools'
+ 'spamassassin: adds support for spamfiltering'
+ 'bogofilter: adds support for spamfiltering'
+)
+provides=(
+ claws
+ $pkgbase
+)
+conflicts=(
+ $pkgbase
+)
+replaces=(
+ $pkgbase
+ sylpheed-claws
+)
+options=(
+ '!libtool'
+)
+install=$pkgbase.install
+source=(
+ http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgbase-$pkgver.tar.bz2
+)
+md5sums=(
+ 4c5ac7b21f0ed17d0f6404124c2229a4
+)
+
+build() {
+ cd $srcdir/$pkgbase-$pkgver
+
+ sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+
+ setarch $CARCH ./configure --prefix=/usr\
+ --disable-dillo-viewer-plugin\
+ --disable-static\
+ --enable-bogofilter-plugin\
+ --enable-crash-dialog\
+ --enable-enchant\
+ --enable-gnutls\
+ --enable-jpilot\
+ --enable-ldap\
+ --enable-pgpmime-plugin\
+ --enable-spamassassin-plugin
+
+ setarch $CARCH make
+}
+
+package() {
+ cd $srcdir/$pkgbase-$pkgver
+ setarch $CARCH make DESTDIR=$pkgdir install
+
+ # build and install extra tools
+ cd tools
+ setarch $CARCH make
+ # all executables and .conf files ; only top directory
+ find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
+ install -D -m755 $i $pkgdir/usr/lib/$pkgbase/tools/$i
+ done
+}
diff --git a/libre/claws-mail-libre/claws-mail.install b/libre/claws-mail-libre/claws-mail.install
new file mode 100644
index 000000000..94313db3a
--- /dev/null
+++ b/libre/claws-mail-libre/claws-mail.install
@@ -0,0 +1,15 @@
+post_install() {
+ echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+}
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 7c231fe27..053a38d1e 100755
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -8,7 +8,7 @@
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.1.1
-pkgrel=1
+pkgrel=1.1
pkgdesc="A music player and library organizer, without spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
@@ -27,7 +27,7 @@ provides=("clementine=$pkgver")
source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
remove-and-disable-spotify.patch)
sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e'
- '3980a00c02e406226f0d08ae9b7e581702c89838')
+ '4d336b6a42100a268e4d905b9596453f396fb649')
install=clementine.install
build() {
@@ -44,7 +44,9 @@ build() {
rm -v data/icons/svg/spotify.svg
rm -v data/schema/schema-30.sql
rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
-
+
+ # Create a blank file due that is a dependency for clementine
+ touch data/schema/schema-30.sql
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
make
diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-and-disable-spotify.patch
index e006e14c5..a9352b275 100755
--- a/libre/clementine-libre/remove-and-disable-spotify.patch
+++ b/libre/clementine-libre/remove-and-disable-spotify.patch
@@ -121,14 +121,6 @@ diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
<file>icons/48x48/view-choose.png</file>
<file>icons/48x48/view-fullscreen.png</file>
<file>icons/48x48/view-media-equalizer.png</file>
-@@ -318,7 +314,6 @@
- <file>schema/schema-28.sql</file>
- <file>schema/schema-29.sql</file>
- <file>schema/schema-2.sql</file>
-- <file>schema/schema-30.sql</file>
- <file>schema/schema-31.sql</file>
- <file>schema/schema-32.sql</file>
- <file>schema/schema-33.sql</file>
@@ -339,7 +334,6 @@
<file>smartplaylistsearchterm.css</file>
<file>songinfo.css</file>
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index addf86ef3..84b4d0cd1 100755
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 166387 2012-09-07 13:33:10Z andyrtr $
+# $Id: PKGBUILD 172123 2012-11-29 18:28:53Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters-libre
_pkgname=cups-filters
-pkgver=1.0.24
+pkgver=1.0.25
pkgrel=1
pkgdesc="OpenPrinting CUPS Filters"
arch=('i686' 'x86_64')
url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
license=('GPL')
-depends=('lcms2' 'poppler>=0.20.3' 'qpdf')
+depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
@@ -17,7 +17,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
backup=(etc/fonts/conf.d/99pdftoopvp.conf)
options=(!libtool)
source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=('242ea48cd41f8546d71b00bf2b06c564')
+md5sums=('9690028c5e312b086e7572ae1899a33c')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index aa7dea706..069fa612d 100755
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
+# Contributor : Rémy Oudompheng <remy@archlinux.org>
# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
_pkgname=hplip
pkgname=hplip-libre
-pkgver=3.12.6
-pkgrel=3
+pkgver=3.12.11
+pkgrel=2
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
arch=('i686' 'x86_64')
url="http://hplipopensource.com"
license=('GPL')
depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
- 'net-snmp>=5.7.1')
+ 'net-snmp>=5.7.1' 'wget')
makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
optdepends=('cups: for printing support'
'python2-dbus: for dbus support'
'sane: for scanner support'
- 'python-imaging: for commandline scanning support'
- 'python-notify: for Desktop notification support'
+ 'python2-imaging: for commandline scanning support'
+ 'python2-notify: for Desktop notification support'
'rpcbind: for network support'
'python2-pyqt: for running hp-toolbox'
'python2-gobject2: for running hp-toolbox'
@@ -29,16 +29,19 @@ conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
options=('!libtool')
install=hplip.install
-source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('5303938e8630775ea6fb383af85775e5'
- 'b562457e4c713d8609b3d6dd2be10baf')
+source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
+ cups-1.6-buildfix.diff)
build() {
cd "$srcdir/$_pkgname-$pkgver"
+
+ # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
+ patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
+
export PYTHON=python2
find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py
sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
sed -i 's|python ./print.py|python2 ./print.py|' scan.py
sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
@@ -46,7 +49,9 @@ build() {
sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
+ # fix rc script path - FS#31921
+ sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py
+
# https://bugs.archlinux.org/task/30085 - hack found in Gentoo
# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
# The hpcups driver does not use foomatic-rip
@@ -78,13 +83,16 @@ build() {
}
package() {
- cd "$srcdir/$_pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ #cd "$srcdir/$_pkgname-$pkgver"
+ cd "$srcdir/$_pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
# remove config provided by sane and autostart of hp-daemon
rm -rf "$pkgdir"/etc/{sane.d,xdg}
# remove HAL .fdi file because HAL is no longer used
rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
}
+md5sums=('6caadc4a9e49076c284b146e2dce2937'
+ '835d3b854d097f229a32291338fa2320'
+ 'ef64578c6cb3ce252dbdcb0f1c2f4a47')
diff --git a/libre/hplip-libre/cups-1.6-buildfix.diff b/libre/hplip-libre/cups-1.6-buildfix.diff
new file mode 100644
index 000000000..8341a1610
--- /dev/null
+++ b/libre/hplip-libre/cups-1.6-buildfix.diff
@@ -0,0 +1,392 @@
+diff -up hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors hplip-3.12.6/prnt/cupsext/cupsext.c
+--- hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors 2012-06-18 12:41:19.000000000 +0200
++++ hplip-3.12.6/prnt/cupsext/cupsext.c 2012-07-19 17:11:47.606524137 +0200
+@@ -87,6 +87,46 @@ typedef int Py_ssize_t;
+ #define PY_SSIZE_T_MIN INT_MIN
+ #endif
+
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr) attr->num_values
++#define ippGetGroupTag(attr) attr->group_tag
++#define ippGetValueTag(attr) attr->value_tag
++#define ippGetName(attr) attr->name
++#define ippGetBoolean(attr, element) attr->values[element].boolean
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetStatusCode(ipp) ipp->request.status.status_code
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
++{
++ if (!ipp)
++ return (NULL);
++ return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
++{
++ if (!ipp || !ipp->current)
++ return (NULL);
++ return (ipp->current = ipp->current->next);
++}
++
++static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
++{
++ ipp->request.op.operation_id = op;
++ return (1);
++}
++
++static int ippSetRequestId( ipp_t *ipp, int request_id )
++{
++ ipp->request.any.request_id = request_id;
++ return (1);
++}
++#endif
+
+ int g_num_options = 0;
+ cups_option_t * g_options;
+@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self,
+ request = ippNew();
+ language = cupsLangDefault();
+
+- request->request.op.operation_id = CUPS_GET_PRINTERS;
+- request->request.any.request_id = 1;
++ ippSetOperation( request, CUPS_GET_PRINTERS );
++ ippSetRequestId ( request, 1);
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+ "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self,
+ ipp_pstate_t state;
+ int i = 0;
+
+- for ( attr = response->attrs; attr != NULL; attr = attr->next )
++ for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
+ {
+- while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
+- attr = attr->next;
++ while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
++ attr = ippNextAttribute( response );
+
+ if ( attr == NULL )
+ break;
+@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self,
+ state = IPP_PRINTER_IDLE;
+ accepting = 0;
+
+- while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
++ while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
+ {
+- if ( strcmp( attr->name, "printer-name" ) == 0 &&
+- attr->value_tag == IPP_TAG_NAME )
+- name = attr->values[ 0 ].string.text;
+-
+- else if ( strcmp( attr->name, "device-uri" ) == 0 &&
+- attr->value_tag == IPP_TAG_URI )
+- device_uri = attr->values[ 0 ].string.text;
+-
+- else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
+- attr->value_tag == IPP_TAG_URI )
+- printer_uri = attr->values[ 0 ].string.text;
+-
+- else if ( strcmp( attr->name, "printer-info" ) == 0 &&
+- attr->value_tag == IPP_TAG_TEXT )
+- info = attr->values[ 0 ].string.text;
+-
+- else if ( strcmp( attr->name, "printer-location" ) == 0 &&
+- attr->value_tag == IPP_TAG_TEXT )
+- location = attr->values[ 0 ].string.text;
+-
+- else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
+- attr->value_tag == IPP_TAG_TEXT )
+- make_model = attr->values[ 0 ].string.text;
+-
+- else if ( strcmp( attr->name, "printer-state" ) == 0 &&
+- attr->value_tag == IPP_TAG_ENUM )
+- state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
+-
+- else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+- attr->value_tag == IPP_TAG_BOOLEAN)
+- accepting = attr->values[ 0 ].boolean;
++ if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
++ ippGetValueTag( attr ) == IPP_TAG_NAME )
++ name = ippGetString( attr, 0, NULL );
++
++ else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
++ ippGetValueTag( attr ) == IPP_TAG_URI )
++ device_uri = ippGetString( attr, 0, NULL );
++
++ else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
++ ippGetValueTag( attr ) == IPP_TAG_URI )
++ printer_uri = ippGetString( attr, 0, NULL );
++
++ else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
++ ippGetValueTag( attr ) == IPP_TAG_TEXT )
++ info = ippGetString( attr, 0, NULL );
++
++ else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
++ ippGetValueTag( attr ) == IPP_TAG_TEXT )
++ location = ippGetString( attr, 0, NULL );
++
++ else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
++ ippGetValueTag( attr ) == IPP_TAG_TEXT )
++ make_model = ippGetString( attr, 0, NULL );
++
++ else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
++ ippGetValueTag( attr ) == IPP_TAG_ENUM )
++ state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
++
++ else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
++ ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
++ accepting = ippGetBoolean( attr, 0 );
+
+- attr = attr->next;
++ attr = ippNextAttribute( response );
+ }
+
+ if ( device_uri == NULL )
+@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self,
+ request = ippNew();
+ language = cupsLangDefault();
+
+- request->request.op.operation_id = CUPS_ADD_PRINTER;
+- request->request.any.request_id = 1;
++ ippSetOperation( request, CUPS_ADD_PRINTER );
++ ippSetRequestId ( request, 1 );
+
+ ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+ "attributes-charset", NULL, cupsLangEncoding( language ) );
+@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self,
+ }
+ else
+ {
+- status = response->request.status.status_code;
++ status = ippGetStatusCode( response );
+ //ippDelete( response );
+ r = 1;
+ }
+@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self,
+ */
+ request = ippNew();
+
+- request->request.op.operation_id = CUPS_DELETE_PRINTER;
+- request->request.op.request_id = 1;
++ ippSetOperation( request, CUPS_DELETE_PRINTER );
++ ippSetRequestId ( request, 1 );
+
+ language = cupsLangDefault();
+
+@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self,
+ */
+ response = cupsDoRequest( http, request, "/admin/" );
+
+- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
++ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+ {
+ r = 1;
+ }
+@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject *
+
+ request = ippNew();
+
+- request->request.op.operation_id = CUPS_SET_DEFAULT;
+- request->request.op.request_id = 1;
++ ippSetOperation( request, CUPS_SET_DEFAULT );
++ ippSetRequestId ( request, 1 );
+
+ language = cupsLangDefault();
+
+@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject *
+
+ response = cupsDoRequest( http, request, "/admin/" );
+
+- if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
++ if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
+ {
+ r = 1;
+ }
+@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * se
+
+ request = ippNew();
+
+- request->request.op.operation_id = op;
+- request->request.op.request_id = 1;
++ ippSetOperation( request, op );
++ ippSetRequestId ( request, 1 );
+
+ language = cupsLangDefault();
+
+@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * se
+
+ response = cupsDoRequest(http, request, "/admin/");
+
+- if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
++ if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
+ {
+ r = 1;
+ }
+@@ -837,7 +877,7 @@ abort:
+ if ( response != NULL )
+ ippDelete( response );
+
+- return Py_BuildValue( "i", r );;
++ return Py_BuildValue( "i", r );
+ }
+
+
+@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self,
+
+ request = ippNew();
+
+- request->request.op.operation_id = CUPS_GET_PPDS;
+- request->request.op.request_id = 1;
++ ippSetOperation( request, CUPS_GET_PPDS );
++ ippSetRequestId ( request, 1 );
+
+ language = cupsLangDefault();
+
+@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self,
+ if ((response = cupsDoRequest(http, request, "/")) != NULL)
+ {
+
+- for (attr = response->attrs; attr; attr = attr->next)
++ for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
+ {
+ PyObject *dict;
+ char *ppdname = NULL;
+
+- while (attr && attr->group_tag != IPP_TAG_PRINTER)
+- attr = attr->next;
++ while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
++ attr = ippNextAttribute( response );
+
+ if (!attr)
+ break;
+
+ dict = PyDict_New ();
+
+- for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
++ for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
+ {
+ PyObject *val = NULL;
+
+- if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
++ if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
+ {
+- ppdname = attr->values[0].string.text;
++ ppdname = ippGetString( attr, 0, NULL );
+
+ //sprintf( buf, "print '%s'", ppdname);
+ //PyRun_SimpleString( buf );
+ }
+
+- else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
+- //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
+- // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
+- // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
+- // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
++ else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
++ //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
++ // (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
++ // (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
++ // (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
+ {
+- val = PyObj_from_UTF8(attr->values[0].string.text);
++ val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
+ }
+
+ if (val)
+ {
+- PyDict_SetItemString (dict, attr->name, val);
++ PyDict_SetItemString (dict, ippGetName( attr ), val);
+ Py_DECREF (val);
+ }
+ }
+diff -up hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors hplip-3.12.6/scan/sane/hpaio.c
+--- hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors 2012-06-18 12:42:51.000000000 +0200
++++ hplip-3.12.6/scan/sane/hpaio.c 2012-07-19 17:12:34.557848760 +0200
+@@ -47,6 +47,43 @@
+ #define DEBUG_DECLARE_ONLY
+ #include "sanei_debug.h"
+
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetGroupTag(attr) attr->group_tag
++#define ippGetValueTag(attr) attr->value_tag
++#define ippGetName(attr) attr->name
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
++{
++ if (!ipp)
++ return (NULL);
++ return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
++{
++ if (!ipp || !ipp->current)
++ return (NULL);
++ return (ipp->current = ipp->current->next);
++}
++
++static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
++{
++ ipp->request.op.operation_id = op;
++ return (1);
++}
++
++static int ippSetRequestId( ipp_t *ipp, int request_id )
++{
++ ipp->request.any.request_id = request_id;
++ return (1);
++}
++#endif
++
+ static SANE_Device **DeviceList = NULL;
+
+ static int AddDeviceList(char *uri, char *model, SANE_Device ***pd)
+@@ -186,8 +223,8 @@ static int GetCupsPrinters(char ***print
+ /* Assemble the IPP request */
+ request = ippNew();
+
+- request->request.op.operation_id = CUPS_GET_PRINTERS;
+- request->request.any.request_id = 1;
++ ippSetOperation( request, CUPS_GET_PRINTERS );
++ ippSetRequestId( request, 1 );
+
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en");
+@@ -197,20 +234,20 @@ static int GetCupsPrinters(char ***print
+ if ((response = cupsDoRequest(http, request, "/")) == NULL)
+ goto bugout;
+
+- for (attr = response->attrs; attr != NULL; attr = attr->next)
++ for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response ))
+ {
+ /* Skip leading attributes until we hit a printer. */
+- while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
+- attr = attr->next;
++ while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
++ attr = ippNextAttribute( response );
+
+ if (attr == NULL)
+ break;
+
+- while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
++ while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER)
+ {
+- if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0)
++ if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0)
+ cnt++;
+- attr = attr->next;
++ attr = ippNextAttribute( response );
+ }
+
+ if (attr == NULL)
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 815f0e340..ef9906627 100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -24,13 +24,13 @@ pkgname=($(for lang in ${_langpacks[@]}
done))
_pkgver=2.7.11
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="Language packs for Debian Iceape."
arch=('any')
url="http://packages.debian.org/source/sid/iceape"
license=('MPL')
-depends=("iceape-libre>=$_pkgver")
+depends=("iceape-libre>=$pkgver")
source=()
for lang in ${_langpacks[@]}
do
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2325b8cd7..2595a36f9 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- 'ed7a06c9e73a9f3e023d7bff9878504b')
+ 'ebe66195898c89644138ffc88ba26a24')
build() {
export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index 9947b1bbe..6273a05a9 100755
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -1,28 +1,24 @@
--- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-02-16 12:08:39.000000000 -0200
-+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 23:23:02.484406177 -0300
-@@ -1,23 +1,23 @@
++++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-29 22:19:37.998383034 -0200
+@@ -1,23 +1,16 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (HTML)
++browser.search.defaultenginename=DuckDuckGo HTML
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
-browser.search.order.3=Bing
-+browser.search.order.1=Duck Duck Go (HTML)
-+browser.search.order.2=Seeks Search
-+browser.search.order.3=YaCy
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+-
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
-browser.contentHandlers.types.0.title=Google
-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
-browser.contentHandlers.types.1.title=My Yahoo!
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -33,25 +29,20 @@
# 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
-@@ -27,19 +27,19 @@
+@@ -26,20 +19,10 @@
+ # don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=3
- # The default set of protocol handlers for webcal:
+-# The default set of protocol handlers for webcal:
-gecko.handlerService.schemes.webcal.0.name=30 Boxes
-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
-
- # The default set of protocol handlers for mailto:
+-
+-# The default set of protocol handlers for mailto:
-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
-
+-
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
@@ -118,9 +109,9 @@
</wizardpage>
</wizard>
---- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:28:27.000000000 -0300
-+++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-06-16 00:52:31.135268099 -0300
-@@ -4,10 +4,10 @@
+--- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 21:25:41.879931999 -0200
++++ comm-release/suite/locales/en-US/chrome/browser/region.properties 2012-11-29 22:25:15.125790092 -0200
+@@ -4,18 +4,11 @@
#
browser.startup.homepage=about:
browser.throbber.url=about:
@@ -129,35 +120,31 @@
-browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
-browser.translation.serviceDomain=translate.google.com
-+browser.translation.service=about:blank
++browser.translation.service=about:
+browser.translation.serviceDomain=
#config.js
#
-@@ -15,7 +15,7 @@
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+ startup.homepage_override_url=about:
+-
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
-browser.contentHandlers.types.0.title=Google
-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
-browser.contentHandlers.types.1.title=My Yahoo!
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
--- comm-release.orig/suite/locales/en-US/chrome/common/region.properties 2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-06-15 23:46:27.744272972 -0300
++++ comm-release/suite/locales/en-US/chrome/common/region.properties 2012-11-29 22:26:25.271781371 -0200
@@ -1,10 +1,10 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (HTML)
++browser.search.defaultenginename=DuckDuckGo HTML
# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
-+browser.search.order.1=Duck Duck Go (HTML)
-+browser.search.order.2=Seeks Search
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
# More information about this update link available in the update wizard.
# Only change this if you are providing localized release notes.
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index cb4ef9688..822f800f2 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,7 +16,7 @@
_pgo=false
pkgname=icecat
pkgver=14.0
-pkgrel=3
+pkgrel=4
pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
arch=(i686 x86_64 mips64el)
license=(GPL2 MPL LGPL)
@@ -79,7 +79,7 @@ md5sums=(
3117865902d1a20ab61d75707be9888e
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
- 0fe48b455f9b0ad7993071cd766b3bbf
+ 0119cc83435b192e78160f97ad2da9ea
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index b5a9acc0b..1f0d4306e 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,3 +1,10 @@
+diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties
+--- a/browser/branding/unofficial/locales/browserconfig.properties
++++ b/browser/branding/unofficial/locales/browserconfig.properties
+@@ -1,2 +1,2 @@
+ # Do NOT localize or otherwise change these values
+-browser.startup.homepage=http://gnuzilla.gnu.org
++browser.startup.homepage=about:home
diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -9,15 +16,6 @@ diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
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");
-@@ -87,7 +88,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://www.gnu.org/software/gnuzilla/addons.html");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/abouthome/aboutHome.js
@@ -129,47 +127,39 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
@@ -143,7 +45,7 @@
// The <a/> part of the snippet will be linked to the corresponding url.
const DEFAULT_SNIPPETS_URLS = [
-- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
+ "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
-+ "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1"
+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
];
const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -1,28 +1,28 @@
+--- a/browser/locales/en-US/chrome/browser-region/region.properties 2012-08-21 21:53:59.000000000 -0300
++++ b/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-30 01:17:50.561255302 -0200
+@@ -1,28 +1,16 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (HTML)
++browser.search.defaultenginename=DuckDuckGo HTML
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Duck Duck Go
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-+browser.search.order.1=Duck Duck Go (HTML)
-+browser.search.order.2=Seeks Search
-+browser.search.order.3=YaCy
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+-
+-# 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
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
-+browser.contentHandlers.types.2.title=
-+browser.contentHandlers.types.2.uri=about:blank
-
- # Keyword URL (for location bar searches)
+-
+-# 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/html/?q=
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -180,21 +170,11 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
# 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
-@@ -30,3 +30,21 @@
+@@ -30,3 +18,11 @@
# means that it's not possible to update the name of existing handler, so
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=3
+
-+# The default set of protocol handlers for webcal:
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
-+
-+# The default set of protocol handlers for mailto:
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
-+
+# The default set of protocol handlers for irc:
+gecko.handlerService.schemes.irc.0.name=Freenode
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
@@ -291,52 +271,49 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
---- a/mobile/locales/en-US/chrome/region.properties
-+++ b/mobile/locales/en-US/chrome/region.properties
-@@ -1,18 +1,18 @@
+--- a/mobile/locales/en-US/chrome/region.properties 2012-08-21 21:53:59.000000000 -0300
++++ b/mobile/locales/en-US/chrome/region.properties 2012-11-30 01:12:12.823875656 -0200
+@@ -1,18 +1,8 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (HTML)
++browser.search.defaultenginename=DuckDuckGo HTML
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (HTML)
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+-
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
-browser.contentHandlers.types.0.title=My Yahoo
-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
-browser.contentHandlers.types.1.title=Google
-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
-
- # Keyword URL (for location bar searches)
+-
+-# Keyword URL (for location bar searches)
-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/html/?q=
++browser.search.order.1=DuckDuckGo HTML
# 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
-@@ -22,11 +20,11 @@
+@@ -21,12 +11,10 @@
+ # don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=2
- # The default set of protocol handlers for webcal:
+-# The default set of protocol handlers for webcal:
-gecko.handlerService.schemes.webcal.0.name=30 Boxes
-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
-
- # The default set of protocol handlers for mailto:
+-
+-# The default set of protocol handlers for mailto:
-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
++# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
++
++# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
--- a/mobile/xul/app/mobile.js
+++ b/mobile/xul/app/mobile.js
@@ -366,7 +343,7 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
pref("keyword.enabled", true);
-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL","https://duckduckgo.com/html/?q=");
++pref("keyword.URL","");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -378,27 +355,7 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
*/
-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL","https://duckduckgo.com/html/?q=");
++pref("keyword.URL","");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
-diff -Naur a/toolkit/locales/en-US/chrome/global-region/region.properties b/toolkit/locales/en-US/chrome/global-region/region.properties
---- a/toolkit/locales/en-US/chrome/global-region/region.properties
-+++ b/toolkit/locales/en-US/chrome/global-region/region.properties
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
-
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=
-+more_plugins_url=about:blank
-+pluginupdates_label=
-+pluginupdates_url=about:blank
-+plugindoc_label=
-+plugindoc_url=about:blank
-
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 406cb3c32..3476c68f5 100755
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,7 +9,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=17.0
+_debver=17.0.1
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=17.0
+_pkgver=17.0.1
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -28,7 +28,7 @@ pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
url="http://www.geticeweasel.org/"
license=('MPL')
-depends=("iceweasel-libre>=$_pkgver")
+depends=("iceweasel-libre>=$pkgver")
source=()
for lang in ${_langpacks[@]}
do
@@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('aca195b6aa9da7fbf568c08f66f966f2'
- 'e026ffecfd999b9ec8a38f3f2f29f4b5'
- '4e1e3a700a7c64556fe7281447b2ee08'
- '68586be8b467b4faf8e0822817a8a844'
- '0855365b830c4558ec23b0976d258356'
- '0e4857a39eab45b03607f0a18d469be6'
- '3d47320eb012880e38344237cd2ee1ff'
- 'd37290ecae4792f97302347c2d9b72fa'
- 'ff8b22a9853a0876b42254dc856f8222'
- '1d57aefb5d8200756e5751b6b660ba69'
- 'b527326e74cb330a0e2ec36f47930e90'
- '8a4ad51e5a9328b3437a5b1dc0ecf613'
- 'c58a6d0ae9bc48d01775f91d84c8afda'
- '01ffe65230eaf9551ea45d6d2d607cdc'
- '735c3e03920964711b9914710fe37b56'
- 'e25a3627c72b4e7a52bf00ccc087aa69'
- 'f576d51ac7fa505133f75634af3a14dc'
- 'd82798c091826fcff1552240669bf72d'
- 'cdd5ec962ed5507eb63ff3cb42f77e19'
- '8ff7b9281ffecc76831315ce3423db93'
- 'e53f4816e34487e6c659dff373aae482'
- 'cf7793dfcbf18d97ffd7168228767da8'
- '20ca3aee8bf43c675f7fb160f5f3359e'
- '228e40322a1fcf6fed867fec81b7c702'
- 'a17b3619eeb977c11e5f99b527c26c12'
- '180b5a570d1117d0f08c7ca9f43e9796'
- 'c1a2dc0954ec3d58de0b46f9efb56c86'
- 'df546f876542bd474656fc27bfea8afe'
- 'fdb7d6212ed888759422222018289c27'
- 'af55d3b4ab09fefde72a14f2d869bedb'
- 'a0235aace986ccf2f66b8f7e3b7878af'
- '4550a84b0884a7eb2530031b8cf7bd13'
- '1a81ba0771c82680cb10182247503703'
- '99950e68df786e47b896e784bd749d53'
- '81f8ff7132d27e04ef18e743aeb7e6b5'
- 'bffdcadd6c0e44013eca8d3cb3ff4e91'
- '44726dde95fb92a9c96de3424784b420'
- 'e70e64366cb381b583e19945ec78f465'
- '38fcd722bc60540ecb347b52237595d2'
- 'dfcc1dad5e95a1460737c70ccd4b5735'
- '941183e99dc85e6b8a834a52f101784a'
- 'eb2e91b9991161891d039eb4c40a25a3'
- '7c509a226c72005e5c9bf4e83bb80abf'
- 'cf7ce1659ee0af3fd6e9fccf6b0b7d62'
- 'ab47d4c2d8ecf8c9a093529edc4cdd17'
- '236cfdaa476eabe1d89e5d03ae83c5f0'
- 'ab572cadb8b952aa0d165ff796f92084'
- '8c7396b7010b6afe8b1cc5625405762c'
- '2adac2f2c2bfc1216b3d7e3944e5a6c5'
- 'fc544cdd63ce46d72694f296b90e807d'
- '46ebea9850dd4f8b5bc8134b0e00fa88'
- '8459c0e2ee2ad97b8828b3ae458c7a30'
- '212ad5e037ae26e06a29e96076a46d88'
- '483f0bc2b12782d93aff4ebd6c9d72bc'
- '69331b072dc1978c7aedc05105b3dab7'
- '9c325dc249e935e32c1bf573a8bf8a03'
- 'dc065160d7d7109aca5e5abee88a38dd'
- '63e0f6e5123b976ba91679e4b0668117'
- '670301325560f01a65a1516c063ba0ab'
- 'bf5754aa9937ca01796724bad4128348'
- 'd37a9af438ede3c95c4147776c1881c7'
- '00b6aa1338665c1ddd830332eba3e869'
- 'fd6df56ae64208669b771cd44edbdf22'
- 'd28ba0c094d0ac6ca8839b6f24b8e36d'
- 'ddb04a9c43a0a7e3a410a56292abeab0'
- '195d2b735f34c04505ca68c0f614805a'
- '6fc7618c6bd4143a8f1e58a560b7a9b2'
- 'aa1558345b96e6cc3b0c9c22fe3540a8'
- '37a43a703b46f3275f960abd9852bae3'
- '523d2d66af36dbd862156fefd183169a'
- 'af4e4651a8e379d9ca151ae3180d4090'
- '79240b7df3c53d122ddf7c734e83fdfa'
- '4bc316dfd0cbb235e787f031155a70f4'
- 'e04f0b6cb1c79345a989feeaba6adba0'
- '4d294d9984a14c7f703a9e92a5144de9'
- 'b1d70ed8d43a3655c2134c7ee32552b3'
- '4b0decc563ef2f308cb76691e7a20ef6'
- 'eec9a1717554a85671d4971757cb302d'
- '588bb4c21d74f3db326ca527dc9fe593'
- '704173008a109a4ca888bce6abdd1ea0'
- '8c230dd567c576ca9e2d7cd40923623c'
- '6dd510df2583839646268121db4ee517'
- '2b915a4d899364934bc04e3ffe693279'
- '3ac196603d06fa52746c56b431f0778d'
- '90ff7e2af56d59cefb941043e6bcd5d5'
- '77a39f2723940c6312798c65dbb602dc'
- 'd7fe6dded2ac3aa1dc697e3b46c8d4d5'
- 'feff9895b8d7678e208947c40c7f53e0') \ No newline at end of file
+md5sums=('9d0c6dcde68b688ba613c9704dad8cf6'
+ 'c3f7acd38f4fd0810a8bbc9c1a1ef990'
+ 'c806782ef309ecac56b0e736081555ac'
+ '41f9def213a2de76687be9bd36341c71'
+ '2aafaa1710de038f7741b1e5c1e40f19'
+ 'c536bdb01893b53346726cdf572cdda8'
+ '1b292d4cb415fb0b493fd88529d8add1'
+ 'eaa814301018cbcbcc9145fd60a0ad3e'
+ 'a7ffe62f5d1a676db58d6bcd0cb5a29e'
+ '25c8732aba36a5f8e58f35788a89b2f6'
+ '5ac90a12d8d1f0bbd0c32e6411168461'
+ 'f47b78c5f086ec511388a143330e22d5'
+ 'ae97555f6474f597a15da089b6ef0089'
+ '0c46ab829c0597dc3faa5e70d64bb903'
+ '555ccc2a64ce110308ae55569cf0d612'
+ 'f2bdc9390388552cebde424ccb533b56'
+ '0f857bdca9f2bcb24b5e8a2f46f398af'
+ '508928bf9b224786e3fdad9bcfda4230'
+ 'af8f928b3dcf59489291ed99ad216c10'
+ 'b97d8915f520de0d760070e7a058492c'
+ '5d894ccd869331f6ba81b79d66452d29'
+ 'c3e268cd4c829cb0852ed02c9de2dd4d'
+ '408c8e898900efc97d3c449382958607'
+ 'ad9568a88b73189cc73c25728d23db3a'
+ 'e6e84f910d33d75953a4abc4fb0e78d5'
+ '403991c8eaa55675b433701901042791'
+ '8b317a2f84f3ab4f20f213134fa4e89f'
+ 'f6e192717ea383206793b5ac51d94b9d'
+ '5a1f2ff1a18c58bf7eae079f0058d3ac'
+ 'd65eeba91a938d95466fb602919a8253'
+ '6719800c6c4ea969af4597386900eed5'
+ '09152085c533d5cfaa3281bd56791ab3'
+ '5c3b9ba64919931ba924aeb82b6d511d'
+ '0a5392e0edf416304fa3501e09a9e755'
+ '9d17cc7f1238db2edda76736ecee56af'
+ '56b19d666ae1df919b26d6c04ede6ec7'
+ '16648d2f5b226786487d9f6dd4bf1e11'
+ '5cc3b11c6dc4399d9024ce58be31dd0b'
+ '999685ea1e48118e0a033f9b64eec244'
+ '3b7cb8fb5da908558ad2843ab61bec57'
+ '7a566e091f024f9cb458e57c20f59fff'
+ 'eca90e7e61b2b628ddceb230229b8fda'
+ '58dc4acfb114088852c1e12708778f6a'
+ '6e6755330cea230f334a6618e5c06268'
+ 'bf1ffad887e9bf769f021790abdfe79b'
+ '83baeeed748511bdd7996aa34e074f39'
+ 'cecea99a977d0849a2077c7c4aca175d'
+ '01b9b43a1ed30e05f96c10365011b980'
+ 'e08db859318bd525f37fe5e90c15bc15'
+ 'e9ba8aeb43ba9465231d91ab4d9046af'
+ 'af84a3746532b3a1e71bbf173f37acae'
+ '0694facbec186997b5e3e56f16924371'
+ 'daeb31829220fc001c9fe63e2fe8de5e'
+ 'f1573ce43e917553c2720bca8f24569d'
+ '8afafca7d0a34532d77f9e22929b591c'
+ 'c67cbab5cb06b30e21c310e3d29fcaa8'
+ '201292f43d1c354bd0189906d03cbbd0'
+ '9cf84d585fea1ac3002e2cced729c8a3'
+ 'b32934822634ebd1a82f64ac70597ef9'
+ '63cb7e54400f55eb5b4995c299174b40'
+ '7bdb7601e9c21af7f6e8d4c6f2acc8d4'
+ 'd998310ca5c38ef8babcc18a4faffae0'
+ 'f9896f39830058b9b003568f4d67b73b'
+ '9568dedd80dc5401bd69880952ef42e1'
+ 'b8863db55f206abf8c4fcc34fd82347b'
+ '8f4df43a91550692497b599856323bf7'
+ '4b91b600a3fa5f520c3c0953128695f5'
+ '0a1fdc989d107d323fb80ea05b13b832'
+ 'ca6e721d01ee9ec6719c1813ebb7f35b'
+ '5c40e59819a74f47dc95b58d5e1005ea'
+ '6506433c61b5811cf600f48a0b5e8074'
+ 'e4410eaaece0a283bb4060d3eb428a96'
+ '635a91b20ba7ecde88de1bdf8517c7bb'
+ 'b884f988301169f17e5f181be5768e74'
+ '4358aa4e516f38b91e284eb75d729978'
+ 'f386732f9fb2629f35defe354e85ce02'
+ '9312ded30c12d367e9280ccfe5f22261'
+ 'a17cd6c8190d0a31938292b77c6c50fb'
+ '01187464580ccd34874e48e8113e4e5c'
+ 'af362b174706ab93851ac1e6e6078422'
+ 'a8291043c75079d9c66258897b30bba6'
+ '5ec754344dba9cfdc3021bb03ec118e0'
+ '04a79f1876c05c62f270f757cf34780c'
+ '494444bb9df2fbefc8689c3c3be61e6f'
+ '9b8c613d0f6cb51209021c436f7313d5'
+ '9ac2c4bab905675ab3cefbc10742f9cb'
+ 'c1a67c2551a9d0de73d72b3bad887159'
+ '2153d65575351ac1974fbb5874b4788b') \ No newline at end of file
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 69fe5c072..69fe5c072 100755..100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 303cc54ae..357fb7321 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=17.0
+_debver=17.0.1
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -52,12 +52,12 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
vendor.js
shared-libs.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('3e555026478026987753b4859ec91d3b'
- '9b07815d94b8190c780fac10009025b9'
+md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
+ '1bbf435ff33f9824de23c0b13fbfb452'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '3956dd8d3c153c2d8a608065a6d522c0'
+ '1570f4402cd46ffffeb7e302b2fb285d'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index c257f04fe..d0f392be3 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -165,15 +165,6 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
-@@ -259,7 +259,7 @@
- pref("dom.disable_window_find", true);
-
- pref("keyword.enabled", true);
--pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
-
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
--- iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
+++ iceweasel-13.0/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
@@ -213,14 +204,14 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
pref("keyword.enabled", true);
-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
++pref("keyword.URL", "");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-17.0/mobile/locales/en-US/chrome/region.properties
--- iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties 2012-11-20 00:46:15.000000000 -0200
-+++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties 2012-11-28 12:42:29.600175386 -0200
-@@ -3,34 +3,10 @@
++++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties 2012-11-30 01:51:40.078652322 -0200
+@@ -3,34 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Default search engine
@@ -236,9 +227,8 @@ diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties icew
-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
-browser.contentHandlers.types.1.title=Google
-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-+browser.search.order.1=DuckDuckGo HTML
-
- # Keyword URL (for location bar searches)
+-
+-# Keyword URL (for location bar searches)
-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-
-# increment this number when anything gets changed in the list below. This will
@@ -257,7 +247,7 @@ diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties icew
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+keyword.URL=https://duckduckgo.com/html/?q=
++browser.search.order.1=DuckDuckGo HTML
diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
--- iceweasel-14.0.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
+++ iceweasel-14.0/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
@@ -266,7 +256,7 @@ diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/mod
// The first character after a period must be alphabetic.
-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
++pref("keyword.URL", "");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 164cd19e9..3d30a19b2 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -28,7 +28,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.
'duckduckgo_lite.desktop')
sha1sums=('5245c1152680ad22dff21c44dad531eda736e769'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
- '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
+ 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
build() {
cd "${srcdir}"
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 11635526e..3810fe495 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -10,14 +10,14 @@
pkgname=mozilla-searchplugins
pkgver=1.3
-pkgrel=1
+pkgrel=2
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
url="https://parabolagnulinux.org/"
source=(
- duckduckgo-html.xml::https://duckduckgo.com/opensearch_html.xml
- duckduckgo-lite.xml::https://duckduckgo.com/opensearch_lite.xml
+ duckduckgo-html.xml
+ duckduckgo-lite.xml
internet-archive.xml
jamendo-en.xml.in
jamendo.ico::http://www.jamendo.com/favicon.ico
@@ -38,8 +38,8 @@ package() {
install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
}
-md5sums=('fde80774b91b3aba358d587c65139727'
- 'd19e22a8e1e663905fb1ead60abd2a5d'
+md5sums=('b4cc6bd8353af36ade441916217619e4'
+ '766aa6def4bf63c0d65afd6ca1b1ce37'
'462c68585461f8cdc23c93c46f6ee4cf'
'0c9a3f48971aab8aa0cf2f5e2ff67292'
'e50a847cec81357e8730e0d327515a9c'
diff --git a/libre/mozilla-searchplugins/duckduckgo-html.xml b/libre/mozilla-searchplugins/duckduckgo-html.xml
new file mode 100644
index 000000000..b53408077
--- /dev/null
+++ b/libre/mozilla-searchplugins/duckduckgo-html.xml
@@ -0,0 +1,8 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>DuckDuckGo HTML</os:ShortName>
+<os:Description>Search DuckDuckGo HTML</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">http://duckduckgo.com/favicon.ico</os:Image>
+<os:Url type="text/html" method="GET" template="https://duckduckgo.com/html/?q={searchTerms}">
+</os:Url>
+</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/duckduckgo-lite.xml b/libre/mozilla-searchplugins/duckduckgo-lite.xml
new file mode 100644
index 000000000..1e651abe6
--- /dev/null
+++ b/libre/mozilla-searchplugins/duckduckgo-lite.xml
@@ -0,0 +1,8 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>DuckDuckGo Lite</os:ShortName>
+<os:Description>Search DuckDuckGo Lite</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">http://duckduckgo.com/favicon.ico</os:Image>
+<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}">
+</os:Url>
+</SearchPlugin>
diff --git a/libre/tokyocabinet/PKGBUILD b/libre/tokyocabinet/PKGBUILD
index 7b3a55c80..1add6c535 100644
--- a/libre/tokyocabinet/PKGBUILD
+++ b/libre/tokyocabinet/PKGBUILD
@@ -3,9 +3,9 @@
pkgname=tokyocabinet
pkgver=1.4.48
-pkgrel=1
+pkgrel=2
pkgdesc="a modern implementation of DBM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
url="http://fallabs.com/tokyocabinet/"
license=('LGPL')
makedepends=('gcc>=3.1' 'make' 'pkgconfig')
@@ -15,7 +15,10 @@ md5sums=('fd03df6965f8f56dd5b8518ca43b4f5e')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --enable-off64 --enable-fastest
+
+ [ "$CARCH" != "mips64el" ] && extra=--enable-fastest
+
+ ./configure --prefix=/usr --enable-off64 $extra
make
}
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 69fe5c072..69fe5c072 100755..100644
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index e9cd2a447..1d485e6d5 100755
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160908 2012-06-06 17:03:39Z ibiru $
+# $Id: PKGBUILD 172187 2012-12-01 13:09:58Z foutrelis $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -6,7 +6,7 @@
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=17.0
+_debver=17.0.1
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -25,15 +25,17 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
mozconfig
mozilla-pkgconfig.patch
+ shared-libs.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('3e555026478026987753b4859ec91d3b'
- '9b07815d94b8190c780fac10009025b9'
+md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
+ '1bbf435ff33f9824de23c0b13fbfb452'
'f2f4f4a573f549e8b494e33b3ad226bc'
'27271ce647a83906ef7a24605e840d61'
+ '52e52f840a49eb1d14be1c0065b03a93'
'65f68090d2a69b467bd2707d0c4ea3bd')
build() {
@@ -63,6 +65,7 @@ build() {
#fix libdir/sdkdir - fedora
patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
+ patch -Np1 -i "$srcdir/shared-libs.patch"
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
export PYTHON="/usr/bin/python2"
@@ -83,8 +86,6 @@ package() {
echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/header.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/typelib.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpidl.py"
+ sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
+ "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py
}
diff --git a/libre/xulrunner-libre/shared-libs.patch b/libre/xulrunner-libre/shared-libs.patch
new file mode 100644
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre/xulrunner-libre/shared-libs.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+
+ MOZ_NONLOCALIZED_PKG_LIST = \