From bf3ea4af547c1dff83c6a45c33f58ab611818133 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 19 Nov 2012 02:41:57 -0200
Subject: pacman-4.0.3-5: updating version
---
...pgrade-scriptlet-gets-old-package-version.patch | 29 ++++++++++++++++++++++
libre/pacman/PKGBUILD | 9 ++++---
2 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
(limited to 'libre')
diff --git a/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
new file mode 100644
index 000000000..ae3a57ecd
--- /dev/null
+++ b/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
@@ -0,0 +1,29 @@
+From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001
+From: Dan McGee
+Date: Fri, 04 May 2012 16:41:40 +0000
+Subject: Ensure pre_upgrade scriptlet gets old package version
+
+This was accidentally broken in the refactor done in commit 73139ccb.
+
+Fixes FS#29371.
+
+Signed-off-by: Dan McGee
+---
+diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
+index 6c2f0cb..c49d99b 100644
+--- a/lib/libalpm/add.c
++++ b/lib/libalpm/add.c
+@@ -488,8 +488,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
+ if(alpm_pkg_has_scriptlet(newpkg) &&
+ !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
+ const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
+- _alpm_runscriptlet(handle, pkgfile,
+- scriptlet_name, newpkg->version, NULL, 1);
++
++ _alpm_runscriptlet(handle, pkgfile, scriptlet_name,
++ newpkg->version, oldpkg ? oldpkg->version : NULL, 1);
+ }
+
+ /* we override any pre-set reason if we have alldeps or allexplicit set */
+--
+cgit v0.9.0.2-13-g2bd3
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 4f05be586..85ae5cc5f 100755
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
+# $Id: PKGBUILD 171482 2012-11-18 01:57:51Z allan $
# Maintainer: Dan McGee
-# Maintainer: Dave Reisner
+# Maintainer: Dave Reisner
pkgname=pacman
pkgver=4.0.3
-pkgrel=3
+pkgrel=5
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
@@ -21,6 +21,7 @@ options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
0001-Add-conflict-for-replacing-owned-empty-directory.patch
0002-Check-empty-subdirectory-ownership.patch
+ 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
pacman.conf
pacman.conf.x86_64
pacman.conf.mips64el
@@ -29,6 +30,7 @@ md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
'1a70392526c8768470da678b31905a6e'
'1a9b79788640907a2b34e8671cacc94a'
'a9ddd43891bed364e1e97d27b2887bf1'
+ '2e8cbf55a94b1954b167c5dee6b62317'
'080d9f76f56e135cc62205874636aa0f'
'ce9943fc8086d491890565e91ea1a0d8'
'eb8dba9bd0b315230fbf0e5dc0a7335b'
@@ -39,6 +41,7 @@ build() {
patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+ patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-doc
--
cgit v1.2.3
From 667a293c32dacb3dcbf3a4a17b6889f2bee96fc7 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 19 Nov 2012 17:23:05 -0200
Subject: clementine-libre-1.1.1-1: updating version
---
libre/clementine-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index c0a063e95..7c231fe27 100755
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -7,8 +7,8 @@
_pkgname=clementine
pkgname=clementine-libre
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
pkgdesc="A music player and library organizer, without spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
@@ -26,7 +26,7 @@ conflicts=('clementine')
provides=("clementine=$pkgver")
source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
remove-and-disable-spotify.patch)
-sha1sums=('af446aba5ca89edd1541871969b3b6738ffbd05f'
+sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e'
'3980a00c02e406226f0d08ae9b7e581702c89838')
install=clementine.install
--
cgit v1.2.3
From e433e9bdf2ceca38687db9e41be4d321fb23e343 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 19 Nov 2012 17:24:25 -0200
Subject: mplayer-libre-35421-1.1; updating revision due x264 dependency
---
libre/mplayer-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 461cc23e2..583b679ca 100755
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=35421
-pkgrel=1
+pkgrel=1.1
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
--
cgit v1.2.3
From c14c7bd13baf9d7a15a9f0a2133f75bb732b83cb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 19 Nov 2012 17:25:41 -0200
Subject: mplayer-vaapi-libre-35107-3.1: updating revision due x264 dependency
---
libre/mplayer-vaapi-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index edb193560..c5b33cf75 100755
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=mplayer-vaapi-libre
pkgver=35107
-pkgrel=3
+pkgrel=3.1
pkgdesc="A movie player, compiled with vaapi (without unfree faac support)"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"
--
cgit v1.2.3
From 7f214c5a65f15e4363c0da11f8fafe3adbb30a68 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Mon, 19 Nov 2012 19:15:20 -0200
Subject: blender-libre: rebuild x264
---
libre/blender-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 396706459..2360945ee 100755
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -17,7 +17,7 @@ else
fi
pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
pkgver=2.64a
-pkgrel=3
+pkgrel=4
pkgaev=5
arch=(
i686
--
cgit v1.2.3
From 622d65ecf22b240afdc889af1cd36ba41a27ba9d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 20 Nov 2012 11:23:51 -0200
Subject: linux-libre-3.6.7-1: updating version
---
libre/linux-libre/PKGBUILD | 13 +++++++++----
libre/linux-libre/irq_cfg_pointer-3.6.6.patch | 16 ++++++++++++++++
libre/linux-libre/linux-libre.install | 2 +-
3 files changed, 26 insertions(+), 5 deletions(-)
create mode 100644 libre/linux-libre/irq_cfg_pointer-3.6.6.patch
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 65086e3e8..7f9cb69cb 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.6
-_sublevel=6
+_sublevel=7
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -31,9 +31,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
'module-symbol-waiting-3.6.patch'
'module-init-wait-3.6.patch'
+ 'irq_cfg_pointer-3.6.6.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
- '887e4a0fd0fb10da9410f5d1a75466b8'
+ 'a4e642180c7d757a642175fe32e4a264'
'e4a3a4677e1fac6ecf0e0fb44c41ca08'
'68fc36a4efb6ade0eca409b9444fef0c'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,7 +44,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'9d3c56a4b999c8bfbd4018089a62f662'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'a281ee5d89a016d72840bddb2d742635')
+ '4909a0271af4e5f373136b382826717f'
+ '1dd80f353c705fef988346a8ef05d13f')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -73,6 +75,9 @@ build() {
patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
+ # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
+ patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/irq_cfg_pointer-3.6.6.patch b/libre/linux-libre/irq_cfg_pointer-3.6.6.patch
new file mode 100644
index 000000000..32583c0ac
--- /dev/null
+++ b/libre/linux-libre/irq_cfg_pointer-3.6.6.patch
@@ -0,0 +1,16 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661
+
+diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
+index c265593..1817fa9 100644
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
+ continue;
+
+ cfg = irq_cfg(irq);
++ if (!cfg)
++ continue;
++
+ raw_spin_lock(&desc->lock);
+
+ /*
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 8a3791240..f5c51e08f 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.6.6-1-LIBRE
+KERNEL_VERSION=3.6.7-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From abdbc40260696149ba955f1cef74c0f6cce3e0ec Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 20 Nov 2012 11:30:48 -0200
Subject: linux-libre-lts-3.0.52-1: updating version
---
libre/linux-libre-lts/PKGBUILD | 8 ++++----
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index b7ffda209..0948ed4f1 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=51
+_sublevel=52
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- 'fb3c742b1f8b01131534a22348cfa712'
+ '41adc30b96b745f08899317da83f7eaa'
'aed25ab047e1c0b020a1516c235c6a74'
'7d37e8ce0f4bd5a957172b12ae742ea0'
'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'e2cc9f33fb26b254b6b65f8981aebf13')
+ 'ecf9d21d2d6dfbc29dc18b616cbce4e1')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 75238bf66..28a571191 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.51-1-LIBRE-LTS
+KERNEL_VERSION=3.0.52-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From 323950ce5e896810f6ea9f0a2401813e1d7573c7 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Wed, 21 Nov 2012 15:44:14 -0300
Subject: Moving unarchiver to unar and fixing #227
---
libre/unar/PKGBUILD | 42 ++++++++++++++++++++++++++++
libre/unar/libz.patch | 13 +++++++++
libre/unar/native_obj_exceptions.patch | 22 +++++++++++++++
libre/unarchiver/PKGBUILD | 42 ----------------------------
libre/unarchiver/libz.patch | 13 ---------
libre/unarchiver/native_obj_exceptions.patch | 22 ---------------
6 files changed, 77 insertions(+), 77 deletions(-)
create mode 100755 libre/unar/PKGBUILD
create mode 100755 libre/unar/libz.patch
create mode 100755 libre/unar/native_obj_exceptions.patch
delete mode 100755 libre/unarchiver/PKGBUILD
delete mode 100755 libre/unarchiver/libz.patch
delete mode 100755 libre/unarchiver/native_obj_exceptions.patch
(limited to 'libre')
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
new file mode 100755
index 000000000..e1664e809
--- /dev/null
+++ b/libre/unar/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Cedric Girard
+# Contributor: N30N
+
+pkgname=unar
+pkgver=1.4
+pkgrel=1
+pkgdesc="An Objective-C application for uncompressing archive files"
+arch=('x86_64' 'i686' 'mips64el')
+url="http://unarchiver.c3.cx/"
+license=('LGPL2.1')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
+makedepends=('gcc-objc')
+replaces=("unarchiver")
+conflicts=("unarchiver")
+provides=("unarchiver")
+source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
+ "native_obj_exceptions.patch")
+
+build() {
+ cd "$srcdir/The Unarchiver"
+
+ patch -p1 < ../native_obj_exceptions.patch
+
+ cd XADMaster
+ . /usr/share/GNUstep/Makefiles/GNUstep.sh
+ make -f Makefile.linux
+}
+
+package() {
+ cd "$srcdir/The Unarchiver/XADMaster"
+ install -d "$pkgdir/usr/bin/"
+ install -m755 unar lsar "$pkgdir/usr/bin/"
+
+ cd "$srcdir/The Unarchiver/Extra"
+ install -d "$pkgdir/usr/share/man/man1"
+ gzip -c lsar.1 > "$pkgdir/usr/share/man/man1"/lsar.1.gz
+ gzip -c unar.1 > "$pkgdir/usr/share/man/man1"/unar.1.gz
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('ae5233dd835229f867f0948d28dde0d6'
+ '4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/libre/unar/libz.patch b/libre/unar/libz.patch
new file mode 100755
index 000000000..acba51463
--- /dev/null
+++ b/libre/unar/libz.patch
@@ -0,0 +1,13 @@
+diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux
+--- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200
++++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:56:13.749166606 +0100
+@@ -51,7 +51,8 @@
+ -licuuc \
+ -lobjc \
+ -lstdc++ \
+- -lm
++ -lm \
++ -lz
+
+ LDFLAGS = -Wl,--whole-archive \
+ -fexceptions \
diff --git a/libre/unar/native_obj_exceptions.patch b/libre/unar/native_obj_exceptions.patch
new file mode 100755
index 000000000..9c84918b2
--- /dev/null
+++ b/libre/unar/native_obj_exceptions.patch
@@ -0,0 +1,22 @@
+diff -Naur The Unarchiver/UniversalDetector/Makefile.linux The Unarchiver_patched/UniversalDetector/Makefile.linux
+--- The Unarchiver/UniversalDetector/Makefile.linux 2011-04-27 03:32:21.000000000 +0200
++++ The Unarchiver_patched/UniversalDetector/Makefile.linux 2011-12-22 10:48:32.138621163 +0100
+@@ -16,7 +16,6 @@
+
+ GNUSTEP_OPTS = -DGNUSTEP \
+ -DGNU_RUNTIME=1 \
+- -D_NATIVE_OBJC_EXCEPTIONS \
+ -fgnu-runtime \
+ -fexceptions \
+ -fobjc-exceptions \
+diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux
+--- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200
++++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:48:15.488721721 +0100
+@@ -16,7 +16,6 @@
+
+ GNUSTEP_OPTS = -DGNUSTEP \
+ -DGNU_RUNTIME=1 \
+- -D_NATIVE_OBJC_EXCEPTIONS \
+ -fgnu-runtime \
+ -fexceptions \
+ -fobjc-exceptions \
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
deleted file mode 100755
index 9921c6d9d..000000000
--- a/libre/unarchiver/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Cedric Girard
-# Contributor: N30N
-
-pkgname=unarchiver
-pkgver=3.2
-pkgrel=1
-pkgdesc="An Objective-C application for uncompressing archive files"
-arch=('x86_64' 'i686')
-url="http://unarchiver.c3.cx/"
-license=('LGPL2.1')
-depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
-makedepends=('gcc-objc')
-source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip"
- "native_obj_exceptions.patch"
- "libz.patch")
-md5sums=('a23d7fbfe1f66b0950a359f206df5c8d'
- '4fa4ecc6e4ba14d3b6952d064e728511'
- '665d01bf93191cc6f57dc80d8c1d3d5a')
-
-build() {
- cd "$srcdir/The Unarchiver"
-
- patch -p1 < ../native_obj_exceptions.patch
- patch -p1 < ../libz.patch
-
- cd XADMaster
- . /usr/share/GNUstep/Makefiles/GNUstep.sh
- make -f Makefile.linux
-}
-
-package() {
- cd "$srcdir/The Unarchiver/XADMaster"
- install -d "$pkgdir/usr/bin/"
- install -m755 unar lsar "$pkgdir/usr/bin/"
-
- cd "$srcdir/The Unarchiver/Extra"
- install -d "$pkgdir/usr/share/man/man1"
- gzip -c lsar.1 > "$pkgdir/usr/share/man/man1"/lsar.1.gz
- gzip -c unar.1 > "$pkgdir/usr/share/man/man1"/unar.1.gz
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/unarchiver/libz.patch b/libre/unarchiver/libz.patch
deleted file mode 100755
index acba51463..000000000
--- a/libre/unarchiver/libz.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux
---- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200
-+++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:56:13.749166606 +0100
-@@ -51,7 +51,8 @@
- -licuuc \
- -lobjc \
- -lstdc++ \
-- -lm
-+ -lm \
-+ -lz
-
- LDFLAGS = -Wl,--whole-archive \
- -fexceptions \
diff --git a/libre/unarchiver/native_obj_exceptions.patch b/libre/unarchiver/native_obj_exceptions.patch
deleted file mode 100755
index 9c84918b2..000000000
--- a/libre/unarchiver/native_obj_exceptions.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur The Unarchiver/UniversalDetector/Makefile.linux The Unarchiver_patched/UniversalDetector/Makefile.linux
---- The Unarchiver/UniversalDetector/Makefile.linux 2011-04-27 03:32:21.000000000 +0200
-+++ The Unarchiver_patched/UniversalDetector/Makefile.linux 2011-12-22 10:48:32.138621163 +0100
-@@ -16,7 +16,6 @@
-
- GNUSTEP_OPTS = -DGNUSTEP \
- -DGNU_RUNTIME=1 \
-- -D_NATIVE_OBJC_EXCEPTIONS \
- -fgnu-runtime \
- -fexceptions \
- -fobjc-exceptions \
-diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux
---- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200
-+++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:48:15.488721721 +0100
-@@ -16,7 +16,6 @@
-
- GNUSTEP_OPTS = -DGNUSTEP \
- -DGNU_RUNTIME=1 \
-- -D_NATIVE_OBJC_EXCEPTIONS \
- -fgnu-runtime \
- -fexceptions \
- -fobjc-exceptions \
--
cgit v1.2.3
From 191f4e0418eaef1ae5dc5c63bc8e16c5331f1789 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 21 Nov 2012 20:22:15 -0200
Subject: linux-libre-kmod-alx-20121003-6: rebuilding against linux-libre new
version
---
libre/linux-libre-kmod-alx/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 68dfccc79..f7bf76187 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva
-_kernver=3.6.6
+_kernver=3.6.7
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=5
+pkgrel=6
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'
--
cgit v1.2.3
From cded5155f0176df069e875757d6899046005102d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 21 Nov 2012 20:25:10 -0200
Subject: linux-libre-lts-kmod-alx-20121003-7: rebuilding against
linux-libre-lts new version
---
libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 65bae7c0b..5892fa794 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva
-_kernver=3.0.51
+_kernver=3.0.52
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=6
+pkgrel=7
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'
--
cgit v1.2.3
From fe67610287c9bd89f073314ea179ad1f52c7152a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 21 Nov 2012 20:26:41 -0200
Subject: gst-plugins-bad-libre-1.0.3-1: updating version
---
libre/gst-plugins-bad-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 2e0658cfb..e96c047a8 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
+# $Id: PKGBUILD 171693 2012-11-21 14:33:55Z heftig $
# Maintainer: Jan de Groot
# Maintainer (Parabola): Márcio Silva
pkgbase=gst-plugins-bad
pkgname=gst-plugins-bad-libre
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
arch=(
@@ -57,7 +57,7 @@ source=(
"$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
)
sha256sums=(
- 9e503305799a2b6eb9d0b77c59b8aa8bbe9e6eb815a0635bd013560c73996579
+ 2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0
)
build() {
--
cgit v1.2.3
From a96f56652fa6d8006771edb50af60f4701c14924 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 21 Nov 2012 20:45:29 -0200
Subject: iceweasel-libre-17.0.1-1: updating version
---
.../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 4 ++--
libre/iceweasel-libre/PKGBUILD | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'libre')
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 a5fe02165..69fe5c072 100755
--- 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
@@ -267,10 +267,10 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 60348b5..c240c4f 100644
+index 68a52e6..02bb30e 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun()
+@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 7532436d7..185f1c039 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=16.0.2
+_debver=17.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -52,8 +52,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
vendor.js
shared-libs.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
- 'ee38477dd7ede1c32e559ee74139b5c9'
+md5sums=('3e555026478026987753b4859ec91d3b'
+ '9b07815d94b8190c780fac10009025b9'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
@@ -61,7 +61,7 @@ md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
- '0a31239f1008038df5057982fe745dec')
+ '65f68090d2a69b467bd2707d0c4ea3bd')
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname=$pkgver")
--
cgit v1.2.3
From 26bc9c13bf629ab36177f6238023f9e5abeb63f3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 21 Nov 2012 22:25:49 -0200
Subject: iceweasel-i18n-17.0.1-1: updating version
---
libre/iceweasel-i18n/PKGBUILD | 182 +++++++++++++++++++++---------------------
1 file changed, 91 insertions(+), 91 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 6fd6aaf03..406cb3c32 100755
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,18 +9,18 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=16.0.2
+_debver=17.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=16.0.2
+_pkgver=17.0
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -56,91 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('7917e479db04573f738d25d9a57cb049'
- 'ec1fadd5879ebbd7884b00c15e8148a8'
- 'fc281450b90d5e7861ac4f555d5ea871'
- '1fe8f0d56b76f2bd627627098813ace2'
- 'fb3a5c73b806bbd7bd50a64a5894c831'
- '84e222c9a5caa3cfd30b8c79cf49ae20'
- '7a8b1160c2ac40dac7bb3ef788d7e2d0'
- '3b974c5d14de638a36ee6b6e3a1fab94'
- '6b40f968cd7c4a19ddc252fedf88dcbc'
- 'd6f533690c8570150ea193e4784fa37e'
- '75bcfbbacde730ec498345994d5da699'
- '322971c545da5815bfaf9c9f5b380ea4'
- '7da8514ff56ad89db85cf160bc02d8cc'
- '8b748543ca637db910531f35fcc7eb1e'
- '3a5188077b07d50a60c19a9be34fef2e'
- 'c2f01b10da3a49049dadf13e7d62194b'
- '97045cfea1caf0730557171a2dbc1384'
- '969c813859367a254d7edbb16e323d62'
- '479b9f915480af5c4cda1477bcc745f6'
- '081f3d13f05b9d44d5bb2d7842998d68'
- 'c527200432799e3a37180439074f7616'
- '6b688e726d273c21bb08f9e09a3dae48'
- 'b912eedaed384be13d99cbe769bb3683'
- '9d828a0459fbb3997ade5a2c4bcfff35'
- '67b79482d42d8057d0e66a8d00314efb'
- 'da9661e6211765ca9d503d1ff0aaeec1'
- 'e31f997e78fc2069b91a25cf71ee4a43'
- '5207746c0154fc737d3bbeb5d468651b'
- '191e284c168827fd4344f25c287f21d1'
- 'ebcb9f2fb2571d045d3e19ee9d8cbb9f'
- '81c5e660d89148f0ca7da1186f1cda3a'
- 'ca8a2f10358da70d30c8a6af7bc44d54'
- '8581d1f7e7e3a850d360e4da7506d166'
- 'd4811aef8cdc90b6661a669ffad2ead8'
- '41a9cd0e8ea9d71f4d82ac0f4e4911c0'
- 'e00759dd17ea1647afe40c1b9f676187'
- 'b145a19de88d7c62e319e5719cc079d5'
- '817beaa2dab8f01cfcc5f034d537f97b'
- '48257dba1a8ca1ccd9e75cf5d00819df'
- '2036c221e16ea942795eae837a690615'
- 'fc879e816fd4e831f47d14a3ed2442d7'
- '1851131108d0f9665cddaf636c5de826'
- '557c1a2d9176bde516c45112ae4632e8'
- '9142dcd98b5ec1783d72ffcb1326aae7'
- 'f4c0f20255fd7f715a923cd6f81301ca'
- '1f65f925300b5e4317018d80d147fb46'
- '955cba749d29a3608fb70e5914835f2b'
- '7ad38d60e90f96404860ef281bddfe17'
- 'd14126daf1067c19297ff1a94dc91e27'
- 'a1e55184abcd990206c5c82d7445b53e'
- '9e1eeb91fb680c4b09ed1439c8af4265'
- 'b313eb3158561713f00eec0b3ff82739'
- 'e42c798d9371109be8595653c87a96e6'
- '499cb790565eb93e4387120815bc0d3f'
- 'efed1f452372a569002282819f2828e8'
- '6e6e1215ffcc77fbd5deac9b3856ecff'
- '5905c1911035d9576e84791ac4416f23'
- 'd7a49fa9daec5c4c403633e04ec03b49'
- '58d91d27d4e9bb8106534bac2562c566'
- '73fe09d52c99ede62bd8fd07c4780ee4'
- '19eb3d4c88d80035645bbd6a992bf938'
- '51a35fae949c997b5a300211a967d36d'
- '579a02556b1200fc749600390dfb9d97'
- '2d7f14c47a9b974a69bfb5f821c6f04b'
- '8622ac1bb52fb56af89e26f2d2a98ffd'
- 'f5073a3e7bbbc71184a29d567c3d0914'
- '8979aaa64b9300ef245cb6368f1e3275'
- '1444fd6ec5639b51fc4c15c3fc7d41ec'
- '0eb171065c77b27c5aed4aa11fa2a6f4'
- '4b2a490537405ceb2935225807d4bde9'
- '69db8437023d658c5da0cf7388b1f579'
- '8d6bf855d5070624268cc175f3e86a14'
- '3edd9eea3d25fecb21787ce83499c994'
- '3ab336a082a86f9c7df7a7873f40a6e9'
- 'b798317e831b5b9a06161bdaf119ad4d'
- 'e86a78e5bfcba6f45b9f0bbf42c5ad89'
- '8f0a46cdd135c0d8858c409cbca4e9cd'
- '0a78294d15ef47fb1916ca129c5348c0'
- '625fb622c634c035f4b326928c776392'
- '6b528ef1c3427e799d924b12a5e1fb39'
- 'c790339622a85b5b307fb4a8fa496fe7'
- '56021c871cce43c64bc6ddff5f794f31'
- 'babbd7cde37d24463ea5d8a389abd512'
- '6eb58fc54626a3b8d58c03f37dfc2ec1'
- '782d556e773cb97298592fedabdc9a7f'
- 'f2cf5e5a2b244d0afab2edd193209039'
- '973c9e08c3329ba51625272db30d9d6c'
- '28055c70eda06dcf371f0399dce94e8b')
+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
--
cgit v1.2.3
From c6f82e8dc74a97c194d1e2caeab67ac5b3743335 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 22 Nov 2012 01:16:27 -0200
Subject: xulrunner-libre-17.0.1-1: updting version
---
.../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 4 ++--
libre/xulrunner-libre/PKGBUILD | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'libre')
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 a5fe02165..69fe5c072 100755
--- 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
@@ -267,10 +267,10 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 60348b5..c240c4f 100644
+index 68a52e6..02bb30e 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun()
+@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 745723604..e9cd2a447 100755
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,7 +6,7 @@
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=16.0.2
+_debver=17.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -18,7 +18,7 @@ pkgrel=1
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
+depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2')
makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
@@ -30,11 +30,11 @@ options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
- 'ee38477dd7ede1c32e559ee74139b5c9'
+md5sums=('3e555026478026987753b4859ec91d3b'
+ '9b07815d94b8190c780fac10009025b9'
'f2f4f4a573f549e8b494e33b3ad226bc'
'27271ce647a83906ef7a24605e840d61'
- '0a31239f1008038df5057982fe745dec')
+ '65f68090d2a69b467bd2707d0c4ea3bd')
build() {
export QUILT_PATCHES=debian/patches
--
cgit v1.2.3
From e0755bc7fa7cd05b992a9988a9d38587e169f42d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 15:59:39 -0200
Subject: iceape-libre-2.7.11.1-1: updating version
---
libre/iceape-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index eedd8f584..2247f0a8a 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Sid
_debname=iceape
-_debver=2.7.10
+_debver=2.7.11
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
${_pkgname}-2.0-lang.patch
clrf.patch
libre.patch)
-md5sums=('63596601fd01000c842d9543ea8dfd56'
- 'f8de6b9e1906c8349e8799f819503897'
+md5sums=('40473b4c662975eda865e1fc35c4953b'
+ 'f704b69cc0328c83edd6223420fbd412'
'60ba9e8f2fafd20e41268af534a55ea7'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
--
cgit v1.2.3
From 0c07410fac8743635f35aadb6150e36078bbc155 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 17:00:55 -0200
Subject: iceape-i18n-2.7.11.1-1: updating version
---
libre/iceape-i18n/PKGBUILD | 50 +++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
(limited to 'libre')
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 6aaa1aa04..cc9691a7c 100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -11,7 +11,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceape
-_debver=2.7.10
+_debver=2.7.11
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ pkgbase=iceape-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=2.7.10
+_pkgver=2.7.11
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('6499aa420d5fa855a3884c657066c443'
- 'c4b98806b5a6cce75878bdf0668f5a4a'
- 'ac1a19ed29bda42f66e533ca9ee79fac'
- '6116bd1b7c51d9414c68e1807d264f35'
- '621dc719068050b479ad0fb9060d39e6'
- 'b184194c4e69dc00ee9f3b15dee71d92'
- '84058513ab8884d0f279aa2990c10327'
- '5be7810ca391eb31d26f5ab46c2f8fea'
- '58737d11a2c0852d6701549d22f071b6'
- 'ac5994cd318ca2692823f91908eee101'
- '5a07c756674b24b0b33af1e26a8e59ee'
- '9178d335fa9f998f157a2e7f27384b15'
- '2e40229a1ef5386574d98b243260f266'
- 'ff8c27d6afc9911af03737c23a0eae5d'
- '611702c6dd5638154ff8a5c99e909da0'
- '217fd6fd1e46eefb524457566f124074'
- '09bb4d6d36403f97b923625055767884'
- 'cebd80d880c87862d9a8baf97c3c5b7b'
- '023750f204d9f0ac89c62987b41532f4'
- '0d753213210d92a8f751b3221fe34dad'
- '4b180802effa63316c54e5ec904405c7'
- '8be48ada576dfd9a37e6b3c0bc55c298'
- 'af08b7f96b175c560bba71ab59e1a3dc')
+md5sums=('fb27360aff6250e7d483803583a5cd78'
+ '236c7aacd7e6416a37aff95f7bfa6a80'
+ 'f17d76128ab529415078cafe63b61d50'
+ '07a5c72158427db8c5a990be6eb2d036'
+ 'fddbcf27d00f1f4d92fed197ace8dd1b'
+ '96eb3291200c44ffdc3ab1d1446f00b7'
+ '04dec3bee388ae66cd434342ab03074f'
+ 'bdef8b38501e7d6805b5304ef2bf8425'
+ '90b5d0ab0ab2eb3b75e5f80cb6d289bb'
+ '97f940c39b84a90b0e16eaeca4fa7806'
+ '34644b44381ae1da46f2fa308fd1cf34'
+ 'a6240664344798568276dd5dbdd27fb2'
+ '61aedef6a89b400584dde82b5e97ff0f'
+ 'abe7a9172876b30c4677b1f4c2237fc9'
+ '60f3c543fbdb72cc12aef8f2369101ff'
+ 'c002da281c0d0fa357f92edd2b8cd12c'
+ 'c17ab30f25f05024879afdf85fa4c516'
+ '250a08a999d6d1d6086ffbd17d60fbb4'
+ '609ce8793ea0d5465da7195e4d956fef'
+ '060226599bac5bc8ddb64417ef1a0108'
+ 'eaa827909690bfa8dfdc621164e23ca8'
+ '3fb66893b5ea3b959de48ef16fb26c74'
+ '6f2d77e767efa0b0d4cb56df9ccd0a2f')
\ No newline at end of file
--
cgit v1.2.3
From 64a05323414587c97e5df9e5b0d7b2ad110bbdc0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 23 Nov 2012 17:30:24 -0200
Subject: iceape-i18n-2.7.11.1-1: adding a new line at the end of PKGBUILD file
---
libre/iceape-i18n/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index cc9691a7c..815f0e340 100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -80,4 +80,4 @@ md5sums=('fb27360aff6250e7d483803583a5cd78'
'060226599bac5bc8ddb64417ef1a0108'
'eaa827909690bfa8dfdc621164e23ca8'
'3fb66893b5ea3b959de48ef16fb26c74'
- '6f2d77e767efa0b0d4cb56df9ccd0a2f')
\ No newline at end of file
+ '6f2d77e767efa0b0d4cb56df9ccd0a2f')
--
cgit v1.2.3
From 195c4578406bed02fbbb75e19abfb302d9a1f5fb Mon Sep 17 00:00:00 2001
From: Michał Masłowski
Date: Sat, 24 Nov 2012 14:00:39 +0100
Subject: enscript-1.6.6-1 fixing issue #225.
---
libre/enscript/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 libre/enscript/PKGBUILD
(limited to 'libre')
diff --git a/libre/enscript/PKGBUILD b/libre/enscript/PKGBUILD
new file mode 100644
index 000000000..281675296
--- /dev/null
+++ b/libre/enscript/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 150464 2012-02-18 00:24:06Z allan $
+# Maintainer: Paul Mattal
+# Contributor: Tom Newsom
+
+pkgname=enscript
+pkgver=1.6.6
+pkgrel=1
+pkgdesc="Convert ASCII files to PostScript suitable for printing"
+arch=('i686' 'x86_64' 'mips64el')
+backup=('etc/enscript/enscript.cfg')
+depends=('glibc')
+license=('GPL2' 'custom')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('3acc242b829adacabcaf28533f049afd')
+url="http://git.savannah.gnu.org/cgit/enscript.git"
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc/enscript --mandir=/usr/share/man \
+ --infodir=/usr/share/info
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make prefix=$pkgdir/usr \
+ sysconfdir=$pkgdir/etc/enscript mandir=$pkgdir/usr/share/man \
+ infodir=$pkgdir/usr/share/info install
+ install -D -m644 afm/MustRead.html "${pkgdir}/usr/share/licenses/${pkgname}/MustRead.html"
+}
+
+# vim: ts=2 sw=2 et ft=sh
--
cgit v1.2.3
From 5c508409510096b2a656cf0534ef6388c3b120fb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 26 Nov 2012 03:02:08 -0200
Subject: icedove-libre-17.0.1-1: updating version
---
libre/icedove-libre/Icedove-branding.patch | 37 ++++++++++++++++++++++++++++++
libre/icedove-libre/PKGBUILD | 19 ++++++++++-----
2 files changed, 50 insertions(+), 6 deletions(-)
create mode 100644 libre/icedove-libre/Icedove-branding.patch
(limited to 'libre')
diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch
new file mode 100644
index 000000000..751305147
--- /dev/null
+++ b/libre/icedove-libre/Icedove-branding.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?=
+Date: Sat, 24 Nov 2012 11:36:16 +0100
+Subject: Icedove branding
+
+---
+ mail/app/application.ini | 2 +-
+ mail/confvars.sh | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mail/app/application.ini b/mail/app/application.ini
+index 8380eb7..12902c2 100644
+--- a/mail/app/application.ini
++++ b/mail/app/application.ini
+@@ -4,7 +4,7 @@
+
+ #filter substitution
+ [App]
+-Name=Thunderbird
++Name=Icedove
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+diff --git a/mail/confvars.sh b/mail/confvars.sh
+index 5c34d70..395bb87 100755
+--- a/mail/confvars.sh
++++ b/mail/confvars.sh
+@@ -3,8 +3,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-MOZ_APP_BASENAME=Thunderbird
+-MOZ_APP_NAME=thunderbird
++MOZ_APP_BASENAME=Icedove
++MOZ_APP_NAME=icedove
+ MOZ_UPDATER=1
+ MOZ_THUNDERBIRD=1
+ MOZ_CHROME_FILE_FORMAT=omni
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 6ec577f58..d61b756f5 100755
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Experimental
_debname=icedove
-_debver=16.0.2
+_debver=17.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
arch=('i586' 'i686' 'x86_64' 'mips64el')
license=('GPL2' 'MPL' 'LGPL')
@@ -30,16 +30,18 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
vendor.js
makefile.patch
branding.patch
- ${_pkgname}.desktop)
+ ${_pkgname}.desktop
+ Icedove-branding.patch)
options=(!emptydirs)
-md5sums=('a3724f40d28014acf593528bb8a048f0'
- '53d62a4841d7989d1f6d1b04929394b4'
+md5sums=('f011e0308a0758df772638836fb03709'
+ '8534a19b46ce21d80fce16b50f1f37bd'
'd6d58d3104a44624e0a3d227cdf1c211'
'476ec205162340fb0679f522c9d31c3b'
'4eecc4fc5aafaf0da651a09eadc90bee'
'c4ed43e85945e180a89cce03e45ec62c'
'126b1446212396c33220936c01d9592d'
- 'e785e0c267f4435ae1a9aa0b03bcacfb')
+ 'e785e0c267f4435ae1a9aa0b03bcacfb'
+ 'ea5f7a06967f561d47d7e5c35b23de6f')
build() {
export QUILT_PATCHES=debian/patches
@@ -58,10 +60,15 @@ build() {
for i in 48x48 64x64; do
install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
done
+
+ # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh
+ rm -v debian/patches/debian-hacks/Icedove-branding.patch || true
+
quilt push -av
patch -Np1 -i "${srcdir}/makefile.patch" # small fix
patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
+ patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
cp "${srcdir}/mozconfig" .mozconfig
make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
--
cgit v1.2.3
From 2fa90d9fe76fa960bb7ee786403340ca1b0dc393 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 26 Nov 2012 03:41:10 -0200
Subject: icedove-i18n-17.0.1-1: updating version
---
libre/icedove-i18n/PKGBUILD | 112 ++++++++++++++++++++++----------------------
1 file changed, 56 insertions(+), 56 deletions(-)
(limited to 'libre')
diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
index 7d0aa1d8b..d7dbbb211 100755
--- a/libre/icedove-i18n/PKGBUILD
+++ b/libre/icedove-i18n/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Silva
pkgbase=icedove-i18n
-pkgver=16.0.2.1
+pkgver=17.0.1
pkgname=('icedove-i18n-ar'
'icedove-i18n-ast'
'icedove-i18n-be'
@@ -473,58 +473,58 @@ package_icedove-i18n-zh-tw() {
cd ${srcdir}
install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi"
}
-md5sums=('9c4a59c7da66e2354164c3a5bc7af21d'
- '1cc30ebb50c2ff783b07060fe14b4260'
- 'bd2a994f1b0aa8d71b7f432f582e08b5'
- '1b7d5f199b714e5d235cdadc89882c82'
- 'a5945807be0c8e205cf0f4be41d1f301'
- 'ec323d1ea8372afa236ed82d1f38bf62'
- '04985b1bb7a7255970de1c9a0d6b6c37'
- '143d16162ded3cf1ed99731e0ccd4cbc'
- 'ec04abda3d2eafd5cccad44b843d2191'
- 'a1273c8ba22f38f0304d44f52095541d'
- '06ff7794da97ef3cad3ccfde2a229db3'
- 'bb873b67b1e65eccf186622c1315e14b'
- '87ea24ef462fed8a3f6e74e25b210607'
- 'c7363deffa336c8470884ca7500ff583'
- '64d7b4490bbe3cdb25cc8633d46761d4'
- '1bc28fd43fbe54185e0f34161e2bb856'
- 'f90cedcac1daa1a7be9abc9a960bbde0'
- '326a063d3b5d0aff735a145dcbb51e01'
- '86ff061d2346b75b85e59374328d20f8'
- '83969caa207fa30dd016fee6bd2aa543'
- '68d50a5c356d62514bfa99b04776ed7c'
- 'f5ffaa9dc1da2412faf78a4920d19278'
- 'a76518ba680a2fc263de99099e0e1c53'
- 'e88f3c95cf4e51035429307f4f6a4eb5'
- 'c2573d6f463cdd69f6b37612f9ae997a'
- '8b17220cd897ea744978752b2ef11ab0'
- '4ee8b3d2e4fd7bf3353a910d76cbbaf8'
- 'f87d295343ecf5b1e21abe430b157c42'
- '74ce04669c8acf87a8b8878fb2653dc4'
- '5ffc16a8c701c8c2c133775a815d1e67'
- '6d6c1a7e31bf6301ee690509881a4395'
- '41c970fd7ef2224a63de7d562ce71b39'
- 'a4243831934d31aad648221190fe2b42'
- '6c1c023d67a35e4ed3a792bb365f360e'
- '0045f4bceaaddd57fa6c0b895a34feff'
- '18b359d881127defff20e549bb0c5b80'
- 'a295fbd180dfe3e009218aa2775ce332'
- '6beaeaf5bf67321fdef0ee6de968edaa'
- '92b29bc95a476d9cb75c5df075f353b9'
- 'fa757024edb1f1f794f77ecee8c07706'
- '8f21adb897625a2a27a040a8e88bed3f'
- '26b5ab6bb93b454702179c48c9da2e5b'
- 'f319345cdc962919830792644c66165d'
- '7f32885e485beab6822eb9ec0025bae7'
- 'edf019e6332d099d67b68f1f90da680c'
- 'e21836a77f143457ac7912ee0e6386dc'
- '24adc86b3fb496f3d27944a5027d5fa9'
- '7192e7c7d80cc8eb85e1f57defa0496c'
- 'f449ced45bb084ce0adda6df89b1ee31'
- '25e3ce79fc2c1e2164ce04821e683a29'
- '615138d3ed86797a168a0d5784f0c6fe'
- '7c83196da5ee2d01444450cca620c29d'
- '265f8447eee6e6b41ab8fdcf1a1dc154'
- '9889d38b50a7e2d095582ebf75cab9e2'
- '12b882986056bca65fdfc90806daf87b')
+md5sums=('15ededc2d92b095297c32682b1ea5556'
+ '21b066c8006bd37843873a0950b4dd17'
+ 'c531b388e48a2b964091cdabdc6ea843'
+ '02dd4a828cd62d3704b329cc0269c754'
+ 'aa058920d2e9e590a5f43371ec0c758a'
+ 'd2f6d97e73956b929812efc26cbb8a00'
+ '422ba52f874f376d97a74c79047bb07e'
+ 'ebc329dbdfd9533f237731f4ab13c0c7'
+ '372f5b371ef045fd9b1d87d0f5a02f1b'
+ 'f4833810e478a319360b144d1e4e5dd0'
+ 'dcd04ada6fc38908cd1a0b4c640d49b6'
+ 'f5805071746aaac4c977dc6104d81524'
+ '55fb0a3581661c71e8a8b4fdaa5f92c6'
+ 'f4f24e1b0a53d0dca2b8bef384173682'
+ '3beb64fc06de87f5b70f2ba08ab3359e'
+ '62d4a011ccdfdf4f24063caec6e881b2'
+ '230373349ab450147ff19f4afebde2ea'
+ 'c7eff1f39bf536a4da476d77a3e0a450'
+ '06a7c3143b493c96628e93a58f25550c'
+ '5017bdacb7ee1430fa73b9b7ca657497'
+ 'c7aa6657da6f2cd9dc90c323c6676bf9'
+ 'ee9a365773d95e7c31de8089aef0d847'
+ 'feebccca9f6eec21b81e26e1804b0140'
+ '65339aa37592def5a0fa6e5aaf416de5'
+ '64980f1186f4045574babcde77f11529'
+ '20f25644314ad2801db9156531ea290c'
+ 'fd7c8318ab9d946a49ef2873de0d8e0a'
+ 'd6612e0b47375fdb34341ed8386a621f'
+ '89295ed1c51be054d571609209641fa1'
+ 'b35e49dc04bf9134262ae7db57b0311b'
+ '15487ee85959928fa0b85fe99e3c7a82'
+ 'ed555ce92aa37545b4f62ea4bdca9187'
+ '5d83088d4bcd042acfecbb0a85215548'
+ '1f1a513aac9b1d3cbc6dce3e948c33ca'
+ '1b955a8dd7690991d06ced05fc2f1fae'
+ '1785e4bb27d71cc0226eab506f81669a'
+ 'fd9a007c75b8738f3b2e167087655526'
+ '6578b879762db29b40e1723ba59043d6'
+ 'afe8fff2c2707724d2ef5536180a0907'
+ 'b8befd7b5e781403c3c0797633f0f92b'
+ '2097f7218575732e448662b3d1d1a351'
+ '82c29288a115668f25d01d0e7175419f'
+ '8398d4a711dd73302b790a2b99d9e78f'
+ '1ed5155cd7f3be98b25d94a126d043bb'
+ '899f04c2629e648be0f32f1ec04b9b56'
+ '4af5b8985fdb1858c0c25b8452ca72fc'
+ '43189f0ad649e00cedc608c6197a6426'
+ 'aeed4c0b7e536c0b4f9b36a5dc3d1d63'
+ 'a8bbc0c2acf8defcf9c200cacd243536'
+ '9c35cfcbf9d66aa42abfaae4aa4a6937'
+ 'b19268362d73d7e3f66ff7f7f21ab6bd'
+ 'c45de9ad905bbdda655227e77b09a1ba'
+ '430bb7d6dc4037666fb452e5c2c03c83'
+ '6280326bb1fb7c2ddd5c3b5a5360651b'
+ '571688d2bce6597ae76a7ead8929420c')
--
cgit v1.2.3
From 34b4025bc7b0c6d8d47988decd140df38b1d98ac Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Mon, 26 Nov 2012 23:50:48 -0500
Subject: update libre/mozilla-searchplugins
* add duckduckgo html
* fix jamendo
* remove logless-search
* use the site's xml files when possible
---
libre/mozilla-searchplugins/PKGBUILD | 35 ++++++++++++++---------
libre/mozilla-searchplugins/duck-duck-go-lite.xml | 8 ------
libre/mozilla-searchplugins/internet-archive.xml | 0
libre/mozilla-searchplugins/jamendo-en.xml | 12 --------
libre/mozilla-searchplugins/jamendo-en.xml.in | 10 +++++++
libre/mozilla-searchplugins/logless-search.xml | 8 ------
libre/mozilla-searchplugins/parabola-packages.xml | 0
libre/mozilla-searchplugins/parabola-wiki-en.xml | 0
libre/mozilla-searchplugins/seeks-search.xml | 8 ------
libre/mozilla-searchplugins/wikipedia.xml | 15 ----------
libre/mozilla-searchplugins/yacy.xml | 9 ------
11 files changed, 31 insertions(+), 74 deletions(-)
mode change 100755 => 100644 libre/mozilla-searchplugins/PKGBUILD
delete mode 100755 libre/mozilla-searchplugins/duck-duck-go-lite.xml
mode change 100755 => 100644 libre/mozilla-searchplugins/internet-archive.xml
delete mode 100755 libre/mozilla-searchplugins/jamendo-en.xml
create mode 100644 libre/mozilla-searchplugins/jamendo-en.xml.in
delete mode 100755 libre/mozilla-searchplugins/logless-search.xml
mode change 100755 => 100644 libre/mozilla-searchplugins/parabola-packages.xml
mode change 100755 => 100644 libre/mozilla-searchplugins/parabola-wiki-en.xml
delete mode 100755 libre/mozilla-searchplugins/seeks-search.xml
delete mode 100755 libre/mozilla-searchplugins/wikipedia.xml
delete mode 100755 libre/mozilla-searchplugins/yacy.xml
(limited to 'libre')
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
old mode 100755
new mode 100644
index 288ce698d..11635526e
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -9,35 +9,42 @@
# Contributor: Muhammad 'MJ' Jassim
pkgname=mozilla-searchplugins
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=1
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
url="https://parabolagnulinux.org/"
source=(
- duck-duck-go-lite.xml
+ duckduckgo-html.xml::https://duckduckgo.com/opensearch_html.xml
+ duckduckgo-lite.xml::https://duckduckgo.com/opensearch_lite.xml
internet-archive.xml
- jamendo-en.xml
- logless-search.xml
+ jamendo-en.xml.in
+ jamendo.ico::http://www.jamendo.com/favicon.ico
parabola-packages.xml
parabola-wiki-en.xml
- seeks-search.xml
- wikipedia.xml
- yacy.xml
+ seeks-search.xml::http://www.seeks-project.info/search.php/opensearch.xml
+ yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml
+ wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
)
+build() {
+ cd "$srcdir"
+ sed "s,@icon@,$(base64 -w0 < jamendo.ico)," < jamendo-en.xml.in > jamendo-en.xml
+}
+
package() {
install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins"
install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
}
-md5sums=('e1bda0854de7d764f7401c81bb82b5ef'
+md5sums=('fde80774b91b3aba358d587c65139727'
+ 'd19e22a8e1e663905fb1ead60abd2a5d'
'462c68585461f8cdc23c93c46f6ee4cf'
- '2d492295c4308f9bba9ece28d8b3af2d'
- '937ac0e5392b060d93bd33e761fbfa51'
+ '0c9a3f48971aab8aa0cf2f5e2ff67292'
+ 'e50a847cec81357e8730e0d327515a9c'
'3c4a7f901bfe9000a702c68f7f78428c'
'5bf9ca2558026fa3f4ec52d8e64fee47'
- '86ccb1d02683e69e6bc0543cb77a06bc'
- 'c35f4971feff8387e0570d7a165eb6fa'
- '24528ca3f7f1e1a0ba735231aa3ac1de')
+ '3c68938db88b6ea552742718a08f3bf8'
+ 'bdb2640c643493063051bc72eeeff920'
+ 'cb281f07933210c812a6153f32109645')
diff --git a/libre/mozilla-searchplugins/duck-duck-go-lite.xml b/libre/mozilla-searchplugins/duck-duck-go-lite.xml
deleted file mode 100755
index 3142d3410..000000000
--- a/libre/mozilla-searchplugins/duck-duck-go-lite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-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/libre/mozilla-searchplugins/internet-archive.xml b/libre/mozilla-searchplugins/internet-archive.xml
old mode 100755
new mode 100644
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml b/libre/mozilla-searchplugins/jamendo-en.xml
deleted file mode 100755
index 91d6df6e4..000000000
--- a/libre/mozilla-searchplugins/jamendo-en.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-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/libre/mozilla-searchplugins/jamendo-en.xml.in b/libre/mozilla-searchplugins/jamendo-en.xml.in
new file mode 100644
index 000000000..96b3a008d
--- /dev/null
+++ b/libre/mozilla-searchplugins/jamendo-en.xml.in
@@ -0,0 +1,10 @@
+
+Jamendo (en)
+Search Jamendo.com English site for downloadable Creative Commons music
+UTF-8
+data:image/x-icon;base64,@icon@
+http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml
+http://www.jamendo.com/en
+
+
+
diff --git a/libre/mozilla-searchplugins/logless-search.xml b/libre/mozilla-searchplugins/logless-search.xml
deleted file mode 100755
index 1538d1ef0..000000000
--- a/libre/mozilla-searchplugins/logless-search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Logless Search
-Use logless.com to search the Internet in privacy, with no search logs.
-UTF-8
-data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
-
diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml
old mode 100755
new mode 100644
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
old mode 100755
new mode 100644
diff --git a/libre/mozilla-searchplugins/seeks-search.xml b/libre/mozilla-searchplugins/seeks-search.xml
deleted file mode 100755
index 5025f5a06..000000000
--- a/libre/mozilla-searchplugins/seeks-search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Seeks Search
-Real-time p2p pattern matching network for social websearch.
-UTF-8
-data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAwwAAAMMBnc7+MwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJCSURBVDiNpZJLSFRxGMV/f2fGGWcc8zI6U5qSmmVPyIW0kURoES1CMgODwgh72yZoU1EQRItMooLQLAiLBAsiaVGRBKFID0oqMpqy0UIdnWke1zuPe/8tNHtAwdTZfHyc75zDB0dUtiiXgAZAkBokcFlUtigyReEvSPsf8T8ZSAkYP3bz3w6TGiQ00OMgDTCM6QmQZgKr4zcDaUA8CnEN9NhM2h9g6KDrPxloIYiFp1NSgdnQIToBpTkrqaneQp5SyIexd1x/3MrngA+AEs9ialdvo8BVxJDfS2dvO0Pj76cdyg8r8lBHo0zqCflVDci+wR6pxqIyooXl1nPr5P72ehlLaDKkBmXvYI+MaGGpxafkrtZaWX5UkaLqRLG8c/AFL4eesLutDt1IkpFu51rTPWyWDBw2J97Rt+y4WENST2C12Liyp5u52fmsb16BeWneKhzWTFzOXNp23pr9zWJKZ75rAQBz7AqtjTdnOXu6gxynm1LPcsxqTKWr7yoIgfjeZgE2SwZqLIoQgshUmOHJTzOUYCTgY8D3jGQiifmptw+HSaGitJK2B2eYCI8zTyngZP0Fnnv7sVszmYqrNN8+xkR4nHxXIdurD/BwoJs3wwOYpQ6ByCQl7jKObDxNSA3icrpRY1HO3z1FliObhqp9HK87iz88hiszF7PJgj/kx9BBLGlSpJGEIs9C1ixbS5FnEaPBEbp6OxgNfgGgMLeYDRWbyclyMzjyikev7+Pzf8RkAVG2V+mUkk2p1QeQINK48Q3fpPIi5xKaPwAAAABJRU5ErkJggg==
-
-
-
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/wikipedia.xml b/libre/mozilla-searchplugins/wikipedia.xml
deleted file mode 100755
index 36b8ed494..000000000
--- a/libre/mozilla-searchplugins/wikipedia.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Wikipedia (en)
-Wikipedia, the free encyclopedia
-UTF-8
-data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-
-
-
-
-
-
-
-
-http://en.wikipedia.org/wiki/Special:Search
-
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
deleted file mode 100755
index 61201ad20..000000000
--- a/libre/mozilla-searchplugins/yacy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-YaCy
-YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer 'kupferhammer-keller'.
-UTF-8
-data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00
-
-
-
-
--
cgit v1.2.3
From 960da58d4a3e44e11ab23d73a136039981fe31fd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:08:38 -0200
Subject: iceweasel-17.0.1-2: replacing ddg lite to ddg html
---
libre/iceweasel-libre/#libre.patch# | 438 ++++++++++++++++++++++++++++++++++++
libre/iceweasel-libre/PKGBUILD | 4 +-
libre/iceweasel-libre/libre.patch | 24 +-
3 files changed, 452 insertions(+), 14 deletions(-)
create mode 100755 libre/iceweasel-libre/#libre.patch#
(limited to 'libre')
diff --git a/libre/iceweasel-libre/#libre.patch# b/libre/iceweasel-libre/#libre.patch#
new file mode 100755
index 000000000..54b84229e
--- /dev/null
+++ b/libre/iceweasel-libre/#libre.patch#
@@ -0,0 +1,438 @@
+diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
+--- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
++++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200
+@@ -37,11 +37,11 @@
+ // 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%");
+-pref("extensions.getAddons.getWithPerformance.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%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.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);
+@@ -194,7 +194,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.
+@@ -327,7 +327,7 @@
+ pref("browser.download.panel.removeFinishedDownloads", false);
+
+ // 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#search%20engines");
+
+ // pointer to the default engine name
+ pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
+@@ -584,7 +584,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-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300
+@@ -1,23 +1,23 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=Duck Duck Go (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
+-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
+
+ # URL for site-specific search engines
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
+
+ # increment this number when anything gets changed in the list below. This will
+ # cause Firefox to re-read these prefs and inject any new handlers into the
+@@ -27,19 +27,19 @@
+ gecko.handlerService.defaultHandlersVersion=3
+
+ # 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:
+-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
++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=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
+diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
+--- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
+@@ -143,7 +143,7 @@
+
+
+ <a> anchor
+- <a> a + href
++ <a> a + href
+
+
+ <abbr> abbr - extended text when mouseover.
+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+--- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
++++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
+@@ -294,6 +294,6 @@
+ oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+
+
+-
++
+
+
+diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
+--- mozilla-build.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
++++ mozilla-build/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300
+@@ -226,13 +226,13 @@
+ /* preferences for the Get Add-ons pane */
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* 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/lite/?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
+--- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
++++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
+@@ -69,6 +69,6 @@
+ label="setViewportScale"/>
+
+
+-
+
+diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
+--- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
+@@ -221,13 +221,12 @@
+ /* preferences for the Get Add-ons pane */
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* preference for the locale picker */
+ pref("extensions.getLocales.get.url", "");
+@@ -247,7 +246,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
+
+ 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/lite/?q=");
+
+ pref("accessibility.typeaheadfind", false);
+ pref("accessibility.typeaheadfind.timeout", 5000);
+diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
+--- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300
++++ mozilla-release/mobile/locales/en-US/chrome/region.properties 2012-06-15 02:17:43.446130868 -0300
+@@ -1,18 +1,18 @@
+ # Default search engine
+-browser.search.defaultenginename=Google
++browser.search.defaultenginename=Duck Duck Go (Lite)
+
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Google
++browser.search.order.1=Duck Duck Go (Lite)
+
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+-browser.contentHandlers.types.0.title=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=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
++keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
+
+ # increment this number when anything gets changed in the list below. This will
+ # cause Firefox to re-read these prefs and inject any new handlers into the
+@@ -22,11 +22,11 @@
+ gecko.handlerService.defaultHandlersVersion=2
+
+ # 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:
+-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
+diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
+--- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
++++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
+@@ -47,7 +47,7 @@
+ // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
+ // 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/lite/?q=");
+ pref("keyword.enabled", false);
+ pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+ pref("general.useragent.compatMode.firefox", false);
+diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
+--- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300
++++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300
+@@ -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 -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300
+@@ -11,13 +11,20 @@
+
@bookmarks_toolbarfolder@
+ @bookmarks_toolbarfolder_description@
+
+-
@getting_started@
++ Parabola GNU/Linux-libre
+
+-
@firefox_heading@
++ Parabola GNU/Linux-libre
+
+-
@firefox_help@
+- @firefox_customize@
+- @firefox_community@
+- @firefox_about@
++ Parabola GNU/Linux-libre
++ Parabola GNU/Linux-libre Packages
++ Parabola GNU/Linux-libre Wiki
++ Parabola GNU/Linux-libre Labs
++
++
Free Software Foundation
++
++
Free Software Foundation
++ LibrePlanet
++ Free addons
++ h-node
+
+
+diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
+@@ -38,104 +38,6 @@
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+-// If a definition requires additional params, check that the final search url
+-// is handled correctly by the engine.
+-const SEARCH_ENGINES = {
+- "Google": {
+- image: "data:image/png;base64," +
+- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
+- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
+- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
+- "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
+- "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
+- "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
+- "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
+- "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
+- "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
+- "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
+- "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
+- "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
+- "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
+- "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
+- "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
+- "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
+- "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
+- "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
+- "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
+- "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
+- "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
+- "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
+- "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
+- "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
+- "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
+- "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
+- "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
+- "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
+- "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
+- "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
+- "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
+- "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
+- "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
+- "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
+- "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
+- "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
+- "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
+- "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
+- "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
+- "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
+- "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
+- "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
+- "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
+- "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
+- "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
+- "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
+- "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
+- "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
+- "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
+- "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
+- "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
+- "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
+- "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
+- "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
+- "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
+- "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
+- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
+- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+- , params: "source=hp&channel=np"
+- }
+-
+-, "Яндекс":
+- {
+- image: "data:image/png;base64," +
+- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
+- "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
+- "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
+- "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
+- "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
+- "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
+- "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
+- "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
+- "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
+- "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
+- "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
+- "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
+- "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
+- "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
+- "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
+- "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
+- "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
+- "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
+- "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
+- "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
+- "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
+- "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
+- "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
+- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
+- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
+- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
+- }
+-};
+-
+ // The process of adding a new default snippet involves:
+ // * add a new entity to aboutHome.dtd
+ // * add a for it in aboutHome.xhtml
+@@ -143,7 +45,7 @@
+ // The 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"
+-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
++, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
+ ];
+
+ const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 185f1c039..ab35bf55f 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '8768dfc39e9f1057c2956bf4405ae58e'
+ 'a54ac42a670b72deb38f17b571740a6e'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 7e7b7290f..183bcd4c6 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -51,13 +51,13 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
@@ -1,23 +1,23 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (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 (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
+browser.search.order.3=YaCy
@@ -77,7 +77,7 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
# 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=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -119,7 +119,7 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b
<a> anchor
- <a> a + href
-+ <a> a + href
++ <a> a + href
<abbr> abbr - extended text when mouseover.
@@ -131,7 +131,7 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
-
-+
++
diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
@@ -163,7 +163,7 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
pref("keyword.enabled", true);
-pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -175,7 +175,7 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
-
diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
@@ -206,7 +206,7 @@ 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/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -216,11 +216,11 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
@@ -1,18 +1,18 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
# This is the default set of web based feed handlers shown in the reader
# selection UI
@@ -235,7 +235,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
# 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/lite/?q=site%3A{moz:domain}+{searchTerms}
++keyword.URL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -265,7 +265,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/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
--
cgit v1.2.3
From 3ca21aa48b6d638985d41b8c3d298993d0c7c4f4 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:09:29 -0200
Subject: iceape-libre-2.7.11.1-2: replacing ddg lite to ddg html
---
libre/iceape-libre/PKGBUILD | 4 ++--
libre/iceape-libre/libre.patch | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'libre')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2247f0a8a..2325b8cd7 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
arch=('i586' 'i686' 'x86_64' 'mips64el')
license=('GPL2' 'MPL' 'LGPL')
@@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- '433b5cd7f02f0ed8861237e877f51ebf')
+ 'ed7a06c9e73a9f3e023d7bff9878504b')
build() {
export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index d25f8dbf5..9947b1bbe 100755
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -3,13 +3,13 @@
@@ -1,23 +1,23 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (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 (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
+browser.search.order.3=YaCy
@@ -29,7 +29,7 @@
# to be searched and the user's search query. Place them in the appropriate location
# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -70,7 +70,7 @@
// 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", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
@@ -125,7 +125,7 @@
browser.startup.homepage=about:
browser.throbber.url=about:
-browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=https://duckduckgo.com/lite/?q=
++browser.search.defaulturl=https://duckduckgo.com/html/?q=
-browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
-browser.translation.serviceDomain=translate.google.com
@@ -151,12 +151,12 @@
@@ -1,10 +1,10 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (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 (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
# More information about this update link available in the update wizard.
@@ -187,7 +187,7 @@
- Google
- Google Groups
- Google News
-+ Duck Duck Go (Lite)
++ Duck Duck Go (HTML)
#unfilter emptyLines
--
cgit v1.2.3
From b50bf5eaf7f83e21df1d415103abd7f17c5439cb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:10:05 -0200
Subject: icecat-14.0-3: replacing ddg lite to ddg html
---
libre/icecat/PKGBUILD | 4 ++--
libre/icecat/libre.patch | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index fd050fb27..cb4ef9688 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,7 +16,7 @@
_pgo=false
pkgname=icecat
pkgver=14.0
-pkgrel=2
+pkgrel=3
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
- 72e6bb9ebebe555b4ab961add3df3b27
+ 0fe48b455f9b0ad7993071cd766b3bbf
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 18dfcc177..b5a9acc0b 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -142,13 +142,13 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
@@ -1,28 +1,28 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (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 (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
+browser.search.order.3=YaCy
@@ -169,14 +169,14 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
# 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/lite/?q=
++keyword.URL=https://duckduckgo.com/html/?q=
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
# to be searched and the user's search query. Place them in the appropriate location
# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
@@ -240,7 +240,7 @@ diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.htm
<a> anchor
- <a> a + href
-+ <a> a + href
++ <a> a + href
<abbr> abbr - extended text when mouseover.
@@ -252,7 +252,7 @@ diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
-
-+
++
diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
@@ -263,7 +263,7 @@ diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
-
diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
@@ -296,11 +296,11 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
@@ -1,18 +1,18 @@
# Default search engine
-browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
# This is the default set of web based feed handlers shown in the reader
# selection UI
@@ -315,7 +315,7 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
# 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/lite/?q=
++keyword.URL=https://duckduckgo.com/html/?q=
# 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
@@ -366,7 +366,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/lite/?q=");
++pref("keyword.URL","https://duckduckgo.com/html/?q=");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -378,7 +378,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/lite/?q=");
++pref("keyword.URL","https://duckduckgo.com/html/?q=");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
--
cgit v1.2.3
From e62916728a432c558487dd94439b193a851bbe6b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 13:15:45 -0200
Subject: iceweasel-libre-17.0.1-2: removing unnecessary file
---
libre/iceweasel-libre/#libre.patch# | 438 ------------------------------------
1 file changed, 438 deletions(-)
delete mode 100755 libre/iceweasel-libre/#libre.patch#
(limited to 'libre')
diff --git a/libre/iceweasel-libre/#libre.patch# b/libre/iceweasel-libre/#libre.patch#
deleted file mode 100755
index 54b84229e..000000000
--- a/libre/iceweasel-libre/#libre.patch#
+++ /dev/null
@@ -1,438 +0,0 @@
-diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
---- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
-+++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200
-@@ -37,11 +37,11 @@
- // 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%");
--pref("extensions.getAddons.getWithPerformance.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%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.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);
-@@ -194,7 +194,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.
-@@ -327,7 +327,7 @@
- pref("browser.download.panel.removeFinishedDownloads", false);
-
- // 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#search%20engines");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -584,7 +584,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-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300
-@@ -1,23 +1,23 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (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
--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
-
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -27,19 +27,19 @@
- gecko.handlerService.defaultHandlersVersion=3
-
- # 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:
--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
-+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=Mibbit
--gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
-diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
---- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
-+++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
-@@ -143,7 +143,7 @@
-
-
- <a> anchor
-- <a> a + href
-+ <a> a + href
-
-
- <abbr> abbr - extended text when mouseover.
-diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
-+++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
-@@ -294,6 +294,6 @@
- oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-
-
--
-+
-
-
-diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
---- mozilla-build.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
-+++ mozilla-build/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300
-@@ -226,13 +226,13 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- /* 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/lite/?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
---- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
-+++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
-@@ -69,6 +69,6 @@
- label="setViewportScale"/>
-
-
--
-
-diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
---- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
-@@ -221,13 +221,12 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-@@ -247,7 +246,7 @@
- pref("dom.disable_window_open_dialog_feature", true);
-
- 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/lite/?q=");
-
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
---- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-release/mobile/locales/en-US/chrome/region.properties 2012-06-15 02:17:43.446130868 -0300
-@@ -1,18 +1,18 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
--browser.contentHandlers.types.0.title=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=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -22,11 +22,11 @@
- gecko.handlerService.defaultHandlersVersion=2
-
- # 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:
--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
-diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
---- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
-+++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // 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/lite/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300
-+++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300
-@@ -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 -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300
-@@ -11,13 +11,20 @@
-
@bookmarks_toolbarfolder@
- @bookmarks_toolbarfolder_description@
-
--
@getting_started@
-+ Parabola GNU/Linux-libre
-
--
@firefox_heading@
-+ Parabola GNU/Linux-libre
-
--
@firefox_help@
-- @firefox_customize@
-- @firefox_community@
-- @firefox_about@
-+ Parabola GNU/Linux-libre
-+ Parabola GNU/Linux-libre Packages
-+ Parabola GNU/Linux-libre Wiki
-+ Parabola GNU/Linux-libre Labs
-+
-+
Free Software Foundation
-+
-+
Free Software Foundation
-+ LibrePlanet
-+ Free addons
-+ h-node
-
-
-diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
-@@ -38,104 +38,6 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--// If a definition requires additional params, check that the final search url
--// is handled correctly by the engine.
--const SEARCH_ENGINES = {
-- "Google": {
-- image: "data:image/png;base64," +
-- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
-- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
-- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
-- "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" +
-- "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" +
-- "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" +
-- "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" +
-- "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" +
-- "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" +
-- "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" +
-- "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" +
-- "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" +
-- "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" +
-- "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" +
-- "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" +
-- "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" +
-- "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" +
-- "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" +
-- "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" +
-- "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" +
-- "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" +
-- "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" +
-- "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" +
-- "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" +
-- "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" +
-- "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" +
-- "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" +
-- "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" +
-- "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" +
-- "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" +
-- "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" +
-- "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" +
-- "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" +
-- "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" +
-- "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" +
-- "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" +
-- "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" +
-- "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" +
-- "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" +
-- "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" +
-- "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" +
-- "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" +
-- "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" +
-- "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" +
-- "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" +
-- "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" +
-- "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" +
-- "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" +
-- "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" +
-- "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" +
-- "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" +
-- "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" +
-- "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" +
-- "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" +
-- "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" +
-- "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
-- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
-- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
-- , params: "source=hp&channel=np"
-- }
--
--, "Яндекс":
-- {
-- image: "data:image/png;base64," +
-- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
-- "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
-- "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
-- "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
-- "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
-- "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
-- "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
-- "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
-- "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
-- "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
-- "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
-- "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
-- "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
-- "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
-- "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
-- "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
-- "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
-- "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
-- "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
-- "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
-- "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
-- "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
-- "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
-- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
-- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
-- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
-- }
--};
--
- // The process of adding a new default snippet involves:
- // * add a new entity to aboutHome.dtd
- // * add a for it in aboutHome.xhtml
-@@ -143,7 +45,7 @@
- // The 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"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
-+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
- ];
-
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
--
cgit v1.2.3
From ba6fabfc73ead8f4f2c344e1f61e99b9a616457f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 27 Nov 2012 14:12:36 -0200
Subject: kdebase-runtime-libre-4.9.3-1.1: adding ddg html support for KDE
---
libre/kdebase-runtime-libre/PKGBUILD | 7 +-
.../kdebase-runtime-libre/duckduckgo_html.desktop | 113 +++++++++++++++++++++
.../kdebase-runtime-libre/duckduckgo_lite.desktop | 4 +-
3 files changed, 121 insertions(+), 3 deletions(-)
create mode 100644 libre/kdebase-runtime-libre/duckduckgo_html.desktop
(limited to 'libre')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 80537f26f..164cd19e9 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
pkgver=4.9.3
-pkgrel=1
+pkgrel=1.1
pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -24,8 +24,10 @@ conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
+ 'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
sha1sums=('5245c1152680ad22dff21c44dad531eda736e769'
+ 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
build() {
@@ -34,6 +36,9 @@ build() {
# Removing non-privacy search providers
rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+# Adding DuckDuckGo HTML
+ cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+
# Adding DuckDuckGo Lite
cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
diff --git a/libre/kdebase-runtime-libre/duckduckgo_html.desktop b/libre/kdebase-runtime-libre/duckduckgo_html.desktop
new file mode 100644
index 000000000..ba6a602ad
--- /dev/null
+++ b/libre/kdebase-runtime-libre/duckduckgo_html.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Charset=
+Hidden=false
+Keys=duckduckgo,dd,dukgo
+Name=Duck Duck Go HTML
+Name[ar]=Duck Duck Go HTML
+Name[ast]=Duck Duck Go HTML
+Name[bg]=Duck Duck Go HTML
+Name[bn]=Duck Duck Go HTML
+Name[bs]=Dak dak go HTML
+Name[ca]=Duck Duck Go HTML
+Name[ca@valencia]=Duck Duck Go HTML
+Name[cs]=Duck Duck Go HTML
+Name[da]=Duck Duck Go HTML
+Name[de]=Duck Duck Go HTML
+Name[el]=Duck Duck Go HTML
+Name[en_GB]=Duck Duck Go HTML
+Name[eo]=Duck Duck Go HTML
+Name[es]=Duck Duck Go HTML
+Name[et]=Duck Duck Go HTML
+Name[eu]=Duck Duck Go HTML
+Name[fa]=Duck Duck Go HTML
+Name[fi]=Duck Duck Go HTML
+Name[fr]=Duck Duck Go HTML
+Name[ga]=Duck Duck Go HTML
+Name[gl]=Duck Duck Go HTML
+Name[gu]=Duck Duck Go HTML
+Name[he]=Duck Duck Go HTML
+Name[hi]=Duck Duck Go HTML
+Name[hr]=Duck Duck Go HTML
+Name[hu]=Duck Duck Go HTML
+Name[ia]=Duck Duck Go HTML
+Name[id]=Duck Duck Go HTML
+Name[is]=Duck Duck Go HTML
+Name[it]=Duck Duck Go HTML
+Name[ja]=Duck Duck Go HTML
+Name[kk]=Duck Duck Go HTML
+Name[km]=Duck Duck Go HTML
+Name[kn]=Duck Duck Go HTML
+Name[ko]=Duck Duck Go HTML
+Name[lt]=Duck Duck Go HTML
+Name[lv]=Duck Duck Go HTML
+Name[ml]=Duck Duck Go HTML
+Name[nb]=Duck Duck Go HTML
+Name[nds]=Duck Duck Go HTML
+Name[nl]=Duck Duck Go HTML
+Name[nn]=Duck Duck Go HTML
+Name[pa]=Duck Duck Go HTML
+Name[pl]=Duck Duck Go HTML
+Name[pt]=Duck Duck Go HTML
+Name[pt_BR]=Duck Duck Go HTML
+Name[ro]=Duck Duck Go HTML
+Name[ru]=Поиск Duck Duck Go HTML
+Name[si]=Duck Duck Go HTML
+Name[sk]=Duck Duck Go HTML
+Name[sl]=Duck Duck Go HTML
+Name[sr]=Duck Duck Go HTML
+Name[sr@ijekavian]=Duck Duck Go HTML
+Name[sr@ijekavianlatin]=Duck Duck Go HTML
+Name[sr@latin]=Duck Duck Go HTML
+Name[sv]=Duck Duck Go HTML
+Name[tg]=Duck Duck Go HTML
+Name[th]=Duck Duck Go HTML
+Name[tr]=Duck Duck Go HTML
+Name[ug]=Duck Duck Go HTML
+Name[uk]=Duck Duck Go HTML
+Name[vi]=Duck Duck Go HTML
+Name[wa]=Duck Duck Go HTML
+Name[x-test]=xxDuck Duck Go HTMLxx
+Name[zh_CN]=Duck Duck Go HTML
+Name[zh_TW]=Duck Duck Go HTML
+Query=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[bg]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[bn]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ca]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[cs]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[da]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[de]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[el]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[eo]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[es]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[et]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[fi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[fr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[gl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[hi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[hu]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ia]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[it]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[kk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[km]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[nb]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[nl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pt]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pt_BR]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ro]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ru]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@ijekavian]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@ijekavianlatin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@latin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sv]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[tr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[uk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[wa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[x-test]=xxhttp://duckduckgo.com/html/?q=\\{@}&t=KDExx
+Query[zh_CN]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[zh_TW]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+ServiceTypes=SearchProvider
+Type=Service
diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
index 2b875b4c1..0da670dbe 100644
--- a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
+++ b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
@@ -1,13 +1,13 @@
[Desktop Entry]
Charset=
Hidden=false
-Keys=duckduckgo,dd,dukgo
+Keys=duckduckgolite,ddlite,dukgolite
Name=Duck Duck Go Lite
Name[ar]=Duck Duck Go Lite
Name[ast]=Duck Duck Go Lite
Name[bg]=Duck Duck Go Lite
Name[bn]=Duck Duck Go Lite
-Name[bs]=Dak dak go lite
+Name[bs]=Dak dak go Lite
Name[ca]=Duck Duck Go Lite
Name[ca@valencia]=Duck Duck Go Lite
Name[cs]=Duck Duck Go Lite
--
cgit v1.2.3
From a976c4f12966caf5f25500850b343add29093532 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Tue, 27 Nov 2012 21:42:10 -0500
Subject: add libre/chroottools
---
libre/chroottools/PKGBUILD | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 libre/chroottools/PKGBUILD
(limited to 'libre')
diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD
new file mode 100644
index 000000000..74300eaec
--- /dev/null
+++ b/libre/chroottools/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Luke Shumaker
+
+pkgname=chroottools
+pkgver=20121127
+pkgdesc='Chroot tools for Arch and Parabola package maintainers'
+url='http://projects.parabolagnulinux.org/packages/chroottools.git/'
+license=('GPL')
+
+replaces=(devtools)
+provides=(devtools)
+conflicts=(devtools)
+
+pkgrel=1
+arch=('any')
+depends=(
+ 'namcap' # to check packages made by makechrootpkg
+ 'arch-install-scripts' # for pacstrap, used to make chroots
+)
+source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2")
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make PREFIX=/usr
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make PREFIX=/usr DESTDIR=${pkgdir} install
+}
+
+md5sums=('d80421f0bbc03feb56a77d8fa39c7c99')
--
cgit v1.2.3
From 37e1355811288653693f10fabdf9c1d81b95b7ec Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Tue, 27 Nov 2012 21:50:36 -0500
Subject: mv java/makepkg-git libre/
---
java/makepkg-git/PKGBUILD | 48 ----------------------------------------------
libre/makepkg-git/PKGBUILD | 48 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 48 deletions(-)
delete mode 100644 java/makepkg-git/PKGBUILD
create mode 100644 libre/makepkg-git/PKGBUILD
(limited to 'libre')
diff --git a/java/makepkg-git/PKGBUILD b/java/makepkg-git/PKGBUILD
deleted file mode 100644
index a8542c318..000000000
--- a/java/makepkg-git/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
-# Maintainer: Dan McGee
-# Maintainer: Dave Reisner
-
-_pkgname=pacman
-pkgname=makepkg-git
-_relver=4.0.3
-_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
-pkgver=${_relver}.git
-
-provides=($_pkgname=$pkgver)
-replaces=(pacman-makepkg-git)
-conflicts=(pacman-makepkg-git)
-
-pkgrel=1
-
-pkgdesc="Pacman's makepkg, built from git sources"
-#arch=('i686' 'x86_64' 'mips64el')
-arch=('any')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-#groups=('base')
-depends=('bash' 'libarchive>=3.0.2' 'curl>=7.19.4' 'gpgme')
-makedepends=('asciidoc')
-optdepends=('fakeroot: for makepkg usage as normal user')
-#backup=(etc/pacman.conf etc/makepkg.conf)
-#install=pacman.install
-options=(!libtool)
-source=(https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz)
-md5sums=('4013517cf9016c920b525611bd63d6dc')
-
-build() {
- cd $srcdir/$_pkgname-$_gitver
-
- ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var
- make
-}
-
-check() {
- make -C "$_pkgname-$_gitver" check
-}
-
-package() {
- install -Dm755 $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg-git
-}
diff --git a/libre/makepkg-git/PKGBUILD b/libre/makepkg-git/PKGBUILD
new file mode 100644
index 000000000..a8542c318
--- /dev/null
+++ b/libre/makepkg-git/PKGBUILD
@@ -0,0 +1,48 @@
+# vim: set ts=2 sw=2 et:
+# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
+# Maintainer: Dan McGee
+# Maintainer: Dave Reisner
+
+_pkgname=pacman
+pkgname=makepkg-git
+_relver=4.0.3
+_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
+pkgver=${_relver}.git
+
+provides=($_pkgname=$pkgver)
+replaces=(pacman-makepkg-git)
+conflicts=(pacman-makepkg-git)
+
+pkgrel=1
+
+pkgdesc="Pacman's makepkg, built from git sources"
+#arch=('i686' 'x86_64' 'mips64el')
+arch=('any')
+url="http://www.archlinux.org/pacman/"
+license=('GPL')
+#groups=('base')
+depends=('bash' 'libarchive>=3.0.2' 'curl>=7.19.4' 'gpgme')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+#backup=(etc/pacman.conf etc/makepkg.conf)
+#install=pacman.install
+options=(!libtool)
+source=(https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz)
+md5sums=('4013517cf9016c920b525611bd63d6dc')
+
+build() {
+ cd $srcdir/$_pkgname-$_gitver
+
+ ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ make -C "$_pkgname-$_gitver" check
+}
+
+package() {
+ install -Dm755 $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg-git
+}
--
cgit v1.2.3
From 3f315b68d2ae2a4d5406a1b92528d1a1d6d13b76 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 13:22:18 -0200
Subject: iceweasel-libre-17.0.1-3: fixing libre.patch
---
libre/iceweasel-libre/PKGBUILD | 4 +-
libre/iceweasel-libre/libre.patch | 148 +++++++++++++++-----------------------
2 files changed, 61 insertions(+), 91 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index ab35bf55f..7ac6debab 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=3
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'a54ac42a670b72deb38f17b571740a6e'
+ 'f617d556dc5c1ce0d47d2b69034b82a4'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 183bcd4c6..c29a3565c 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -45,10 +45,12 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
// 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-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300
-@@ -1,23 +1,23 @@
+diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
+--- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200
++++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 12:54:19.326326121 -0200
+@@ -3,25 +3,21 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (HTML)
@@ -57,20 +59,19 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
-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=Duck Duck Go (HTML)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
++
++# Keyword URL (for location bar searches)
++keyword.URL=https://duckduckgo.com/?q=
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -81,25 +82,20 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
# 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 @@
+@@ -30,20 +26,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
@@ -112,8 +108,8 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
+gecko.handlerService.schemes.ircs.0.name=Freenode
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
---- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
-+++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
+--- iceweasel-13.0.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300
++++ iceweasel-13.0/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
@@ -143,7 +143,7 @@
@@ -124,8 +120,8 @@ diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/b
<abbr> abbr - extended text when mouseover.
diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
-+++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
+--- iceweasel-13.0.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300
++++ iceweasel-13.0/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300
@@ -294,6 +294,6 @@
oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
@@ -135,8 +131,8 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
---- mozilla-build.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
-+++ mozilla-build/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300
+--- iceweasel-14.0.1.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
++++ iceweasel-14.0.1/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300
@@ -226,13 +226,13 @@
/* preferences for the Get Add-ons pane */
pref("extensions.getAddons.cache.enabled", true);
@@ -168,8 +164,8 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
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
---- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300
-+++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300
+--- 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
@@ -69,6 +69,6 @@
label="setViewportScale"/>
@@ -179,8 +175,8 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
remote="true"/>
diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
---- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
+--- iceweasel-14.0.1.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300
++++ iceweasel-14.0.1/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300
@@ -221,13 +221,12 @@
/* preferences for the Get Add-ons pane */
pref("extensions.getAddons.cache.enabled", true);
@@ -210,56 +206,50 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
---- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-release/mobile/locales/en-US/chrome/region.properties 2012-06-15 02:17:43.446130868 -0300
-@@ -1,18 +1,18 @@
+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 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (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
++browser.search.order.1=Duck Duck Go (HTML)
# 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=site%3A{moz:domain}+{searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -22,11 +22,11 @@
- gecko.handlerService.defaultHandlersVersion=2
-
- # The default set of protocol handlers for webcal:
+-
+-# 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
+-# profile database. Note that "new" is defined as "has a different URL"; this
+-# means that it's not possible to update the name of existing handler, so
+-# don't make any spelling errors here.
+-gecko.handlerService.defaultHandlersVersion=2
+-
+-# 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
++keyword.URL=https://duckduckgo.com/?q=
diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
---- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300
-+++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300
+--- 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
@@ -47,7 +47,7 @@
// SYNTAX HINTS: dashes are delimiters. Use underscores instead.
// The first character after a period must be alphabetic.
@@ -269,29 +259,9 @@ diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/mod
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300
-+++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300
-@@ -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 -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300
+--- iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
++++ iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300
@@ -11,13 +11,20 @@
@bookmarks_toolbarfolder@
@bookmarks_toolbarfolder_description@
@@ -320,8 +290,8 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
+--- iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
++++ iceweasel-13.0/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
@@ -38,104 +38,6 @@
*
* ***** END LICENSE BLOCK ***** */
--
cgit v1.2.3
From e0f288f534770ed346b4e477e9468881aebde522 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 16:49:21 -0200
Subject: iceweasel-libre-17.0.1-3: fixing more parts on libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 42 +++++++++++++++++++++++++++++----------
2 files changed, 32 insertions(+), 12 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 7ac6debab..a0049d64b 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'f617d556dc5c1ce0d47d2b69034b82a4'
+ '9814ffe0b0bf122b129f41320614ea36'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index c29a3565c..922102e70 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,6 +1,6 @@
-diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
---- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
-+++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200
+diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/browser/app/profile/firefox.js
+--- iceweasel-17.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
++++ iceweasel-17.0/browser/app/profile/firefox.js 2012-11-28 16:33:37.105547392 -0200
@@ -37,11 +37,11 @@
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
@@ -27,7 +27,16 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
// restart.
-@@ -327,7 +327,7 @@
+@@ -210,7 +210,7 @@
+ pref("keyword.enabled", true);
+ // Override the default keyword.URL. Empty value means
+ // "use the search service's default engine"
+-pref("keyword.URL", "");
++pref("keyword.URL", "https://duckduckgo.com/?q=");
+
+ pref("general.skins.selectedSkin", "classic/1.0");
+
+@@ -340,7 +340,7 @@
pref("browser.download.panel.removeFinishedDownloads", false);
// search engines URL
@@ -36,7 +45,7 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
// pointer to the default engine name
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -584,7 +584,7 @@
+@@ -582,7 +582,7 @@
pref("accessibility.typeaheadfind.flashBar", 1);
// plugin finder service url
@@ -45,10 +54,24 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
// 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);
+@@ -1184,13 +1184,3 @@
+ // might keep around more than this, but we'll try to get down to this value).
+ // (This is intentionally on the high side; see bug 746055.)
+ pref("image.mem.max_decoded_image_kb", 256000);
+-
+-// Example social provider
+-pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
+-// Comma-separated list of nsIURI::prePaths that are allowed to activate
+-// built-in social functionality.
+-pref("social.activation.whitelist", "https://www.facebook.com");
+-pref("social.sidebar.open", true);
+-pref("social.sidebar.unload_timeout_ms", 10000);
+-pref("social.active", false);
+-pref("social.toast-notifications.enabled", true);
diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
--- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200
-+++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 12:54:19.326326121 -0200
-@@ -3,25 +3,21 @@
++++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 16:25:11.411107262 -0200
+@@ -3,25 +3,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Default search engine
@@ -69,9 +92,6 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
+browser.search.order.1=Duck Duck Go (HTML)
+browser.search.order.2=Seeks Search
+browser.search.order.3=YaCy
-+
-+# Keyword URL (for location bar searches)
-+keyword.URL=https://duckduckgo.com/?q=
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -82,7 +102,7 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
# 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,20 +26,10 @@
+@@ -30,20 +23,10 @@
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=3
--
cgit v1.2.3
From deba1038f49ba89c7decdba2123896f22644d647 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 17:11:29 -0200
Subject: iceweasel-libre-17.0.1-3: fixing duckduckgo url on libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index a0049d64b..78fe9e946 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '9814ffe0b0bf122b129f41320614ea36'
+ '8686d39ea314c2c7df43aad44279b7f1'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 922102e70..5b1b94552 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -32,7 +32,7 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
// Override the default keyword.URL. Empty value means
// "use the search service's default engine"
-pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
pref("general.skins.selectedSkin", "classic/1.0");
@@ -266,7 +266,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/?q=
++keyword.URL=https://duckduckgo.com/html/?q=
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
--
cgit v1.2.3
From 88a90373fe97bcd3fbe1052e9d11bcaac235f7fb Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Wed, 28 Nov 2012 15:46:16 -0500
Subject: makepkg-git: use the .tar for the source
---
libre/makepkg-git/PKGBUILD | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/makepkg-git/PKGBUILD b/libre/makepkg-git/PKGBUILD
index a8542c318..60453a927 100644
--- a/libre/makepkg-git/PKGBUILD
+++ b/libre/makepkg-git/PKGBUILD
@@ -1,7 +1,8 @@
# vim: set ts=2 sw=2 et:
# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
-# Maintainer: Dan McGee
-# Maintainer: Dave Reisner
+# Maintainer: Luke Shumaker
+# Maintainer (Arch): Dan McGee
+# Maintainer (Arch): Dave Reisner
_pkgname=pacman
pkgname=makepkg-git
@@ -13,7 +14,7 @@ provides=($_pkgname=$pkgver)
replaces=(pacman-makepkg-git)
conflicts=(pacman-makepkg-git)
-pkgrel=1
+pkgrel=2
pkgdesc="Pacman's makepkg, built from git sources"
#arch=('i686' 'x86_64' 'mips64el')
@@ -27,8 +28,8 @@ optdepends=('fakeroot: for makepkg usage as normal user')
#backup=(etc/pacman.conf etc/makepkg.conf)
#install=pacman.install
options=(!libtool)
-source=(https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz)
-md5sums=('4013517cf9016c920b525611bd63d6dc')
+source=(https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar)
+md5sums=('2152bdff59dcab8e7d36103a4756e5bf')
build() {
cd $srcdir/$_pkgname-$_gitver
--
cgit v1.2.3
From 12f5a522133422c59df5328331e22af1eaf32935 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Wed, 28 Nov 2012 15:46:31 -0500
Subject: bump libre/libretools
---
libre/libretools/PKGBUILD | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index bd1d8e59f..9217b4d02 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,15 +4,16 @@
pkgbase=libretools
pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=20121113
-pkgdesc="Scripts for Parabola development"
+pkgver=20121128
+pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/libretools.git/"
license=('GPL3+')
pkgrel=1
arch=('any')
-depends=(openssh rsync git wget devtools tokyocabinet)
-source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar.bz2)
+groups=(base-devel)
+depends=(openssh rsync git wget chroottools tokyocabinet)
+source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar)
build() {
cd "$srcdir/$pkgbase-$pkgver"
@@ -44,4 +45,4 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('966fb9828f55f58e2aa974065e726621')
+md5sums=('4c730066c2152f929ca63424019b165a')
--
cgit v1.2.3
From aaa3e32882eb2fa64659e84166ac1d02377a6600 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Wed, 28 Nov 2012 15:46:53 -0500
Subject: bump libre/chroottools
---
libre/chroottools/PKGBUILD | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'libre')
diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD
index 74300eaec..d48b9015b 100644
--- a/libre/chroottools/PKGBUILD
+++ b/libre/chroottools/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luke Shumaker
pkgname=chroottools
-pkgver=20121127
+pkgver=20121128.1
pkgdesc='Chroot tools for Arch and Parabola package maintainers'
url='http://projects.parabolagnulinux.org/packages/chroottools.git/'
license=('GPL')
@@ -13,10 +13,11 @@ conflicts=(devtools)
pkgrel=1
arch=('any')
depends=(
- 'namcap' # to check packages made by makechrootpkg
'arch-install-scripts' # for pacstrap, used to make chroots
+ 'curl'
+ 'namcap' # to check packages made by makechrootpkg
)
-source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2")
+source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar")
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,4 +29,4 @@ package() {
make PREFIX=/usr DESTDIR=${pkgdir} install
}
-md5sums=('d80421f0bbc03feb56a77d8fa39c7c99')
+md5sums=('8f9b36b50466a278e02e29f0ca06d267')
--
cgit v1.2.3
From 98e6613af5c36d274cac4d2731101e8925b171f9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 19:40:41 -0200
Subject: filesystem-2012.11-1: updating version, drop media and empty fstab
---
libre/filesystem/PKGBUILD | 12 ++++----
libre/filesystem/fstab | 1 -
libre/filesystem/parabola.7.txt | 63 ++++++++++++++++++++++++-----------------
3 files changed, 43 insertions(+), 33 deletions(-)
(limited to 'libre')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 6fc74fe5a..c024b5700 100755
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169557 2012-10-23 14:38:06Z tomegun $
+# $Id: PKGBUILD 171894 2012-11-22 14:54:47Z tomegun $
# Maintainer: Tom Gundersen
# Maintainer (Parabola): Nicolás Reynolds
# Maintainer (Parabola): André Silva
pkgname=filesystem
-pkgver=2012.10
-pkgrel=2
+pkgver=2012.11
+pkgrel=1
pkgdesc='Base filesystem for Parabola'
arch=('any')
license=('GPL')
@@ -33,7 +33,7 @@ package() {
#
# setup root filesystem
#
- for d in boot dev etc home media mnt usr var opt srv/http run; do
+ for d in boot dev etc home mnt usr var opt srv/http run; do
install -d -m755 ${d}
done
install -d -m555 proc
@@ -98,7 +98,7 @@ md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
'6e488ffecc8ba142c0cf7e2d7aeb832e'
'455b78cada80f40b6f6968f5cbd97a2e'
'01249bb0ba4468f95e2cc3a627f5e6e3'
- 'ca716f853860199c1286e7939b2f2666'
+ '693c97f2c9a519bb97a17008e92c2b74'
'1745349eb24ed21b4cfaa6f423bddb76'
'7bc65f234dfb6abf24e7c3b03e86f4ff'
'd41d8cd98f00b204e9800998ecf8427e'
@@ -108,5 +108,5 @@ md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
'677523dbe94b79299aa91b35ed8203b6'
'f3b6ae7db8adffaaa4bffc6099dcbd50'
'a8a962370cd0128465d514e6a1f74130'
- '9f445ef4f7785d04504886fb223ee401'
+ 'd5732ffdb3488e1383d4ea199343e767'
'3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab
index f7f9298d4..b6716c14a 100755
--- a/libre/filesystem/fstab
+++ b/libre/filesystem/fstab
@@ -2,4 +2,3 @@
# /etc/fstab: static file system information
#
#
-tmpfs /tmp tmpfs nodev,nosuid 0 0
diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt
index 23a44bb22..60e1121e0 100644
--- a/libre/filesystem/parabola.7.txt
+++ b/libre/filesystem/parabola.7.txt
@@ -14,67 +14,78 @@ Overview of the basic configuration of Parabola GNU/Linux-libre.
DESCRIPTION
-----------
-Parabola exposes the user to the system without hiding any details. This manpage gives a
-brief overview of the configuration files that should be set up on a fresh install.
+Parabola exposes the user to the system without hiding any details.
+This man page gives a brief overview of the configuration files that should be set up on a fresh install.
SYSTEM SERVICES[[S]]
--------------------
-System services to be started at boot can be enabled using 'systemctl enable .service'. To view
-available services use 'systemctl list-unit-files'.
+System services to be started at boot can be enabled using 'systemctl enable '.
+To view available services, use 'systemctl list-unit-files'.
HOSTNAME[[H]]
-------------
-The hostname of the machine can be set using 'hostnamectl set-hostname '. It will then be
-written to /etc/hostname.
+The hostname of the machine can be set using 'hostnamectl set-hostname '.
+It will then be written to /etc/hostname.
LOCALIZATION[[L]]
-----------------
-Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used
-can be configured in /etc/locale.conf. These settings can be overridden on a per-user basis by keeping a
-user-specific locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
+Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'.
+The system-wide locale to be used can be configured in /etc/locale.conf.
+These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf.
+The user-specific file will take precedence if it exists.
VIRTUAL CONSOLE[[V]]
--------------------
-The virtual console is configured in /etc/vconsole.conf. It allows you to set a font and a keyboard layout, among
-other things. Note that these settings only apply to the console, and not if you use X.
+The virtual console is configured in /etc/vconsole.conf.
+It allows you to set a font and a keyboard layout, among other things.
+Note that these settings only apply to the console and do not apply if you use X.
TIME[[T]]
---------
-The local timezone is configured by calling 'timedatectl set-timezone '. A *symlink* is then created
-from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. E.g.,
+The local time zone is configured by calling 'timedatectl set-timezone '.
+A relative *symlink* is then created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. For example,
/etc/localtime -> ../usr/share/zoneinfo/Europe/Paris
The real-time clock, which keeps track of time when the computer is off, can be configured to either
-be in UTC or in localtime by calling 'timedatectl set-local-rtc '. The default is UTC.
+be in UTC or in local time by calling 'timedatectl set-local-rtc '.
+The default is UTC.
-FILESYSTEMS[[F]]
-----------------
-Filesystems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
+FILE SYSTEMS[[F]]
+-----------------
+File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
INITRAMFS[[R]]
--------------
-The initramfs is generated by mkinitcpio, and can be configured in /etc/mkinitcpio.conf.
+The initramfs is generated by 'mkinitcpio -p '.
+The default preset is "linux-libre".
+The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes.
PACKAGE MANAGER[[P]]
--------------------
The package manager, pacman, is configured in /etc/pacman.conf.
-BOOTLOADER[[B]]
----------------
-GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg
+BOOT LOADER[[B]]
+----------------
+GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'.
+Syslinux is configured in /boot/syslinux/syslinux.cfg.
MODULES[[M]]
------------
-Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
-and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/.
+Most modules should be loaded on-demand.
+Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
+and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/.
SEE ALSO
--------
-systemctl(1), hostnamectl(1), hostname(5), locale.conf(5), vconsole.conf(5), timedatectl(1), timezone(3), hwclock(8), fstab(5),
-crypttab(5), mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
+*systemctl*(1), *hostnamectl*(1), *hostname*(5), *locale.conf*(5),
+*vconsole.conf*(5), *timedatectl*(1), *timezone*(3), *hwclock*(8),
+*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5),
+*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5),
+*systemd*(1)
AUTHORS
-------
-Written by Tom Gundersen. Rebranded for Parabola by Nicolás Reynolds and André Silva.
+Written by Tom Gundersen.
+Rebranded for Parabola by Nicolás Reynolds and André Silva.
--
cgit v1.2.3
From f79e5b6f161eb4f4053665beda522c4bb4ff7338 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 19:50:41 -0200
Subject: linux-libre-3.6.8-1: updating version
---
libre/linux-libre/PKGBUILD | 8 ++++----
libre/linux-libre/linux-libre.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 7f9cb69cb..55d68e2a6 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.6
-_sublevel=7
+_sublevel=8
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -34,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'irq_cfg_pointer-3.6.6.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
- 'a4e642180c7d757a642175fe32e4a264'
+ '3f4d630f49a12079598a3601dd2adb24'
'e4a3a4677e1fac6ecf0e0fb44c41ca08'
'68fc36a4efb6ade0eca409b9444fef0c'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -45,7 +45,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
'4909a0271af4e5f373136b382826717f'
- '1dd80f353c705fef988346a8ef05d13f')
+ 'acc79d1934fe9710acd9039dcd4e8b30')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index f5c51e08f..62df4eb18 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.6.7-1-LIBRE
+KERNEL_VERSION=3.6.8-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From b9f0b6cc78f7087c89e4112c0227b2fffb12e00d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 19:55:09 -0200
Subject: linux-libre-lts-3.0.53-1: updating version
---
libre/linux-libre-lts/PKGBUILD | 4 ++--
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0948ed4f1..a36ead268 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=52
+_sublevel=53
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '41adc30b96b745f08899317da83f7eaa'
+ 'bb8cb7d0f02f0b7a5861ee04236875a7'
'aed25ab047e1c0b020a1516c235c6a74'
'7d37e8ce0f4bd5a957172b12ae742ea0'
'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 28a571191..a273c9f0e 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.52-1-LIBRE-LTS
+KERNEL_VERSION=3.0.53-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From 90094ea4888376f056b1091c731102595b054fa3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 21:38:33 -0200
Subject: iceweasel-libre-17.0.1-3: fixing some details on libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 19 +++++--------------
2 files changed, 6 insertions(+), 15 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 78fe9e946..42ca5e358 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '8686d39ea314c2c7df43aad44279b7f1'
+ 'd5fc17b27fcd5cca0b51501a1b280928'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 5b1b94552..389e2f0f5 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -27,15 +27,6 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
// restart.
-@@ -210,7 +210,7 @@
- pref("keyword.enabled", true);
- // Override the default keyword.URL. Empty value means
- // "use the search service's default engine"
--pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/html/?q=");
-
- pref("general.skins.selectedSkin", "classic/1.0");
-
@@ -340,7 +340,7 @@
pref("browser.download.panel.removeFinishedDownloads", false);
@@ -76,7 +67,7 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
# 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
@@ -89,9 +80,9 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
-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.search.order.1=Duck Duck Go (HTML)
++browser.search.order.1=DuckDuckGo HTML
+browser.search.order.2=Seeks Search
-+browser.search.order.3=YaCy
++browser.search.order.3=YaCy/bluebox
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -234,7 +225,7 @@ diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties icew
# 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
@@ -245,7 +236,7 @@ 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=Duck Duck Go (HTML)
++browser.search.order.1=DuckDuckGo HTML
# Keyword URL (for location bar searches)
-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--
cgit v1.2.3
From dfe13d15585eb6a53af45de6415068b8416a07ad Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 28 Nov 2012 21:49:57 -0200
Subject: iceweasel-libre-17.0.1-3: adding ddg lite in the priority search
plugins list for region.properties
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 42ca5e358..673d2ce99 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'd5fc17b27fcd5cca0b51501a1b280928'
+ '4167af0566792cf00cb5c7da8ffd841f'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 389e2f0f5..5cdceda33 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -61,8 +61,8 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
-pref("social.toast-notifications.enabled", true);
diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
--- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200
-+++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 16:25:11.411107262 -0200
-@@ -3,25 +3,18 @@
++++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200
+@@ -3,25 +3,19 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Default search engine
@@ -81,8 +81,9 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
-browser.contentHandlers.types.1.title=My Yahoo!
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=Seeks Search
-+browser.search.order.3=YaCy/bluebox
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
++browser.search.order.4=YaCy/bluebox
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -93,7 +94,7 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
# 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,20 +23,10 @@
+@@ -30,20 +24,10 @@
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=3
--
cgit v1.2.3
From 09386c60c2b6801c47bc303d0824a0ee31d11db3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 29 Nov 2012 00:16:09 -0200
Subject: iceweasel-libre-17.0.1-3: removing a search engine in
region.properties due that support until max 3 search engines
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 673d2ce99..303cc54ae 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '4167af0566792cf00cb5c7da8ffd841f'
+ '3956dd8d3c153c2d8a608065a6d522c0'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 5cdceda33..c257f04fe 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -62,7 +62,7 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
--- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200
+++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200
-@@ -3,25 +3,19 @@
+@@ -3,25 +3,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Default search engine
@@ -83,7 +83,6 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
+browser.search.order.1=DuckDuckGo HTML
+browser.search.order.2=DuckDuckGo Lite
+browser.search.order.3=Seeks Search
-+browser.search.order.4=YaCy/bluebox
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -94,7 +93,7 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region
# 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,20 +24,10 @@
+@@ -30,20 +23,10 @@
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=3
--
cgit v1.2.3
From 12aa7037abf5c2c3ccae621a6f53f86360e74dc7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Wed, 28 Nov 2012 22:17:38 -0500
Subject: update libre/{libre,chroot}tools
---
libre/chroottools/PKGBUILD | 12 ++++--------
libre/libretools/PKGBUILD | 6 +++---
2 files changed, 7 insertions(+), 11 deletions(-)
(limited to 'libre')
diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD
index d48b9015b..049f33286 100644
--- a/libre/chroottools/PKGBUILD
+++ b/libre/chroottools/PKGBUILD
@@ -1,21 +1,17 @@
# Maintainer: Luke Shumaker
pkgname=chroottools
-pkgver=20121128.1
+pkgver=20121128.6
pkgdesc='Chroot tools for Arch and Parabola package maintainers'
url='http://projects.parabolagnulinux.org/packages/chroottools.git/'
license=('GPL')
-replaces=(devtools)
-provides=(devtools)
-conflicts=(devtools)
-
pkgrel=1
arch=('any')
+conflicts=(devtools)
depends=(
'arch-install-scripts' # for pacstrap, used to make chroots
- 'curl'
- 'namcap' # to check packages made by makechrootpkg
+ 'curl' # used by checkpkg
)
source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar")
@@ -29,4 +25,4 @@ package() {
make PREFIX=/usr DESTDIR=${pkgdir} install
}
-md5sums=('8f9b36b50466a278e02e29f0ca06d267')
+md5sums=('32f0cc7fe772a946d8184125011154e1')
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 9217b4d02..01d835b1a 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,10 +4,10 @@
pkgbase=libretools
pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=20121128
+pkgver=20121128.3
pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/libretools.git/"
-license=('GPL3+')
+license=('GPL3+' 'GPL2')
pkgrel=1
arch=('any')
@@ -45,4 +45,4 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('4c730066c2152f929ca63424019b165a')
+md5sums=('510f69ff043095b60f8a23ee28fd0a16')
--
cgit v1.2.3
From 7e517c647acdf709e94ea471a6d00604505d0942 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 29 Nov 2012 01:43:15 -0200
Subject: ddg xml files were replaced due that generates issues and
incompatibility with Keyword search URL in about:home on the mozilla browsers
---
libre/mozilla-searchplugins/PKGBUILD | 10 +++++-----
libre/mozilla-searchplugins/duckduckgo-html.xml | 8 ++++++++
libre/mozilla-searchplugins/duckduckgo-lite.xml | 8 ++++++++
3 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 libre/mozilla-searchplugins/duckduckgo-html.xml
create mode 100644 libre/mozilla-searchplugins/duckduckgo-lite.xml
(limited to 'libre')
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 @@
+
+DuckDuckGo HTML
+Search DuckDuckGo HTML
+UTF-8
+http://duckduckgo.com/favicon.ico
+
+
+
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 @@
+
+DuckDuckGo Lite
+Search DuckDuckGo Lite
+UTF-8
+http://duckduckgo.com/favicon.ico
+
+
+
--
cgit v1.2.3
From dea4c7473a34a9f40fc2827521790f013ea3d866 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 29 Nov 2012 17:21:29 -0200
Subject: icecat-14.0-3: updating libre.patch file
---
libre/icecat/PKGBUILD | 2 +-
libre/icecat/libre.patch | 112 +++++++++++++++--------------------------------
2 files changed, 37 insertions(+), 77 deletions(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index cb4ef9688..742c1e637 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -79,7 +79,7 @@ md5sums=(
3117865902d1a20ab61d75707be9888e
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
- 0fe48b455f9b0ad7993071cd766b3bbf
+ 0dd247d29f9bf50e7826f654c72c7bb3
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index b5a9acc0b..3d3350d79 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,9 +127,8 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
@@ -143,7 +45,7 @@
// The 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"
];
@@ -139,33 +136,27 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
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 @@
+@@ -1,28 +1,19 @@
# 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
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
# Keyword URL (for location bar searches)
-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
@@ -180,21 +171,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 +21,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/
@@ -293,25 +274,21 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
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 @@
+@@ -1,18 +1,11 @@
# 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
++browser.search.order.1=DuckDuckGo HTML
# Keyword URL (for location bar searches)
-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
@@ -319,24 +296,27 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
# 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 +14,11 @@
+ # 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
@@ -382,23 +362,3 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
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
-
--
cgit v1.2.3
From bbdcebca9d7841d75498457f5ac722792766d859 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 29 Nov 2012 17:25:29 -0200
Subject: icecat-14.0-3: deleting black spaces in libre.patch file
---
libre/icecat/PKGBUILD | 2 +-
libre/icecat/libre.patch | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 742c1e637..bb9615f38 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -79,7 +79,7 @@ md5sums=(
3117865902d1a20ab61d75707be9888e
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
- 0dd247d29f9bf50e7826f654c72c7bb3
+ 022814b1036b62e508729ef6b3474ac1
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 3d3350d79..4aec17d86 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -296,7 +296,7 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
# 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
-@@ -21,12 +14,11 @@
+@@ -21,12 +14,10 @@
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=2
@@ -316,7 +316,6 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
+# 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
--
cgit v1.2.3
From d2a872fec31748f5a2834b2b6507bac5aec73cfe Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 29 Nov 2012 22:08:48 -0200
Subject: kdebase-runtime-libre-4.9.3-1.1: updating sha1sums
---
libre/kdebase-runtime-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
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}"
--
cgit v1.2.3
From e94d8f97c299b0d27a1db605b6c40068a94cb689 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 29 Nov 2012 23:24:07 -0200
Subject: iceape-libre-2.7.11.1-2: updating libre.patch
---
libre/iceape-libre/PKGBUILD | 2 +-
libre/iceape-libre/libre.patch | 69 +++++++++++++++++-------------------------
2 files changed, 29 insertions(+), 42 deletions(-)
(limited to 'libre')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2325b8cd7..dea779f53 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- 'ed7a06c9e73a9f3e023d7bff9878504b')
+ '26fb301bdb7a17691bf53da9c9fad3e9')
build() {
export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index 9947b1bbe..375995a88 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
-
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
# 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 @@
---- 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.
--
cgit v1.2.3
From 206bb4de6ce77dc61855859e3720969ab4eabcaf Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 29 Nov 2012 23:50:23 -0200
Subject: iceape-libre-2.7.11.1-2: fixing libre.patch
---
libre/iceape-libre/PKGBUILD | 2 +-
libre/iceape-libre/libre.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index dea779f53..2595a36f9 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- '26fb301bdb7a17691bf53da9c9fad3e9')
+ 'ebe66195898c89644138ffc88ba26a24')
build() {
export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index 375995a88..6273a05a9 100755
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -41,7 +41,7 @@
-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.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
--
cgit v1.2.3
From c80c4f0761386f3472c40b8addcee3d42ce0f8f1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 30 Nov 2012 00:01:47 -0200
Subject: clementine-libre-1.1.1-1.1: fixing issues related to schema-30.sql
---
libre/clementine-libre/PKGBUILD | 8 +++++---
libre/clementine-libre/remove-and-disable-spotify.patch | 8 --------
2 files changed, 5 insertions(+), 11 deletions(-)
(limited to 'libre')
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
icons/48x48/view-choose.png
icons/48x48/view-fullscreen.png
icons/48x48/view-media-equalizer.png
-@@ -318,7 +314,6 @@
- schema/schema-28.sql
- schema/schema-29.sql
- schema/schema-2.sql
-- schema/schema-30.sql
- schema/schema-31.sql
- schema/schema-32.sql
- schema/schema-33.sql
@@ -339,7 +334,6 @@
smartplaylistsearchterm.css
songinfo.css
--
cgit v1.2.3
From d3ad37e871098fe75d555d84aae891b205756153 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 30 Nov 2012 01:27:11 -0200
Subject: icecat-14.0-4: fixing some parts in libre.patch
---
libre/icecat/PKGBUILD | 4 ++--
libre/icecat/libre.patch | 36 +++++++++++++++++-------------------
2 files changed, 19 insertions(+), 21 deletions(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index bb9615f38..0e7581bf4 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
- 022814b1036b62e508729ef6b3474ac1
+ 3629415e3d3b8595c191d1836ac013d9
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 4aec17d86..47410e1b7 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -134,9 +134,9 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
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,19 @@
+--- 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=DuckDuckGo HTML
@@ -154,14 +154,13 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-browser.contentHandlers.types.2.title=Google
-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+-
+-# Keyword URL (for location bar searches)
+-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
+browser.search.order.1=DuckDuckGo HTML
+browser.search.order.2=DuckDuckGo Lite
+browser.search.order.3=Seeks Search
-
- # 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=
-
+
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
# to be searched and the user's search query. Place them in the appropriate location
@@ -171,7 +170,7 @@ 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 +21,11 @@
+@@ -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
@@ -272,9 +271,9 @@ 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,11 @@
+--- 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=DuckDuckGo HTML
@@ -288,15 +287,14 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
-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=
-+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
-@@ -21,12 +14,10 @@
+@@ -21,12 +11,10 @@
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=2
@@ -345,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);
@@ -357,7 +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);
--
cgit v1.2.3
From ec120955ceb44cbdd4a2d64d4c674829efcc151e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 30 Nov 2012 03:09:08 -0200
Subject: icecat-14.0-4: removing a black space in libre.patch
---
libre/icecat/PKGBUILD | 2 +-
libre/icecat/libre.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 0e7581bf4..822f800f2 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -79,7 +79,7 @@ md5sums=(
3117865902d1a20ab61d75707be9888e
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
- 3629415e3d3b8595c191d1836ac013d9
+ 0119cc83435b192e78160f97ad2da9ea
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 47410e1b7..1f0d4306e 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -160,7 +160,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
+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
# to be searched and the user's search query. Place them in the appropriate location
--
cgit v1.2.3
From 493b0bf3a08f3fb45790da6df9da51c32578fbc0 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 1 Dec 2012 03:12:23 -0200
Subject: hplip-libre-3.12.11-2: updating version
---
libre/hplip-libre/PKGBUILD | 42 ++--
libre/hplip-libre/cups-1.6-buildfix.diff | 392 +++++++++++++++++++++++++++++++
2 files changed, 417 insertions(+), 17 deletions(-)
create mode 100644 libre/hplip-libre/cups-1.6-buildfix.diff
(limited to 'libre')
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
-# Maintainer : Rémy Oudompheng
+# Contributor : Rémy Oudompheng
# Contributor: Morgan LEFIEUX
# Maintainer (Parabola): Jorge López
_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)
--
cgit v1.2.3
From 1d37002e5af51ea719719c379c95d3d8ffdf79d5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 1 Dec 2012 03:27:16 -0200
Subject: cups-filters-libre-1.0.25-1: updating version
---
libre/cups-filters-libre/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'libre')
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
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}")
--
cgit v1.2.3
From 38928b09176f30c57a19a436517aa9bf1f7e80fd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 1 Dec 2012 16:25:55 -0200
Subject: iceweasel-libre-17.0.1.1-1: updating version
---
...Make-the-Reset-Firefox-feature-more-gener.patch | 0
libre/iceweasel-libre/PKGBUILD | 10 ++++-----
libre/iceweasel-libre/libre.patch | 24 +++++++---------------
3 files changed, 12 insertions(+), 22 deletions(-)
mode change 100755 => 100644 libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
(limited to 'libre')
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
old mode 100755
new mode 100644
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);
--
cgit v1.2.3
From 468da157ce326b6b3b45b8fc968b3373f65668ea Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 1 Dec 2012 16:26:20 -0200
Subject: xulrunner-libre-17.0.1.1-1: updating version
---
...6390-Make-the-Reset-Firefox-feature-more-gener.patch | 0
libre/xulrunner-libre/PKGBUILD | 17 +++++++++--------
libre/xulrunner-libre/shared-libs.patch | 12 ++++++++++++
3 files changed, 21 insertions(+), 8 deletions(-)
mode change 100755 => 100644 libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
create mode 100644 libre/xulrunner-libre/shared-libs.patch
(limited to 'libre')
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
old mode 100755
new mode 100644
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index e9cd2a447..0fd715e8a 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
# Contributor: Alexander Baldeck
@@ -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-$pkgver/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 = \
--
cgit v1.2.3
From 7caf34feef9f38f6953e1b65b01d75e6b756e548 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 1 Dec 2012 16:31:25 -0200
Subject: xulrunner-libre-17.0.1.1-1: fixing a detail at the end of PKGBUILD
file
---
libre/xulrunner-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 0fd715e8a..1d485e6d5 100755
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -87,5 +87,5 @@ package() {
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-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py
+ "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py
}
--
cgit v1.2.3
From 1f1d0954f85b45336639c1d83e3d63c9f25f31e9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 1 Dec 2012 18:02:24 -0200
Subject: iceweasel-i18n-17.0.1.1-1: updating version
---
libre/iceweasel-i18n/PKGBUILD | 180 +++++++++++++++++++++---------------------
1 file changed, 90 insertions(+), 90 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 406cb3c32..6dbc74148 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
@@ -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=('c99d7605c0e0bb0d77e71cd54f305a9a'
+ '1f4aeabf6c28fcf6539d13f65f8b366b'
+ 'cb9cc5f721d81442f1a93d134054f23c'
+ 'f926850d2071114f4ba719230ce43168'
+ '8c414a4f8d6d137dcca41b203fce4d0c'
+ 'a16081e4da9daf6df5f6fcce2000cec1'
+ '88dd4c5837485acea83e97f3cb4f1e31'
+ '8751f0a634656ba973c53f96d1fa34e1'
+ 'a3905a8a62c0b5ba4c11fee49ad6d184'
+ '740667ba651f0562b45bbfe63b8ec84e'
+ '85a7a4de61e5546487dae32849ae63f2'
+ '3d00ad2734c890930441d6cd919f11c8'
+ '80a49422e0973ed8d6fd7920cf0a4379'
+ '30ce51ca764b091c59df5c08e35e8a7f'
+ '3fdbb51a5cbea3f6a7c43534a8c67d5a'
+ '1eacf81985d9993b2b94f98fd4c453e0'
+ 'ccd6c210bf596909137c4159580042eb'
+ '688c3eeca95418703bf6c2cb0dbe18d0'
+ '3830cab7a1b48890588cfbeb42444a22'
+ '6924436432149b668e14c3595602af79'
+ 'ae6007384d85dbd14fbe6496e0b9e47b'
+ '3859dac30bf0ec9d49419c83b116407e'
+ '4c200fc11efb425ba1ed0c6254f323a5'
+ '200f856b50a7485a1d5447cbf8dee77c'
+ '5b8d0c552c0ca7abb48ef4e94908edd2'
+ 'c6dde21438789ccf4c666afc22ee713c'
+ 'b234e98c5155fb597fa6f5b1242492ec'
+ '5abfc72599632a0ac85f18b4f706ee71'
+ 'a78698a63ef66d5532601f76f48613c3'
+ 'cca18bf0e95da80578d1e71a7592a545'
+ '9213e16598b0595710583956fa95dfff'
+ '120a4a00c1775a8445d35266b3157112'
+ 'cf94d425550530b34e355ed445618626'
+ 'dbf451ef9ecf1816973ac4dffe7e2b8e'
+ '87a12e25b99886ac25cb0d9f0ca201ad'
+ '0efff47ab838fd320c710ffd46ee3a57'
+ '28e5d445e7a91ddd64d50478b05edb51'
+ '770dcdf1a8d6d2db64dadb6e4f6149fb'
+ '7732b021cdf73ace33cb41609b327f3d'
+ 'ac79148f7bbdeff056d10cf0542f6ea0'
+ '4718bff38f0a6c8ec7b41df148255f34'
+ '2edcd565c19828e3d4a2da19f8529edd'
+ '531c54a91d509e768b55bfd88a96a527'
+ 'c8a4d346560350fd45533e52c0e6a15e'
+ '707d055b9d86ba16b2a44376a6cf3fb9'
+ '66b2b23c7e16840554521c748a22d083'
+ '61e53be2eeb528742c19d3a13252a961'
+ '89c23536240f86a776fb62728297e13d'
+ '535f68d0cfa4dee9df0cddbee42a4c94'
+ '7c91dc4f2bbcdac2f8547caad24516ea'
+ '4476b94e676b3cfb309f972f7c42da1b'
+ '792700b40ba53de7de5b48187b604b29'
+ '500861d2d8bebc85596a3ee343adb75e'
+ 'b2f5d243b28a9137189b6fa001c0207e'
+ 'a36a7b1785532e659d3b972e4e767f45'
+ '46509bb591bf54b6fed025814bfc11bf'
+ '715a3f8c2fcdab17b24ce61f55c49183'
+ '658226211d66a724d0335a173ef8512f'
+ 'ecb41c7536c95cf2ca118d7ab6b7d357'
+ '3b832ba3a5d1543809395171e5a105f6'
+ '46380a60795095514004bc19c512e1c5'
+ 'fba979124cd393f1164a59e3b9183ccc'
+ 'db0e3b1146b0350e23e35958ee896aa5'
+ '665140babab027228eb195b6c0e83d4e'
+ 'e71a740bfc52d25968f8e2c4c1896897'
+ '47bd00559728578bfc257b80c72ce393'
+ '0b77be5ee8a66f5b819f9bf032f1b744'
+ '38df23959bd6940a82e78f76a00cc973'
+ 'b6c74d7b9cf5f6722c661bdba78c3769'
+ '481db49b914f33d6c594ecebbc291e4c'
+ '6a680e3aa71a39a1d59f877535eb7bbc'
+ '9ee935f09dc89b42db9ad8db3473717d'
+ 'e9ad600f21766465aed4ae8473290077'
+ 'b70d217d69692ea3fb26e87fa468f4eb'
+ '32b73226e95ae47dc11a554a7208d960'
+ '5b78c67c024c683f4c0f1bc9931a2b28'
+ 'f7a347a3d5679d82340d227474de938f'
+ '2939f738602daee17e63e14374db86be'
+ '73bead055152cd4885b9834691c9066a'
+ '722a0d2212060e2044cbac859db3e063'
+ '8f259efea0bf1b67fd4b4dae492e2e00'
+ '03c2a59eab8ef4ad3687b91c07f96165'
+ '726317125b44225273307235f609d341'
+ 'b75b729e9ab3ff9a908115ab520339a9'
+ 'cd696e70fdb4f5ab9d50040abea46b82'
+ 'cdd2dba79e929e6585799d7f3f7fa7d4'
+ '0b611a362d7e566805c2df474ff407b6'
+ 'de6037c0a65e7b86e0929637156ba587')
\ No newline at end of file
--
cgit v1.2.3
From aad9ae5bb9c05c5725a66a0380da9096eaee9de4 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 2 Dec 2012 13:36:29 -0200
Subject: iceweasel-i18n-17.0.1.1-1: fixing md5sums
---
libre/iceweasel-i18n/PKGBUILD | 178 +++++++++++++++++++++---------------------
1 file changed, 89 insertions(+), 89 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 6dbc74148..3476c68f5 100755
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -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=('c99d7605c0e0bb0d77e71cd54f305a9a'
- '1f4aeabf6c28fcf6539d13f65f8b366b'
- 'cb9cc5f721d81442f1a93d134054f23c'
- 'f926850d2071114f4ba719230ce43168'
- '8c414a4f8d6d137dcca41b203fce4d0c'
- 'a16081e4da9daf6df5f6fcce2000cec1'
- '88dd4c5837485acea83e97f3cb4f1e31'
- '8751f0a634656ba973c53f96d1fa34e1'
- 'a3905a8a62c0b5ba4c11fee49ad6d184'
- '740667ba651f0562b45bbfe63b8ec84e'
- '85a7a4de61e5546487dae32849ae63f2'
- '3d00ad2734c890930441d6cd919f11c8'
- '80a49422e0973ed8d6fd7920cf0a4379'
- '30ce51ca764b091c59df5c08e35e8a7f'
- '3fdbb51a5cbea3f6a7c43534a8c67d5a'
- '1eacf81985d9993b2b94f98fd4c453e0'
- 'ccd6c210bf596909137c4159580042eb'
- '688c3eeca95418703bf6c2cb0dbe18d0'
- '3830cab7a1b48890588cfbeb42444a22'
- '6924436432149b668e14c3595602af79'
- 'ae6007384d85dbd14fbe6496e0b9e47b'
- '3859dac30bf0ec9d49419c83b116407e'
- '4c200fc11efb425ba1ed0c6254f323a5'
- '200f856b50a7485a1d5447cbf8dee77c'
- '5b8d0c552c0ca7abb48ef4e94908edd2'
- 'c6dde21438789ccf4c666afc22ee713c'
- 'b234e98c5155fb597fa6f5b1242492ec'
- '5abfc72599632a0ac85f18b4f706ee71'
- 'a78698a63ef66d5532601f76f48613c3'
- 'cca18bf0e95da80578d1e71a7592a545'
- '9213e16598b0595710583956fa95dfff'
- '120a4a00c1775a8445d35266b3157112'
- 'cf94d425550530b34e355ed445618626'
- 'dbf451ef9ecf1816973ac4dffe7e2b8e'
- '87a12e25b99886ac25cb0d9f0ca201ad'
- '0efff47ab838fd320c710ffd46ee3a57'
- '28e5d445e7a91ddd64d50478b05edb51'
- '770dcdf1a8d6d2db64dadb6e4f6149fb'
- '7732b021cdf73ace33cb41609b327f3d'
- 'ac79148f7bbdeff056d10cf0542f6ea0'
- '4718bff38f0a6c8ec7b41df148255f34'
- '2edcd565c19828e3d4a2da19f8529edd'
- '531c54a91d509e768b55bfd88a96a527'
- 'c8a4d346560350fd45533e52c0e6a15e'
- '707d055b9d86ba16b2a44376a6cf3fb9'
- '66b2b23c7e16840554521c748a22d083'
- '61e53be2eeb528742c19d3a13252a961'
- '89c23536240f86a776fb62728297e13d'
- '535f68d0cfa4dee9df0cddbee42a4c94'
- '7c91dc4f2bbcdac2f8547caad24516ea'
- '4476b94e676b3cfb309f972f7c42da1b'
- '792700b40ba53de7de5b48187b604b29'
- '500861d2d8bebc85596a3ee343adb75e'
- 'b2f5d243b28a9137189b6fa001c0207e'
- 'a36a7b1785532e659d3b972e4e767f45'
- '46509bb591bf54b6fed025814bfc11bf'
- '715a3f8c2fcdab17b24ce61f55c49183'
- '658226211d66a724d0335a173ef8512f'
- 'ecb41c7536c95cf2ca118d7ab6b7d357'
- '3b832ba3a5d1543809395171e5a105f6'
- '46380a60795095514004bc19c512e1c5'
- 'fba979124cd393f1164a59e3b9183ccc'
- 'db0e3b1146b0350e23e35958ee896aa5'
- '665140babab027228eb195b6c0e83d4e'
- 'e71a740bfc52d25968f8e2c4c1896897'
- '47bd00559728578bfc257b80c72ce393'
- '0b77be5ee8a66f5b819f9bf032f1b744'
- '38df23959bd6940a82e78f76a00cc973'
- 'b6c74d7b9cf5f6722c661bdba78c3769'
- '481db49b914f33d6c594ecebbc291e4c'
- '6a680e3aa71a39a1d59f877535eb7bbc'
- '9ee935f09dc89b42db9ad8db3473717d'
- 'e9ad600f21766465aed4ae8473290077'
- 'b70d217d69692ea3fb26e87fa468f4eb'
- '32b73226e95ae47dc11a554a7208d960'
- '5b78c67c024c683f4c0f1bc9931a2b28'
- 'f7a347a3d5679d82340d227474de938f'
- '2939f738602daee17e63e14374db86be'
- '73bead055152cd4885b9834691c9066a'
- '722a0d2212060e2044cbac859db3e063'
- '8f259efea0bf1b67fd4b4dae492e2e00'
- '03c2a59eab8ef4ad3687b91c07f96165'
- '726317125b44225273307235f609d341'
- 'b75b729e9ab3ff9a908115ab520339a9'
- 'cd696e70fdb4f5ab9d50040abea46b82'
- 'cdd2dba79e929e6585799d7f3f7fa7d4'
- '0b611a362d7e566805c2df474ff407b6'
- 'de6037c0a65e7b86e0929637156ba587')
\ 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
--
cgit v1.2.3
From c263eb4fd1a9ccb79202f226cf3dc519de9cc296 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 2 Dec 2012 13:37:14 -0200
Subject: iceweasel-i18n-2.7.11.1-1: fixing iceape-libre version dependency
---
libre/iceape-i18n/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
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
--
cgit v1.2.3
From a410436d32ff8891eca5fba302df80eddde1be39 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 3 Dec 2012 04:49:22 -0200
Subject: putting tokyocabinet in [libre] repo
---
libre/tokyocabinet/PKGBUILD | 33 +++++++++++++++++++++++++++++++++
social/tokyocabinet/PKGBUILD | 33 ---------------------------------
2 files changed, 33 insertions(+), 33 deletions(-)
create mode 100755 libre/tokyocabinet/PKGBUILD
delete mode 100755 social/tokyocabinet/PKGBUILD
(limited to 'libre')
diff --git a/libre/tokyocabinet/PKGBUILD b/libre/tokyocabinet/PKGBUILD
new file mode 100755
index 000000000..7eb52ed6e
--- /dev/null
+++ b/libre/tokyocabinet/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Mark Foxwell
+# Contributor: Nicolas Martyanoff
+
+pkgname=tokyocabinet
+pkgver=1.4.48
+pkgrel=2
+pkgdesc="a modern implementation of DBM"
+arch=('i686' 'x86_64')
+url="http://fallabs.com/tokyocabinet/"
+license=('LGPL')
+makedepends=('gcc>=3.1' 'make' 'pkgconfig')
+depends=('zlib' 'bzip2')
+source=("http://fallabs.com/tokyocabinet/${pkgname}-${pkgver}.tar.gz")
+md5sums=('fd03df6965f8f56dd5b8518ca43b4f5e')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --enable-off64 --enable-fastest
+ make
+}
+
+# uncomment check routine if needed (can take ~5mins to run check)
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -k check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/social/tokyocabinet/PKGBUILD b/social/tokyocabinet/PKGBUILD
deleted file mode 100755
index 7eb52ed6e..000000000
--- a/social/tokyocabinet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Mark Foxwell
-# Contributor: Nicolas Martyanoff
-
-pkgname=tokyocabinet
-pkgver=1.4.48
-pkgrel=2
-pkgdesc="a modern implementation of DBM"
-arch=('i686' 'x86_64')
-url="http://fallabs.com/tokyocabinet/"
-license=('LGPL')
-makedepends=('gcc>=3.1' 'make' 'pkgconfig')
-depends=('zlib' 'bzip2')
-source=("http://fallabs.com/tokyocabinet/${pkgname}-${pkgver}.tar.gz")
-md5sums=('fd03df6965f8f56dd5b8518ca43b4f5e')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --enable-off64 --enable-fastest
- make
-}
-
-# uncomment check routine if needed (can take ~5mins to run check)
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make -k check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
--
cgit v1.2.3
From a4547529c10e1c3ee7d25f7e32d101a2b05fd769 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Mon, 3 Dec 2012 05:13:31 -0200
Subject: claws-mail-libre: add pkg to libre repo
---
libre/claws-mail-libre/PKGBUILD | 96 +++++++++++++++++++++++++++++++
libre/claws-mail-libre/claws-mail.install | 15 +++++
2 files changed, 111 insertions(+)
create mode 100644 libre/claws-mail-libre/PKGBUILD
create mode 100644 libre/claws-mail-libre/claws-mail.install
(limited to 'libre')
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
+# Maintainer (Parabola): Márcio Silva
+
+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
+}
--
cgit v1.2.3
From 07f8d2352bfbd32bde544ab085766cdd5bcf855f Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Mon, 3 Dec 2012 11:48:21 -0500
Subject: mv social/tokyocabinet libre
---
libre/tokyocabinet/PKGBUILD | 33 +++++++++++++++++++++++++++++++++
social/tokyocabinet/PKGBUILD | 33 ---------------------------------
2 files changed, 33 insertions(+), 33 deletions(-)
create mode 100644 libre/tokyocabinet/PKGBUILD
delete mode 100755 social/tokyocabinet/PKGBUILD
(limited to 'libre')
diff --git a/libre/tokyocabinet/PKGBUILD b/libre/tokyocabinet/PKGBUILD
new file mode 100644
index 000000000..7b3a55c80
--- /dev/null
+++ b/libre/tokyocabinet/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Mark Foxwell
+# Contributor: Nicolas Martyanoff
+
+pkgname=tokyocabinet
+pkgver=1.4.48
+pkgrel=1
+pkgdesc="a modern implementation of DBM"
+arch=('i686' 'x86_64')
+url="http://fallabs.com/tokyocabinet/"
+license=('LGPL')
+makedepends=('gcc>=3.1' 'make' 'pkgconfig')
+depends=('zlib' 'bzip2')
+source=("http://fallabs.com/tokyocabinet/${pkgname}-${pkgver}.tar.gz")
+md5sums=('fd03df6965f8f56dd5b8518ca43b4f5e')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --enable-off64 --enable-fastest
+ make
+}
+
+# uncomment check routine if needed (can take ~5mins to run check)
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -k check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/social/tokyocabinet/PKGBUILD b/social/tokyocabinet/PKGBUILD
deleted file mode 100755
index 7b3a55c80..000000000
--- a/social/tokyocabinet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Mark Foxwell
-# Contributor: Nicolas Martyanoff
-
-pkgname=tokyocabinet
-pkgver=1.4.48
-pkgrel=1
-pkgdesc="a modern implementation of DBM"
-arch=('i686' 'x86_64')
-url="http://fallabs.com/tokyocabinet/"
-license=('LGPL')
-makedepends=('gcc>=3.1' 'make' 'pkgconfig')
-depends=('zlib' 'bzip2')
-source=("http://fallabs.com/tokyocabinet/${pkgname}-${pkgver}.tar.gz")
-md5sums=('fd03df6965f8f56dd5b8518ca43b4f5e')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --enable-off64 --enable-fastest
- make
-}
-
-# uncomment check routine if needed (can take ~5mins to run check)
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make -k check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
--
cgit v1.2.3
From 7da2c7104bf0b90ad700b6fe3e99284802106cbe Mon Sep 17 00:00:00 2001
From: Michał Masłowski
Date: Mon, 3 Dec 2012 18:21:30 +0100
Subject: Fix tokyocabinet mips64el build, not released due to a bus error.
---
libre/tokyocabinet/PKGBUILD | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/tokyocabinet/PKGBUILD b/libre/tokyocabinet/PKGBUILD
index 7eb52ed6e..1add6c535 100755
--- a/libre/tokyocabinet/PKGBUILD
+++ b/libre/tokyocabinet/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tokyocabinet
pkgver=1.4.48
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
}
--
cgit v1.2.3
From 8ca8e3bf01034644a1487fd47d02c15aae3d5af9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 03:03:02 -0200
Subject: iceweasel-libre-17.0.1.1-1: improving libre.patch file to has
duckduck logo in about:home and fix keyword.url for all locales from the main
source code
---
libre/iceweasel-libre/PKGBUILD | 6 +--
libre/iceweasel-libre/libre.patch | 103 +++++++++++++++++++++++++++++++-------
libre/iceweasel-libre/vendor.js | 8 +++
3 files changed, 96 insertions(+), 21 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 357fb7321..be177d8b9 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -57,9 +57,9 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '1570f4402cd46ffffeb7e302b2fb285d'
+ '420e6a57743591b4bcdf188fd027da38'
'abf5ecb74caa857abb42bcfbb3442d9c'
- '0d053487907de4376d67d8f499c5502b'
+ '0bda96fad259ff676e5584b5811f4e2e'
'52e52f840a49eb1d14be1c0065b03a93'
'65f68090d2a69b467bd2707d0c4ea3bd')
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index d0f392be3..faae29a36 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -290,18 +290,16 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
+ h-node
-diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
-+++ iceweasel-13.0/browser/base/content/abouthome/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
-@@ -38,104 +38,6 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--// If a definition requires additional params, check that the final search url
--// is handled correctly by the engine.
--const SEARCH_ENGINES = {
+diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js
+--- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js 2012-11-29 02:43:23.000000000 -0200
++++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js 2012-12-04 02:08:18.095477555 -0200
+@@ -5,99 +5,42 @@
+ // If a definition requires additional params, check that the final search url
+ // is handled correctly by the engine.
+ const SEARCH_ENGINES = {
- "Google": {
-- image: "data:image/png;base64," +
++ "DuckDuckGo HTML": {
+ image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -393,17 +391,86 @@ diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js icewea
- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
- }
--};
--
++ "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
++ "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
++ "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
++ "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
++ "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
++ "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
++ "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
++ "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
++ "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
++ "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
++ "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
++ "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
++ "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
++ "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
++ "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
++ "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
++ "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
++ "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
++ "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
++ "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
++ "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
++ "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
++ "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
++ "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
++ "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
++ "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
++ "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
++ "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
++ "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
++ "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
++ "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
++ "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
++ "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
++ },
+ };
+
// The process of adding a new default snippet involves:
- // * add a new entity to aboutHome.dtd
- // * add a for it in aboutHome.xhtml
-@@ -143,7 +45,7 @@
+@@ -106,13 +49,15 @@
+ // * add an entry here in the proper ordering (based on spans)
// The 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"
-+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
++ "http://packages.debian.org/experimental/iceweasel"
++, "https://www.gnu.org/software/gnuzilla/addons.html"
];
const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+
+-let gSearchEngine;
++// Bug with dom.storage.enabled set as false
++// We are using DDG HTML as a default in this case.
++let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"};
+
+ document.addEventListener("DOMContentLoaded", function init() {
+ setupSearchEngine();
+@@ -142,13 +87,13 @@
+
+ function setupSearchEngine()
+ {
+- gSearchEngine = JSON.parse(localStorage["search-engine"]);
+-
+- if (!gSearchEngine)
+- return;
++ if (localStorage && localStorage["search-engine"]) {
++ gSearchEngine = JSON.parse(localStorage["search-engine"]);
++ }
+
++
+ // Look for extended information, like logo and links.
+- let searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
++ var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
+ if (searchEngineInfo) {
+ for (let prop in searchEngineInfo)
+ gSearchEngine[prop] = searchEngineInfo[prop];
+diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties
+--- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties 2012-12-01 07:21:01.000000000 -0200
++++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 02:32:50.710792982 -0200
+@@ -1,3 +1,3 @@
+ # Do NOT localize or otherwise change these values
+ browser.startup.homepage=about:home
+-
++browser.search.defaultenginename=DuckDuckGo HTML
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index d8d606bc1..0c6172288 100755
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -7,3 +7,11 @@ pref("browser.shell.checkDefaultBrowser", false);
// Don't disable our bundled extensions in the application directory
pref("extensions.autoDisableScopes", 11);
pref("extensions.shownSelectionUI", true);
+
+// Disable safe browsing.
+pref("browser.safebrowsing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
+
+// Disable localstorage for privacy reasons. We will rewrite about:home js to
+// fix the bug.
+pref("dom.storage.enabled", false);
\ No newline at end of file
--
cgit v1.2.3
From 9ab5dcad0aa9e967e1715286d9cdd81aabccedc7 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 03:11:52 -0200
Subject: iceweasel-libre-17.0.1.1-2: adding a blank space at the end of
vendor.js file
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/vendor.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index be177d8b9..9b00b201a 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -59,7 +59,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'a485a2b5dc544a8a2bd40c985d2e5813'
'420e6a57743591b4bcdf188fd027da38'
'abf5ecb74caa857abb42bcfbb3442d9c'
- '0bda96fad259ff676e5584b5811f4e2e'
+ '97fff72dee9c0e3748c7e3e4a8c2060f'
'52e52f840a49eb1d14be1c0065b03a93'
'65f68090d2a69b467bd2707d0c4ea3bd')
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 0c6172288..29a9ceaf7 100755
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -14,4 +14,4 @@ pref("browser.safebrowsing.malware.enabled", false);
// Disable localstorage for privacy reasons. We will rewrite about:home js to
// fix the bug.
-pref("dom.storage.enabled", false);
\ No newline at end of file
+pref("dom.storage.enabled", false);
--
cgit v1.2.3
From 749682abcb107b2ae7f940658bfe66f7b2867e89 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 04:21:09 -0200
Subject: iceweasel-libre-17.0.1.1-2: put new changes from vendor.js to the
libre.patch for firefox-branding.js
---
libre/iceweasel-libre/PKGBUILD | 4 ++--
libre/iceweasel-libre/libre.patch | 17 +++++++++++++++++
libre/iceweasel-libre/vendor.js | 8 --------
3 files changed, 19 insertions(+), 10 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 9b00b201a..f1d873728 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,9 +57,9 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '420e6a57743591b4bcdf188fd027da38'
+ 'f2bf013ba4259091355c762dc70b4985'
'abf5ecb74caa857abb42bcfbb3442d9c'
- '97fff72dee9c0e3748c7e3e4a8c2060f'
+ '0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
'65f68090d2a69b467bd2707d0c4ea3bd')
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index faae29a36..4534f0ca8 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -474,3 +474,20 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties
browser.startup.homepage=about:home
-
+browser.search.defaultenginename=DuckDuckGo HTML
+diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js
+--- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200
++++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 04:11:24.803127119 -0200
+@@ -1,3 +1,13 @@
+ pref("startup.homepage_override_url","");
+ pref("startup.homepage_welcome_url","");
+ pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
++
++pref("browser.search.defaultenginename", "DuckDuckGo HTML");
++
++// Disable safe browsing.
++pref("browser.safebrowsing.enabled", false);
++pref("browser.safebrowsing.malware.enabled", false);
++
++// Disable localstorage for privacy reasons. We will rewrite about:home js to
++// fix the bug.
++pref("dom.storage.enabled", false);
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 29a9ceaf7..d8d606bc1 100755
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -7,11 +7,3 @@ pref("browser.shell.checkDefaultBrowser", false);
// Don't disable our bundled extensions in the application directory
pref("extensions.autoDisableScopes", 11);
pref("extensions.shownSelectionUI", true);
-
-// Disable safe browsing.
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-// Disable localstorage for privacy reasons. We will rewrite about:home js to
-// fix the bug.
-pref("dom.storage.enabled", false);
--
cgit v1.2.3
From c40b2438f506e0706ffb44449190f29cb11824f8 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 06:37:10 -0200
Subject: iceweasel-libre-17.0.1.1-2: more fixes on region.properties for
locales from source code and adjusting for ddg html logo
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 43 +++++++++++++++++++++++++++++++++++++--
2 files changed, 42 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index f1d873728..b9515737b 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'f2bf013ba4259091355c762dc70b4985'
+ 'fbdc942afd33a4a26ea3a96b1da2cbe8'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 4534f0ca8..102bf59ea 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -476,14 +476,33 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties
+browser.search.defaultenginename=DuckDuckGo HTML
diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js
--- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 04:11:24.803127119 -0200
-@@ -1,3 +1,13 @@
++++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 06:23:43.870132762 -0200
+@@ -1,3 +1,32 @@
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
+
++// region.properties for all locales
+pref("browser.search.defaultenginename", "DuckDuckGo HTML");
+
++pref("browser.search.order.1", "DuckDuckGo HTML");
++pref("browser.search.order.2", "DuckDuckGo Lite");
++pref("browser.search.order.3", "Seeks Search");
++
++pref("gecko.handlerService.schemes.webcal.0.name","");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate","");
++
++pref("gecko.handlerService.schemes.mailto.0.name","");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate","");
++pref("gecko.handlerService.schemes.mailto.1.name","");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate","");
++
++pref("gecko.handlerService.schemes.irc.0.name", "Freenode");
++pref("gecko.handlerService.schemes.irc.0.uriTemplate", "https://webchat.freenode.net/");
++
++pref("gecko.handlerService.schemes.ircs.0.name", "Freenode");
++pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "https://webchat.freenode.net/");
++
+// Disable safe browsing.
+pref("browser.safebrowsing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
@@ -491,3 +510,23 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17
+// Disable localstorage for privacy reasons. We will rewrite about:home js to
+// fix the bug.
+pref("dom.storage.enabled", false);
+diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css
+--- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css 2012-11-29 02:43:23.000000000 -0200
++++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css 2012-12-04 06:31:10.410410656 -0200
+@@ -66,7 +66,7 @@
+ #searchEngineLogo {
+ display: inline-block;
+ height: 28px;
+- width: 70px;
++ width: 47px;
+ }
+
+ #searchText {
+@@ -79,6 +79,7 @@
+ 0 0 2px hsla(210,65%,9%,.1) inset,
+ 0 1px 0 hsla(0,0%,100%,.2);
+ border-radius: 2.5px 0 0 2.5px;
++ font-size:.9em;
+ }
+
+ #searchText:-moz-dir(rtl) {
--
cgit v1.2.3
From 9ad0567a94daec95dfea0afece368fcae068aa1e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 06:54:02 -0200
Subject: iceweasel-libre-17.0.1.1-2: removing unnecessary change in
libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index b9515737b..01cdb00a9 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'fbdc942afd33a4a26ea3a96b1da2cbe8'
+ '9242b38926f661920d6ba10c68a92fe4'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 102bf59ea..114c93adf 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -522,11 +522,3 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css ice
}
#searchText {
-@@ -79,6 +79,7 @@
- 0 0 2px hsla(210,65%,9%,.1) inset,
- 0 1px 0 hsla(0,0%,100%,.2);
- border-radius: 2.5px 0 0 2.5px;
-+ font-size:.9em;
- }
-
- #searchText:-moz-dir(rtl) {
--
cgit v1.2.3
From 96667ab29847d7880d84465ed4993d947a32637a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 09:03:32 -0200
Subject: iceweasel-libre-17.0.1.1-2: adding some things for
firefox-branding.js in libre.patch
---
libre/iceweasel-libre/libre.patch | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 114c93adf..8195e9760 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -476,8 +476,8 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties
+browser.search.defaultenginename=DuckDuckGo HTML
diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js
--- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 06:23:43.870132762 -0200
-@@ -1,3 +1,32 @@
++++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 08:56:43.411376475 -0200
+@@ -1,3 +1,37 @@
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
@@ -489,6 +489,11 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17
+pref("browser.search.order.2", "DuckDuckGo Lite");
+pref("browser.search.order.3", "Seeks Search");
+
++pref("browser.contentHandlers.types.0.title","");
++pref("browser.contentHandlers.types.0.uri","");
++pref("browser.contentHandlers.types.1.title","");
++pref("browser.contentHandlers.types.1.uri","");
++
+pref("gecko.handlerService.schemes.webcal.0.name","");
+pref("gecko.handlerService.schemes.webcal.0.uriTemplate","");
+
--
cgit v1.2.3
From c28e0105b720878da5c3e6a65eb49488c21a08aa Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 09:06:28 -0200
Subject: iceweasel-libre-17.0.1.1-2: updating md5sum of libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 01cdb00a9..4255151a4 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '9242b38926f661920d6ba10c68a92fe4'
+ '0c030a9afaf7a5b5f6ce703a6acdc58f'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
--
cgit v1.2.3
From e8330931a1cf3b76578c41b251d185436c238529 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 13:55:16 -0200
Subject: iceweasel-libre-17.0.1.1-3: fixing issues related to irc handle url
---
libre/iceweasel-libre/PKGBUILD | 4 ++--
libre/iceweasel-libre/libre.patch | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 4255151a4..506aff177 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=3
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '0c030a9afaf7a5b5f6ce703a6acdc58f'
+ '0082890e1ab495505b6a885aaaa72bf4'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 8195e9760..a7ba03066 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -489,18 +489,18 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17
+pref("browser.search.order.2", "DuckDuckGo Lite");
+pref("browser.search.order.3", "Seeks Search");
+
-+pref("browser.contentHandlers.types.0.title","");
-+pref("browser.contentHandlers.types.0.uri","");
-+pref("browser.contentHandlers.types.1.title","");
-+pref("browser.contentHandlers.types.1.uri","");
++pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
+
-+pref("gecko.handlerService.schemes.webcal.0.name","");
-+pref("gecko.handlerService.schemes.webcal.0.uriTemplate","");
++pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+
-+pref("gecko.handlerService.schemes.mailto.0.name","");
-+pref("gecko.handlerService.schemes.mailto.0.uriTemplate","");
-+pref("gecko.handlerService.schemes.mailto.1.name","");
-+pref("gecko.handlerService.schemes.mailto.1.uriTemplate","");
++pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+
+pref("gecko.handlerService.schemes.irc.0.name", "Freenode");
+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "https://webchat.freenode.net/");
--
cgit v1.2.3
From 1cdfe838b643f2c4a355b04a02a5284a272c4e85 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 17:18:47 -0200
Subject: iceweasel-libre-17.0.1.1-3: fixing more issues in libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 262 +++++++++++++++++++++++++++++++-------
2 files changed, 214 insertions(+), 50 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 506aff177..f5967ce2a 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '0082890e1ab495505b6a885aaaa72bf4'
+ 'f84421b909332bd91c383cdbc2f719a2'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index a7ba03066..b61a04e0c 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,7 +1,7 @@
-diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/browser/app/profile/firefox.js
---- iceweasel-17.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300
-+++ iceweasel-17.0/browser/app/profile/firefox.js 2012-11-28 16:33:37.105547392 -0200
-@@ -37,11 +37,11 @@
+diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/browser/app/profile/firefox.js
+--- iceweasel-17.0.1.orig/browser/app/profile/firefox.js 2012-11-29 02:43:23.000000000 -0200
++++ iceweasel-17.0.1/browser/app/profile/firefox.js 2012-12-04 17:00:51.691456154 -0200
+@@ -37,11 +37,10 @@
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
@@ -10,24 +10,24 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.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");
++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);
-@@ -194,7 +194,7 @@
+@@ -194,7 +193,8 @@
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.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons");
+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.
-@@ -340,7 +340,7 @@
+@@ -329,18 +328,18 @@
pref("browser.download.panel.removeFinishedDownloads", false);
// search engines URL
@@ -35,8 +35,23 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
// pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -582,7 +582,7 @@
+-pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
++pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties");
+
+ // disable logging for the search service by default
+ pref("browser.search.log", false);
+
+ // Ordering of Search Engines in the Engine list.
+-pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
++pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties");
+
+ // search bar results always open in a new tab
+ pref("browser.search.openintab", false);
+@@ -571,7 +570,7 @@
pref("accessibility.typeaheadfind.flashBar", 1);
// plugin finder service url
@@ -45,7 +60,163 @@ diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/brow
// 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);
-@@ -1184,13 +1184,3 @@
+@@ -624,23 +623,23 @@
+ pref("browser.send_pings", false);
+
+ /* initial web feed readers list */
+-pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.5.uri", "cchrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
+
+ pref("browser.feeds.handler", "ask");
+@@ -651,7 +650,7 @@
+ // region.properties file is newer than the version number in the handler
+ // service datastore, it will add any new handlers it finds in the prefs (as
+ // seeded by this file) to its datastore.
+-pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties");
+
+ // The default set of web-based protocol handlers shown in the application
+ // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
+@@ -659,65 +658,65 @@
+ // protocol not currently listed here), we should go ahead and add those.
+
+ // webcal
+-pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // mailto
+-pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // irc
+-pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // ircs
+-pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
+ pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
+
+ #ifdef MOZ_SAFE_BROWSING
+-pref("browser.safebrowsing.enabled", true);
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.enabled", false);
++pref("browser.safebrowsing.malware.enabled", false);
+ pref("browser.safebrowsing.debug", false);
+
+-pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
+-pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
++pref("browser.safebrowsing.updateURL", "");
++pref("browser.safebrowsing.keyURL", "");
++pref("browser.safebrowsing.gethashURL", "");
++pref("browser.safebrowsing.reportURL", "");
++pref("browser.safebrowsing.reportGenericURL", "");
++pref("browser.safebrowsing.reportErrorURL", "");
++pref("browser.safebrowsing.reportPhishURL", "");
++pref("browser.safebrowsing.reportMalwareURL", "");
++pref("browser.safebrowsing.reportMalwareErrorURL", "");
+
+-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
+-pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
++pref("browser.safebrowsing.warning.infoURL", "");
++pref("browser.safebrowsing.malware.reportURL", "");
+
+ // Name of the about: page contributed by safebrowsing to handle display of error
+ // pages on phishing/malware hits. (bug 399233)
+@@ -1164,13 +1167,3 @@
// might keep around more than this, but we'll try to get down to this value).
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -468,50 +639,43 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
gSearchEngine[prop] = searchEngineInfo[prop];
diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties
--- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties 2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 02:32:50.710792982 -0200
-@@ -1,3 +1,3 @@
++++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 16:47:47.039271071 -0200
+@@ -1,3 +1,27 @@
# Do NOT localize or otherwise change these values
++
++# Default startup homepage
browser.startup.homepage=about:home
--
+
++# Default search engine
+browser.search.defaultenginename=DuckDuckGo HTML
++
++# Search engine order (order displayed in the search bar dropdown)s
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
++
++# 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
++# profile database. Note that "new" is defined as "has a different URL"; this
++# 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 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 -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js
--- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 08:56:43.411376475 -0200
-@@ -1,3 +1,37 @@
++++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 16:22:08.817372515 -0200
+@@ -1,3 +1,7 @@
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
+
-+// region.properties for all locales
-+pref("browser.search.defaultenginename", "DuckDuckGo HTML");
-+
-+pref("browser.search.order.1", "DuckDuckGo HTML");
-+pref("browser.search.order.2", "DuckDuckGo Lite");
-+pref("browser.search.order.3", "Seeks Search");
-+
-+pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
-+
-+pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
-+
-+pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
-+
-+pref("gecko.handlerService.schemes.irc.0.name", "Freenode");
-+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "https://webchat.freenode.net/");
-+
-+pref("gecko.handlerService.schemes.ircs.0.name", "Freenode");
-+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "https://webchat.freenode.net/");
-+
-+// Disable safe browsing.
-+pref("browser.safebrowsing.enabled", false);
-+pref("browser.safebrowsing.malware.enabled", false);
-+
+// Disable localstorage for privacy reasons. We will rewrite about:home js to
+// fix the bug.
+pref("dom.storage.enabled", false);
--
cgit v1.2.3
From e0caa80a7d078e74bf767a958e5e18ab3ae1c39d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 20:50:48 -0200
Subject: iceweasel-libre-17.0.1.1-4: fixing grammars on libre.patch
---
libre/iceweasel-libre/PKGBUILD | 4 ++--
libre/iceweasel-libre/iceweasel.install | 1 +
libre/iceweasel-libre/libre.patch | 28 ++++++++++++++--------------
3 files changed, 17 insertions(+), 16 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index f5967ce2a..126dcccd5 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=4
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'f84421b909332bd91c383cdbc2f719a2'
+ 'ee9e1a97f6d3f1986712f0147f7142a7'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install
index c1fe8284a..c1e20dbc3 100755
--- a/libre/iceweasel-libre/iceweasel.install
+++ b/libre/iceweasel-libre/iceweasel.install
@@ -5,6 +5,7 @@ post_install() {
post_upgrade() {
post_install $1
+EOM
}
post_remove() {
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index b61a04e0c..c4704aa6d 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -92,7 +92,7 @@ diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/
-pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
+pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.5.uri", "cchrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties");
pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
pref("browser.feeds.handler", "ask");
@@ -326,13 +326,13 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
@@ -361,12 +361,12 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.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.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
--
cgit v1.2.3
From 834a3a4707c35f93a0f9fa65892cf3fd6494b67d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 20:53:17 -0200
Subject: iceweasel-libre-17.0.1.1-4: removing a error in iceweasel.install
---
libre/iceweasel-libre/iceweasel.install | 1 -
1 file changed, 1 deletion(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install
index c1e20dbc3..c1fe8284a 100755
--- a/libre/iceweasel-libre/iceweasel.install
+++ b/libre/iceweasel-libre/iceweasel.install
@@ -5,7 +5,6 @@ post_install() {
post_upgrade() {
post_install $1
-EOM
}
post_remove() {
--
cgit v1.2.3
From dba7b4d63f882ecc2bf45e615bc5b828acfb1437 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 21:01:39 -0200
Subject: iceweasel-libre-17.0.1.1-4: removing a error in abouthome.js
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 126dcccd5..56f1e4dfa 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'ee9e1a97f6d3f1986712f0147f7142a7'
+ 'c8040002668fae7d1b950833bae51607'
'abf5ecb74caa857abb42bcfbb3442d9c'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index c4704aa6d..cd3d49f2f 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -595,7 +595,7 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
+ "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
+ "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
+ "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-+ },
++ }
};
// The process of adding a new default snippet involves:
--
cgit v1.2.3
From 8b6f66ee13008d801f25b109a5e19874be9717d1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 22:27:20 -0200
Subject: icecat-17.0.1-1: updating version
---
libre/icecat/PKGBUILD | 12 +-
libre/icecat/libre.patch | 357 +++++++++++++++++++++++++++++++++++++++--------
libre/icecat/mozconfig | 2 +-
3 files changed, 307 insertions(+), 64 deletions(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 822f800f2..85d0bd554 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,8 +15,8 @@
_pgo=false
pkgname=icecat
-pkgver=14.0
-pkgrel=4
+pkgver=17.0.1
+pkgrel=1
pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
arch=(i686 x86_64 mips64el)
license=(GPL2 MPL LGPL)
@@ -72,10 +72,10 @@ source=(
$pkgname-safe.desktop
$pkgname-install-dir.patch
vendor.js
- cairo.patch
+ #cairo.patch
)
md5sums=(
- 6bb02202cd568e8a4f43239b8f52a4a7
+ c88a29aa92fc41a07e777a0e63ac5f7e
3117865902d1a20ab61d75707be9888e
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
@@ -84,7 +84,7 @@ md5sums=(
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
0d053487907de4376d67d8f499c5502b
- c8552d030494443218d88792f4dbbd0f
+ #c8552d030494443218d88792f4dbbd0f
)
build() {
@@ -98,7 +98,7 @@ build() {
patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix
patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff
- patch -Np1 -i $srcdir/cairo.patch # fix cairo
+ #patch -Np1 -i $srcdir/cairo.patch # fix cairo
# Fix for use nspr, sqlite and nss external
sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 1f0d4306e..bf2dff437 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,33 +1,242 @@
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 @@
+@@ -3,5 +3,29 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
# Do NOT localize or otherwise change these values
--browser.startup.homepage=http://gnuzilla.gnu.org
-+browser.startup.homepage=about:home
++
++# Default startup homepage
+ browser.startup.homepage=about:home
+-browser.search.defaultenginename="DuckDuckGo"
++
++# Default search engine
++browser.search.defaultenginename=DuckDuckGo HTML
++
++# Search engine order (order displayed in the search bar dropdown)s
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
++
++# 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
++# profile database. Note that "new" is defined as "has a different URL"; this
++# 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 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/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -70,6 +70,7 @@
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
- pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/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");
-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
-@@ -38,104 +38,6 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--// If a definition requires additional params, check that the final search url
--// is handled correctly by the engine.
--const SEARCH_ENGINES = {
+--- a/browser/app/profile/firefox.js 2012-12-01 16:06:30.000000000 -0200
++++ b/browser/app/profile/firefox.js 2012-12-04 20:42:20.753633713 -0200
+@@ -324,15 +324,15 @@
+ pref("browser.search.searchEnginesURL","http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
+
+ // pointer to the default engine name
+-pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
++pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties");
+
+ // disable logging for the search service by default
+ pref("browser.search.log", false);
+
+ // Ordering of Search Engines in the Engine list.
+-pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
++pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties");
+
+ // search bar results always open in a new tab
+ pref("browser.search.openintab", false);
+@@ -616,23 +616,23 @@
+ pref("browser.send_pings", false);
+
+ /* initial web feed readers list */
+-pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
+
+ pref("browser.feeds.handler", "ask");
+@@ -643,7 +643,7 @@
+ // region.properties file is newer than the version number in the handler
+ // service datastore, it will add any new handlers it finds in the prefs (as
+ // seeded by this file) to its datastore.
+-pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties");
+
+ // The default set of web-based protocol handlers shown in the application
+ // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
+@@ -651,65 +651,65 @@
+ // protocol not currently listed here), we should go ahead and add those.
+
+ // webcal
+-pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // mailto
+-pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // irc
+-pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // ircs
+-pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
+ pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
+
+ #ifdef MOZ_SAFE_BROWSING
+-pref("browser.safebrowsing.enabled", true);
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.enabled", false);
++pref("browser.safebrowsing.malware.enabled", false);
+ pref("browser.safebrowsing.debug", false);
+
+-pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
+-pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
++pref("browser.safebrowsing.updateURL", "");
++pref("browser.safebrowsing.keyURL", "");
++pref("browser.safebrowsing.gethashURL", "");
++pref("browser.safebrowsing.reportURL", "");
++pref("browser.safebrowsing.reportGenericURL", "");
++pref("browser.safebrowsing.reportErrorURL", "");
++pref("browser.safebrowsing.reportPhishURL", "");
++pref("browser.safebrowsing.reportMalwareURL", "");
++pref("browser.safebrowsing.reportMalwareErrorURL", "");
+
+-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
+-pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
++pref("browser.safebrowsing.warning.infoURL", "");
++pref("browser.safebrowsing.malware.reportURL", "");
+
+ // Name of the about: page contributed by safebrowsing to handle display of error
+ // pages on phishing/malware hits. (bug 399233)
+@@ -1149,13 +1149,3 @@
+ // might keep around more than this, but we'll try to get down to this value).
+ // (This is intentionally on the high side; see bug 746055.)
+ pref("image.mem.max_decoded_image_kb", 256000);
+-
+-// Example social provider
+-pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
+-// Comma-separated list of nsIURI::prePaths that are allowed to activate
+-// built-in social functionality.
+-pref("social.activation.whitelist", "https://www.facebook.com");
+-pref("social.sidebar.open", true);
+-pref("social.sidebar.unload_timeout_ms", 10000);
+-pref("social.active", false);
+-pref("social.toast-notifications.enabled", true);
+diff -Nur a/browser/branding/unofficial/content/aboutHome.js b/browser/branding/unofficial/content/aboutHome.js
+--- a/browser/branding/unofficial/content/aboutHome.js
++++ b/browser/branding/unofficial/content/aboutHome.js
+@@ -5,100 +5,41 @@
+ // If a definition requires additional params, check that the final search url
+ // is handled correctly by the engine.
+ const SEARCH_ENGINES = {
+- "Duck Duck Go": {
+- image: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3PuK8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktrRRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VSda6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQHxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/qyT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYHV349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVXyyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EHv4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SMyAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpslj09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxNv62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYVQTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4kwJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjzeRMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBxtp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMMak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWDuek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJMbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMxAov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4GSawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KOGKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwvYzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vVw7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6uuctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtDahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="},
- "Google": {
-- image: "data:image/png;base64," +
++ "DuckDuckGo HTML": {
+ image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -118,31 +327,65 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
-- }
--};
--
- // The process of adding a new default snippet involves:
- // * add a new entity to aboutHome.dtd
- // * add a for it in aboutHome.xhtml
-@@ -143,7 +45,7 @@
- // The 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"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
-+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
- ];
++ "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
++ "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
++ "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
++ "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
++ "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
++ "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
++ "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
++ "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
++ "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
++ "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
++ "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
++ "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
++ "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
++ "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
++ "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
++ "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
++ "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
++ "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
++ "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
++ "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
++ "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
++ "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
++ "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
++ "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
++ "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
++ "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
++ "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
++ "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
++ "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
++ "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
++ "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
++ "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
++ "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
+ }
+ };
+@@ -115,8 +56,8 @@
const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+
+ // Bug with dom.storage.enabled set as false
+-// We are using DDG as a default in this case.
+-let gSearchEngine = {"name": "Duck Duck Go", "searchUrl": "https://duckduckgo.com/html/?t=icecat&q=_searchTerms_"};
++// We are using DDG HTML as a default in this case.
++let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"};
+
+ document.addEventListener("DOMContentLoaded", function init() {
+ setupSearchEngine();
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 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 @@
+--- a/browser/locales/en-US/chrome/browser-region/region.properties
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
+@@ -3,30 +3,18 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
# Default search engine
--browser.search.defaultenginename=Google
+-browser.search.defaultenginename=DuckDuckGo
+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.1=DuckDuckGo
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-
@@ -170,7 +413,7 @@ 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 +18,11 @@
+@@ -34,3 +22,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
@@ -260,13 +503,13 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.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.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.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.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
@@ -328,13 +571,13 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.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.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.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.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index c09eacaca..5df8547f7 100755
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -15,7 +15,7 @@ ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+ac_add_options --disable-system-cairo
ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
--
cgit v1.2.3
From 5255a7a79f9439ffd5747e7192255672b4bc7242 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 22:29:30 -0200
Subject: icecat-17.0.1-1: updating mozconfig md5sum
---
libre/icecat/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 85d0bd554..53c3c3f77 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -76,7 +76,7 @@ source=(
)
md5sums=(
c88a29aa92fc41a07e777a0e63ac5f7e
- 3117865902d1a20ab61d75707be9888e
+ a22327391a1995703436ed42fe703d3f
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
0119cc83435b192e78160f97ad2da9ea
--
cgit v1.2.3
From 49eb2cf7c1e246cffe7c1d34a60b5e774e298a4b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 22:41:36 -0200
Subject: icecat-17.0.1-1: updating libre.patch md5sum
---
libre/icecat/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 53c3c3f77..14a04b8fd 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -79,7 +79,7 @@ md5sums=(
a22327391a1995703436ed42fe703d3f
ac29b01c189f20abae2f3eef1618ffc0
3009b176cc5f9b1e416b1bf7c45b064b
- 0119cc83435b192e78160f97ad2da9ea
+ f4cffe48e84283026da634424f4bbee6
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
b320085e7effa2890a79f4f45760614b
--
cgit v1.2.3
From a53d499df5e3a4c063192cbc8b9b5a18a4d29bad Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 4 Dec 2012 22:48:25 -0200
Subject: icecat-17.0.1-1: fixing icecat-install-dir.patch
---
libre/icecat/PKGBUILD | 2 +-
libre/icecat/icecat-install-dir.patch | 47 +++++++++++++++++++----------------
2 files changed, 26 insertions(+), 23 deletions(-)
mode change 100755 => 100644 libre/icecat/icecat-install-dir.patch
(limited to 'libre')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 14a04b8fd..cc5889c7a 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -82,7 +82,7 @@ md5sums=(
f4cffe48e84283026da634424f4bbee6
e81ad01dbc16ba28bf92ba4b7c309ca7
d93fe402b87cd000a869e1fd6badc6c9
- b320085e7effa2890a79f4f45760614b
+ 64826fcf48816b13090042eefddbaa58
0d053487907de4376d67d8f499c5502b
#c8552d030494443218d88792f4dbbd0f
)
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
old mode 100755
new mode 100644
index eb698f307..7a72b9c9d
--- a/libre/icecat/icecat-install-dir.patch
+++ b/libre/icecat/icecat-install-dir.patch
@@ -1,27 +1,30 @@
---- a/config/autoconf.mk.in
-+++ b/config/autoconf.mk.in
-@@ -74,8 +74,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
---- a/js/src/config/autoconf.mk.in
-+++ b/js/src/config/autoconf.mk.in
-@@ -60,8 +60,8 @@
- datadir = @datadir@
- mandir = @mandir@
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
+--- a/js/src/config/baseconfig.mk
++++ b/js/src/config/baseconfig.mk
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- TOP_DIST = @TOP_DIST@
ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
--
cgit v1.2.3
From 4c96ddfb5f3ba314e61b1001064ce00e2f2bc6f9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 5 Dec 2012 16:35:58 -0200
Subject: linux-libre-3.6.9-1: updating version
---
libre/linux-libre/PKGBUILD | 14 ++++++++++----
libre/linux-libre/fat-3.6.x.patch | 33 +++++++++++++++++++++++++++++++++
libre/linux-libre/linux-libre.install | 2 +-
3 files changed, 44 insertions(+), 5 deletions(-)
create mode 100644 libre/linux-libre/fat-3.6.x.patch
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 55d68e2a6..9924386ea 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.6
-_sublevel=8
+_sublevel=9
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,9 +32,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-symbol-waiting-3.6.patch'
'module-init-wait-3.6.patch'
'irq_cfg_pointer-3.6.6.patch'
+ 'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
- '3f4d630f49a12079598a3601dd2adb24'
+ '2127e118d09154c7a44dd2dfed2cfecd'
'e4a3a4677e1fac6ecf0e0fb44c41ca08'
'68fc36a4efb6ade0eca409b9444fef0c'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -45,7 +46,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
'4909a0271af4e5f373136b382826717f'
- 'acc79d1934fe9710acd9039dcd4e8b30')
+ '88d501404f172dac6fcb248978251560'
+ '2f3ae0624acb4a4b12ea2c008b964bd2')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -78,6 +80,10 @@ build() {
# fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+ # fix cosmetic fat issue
+ # https://bugs.archlinux.org/task/32916
+ patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/fat-3.6.x.patch b/libre/linux-libre/fat-3.6.x.patch
new file mode 100644
index 000000000..d8deeb788
--- /dev/null
+++ b/libre/linux-libre/fat-3.6.x.patch
@@ -0,0 +1,33 @@
+From: Dave Reisner
+Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100)
+Subject: fs/fat: strip "cp" prefix from codepage in display
+X-Git-Tag: next-20121130~1^2~97
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405
+
+fs/fat: strip "cp" prefix from codepage in display
+
+Option parsing code expects an unsigned integer for the codepage option,
+but prefixes and stores this option with "cp" before passing to
+load_nls(). This makes the displayed option in /proc an invalid one.
+Strip the prefix when printing so that the displayed option is valid for
+reuse.
+
+Signed-off-by: Dave Reisner
+Acked-by: OGAWA Hirofumi
+Signed-off-by: Andrew Morton
+---
+
+diff --git a/fs/fat/inode.c b/fs/fat/inode.c
+index 3b733a7..3580681 100644
+--- a/fs/fat/inode.c
++++ b/fs/fat/inode.c
+@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root)
+ if (opts->allow_utime)
+ seq_printf(m, ",allow_utime=%04o", opts->allow_utime);
+ if (sbi->nls_disk)
+- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset);
++ /* strip "cp" prefix from displayed option */
++ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]);
+ if (isvfat) {
+ if (sbi->nls_io)
+ seq_printf(m, ",iocharset=%s", sbi->nls_io->charset);
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 62df4eb18..89024bf96 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.6.8-1-LIBRE
+KERNEL_VERSION=3.6.9-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From 12c1af76a470f2038922fd464d6b25d62e897eae Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 5 Dec 2012 18:18:50 -0200
Subject: linux-libre-lts-3.0.54-1: updating version
---
.../linux-libre-lts/3.0.54-ptrace-i686-build.patch | 41 ++++++++++
libre/linux-libre-lts/PKGBUILD | 17 +++--
libre/linux-libre-lts/config.i686 | 88 +---------------------
libre/linux-libre-lts/config.x86_64 | 71 +----------------
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
5 files changed, 59 insertions(+), 160 deletions(-)
create mode 100644 libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
(limited to 'libre')
diff --git a/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
new file mode 100644
index 000000000..6ef275bda
--- /dev/null
+++ b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
@@ -0,0 +1,41 @@
+From: H. Peter Anvin
+Date: Wed, 21 Nov 2012 06:21:02 +0000 (-0800)
+Subject: x86-32: Export kernel_stack_pointer() for modules
+X-Git-Tag: v3.6.9~50
+X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=051d62f6f239a9427fcab244a310610ed8bedb43
+
+x86-32: Export kernel_stack_pointer() for modules
+
+commit cb57a2b4cff7edf2a4e32c0163200e9434807e0a upstream.
+
+Modules, in particular oprofile (and possibly other similar tools)
+need kernel_stack_pointer(), so export it using EXPORT_SYMBOL_GPL().
+
+Link: http://lkml.kernel.org/r/20120912135059.GZ8285@erda.amd.com
+Cc: Yang Wei
+Cc: Robert Richter
+Cc: Jun Zhang
+Signed-off-by: H. Peter Anvin
+Signed-off-by: Greg Kroah-Hartman
+---
+
+diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
+index 947cf90..9ee1787 100644
+--- a/arch/x86/kernel/ptrace.c
++++ b/arch/x86/kernel/ptrace.c
+@@ -21,6 +21,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include
+@@ -192,6 +193,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
+
+ return (unsigned long)regs;
+ }
++EXPORT_SYMBOL_GPL(kernel_stack_pointer);
+
+ static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)
+ {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index a36ead268..0170fdfac 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=53
+_sublevel=54
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.53 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -30,11 +30,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'ext4-options.patch'
'module-symbol-waiting-3.0.patch'
'module-init-wait-3.0.patch'
+ '3.0.54-ptrace-i686-build.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- 'bb8cb7d0f02f0b7a5861ee04236875a7'
- 'aed25ab047e1c0b020a1516c235c6a74'
- '7d37e8ce0f4bd5a957172b12ae742ea0'
+ '2fd5511915299a3f60b0494914881e3f'
+ 'a5d98603d79d3ab7f979af49b2970f26'
+ '0ed396b368d8cdf8845f7ef2f62fc93c'
'c072b17032e80debc6a8626299245d46'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -44,7 +45,8 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'ecf9d21d2d6dfbc29dc18b616cbce4e1')
+ '80889d526d86e516757b52fc99dca64d'
+ '461adf81c9df997b57bfb3fa07d13746')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -87,6 +89,9 @@ build() {
patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+ # fix building on i686 platform
+ patch -Np1 -i "${srcdir}/3.0.54-ptrace-i686-build.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 823d65d18..a4198fa07 100755
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.43-1 Kernel Configuration
+# Linux/i386 3.0.54-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -431,6 +431,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
@@ -1533,89 +1534,7 @@ CONFIG_IWMC3200TOP=m
CONFIG_TI_ST=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
#
# SCSI device support
@@ -4523,7 +4442,6 @@ CONFIG_LEDS_TRIGGERS=y
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 89eed9382..ed86b4b62 100755
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.43-1 Kernel Configuration
+# Linux/x86_64 3.0.54-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -417,6 +417,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
@@ -1475,72 +1476,7 @@ CONFIG_IWMC3200TOP=m
CONFIG_TI_ST=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDE is not set
#
# SCSI device support
@@ -4298,7 +4234,6 @@ CONFIG_LEDS_TRIGGERS=y
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index a273c9f0e..1251b68c7 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.53-1-LIBRE-LTS
+KERNEL_VERSION=3.0.54-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From 498fa3c696035f6dc30f3cf7de3d36d99e524e3c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 5 Dec 2012 18:38:07 -0200
Subject: filesystem-2012.12-1: updating version
---
libre/filesystem/PKGBUILD | 12 ++++++------
libre/filesystem/filesystem.install | 4 +++-
libre/filesystem/group | 1 +
libre/filesystem/gshadow | 1 +
libre/filesystem/passwd | 1 +
libre/filesystem/shadow | 1 +
6 files changed, 13 insertions(+), 7 deletions(-)
(limited to 'libre')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index c024b5700..fb422594c 100755
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171894 2012-11-22 14:54:47Z tomegun $
+# $Id: PKGBUILD 172494 2012-12-04 01:05:09Z tomegun $
# Maintainer: Tom Gundersen
# Maintainer (Parabola): Nicolás Reynolds
# Maintainer (Parabola): André Silva
pkgname=filesystem
-pkgver=2012.11
+pkgver=2012.12
pkgrel=1
pkgdesc='Base filesystem for Parabola'
arch=('any')
@@ -90,14 +90,14 @@ package() {
done
ln -s ../man usr/local/share/man
}
-md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
+md5sums=('c61f6ac4f6377108e59879f203f18633'
'6be47d893fd49b2e4a8c0e811b350861'
'9e4533df61f0c82d6b2e2371f7376282'
'4c4540eeb748bf1f71d631b8c1dcf0b3'
'f28150d4c0b22a017be51b9f7f9977ed'
'6e488ffecc8ba142c0cf7e2d7aeb832e'
- '455b78cada80f40b6f6968f5cbd97a2e'
- '01249bb0ba4468f95e2cc3a627f5e6e3'
+ '1cfd310dff0804a7d21958487c32a3b1'
+ '2ef2429c2c98d0883906aa6f5363be80'
'693c97f2c9a519bb97a17008e92c2b74'
'1745349eb24ed21b4cfaa6f423bddb76'
'7bc65f234dfb6abf24e7c3b03e86f4ff'
@@ -105,7 +105,7 @@ md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
'0e145e18fea8fd190b30d45764f5707c'
'6f48288b6fcaf0065fcb7b0e525413e0'
'22518e922891f9359f971f4f5b4e793c'
- '677523dbe94b79299aa91b35ed8203b6'
+ 'ffe983034b8004989b8c3df97ec91095'
'f3b6ae7db8adffaaa4bffc6099dcbd50'
'a8a962370cd0128465d514e6a1f74130'
'd5732ffdb3488e1383d4ea199343e767'
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 34fcc0dee..12e59b01b 100755
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -42,7 +42,9 @@ post_upgrade() {
_addgroup rfkill -g 24
_addgroup lock -g 54
_addgroup uuidd -g 68
- _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin
+ _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin
+ _addgroup dbus -g 81
+ _adduser dbus -u 81 -d / -g dbus -s /sbin/nologin
# sync gshadow to group (fixes FS#19869)
if ! grep -q '^lock:' etc/gshadow; then
diff --git a/libre/filesystem/group b/libre/filesystem/group
index cfee1f23e..3e6645c83 100755
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -21,6 +21,7 @@ http:x:33:
games:x:50:
lock:x:54:
uuidd:x:68:
+dbus:x:81:
network:x:90:
video:x:91:
audio:x:92:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index c5ac18581..253f35838 100755
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -21,6 +21,7 @@ http:::
games:::
lock:::
uuidd:!::
+dbus:x::
network:x::
video:x::
audio:::
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
index cb9fec7ff..671fc486e 100755
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -5,4 +5,5 @@ mail:x:8:12:mail:/var/spool/mail:/bin/false
ftp:x:14:11:ftp:/srv/ftp:/bin/false
http:x:33:33:http:/srv/http:/bin/false
uuidd:x:68:68:uuidd:/:/sbin/nologin
+dbus:x:81:81:dbus:/:/sbin/nologin
nobody:x:99:99:nobody:/:/bin/false
diff --git a/libre/filesystem/shadow b/libre/filesystem/shadow
index 5eff4935c..39ebb13c7 100755
--- a/libre/filesystem/shadow
+++ b/libre/filesystem/shadow
@@ -5,4 +5,5 @@ mail:x:14871::::::
ftp:x:14871::::::
http:x:14871::::::
uuidd:x:14871::::::
+dbus:x:14871::::::
nobody:x:14871::::::
--
cgit v1.2.3
From 276bd5a0c0f719faac74cca3c44c30b8f593b098 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 6 Dec 2012 15:46:08 -0200
Subject: kdelibs-libre-4.9.4-3: updating version
---
...-check-parent-mimetypes-in-protocolForArc.patch | 53 ++++++++++++++++++++++
libre/kdelibs-libre/PKGBUILD | 18 ++++----
libre/kdelibs-libre/fix-crash-on-open-with.patch | 19 ++++++++
3 files changed, 81 insertions(+), 9 deletions(-)
create mode 100644 libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
create mode 100644 libre/kdelibs-libre/fix-crash-on-open-with.patch
(limited to 'libre')
diff --git a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
new file mode 100644
index 000000000..5aadeb883
--- /dev/null
+++ b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
@@ -0,0 +1,53 @@
+From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Wed, 5 Dec 2012 22:42:25 +0100
+Subject: [PATCH] Revert "Also check parent mimetypes in
+ protocolForArchiveMimetype()."
+
+This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
+It breaks opening odt and other zip-based files in external apps.
+That's what I get for delegating the testing :-)
+BUG: 311214
+---
+ kio/kio/kprotocolmanager.cpp | 19 +------------------
+ 1 files changed, 1 insertions(+), 18 deletions(-)
+
+diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
+index 3f1cadd..502a3e6 100644
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
+@@ -47,7 +47,6 @@
+ #include
+ #include
+ #include
+-#include
+ #include
+ #include
+
+@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
+ }
+ }
+ }
+- const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
+- if (!prot.isEmpty())
+- return prot;
+-
+- // Check parent mimetypes
+- KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+- if (mime) {
+- const QStringList parentMimeTypes = mime->allParentMimeTypes();
+- Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
+- const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
+- if (!res.isEmpty()) {
+- return res;
+- }
+- }
+- }
+-
+- return QString();
++ return d->protocolForArchiveMimetypes.value(mimeType);
+ }
+
+ #undef PRIVATE_DATA
+--
+1.7.7
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 326eae2aa..1f88f6557 100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 170700 2012-11-09 21:01:24Z andrea $
+# $Id: PKGBUILD 172900 2012-12-06 14:03:01Z andrea $
# Maintainer: Andrea Scarpino
# Maintainer (Parabola): André Silva
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.9.3
-pkgrel=2
+pkgver=4.9.4
+pkgrel=3
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -23,13 +23,13 @@ conflicts=('kdelibs')
install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch'
- 'use-pythondontwritebytecode.patch'
- 'fix-save-path.patch'
+ '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch'
+ 'fix-crash-on-open-with.patch'
'khtml-fsdg.diff')
sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '1138e78f15faa7221669ea81e313c595000cc953'
- 'e3d2621bd1451fe7f45a454af970fae108614ddd'
+ 'f5d203932f67ab6d87c794e9cb78a3b1a22ef747'
+ '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07'
'a1502a964081ad583a00cf90c56e74bf60121830')
build() {
@@ -39,8 +39,8 @@ build() {
patch -p1 -i "${srcdir}"/kde-applications-menu.patch
# Fixed upstream
- patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch
- patch -p1 -i "${srcdir}"/fix-save-path.patch
+ patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+ patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch
# Don't ask the user to download a plugin, it's probably nonfree.
patch -p1 -i "${srcdir}"/khtml-fsdg.diff
diff --git a/libre/kdelibs-libre/fix-crash-on-open-with.patch b/libre/kdelibs-libre/fix-crash-on-open-with.patch
new file mode 100644
index 000000000..60556386d
--- /dev/null
+++ b/libre/kdelibs-libre/fix-crash-on-open-with.patch
@@ -0,0 +1,19 @@
+commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
+Author: David Faure
+Date: Thu Dec 6 11:55:05 2012 +0100
+
+ Fix crash when no service was selected (user clicked on "Open With...")
+
+diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
+index 6d84800..6de0380 100644
+--- a/kparts/browserrun.cpp
++++ b/kparts/browserrun.cpp
+@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
+ this, SLOT(slotCopyToTempFileResult(KJob*)) );
+ return Delayed; // We'll continue after the job has finished
+ }
+- if (selectedService) {
++ if (selectedService && question.selectedService()) {
+ *selectedService = question.selectedService();
+ // KRun will use this when starting an app
+ KRun::setPreferredService(question.selectedService()->desktopEntryName());
--
cgit v1.2.3
From f7c3d7428a9f13ff4a6bb3af6fb813231ecbe323 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 6 Dec 2012 15:46:36 -0200
Subject: kdebase-konqueror-libre-4.9.4-1: updating version
---
libre/kdebase-konqueror-libre/PKGBUILD | 10 +++++-----
libre/kdebase-konqueror-libre/konq-about-fsdg.diff | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'libre')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 69951b8cf..f47b71243 100755
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165939 2012-09-03 21:49:19Z andrea $
+# $Id: PKGBUILD 172214 2012-12-02 07:43:07Z andrea $
# Maintainer: Andrea Scarpino
# Contributor: Pierre Schmitz
# Maintainer (Parabola): Michał Masłowski
@@ -6,7 +6,7 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.9.3
+pkgver=4.9.4
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
@@ -15,9 +15,9 @@ groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
"konq-about-fsdg.diff")
-sha1sums=('282b8704d54f081a16894bb94aa901e72eb5e694'
- 'f41541371414dcbe5e76687835e648112b3ff364')
-pkgdesc='KDE File Manager & Web Browser'
+sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747'
+ 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
+pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
optdepends=('kwebkitpart: to enable webkit engine')
install='kdebase-konqueror.install'
diff --git a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
index 06b2103c3..93ef4016a 100755
--- a/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
+++ b/libre/kdebase-konqueror-libre/konq-about-fsdg.diff
@@ -16,7 +16,7 @@ diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps-
- QString("http://www.real.com"), QString("http://www.real.com"),
- QString("about:plugins")) )
+ .arg( i18n("Netscape Communicator® plugins ",
-+ QString("about:plugins")) )
++ QString("about:plugins")) )
.arg( i18n("built-in") )
.arg( i18n("Secure Sockets Layer") )
.arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") )
@@ -27,7 +27,7 @@ diff -ru kde-baseapps-4.8.0.orig/konqueror/about/konq_aboutpage.cc kde-baseapps-
- .arg( i18n( "Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, "
- "using Google, for the search phrase \"KDE\". There are a lot of "
+ .arg( i18n( "Use Web-Shortcuts: by typing \"dd: KDE\" one can search the Internet, "
-+ "using DuckDuckGo, for the search phrase \"KDE\". There are a lot of "
++ "using DuckDuckGo HTML, for the search phrase \"KDE\". There are a lot of "
"Web-Shortcuts predefined to make searching for software or looking "
"up certain words in an encyclopedia a breeze. You can even "
"create your own Web-Shortcuts." , QString("exec:/kcmshell4 ebrowsing")) )
--
cgit v1.2.3
From 2b64b5cb6c9ac24f616cb000321eaac8225a3e46 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 6 Dec 2012 15:47:01 -0200
Subject: kdebase-runtime-libre-4.9.4-1: updating version
---
libre/kdebase-runtime-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 3d30a19b2..75c9a87da 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,8 +5,8 @@
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.9.3
-pkgrel=1.1
+pkgver=4.9.4
+pkgrel=1
pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha1sums=('5245c1152680ad22dff21c44dad531eda736e769'
+sha1sums=('8988c3684c05efc676d1bfe454480f60d75fac3b'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
--
cgit v1.2.3
From 0325b9ab5f6e2ec0c13abf8ea127a330d0079eba Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 6 Dec 2012 15:47:32 -0200
Subject: kdenetwork-kopete-libre-4.9.4-1: updating version
---
libre/kdenetwork-kopete-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 71c772a4e..3ff2a4205 100755
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170697 2012-11-09 20:49:27Z andrea $
+# $Id: PKGBUILD 172278 2012-12-02 07:47:19Z andrea $
# Maintainer: Andrea Scarpino
# Contributor: Pierre Schmitz
# Maintainer (Parabola): André Silva
pkgbase=kdenetwork
pkgname=('kdenetwork-kopete-libre')
-pkgver=4.9.3
+pkgver=4.9.4
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
'use-libotr3.patch')
-sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
+sha1sums=('1541bfd584fc86e29782dbfdbb94c2b183a2bd48'
'9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
build() {
--
cgit v1.2.3
From bcb356e528300bba320ca70d0c1a9d7aaf6eedec Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 6 Dec 2012 15:48:14 -0200
Subject: kdeutils-ark-libre-4.9.4-1: updating version
---
libre/kdeutils-ark-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index e4d7d69ab..20ac66607 100755
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170330 2012-11-06 13:02:06Z andrea $
+# $Id: PKGBUILD 172283 2012-12-02 07:47:38Z andrea $
# Maintainer: Andrea Scarpino
# Maintainer (Parabola): André Silva
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.9.3
+pkgver=4.9.4
pkgrel=1
pkgdesc='Archiving Tool'
url='http://kde.org/applications/utilities/ark/'
@@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver")
replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('7bca83a9985e75e2c5c280c6beb5d16e5a136e90')
+sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb')
build() {
cd "${srcdir}"
--
cgit v1.2.3
From d2f5dc373041815badc71b328cb205207b072496 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 7 Dec 2012 03:06:07 -0200
Subject: kdelibs-libre-4.9.4-3: updating md5sum
---
libre/kdelibs-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 1f88f6557..bc71be0c1 100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -26,7 +26,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.
'0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch'
'fix-crash-on-open-with.patch'
'khtml-fsdg.diff')
-sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
+sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'f5d203932f67ab6d87c794e9cb78a3b1a22ef747'
'8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07'
--
cgit v1.2.3
From d7ca70230e29258e0e0c2ae80552e8fd146ec8a6 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 7 Dec 2012 03:55:33 -0200
Subject: file-roller-libre-3.6.3-1: updating version
---
libre/file-roller-libre/PKGBUILD | 15 +++++----------
libre/file-roller-libre/extract-to-fix.patch | 13 -------------
2 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 libre/file-roller-libre/extract-to-fix.patch
(limited to 'libre')
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 297067255..eae98446f 100755
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171115 2012-11-16 17:25:15Z ibiru $
+# $Id: PKGBUILD 172924 2012-12-06 20:47:37Z heftig $
# Maintainer: Jan Alexander Steffens (heftig)
# Contributor: Jan de Groot
_pkgname=file-roller
pkgname=file-roller-libre
-pkgver=3.6.2
-pkgrel=3
+pkgver=3.6.3
+pkgrel=1
pkgdesc="Archive manipulator for GNOME"
arch=('i686' 'x86_64')
license=('GPL')
@@ -22,17 +22,12 @@ conflicts=("$_pkgname")
options=('!libtool' '!emptydirs')
install=file-roller.install
url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz
- extract-to-fix.patch)
-sha256sums=('47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1'
- 'fc23e122b2d95df9eafe5bdf2a55beb1339a2b1b077973a1b45f881d9bb8427e')
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('6d99d7be243d442484ba46505df5e52ffb4e46ea5cd754daba865eccc22c8402')
build() {
cd $_pkgname-$pkgver
- # https://bugzilla.gnome.org/show_bug.cgi?id=686321
- patch -Np1 -i "$srcdir/extract-to-fix.patch"
-
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/file-roller \
--localstatedir=/var --disable-static \
diff --git a/libre/file-roller-libre/extract-to-fix.patch b/libre/file-roller-libre/extract-to-fix.patch
deleted file mode 100644
index 2ec4c8336..000000000
--- a/libre/file-roller-libre/extract-to-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/main.c~ b/src/main.c
-index 1eb2e65..539ddfa 100644
---- a/src/main.c~
-+++ b/src/main.c
-@@ -850,7 +850,7 @@ fr_application_command_line (GApplication *application,
-
- _g_object_unref (default_directory);
- _g_object_unref (add_to_archive);
-- g_free (extraction_destination);
-+ _g_object_unref (extraction_destination);
-
- return fr_application_command_line_finished (application, EXIT_SUCCESS);
- }
--
cgit v1.2.3
From 918b51b44f8d1a299f7f0fbce1f58491804c9f80 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Sun, 9 Dec 2012 17:00:18 -0500
Subject: update libretools+chroottools
---
libre/chroottools/PKGBUILD | 4 ++--
libre/libretools/PKGBUILD | 16 ++++------------
2 files changed, 6 insertions(+), 14 deletions(-)
(limited to 'libre')
diff --git a/libre/chroottools/PKGBUILD b/libre/chroottools/PKGBUILD
index 049f33286..90e0e4fd0 100644
--- a/libre/chroottools/PKGBUILD
+++ b/libre/chroottools/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luke Shumaker
pkgname=chroottools
-pkgver=20121128.6
+pkgver=20121202
pkgdesc='Chroot tools for Arch and Parabola package maintainers'
url='http://projects.parabolagnulinux.org/packages/chroottools.git/'
license=('GPL')
@@ -25,4 +25,4 @@ package() {
make PREFIX=/usr DESTDIR=${pkgdir} install
}
-md5sums=('32f0cc7fe772a946d8184125011154e1')
+md5sums=('68bb7fb792c55031ad68a970b65ab793')
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 01d835b1a..a5d718ad1 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: fauno
pkgbase=libretools
-pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=20121128.3
+pkgname=(libretools libretools-mips64el)
+pkgver=20121209
pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/libretools.git/"
license=('GPL3+' 'GPL2')
@@ -12,7 +12,7 @@ license=('GPL3+' 'GPL2')
pkgrel=1
arch=('any')
groups=(base-devel)
-depends=(openssh rsync git wget chroottools tokyocabinet)
+depends=(openssh rsync git wget 'chroottools>=20121202' tokyocabinet)
source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar)
build() {
@@ -29,14 +29,6 @@ package_libretools() {
install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto
}
-package_libretools-pr() {
- pkgdesc="Scripts for Parabola development (pr)"
- backup=('etc/libretools.d/prtools.conf')
-
- cd "$srcdir/$pkgbase-$pkgver"
- make install-libretools-pr DESTDIR="$pkgdir"
-}
-
package_libretools-mips64el() {
pkgdesc="Scripts for Parabola development (for mips64el architecture)"
backup=('etc/libretools.d/mips64el.conf')
@@ -45,4 +37,4 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('510f69ff043095b60f8a23ee28fd0a16')
+md5sums=('0a9bea328886b7745a513fa322f16d88')
--
cgit v1.2.3
From 2dc41c2e7173d96fe9875438302eb541e0f76fb8 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 9 Dec 2012 22:36:22 -0200
Subject: kdebase-konqueror-libre-4.9.4-2: adding new patch to fix some bugs
---
libre/kdebase-konqueror-libre/PKGBUILD | 11 +-
.../kde-baseapps-4.9.4-fix-bugs-311206-311246.diff | 232 +++++++++++++++++++++
2 files changed, 239 insertions(+), 4 deletions(-)
create mode 100644 libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
(limited to 'libre')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index f47b71243..ba585e10c 100755
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172214 2012-12-02 07:43:07Z andrea $
+# $Id: PKGBUILD 172988 2012-12-08 05:56:10Z andrea $
# Maintainer: Andrea Scarpino
# Contributor: Pierre Schmitz
# Maintainer (Parabola): Michał Masłowski
@@ -7,15 +7,17 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
pkgver=4.9.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
+ 'kde-baseapps-4.9.4-fix-bugs-311206-311246.diff'
"konq-about-fsdg.diff")
sha1sums=('b68e76766331272a45b1d897adf4c1928a11e747'
+ '998f1db2309744dd2c054aec3462a717bc107c2e'
'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
@@ -26,12 +28,13 @@ replaces=('kdebase-nsplugins' 'kdebase-konqueror')
provides=("kdebase-konqueror=$pkgver")
build() {
- cd "${srcdir}"/kde-baseapps-${pkgver}
+ cd kde-baseapps-${pkgver}
+ patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
+ cd ../
# Don't recommend nonfree software or Google.
patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
- cd ${srcdir}
mkdir build
cd build
cmake ../kde-baseapps-${pkgver} \
diff --git a/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff b/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
new file mode 100644
index 000000000..9f328ec60
--- /dev/null
+++ b/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
@@ -0,0 +1,232 @@
+diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
+index f92cab5..af16954 100644
+--- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
++++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
+@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
+ m_additionalInfoTextColor(),
+ m_overlay(),
+ m_rating(),
+- m_roleEditor(0)
++ m_roleEditor(0),
++ m_oldRoleEditor(0)
+ {
+ }
+
+@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
+ m_textInfo.clear();
+
+ delete m_roleEditor;
++ delete m_oldRoleEditor;
+ }
+
+ void KStandardItemListWidget::setLayout(Layout layout)
+@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
+ this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
+ disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+- // Do not delete the role editor using deleteLater() because we might be
+- // inside a nested event loop which has been started by one of its event
+- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
+- m_roleEditor->deleteWhenIdle();
++ m_oldRoleEditor = m_roleEditor;
++ m_roleEditor->hide();
+ m_roleEditor = 0;
+ }
+ return;
++ } else if (m_oldRoleEditor) {
++ // Delete the old editor before constructing the new one to
++ // prevent a memory leak.
++ m_oldRoleEditor->deleteLater();
++ m_oldRoleEditor = 0;
+ }
+
+ Q_ASSERT(!m_roleEditor);
+@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
+
+ void KStandardItemListWidget::closeRoleEditor()
+ {
++ disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
++ this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
++ disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
++ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
++
+ if (m_roleEditor->hasFocus()) {
+ // If the editing was not ended by a FocusOut event, we have
+ // to transfer the keyboard focus back to the KItemListContainer.
+ scene()->views()[0]->parentWidget()->setFocus();
+ }
+
+- disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
+- this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
+- disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+- this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+-
+- // Do not delete the role editor using deleteLater() because we might be
+- // inside a nested event loop which has been started by one of its event
+- // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
+- m_roleEditor->deleteWhenIdle();
++ m_oldRoleEditor = m_roleEditor;
++ m_roleEditor->hide();
+ m_roleEditor = 0;
+ }
+
+diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
+index 787722d..386f60e 100644
+--- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
++++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
+@@ -241,6 +241,7 @@ private:
+ QPixmap m_rating;
+
+ KItemListRoleEditor* m_roleEditor;
++ KItemListRoleEditor* m_oldRoleEditor;
+
+ friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
+ // share a common layout calculation
+diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
+index 78dbfe9..1e4b5fd 100644
+--- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
++++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
+@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
+ KTextEdit(parent),
+ m_index(0),
+ m_role(),
+- m_blockFinishedSignal(false),
+- m_eventHandlingLevel(0),
+- m_deleteAfterEventHandling(false)
++ m_blockFinishedSignal(false)
+ {
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
+ return m_role;
+ }
+
+-void KItemListRoleEditor::deleteWhenIdle()
+-{
+- if (m_eventHandlingLevel > 0) {
+- // We are handling an event at the moment. It could be that we
+- // are in a nested event loop run by contextMenuEvent() or a
+- // call of mousePressEvent() which results in drag&drop.
+- // -> do not call deleteLater() to prevent a crash when we
+- // return from the nested event loop.
+- m_deleteAfterEventHandling = true;
+- } else {
+- deleteLater();
+- }
+-}
+-
+ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
+ {
+ if (watched == parentWidget() && event->type() == QEvent::Resize) {
+@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
+
+ bool KItemListRoleEditor::event(QEvent* event)
+ {
+- ++m_eventHandlingLevel;
+-
+ if (event->type() == QEvent::FocusOut) {
+ QFocusEvent* focusEvent = static_cast(event);
+ if (focusEvent->reason() != Qt::PopupFocusReason) {
+ emitRoleEditingFinished();
+ }
+ }
+-
+- const int result = KTextEdit::event(event);
+- --m_eventHandlingLevel;
+-
+- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
+- // Schedule this object for deletion and make sure that we do not try
+- // to deleteLater() again when the DeferredDelete event is received.
+- deleteLater();
+- m_deleteAfterEventHandling = false;
+- }
+-
+- return result;
+-}
+-
+-bool KItemListRoleEditor::viewportEvent(QEvent* event)
+-{
+- ++m_eventHandlingLevel;
+- const bool result = KTextEdit::viewportEvent(event);
+- --m_eventHandlingLevel;
+-
+- if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
+- // Schedule this object for deletion and make sure that we do not try
+- // to deleteLater() again when the DeferredDelete event is received.
+- deleteLater();
+- m_deleteAfterEventHandling = false;
+- }
+-
+- return result;
++ return KTextEdit::event(event);
+ }
+
+ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
+@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
+ return;
+ case Qt::Key_Enter:
+ case Qt::Key_Return:
+- // TODO: find a better way to fix the bug 309760
+- clearFocus(); // emitRoleEditingFinished(); results in a crash
++ emitRoleEditingFinished();
+ event->accept();
+ return;
+ default:
+diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
+index a2f7058..aa2c977 100644
+--- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
++++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
+@@ -47,15 +47,6 @@ public:
+ void setRole(const QByteArray& role);
+ QByteArray role() const;
+
+- /**
+- * Calls deleteLater() if no event is being handled at the moment.
+- * Otherwise, the deletion is deferred until the event handling is
+- * finished. This prevents that the deletion happens inside a nested
+- * event loop which might be run in contextMenuEvent() or
+- * mouseMoveEvent() because this would probably cause a crash.
+- */
+- void deleteWhenIdle();
+-
+ virtual bool eventFilter(QObject* watched, QEvent* event);
+
+ signals:
+@@ -64,7 +55,6 @@ signals:
+
+ protected:
+ virtual bool event(QEvent* event);
+- virtual bool viewportEvent(QEvent* event);
+ virtual void keyPressEvent(QKeyEvent* event);
+
+ private slots:
+@@ -85,8 +75,6 @@ private:
+ int m_index;
+ QByteArray m_role;
+ bool m_blockFinishedSignal;
+- int m_eventHandlingLevel;
+- bool m_deleteAfterEventHandling;
+ };
+
+ #endif
+diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
+index 70a7394..0e97c5a 100644
+--- a/dolphin/src/views/dolphinview.cpp
++++ b/dolphin/src/views/dolphinview.cpp
+@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
+
+ QSet selectedItems = selectionManager->selectedItems();
+
+- for (QList::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
++ QList::iterator it = m_selectedUrls.begin();
++ while (it != m_selectedUrls.end()) {
+ const int index = m_model->index(*it);
+ if (index >= 0) {
+ selectedItems.insert(index);
+- m_selectedUrls.erase(it);
++ it = m_selectedUrls.erase(it);
++ } else {
++ ++it;
+ }
+ }
+
--
cgit v1.2.3
From a6bc83c4664f2b3b3ca5a160e661e579333c1669 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 10 Dec 2012 01:14:47 -0200
Subject: kdebase-konqueror-libre-4.9.4-2: fixing compilation error on PKGBUILD
---
libre/kdebase-konqueror-libre/PKGBUILD | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index ba585e10c..26b14ff86 100755
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -30,11 +30,12 @@ provides=("kdebase-konqueror=$pkgver")
build() {
cd kde-baseapps-${pkgver}
patch -p1 -i "${srcdir}"/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
- cd ../
# Don't recommend nonfree software or Google.
patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
+ cd ../
+
mkdir build
cd build
cmake ../kde-baseapps-${pkgver} \
--
cgit v1.2.3
From aeb9cba708408769686b3f241afc2e937dfd003c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 17:47:50 -0200
Subject: texlive-core-libre-2012.28273-1: update version
---
libre/texlive-core-libre/PKGBUILD | 6 +++---
libre/texlive-core-libre/texlive.install | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 41021cf24..1e3d5534b 100755
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -4,9 +4,9 @@
pkgname=texlive-core-libre
_pkgname=texlive-core
-pkgver=2012.26892
+pkgver=2012.28273
_revnr=${pkgver#2012.}
-pkgrel=2
+pkgrel=1
pkgdesc="TeX Live core distribution"
license=('GPL')
arch=(any)
@@ -30,7 +30,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
options=(!strip)
install=texlive.install
#backup=(etc/texmf/tex/context/config/cont-usr.tex)
-md5sums=('c913b3c01bdcf81da80e4833cd4cc691'
+md5sums=('42ce6cf5a7728f2ebb9a1a2bbf9dc4ed'
'82c03f7226e1df4440f30c89c05ee653')
build() {
diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install
index 601c4af19..14ca7c531 100755
--- a/libre/texlive-core-libre/texlive.install
+++ b/libre/texlive-core-libre/texlive.install
@@ -9,7 +9,7 @@ post_install() {
TMPFILE=`mktemp`
echo ">>> texlive: saving updmap.cfg as $TMPFILE..."
cp "$UPDMAP" "$TMPFILE"
- echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+ echo ">>> texlive: regenerating updmap.cfg (custom additions should go"
echo " into /etc/texmf/web2c/updmap-local.cfg"
cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
@@ -31,7 +31,7 @@ post_upgrade() {
TMPFILE=`mktemp`
echo ">>> texlive: saving updmap.cfg as $TMPFILE..."
cp "$UPDMAP" "$TMPFILE"
- echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+ echo ">>> texlive: regenerating updmap.cfg (custom additions should go"
echo " into /etc/texmf/web2c/updmap-local.cfg"
cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
--
cgit v1.2.3
From 9a88d495010177231aff172fd7dfe604e2b4e34e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 17:48:34 -0200
Subject: texlive-fontsextra-libre-2012.28268-1: update version
---
libre/texlive-fontsextra-libre/PKGBUILD | 6 +++---
libre/texlive-fontsextra-libre/texlive-fontsextra.maps | 11 +++++++++--
libre/texlive-fontsextra-libre/texlive.install | 4 ++--
3 files changed, 14 insertions(+), 7 deletions(-)
(limited to 'libre')
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index cabf58619..a445de005 100755
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=texlive-fontsextra-libre
_pkgname=texlive-fontsextra
-pkgver=2012.26866
+pkgver=2012.28268
_revnr=${pkgver#2012.}
pkgrel=1
pkgdesc="TeX Live - all sorts of extra fonts"
@@ -20,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
options=('!emptydirs')
options=(!strip)
install=texlive.install
-md5sums=('f75e552c4573ce73d3eee03fffee723f'
- '4a2f2b3b4527655fb47ab0d59b01bfea')
+md5sums=('2c900d7eaa4506b057e25be64b4ad24b'
+ 'd1d90a08bbea59c2f925a4b07c355828')
build() {
cd "$srcdir"
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
index fbced973a..771bf3607 100755
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -24,6 +24,8 @@ Map Romantik.map
Map Rothdn.map
Map RoyalIn.map
Map Sanremo.map
+Map SourceCodePro.map
+Map SourceSansPro.map
Map Starburst.map
Map Typocaps.map
Map Zallman.map
@@ -38,7 +40,10 @@ Map auncial.map
Map aurical.map
Map belleek.map
Map bera.map
+Map bguq.map
+Map biolinum-type1.map
Map boondox.map
+Map cabin.map
Map calligra.map
Map cantarell.map
Map ccicons.map
@@ -69,19 +74,20 @@ Map gfsdidot.map
Map gfsneohellenic.map
Map gfssolomos.map
Map gptimes.map
+Map hacm.map
Map icelandic.map
Map iwona.map
Map kpfonts.map
Map kurier.map
Map lato.map
-Map libertine.map
+Map libertine-type1.map
Map linearA.map
Map mathabx.map
Map mdbch.map
Map mdput.map
Map mdsymbol.map
Map mdugm.map
-Map ntx.map
+Map newtx.map
Map ocrb.map
Map opensans.map
Map paratype-type1.map
@@ -94,6 +100,7 @@ Map rsfso.map
Map sansmathaccent.map
Map sqrcaps.map
Map starfont.map
+Map superiors.map
Map tfrupee.map
Map uaq.map
Map ugq.map
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install
index c2c5e8165..6f81bd4ba 100755
--- a/libre/texlive-fontsextra-libre/texlive.install
+++ b/libre/texlive-fontsextra-libre/texlive.install
@@ -9,7 +9,7 @@ post_install() {
TMPFILE=`mktemp`
echo ">>> texlive: saving updmap.cfg as $TMPFILE..."
cp "$UPDMAP" "$TMPFILE"
- echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+ echo ">>> texlive: regenerating updmap.cfg (custom additions should go"
echo " into /etc/texmf/web2c/updmap-local.cfg"
cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
@@ -25,7 +25,7 @@ post_upgrade() {
TMPFILE=`mktemp`
echo ">>> texlive: saving updmap.cfg as $TMPFILE..."
cp "$UPDMAP" "$TMPFILE"
- echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+ echo ">>> texlive: regenerating updmap.cfg (custom additions should go"
echo " into /etc/texmf/web2c/updmap-local.cfg"
cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
--
cgit v1.2.3
From 6ef3ac1c28f21cfc46b9f50781f622580d68ccac Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 17:49:41 -0200
Subject: texlive-latexextra-libre-2012.28272-1: update version
---
libre/texlive-latexextra-libre/PKGBUILD | 55 +++++++++++++-------------
libre/texlive-latexextra-libre/texlive.install | 4 +-
2 files changed, 29 insertions(+), 30 deletions(-)
(limited to 'libre')
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index d806b73fd..533a0aa6e 100755
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Firmicus
+# $Id: PKGBUILD 171569 2012-11-19 07:37:56Z remy $
# Maintainer: Rémy Oudompheng
# Maintainer (Parabola): Michał Masłowski
# Contributor (Parabola): André Silva
pkgname=texlive-latexextra-libre
_pkgname=texlive-latexextra
-pkgver=2012.26807
+pkgver=2012.28272
_revnr=${pkgver#2012.}
pkgrel=1
pkgdesc="TeX Live - Large collection of add-on packages for LaTeX"
@@ -25,7 +25,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
options=('!emptydirs')
options=(!strip)
install=texlive.install
-md5sums=('868dc1824391768e120fdd71ba28e520'
+md5sums=('75db29b9e9bea30e9b6c1b77c4fca964'
'9e4825f47dac663dd62c4bfa67899e84')
build() {
@@ -40,35 +40,34 @@ build() {
rm -rf {tlpkg,doc,source} || true
}
package() {
- install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
+ install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs
sed -i '/^#/d' CONTENTS
- install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
- install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
- install -m755 -d $pkgdir/usr/share
+ install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
+ install -m644 $_pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/
+ install -m755 -d "$pkgdir"/usr/share
wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
for dir in $wanteddirs; do
- find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \;
- find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \;
+ find $dir -type d -exec install -d -m755 "$pkgdir"/usr/share/texmf-dist/'{}' \;
+ find $dir -type f -exec install -m644 '{}' "$pkgdir"/usr/share/texmf-dist/'{}' \;
done
if [[ -d texmf-dist ]]; then
- find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
- find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
+ find texmf-dist -type d -exec install -d -m755 "$pkgdir"/usr/share/'{}' \;
+ find texmf-dist -type f -exec install -m644 '{}' "$pkgdir"/usr/share/'{}' \;
fi
- if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
- find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
+ if [[ -d "$pkgdir"/usr/share/texmf-dist/scripts ]]; then
+ find "$pkgdir"/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
fi
#add symlinks that were in texlive-bin:
- install -m755 -d $pkgdir/usr/bin
- ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex $pkgdir/usr/bin/authorindex
- ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex $pkgdir/usr/bin/exceltex
- ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries $pkgdir/usr/bin/makeglossaries
- ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl $pkgdir/usr/bin/pdfannotextractor
- ln -s /usr/share/texmf-dist/scripts/ppower4/pdfthumb.tlu $pkgdir/usr/bin/pdfthumb
- ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl $pkgdir/usr/bin/perltex
- ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf $pkgdir/usr/bin/ps4pdf
- ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl $pkgdir/usr/bin/splitindex
- ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl $pkgdir/usr/bin/svn-multi
- ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl $pkgdir/usr/bin/vpe
+ install -m755 -d "$pkgdir"/usr/bin
+ ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex "$pkgdir"/usr/bin/authorindex
+ ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex "$pkgdir"/usr/bin/exceltex
+ ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries "$pkgdir"/usr/bin/makeglossaries
+ ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl "$pkgdir"/usr/bin/pdfannotextractor
+ ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl "$pkgdir"/usr/bin/perltex
+ ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf "$pkgdir"/usr/bin/ps4pdf
+ ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl "$pkgdir"/usr/bin/splitindex
+ ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl "$pkgdir"/usr/bin/svn-multi
+ ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl "$pkgdir"/usr/bin/vpe
# but ppower4 was a symlink to ppower4.tlu, which was broken, but this is far better:
(
cat <<"END"
@@ -76,8 +75,8 @@ package() {
java -jar /usr/share/texmf-dist/scripts/ppower4/pp4p.jar $@
END
) > /tmp/ppower4
- install -m755 /tmp/ppower4 $pkgdir/usr/bin/
- rm $pkgdir/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat
- rm $pkgdir/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat*
- rm $pkgdir/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat
+ install -m755 /tmp/ppower4 "$pkgdir"/usr/bin/
+ rm "$pkgdir"/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat
+ rm "$pkgdir"/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat*
+ rm "$pkgdir"/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat
}
diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install
index e8878db08..3416a2732 100755
--- a/libre/texlive-latexextra-libre/texlive.install
+++ b/libre/texlive-latexextra-libre/texlive.install
@@ -9,7 +9,7 @@ post_install() {
TMPFILE=`mktemp`
echo ">>> texlive: saving updmap.cfg as $TMPFILE..."
cp "$UPDMAP" "$TMPFILE"
- echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+ echo ">>> texlive: regenerating updmap.cfg (custom additions should go"
echo " into /etc/texmf/web2c/updmap-local.cfg"
cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
@@ -25,7 +25,7 @@ post_upgrade() {
TMPFILE=`mktemp`
echo ">>> texlive: saving updmap.cfg as $TMPFILE..."
cp "$UPDMAP" "$TMPFILE"
- echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go"
+ echo ">>> texlive: regenerating updmap.cfg (custom additions should go"
echo " into /etc/texmf/web2c/updmap-local.cfg"
cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP
--
cgit v1.2.3
From f26e5052d31cc346f630e58693d36cf4304798c5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 17:50:42 -0200
Subject: audacious-plugins-libre-3.3.3-1: updating version
---
libre/audacious-plugins-libre/PKGBUILD | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 1644c5576..c59052f0d 100755
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 166974 2012-09-23 22:57:12Z bisson $
+# $Id: PKGBUILD 173107 2012-12-11 04:46:40Z bisson $
+# Maintainer: Gaetan Bisson
# Contributor: Alexander Fehr
# Contributor: William Rea
# Maintainer: Gaetan Bisson
@@ -7,7 +8,7 @@
_pkgname=audacious-plugins
pkgname=audacious-plugins-libre
-pkgver=3.3.2
+pkgver=3.3.3
pkgrel=1
pkgdesc='Plugins for Audacious without unfree plugins'
url='http://audacious-media-player.org/'
@@ -60,7 +61,7 @@ optdepends=('oss: Open Sound System v4 output'
'libcue: CUE playlist format')
source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('869d3820263ff35609bfc6f2e69885a00d660513')
+sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e')
build() {
# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
--
cgit v1.2.3
From 57bfe4b3e7058690797b8403b605006eaf66ea90 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 20:32:12 -0200
Subject: linux-libre-3.6.10: updating version
---
libre/linux-libre/PKGBUILD | 4 ++--
libre/linux-libre/linux-libre.install | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9924386ea..b51d91446 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,7 +10,7 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.6
-_sublevel=9
+_sublevel=10
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
@@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
- '2127e118d09154c7a44dd2dfed2cfecd'
+ 'd0382e715c9ce5f28dea840fd89c6434'
'e4a3a4677e1fac6ecf0e0fb44c41ca08'
'68fc36a4efb6ade0eca409b9444fef0c'
'e49ac236dfeef709f91a3d993ea7b62c'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 89024bf96..1e065da77 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.6.9-1-LIBRE
+KERNEL_VERSION=3.6.10-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From 9c36ad372e6150e84235b94df29ddd52feb9546d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 20:39:42 -0200
Subject: linux-libre-lts-3.0.56-1: updating version
---
libre/linux-libre-lts/PKGBUILD | 8 ++++----
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0170fdfac..1de1d64a2 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=54
+_sublevel=56
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.53 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.55 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'3.0.54-ptrace-i686-build.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '2fd5511915299a3f60b0494914881e3f'
+ '49061818ee1c6d38095f5614be9a0eac'
'a5d98603d79d3ab7f979af49b2970f26'
'0ed396b368d8cdf8845f7ef2f62fc93c'
'c072b17032e80debc6a8626299245d46'
@@ -46,7 +46,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
'80889d526d86e516757b52fc99dca64d'
- '461adf81c9df997b57bfb3fa07d13746')
+ '0dbe7bf91cc9461d7394cf46ac37ff68')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 1251b68c7..a2029fd2e 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.54-1-LIBRE-LTS
+KERNEL_VERSION=3.0.56-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From 4f3b8c6350d86cd7fbf695d21c93b8e0d0670bec Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 20:59:50 -0200
Subject: linux-libre-lts-3.0.56-1: removing 3.0.54-ptrace-i686-build.patch
---
libre/linux-libre-lts/PKGBUILD | 4 ----
1 file changed, 4 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 1de1d64a2..b5964eadc 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -45,7 +45,6 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '80889d526d86e516757b52fc99dca64d'
'0dbe7bf91cc9461d7394cf46ac37ff68')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
@@ -89,9 +88,6 @@ build() {
patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
- # fix building on i686 platform
- patch -Np1 -i "${srcdir}/3.0.54-ptrace-i686-build.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
--
cgit v1.2.3
From d575b3eb2b0d121d5ce1816b219ae1c59daca1d1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 11 Dec 2012 21:29:02 -0200
Subject: linux-libre-lts-3.0.56-1: removing 3.0.54-ptrace-i686-build.patch
from PKGBUILD
---
libre/linux-libre-lts/PKGBUILD | 1 -
1 file changed, 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index b5964eadc..28fd3d71b 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -30,7 +30,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'ext4-options.patch'
'module-symbol-waiting-3.0.patch'
'module-init-wait-3.0.patch'
- '3.0.54-ptrace-i686-build.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
'49061818ee1c6d38095f5614be9a0eac'
--
cgit v1.2.3
From 4af2701db8813ccc17ded58dace627d216dbb9c7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Tue, 11 Dec 2012 19:41:37 -0500
Subject: update libre/parabolaweb-utils
---
libre/parabolaweb-utils/PKGBUILD | 19 +++++++++++--------
libre/parabolaweb-utils/helper.sh | 32 +++++++++-----------------------
2 files changed, 20 insertions(+), 31 deletions(-)
(limited to 'libre')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 5fdd12bdb..e3d9444ce 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,14 +1,13 @@
# Maintainer: Luke Shumaker
-. helper.sh
+. "${startdir:-.}/helper.sh"
# provides:
-# _get_pkgver
# _get_depends
# _get_depends_nover (no version requirements)
pkgname=parabolaweb-utils
-pkgver=`_get_pkgver`
-pkgrel=8
+pkgver=20121115.1554
+pkgrel=1
pkgdesc="Utils for the Parabola website"
arch=('any')
url="https://projects.parabolagnulinux.org/parabolaweb.git/"
@@ -20,11 +19,8 @@ depends=(
'git' # used in parabolaweb-download
'libretools' # used in parabolaweb-{download,update} (libremessages)
`_get_depends`)
-backup=('etc/conf.d/parabolaweb')
-
-export pkgver
-
makedepends=(makepkg-git)
+backup=('etc/conf.d/parabolaweb')
source=(git://parabolagnulinux.org/parabolaweb.git
parabolaweb-download
@@ -34,6 +30,13 @@ source=(git://parabolagnulinux.org/parabolaweb.git
parabolaweb.service
parabolaweb.conf)
+pkgver() {
+ cd "$srcdir/parabolaweb"
+ # get the date requirements_prod.txt was last modified
+ gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
+ date -u +%Y%m%d.%H%M -d "$gitdate"
+}
+
build() {
:
}
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
index 5ce4182b3..5212571a8 100644
--- a/libre/parabolaweb-utils/helper.sh
+++ b/libre/parabolaweb-utils/helper.sh
@@ -1,35 +1,21 @@
_mksource() {
- if [[ -z _DO_NOT_RUN_MKSOURCE ]]; then
- _DO_NOT_RUN_MKSOURCE=true makepkg -o
- fi
-}
-
-_get_pkgver() {
- if [[ -n $pkgver ]] && [[ $pkgver != 0.bogus ]]; then
- echo $pkgver
- else
- _mksource 1>&2
- if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
- pushd "${srcdir:-src}/parabolaweb" >/dev/null
- # get the date requirements_prod.txt was last modified
- gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
- date -u +%Y%m%d.%H%M -d "$gitdate"
- popd >/dev/null
- else
- echo 0.bogus
- fi
+ pushd "${startdir:-.}" >/dev/null
+ if [[ -z $_DO_NOT_RUN_MKSOURCE && $0 =~ ^makepkg ]]; then
+ local flags=(-o)
+ (( EUID )) || flags+=(--asroot)
+ _DO_NOT_RUN_MKSOURCE=true "${0}" "${flags[@]}"
fi
+ popd >/dev/null
}
_get_depends() {
_mksource 1>&2
- if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
+ if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
pushd "${srcdir:-src}" >/dev/null
- python2_packages='markdown|psycopg2|pyinotify|pytz|south'
< parabolaweb/requirements_prod.txt sed -r \
-e 's/.*/\L&/' -e 's/==/=/' \
- -e 's/^python-memcached/python2-memcached/' \
- -e "s/^(${python2_packages})/python2-&/"
+ -e 's/^(python2?-)?/python2-/' \
+ -e 's/python2-django/django/'
popd >/dev/null
fi
}
--
cgit v1.2.3
From d2d760f250656ffd6ba2e1cbbfb0a857f1e944ad Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Wed, 12 Dec 2012 06:27:53 -0200
Subject: blender-libre: updating pkg
---
libre/blender-libre/PKGBUILD | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
mode change 100755 => 100644 libre/blender-libre/PKGBUILD
(limited to 'libre')
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
old mode 100755
new mode 100644
index 2360945ee..e6c684b1e
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -15,9 +15,9 @@ else
)
spndesc=''
fi
-pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.64a
-pkgrel=4
+pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
+pkgver=2.65
+pkgrel=1
pkgaev=5
arch=(
i686
@@ -137,7 +137,7 @@ source=(
"http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
)
sha512sums=(
- 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
+ 92488691c25d390eabf35569cb37ec62437dd42f57e096334a6ed804b3265efe6f81871eba15dad67399ff4e6bf4262d4043298a3ceb90e5dc57586eb9f2870f
)
build() {
@@ -148,7 +148,7 @@ build() {
[[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
- cmake .. \
+ setarch $CARCH cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \
@@ -171,13 +171,13 @@ build() {
-DWITH_PYTHON_INSTALL=OFF \
-DWITH_SYSTEM_GLEW=ON
- make $MAKEFLAGS
+ setarch $CARCH make $MAKEFLAGS
- make
+ setarch $CARCH make
}
package() {
cd $srcdir/${pkgbase%$pkgflag}-$pkgver/build
- make DESTDIR=$pkgdir install
- python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
+ setarch $CARCH make DESTDIR=$pkgdir install
+ setarch $CARCH python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
}
--
cgit v1.2.3
From 083ff706ff310e8ede7495915b8eb09f0fd6b512 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Wed, 12 Dec 2012 06:29:19 -0200
Subject: luxblend25: updating pkg
---
libre/luxblend25/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 245aba247..26640795f 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -4,12 +4,12 @@
pkgbase=luxrender
pkgname=luxblend25
srcver=3a928b723b29
-pkgver=1.1.v2.64
+pkgver=1.1.v2.65
_pkgver=${pkgver::3}
reqname=blender
reqver=${pkgver:5}
-pkgrel=2
-pkgdesc='A LuxRender exporter for Blender-libre'
+pkgrel=1
+pkgdesc='LuxRender exporter for Blender-libre'
arch=(
any
)
--
cgit v1.2.3
From d7b0840786e1bd6ab304807790ba54f0c78d0b01 Mon Sep 17 00:00:00 2001
From: Michał Masłowski
Date: Wed, 12 Dec 2012 10:16:26 +0100
Subject: Update your-freedom after unblacklisting supertuxkart.
---
libre/your-freedom/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 9c5f6242c..8aad59fe4 100755
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -24,4 +24,4 @@ package() {
))
}
-md5sums=('cc8ed9a33d0c58fcecc3323f831f687e')
+md5sums=('b8c939de5aa75a92299f65210e510d61')
--
cgit v1.2.3
From f840a49d9728384eb86e44313b2622e575f8ee89 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Wed, 12 Dec 2012 20:46:52 -0200
Subject: claws-mail-libre: fixing provides
---
libre/claws-mail-libre/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index 38533f59b..7a093b29a 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=claws-mail
pkgname=claws-mail-libre
pkgflag=-libre
pkgver=3.9.0
-pkgrel=1
+pkgrel=2
pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
arch=(
i686
@@ -42,7 +42,7 @@ optdepends=(
)
provides=(
claws
- $pkgbase
+ $pkgbase=$pkgver
)
conflicts=(
$pkgbase
--
cgit v1.2.3
From 54f9a793badf6063d8bfa7d261727d08f3de034a Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Wed, 12 Dec 2012 19:43:19 -0500
Subject: update libre/parabolaweb-utils
---
libre/parabolaweb-utils/PKGBUILD | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index e3d9444ce..1015f60a6 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -6,7 +6,7 @@
# _get_depends_nover (no version requirements)
pkgname=parabolaweb-utils
-pkgver=20121115.1554
+pkgver=20121213.0039
pkgrel=1
pkgdesc="Utils for the Parabola website"
arch=('any')
@@ -19,6 +19,7 @@ depends=(
'git' # used in parabolaweb-download
'libretools' # used in parabolaweb-{download,update} (libremessages)
`_get_depends`)
+conflicts=('django>=1.5') # hold it at 1.4
makedepends=(makepkg-git)
backup=('etc/conf.d/parabolaweb')
--
cgit v1.2.3
From 3de4a02fd7512d3089c0c7228838446278aff531 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Thu, 13 Dec 2012 14:12:26 -0500
Subject: add libre/django-countries, a new dep of parabolaweb
---
libre/django-countries/PKGBUILD | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 libre/django-countries/PKGBUILD
(limited to 'libre')
diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD
new file mode 100644
index 000000000..24b667a67
--- /dev/null
+++ b/libre/django-countries/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Luke Shumaker
+
+pkgname=django-countries
+pkgver=1.5
+pkgdesc="Provides a country field for Django models"
+license=('custom:MIT')
+url="http://bitbucket.org/smileychris/django-countries/"
+
+pkgrel=1
+arch=(any)
+depends=('django')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=(6c65fcc3aa7de065a54cdb619397626d)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
+ # fix python->python2, and a typo!
+ sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./setup.py install --root="$pkgdir/" --optimize=1
+}
--
cgit v1.2.3
From 1774f880f4ad657ca3954c9e6f90c9dd8c4edcd7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker
Date: Thu, 13 Dec 2012 14:12:44 -0500
Subject: update libre/parabolaweb-utils
---
libre/parabolaweb-utils/PKGBUILD | 8 +++++---
libre/parabolaweb-utils/helper.sh | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'libre')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 1015f60a6..4220394dc 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -6,12 +6,14 @@
# _get_depends_nover (no version requirements)
pkgname=parabolaweb-utils
-pkgver=20121213.0039
-pkgrel=1
+pkgver=20120425.0657
pkgdesc="Utils for the Parabola website"
-arch=('any')
url="https://projects.parabolagnulinux.org/parabolaweb.git/"
license=('GPL2')
+
+pkgrel=1
+epoch=1
+arch=('any')
depends=(
'python2' # duh
'python2-flup' # for fcgi
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
index 5212571a8..ce8638e7e 100644
--- a/libre/parabolaweb-utils/helper.sh
+++ b/libre/parabolaweb-utils/helper.sh
@@ -13,7 +13,7 @@ _get_depends() {
if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
pushd "${srcdir:-src}" >/dev/null
< parabolaweb/requirements_prod.txt sed -r \
- -e 's/.*/\L&/' -e 's/==/=/' \
+ -e 's/.*/\L&/' -e 's/==/>=/' \
-e 's/^(python2?-)?/python2-/' \
-e 's/python2-django/django/'
popd >/dev/null
--
cgit v1.2.3
From 549da93280e61dbd33da7c4328866ff7f937dc96 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 14 Dec 2012 15:15:54 -0200
Subject: clementine-libre-1.1.1-2: Adding google drive support
---
libre/clementine-libre/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 053a38d1e..fb7beb4f6 100755
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -8,14 +8,14 @@
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.1.1
-pkgrel=1.1
+pkgrel=2
pkgdesc="A music player and library organizer, without spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
arch=('i686' 'x86_64')
depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
- 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
+ 'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
makedepends=('cmake' 'boost' 'mesa')
optdepends=('gstreamer0.10-base-plugins: for more open formats'
'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
--
cgit v1.2.3
From eea98ae3fa55de9797317fa72653952f257432cd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 15 Dec 2012 00:53:22 -0200
Subject: linux-libre-tools-3.7-2: updating version
---
libre/linux-libre-tools/PKGBUILD | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index d3154ac86..68b75c631 100755
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -3,12 +3,12 @@
# Maintainer (Parabola): André Silva
pkgbase=linux-libre-tools
-pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
-_basekernel=3.6
+pkgname=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+_basekernel=3.7
#_sublevel=1
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=1
+pkgrel=2
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -17,7 +17,7 @@ options=('!strip')
# kernel source deps
makedepends=('asciidoc' 'xmlto')
# perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
# cpupower-libre deps
makedepends+=('pciutils')
# usbip-libre deps
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'usbipd.conf'
'usbipd.rc'
'usbipd.service')
-md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
'56883c159381ba89e50ab8ea65efec77'
'5fc1fcda4cef93f16e752b1931db23e3'
'c0d17b5295fe964623c772a2dd981771'
@@ -48,6 +48,11 @@ build() {
patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
fi
+ msg2 'Build libtraceevent-libre'
+ pushd linux-$pkgver/tools/lib/traceevent
+ make
+ popd
+
msg2 'Build perf-libre'
pushd linux-$pkgver/tools/perf
make \
@@ -74,15 +79,28 @@ build() {
msg2 'Build usbip-libre'
pushd linux-$pkgver/drivers/staging/usbip/userspace
+ # fix missing man page
+ sed -i 's/usbip_bind_driver.8//' Makefile.am
./autogen.sh
./configure --prefix=/usr
make
popd
}
+package_libtraceevent-libre() {
+ pkgdesc='Linux-libre kernel trace event library'
+ replaces=('libtraceevent')
+ conflicts=('libtraceevent')
+ provides=("libtraceevent=$pkgver")
+
+ cd linux-$pkgver/tools/lib/traceevent
+ install -dm 755 "$pkgdir/usr/lib"
+ install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib"
+}
+
package_perf-libre() {
pkgdesc='Linux-libre kernel performance auditing tool'
- depends=('perl' 'python2' 'libnewt' 'elfutils')
+ depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
replaces=('perf')
conflicts=('perf')
provides=("perf=$pkgver")
--
cgit v1.2.3
From 4aa1a49f5a55ac9783e4452ca4806cd4e88c348a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 16 Dec 2012 00:40:10 -0200
Subject: linux-libre-kmod-alx-20121003-7: building against linux-libre new
version
---
libre/linux-libre-kmod-alx/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index f7bf76187..81c5088e3 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva
-_kernver=3.6.7
+_kernver=3.6.10
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=6
+pkgrel=7
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'
--
cgit v1.2.3
From b3a10c056595da14a0dafda2efbc24daccc693ad Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 16 Dec 2012 00:41:30 -0200
Subject: linux-libre-lts-kmod-alx-20121003-8: building against linux-libre-lts
new version
---
libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 5892fa794..02e85467c 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva
-_kernver=3.0.52
+_kernver=3.0.56
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=7
+pkgrel=8
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'
--
cgit v1.2.3
From cc394a12128b3aba1cebe3db2cfae8120942f58d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 18 Dec 2012 18:54:00 -0200
Subject: linux-libre-3.7.1-1: updating version
---
libre/linux-libre/ChangeLog | 5 +
libre/linux-libre/PKGBUILD | 67 +--
libre/linux-libre/config.i686 | 702 +++++++++++-----------
libre/linux-libre/config.x86_64 | 697 ++++++++++-----------
libre/linux-libre/irq_cfg_pointer-3.6.6.patch | 16 -
libre/linux-libre/linux-libre.install | 2 +-
libre/linux-libre/module-init-wait-3.6.patch | 77 ---
libre/linux-libre/module-symbol-waiting-3.6.patch | 66 --
8 files changed, 743 insertions(+), 889 deletions(-)
delete mode 100644 libre/linux-libre/irq_cfg_pointer-3.6.6.patch
delete mode 100644 libre/linux-libre/module-init-wait-3.6.patch
delete mode 100644 libre/linux-libre/module-symbol-waiting-3.6.patch
(limited to 'libre')
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index b41198fe5..a1aabf311 100755
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-18 André Silva
+
+ * linux-libre-3.7.1-1
+ * Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+
2012-06-23 André Silva
* linux-libre-3.4.4-1
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b51d91446..6056ef657 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,11 +9,11 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.6
-_sublevel=10
+_basekernel=3.7
+_sublevel=1
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -29,9 +29,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'module-symbol-waiting-3.6.patch'
- 'module-init-wait-3.6.patch'
- 'irq_cfg_pointer-3.6.6.patch'
'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
@@ -43,9 +40,6 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
- '670931649c60fcb3ef2e0119ed532bd4'
- '8a71abc4224f575008f974a099b5cf6f'
- '4909a0271af4e5f373136b382826717f'
'88d501404f172dac6fcb248978251560'
'2f3ae0624acb4a4b12ea2c008b964bd2')
if [ "$CARCH" != "mips64el" ]; then
@@ -72,14 +66,6 @@ build() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix module initialisation
- # https://bugs.archlinux.org/task/32122
- patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
- patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
-
- # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
- patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
-
# fix cosmetic fat issue
# https://bugs.archlinux.org/task/32916
patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
@@ -268,7 +254,7 @@ _package-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
for i in acpi asm-generic config crypto drm generated linux math-emu \
- media mtd net pcmcia scsi sound trace video xen; do
+ media net pcmcia scsi sound trace uapi video xen; do
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
done
@@ -301,13 +287,22 @@ _package-headers() {
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
# add headers for lirc package
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
- cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
- for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
- cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+ # pci
+ for i in bt8xx cx88 saa7134; do
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+ cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+ done
+ # usb
+ for i in cpia2 em28xx pwc sn9c102; do
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+ cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+ done
+ # i2c
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
+ cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+ for i in cx25840; do
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+ cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
done
# add docbook makefile
@@ -329,8 +324,8 @@ _package-headers() {
# add dvb headers for external modules
# in reference to:
# http://bugs.archlinux.org/task/9912
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
- cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
+ cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
# and...
# http://bugs.archlinux.org/task/11194
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
@@ -339,19 +334,19 @@ _package-headers() {
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
# in reference to:
# http://bugs.archlinux.org/task/13146
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
- cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
- cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+ cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+ cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
# add dvb headers
# in reference to:
# http://bugs.archlinux.org/task/20402
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
- cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
- cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
- cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
+ cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
+ cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
+ cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
# add xfs and shmem for aufs building
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 6533b0402..5413daf03 100755
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,10 +1,9 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.6.3 Kernel Configuration
+# Linux/i386 3.7.1-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
@@ -20,7 +19,6 @@ CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -71,13 +69,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_FHANDLE=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
@@ -111,6 +103,18 @@ CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
#
# RCU Subsystem
#
@@ -153,6 +157,7 @@ CONFIG_IPC_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
@@ -166,8 +171,10 @@ CONFIG_RD_LZO=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
+CONFIG_HAVE_UID16=y
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
CONFIG_HOTPLUG=y
@@ -225,14 +232,21 @@ CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
CONFIG_HAVE_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_GENERIC_KERNEL_THREAD=y
+CONFIG_GENERIC_KERNEL_EXECVE=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_MODULES_USE_ELF_REL=y
#
# GCOV-based kernel profiling
@@ -248,6 +262,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_LBDAF=y
@@ -292,35 +307,8 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_ASN1=m
CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
#
@@ -337,7 +325,6 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
# CONFIG_XEN_PRIVILEGED_GUEST is not set
-CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
CONFIG_LGUEST_GUEST=y
CONFIG_PARAVIRT=y
@@ -395,11 +382,9 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
@@ -429,8 +414,6 @@ CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -477,6 +460,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
@@ -546,7 +530,7 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=y
CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=m
+CONFIG_ACPI_BGRT=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
@@ -584,6 +568,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K6=m
CONFIG_X86_POWERNOW_K7=m
CONFIG_X86_POWERNOW_K7_ACPI=y
@@ -623,7 +608,6 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_OLPC=y
CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCIEPORTBUS=y
CONFIG_HOTPLUG_PCI_PCIE=m
CONFIG_PCIEAER=y
@@ -681,7 +665,6 @@ CONFIG_TCIC=m
CONFIG_PCMCIA_PROBE=y
CONFIG_PCCARD_NONSTATIC=y
CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
CONFIG_HOTPLUG_PCI_COMPAQ=m
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
CONFIG_HOTPLUG_PCI_IBM=m
@@ -712,6 +695,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_HAVE_AOUT=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
CONFIG_HAVE_ATOMIC_IOMAP=y
CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_NET=y
@@ -720,6 +704,7 @@ CONFIG_NET=y
# Networking options
#
CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
@@ -799,6 +784,7 @@ CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
# CONFIG_IPV6_MROUTE is not set
@@ -844,6 +830,16 @@ CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=m
@@ -870,10 +866,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -994,23 +991,14 @@ CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
CONFIG_NF_NAT_PPTP=m
CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_TARGET_ECN=m
@@ -1042,6 +1030,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1375,7 +1366,6 @@ CONFIG_NFC_HCI=m
#
# Near Field Communication (NFC) devices
#
-CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
@@ -1403,6 +1393,11 @@ CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_CMA is not set
+
+#
+# Bus devices
+#
+CONFIG_OMAP_OCP2SCP=m
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1505,7 +1500,6 @@ CONFIG_BCH_CONST_T=4
CONFIG_MTD_NAND_ECC=m
CONFIG_MTD_NAND_ECC_SMC=y
CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
CONFIG_MTD_SM_COMMON=m
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
@@ -1531,7 +1525,8 @@ CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_OF=y
@@ -1589,7 +1584,6 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1856,6 +1850,7 @@ CONFIG_ATA_BMDMA=y
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
@@ -1942,6 +1937,7 @@ CONFIG_MD_FAULTY=m
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
@@ -2000,9 +1996,6 @@ CONFIG_DUMMY=m
CONFIG_EQUALIZER=m
# CONFIG_NET_FC is not set
CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
CONFIG_IFB=m
CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -2011,6 +2004,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
@@ -2240,6 +2234,7 @@ CONFIG_SFC=m
CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y
+CONFIG_SFC_PTP=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC9194=m
CONFIG_PCMCIA_SMC91C92=m
@@ -2282,6 +2277,7 @@ CONFIG_PHYLIB=m
#
# MII PHY device drivers
#
+CONFIG_AT803X_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MARVELL_PHY=m
CONFIG_DAVICOM_PHY=m
@@ -2301,6 +2297,7 @@ CONFIG_MICREL_PHY=m
# CONFIG_MDIO_BITBANG is not set
CONFIG_MDIO_BUS_MUX=m
CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2435,6 +2432,7 @@ CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCMISCAN is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2535,6 +2533,9 @@ CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
CONFIG_VMXNET3=m
CONFIG_HYPERV_NET=m
CONFIG_ISDN=y
@@ -2933,10 +2934,10 @@ CONFIG_TRACE_SINK=m
# Serial drivers
#
CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -2951,6 +2952,7 @@ CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_SCCNXP=m
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
@@ -2976,6 +2978,7 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_GEODE=m
CONFIG_HW_RANDOM_VIA=m
CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
CONFIG_NVRAM=m
CONFIG_DTLK=m
CONFIG_R3964=m
@@ -2998,6 +3001,7 @@ CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
@@ -3070,8 +3074,8 @@ CONFIG_I2C_TINY_USB=m
# Other I2C/SMBus bus drivers
#
CONFIG_I2C_PCA_ISA=m
-# CONFIG_I2C_STUB is not set
CONFIG_SCx200_ACB=m
+# CONFIG_I2C_STUB is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
@@ -3126,6 +3130,7 @@ CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
#
# PCI GPIO expanders:
@@ -3188,6 +3193,7 @@ CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_ADM1029=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7410=m
CONFIG_SENSORS_ADT7411=m
CONFIG_SENSORS_ADT7462=m
CONFIG_SENSORS_ADT7470=m
@@ -3237,6 +3243,7 @@ CONFIG_SENSORS_LM95245=m
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
@@ -3302,6 +3309,7 @@ CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+# CONFIG_CPU_THERMAL is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3429,6 +3437,7 @@ CONFIG_MFD_RDC321X=m
# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
CONFIG_MFD_WL1273_CORE=m
+# CONFIG_MFD_SYSCON is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3442,16 +3451,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
#
# Media drivers
#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=m
CONFIG_RC_MAP=m
CONFIG_RC_DECODERS=y
@@ -3477,156 +3498,10 @@ CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-CONFIG_VIDEO_ADP1653=m
-CONFIG_VIDEO_AS3645A=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_V4L_USB_DRIVERS=y
+CONFIG_MEDIA_USB_SUPPORT=y
#
# Webcam devices
@@ -3690,15 +3565,7 @@ CONFIG_USB_S2255=m
CONFIG_USB_SN9C102=m
#
-# Webcam and/or TV USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# TV USB devices
+# Analog TV USB devices
#
CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_PVRUSB2=m
@@ -3707,6 +3574,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
+
+#
+# Analog/digital TV USB devices
+#
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
@@ -3714,10 +3588,92 @@ CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX23885=m
@@ -3730,29 +3686,49 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_RC=y
CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
# CONFIG_V4L_PLATFORM_DRIVERS is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
@@ -3775,128 +3751,129 @@ CONFIG_RADIO_WL1273=m
#
CONFIG_RADIO_WL128X=m
# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
#
-# Supported SAA7146 based PCI Adapters
+# Supported FireWire (IEEE 1394) Adapters
#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
#
-# Supported USB Adapters
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_IR_I2C=m
#
-# Siano module components
+# Audio decoders, processors and mixers
#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
#
-# Supported FlexCopII (B2C2) Adapters
+# RDS decoders
#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+CONFIG_VIDEO_SAA6588=m
#
-# Supported BT878 Adapters
+# Video decoders
#
-CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_VPX3220=m
#
-# Supported Pluto2 Adapters
+# Video and audio decoders
#
-CONFIG_DVB_PLUTO2=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
#
-# Supported SDMC DM1105 Adapters
+# MPEG video encoders
#
-CONFIG_DVB_DM1105=m
+CONFIG_VIDEO_CX2341X=m
#
-# Supported FireWire (IEEE 1394) Adapters
+# Video encoders
#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
#
-# Supported Earthsoft PT1 Adapters
+# Camera sensor devices
#
-CONFIG_DVB_PT1=m
+CONFIG_VIDEO_MT9V011=m
#
-# Supported Mantis Adapters
+# Flash devices
#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
#
-# Supported nGene Adapters
+# Video improvement chips
#
-CONFIG_DVB_NGENE=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
#
-# Supported ddbridge ('Octopus') Adapters
+# Miscelaneous helper chips
#
-CONFIG_DVB_DDBRIDGE=m
+CONFIG_VIDEO_M52790=m
#
-# Supported DVB Frontends
+# Sensors used on soc_camera driver
#
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
#
# Multistandard (satellite) frontends
@@ -4052,8 +4029,9 @@ CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
#
# I2C encoder or helper chips
@@ -4158,14 +4136,16 @@ CONFIG_LCD_PLATFORM=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
#
# Console display driver support
@@ -4250,6 +4230,7 @@ CONFIG_SND_ALS100=m
CONFIG_SND_AZT1605=m
CONFIG_SND_AZT2316=m
CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
CONFIG_SND_CMI8330=m
CONFIG_SND_CS4231=m
CONFIG_SND_CS4236=m
@@ -4345,7 +4326,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y
CONFIG_SND_HDA_CODEC_CMEDIA=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -4449,7 +4429,9 @@ CONFIG_HID_PICOLCD_FB=y
CONFIG_HID_PICOLCD_BACKLIGHT=y
CONFIG_HID_PICOLCD_LCD=y
CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
@@ -4471,6 +4453,7 @@ CONFIG_HID_WIIMOTE_EXT=y
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
#
# USB HID support
@@ -4571,8 +4554,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
#
# USB Imaging devices
@@ -4585,7 +4566,6 @@ CONFIG_USB_MICROTEK=m
#
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
@@ -4650,6 +4630,7 @@ CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
@@ -4678,10 +4659,12 @@ CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
#
# USB Physical Layer drivers
#
+CONFIG_OMAP_USB2=m
CONFIG_USB_ISP1301=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
@@ -4711,8 +4694,7 @@ CONFIG_USB_NET2280=m
CONFIG_USB_GOKU=m
CONFIG_USB_EG20T=m
CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_SUPERSPEED=y
+CONFIG_USB_LIBCOMPOSITE=m
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
@@ -4803,6 +4785,7 @@ CONFIG_LEDS_CLASS=y
#
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
@@ -4818,7 +4801,7 @@ CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM3556=m
+CONFIG_LEDS_LM355x=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_TRIGGERS=y
@@ -4830,6 +4813,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
@@ -4924,12 +4908,14 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
CONFIG_RTC_DRV_PCF50633=m
#
# on-CPU RTC drivers
#
CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_SNVS=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4965,7 +4951,6 @@ CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
# CONFIG_VFIO is not set
CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
#
# Virtio drivers
@@ -5048,6 +5033,7 @@ CONFIG_COMEDI_PCMUIO=m
CONFIG_COMEDI_MULTIQ3=m
CONFIG_COMEDI_POC=m
CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -5062,9 +5048,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
CONFIG_COMEDI_ADL_PCI8164=m
CONFIG_COMEDI_ADL_PCI9111=m
CONFIG_COMEDI_ADL_PCI9118=m
@@ -5090,7 +5074,6 @@ CONFIG_COMEDI_KE_COUNTER=m
CONFIG_COMEDI_CB_PCIDAS64=m
CONFIG_COMEDI_CB_PCIDAS=m
CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
# CONFIG_COMEDI_CB_PCIMDAS is not set
CONFIG_COMEDI_CB_PCIMDDA=m
CONFIG_COMEDI_ME4000=m
@@ -5200,8 +5183,6 @@ CONFIG_DVB_CXD2099=m
CONFIG_VIDEO_DT3155=m
CONFIG_DT3155_CCIR=y
CONFIG_DT3155_STREAMING=y
-CONFIG_EASYCAP=m
-# CONFIG_EASYCAP_DEBUG is not set
CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
@@ -5222,7 +5203,6 @@ CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
#
@@ -5242,6 +5222,11 @@ CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
CONFIG_CSR_WIFI=m
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5309,6 +5294,8 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
#
# Remoteproc drivers (EXPERIMENTAL)
#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
#
# Rpmsg drivers (EXPERIMENTAL)
@@ -5513,7 +5500,11 @@ CONFIG_NFS_V3=m
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=m
# CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5529,6 +5520,7 @@ CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_SUNRPC_DEBUG is not set
CONFIG_CEPH_FS=m
@@ -5539,10 +5531,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
# CONFIG_CIFS_DEBUG2 is not set
CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5649,6 +5642,7 @@ CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -5657,6 +5651,7 @@ CONFIG_TIMER_STATS=y
CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU_DELAY is not set
# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
@@ -5705,6 +5700,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
@@ -5735,6 +5731,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -5892,7 +5890,7 @@ CONFIG_CRYPTO_WP512=m
#
# Ciphers
#
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_ANUBIS=m
@@ -5936,6 +5934,10 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
CONFIG_CRYPTO_DEV_GEODE=m
CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_EVENTFD=y
@@ -5943,6 +5945,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -6018,5 +6021,8 @@ CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index fbc1c7588..19eb22d1f 100755
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,9 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.3 Kernel Configuration
+# Linux/x86_64 3.7.1-1 Kernel Configuration
#
CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
CONFIG_X86_64=y
CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
@@ -21,7 +20,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -72,13 +70,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_FHANDLE=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
@@ -113,11 +105,24 @@ CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
#
# RCU Subsystem
#
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_USER_QS is not set
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
@@ -155,6 +160,7 @@ CONFIG_IPC_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
@@ -168,8 +174,10 @@ CONFIG_RD_LZO=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
+CONFIG_HAVE_UID16=y
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
CONFIG_HOTPLUG=y
@@ -226,6 +234,8 @@ CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
CONFIG_HAVE_USER_RETURN_NOTIFIER=y
CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
@@ -233,8 +243,14 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_GENERIC_KERNEL_THREAD=y
+CONFIG_GENERIC_KERNEL_EXECVE=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_RCU_USER_QS=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_MODULES_USE_ELF_RELA=y
#
# GCOV-based kernel profiling
@@ -250,6 +266,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_BLK_DEV_BSG=y
@@ -294,35 +311,8 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_ASN1=m
CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
#
@@ -344,7 +334,6 @@ CONFIG_XEN_PVHVM=y
CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_SPINLOCKS is not set
@@ -382,7 +371,6 @@ CONFIG_IOMMU_HELPER=y
CONFIG_NR_CPUS=64
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
@@ -464,6 +452,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
@@ -537,7 +526,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=y
CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=m
+CONFIG_ACPI_BGRT=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
@@ -568,6 +557,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K8=m
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_P4_CLOCKMOD=m
@@ -596,7 +586,6 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_XEN=y
CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCIEPORTBUS=y
CONFIG_HOTPLUG_PCI_PCIE=m
CONFIG_PCIEAER=y
@@ -641,7 +630,6 @@ CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_PCCARD_NONSTATIC=y
CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
CONFIG_HOTPLUG_PCI_ACPI=m
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=y
@@ -669,6 +657,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
CONFIG_IA32_EMULATION=y
CONFIG_IA32_AOUT=m
CONFIG_X86_X32=y
@@ -685,6 +674,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
# Networking options
#
CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
@@ -764,6 +754,7 @@ CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
# CONFIG_IPV6_MROUTE is not set
@@ -809,6 +800,16 @@ CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=m
@@ -835,10 +836,11 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -959,23 +961,14 @@ CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
CONFIG_NF_NAT_PPTP=m
CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_TARGET_ECN=m
@@ -1007,6 +1000,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1332,7 +1328,6 @@ CONFIG_NFC_HCI=m
#
# Near Field Communication (NFC) devices
#
-CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
CONFIG_HAVE_BPF_JIT=y
@@ -1360,6 +1355,11 @@ CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
+
+#
+# Bus devices
+#
+CONFIG_OMAP_OCP2SCP=m
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1460,7 +1460,6 @@ CONFIG_BCH_CONST_T=4
CONFIG_MTD_NAND_ECC=m
CONFIG_MTD_NAND_ECC_SMC=y
CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
CONFIG_MTD_SM_COMMON=m
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
@@ -1485,7 +1484,8 @@ CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
@@ -1523,7 +1523,6 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1771,6 +1770,7 @@ CONFIG_ATA_BMDMA=y
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
@@ -1853,6 +1853,7 @@ CONFIG_MD_FAULTY=m
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
@@ -1912,9 +1913,6 @@ CONFIG_DUMMY=m
CONFIG_EQUALIZER=m
# CONFIG_NET_FC is not set
CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
CONFIG_IFB=m
CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -1923,6 +1921,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
@@ -2124,6 +2123,7 @@ CONFIG_SFC=m
CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y
+CONFIG_SFC_PTP=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
@@ -2165,6 +2165,7 @@ CONFIG_PHYLIB=m
#
# MII PHY device drivers
#
+CONFIG_AT803X_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MARVELL_PHY=m
CONFIG_DAVICOM_PHY=m
@@ -2316,6 +2317,7 @@ CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCMISCAN is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2416,6 +2418,9 @@ CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_VMXNET3=m
@@ -2664,7 +2669,6 @@ CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
@@ -2794,10 +2798,10 @@ CONFIG_TRACE_SINK=m
# Serial drivers
#
CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -2810,6 +2814,7 @@ CONFIG_SERIAL_MFD_HSU=m
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
@@ -2837,6 +2842,7 @@ CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_VIA=m
CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
CONFIG_NVRAM=m
CONFIG_R3964=m
CONFIG_APPLICOM=m
@@ -2855,6 +2861,7 @@ CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
@@ -3039,6 +3046,7 @@ CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_ADM1029=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7410=m
CONFIG_SENSORS_ADT7411=m
CONFIG_SENSORS_ADT7462=m
CONFIG_SENSORS_ADT7470=m
@@ -3088,6 +3096,7 @@ CONFIG_SENSORS_LM95245=m
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
@@ -3153,6 +3162,7 @@ CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+# CONFIG_CPU_THERMAL is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3286,16 +3296,28 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
#
# Media drivers
#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=m
CONFIG_RC_MAP=m
CONFIG_RC_DECODERS=y
@@ -3321,156 +3343,10 @@ CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-CONFIG_VIDEO_ADP1653=m
-CONFIG_VIDEO_AS3645A=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_V4L_USB_DRIVERS=y
+CONFIG_MEDIA_USB_SUPPORT=y
#
# Webcam devices
@@ -3534,15 +3410,7 @@ CONFIG_USB_S2255=m
CONFIG_USB_SN9C102=m
#
-# Webcam and/or TV USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# TV USB devices
+# Analog TV USB devices
#
CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_PVRUSB2=m
@@ -3551,6 +3419,13 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
+
+#
+# Analog/digital TV USB devices
+#
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
@@ -3558,10 +3433,92 @@ CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX23885=m
@@ -3574,29 +3531,48 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_RC=y
CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
# CONFIG_V4L_PLATFORM_DRIVERS is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
@@ -3618,128 +3594,129 @@ CONFIG_RADIO_WL1273=m
# Texas Instruments WL128x FM driver (ST based)
#
CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
#
-# Supported SAA7146 based PCI Adapters
+# Supported FireWire (IEEE 1394) Adapters
#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
#
-# Supported USB Adapters
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_IR_I2C=m
#
-# Siano module components
+# Audio decoders, processors and mixers
#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
#
-# Supported FlexCopII (B2C2) Adapters
+# RDS decoders
#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+CONFIG_VIDEO_SAA6588=m
#
-# Supported BT878 Adapters
+# Video decoders
#
-CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_VPX3220=m
#
-# Supported Pluto2 Adapters
+# Video and audio decoders
#
-CONFIG_DVB_PLUTO2=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
#
-# Supported SDMC DM1105 Adapters
+# MPEG video encoders
#
-CONFIG_DVB_DM1105=m
+CONFIG_VIDEO_CX2341X=m
#
-# Supported FireWire (IEEE 1394) Adapters
+# Video encoders
#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
#
-# Supported Earthsoft PT1 Adapters
+# Camera sensor devices
#
-CONFIG_DVB_PT1=m
+CONFIG_VIDEO_MT9V011=m
#
-# Supported Mantis Adapters
+# Flash devices
#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
#
-# Supported nGene Adapters
+# Video improvement chips
#
-CONFIG_DVB_NGENE=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
#
-# Supported ddbridge ('Octopus') Adapters
+# Miscelaneous helper chips
#
-CONFIG_DVB_DDBRIDGE=m
+CONFIG_VIDEO_M52790=m
#
-# Supported DVB Frontends
+# Sensors used on soc_camera driver
#
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
#
# Multistandard (satellite) frontends
@@ -3889,8 +3866,9 @@ CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
#
# I2C encoder or helper chips
@@ -3993,14 +3971,16 @@ CONFIG_LCD_PLATFORM=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
#
# Console display driver support
@@ -4143,7 +4123,6 @@ CONFIG_SND_HDA_CODEC_CA0132=y
CONFIG_SND_HDA_CODEC_CMEDIA=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -4246,7 +4225,9 @@ CONFIG_HID_PICOLCD_FB=y
CONFIG_HID_PICOLCD_BACKLIGHT=y
CONFIG_HID_PICOLCD_LCD=y
CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
@@ -4268,6 +4249,7 @@ CONFIG_HID_WIIMOTE_EXT=y
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
#
# USB HID support
@@ -4368,8 +4350,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
CONFIG_USB_STORAGE_KARMA=m
CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
#
# USB Imaging devices
@@ -4382,7 +4362,6 @@ CONFIG_USB_MICROTEK=m
#
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
@@ -4447,6 +4426,7 @@ CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
@@ -4475,10 +4455,12 @@ CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
#
# USB Physical Layer drivers
#
+CONFIG_OMAP_USB2=m
CONFIG_USB_ISP1301=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
@@ -4507,8 +4489,7 @@ CONFIG_USB_NET2280=m
CONFIG_USB_GOKU=m
CONFIG_USB_EG20T=m
CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_SUPERSPEED=y
+CONFIG_USB_LIBCOMPOSITE=m
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
@@ -4599,6 +4580,7 @@ CONFIG_LEDS_CLASS=y
#
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
@@ -4614,7 +4596,7 @@ CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM3556=m
+CONFIG_LEDS_LM355x=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_TRIGGERS=y
@@ -4626,6 +4608,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
@@ -4718,6 +4701,7 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
CONFIG_RTC_DRV_PCF50633=m
#
@@ -4759,7 +4743,6 @@ CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
# CONFIG_VFIO is not set
CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
#
# Virtio drivers
@@ -4818,6 +4801,7 @@ CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -4832,9 +4816,7 @@ CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
CONFIG_COMEDI_ADL_PCI8164=m
CONFIG_COMEDI_ADL_PCI9111=m
CONFIG_COMEDI_ADL_PCI9118=m
@@ -4860,7 +4842,6 @@ CONFIG_COMEDI_KE_COUNTER=m
CONFIG_COMEDI_CB_PCIDAS64=m
CONFIG_COMEDI_CB_PCIDAS=m
CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
CONFIG_COMEDI_CB_PCIMDAS=m
CONFIG_COMEDI_CB_PCIMDDA=m
CONFIG_COMEDI_ME4000=m
@@ -4969,8 +4950,6 @@ CONFIG_DVB_CXD2099=m
CONFIG_VIDEO_DT3155=m
CONFIG_DT3155_CCIR=y
CONFIG_DT3155_STREAMING=y
-CONFIG_EASYCAP=m
-# CONFIG_EASYCAP_DEBUG is not set
CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
@@ -4991,7 +4970,6 @@ CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
#
@@ -5011,6 +4989,11 @@ CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
CONFIG_CSR_WIFI=m
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5078,6 +5061,8 @@ CONFIG_IRQ_REMAP=y
#
# Remoteproc drivers (EXPERIMENTAL)
#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
#
# Rpmsg drivers (EXPERIMENTAL)
@@ -5283,7 +5268,11 @@ CONFIG_NFS_V3=m
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=m
# CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5299,6 +5288,7 @@ CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_SUNRPC_DEBUG is not set
CONFIG_CEPH_FS=m
@@ -5309,10 +5299,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
# CONFIG_CIFS_DEBUG2 is not set
CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5419,6 +5410,7 @@ CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -5427,6 +5419,7 @@ CONFIG_TIMER_STATS=y
CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU_DELAY is not set
# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
@@ -5472,8 +5465,10 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
@@ -5504,6 +5499,8 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_DYNAMIC_DEBUG is not set
@@ -5663,7 +5660,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
#
# Ciphers
#
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_X86_64=m
CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_ANUBIS=m
@@ -5674,7 +5671,9 @@ CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAMELLIA_X86_64=m
CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
@@ -5709,6 +5708,10 @@ CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_EVENTFD=y
@@ -5716,6 +5719,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -5789,5 +5793,8 @@ CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
diff --git a/libre/linux-libre/irq_cfg_pointer-3.6.6.patch b/libre/linux-libre/irq_cfg_pointer-3.6.6.patch
deleted file mode 100644
index 32583c0ac..000000000
--- a/libre/linux-libre/irq_cfg_pointer-3.6.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661
-
-diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index c265593..1817fa9 100644
---- a/arch/x86/kernel/apic/io_apic.c
-+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
- continue;
-
- cfg = irq_cfg(irq);
-+ if (!cfg)
-+ continue;
-+
- raw_spin_lock(&desc->lock);
-
- /*
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 1e065da77..e8f8b6979 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.6.10-1-LIBRE
+KERNEL_VERSION=3.7.1-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/module-init-wait-3.6.patch b/libre/linux-libre/module-init-wait-3.6.patch
deleted file mode 100644
index 1bcfd2491..000000000
--- a/libre/linux-libre/module-init-wait-3.6.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Rusty Russell
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: wait when loading a module which is currently initializing.
-X-Git-Tag: v3.7-rc1~2^2~32
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
-
-module: wait when loading a module which is currently initializing.
-
-The original module-init-tools module loader used a fnctl lock on the
-.ko file to avoid attempts to simultaneously load a module.
-Unfortunately, you can't get an exclusive fcntl lock on a read-only
-fd, making this not work for read-only mounted filesystems.
-module-init-tools has a hacky sleep-and-loop for this now.
-
-It's not that hard to wait in the kernel, and only return -EEXIST once
-the first module has finished loading (or continue loading the module
-if the first one failed to initialize for some reason). It's also
-consistent with what we do for dependent modules which are still loading.
-
-Suggested-by: Lucas De Marchi
-Signed-off-by: Rusty Russell
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 63cf6e7..74bc195 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
- return module_finalize(info->hdr, info->sechdrs, mod);
- }
-
-+/* Is this module of this name done loading? No locks held. */
-+static bool finished_loading(const char *name)
-+{
-+ struct module *mod;
-+ bool ret;
-+
-+ mutex_lock(&module_mutex);
-+ mod = find_module(name);
-+ ret = !mod || mod->state != MODULE_STATE_COMING;
-+ mutex_unlock(&module_mutex);
-+
-+ return ret;
-+}
-+
- /* Allocate and load the module: note that size of section 0 is always
- zero, and we rely on this for optional sections. */
- static struct module *load_module(void __user *umod,
-@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod,
- const char __user *uargs)
- {
- struct load_info info = { NULL, };
-- struct module *mod;
-+ struct module *mod, *old;
- long err;
-
- pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
-@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod,
- * function to insert in a way safe to concurrent readers.
- * The mutex protects against concurrent writers.
- */
-+again:
- mutex_lock(&module_mutex);
-- if (find_module(mod->name)) {
-+ if ((old = find_module(mod->name)) != NULL) {
-+ if (old->state == MODULE_STATE_COMING) {
-+ /* Wait in case it fails to load. */
-+ mutex_unlock(&module_mutex);
-+ err = wait_event_interruptible(module_wq,
-+ finished_loading(mod->name));
-+ if (err)
-+ goto free_arch_cleanup;
-+ goto again;
-+ }
- err = -EEXIST;
- goto unlock;
- }
diff --git a/libre/linux-libre/module-symbol-waiting-3.6.patch b/libre/linux-libre/module-symbol-waiting-3.6.patch
deleted file mode 100644
index b87a38ff5..000000000
--- a/libre/linux-libre/module-symbol-waiting-3.6.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Rusty Russell
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: fix symbol waiting when module fails before init
-X-Git-Tag: v3.7-rc1~2^2~33
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1
-
-module: fix symbol waiting when module fails before init
-
-We use resolve_symbol_wait(), which blocks if the module containing
-the symbol is still loading. However:
-
-1) The module_wq we use is only woken after calling the modules' init
- function, but there are other failure paths after the module is
- placed in the linked list where we need to do the same thing.
-
-2) wake_up() only wakes one waiter, and our waitqueue is shared by all
- modules, so we need to wake them all.
-
-3) wake_up_all() doesn't imply a memory barrier: I feel happier calling
- it after we've grabbed and dropped the module_mutex, not just after
- the state assignment.
-
-Signed-off-by: Rusty Russell
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 7f2ee45f..63cf6e7 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod,
- /* Unlink carefully: kallsyms could be walking list. */
- list_del_rcu(&mod->list);
- module_bug_cleanup(mod);
--
-+ wake_up_all(&module_wq);
- ddebug:
- dynamic_debug_remove(info.debug);
- unlock:
-@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- blocking_notifier_call_chain(&module_notify_list,
- MODULE_STATE_GOING, mod);
- free_module(mod);
-- wake_up(&module_wq);
-+ wake_up_all(&module_wq);
- return ret;
- }
- if (ret > 0) {
-@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- dump_stack();
- }
-
-- /* Now it's a first class citizen! Wake up anyone waiting for it. */
-+ /* Now it's a first class citizen! */
- mod->state = MODULE_STATE_LIVE;
-- wake_up(&module_wq);
- blocking_notifier_call_chain(&module_notify_list,
- MODULE_STATE_LIVE, mod);
-
-@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- mod->init_ro_size = 0;
- mod->init_text_size = 0;
- mutex_unlock(&module_mutex);
-+ wake_up_all(&module_wq);
-
- return 0;
- }
--
cgit v1.2.3
From 8b373b2bbe39bcacd1fcee112f050020bcc52e11 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 18 Dec 2012 19:19:35 -0200
Subject: linux-libre-3.7.1-1: updating md5sums
---
libre/linux-libre/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 6056ef657..02421d0c8 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -31,17 +31,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('a2312edd0265b5b07bd4b50afae2b380'
- 'd0382e715c9ce5f28dea840fd89c6434'
- 'e4a3a4677e1fac6ecf0e0fb44c41ca08'
- '68fc36a4efb6ade0eca409b9444fef0c'
+md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
+ '6f4bb80d3d91b69daf5ccfea836d02df'
+ '54b20031deeff214ed21074ab179cab2'
+ '65d8ca049850d18b97f59fa7a7b879f2'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'88d501404f172dac6fcb248978251560'
- '2f3ae0624acb4a4b12ea2c008b964bd2')
+ '0a74f8d9c640daabb774c25cb74db512')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
--
cgit v1.2.3
From 3b56532b1cf602743c2f7962e494e858a63e5afa Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 18 Dec 2012 19:23:49 -0200
Subject: linux-libre-3.7.1-1: fixing version for mips64el
---
libre/linux-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 02421d0c8..452929cce 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@ _basekernel=3.7
_sublevel=1
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
--
cgit v1.2.3
From 681fb1a83422112a366c41bee0c28bacdb63420d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 18 Dec 2012 20:25:07 -0200
Subject: linux-libre-lts-3.0.57-1: updating version
---
libre/linux-libre-lts/PKGBUILD | 8 ++++----
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 28fd3d71b..083330019 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=56
+_sublevel=57
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.55 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.56 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '49061818ee1c6d38095f5614be9a0eac'
+ 'b26d37a0fa9cf5024810996f3117361c'
'a5d98603d79d3ab7f979af49b2970f26'
'0ed396b368d8cdf8845f7ef2f62fc93c'
'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '0dbe7bf91cc9461d7394cf46ac37ff68')
+ 'fbaf6e706052fdd45ab889505758c3fc')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index a2029fd2e..bb727e900 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.56-1-LIBRE-LTS
+KERNEL_VERSION=3.0.57-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From d29f4dca671673f1026bcfef7bc9e36d51b6a21b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 18 Dec 2012 20:29:16 -0200
Subject: linux-libre-firmware-3.7-1: updating version
---
libre/linux-libre-firmware/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 57488f6de..71a1f0fb7 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Márcio Silva
pkgname=linux-libre-firmware
-pkgver=3.6
-pkgrel=2
+pkgver=3.7
+pkgrel=1
pkgdesc='Free firmware files for Linux-libre'
arch=('any')
url='http://linux-libre.fsfla.org/'
@@ -36,7 +36,7 @@ replaces=('linux-firmware'
'rt2x00-rt61-fw'
'rt2x00-rt71w-fw')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('a2312edd0265b5b07bd4b50afae2b380')
+md5sums=('06bf9601d859531e7378eb43d4ca7dd3')
package() {
cd $srcdir/linux-$pkgver
--
cgit v1.2.3
From 3dbbe1eda760ac2972f4829861b195705dcdc0db Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 18 Dec 2012 20:38:49 -0200
Subject: linux-libre-firmware-3.7-1: fixing provides line
---
libre/linux-libre-firmware/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 71a1f0fb7..52fcbd887 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc='Free firmware files for Linux-libre'
arch=('any')
url='http://linux-libre.fsfla.org/'
license=('GPL2')
-provides=('linux-firmware=20120625'
+provides=('linux-firmware'
'kernel26-firmware=2.6.34.99')
conflicts=('linux-firmware'
'linux-firmware-git'
--
cgit v1.2.3
From d76d85e71725ac7e791b79268607968e1387ff68 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 02:32:22 -0200
Subject: linux-libre-kmod-alx-20121003-8: building against linux-libre new
version
---
libre/linux-libre-kmod-alx/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 81c5088e3..5fd538662 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva
-_kernver=3.6.10
+_kernver=3.7.1
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=7
+pkgrel=8
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'
@@ -20,7 +20,7 @@ md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
build() {
# current extramodules version
- _extraver=extramodules-3.6-LIBRE
+ _extraver=extramodules-3.7-LIBRE
cd $srcdir/compat-wireless-$_pkgver-pc
--
cgit v1.2.3
From 98953304ff1ea632fdc2733325abbcc273c9ff1c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 02:34:22 -0200
Subject: linux-libre-lts-kmod-alx-20121003-9: building against linux-libre-lts
new version
---
libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 02e85467c..5e03aa720 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva
-_kernver=3.0.56
+_kernver=3.0.57
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=8
+pkgrel=9
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'
--
cgit v1.2.3
From 4c848bbe16a05c51b1ee80cc08f9117c8d392d86 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 03:12:51 -0200
Subject: linux-libre-3.7.1-1: fixing date on a commentary in ChangeLog due
that the linux-libre-3.7.1 was released at 20121219
---
libre/linux-libre/ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index a1aabf311..a4a67ef14 100755
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,4 +1,4 @@
-2012-12-18 André Silva
+2012-12-19 André Silva
* linux-libre-3.7.1-1
* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
--
cgit v1.2.3
From 638b19b5f347bf8a3f8de33a5461176984e6ae75 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 04:11:19 -0200
Subject: linux-libre-kmod-alx-20121204-1: updating version
---
libre/linux-libre-kmod-alx/PKGBUILD | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 5fd538662..5e7b01e40 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -3,36 +3,36 @@
_kernver=3.7.1
_kernrel=1
pkgname=('linux-libre-kmod-alx')
-_pkgver=2012-10-03
-pkgver=20121003
-pkgrel=8
+_pkgver=2012-12-04-1-u
+pkgver=20121204
+pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
-url='http://linuxwireless.org/'
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
license=('GPL2')
depends=("linux-libre=$_kernver")
makedepends=("linux-libre-headers=$_kernver")
install=linux-libre-kmod-alx.install
-source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
-md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
+md5sums=('bc46200e288acb862149a2af11f4b293')
build() {
# current extramodules version
_extraver=extramodules-3.7-LIBRE
- cd $srcdir/compat-wireless-$_pkgver-pc
+ cd $srcdir/compat-drivers-$_pkgver
# replacing to specific linux-libre kernel version
sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile
./scripts/driver-select alx
make
- cd $srcdir/compat-wireless-$_pkgver-pc/compat
+ cd $srcdir/compat-drivers-$_pkgver/compat
gzip -9 compat.ko
install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
- cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx
+ cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
gzip -9 alx.ko
install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
}
--
cgit v1.2.3
From 2a5557d8036372ff59626766caa6166619ce61f5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 04:25:47 -0200
Subject: linux-libre-kmod-alx-20121204-1: adding conflicts, replaces and
provides
---
libre/linux-libre-kmod-alx/PKGBUILD | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 5e7b01e40..87aa3d7af 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -8,11 +8,14 @@ pkgver=20121204
pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/'
license=('GPL2')
depends=("linux-libre=$_kernver")
makedepends=("linux-libre-headers=$_kernver")
install=linux-libre-kmod-alx.install
+replaces=('alx' 'alx-driver' 'dkms-alx')
+provides=('alx' 'alx-driver' 'dkms-alx')
+conflicts=('alx' 'alx-driver' 'dkms-alx')
source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
md5sums=('bc46200e288acb862149a2af11f4b293')
--
cgit v1.2.3
From b2303b86deca3523634431c4642fadcc9628efe9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 04:43:24 -0200
Subject: linux-libre-lts-kmod-alx-20121204-1: updating version
---
libre/linux-libre-lts-kmod-alx/PKGBUILD | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 5e03aa720..71be049c7 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -3,36 +3,39 @@
_kernver=3.0.57
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
-_pkgver=2012-10-03
-pkgver=20121003
-pkgrel=9
+_pkgver=2012-12-04-1-u
+pkgver=20121204
+pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
-url='http://linuxwireless.org/'
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/'
license=('GPL2')
depends=("linux-libre-lts=$_kernver")
makedepends=("linux-libre-lts-headers=$_kernver")
install=linux-libre-lts-kmod-alx.install
-source=(http://linuxwireless.org/download/compat-wireless-2.6/compat-wireless-$_pkgver-pc.tar.bz2)
+replaces=('alx' 'alx-driver' 'dkms-alx')
+provides=('alx' 'alx-driver' 'dkms-alx')
+conflicts=('alx' 'alx-driver' 'dkms-alx')
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
-md5sums=('7d541af2ae06eeaaadaba5b4fbcbfb13')
+md5sums=('bc46200e288acb862149a2af11f4b293')
build() {
# current extramodules version
_extraver=extramodules-3.0-LIBRE-LTS
- cd ${srcdir}/compat-wireless-$_pkgver-pc
+ cd $srcdir/compat-drivers-$_pkgver
# replacing to specific linux-libre-lts kernel version
sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile
./scripts/driver-select alx
make
- cd $srcdir/compat-wireless-$_pkgver-pc/compat
+ cd $srcdir/compat-drivers-$_pkgver/compat
gzip -9 compat.ko
install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
- cd $srcdir/compat-wireless-$_pkgver-pc/drivers/net/ethernet/atheros/alx
+ cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
gzip -9 alx.ko
install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
}
--
cgit v1.2.3
From 9b48cd37afb641855c8aa33a3bf60e528ff7a3ce Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 04:48:02 -0200
Subject: cdfs-libre-2.6.27-34: building against linux-libre-3.7 series
---
libre/cdfs-libre/PKGBUILD | 2 +-
libre/cdfs-libre/cdfs.install | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'libre')
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index e39dfc88a..306a9ec0c 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=cdfs
pkgname=cdfs-libre
pkgver=2.6.27
-pkgrel=33
+pkgrel=34
pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
arch=(i686 x86_64)
url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index aa71a92ac..3847b8b14 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
post_install() {
- EXTRAMODULES='extramodules-3.6-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.6-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.6-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
--
cgit v1.2.3
From c15e755852532ffbbe720c872e53d0987a62ed6d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 04:50:46 -0200
Subject: lirc-libre-1:0.9.0-35: building against linux-libre-3.7 series
---
libre/lirc-libre/PKGBUILD | 8 ++++----
libre/lirc-libre/lirc.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'libre')
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 2d7f3be5f..c8cd92d40 100755
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,14 +6,14 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=34
+pkgrel=35
epoch=1
-_extramodules=extramodules-3.6-LIBRE
+_extramodules=extramodules-3.7-LIBRE
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lirc.org/"
license=('GPL')
### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
@@ -56,7 +56,7 @@ build() {
package_lirc-libre() {
pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre"
- depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7')
+ depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
replaces=('lirc' 'lirc+pctv')
conflicts=('lirc')
provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index 976f5ab8a..a6694836f 100755
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.6-LIBRE
+EXTRAMODULES=extramodules-3.7-LIBRE
post_install() {
# updating module dependencies
--
cgit v1.2.3
From 311ef1530cadebb0130ceb97c8e765514127e9a4 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 04:56:18 -0200
Subject: tp_smapi-libre-0.41-12: building against linux-libre-3.7 series
---
libre/tp_smapi-libre/PKGBUILD | 6 +++---
libre/tp_smapi-libre/tp_smapi.install | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'libre')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 27e9ce6ea..37a7c1ad9 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,13 +11,13 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=11
+pkgrel=12
pkgdesc="Modules for ThinkPad's SMAPI functionality"
arch=('i686' 'x86_64')
url='https://github.com/evgeni/tp_smapi'
license=('GPL')
-depends=('linux-libre>=3.6' 'linux-libre<3.7')
-makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7')
+depends=('linux-libre>=3.7' 'linux-libre<3.8')
+makedepends=('linux-libre-headers>=3.7' 'linux-libre-headers<3.8')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 3662e7f34..3e1c13750 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.6-ARCH
+extramodules=/usr/lib/modules/extramodules-3.7-ARCH
post_install() {
depmod -v $(< "$extramodules/version") &>/dev/null
--
cgit v1.2.3
From c451ff3e8352c31fd90d029727105eedfa426f25 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 05:01:08 -0200
Subject: vhba-module-libre-20120422-15: building against linux-libre-3.7
series
---
libre/vhba-module-libre/PKGBUILD | 6 +++---
libre/vhba-module-libre/vhba-module.install | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'libre')
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index febefacfa..962087b82 100755
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -7,13 +7,13 @@
_pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20120422
-_extramodules=extramodules-3.6-LIBRE
-pkgrel=14
+_extramodules=extramodules-3.7-LIBRE
+pkgrel=15
pkgdesc="Kernel libre module that emulates SCSI devices"
arch=('i686' 'x86_64')
url="http://cdemu.sourceforge.net/"
license=('GPL')
-depends=('linux-libre>=3.6' 'linux-libre<3.7')
+depends=('linux-libre>=3.7' 'linux-libre<3.8')
makedepends=('linux-libre-headers')
options=(!makeflags)
install=$_pkgname.install
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 8bd740943..9f376f541 100755
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
_updatemod() {
echo " > Updating module dependencies..."
- EXTRAMODULES='extramodules-3.6-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
--
cgit v1.2.3
From d4577588eb522eb49a09c6c270b01675a12fd54f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 05:29:34 -0200
Subject: linux-libre-kmod-alx-20121204-1: fixing url
---
libre/linux-libre-kmod-alx/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 87aa3d7af..64008c7b6 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=20121204
pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/'
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
license=('GPL2')
depends=("linux-libre=$_kernver")
makedepends=("linux-libre-headers=$_kernver")
--
cgit v1.2.3
From 3139dc560ef164cc9c70733881035c5e459fdb2a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 05:29:52 -0200
Subject: linux-libre-lts-kmod-alx-20121204-1: fixing url
---
libre/linux-libre-lts-kmod-alx/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 71be049c7..767609934 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=20121204
pkgrel=1
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx/'
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
license=('GPL2')
depends=("linux-libre-lts=$_kernver")
makedepends=("linux-libre-lts-headers=$_kernver")
--
cgit v1.2.3
From 3ce1de34d8697e8fa57c02cdc2aeed24dc94ab18 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 19 Dec 2012 20:20:08 -0200
Subject: gst-plugins-bad-libre-1.0.4-1: updating versioN
---
libre/gst-plugins-bad-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libre')
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index e96c047a8..5a20ba446 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171693 2012-11-21 14:33:55Z heftig $
+# $Id: PKGBUILD 173502 2012-12-19 18:25:44Z heftig $
# Maintainer: Jan de Groot
# Maintainer (Parabola): Márcio Silva
pkgbase=gst-plugins-bad
pkgname=gst-plugins-bad-libre
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=1
pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
arch=(
@@ -57,7 +57,7 @@ source=(
"$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
)
sha256sums=(
- 2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0
+ 198759adb10ceb1777245f5706a198708e4539cd1e19b8a900f5d573fc76089f
)
build() {
--
cgit v1.2.3
From 840174e0e1b670afbc8468c31dc934ef0bf06859 Mon Sep 17 00:00:00 2001
From: Esteban Carnevale
Date: Thu, 20 Dec 2012 16:31:53 -0300
Subject: virtualbox-libre-4.2.4-1: Add OS selection freedom warning code with
several translations
---
libre/virtualbox-libre/PKGBUILD | 3 +-
libre/virtualbox-libre/free-distros.patch | 978 ++++++++++++++++++++++++++----
2 files changed, 877 insertions(+), 104 deletions(-)
(limited to 'libre')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 54978ea3c..416886f4c 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -109,7 +109,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'85141ccd2621a8e004b8f55c9a1f83eb'
- 'c7b29fbf4c24a00e8646ca6dd73f38a1')
+ '54884839546647efd75adb22dbd68337')
build() {
cd "VirtualBox-$pkgver"
@@ -346,3 +346,4 @@ package_virtualbox-libre-guest-utils(){
}
# vim:set ts=4 sw=4 et:
+54884839546647efd75adb22dbd68337 free-distros.patch
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index fcdb3c631..db6774542 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,6 +1,8 @@
---- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-10-16 23:00:19.998701465 -0200
-@@ -33,289 +33,365 @@
+diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
+index 6ae0372..df65e60 100644
+--- a/src/VBox/Main/src-all/Global.cpp
++++ b/src/VBox/Main/src-all/Global.cpp
+@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] =
VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -190,318 +192,320 @@
+ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux", "Arch Linux",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux",
VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux_64", "Arch Linux (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux_64", "Arch Linux (64 bit)",
VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Debian", "Debian",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian", "Debian",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian", "Debian",
VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Debian_64", "Debian (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian_64", "Debian (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian_64", "Debian (64 bit)",
VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
- { "Linux", "Linux", "OpenSUSE", "openSUSE",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE", "openSUSE",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE", "openSUSE",
VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE_64", "openSUSE (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE_64", "openSUSE (64 bit)",
VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Fedora", "Fedora",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora", "Fedora",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora", "Fedora",
VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora_64", "Fedora (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora_64", "Fedora (64 bit)",
VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Gentoo", "Gentoo",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo", "Gentoo",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo", "Gentoo",
VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo_64", "Gentoo (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo_64", "Gentoo (64 bit)",
VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Mandriva", "Mandriva",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva", "Mandriva",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva", "Mandriva",
VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva_64", "Mandriva (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva_64", "Mandriva (64 bit)",
VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "RedHat", "Red Hat",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat", "Red Hat",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat", "Red Hat",
VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat_64", "Red Hat (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat_64", "Red Hat (64 bit)",
VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Turbolinux", "Turbolinux",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux", "Turbolinux",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux", "Turbolinux",
VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux_64", "Turbolinux (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux_64", "Turbolinux (64 bit)",
VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Ubuntu", "Ubuntu",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu", "Ubuntu",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu", "Ubuntu",
VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu_64", "Ubuntu (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu_64", "Ubuntu (64 bit)",
VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Xandros", "Xandros",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros", "Xandros",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros", "Xandros",
VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros_64", "Xandros (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros_64", "Xandros (64 bit)",
VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Oracle", "Oracle",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle", "Oracle",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle", "Oracle",
VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)",
-+ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle_64", "Oracle (64 bit)",
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle_64", "Oracle (64 bit)",
VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Linux", "Linux", "Linux", "Other Linux",
- VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows31", "Windows 3.1",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1",
+ VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY,
+ 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows95", "Windows 95",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows95", "Windows 95",
+ VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY,
+ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows98", "Windows 98",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows98", "Windows 98",
+ VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY,
+ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsMe", "Windows ME",
++ { "Non-free OSs", "Non-free Operating Systems", "WindowsMe", "Windows ME",
+ VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
+ 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT4", "Windows NT 4",
++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4", "Windows NT 4",
+ VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE,
+ 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2000", "Windows 2000",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows2000", "Windows 2000",
+ VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET,
+ 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP", "Windows XP",
++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP", "Windows XP",
+ VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET,
+ 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP_64", "Windows XP (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64", "Windows XP (64 bit)",
+ VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003", "Windows 2003",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003", "Windows 2003",
+ VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET,
+ 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003_64", "Windows 2003 (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64", "Windows 2003 (64 bit)",
+ VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista", "Windows Vista",
++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista", "Windows Vista",
+ VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET,
+ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista_64", "Windows Vista (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64", "Windows Vista (64 bit)",
+ VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008", "Windows 2008",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008", "Windows 2008",
+ VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET,
+ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008_64", "Windows 2008 (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64", "Windows 2008 (64 bit)",
+ VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7", "Windows 7",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows7", "Windows 7",
+ VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET,
+ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7_64", "Windows 7 (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows7_64", "Windows 7 (64 bit)",
+ VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8", "Windows 8",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows8", "Windows 8",
+ VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
+ 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8_64", "Windows 8 (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows8_64", "Windows 8 (64 bit)",
+ VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2012_64", "Windows 2012 (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)",
+ VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT", "Other Windows",
++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT", "Other Windows",
+ VBOXOSTYPE_WinNT, VBOXOSHINT_NONE,
+ 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris", "Oracle Solaris 10 5/09 and earlier",
++ { "Non-free OSs", "Non-free Operating Systems", "Solaris", "Oracle Solaris 10 5/09 and earlier",
VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)",
VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris", "Oracle Solaris 10 10/09 and later",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris", "Oracle Solaris 10 10/09 and later",
VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET,
768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)",
VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris11_64", "Oracle Solaris 11 (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "Solaris11_64", "Oracle Solaris 11 (64 bit)",
VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "FreeBSD", "FreeBSD",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD", "FreeBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD",
VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE,
128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD_64", "FreeBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)",
VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "OpenBSD", "OpenBSD",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD", "OpenBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD",
VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD_64", "OpenBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)",
VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "NetBSD", "NetBSD",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD", "NetBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD",
VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD_64", "NetBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)",
VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp3", "OS/2 Warp 3",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3",
VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp4", "OS/2 Warp 4",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4",
VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp45", "OS/2 Warp 4.5",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5",
VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2eCS", "eComStation",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2eCS", "eComStation",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation",
VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX,
256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "OS2", "IBM OS/2", "OS2", "Other OS/2",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2", "Other OS/2",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2",
VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "MacOS", "Mac OS X", "MacOS", "Mac OS X",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS", "Mac OS X",
++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X",
VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
ChipsetType_ICH9, AudioControllerType_HDA },
- { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS_64", "Mac OS X (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)",
VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
ChipsetType_ICH9, AudioControllerType_HDA },
- { "Other", "Other", "DOS", "DOS",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "DOS", "DOS",
++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS",
VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "Other", "Other", "Netware", "Netware",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Netware", "Netware",
++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware",
VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX,
512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "L4", "L4",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "L4", "L4",
++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4",
VBOXOSTYPE_L4, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "QNX", "QNX",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "QNX", "QNX",
++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX",
VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX,
512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "JRockitVE", "JRockitVE",
-+ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "JRockitVE", "JRockitVE",
++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE",
VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 22:44:37.177454655 -0200
-@@ -44,45 +44,33 @@
+diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+index 4c52fb0..fbccfaf 100644
+--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+@@ -44,45 +44,33 @@ struct osTypePattern
static const osTypePattern gs_OSTypePattern[] =
{
@@ -542,6 +546,8 @@
- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+-
+- /* Code names for Linux distributions: */
+ /* Code names for free GNU/Linux distributions */
+ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
+ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
@@ -567,13 +573,12 @@
+ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
-
-- /* Code names for Linux distributions: */
++
+ /* Code names for non-free GNU/Linux distributions: */
{ QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
{ QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
{ QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -90,7 +78,7 @@
+@@ -90,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
{ QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
@@ -582,7 +587,7 @@
{ QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
{ QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
{ QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +103,50 @@
+@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
{ QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
{ QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -641,7 +646,7 @@
{ QRegExp("L4", Qt::CaseInsensitive), "L4" },
{ QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
{ QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -136,6 +159,8 @@
+@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
{ QRegExp("Net", Qt::CaseInsensitive), "Netware" },
{ QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
@@ -650,9 +655,28 @@
{ QRegExp("Ot", Qt::CaseInsensitive), "Other" },
};
---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp 2012-08-29 11:13:34.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp 2012-10-03 17:02:44.581501053 -0300
-@@ -3405,7 +3405,18 @@
+@@ -230,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+ /* Create widgets: */
+ QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+ {
++ pMainLayout->setContentsMargins(8, 6, 8, 6);
+ m_pLabel = new QIRichTextLabel(this);
++ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
+- pMainLayout->addWidget(m_pLabel);
+- pMainLayout->addWidget(m_pNameAndSystemEditor);
+- pMainLayout->addStretch();
++ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
++ pMainLayout->addWidget(m_pLabel, 1);
++ pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
+ }
+
+ /* Setup connections: */
+diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp
+index 8cb1e12..20e3eda 100644
+--- a/src/VBox/Main/xml/Settings.cpp
++++ b/src/VBox/Main/xml/Settings.cpp
+@@ -3405,7 +3405,18 @@ const struct {
{ "netware", "Netware" },
{ "solaris", "Solaris" },
{ "opensolaris", "OpenSolaris" },
@@ -672,9 +696,11 @@
};
void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
---- VirtualBox-4.2.0.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-09-04 09:48:43.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl 2012-10-03 17:02:10.780019131 -0300
-@@ -763,6 +763,17 @@
+diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl
+index 9a31a4c..7db11ad 100644
+--- a/src/VBox/Main/xml/SettingsConverter.xsl
++++ b/src/VBox/Main/xml/SettingsConverter.xsl
+@@ -763,6 +763,17 @@ Value ' ' of 'HardDisk::type' attribute is invalid.
Solaris
OpenSolaris
L4
@@ -692,8 +718,10 @@
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-05-30 07:39:18.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-10-03 00:13:20.408089706 -0300
+diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+index 075f097..3d311e1 100644
+--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
++++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
@@ -70,6 +70,24 @@
images/os_oracle_64.png
images/os_macosx.png
@@ -719,9 +747,11 @@
images/hd_16px.png
images/hd_disabled_16px.png
images/hd_32px.png
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-10-03 17:03:46.114796857 -0300
-@@ -4310,11 +4310,11 @@
+diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+index ec404df..c09e3b1 100644
+--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+@@ -4334,11 +4334,11 @@ void VBoxGlobal::init()
{"OS2Warp45", ":/os_os2warp45.png"},
{"OS2eCS", ":/os_os2ecs.png"},
{"OS2", ":/os_os2_other.png"},
@@ -738,7 +768,7 @@
{"ArchLinux", ":/os_archlinux.png"},
{"ArchLinux_64", ":/os_archlinux_64.png"},
{"Debian", ":/os_debian.png"},
-@@ -4337,7 +4337,7 @@
+@@ -4361,7 +4361,7 @@ void VBoxGlobal::init()
{"Xandros_64", ":/os_xandros_64.png"},
{"Oracle", ":/os_oracle.png"},
{"Oracle_64", ":/os_oracle_64.png"},
@@ -747,7 +777,7 @@
{"FreeBSD", ":/os_freebsd.png"},
{"FreeBSD_64", ":/os_freebsd_64.png"},
{"OpenBSD", ":/os_openbsd.png"},
-@@ -4353,6 +4353,25 @@
+@@ -4377,6 +4377,25 @@ void VBoxGlobal::init()
{"MacOS", ":/os_macosx.png"},
{"MacOS_64", ":/os_macosx_64.png"},
{"JRockitVE", ":/os_jrockitve.png"},
@@ -773,9 +803,11 @@
};
for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
{
---- VirtualBox-4.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300
-+++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-10-03 17:07:12.143504689 -0300
-@@ -116,6 +116,25 @@
+diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h
+index cbc0b73..31516cd 100644
+--- a/include/VBox/ostypes.h
++++ b/include/VBox/ostypes.h
+@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE
VBOXOSTYPE_MacOS = 0xB0000,
VBOXOSTYPE_MacOS_x64 = 0xB0100,
VBOXOSTYPE_JRockitVE = 0xC0000,
@@ -801,9 +833,11 @@
/** The bit number which indicates 64-bit or 32-bit. */
#define VBOXOSTYPE_x64_BIT 8
/** The mask which indicates 64-bit. */
---- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-10-03 17:11:27.739487250 -0300
-@@ -84,7 +84,32 @@
+diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
+index 05fc3b6..ce24d92 100644
+--- a/src/VBox/Main/src-server/ApplianceImpl.cpp
++++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
+@@ -84,7 +84,32 @@ g_osTypes[] =
{ ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS },
{ ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this
@@ -837,7 +871,7 @@
{ ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat },
{ ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 },
{ ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 },
-@@ -110,7 +135,7 @@
+@@ -110,7 +135,7 @@ g_osTypes[] =
{ ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 },
{ ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 },
@@ -846,7 +880,7 @@
{ ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux },
{ ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 },
{ ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore },
-@@ -151,53 +176,72 @@
+@@ -151,53 +176,72 @@ struct osTypePattern
/* These are the 32-Bit ones. They are sorted by priority. */
static const osTypePattern g_osTypesPattern[] =
{
@@ -961,9 +995,11 @@
};
/**
---- VirtualBox-4.2.0.orig/src/VBox/Main/include/ovfreader.h 2011-04-28 05:00:56.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h 2012-10-03 17:13:50.738308572 -0300
-@@ -145,8 +145,20 @@
+diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h
+index e1e21d5..6d2da12 100644
+--- a/src/VBox/Main/include/ovfreader.h
++++ b/src/VBox/Main/include/ovfreader.h
+@@ -145,8 +145,20 @@ enum CIMOSType_T
CIMOSType_CIMOS_CentOS_64 = 107,
CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
@@ -985,9 +1021,11 @@
};
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-10-03 22:49:11.871882837 -0300
-@@ -141,7 +141,7 @@
+diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
+index 59749be..8e2b425 100644
+--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
+@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType)
#ifdef VBOX_WITH_VIDEOHWACCEL
/* Check if 2D video acceleration supported by the guest OS type: */
QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
@@ -996,3 +1034,737 @@
#endif /* VBOX_WITH_VIDEOHWACCEL */
#ifdef VBOX_WITH_CRHGSMI
/* Check if WDDM mode supported by the guest OS type: */
+diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+index f67cfc2..438ffee 100644
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+@@ -32,6 +32,11 @@ enum
+ TypeID = Qt::UserRole + 1
+ };
+
++const char* FreedomLabel = "We hope you don't use non-free "
++ "GNU/Linux distros and non-free operating "
++ "systems, since to use them is to surrender "
++ "your freedom.";
++
+ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
+ : QIWithRetranslateUI(pParent)
+ {
+@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
+ qRegisterMetaType();
+
+ /* Create widgets: */
+- QGridLayout *pMainLayout = new QGridLayout(this);
++ QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+ {
+ pMainLayout->setContentsMargins(0, 0, 0, 0);
+- m_pNameLabel = new QLabel(this);
+- {
+- m_pNameLabel->setAlignment(Qt::AlignRight);
+- m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+- }
+- m_pNameEditor = new QLineEdit(this);
+- {
+- m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+- m_pNameLabel->setBuddy(m_pNameEditor);
+- }
+- m_pFamilyLabel = new QLabel(this);
+- {
+- m_pFamilyLabel->setAlignment(Qt::AlignRight);
+- m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+- }
+- m_pFamilyCombo = new QComboBox(this);
+- {
+- m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+- m_pFamilyLabel->setBuddy(m_pFamilyCombo);
+- }
+- m_pTypeLabel = new QLabel(this);
+- {
+- m_pTypeLabel->setAlignment(Qt::AlignRight);
+- m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+- }
+- m_pTypeCombo = new QComboBox(this);
+- {
+- m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+- m_pTypeLabel->setBuddy(m_pTypeCombo);
+- }
+- QVBoxLayout *pIconLayout = new QVBoxLayout;
+- {
+- m_pTypeIcon = new QLabel(this);
++
++ /* Top QWidget */
++ m_pGlobalCnt = new QFrame;
++ m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
++
++ QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt);
++ {
++ m_pGridCnt = new QFrame;
++ m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
++ m_pGridCnt->setMinimumWidth(500);
++
++ QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt);
+ {
+- m_pTypeIcon->setFixedSize(32, 32);
+- }
+- pIconLayout->addWidget(m_pTypeIcon);
+- pIconLayout->addStretch();
+- }
+- pMainLayout->addWidget(m_pNameLabel, 0, 0);
+- pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
+- pMainLayout->addWidget(m_pFamilyLabel, 1, 0);
+- pMainLayout->addWidget(m_pFamilyCombo, 1, 1);
+- pMainLayout->addWidget(m_pTypeLabel, 2, 0);
+- pMainLayout->addWidget(m_pTypeCombo, 2, 1);
+- pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1);
++ pGridLayout->setContentsMargins(4, 4, 4, 4);
++ m_pNameLabel = new QLabel(m_pGridCnt);
++ {
++ m_pNameLabel->setAlignment(Qt::AlignRight);
++ m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++ }
++ m_pNameEditor = new QLineEdit(m_pGridCnt);
++ {
++ m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
++ m_pNameLabel->setBuddy(m_pNameEditor);
++ }
++ m_pFamilyLabel = new QLabel(m_pGridCnt);
++ {
++ m_pFamilyLabel->setAlignment(Qt::AlignRight);
++ m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++ }
++ m_pFamilyCombo = new QComboBox(m_pGridCnt);
++ {
++ m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
++ m_pFamilyLabel->setBuddy(m_pFamilyCombo);
++ }
++ m_pTypeLabel = new QLabel(m_pGridCnt);
++ {
++ m_pTypeLabel->setAlignment(Qt::AlignRight);
++ m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++ }
++ m_pTypeCombo = new QComboBox(m_pGridCnt);
++ {
++ m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
++ m_pTypeLabel->setBuddy(m_pTypeCombo);
++ }
++ QVBoxLayout *pIconLayout = new QVBoxLayout;
++ {
++ m_pTypeIcon = new QLabel;
++ {
++ m_pTypeIcon->setFixedSize(32, 32);
++ }
++ pIconLayout->addWidget(m_pTypeIcon);
++ pIconLayout->addStretch();
++ }
++
++ pGridLayout->addWidget(m_pNameLabel, 0, 0);
++ pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
++ pGridLayout->addWidget(m_pFamilyLabel, 1, 0);
++ pGridLayout->addWidget(m_pFamilyCombo, 1, 1);
++ pGridLayout->addWidget(m_pTypeLabel, 2, 0);
++ pGridLayout->addWidget(m_pTypeCombo, 2, 1);
++ pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1);
++ }
++
++ m_pFreedomLabel = new QLabel(m_pGlobalCnt);
++ {
++ m_pFreedomLabel->setStyleSheet("color: red;"
++ "border-radius: 4px;"
++ "padding: 2px;"
++ "background-color: #DDDDDD;");
++ m_pFreedomLabel->setWordWrap(true);
++ m_pFreedomLabel->setAlignment(Qt::AlignCenter);
++ m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
++ m_pFreedomLabel->hide();
++ }
++
++ pGlobalLayout->addStretch();
++ pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter);
++ pGlobalLayout->addWidget(m_pFreedomLabel);
++ pGlobalLayout->addStretch();
++ }
++
++ pMainLayout->addWidget(m_pGlobalCnt);
+ }
+
+ /* Check if host supports (AMD-V or VT-x) and long mode: */
+@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi()
+ m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that "
+ "you plan to install into this virtual machine "
+ "(called a guest operating system)."));
++ m_pFreedomLabel->setText(tr(FreedomLabel));
+ }
+
+ void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
+@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
+ /* Else simply select the first one present: */
+ else m_pTypeCombo->setCurrentIndex(0);
+
++ /* Hide or show the freedom label if it is translated to the active language */
++ int isEnglish = QLocale::system().language();
++ if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31)
++ {
++ if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros")
++ {
++ m_pFreedomLabel->show();
++ }
++ else
++ {
++ m_pFreedomLabel->hide();
++ }
++ }
++
+ /* Update all the stuff: */
+ sltTypeChanged(m_pTypeCombo->currentIndex());
+
+diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
+index 6a698c0..3c23845 100644
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
++++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
+@@ -30,6 +30,7 @@
+ class QLabel;
+ class QLineEdit;
+ class QComboBox;
++class QFrame;
+
+ /* QWidget reimplementation providing editor for basic VM parameters: */
+ class UINameAndSystemEditor : public QIWithRetranslateUI
+@@ -76,6 +77,8 @@ private slots:
+ private:
+
+ /* Widgets: */
++ QFrame *m_pGlobalCnt;
++ QFrame *m_pGridCnt;
+ QLabel *m_pNameLabel;
+ QLabel *m_pFamilyLabel;
+ QLabel *m_pTypeLabel;
+@@ -83,6 +86,7 @@ private:
+ QLineEdit *m_pNameEditor;
+ QComboBox *m_pFamilyCombo;
+ QComboBox *m_pTypeCombo;
++ QLabel *m_pFreedomLabel;
+
+ /* Variables: */
+ CGuestOSType m_type;
+diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
+index 100cb8c..5ab98ad 100644
+--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
+@@ -19,7 +19,7 @@
+
+ /* Global includes: */
+ #include
+-#include
++#include
+ #include
+ #include
+ #include
+@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
+ m_pNameAndSystemCnt = new QGroupBox(this);
+ {
+ m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+- QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
++ m_pNameAndSystemCnt->setFixedHeight(170);
++
++ QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt);
+ {
++ pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2);
+ m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
+ pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
+ }
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
+index cea825b..7ade350 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
+@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
+index e41d97d..f449069 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
+@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'aquesta màquina virtual (anomenat sistema operatiu client).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
+index e82fc7c..a98be2c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
+@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'esta màquina virtual (anomenat sistema operatiu client).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
+index 176f417..bb58906 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
+@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManager
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
+index 3f88de8..1d48468 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
+@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
+index 14a3721..945d554 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
+@@ -4838,6 +4838,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
+index 4e52534..3d7dba6 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
+@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
+index 275e1e6..34171eb 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
+@@ -5951,6 +5951,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
+index fcaed77..ab92ef9 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
+@@ -4830,6 +4830,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
+index 3f31f8f..9248344 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
+@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin.
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
+index b918edb..a6868a4 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
+@@ -6432,6 +6432,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Affiche le type du système d'exploitation (dit système d'exploitation invité) que vous allez installer dans cette machine virtuelle.
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Nous espérons que vous n'utilisez pas de distribution GNU/Linux non libre ni de système d'exploitation non libre car, si vous le faites, vous abdiquez votre liberté.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
+index b04f31b..77a389f 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
+@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Mostrar o tipo do sistema operativo que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
+index 76d4371..c1aff65 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
+@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ A tervezett vendég operációs rendszer típusa.
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
+index 349d776..fb81c2c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
+@@ -6768,6 +6768,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
+index 61f6a37..70e66b9 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
+@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà.
++
+
+
+ UINetworkManager
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
+index 9ab3823..40006f9 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
+@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ 仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。
+
++
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
+index be82aab..7d73e23 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
+@@ -6451,6 +6451,10 @@ medium
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ បង្ហាញប្រភេទប្រព័ន្ធប្រតិបត្តិការដែលអ្នកមានគម្រោងដំឡើងម៉ាស៊ីននិម្មិតនេះ (បានហៅប្រព័ន្ធប្រតិបត្តិរបស់ម៉ាស៊ីនភ្ញៀវ) ។
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
+index 05ccf51..3fb2a07 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
+@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ 이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다.
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ 자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로, 사용하지 않을 것을 권유합니다.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
+index 3e06e93..cadd54b 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
+@@ -6767,6 +6767,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
+index 2b81abd..610dad8 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
+@@ -5894,6 +5894,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
+index 7122389..ca0b4b2 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
+@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
+index ebcba39..0bb693b 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
+@@ -6816,6 +6816,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
+index 6a82c7e..c866fa4 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
+@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade.
++
+
+
+ UINetworkManager
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
+index 3b79282..345725c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
+@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
+index c2230a2..653f436 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
+@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется "гостевая ОС").
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы.
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
+index 40eec9d..dcecd31 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
+@@ -6762,6 +6762,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
+index 9eeef05..649c108 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
+@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Показује тип система који планирате да инсталирате на машину (позвано гост систем).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
+index 800d10b..239a8d4 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
+@@ -7768,6 +7768,10 @@ serial ports
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta.
++
+
+
+ UINetworkManager
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
+index cdb888e..4c8d86c 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
+@@ -6312,6 +6312,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır).
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
+index 8b51e82..2557231 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
+@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; }
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManager
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
+index 2690322..0ea229a 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
+@@ -4810,6 +4810,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
+index 5b567f7..8709191 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
+@@ -5858,6 +5858,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ 显示你要安装到虚拟电脑的操作系统类型.
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++ 我们真心希望您能拒绝使用非自由的操作系统,包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。
++
+
+
+ UINetworkManagerDialog
+diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
+index 5d1d136..095c169 100644
+--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
++++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
+@@ -4834,6 +4834,10 @@
+ Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).
+ 顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。
+
++
++ We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.
++
++
+
+
+ UINetworkManagerDialog
--
cgit v1.2.3
From be08f3747fd4c4f2b70e700187728fead5d5f9eb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 20 Dec 2012 17:44:13 -0200
Subject: linux-libre-tools-3.7-3: adding glibc as dependency for
libtraceevent-libre
---
libre/linux-libre-tools/PKGBUILD | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'libre')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 68b75c631..1fe61100d 100755
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -8,7 +8,7 @@ _basekernel=3.7
#_sublevel=1
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=2
+pkgrel=3
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -89,6 +89,7 @@ build() {
package_libtraceevent-libre() {
pkgdesc='Linux-libre kernel trace event library'
+ depends=('glibc')
replaces=('libtraceevent')
conflicts=('libtraceevent')
provides=("libtraceevent=$pkgver")
--
cgit v1.2.3
From a901f69dc38e2841d12457386b09281c003932c4 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 20 Dec 2012 18:09:04 -0200
Subject: virtualbox-libre-4.2.4-2: updating revision due fixing keymap path
---
libre/virtualbox-libre/PKGBUILD | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 416886f4c..2bda4edbc 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-guest-utils'
'virtualbox-libre-guest-source')
pkgver=4.2.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -152,13 +152,15 @@ build() {
--enable-vde \
--enable-vnc \
--disable-kmods
-# --with-linux=/usr/src/linux-${_kernver}
+ --with-linux=/usr/src/linux-${_kernver}
source ./env.sh
kmk all
sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
# build rdesktop-vrdp (broken from LocalConfig.kmk)
cd src/VBox/RDP/client
cp "$srcdir/LocalConfig.kmk" .
+ # fix keymap path FS#32548
+ sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
kmk all
}
@@ -172,6 +174,7 @@ package_virtualbox-libre() {
'libxml2'
'libxmu'
'sdl-libre'
+ 'shared-mime-info'
'virtualbox-libre-host-modules')
optdepends=('qt: VirtualBox GUI support'
'vde2: Virtual Distributed Ethernet support'
--
cgit v1.2.3
From a4c9e8588d3bef448d6986153e0fa2a78e047a63 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 20 Dec 2012 18:13:51 -0200
Subject: virtualbox-libre-modules-4.2.4-3: updating revision due rebuilding
against linux-libre-3.7 series
---
libre/virtualbox-libre-modules/PKGBUILD | 6 +++---
.../virtualbox-libre-modules/virtualbox-libre-guest-modules.install | 6 +++---
.../virtualbox-libre-modules/virtualbox-libre-host-modules.install | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'libre')
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 1ecee7b2c..b0b6385df 100755
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
pkgver=4.2.4
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -32,7 +32,7 @@ build() {
package_virtualbox-libre-host-modules(){
pkgdesc='Host kernel libre modules for VirtualBox'
- depends=('linux-libre>=3.6' 'linux-libre<3.7')
+ depends=('linux-libre>=3.7' 'linux-libre<3.8')
provides=("virtualbox-host-modules=${pkgver}")
replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
@@ -51,7 +51,7 @@ package_virtualbox-libre-host-modules(){
package_virtualbox-libre-guest-modules(){
pkgdesc='Guest kernel libre modules for VirtualBox'
license=('GPL')
- depends=('linux-libre>=3.6' 'linux-libre<3.7')
+ depends=('linux-libre>=3.7' 'linux-libre<3.8')
provides=("virtualbox-guest-modules=${pkgver}")
replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index caf59aa13..41b5ac73a 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
- EXTRAMODULES='extramodules-3.6-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.6-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.6-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
index 8605cf20a..1ac430c3b 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
===> You must load vboxdrv module before starting VirtualBox:
===> # modprobe vboxdrv
EOF
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
echo 'In order to use the new version, reload all virtualbox modules manually.'
}
post_remove() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.7-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
--
cgit v1.2.3
From 32c7a6da00c66b0b6651bf754f9b8942ff440ea2 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 20 Dec 2012 18:23:46 -0200
Subject: virtualbox-libre-4.2.4-2: removing unnecessary md5sum at the end of
PKGBUILD file
---
libre/virtualbox-libre/PKGBUILD | 1 -
1 file changed, 1 deletion(-)
(limited to 'libre')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 2bda4edbc..a35f811e9 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -349,4 +349,3 @@ package_virtualbox-libre-guest-utils(){
}
# vim:set ts=4 sw=4 et:
-54884839546647efd75adb22dbd68337 free-distros.patch
--
cgit v1.2.3
From de3c30d757cfbb8499e7308dea19565d3c5a0b38 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 20 Dec 2012 18:29:24 -0200
Subject: virtualbox-libre-4.2.4-2: removing unnecessary line about linux-libre
kernel on PKGBUILD
---
libre/virtualbox-libre/PKGBUILD | 1 -
1 file changed, 1 deletion(-)
(limited to 'libre')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index a35f811e9..c7ca35aca 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -152,7 +152,6 @@ build() {
--enable-vde \
--enable-vnc \
--disable-kmods
- --with-linux=/usr/src/linux-${_kernver}
source ./env.sh
kmk all
sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
--
cgit v1.2.3
From 3a313b6d01be07930155507aafe81dc671773f82 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 20 Dec 2012 20:16:17 -0200
Subject: linux-libre-3.7.1-2: updating revision due fixing watchdog regression
---
libre/linux-libre/PKGBUILD | 8 ++++++-
libre/linux-libre/fix-watchdog-3.7.patch | 38 ++++++++++++++++++++++++++++++++
libre/linux-libre/linux-libre.install | 2 +-
3 files changed, 46 insertions(+), 2 deletions(-)
create mode 100644 libre/linux-libre/fix-watchdog-3.7.patch
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 452929cce..2de420d16 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel
_basekernel=3.7
_sublevel=1
pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
+pkgrel=2
_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -30,6 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'fat-3.6.x.patch'
+ 'fix-watchdog-3.7.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
'6f4bb80d3d91b69daf5ccfea836d02df'
@@ -41,6 +42,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'88d501404f172dac6fcb248978251560'
+ '3485d6c7ae3af35d16e09d6d9a7ed32a'
'0a74f8d9c640daabb774c25cb74db512')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
@@ -70,6 +72,10 @@ build() {
# https://bugs.archlinux.org/task/32916
patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
+ # fix watchdog enable/disable regression
+ # https://bugs.archlinux.org/task/33095
+ patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch
new file mode 100644
index 000000000..fe4431604
--- /dev/null
+++ b/libre/linux-libre/fix-watchdog-3.7.patch
@@ -0,0 +1,38 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62
+
+diff --git a/kernel/watchdog.c b/kernel/watchdog.c
+index 997c6a1..75a2ab3 100644
+--- a/kernel/watchdog.c
++++ b/kernel/watchdog.c
+@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu)
+ {
+ struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
+
++ /* kick off the timer for the hardlockup detector */
++ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++ hrtimer->function = watchdog_timer_fn;
++
+ if (!watchdog_enabled) {
+ kthread_park(current);
+ return;
+@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu)
+ /* Enable the perf event */
+ watchdog_nmi_enable(cpu);
+
+- /* kick off the timer for the hardlockup detector */
+- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+- hrtimer->function = watchdog_timer_fn;
+-
+ /* done here because hrtimer_start can only pin to smp_processor_id() */
+ hrtimer_start(hrtimer, ns_to_ktime(sample_period),
+ HRTIMER_MODE_REL_PINNED);
+@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu)
+ {
+ struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
+
+- if (!watchdog_enabled)
+- return;
+-
+ watchdog_set_prio(SCHED_NORMAL, 0);
+ hrtimer_cancel(hrtimer);
+ /* disable the perf event */
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index e8f8b6979..301a1b6c2 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.7.1-1-LIBRE
+KERNEL_VERSION=3.7.1-2-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
--
cgit v1.2.3
From 6d922d071efba7dc5bd287f0882210458d231be8 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 21 Dec 2012 17:53:36 -0200
Subject: linux-libre-3.7.1-2: updating version for mips64el
---
libre/linux-libre/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 2de420d16..26c18da17 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@ _basekernel=3.7
_sublevel=1
pkgver=${_basekernel}.${_sublevel}
pkgrel=2
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -43,7 +43,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
'9d3c56a4b999c8bfbd4018089a62f662'
'88d501404f172dac6fcb248978251560'
'3485d6c7ae3af35d16e09d6d9a7ed32a'
- '0a74f8d9c640daabb774c25cb74db512')
+ 'b56c33eaee920970151fffdfc7df0766')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
--
cgit v1.2.3
From 73e359c0b2b5b3d772b71ed716f7df5bb784ecb6 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 21 Dec 2012 17:53:57 -0200
Subject: linux-libre-lts-3.0.57-1: updating version for mips64el
---
libre/linux-libre-lts/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'libre')
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 083330019..47666d7b4 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -10,7 +10,7 @@ _basekernel=3.0
_sublevel=57
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.56 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- 'fbaf6e706052fdd45ab889505758c3fc')
+ '21f93138b6d4410b095cc9998f89e47d')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
--
cgit v1.2.3
From b17b3f9f8399114a99aa0971e61d9574d647626a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 21 Dec 2012 22:23:58 -0200
Subject: calibre-libre: adding new package to [libre] repo
---
libre/calibre-libre/PKGBUILD | 82 +++++++++++++++++++
libre/calibre-libre/calibre-mount-helper | 28 +++++++
libre/calibre-libre/calibre.install | 12 +++
libre/calibre-libre/desktop_integration.patch | 109 ++++++++++++++++++++++++++
4 files changed, 231 insertions(+)
create mode 100644 libre/calibre-libre/PKGBUILD
create mode 100644 libre/calibre-libre/calibre-mount-helper
create mode 100644 libre/calibre-libre/calibre.install
create mode 100644 libre/calibre-libre/desktop_integration.patch
(limited to 'libre')
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
new file mode 100644
index 000000000..a8dc5ebd5
--- /dev/null
+++ b/libre/calibre-libre/PKGBUILD
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Giovanni Scafora
+# Contributor: Petrov Roman