From f944490c481c2665eb788d6b985bf5046407b870 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Wed, 11 Jul 2012 16:50:55 -0300
Subject: spacenavd: adding package to artistic repo
---
artistic/spacenavd/PKGBUILD | 23 +++++++++++++++++++++++
artistic/spacenavd/spacenavd | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 artistic/spacenavd/PKGBUILD
create mode 100644 artistic/spacenavd/spacenavd
diff --git a/artistic/spacenavd/PKGBUILD b/artistic/spacenavd/PKGBUILD
new file mode 100644
index 000000000..1c117b804
--- /dev/null
+++ b/artistic/spacenavd/PKGBUILD
@@ -0,0 +1,23 @@
+# Contributor: Jan Hambrecht
+# Maintainer (Parabola): Márcio Silva
+
+pkgname=spacenavd
+pkgver=0.5
+pkgrel=1
+pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://spacenav.sourceforge.net/"
+license=('GPL')
+depends=('libx11')
+backup=('etc/spnavrc')
+source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz spacenavd )
+
+md5sums=('0bb21da5315bd376aa508157a9455aaa'
+ '27a739300d4de07920879af2d2bdd47f')
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=$pkgdir/usr
+ make || return 1
+ make DESTDIR=$pkgdir install || return 1
+ install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1
+}
diff --git a/artistic/spacenavd/spacenavd b/artistic/spacenavd/spacenavd
new file mode 100644
index 000000000..61946197c
--- /dev/null
+++ b/artistic/spacenavd/spacenavd
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON=/usr/bin/spacenavd
+
+PID=`pidof -o %PPID $DAEMON`
+case "$1" in
+ start)
+ stat_busy "Starting Spacenavigator Daemon"
+ [ -z "$PID" ] && $DAEMON
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon spacenavd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Spacenavigator Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon spacenavd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
--
cgit v1.2.3
From 9c2b79f31e212ff4c4a7f3b58673168288562835 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 12 Jul 2012 22:42:55 -0300
Subject: foomatic-filters-libre-4.0.17_20120712-1: update version
---
libre/foomatic-filters-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
index 87b155c0c..73a7af6c4 100644
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ b/libre/foomatic-filters-libre/PKGBUILD
@@ -5,8 +5,8 @@
pkgbase="foomatic"
pkgname=('foomatic-filters-libre')
arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it
-_snapdate=20120626
-_filtersver=4.0.16
+_snapdate=20120712
+_filtersver=4.0.17
pkgver=${_filtersver}_${_snapdate}
pkgrel=1
epoch=1
@@ -14,7 +14,7 @@ makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz)
url="http://www.linuxprinting.org/foomatic.html"
options=('!emptydirs')
-md5sums=('ec907d9ea17e03bccb91db66e9470586')
+md5sums=('b05f5dcbfe359f198eef3df5b283d896')
package_foomatic-filters-libre() {
--
cgit v1.2.3
From de9ab185a1c49d54b0ab5cee79f016d663d90b10 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sat, 14 Jul 2012 17:40:19 -0300
Subject: initscript: updating package
---
...emove-run-nologin-before-leaving-rc.multi.patch | 28 ++++++++++++++++++++++
libre/initscripts/PKGBUILD | 13 +++++++---
2 files changed, 38 insertions(+), 3 deletions(-)
create mode 100644 libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
new file mode 100644
index 000000000..3dc75df1c
--- /dev/null
+++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
@@ -0,0 +1,28 @@
+From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner
+Date: Tue, 3 Jul 2012 22:28:05 -0400
+Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
+To: arch-projects@archlinux.org
+
+systemd-186 writes this file when running systemd-tmpfiles, but
+initscripts never removes it. This disallows all non-root logins.
+
+Reported-by: Dan McGee
+Signed-off-by: Dave Reisner
+---
+ rc.multi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/rc.multi b/rc.multi
+index daf2372..7d4acaa 100755
+--- a/rc.multi
++++ b/rc.multi
+@@ -31,4 +31,6 @@ run_hook multi_end
+
+ bootlogd_stop
+
++rm -f /run/nologin
++
+ # vim: set ts=2 sw=2 noet:
+--
+1.7.11.1
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index aee2585d9..a25daabe2 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,8 +5,8 @@
# Maintainer (Parabola): Nicolas Reynolds
pkgname=initscripts
-pkgver=2012.06.28
-pkgrel=1
+pkgver=2012.07.5
+pkgrel=2
pkgdesc="System initialization/bootup scripts (Parabola branding)"
arch=('any')
url="https://parabolagnulinux.org"
@@ -21,12 +21,19 @@ optdepends=('bridge-utils: Network bridging support'
makedepends=(asciidoc)
install=initscripts.install
source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
+ 0001-remove-run-nologin-before-leaving-rc.multi.patch
'wireless.conf.d')
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
+}
+
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
-md5sums=('21651eaba1fd34542c78f39c755cd171'
+md5sums=('c95c3cd09975414fbb6719e4222ff74b'
+ '87f02d111e0c613dd9fc61a9613f9c92'
'027576534885b8d5dded9be546057b12')
--
cgit v1.2.3
From d1c720e0d937ab956225ca4ce869066cdcec325e Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Sat, 14 Jul 2012 18:07:12 -0300
Subject: libre/initscripts-2012.07.5
---
libre/initscripts/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index aee2585d9..ac9d98d27 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
# Maintainer (Parabola): Nicolas Reynolds
pkgname=initscripts
-pkgver=2012.06.28
+pkgver=2012.07.5
pkgrel=1
pkgdesc="System initialization/bootup scripts (Parabola branding)"
arch=('any')
@@ -28,5 +28,5 @@ package() {
make DESTDIR=${pkgdir} install
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
-md5sums=('21651eaba1fd34542c78f39c755cd171'
+md5sums=('c95c3cd09975414fbb6719e4222ff74b'
'027576534885b8d5dded9be546057b12')
--
cgit v1.2.3
From a4d72c480892aecc4f2d61fb1887b1a67a3378f3 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Sat, 14 Jul 2012 18:13:14 -0300
Subject: libre/initscripts-2012.07.14
---
.../0001-remove-run-nologin-before-leaving-rc.multi.patch | 7 ++++---
libre/initscripts/PKGBUILD | 7 +++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
index 3dc75df1c..a9b7a2423 100644
--- a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
+++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
@@ -18,11 +18,12 @@ index daf2372..7d4acaa 100755
--- a/rc.multi
+++ b/rc.multi
@@ -31,4 +31,6 @@ run_hook multi_end
-
+
bootlogd_stop
-
+
+rm -f /run/nologin
+
# vim: set ts=2 sw=2 noet:
---
+--
1.7.11.1
+
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 85ada99ca..cc509fdd3 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
# Maintainer (Parabola): Nicolas Reynolds
pkgname=initscripts
-pkgver=2012.07.5
+pkgver=2012.07.14
pkgrel=1
pkgdesc="System initialization/bootup scripts (Parabola branding)"
arch=('any')
@@ -26,7 +26,7 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
+# patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
}
package() {
@@ -34,3 +34,6 @@ package() {
make DESTDIR=${pkgdir} install
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
+md5sums=('15e2f373be03b25b0033fd4fb4820d30'
+ 'ba32b9d723c20b38487669fb3c00d3d5'
+ '027576534885b8d5dded9be546057b12')
--
cgit v1.2.3
From 327339bc77c1312de217fac4fb9b060e713acc96 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Sat, 14 Jul 2012 18:14:56 -0300
Subject: ~fauno/pandoc-1.9.4.2
---
~fauno/pandoc/PKGBUILD | 8 ++++----
~fauno/pandoc/SRCBUILD | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index b577f0cf1..410a3dd2b 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -4,7 +4,7 @@
# Run `makepkg -srp SRCBUILD` if you want to update the source tarball
pkgname=pandoc
-pkgver=1.9.4
+pkgver=1.9.4.2
pkgrel=1
pkgdesc='Conversion between markup formats (no Haskell libs)'
url='http://johnmacfarlane.net/pandoc/'
@@ -57,6 +57,6 @@ package() {
find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
}
-md5sums=('dbf83bc5fae25877f8f1444c67fcc706'
- '179a9b8a716e1de8e6afba3d43c3ebef'
- 'ec809a0c1f787dc53c896c391d32ef6e')
+md5sums=('3a9191e729a4547370f756ba831cad77'
+ 'a8da851ee560ce54c7c5044dfb5042f0'
+ '8dab4575128cf33941a577bfb500c417')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index c8b13d906..68939a103 100644
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -2,7 +2,7 @@
# Based on haskell-pandoc
pkgname=pandoc
-pkgver=1.9.4
+pkgver=1.9.4.2
pkgrel=1
pkgdesc='Conversion between markup formats (no Haskell libs)'
url='http://johnmacfarlane.net/pandoc/'
--
cgit v1.2.3
From a8a2c7388922e286a6aa4bbd388a128aef9c720b Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sun, 15 Jul 2012 15:45:11 -0300
Subject: blender-libre: updating package
---
libre/blender-libre/PKGBUILD | 23 +++++++-------------
libre/blender-libre/boost-1.50.patch | 42 ++++++++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 15 deletions(-)
create mode 100644 libre/blender-libre/boost-1.50.patch
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 5dd14405d..b4ba9f827 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=blender
pkgname=blender-libre
pkgver=2.63a
-pkgrel=2.1
+pkgrel=3
epoch=4
pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,15 +18,19 @@ makedepends=('cmake' 'boost')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
-options=(!strip)
install=${_pkgname}.install
-source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch)
-md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217')
+source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
+ ffmpeg-0.11.patch
+ boost-1.50.patch)
+md5sums=('31a60b3ce5466d965cb7e2648995e092'
+ '9e5649403e51654615d30b10bc460217'
+ '0bab80da07d980c47b8ce3cb998edaef')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
+ patch -Np1 < "${srcdir}"/boost-1.50.patch
sed -i "//d" intern/ffmpeg/ffmpeg_compat.h
sed -i "//d" source/blender/blenkernel/intern/writeffmpeg.c
@@ -60,10 +64,6 @@ build() {
make $MAKEFLAGS
-# cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \
-# "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/
-# cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi
-# chmod 755 bmake
make
}
@@ -71,11 +71,4 @@ package() {
cd "${srcdir}/${_pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install
python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-# install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \
-# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \
-# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
}
diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch
new file mode 100644
index 000000000..fa698a3a6
--- /dev/null
+++ b/libre/blender-libre/boost-1.50.patch
@@ -0,0 +1,42 @@
+diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
+--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300
+@@ -26,8 +26,6 @@
+ #include "util_path.h"
+ #include "util_types.h"
+
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include
+ #include
+
+@@ -117,7 +115,7 @@
+ boost::filesystem::directory_iterator it(dir), it_end;
+
+ for(; it != it_end; it++) {
+- string filename = it->path().filename();
++ string filename = it->path().filename().string();
+
+ if(boost::starts_with(filename, name))
+ if(except.find(filename) == except.end())
+diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
+--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300
+@@ -26,8 +26,6 @@
+
+ #include
+
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include
+ #include
+
+@@ -60,7 +58,7 @@
+
+ string path_filename(const string& path)
+ {
+- return boost::filesystem::path(path).filename();
++ return boost::filesystem::path(path).filename().string();
+ }
+
+ string path_dirname(const string& path)
--
cgit v1.2.3
From 3a1e846b8bdc5fa860ff7e56300ddc72702c3602 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sun, 15 Jul 2012 15:45:54 -0300
Subject: blender-spacenav-libre: updating package
---
artistic/blender-spacenav-libre/PKGBUILD | 23 +++++--------
artistic/blender-spacenav-libre/boost-1.50.patch | 42 ++++++++++++++++++++++++
2 files changed, 50 insertions(+), 15 deletions(-)
create mode 100644 artistic/blender-spacenav-libre/boost-1.50.patch
diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
index 2c11b4d30..f8fc7fd46 100644
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ b/artistic/blender-spacenav-libre/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=blender
pkgname=blender-spacenav-libre
pkgver=2.63a
-pkgrel=2.1
+pkgrel=3
epoch=4
pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,15 +18,19 @@ makedepends=('cmake' 'boost')
replaces=("${_pkgname}")
conflicts=("${_pkgname}" "${_pkgname}-libre")
provides=("${_pkgname}=${pkgver}" "${_pkgname}-libre=${pkgver}")
-options=(!strip)
install=${_pkgname}.install
-source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch)
-md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217')
+source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
+ ffmpeg-0.11.patch
+ boost-1.50.patch)
+md5sums=('31a60b3ce5466d965cb7e2648995e092'
+ '9e5649403e51654615d30b10bc460217'
+ '0bab80da07d980c47b8ce3cb998edaef')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
+ patch -Np1 < "${srcdir}"/boost-1.50.patch
sed -i "//d" intern/ffmpeg/ffmpeg_compat.h
sed -i "//d" source/blender/blenkernel/intern/writeffmpeg.c
@@ -60,10 +64,6 @@ build() {
make $MAKEFLAGS
-# cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \
-# "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/
-# cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi
-# chmod 755 bmake
make
}
@@ -71,11 +71,4 @@ package() {
cd "${srcdir}/${_pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install
python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-# install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \
-# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \
-# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
}
diff --git a/artistic/blender-spacenav-libre/boost-1.50.patch b/artistic/blender-spacenav-libre/boost-1.50.patch
new file mode 100644
index 000000000..fa698a3a6
--- /dev/null
+++ b/artistic/blender-spacenav-libre/boost-1.50.patch
@@ -0,0 +1,42 @@
+diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
+--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300
+@@ -26,8 +26,6 @@
+ #include "util_path.h"
+ #include "util_types.h"
+
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include
+ #include
+
+@@ -117,7 +115,7 @@
+ boost::filesystem::directory_iterator it(dir), it_end;
+
+ for(; it != it_end; it++) {
+- string filename = it->path().filename();
++ string filename = it->path().filename().string();
+
+ if(boost::starts_with(filename, name))
+ if(except.find(filename) == except.end())
+diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
+--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300
+@@ -26,8 +26,6 @@
+
+ #include
+
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include
+ #include
+
+@@ -60,7 +58,7 @@
+
+ string path_filename(const string& path)
+ {
+- return boost::filesystem::path(path).filename();
++ return boost::filesystem::path(path).filename().string();
+ }
+
+ string path_dirname(const string& path)
--
cgit v1.2.3
From 718af6e3e7f3d39d288257ebe37d0cb8a7c2338e Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sun, 15 Jul 2012 18:14:05 -0300
Subject: luxrender-libre: adding package to libre-testing repo
---
libre-testing/luxrender-libre/PKGBUILD | 54 +++++++++
libre-testing/luxrender-libre/boost_1.50_fix.diff | 131 ++++++++++++++++++++++
2 files changed, 185 insertions(+)
create mode 100644 libre-testing/luxrender-libre/PKGBUILD
create mode 100644 libre-testing/luxrender-libre/boost_1.50_fix.diff
diff --git a/libre-testing/luxrender-libre/PKGBUILD b/libre-testing/luxrender-libre/PKGBUILD
new file mode 100644
index 000000000..44df6f3c2
--- /dev/null
+++ b/libre-testing/luxrender-libre/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya
+# Maintainer (Parabola): Márcio Silva
+pkgname=luxrender-libre
+pkgver=1.0rc2
+_pkgver=008805644181
+pkgrel=2
+pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+ 'python: Python interface (pylux)')
+makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
+replaces=('luxrender')
+conflicts=('luxrender')
+provides=("luxrender=$pkgver")
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+ boost_1.50_fix.diff)
+md5sums=('1922ccce6f70e7d707b340e2415875cd'
+ '8c7774bb0c97aadd77d9e665d8fa4aab')
+
+build() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+
+ # fix for boost 1.50
+ # the boost::TIME_UTC has been renamed due to the conflict with C++11
+ patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true
+
+ export CXXFLAGS="$CXXFLAGS -lpthread"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLUXRAYS_DISABLE_OPENCL=ON \
+ -DPYTHON_CUSTOM=ON \
+ -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
+ -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
+ .
+ make
+}
+
+package() {
+ cd "$srcdir"/luxrender-lux-$_pkgver
+ make DESTDIR="$pkgdir" install
+
+ # fix library path on x86_64
+ [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+ #install pylux
+ install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/luxrender-libre/boost_1.50_fix.diff b/libre-testing/luxrender-libre/boost_1.50_fix.diff
new file mode 100644
index 000000000..c1aa0a8e2
--- /dev/null
+++ b/libre-testing/luxrender-libre/boost_1.50_fix.diff
@@ -0,0 +1,131 @@
+diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp
+--- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200
+@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte
+ int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth);
+ samplePerPass = xRealWidth * yRealHeight;
+
+- boost::xtime_get(&creationTime, boost::TIME_UTC);
++ boost::xtime_get(&creationTime, boost::TIME_UTC_);
+
+ //Queryable parameters
+ AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution);
+@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) {
+ if (haltTime > 0) {
+ // Check if we have met the enough rendering time condition
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ if (t.sec - creationTime.sec > haltTime)
+ enoughSamplesPerPixel = true;
+ }
+diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp
+--- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200
+@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen
+
+ boost::xtime photonShootingStartTime;
+ boost::xtime lastUpdateTime;
+- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC);
+- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC);
++ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_);
++ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_);
+ u_int nshot = 0;
+ while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) {
+ // Dade - print some progress information
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ if (currentTime.sec - lastUpdateTime.sec > 5) {
+ ss.str("");
+ ss << "Photon shooting progress: Direct[" << directPhotons.size();
+@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen
+ return;
+
+ boost::xtime photonShootingEndTime;
+- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC);
++ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_);
+ LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)";
+
+ if (computeRadianceMap) {
+@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen
+ for (u_int i = 0; i < radiancePhotons.size(); ++i) {
+ // Dade - print some progress info
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ if (currentTime.sec - lastUpdateTime.sec > 5) {
+ LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)";
+
+@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen
+
+
+ boost::xtime radianceComputeEndTime;
+- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC);
++ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_);
+ LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)";
+ }
+
+diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp
+--- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200
+@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+ // Dade - thread to update the film with data from servers
+
+ boost::xtime reft;
+- boost::xtime_get(&reft, boost::TIME_UTC);
++ boost::xtime_get(&reft, boost::TIME_UTC_);
+
+ while (filmUpdaterThread->signal == SIG_NONE) {
+ // Dade - check signal every 1 sec
+@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+ for(;;) {
+ // Dade - sleep for 1 sec
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.sec += 1;
+ boost::thread::sleep(xt);
+
+diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp
+--- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200
+@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres,
+ m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != "";
+
+ // init timer
+- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC);
++ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_);
+ lastWriteFLMTime = lastWriteImageTime;
+ }
+
+@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter
+ {
+ // Check write output interval
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval);
+ bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval);
+
+@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter
+ // WriteImage can take a very long time to be executed (i.e. by saving
+ // the film. It is better to refresh timestamps after the
+ // execution of WriteImage instead than before.
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+
+ if (timeToWriteImage)
+ lastWriteImageTime = currentTime;
+diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h
+--- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200
+@@ -126,7 +126,7 @@ public:
+ {
+ while (state == PAUSE && !boost::this_thread::interruption_requested()) {
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.sec += 1;
+ boost::thread::sleep(xt);
+ }
--
cgit v1.2.3
From 5e92143b58bc8552319151b87c531fa5a66005e5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 16 Jul 2012 18:37:52 -0300
Subject: d0_blind_id-git: add new package to pcr repo
---
pcr/d0_blind_id-git/PKGBUILD | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 pcr/d0_blind_id-git/PKGBUILD
diff --git a/pcr/d0_blind_id-git/PKGBUILD b/pcr/d0_blind_id-git/PKGBUILD
new file mode 100644
index 000000000..bfda13205
--- /dev/null
+++ b/pcr/d0_blind_id-git/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: MrBougo
+pkgname=d0_blind_id-git
+pkgver=20120716
+pkgrel=1
+pkgdesc="Cryptographic library for identification with Schnorr ID scheme and Blind RSA Signatures"
+arch=('i686' 'x86_64')
+url="http://github.com/divVerent/d0_blind_id"
+license=('BSD')
+depends=('gmp')
+makedepends=('git')
+conflicts=()
+options=('!libtool')
+
+_gitroot="git://git.xonotic.org/xonotic/d0_blind_id.git"
+_gitname="d0_blind_id"
+
+build() {
+ cd "$srcdir"
+ msg "Connecting to GIT server...."
+
+ if [ -d $_gitname ] ; then
+ cd $_gitname && git pull origin
+ msg "The local files are updated."
+ else
+ git clone $_gitroot $_gitname
+ fi
+
+ msg "GIT checkout done or server timeout"
+ msg "Starting make..."
+
+ rm -rf "$srcdir/$_gitname-build"
+ git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+ cd "$srcdir/$_gitname-build"
+
+ sh autogen.sh
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$_gitname-build"
+ make DESTDIR="$pkgdir/" install
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
--
cgit v1.2.3
From cd68c83ecc1faa97e0d2f3a86a058765cdd3eb13 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 17 Jul 2012 15:44:39 -0300
Subject: linux-libre-3.4.5-1: updating version
---
libre/linux-libre/PKGBUILD | 29 +++++++++++++++--------------
libre/linux-libre/linux-libre.install | 2 +-
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 08a32eae0..250ec13ef 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE
_basekernel=3.4
-_sublevel=4
+_sublevel=5
pkgver=${_basekernel}.${_sublevel}
_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
-pkgrel=3
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -34,18 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'i915-fix-ghost-tv-output.patch'
'3.4.4-fix-backlight-regression.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- 'e9bb311ab329555a61696b1a18df2d34'
- '669c3f9d5c6a2109bad8e511287826c3'
- '454231e14419e56a5281eb7bc6fde83e'
- 'e49ac236dfeef709f91a3d993ea7b62c'
- '2967cecc3af9f954ccc822fd63dca6ff'
- '8267264d9a8966e57fdacd1fa1fc65c4'
- '04b21c79df0a952c22d681dd4f4562df'
- '9d3c56a4b999c8bfbd4018089a62f662'
- '263725f20c0b9eb9c353040792d644e5'
- '80a46681386bb87813989faeb92bdd9a'
- '86910efeadb5d1e5d5416ff1a9dacb33')
+
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -385,3 +374,15 @@ package_linux-libre-docs() {
# remove a file already in linux package
rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
}
+md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
+ '0882e254b12df2c8d73df29de85223a7'
+ '669c3f9d5c6a2109bad8e511287826c3'
+ '454231e14419e56a5281eb7bc6fde83e'
+ 'e49ac236dfeef709f91a3d993ea7b62c'
+ '2967cecc3af9f954ccc822fd63dca6ff'
+ '8267264d9a8966e57fdacd1fa1fc65c4'
+ '04b21c79df0a952c22d681dd4f4562df'
+ '9d3c56a4b999c8bfbd4018089a62f662'
+ '263725f20c0b9eb9c353040792d644e5'
+ '80a46681386bb87813989faeb92bdd9a'
+ '86910efeadb5d1e5d5416ff1a9dacb33')
\ No newline at end of file
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 44850230f..7d7e7a1db 100644
--- 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.4.4-3-LIBRE
+KERNEL_VERSION=3.4.5-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 0f30930e8efdf56b42d1418b5b14ae44afd4a38e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 17 Jul 2012 15:49:58 -0300
Subject: linux-libre-3.4.5-1: adding a new line at the end on PKGBUILD file
---
libre/linux-libre/PKGBUILD | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 250ec13ef..59ea3ba2c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -385,4 +385,5 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'80a46681386bb87813989faeb92bdd9a'
- '86910efeadb5d1e5d5416ff1a9dacb33')
\ No newline at end of file
+ '86910efeadb5d1e5d5416ff1a9dacb33')
+
--
cgit v1.2.3
From 7d8a07367c221dc4f04f0fa4735c82b95842f4ff Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 17 Jul 2012 16:10:57 -0300
Subject: linux-libre-3.4.5-1: coming back md5sums to the original place due
that contains mips patch and variables to enable it on PKGBUILD
---
libre/linux-libre/PKGBUILD | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 59ea3ba2c..e3116046b 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -34,6 +34,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'i915-fix-ghost-tv-output.patch'
'3.4.4-fix-backlight-regression.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
+ '0882e254b12df2c8d73df29de85223a7'
+ '669c3f9d5c6a2109bad8e511287826c3'
+ '454231e14419e56a5281eb7bc6fde83e'
+ 'e49ac236dfeef709f91a3d993ea7b62c'
+ '2967cecc3af9f954ccc822fd63dca6ff'
+ '8267264d9a8966e57fdacd1fa1fc65c4'
+ '04b21c79df0a952c22d681dd4f4562df'
+ '9d3c56a4b999c8bfbd4018089a62f662'
+ '263725f20c0b9eb9c353040792d644e5'
+ '80a46681386bb87813989faeb92bdd9a'
+ '86910efeadb5d1e5d5416ff1a9dacb33')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
@@ -374,16 +386,3 @@ package_linux-libre-docs() {
# remove a file already in linux package
rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
}
-md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- '0882e254b12df2c8d73df29de85223a7'
- '669c3f9d5c6a2109bad8e511287826c3'
- '454231e14419e56a5281eb7bc6fde83e'
- 'e49ac236dfeef709f91a3d993ea7b62c'
- '2967cecc3af9f954ccc822fd63dca6ff'
- '8267264d9a8966e57fdacd1fa1fc65c4'
- '04b21c79df0a952c22d681dd4f4562df'
- '9d3c56a4b999c8bfbd4018089a62f662'
- '263725f20c0b9eb9c353040792d644e5'
- '80a46681386bb87813989faeb92bdd9a'
- '86910efeadb5d1e5d5416ff1a9dacb33')
-
--
cgit v1.2.3
From 120fb2912d957d87aeaa59665a70f35a079484fd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 17 Jul 2012 16:13:52 -0300
Subject: linux-libre-3.4.5-1: deleting blank spaces
---
libre/linux-libre/PKGBUILD | 1 -
1 file changed, 1 deletion(-)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index e3116046b..d36ba4da2 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -46,7 +46,6 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'263725f20c0b9eb9c353040792d644e5'
'80a46681386bb87813989faeb92bdd9a'
'86910efeadb5d1e5d5416ff1a9dacb33')
-
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
--
cgit v1.2.3
From 661bd5e9553921c40bbdb66fc29d10dc12a271a9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 17 Jul 2012 17:10:13 -0300
Subject: linux-libre-lts-3.0.37-1: updating version
---
libre/linux-libre-lts/PKGBUILD | 6 +++---
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 17651ce1e..9793f599e 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,10 +9,10 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-LTS
_basekernel=3.0
-_sublevel=36
+_sublevel=37
pkgver=${_basekernel}.${_sublevel}
_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver
-pkgrel=2
+pkgrel=1
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
'ext4-options.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '150413437fe54d4822e9e43189e37319'
+ '5fbdf641fc8962f875d1e9e8ce8f2969'
'9cfcf3807201ce44aa720571232a10ce'
'8bb5c5aa217202c3ac3798ba7798e07d'
'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 8a688091d..12b654f19 100644
--- 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.36-2-LIBRE-LTS
+KERNEL_VERSION=3.0.37-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 561d5f2c9502a8a8f13a20f8d0fa5498b20cc357 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Tue, 17 Jul 2012 17:12:48 -0300
Subject: xonotic-git: add new package to pcr repo
---
pcr/xonotic-git/PKGBUILD | 197 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 197 insertions(+)
create mode 100644 pcr/xonotic-git/PKGBUILD
diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD
new file mode 100644
index 000000000..2a032cd4a
--- /dev/null
+++ b/pcr/xonotic-git/PKGBUILD
@@ -0,0 +1,197 @@
+# Maintainer: MrBougo
+# Contributor: wido
+# Contributor: Alexander Suhoverhov
+
+pkgname=xonotic-git
+pkgver=20120718
+pkgrel=1
+pkgdesc="A free, fast-paced crossplatform first-person shooter"
+arch=('i686' 'x86_64')
+url="http://xonotic.org"
+license=('GPL')
+depends=(
+ 'd0_blind_id-git'
+ 'libxpm'
+ 'libjpeg>=8'
+ 'libpng>=1.4.0'
+ 'libmodplug'
+ 'libvorbis'
+ 'libxxf86dga'
+ 'libxxf86vm'
+ 'alsa-lib'
+ 'sdl'
+ 'curl'
+)
+makedepends=('git' 'p7zip' 'zip' 'unzip' 'vorbis-tools' 'sdl' 'mesa' 'imagemagick')
+optdepends=(
+ 'libtheora: recording in ogv'
+ #'d0_blind_id-git: crypto libraries for player authentification'
+)
+provides=('xonotic' 'xonotic-data')
+conflicts=('xonotic' 'xonotic-data')
+
+_gitroot="git://git.xonotic.org/xonotic/xonotic.git"
+_gitname="xonotic"
+_releasename="git-AUR"
+_compression=5
+
+# the jpeg and ogg variables can be modified, the function may also be skipped for raw data
+# the values here are also used in the official -low builds
+_compress() {
+ find $1 -type f -print0 |
+ git_src_repo=$2 \
+ CACHEDIR="$srcdir"/datacache \
+ do_jpeg=true \
+ jpeg_qual_rgb=80 \
+ jpeg_qual_a=97 \
+ do_dds=false \
+ do_ogg=true \
+ ogg_qual=1 \
+ del_src=true \
+ xargs -0 "$srcdir"/$_gitname/misc/tools/cached-converter.sh
+}
+
+_git_extract() {
+ _from=$1
+ _to=$2
+ shift 2
+ { cd "$_from"; git archive --format=tar HEAD -- "$@"; } \
+ | {
+ cd "$_to"
+ tar xvf -
+ }
+}
+
+# 7z compresses nicely but can't deal with flags and symlinks
+_mkzip() {
+ _archive=$1
+ shift
+ _ziplist=`mktemp`
+ find "$@" -xtype f \( -executable -or -type l \) -print > "$_ziplist"
+ 7za a -tzip -mx=$_compression -x@"$_ziplist" "$_archive" "$@" || true
+ zip -$_compression -y -@<"$_ziplist" "$_archive" || true
+ rm -f "$_ziplist"
+}
+
+#credit goes to omgwizard for the shallow clone idea
+_update() {
+ cd "$srcdir"/$_gitname
+ sed 's/git clone/git clone --depth 1/g' --in-place=".PKGBUILD_BU" ./all
+ ./all update
+ mv -f ./all.PKGBUILD_BU ./all
+ cd "$OLDPWD"
+}
+
+build() {
+ cd "$srcdir"
+ msg "Connecting to GIT server...."
+
+ if [ -d $_gitname ] ; then
+ #future updates might introduce new subrepos, use shallow cloning anyway
+ cd $_gitname && _update
+ msg "The local files are updated."
+ else
+ git clone --depth 1 $_gitroot $_gitname
+ cd $_gitname
+ touch d0_blind_id.no
+ touch netradiant.no
+ _update
+ fi
+
+ msg "GIT checkout done or server timeout"
+
+ # BUILD
+
+ msg "Copying sources..."
+
+ rm -rf "$srcdir"/src
+ mkdir -p "$srcdir"/src/darkplaces "$srcdir"/src/fteqcc
+ _git_extract "$srcdir"/$_gitname/fteqcc "$srcdir"/src/fteqcc
+ _git_extract "$srcdir"/$_gitname/darkplaces "$srcdir"/src/darkplaces
+ _git_extract "$srcdir"/$_gitname/data/xonotic-data.pk3dir "$srcdir"/src \
+ qcsrc Makefile check-cvars.sh
+
+ msg "Fetching map binaries..."
+ cd "$srcdir"/$_gitname
+ ./all update-maps
+
+ msg "Compiling the engine..."
+ cd "$srcdir"/src/darkplaces
+ CC="${CC:-gcc} -g -DSUPPORTIPV6" make release
+
+ msg "Compiling fteqcc..."
+ cd "$srcdir"/src/fteqcc
+ make all
+
+ msg "Compiling the game code"
+ cd "$srcdir"/src/
+ make FTEQCC="../../fteqcc/fteqcc.bin" # relative to the directories containing progs.src
+
+ msg "Building data pk3's..."
+ rm -rf "$srcdir"/temp # just in case it was interrupted previously
+ mkdir "$srcdir"/temp
+ cd "$srcdir"/temp
+ for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do
+ mkdir $_subrepo
+ _git_extract "$srcdir"/$_gitname/data/$_subrepo.pk3dir "$srcdir"/temp/$_subrepo
+ done
+
+ rm -rf "$srcdir"/temp/xonotic-data/qcsrc
+ mv "$srcdir"/src/progs.dat "$srcdir"/src/csprogs.dat "$srcdir"/src/menu.dat "$srcdir"/temp/xonotic-data
+
+ cd "$srcdir"/temp/xonotic-maps
+ #2x40 question marks. That's as many as eight tens. And that's terrible.
+ for X in "$srcdir"/$_gitname/data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+ if [ -f "$X" ]; then
+ unzip "$X"
+ rm -f maps/*.log maps/*.irc maps/*.lin
+ fi
+ done
+
+ msg "Compressing data..."
+ cd "$srcdir"/temp/
+ # don't compress the font files
+ for _subrepo in xonotic-data xonotic-music xonotic-maps; do
+ _compress $_subrepo "$srcdir"/$_gitname/data/$_subrepo.pk3dir
+ done
+
+ msg "Packing data..."
+ for _subrepo in font-nimbussansl font-xolonium xonotic-data xonotic-music xonotic-maps; do
+ cd "$srcdir"/temp/$_subrepo
+ _mkzip "$srcdir"/$_subrepo.pk3 * # this wildcard excludes dot files
+ done
+
+ msg "Removing temporary files..."
+ rm -rf "$srcdir"/temp
+}
+
+package() {
+ msg "Installing..."
+ mkdir -p "$pkgdir"/opt/$pkgname/
+ _git_extract "$srcdir"/$_gitname/ "$pkgdir"/opt/$pkgname \
+ Docs \
+ server \
+ xonotic-linux-glx.sh xonotic-linux-sdl.sh \
+ key_0.d0pk
+ chmod 755 "$pkgdir"/opt/$pkgname/xonotic-linux-glx.sh \
+ "$pkgdir"/opt/$pkgname/xonotic-linux-sdl.sh
+
+ # Binaries -- those names are needed by the launcher script
+ case "$CARCH" in
+ x86_64) _arch="linux64" ;;
+ *) _arch="linux32" ;;
+ esac
+ install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-glx
+ install -m755 "$srcdir"/src/darkplaces/darkplaces-glx "$pkgdir"/opt/$pkgname/xonotic-$_arch-sdl
+ install -m755 "$srcdir"/src/darkplaces/darkplaces-dedicated "$pkgdir"/opt/$pkgname/xonotic-$_arch-dedicated
+
+ mkdir -p "$pkgdir"/opt/$pkgname/data/
+ mv -f "$srcdir"/*.pk3 "$pkgdir"/opt/$pkgname/data || true # those files are too big to be copied
+
+ # Launch scripts
+ mkdir -p "$pkgdir"/usr/bin
+ mv -f "$pkgdir"/opt/$pkgname/server/server_linux.sh "$pkgdir"/opt/$pkgname/
+ ln -sf /opt/$pkgname/xonotic-linux-glx.sh "$pkgdir"/usr/bin/xonotic-glx
+ ln -sf /opt/$pkgname/xonotic-linux-sdl.sh "$pkgdir"/usr/bin/xonotic-sdl
+ ln -sf /opt/$pkgname/server_linux.sh "$pkgdir"/usr/bin/xonotic-dedicated
+}
--
cgit v1.2.3
From 98e9dda466e303d77d6f58932cf60c940b5e533c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 18 Jul 2012 01:55:00 -0300
Subject: iceweasel-libre-14.0.1.1-1: updating version
---
...Make-the-Reset-Firefox-feature-more-gener.patch | 204 ++++++++++++---------
libre/iceweasel-libre/PKGBUILD | 12 +-
libre/iceweasel-libre/libre.patch | 14 +-
3 files changed, 133 insertions(+), 97 deletions(-)
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 3e7149308..4a0507271 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -1,17 +1,21 @@
+From: Mike Hommey
+Date: Tue, 5 Jun 2012 08:57:06 +0200
+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
+
diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index ffb0c34..442a5ff 100644
+index 0e8ccf5..fa46c08 100644
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
-@@ -314,7 +314,7 @@ var MigrationWizard = {
+@@ -249,7 +249,7 @@ var MigrationWizard = {
}
- var bundle = document.getElementById("brandBundle");
+ var brandBundle = document.getElementById("brandBundle");
- // These strings don't exist when not using official branding. If that's
+ // These strings may not exist when not using official branding. If that's
// the case, just skip this page.
try {
- var pageTitle = bundle.getString("homePageMigrationPageTitle");
-@@ -346,8 +346,8 @@ var MigrationWizard = {
+ var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
+@@ -281,8 +281,8 @@ var MigrationWizard = {
case "chrome":
source = "sourceNameChrome";
break;
@@ -22,75 +26,107 @@ index ffb0c34..442a5ff 100644
break;
}
-@@ -357,8 +357,13 @@ var MigrationWizard = {
+@@ -292,7 +292,12 @@ var MigrationWizard = {
var oldHomePageURL = this._migrator.sourceHomePageURL;
if (oldHomePageURL && source) {
-- var bundle2 = document.getElementById("bundle");
-- var appName = bundle2.getString(source);
+- var appName = MigrationUtils.getLocalizedString(source);
+ var appName;
+ if (source == "brand") {
-+ appName = bundle.GetStringFromName("brandFullName");
++ appName = brandBundle.GetStringFromName("brandFullName");
+ } else {
-+ var bundle2 = document.getElementById("bundle");
-+ appName = bundle2.getString(source);
++ appName = MigrationUtils.getLocalizedString(source);
+ }
- var oldHomePageLabel = bundle.getFormattedString("homePageImport",
- [appName]);
+ var oldHomePageLabel =
+ brandBundle.getFormattedString("homePageImport", [appName]);
var oldHomePage = document.getElementById("oldHomePage");
diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index f8653b1..f3ac62a 100644
+index 4bcc1d9..c4db956 100644
--- a/browser/components/migration/content/migration.xul
+++ b/browser/components/migration/content/migration.xul
-@@ -76,7 +76,7 @@
- #endif
- #endif
+@@ -74,7 +74,7 @@
+ #elifdef XP_UNIX
+ #endif
-
+
-
+
diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index f49e481..e490ddf 100644
+index 527771f..782b38f 100644
--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,4 +3,4 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+ component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
+ component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js
diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 7b4a6e4..add5bc4 100644
+index 8f14f49..8dc175d 100644
--- a/browser/components/migration/src/FirefoxProfileMigrator.js
+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {
- ]),
+@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
- classDescription: "Firefox Profile Migrator",
-- contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",
-+ contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",
- classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")
- };
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index ea66675..fe4df10 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {
- params);
+ FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
+-FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
++FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
+ FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
+
+ const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
+index 9460e6d..8db6827 100644
+--- a/browser/components/migration/src/MigrationUtils.jsm
++++ b/browser/components/migration/src/MigrationUtils.jsm
+@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+ * @see nsIStringBundle
+ */
+ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
+- const OVERRIDES = {
+- "4_firefox": "4_firefox_history_and_bookmarks"
+- };
+- aKey = OVERRIDES[aKey] || aKey;
+-
+ if (aReplacements === undefined)
+ return getMigrationBundle().GetStringFromName(aKey);
+ return getMigrationBundle().formatStringFromName(
+@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
},
-+ canMigrate: function PM__canMigrate(aMigratorKey) {
+ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ canMigrate:
++ function MU_canMigrate(aMigratorKey) {
+ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
+ },
+
- _toCString: function PM__toCString(aStr) {
- let cstr = Cc["@mozilla.org/supports-cstring;1"].
- createInstance(Ci.nsISupportsCString);
++ /**
+ * Cleans up references to migrators and nsIProfileInstance instances.
+ */
+ finishMigration: function MU_finishMigration() {
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index 744f117..59e5a4c 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -12,6 +12,7 @@ function ProfileMigrator() {
+
+ ProfileMigrator.prototype = {
+ migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
++ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
+ QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
+ classDescription: "Profile Migrator",
+ contractID: "@mozilla.org/toolkit/profile-migrator;1",
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 86e9d0b..8df7864 100644
+index 0b4b776..ce26fbd 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
@@ -13,8 +13,6 @@
@@ -99,11 +135,11 @@ index 86e9d0b..8df7864 100644
-
-
-
-
+
+
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 495ed78..0272654 100644
+index f522a66..be26460 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
@@ -4,7 +4,6 @@ profileName_format=%S %S
@@ -113,8 +149,8 @@ index 495ed78..0272654 100644
-sourceNameFirefox=Mozilla Firefox
importedBookmarksFolder=From %S
- importedSearchURLsFolder=Keyword Searches (From %S)
-@@ -21,27 +20,27 @@ importedSafariBookmarks=From Safari
+
+@@ -18,29 +17,29 @@ importedSafariReadingList=Reading List (From Safari)
2_ie=Cookies
2_safari=Cookies
2_chrome=Cookies
@@ -124,8 +160,8 @@ index 495ed78..0272654 100644
4_ie=Browsing History
4_safari=Browsing History
4_chrome=Browsing History
--4_firefox=Browsing History
-+4_self=Browsing History
+-4_firefox_history_and_bookmarks=Browsing History and Bookmarks
++4_self=Browsing History and Bookmarks
8_ie=Saved Form History
8_safari=Saved Form History
@@ -147,11 +183,14 @@ index 495ed78..0272654 100644
64_ie=Other Data
64_safari=Other Data
+ 64_chrome=Other Data
+-64_firefox=Bookmarks Backups
++64_self=Bookmarks Backups
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
-index c86d80c..ff1ccfe 100644
+index 957d4d8..1af3629 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
-@@ -608,13 +608,13 @@ function populateResetBox() {
+@@ -616,13 +616,13 @@ function populateResetBox() {
.getService(Ci.nsIToolkitProfileService);
let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
@@ -169,46 +208,43 @@ index c86d80c..ff1ccfe 100644
return;
document.getElementById("reset-box").style.visibility = "visible";
} catch (e) {
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 6f0d2d6..da7342b 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -38,7 +38,7 @@ toolkit.jar:
- + content/global/mozilla.xhtml (mozilla.xhtml)
- *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
- content/global/resetProfile.css (resetProfile.css)
--* content/global/resetProfile.js (resetProfile.js)
-+ content/global/resetProfile.js (resetProfile.js)
- * content/global/resetProfile.xul (resetProfile.xul)
- * content/global/treeUtils.js (treeUtils.js)
- *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index 975a9ed..d8e46b1 100644
+index 84de6cd..3126da6 100644
--- a/toolkit/content/resetProfile.js
+++ b/toolkit/content/resetProfile.js
-@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+@@ -6,6 +6,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
// based on onImportItemsPageShow from migration.js
function onResetProfileLoad() {
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
- const MAX_MIGRATED_TYPES = 16;
++<<<<<<< HEAD
+ #expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+ #expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+
+@@ -16,16 +17,22 @@ function onResetProfileLoad() {
+ "8_" + MOZ_APP_NAME, // Form History
+ "2_" + MOZ_APP_NAME, // Cookies
+ ];
++=======
++ Components.utils.import("resource:///modules/MigrationUtils.jsm");
++ const MAX_MIGRATED_TYPES = 16;
++>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
var migratedItems = document.getElementById("migratedItems");
- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
-+ var bundle = Services.strings.createBundle("chrome://browser" +
- "/locale/migration/migration.properties");
+- "/locale/migration/migration.properties");
- // Loop over possible data to migrate to give the user a list of what will be preserved. This
-@@ -21,7 +19,7 @@ function onResetProfileLoad() {
- var itemID = Math.pow(2, i);
+ // Loop over possible data to migrate to give the user a list of what will be preserved.
+ for (var itemStringName of MIGRATED_TYPES) {
try {
var checkbox = document.createElement("label");
-- checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));
-+ checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));
++<<<<<<< HEAD
+ checkbox.setAttribute("value", bundle.GetStringFromName(itemStringName));
++=======
++ checkbox.setAttribute("value", MigrationUtils.getLocalizedString(itemID + "_self"));
++>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
migratedItems.appendChild(checkbox);
} catch (x) {
- // Catch exceptions when the string for a data type doesn't exist because it's not migrated
+ // Catch exceptions when the string for a data type doesn't exist.
diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
index e941336..5b264af 100644
--- a/toolkit/profile/nsIProfileMigrator.idl
@@ -238,15 +274,15 @@ index e941336..5b264af 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 32eef5c..dbe1580 100644
+index d2db0e2..45a4b0d 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
- if (gDoProfileReset) {
- // Automatically migrate from the current application if we just
- // reset the profile.
-- aKey = MOZ_APP_NAME;
-+ aKey = "self";
- pm->Migrate(&dirProvider, aKey);
- // Set the new profile as the default after migration.
- rv = SetCurrentProfileAsDefault(profileSvc, profD);
+@@ -3642,7 +3642,7 @@ XREMain::XRE_mainRun()
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ pm->Migrate(&mDirProvider, aKey);
+ // Set the new profile as the default after migration.
+ rv = SetCurrentProfileAsDefault(mProfileSvc, mProfD);
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index a54e9d948..4b8d75833 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=false
# We're getting this from Debian Sid
_debname=iceweasel
-_debver=13.0.1
-_debrel=2
+_debver=14.0.1
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -51,15 +51,15 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
iceweasel-install-dir.patch
vendor.js
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('9eb7668e4a5b5be63ccf4d43c212d011'
- 'c5eb6357cecd0d83e75ef37a9dcf3683'
+md5sums=('8e4f3987d37c8e73b168948d0771b872'
+ 'fca50bc0a4327c1389349be7939c14bd'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '54bd934ac23839601c7d23a60fbefe6a'
+ 'e4b12f400102a0d1be9cbefdeed3f617'
'e529742c0a425648087bc3ce537fe4c5'
'0d053487907de4376d67d8f499c5502b'
- 'efda47526ba76ef926b236bf2cda2456')
+ '88350bc611361a1ff635f5c960c6d6ee')
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname=$pkgver")
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 39ea86c05..e791a3853 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -63,7 +63,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.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-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties
+diff -urN iceweasel-14.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0/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 @@
@@ -94,7 +94,7 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
# to be searched and the user's search query. Place them in the appropriate location
# for your locale's URL but do not translate them.
--browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
+-browser.search.siteSearchURL=https://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}
# increment this number when anything gets changed in the list below. This will
@@ -163,7 +163,7 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
+
-diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul/app/mobile.js
+diff -urN iceweasel-14.0.orig/mobile/xul/app/mobile.js iceweasel-14.0/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 @@
@@ -190,7 +190,7 @@ diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul
pref("dom.disable_window_open_dialog_feature", true);
pref("keyword.enabled", true);
--pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
+-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);
@@ -219,7 +219,7 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
+browser.contentHandlers.types.1.uri=about:blank
# 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://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
@@ -242,14 +242,14 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
+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-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js
+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", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
+-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");
--
cgit v1.2.3
From 776798e6dc808ee5769b2147a61c5a58d059f15e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 18 Jul 2012 02:57:36 -0300
Subject: iceweasel-libre-14.0.1.1-1: updating libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 493 ++++++++++++++++++++++++++++++++------
2 files changed, 427 insertions(+), 68 deletions(-)
mode change 100644 => 100755 libre/iceweasel-libre/libre.patch
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 4b8d75833..908a8415a 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -56,7 +56,7 @@ md5sums=('8e4f3987d37c8e73b168948d0771b872'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'e4b12f400102a0d1be9cbefdeed3f617'
+ 'c0010ef28ca4ff351ac0ee21a7a43853'
'e529742c0a425648087bc3ce537fe4c5'
'0d053487907de4376d67d8f499c5502b'
'88350bc611361a1ff635f5c960c6d6ee')
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
old mode 100644
new mode 100755
index e791a3853..ab5b8ebdd
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -63,10 +63,10 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.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.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0/browser/locales/en-US/chrome/browser-region/region.properties
+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 @@
+@@ -1,23 +1,21 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -85,10 +85,8 @@ diff -urN iceweasel-14.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.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.0.title=
++#browser.contentHandlers.types.0.uri=about:blank
# URL for site-specific search engines
# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
@@ -99,24 +97,22 @@ diff -urN iceweasel-14.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
-@@ -27,19 +27,19 @@
+@@ -27,19 +25,17 @@
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
++#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
++#gecko.handlerService.schemes.mailto.0.name=
++#gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
@@ -131,7 +127,7 @@ diff -urN iceweasel-14.0.orig/browser/locales/en-US/chrome/browser-region/region
+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
++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
@@ -143,7 +143,7 @@
@@ -152,6 +148,39 @@ 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
+@@ -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", "");
+@@ -252,7 +252,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&gfns=1&q=");
++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
@@ -163,10 +192,10 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
+
-diff -urN iceweasel-14.0.orig/mobile/xul/app/mobile.js iceweasel-14.0/mobile/xul/app/mobile.js
+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 @@
+@@ -221,13 +221,13 @@
/* preferences for the Get Add-ons pane */
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
@@ -183,10 +212,11 @@ diff -urN iceweasel-14.0.orig/mobile/xul/app/mobile.js iceweasel-14.0/mobile/xul
+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", "");
-@@ -247,7 +246,7 @@
+@@ -247,7 +247,7 @@
pref("dom.disable_window_open_dialog_feature", true);
pref("keyword.enabled", true);
@@ -198,7 +228,7 @@ diff -urN iceweasel-14.0.orig/mobile/xul/app/mobile.js iceweasel-14.0/mobile/xul
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 @@
+@@ -1,18 +1,16 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -213,10 +243,8 @@ diff -urN iceweasel-13.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.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.0.title=
++#browser.contentHandlers.types.0.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=
@@ -224,25 +252,24 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
# 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 @@
+@@ -22,11 +20,9 @@
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
++#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
++#gecko.handlerService.schemes.mailto.0.name=
++#gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
+
+diff -urN iceweasel-14.0.1.orig/modules/libpref/src/init/all.js iceweasel-14.0.1/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 @@
@@ -267,14 +294,14 @@ diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.
-pluginupdates_url=http://www.mozilla.com/plugincheck/
-plugindoc_label=plugindoc.mozdev.org
-plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=gnuzilla.gnu.org
-+more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html
-+pluginupdates_label=gnuzilla.gnu.org
-+pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html
-+plugindoc_label=gnuzilla.gnu.org
-+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
-
-diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in
++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 @@
@@ -282,7 +309,7 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in
@bookmarks_toolbarfolder_description@
-
- @getting_started@
-+
- Parabola GNU/Linux-libre
++
- Parabola GNU/Linux-libre
-
@firefox_heading@
+ Parabola GNU/Linux-libre
@@ -291,31 +318,29 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in
- @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
++ 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
++
- 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 = {
+diff -Naur iceweasel-14.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-14.0.1/browser/base/content/abouthome/aboutHome.js
+--- mozilla-build.orig/browser/base/content/abouthome/aboutHome.js 2012-07-12 14:27:37.000000000 -0300
++++ mozilla-build/browser/base/content/abouthome/aboutHome.js 2012-07-17 23:19:05.593724417 -0300
+@@ -41,99 +41,348 @@
+ // 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," +
++ "Duck Duck Go (Lite)": {
+ image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -375,11 +400,159 @@ diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js icewea
- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
- , params: "source=hp&channel=np"
-- }
--
++ "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" +
++ "RU5ErkJggg%3D%3D"
+ }
+
-, "Яндекс":
- {
-- image: "data:image/png;base64," +
++ "Seeks Search": {
+ image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
- "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
@@ -406,13 +579,199 @@ diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js icewea
- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
-- }
--};
--
++ "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%3D%3D"
+ }
++
++ "YaCy": {
++ }
++
+ };
+
// 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 @@
+@@ -143,7 +392,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"
--
cgit v1.2.3
From e5d3369b93f2ee78bd5e66b1e65d4ad0d9e80d90 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 18 Jul 2012 03:22:42 -0300
Subject: iceweasel-libre-14.0.1.1-1: fixing some parts on libre.patch
---
libre/iceweasel-libre/PKGBUILD | 2 +-
libre/iceweasel-libre/libre.patch | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 908a8415a..974ad140c 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -56,7 +56,7 @@ md5sums=('8e4f3987d37c8e73b168948d0771b872'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'c0010ef28ca4ff351ac0ee21a7a43853'
+ 'ed909b5b61f36a81a71989b7daeb2545'
'e529742c0a425648087bc3ce537fe4c5'
'0d053487907de4376d67d8f499c5502b'
'88350bc611361a1ff635f5c960c6d6ee')
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index ab5b8ebdd..b136cb4ad 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -172,11 +172,11 @@ 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", "");
-@@ -252,7 +252,7 @@
- pref("dom.disable_window_open_dialog_feature", true);
+@@ -259,7 +259,7 @@
+ pref("dom.disable_window_find", true);
pref("keyword.enabled", true);
--pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
+-pref("keyword.URL", "");
+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
pref("accessibility.typeaheadfind", false);
--
cgit v1.2.3
From b6b429cff8c94bb9110d8ae261776065b6870ee2 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Wed, 18 Jul 2012 04:16:36 -0300
Subject: icecat: updating package
---
libre/icecat/PKGBUILD | 11 +-
libre/icecat/libre.patch | 807 ++++++++++++++++++++++++++++++++++-------------
2 files changed, 594 insertions(+), 224 deletions(-)
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index ebd5a1350..9347d3785 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,7 +16,7 @@
_pgo=false
_pkgname=icecat
-pkgver=12.0
+pkgver=13.0.1
pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
@@ -66,7 +66,7 @@ fi
url="http://www.gnu.org/software/gnuzilla/"
install=icecat.install
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
+source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/${pkgname}-${pkgver}.tar.gz
mozconfig
mozconfig.pgo
xulrunner-copy-stub.patch
@@ -75,19 +75,17 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
icecat-safe.desktop
icecat-install-dir.patch
vendor.js
- gcc47.patch
cairo.patch)
-md5sums=('04a5504c5c473354bcd20f7116360fee'
+md5sums=('ba249f3e889089dc64615333dd324791'
'3117865902d1a20ab61d75707be9888e'
'ac29b01c189f20abae2f3eef1618ffc0'
'683c4540ab84c220937feb7d1a1450ee'
- 'd403b0ae09306fef3870132e7fd33ed2'
+ 'bae9a078edc6797f9de9ab68e5f4827e'
'e81ad01dbc16ba28bf92ba4b7c309ca7'
'd93fe402b87cd000a869e1fd6badc6c9'
'268e65c8fcae6152e156c09760a18dfd'
'0d053487907de4376d67d8f499c5502b'
- '79e471e0bd03b1d4e84fd3a6776bd619'
'721c59ffc14f14cb0d3a90b7e84df70e')
if [ "$_pkgname" != "$pkgname" ]; then
@@ -104,7 +102,6 @@ build() {
patch -Np1 -i "$srcdir/icecat-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/gcc47.patch"
patch -Np1 -i "$srcdir/cairo.patch"
cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index ff7f6f4ed..b7bb7cd50 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,8 +1,7 @@
-diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js
---- mozilla-build.orig/browser/app/profile/firefox.js 2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-build/browser/app/profile/firefox.js 2012-06-05 19:53:08.847012282 -0300
-@@ -64,10 +64,11 @@
- // Preferences for AMO integration
+diff -Naur icecat-13.0.1/browser/app/profile/firefox.js icecat-13.0.1-libre/browser/app/profile/firefox.js
+--- icecat-13.0.1/browser/app/profile/firefox.js 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/browser/app/profile/firefox.js 2012-07-17 21:35:32.600229972 -0300
+@@ -65,6 +65,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");
@@ -10,10 +9,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow
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);
-@@ -81,7 +82,7 @@
+@@ -82,7 +83,7 @@
pref("extensions.update.autoUpdateDefault", true);
// Dictionary download preference
@@ -22,19 +18,468 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow
// The minimum delay in seconds for the timer to fire.
// default=2 minutes
-@@ -242,7 +243,7 @@
+@@ -247,7 +248,7 @@
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
pref("browser.startup.page", 1);
-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
+pref("browser.startup.homepage", "about:home");
-
+
// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-15 02:17:00.978636665 -0300
-@@ -1,28 +1,28 @@
+diff -Naur icecat-13.0.1/browser/base/content/abouthome/aboutHome.js icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js
+--- icecat-13.0.1/browser/base/content/abouthome/aboutHome.js 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js 2012-07-17 23:19:05.593724417 -0300
+@@ -41,99 +41,348 @@
+ // If a definition requires additional params, check that the final search url
+ // is handled correctly by the engine.
+ const SEARCH_ENGINES = {
+- "Google": {
++ "Duck Duck Go (Lite)": {
+ image: "data:image/png;base64," +
+- "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"
+- , params: "source=hp&channel=np"
++ "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" +
++ "RU5ErkJggg%3D%3D"
+ }
+
+-, "Яндекс":
+- {
++ "Seeks Search": {
+ image: "data:image/png;base64," +
+- "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%3D%3D"
+ }
++
++ "YaCy": {
++ }
++
+ };
+
+ // The process of adding a new default snippet involves:
+@@ -143,7 +392,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 -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties
+--- icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-17 22:01:56.786224684 -0300
+@@ -1,28 +1,24 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -55,12 +500,8 @@ diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region
-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.contentHandlers.types.0.title=
++#browser.contentHandlers.types.0.uri=about:blank
# Keyword URL (for location bar searches)
-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
@@ -75,9 +516,59 @@ diff -urN iceweasel-13.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
-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
+@@ -30,3 +26,19 @@
+ # 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
++
++# 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 -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in
+--- icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in 2012-07-17 23:34:22.488558721 -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 -Naur icecat-13.0.1/build/pgo/blueprint/elements.html icecat-13.0.1-libre/build/pgo/blueprint/elements.html
+--- icecat-13.0.1/build/pgo/blueprint/elements.html 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/build/pgo/blueprint/elements.html 2012-07-17 21:44:48.052812473 -0300
@@ -143,7 +143,7 @@
@@ -87,9 +578,9 @@ 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
+diff -Naur icecat-13.0.1/dom/ipc/test.xul icecat-13.0.1-libre/dom/ipc/test.xul
+--- icecat-13.0.1/dom/ipc/test.xul 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/dom/ipc/test.xul 2012-07-17 21:48:08.242020288 -0300
@@ -294,6 +294,6 @@
oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
@@ -98,9 +589,9 @@ diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+
-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
+diff -Naur icecat-13.0.1/layout/ipc/test-ipcbrowser.xul icecat-13.0.1-libre/layout/ipc/test-ipcbrowser.xul
+--- icecat-13.0.1/layout/ipc/test-ipcbrowser.xul 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/layout/ipc/test-ipcbrowser.xul 2012-07-17 21:48:50.526879514 -0300
@@ -69,6 +69,6 @@
label="setViewportScale"/>
@@ -109,20 +600,20 @@ diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layo
+
-diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/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
-@@ -220,13 +220,13 @@
+diff -Naur icecat-13.0.1/mobile/android/app/mobile.js icecat-13.0.1-libre/mobile/android/app/mobile.js
+--- icecat-13.0.1/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/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%/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%");
--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", "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");
@@ -133,7 +624,7 @@ diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
-@@ -243,7 +243,7 @@
+@@ -252,7 +252,7 @@
pref("dom.disable_window_open_dialog_feature", true);
pref("keyword.enabled", true);
@@ -142,10 +633,10 @@ diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul
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 -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties
+--- icecat-13.0.1/mobile/locales/en-US/chrome/region.properties 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties 2012-07-17 22:01:03.952816711 -0300
+@@ -1,18 +1,16 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -160,38 +651,67 @@ diff -urN iceweasel-13.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.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.0.title=
++#browser.contentHandlers.types.0.uri=about:blank
# 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=site%3A{moz:domain}+{searchTerms}
++keyword.URL=https://duckduckgo.com/lite/?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
-@@ -22,11 +22,11 @@
+@@ -22,11 +20,9 @@
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
++#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-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.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
++#gecko.handlerService.schemes.mailto.0.name=
++#gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
+diff -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul/app/mobile.js
+--- icecat-13.0.1/mobile/xul/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/mobile/xul/app/mobile.js 2012-07-17 22:08:34.513828987 -0300
+@@ -221,13 +221,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%/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");
++pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+
+ /* preference for the locale picker */
+ pref("extensions.getLocales.get.url", "");
+@@ -247,7 +247,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
+
+ pref("keyword.enabled", true);
+-pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
+
+ pref("accessibility.typeaheadfind", false);
+ pref("accessibility.typeaheadfind.timeout", 5000);
+diff -Naur icecat-13.0.1/modules/libpref/src/init/all.js icecat-13.0.1-libre/modules/libpref/src/init/all.js
+--- icecat-13.0.1/modules/libpref/src/init/all.js 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/modules/libpref/src/init/all.js 2012-07-17 22:16:45.176878991 -0300
@@ -47,7 +47,7 @@
// SYNTAX HINTS: dashes are delimiters. Use underscores instead.
// The first character after a period must be alphabetic.
@@ -201,9 +721,9 @@ diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.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
+diff -Naur icecat-13.0.1/toolkit/locales/en-US/chrome/global-region/region.properties icecat-13.0.1-libre/toolkit/locales/en-US/chrome/global-region/region.properties
+--- icecat-13.0.1/toolkit/locales/en-US/chrome/global-region/region.properties 2012-07-12 14:27:37.000000000 -0300
++++ icecat-13.0.1-libre/toolkit/locales/en-US/chrome/global-region/region.properties 2012-07-17 21:58:17.176492031 -0300
@@ -4,10 +4,10 @@
pluginStartupMessage=Starting Plugin for type
@@ -214,157 +734,10 @@ diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.
-pluginupdates_url=http://www.mozilla.com/plugincheck/
-plugindoc_label=plugindoc.mozdev.org
-plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=gnuzilla.gnu.org
-+more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html
-+pluginupdates_label=gnuzilla.gnu.org
-+pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html
-+plugindoc_label=gnuzilla.gnu.org
-+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
-
-diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/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.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/aboutHome.js 2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-release/browser/base/content/aboutHome.js 2012-06-13 18:07:51.217531774 -0300
-@@ -37,104 +37,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," +
-- "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"
-- , params: "source=hp&channel=np"
-- }
--
--, "Яндекс":
-- {
-- image: "data:image/png;base64," +
-- "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"
-- }
--};
--
- // The process of adding a new default snippet involves:
- // * add a new entity to aboutHome.dtd
- // * add a for it in aboutHome.xhtml
-@@ -142,7 +44,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"
- ];
++more_plugins_label=
++more_plugins_url=about:blank
++pluginupdates_label=
++pluginupdates_url=about:blank
++plugindoc_label=
++plugindoc_url=about:blank
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
--
cgit v1.2.3
From 7752d0d4fa32e4e0ebe8a1a0b64e87004e982e27 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 18 Jul 2012 04:49:09 -0300
Subject: iceweasel-libre-14.0.1.1-1: adding new patch to fix bugs
---
libre/iceweasel-libre/PKGBUILD | 3 +++
libre/iceweasel-libre/shared-libs.patch | 12 ++++++++++++
2 files changed, 15 insertions(+)
create mode 100644 libre/iceweasel-libre/shared-libs.patch
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 974ad140c..fff9a3a21 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -50,6 +50,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
libre.patch
iceweasel-install-dir.patch
vendor.js
+ shared-libs.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
md5sums=('8e4f3987d37c8e73b168948d0771b872'
'fca50bc0a4327c1389349be7939c14bd'
@@ -59,6 +60,7 @@ md5sums=('8e4f3987d37c8e73b168948d0771b872'
'ed909b5b61f36a81a71989b7daeb2545'
'e529742c0a425648087bc3ce537fe4c5'
'0d053487907de4376d67d8f499c5502b'
+ '52e52f840a49eb1d14be1c0065b03a93'
'88350bc611361a1ff635f5c960c6d6ee')
if [ "$_pkgname" != "$pkgname" ]; then
@@ -88,6 +90,7 @@ build() {
patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
patch -Np1 -i "$srcdir/libre.patch"
+ patch -Np1 -i "$srcdir/shared-libs.patch"
cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch
new file mode 100644
index 000000000..1f22b2b0d
--- /dev/null
+++ b/libre/iceweasel-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 0467ea83ceb888dfb2e45ae299f9145fa63ef7de Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Wed, 18 Jul 2012 17:47:18 -0300
Subject: lirc-libre-1:0.9.0-21: updating revision
---
libre/lirc-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 3b73a9f2f..c4d8b1e95 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=20
+pkgrel=21
epoch=1
_extramodules=extramodules-3.4-LIBRE
arch=('i686' 'x86_64' 'mips64el')
--
cgit v1.2.3
From 82c3904c23eb688590b66e190415cc0a91e5d9d8 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 00:40:59 -0300
Subject: iceweasel-libre-14.0.1.1-2: fixing libre.patch due about:home errors
---
libre/iceweasel-libre/PKGBUILD | 4 +-
libre/iceweasel-libre/libre.patch | 424 +++++---------------------------------
2 files changed, 51 insertions(+), 377 deletions(-)
mode change 100755 => 100644 libre/iceweasel-libre/libre.patch
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index fff9a3a21..212782495 100644
--- 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=('8e4f3987d37c8e73b168948d0771b872'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'ed909b5b61f36a81a71989b7daeb2545'
+ 'cd793fac6a572fe5db09e275ca038125'
'e529742c0a425648087bc3ce537fe4c5'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
old mode 100755
new mode 100644
index b136cb4ad..b7efb7dc1
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -66,7 +66,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow
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,21 @@
+@@ -1,23 +1,23 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -85,8 +85,10 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
-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.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
@@ -97,22 +99,24 @@ 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 +25,17 @@
+@@ -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
++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.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
@@ -127,7 +131,7 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
+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
++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300
@@ -143,7 +143,7 @@
@@ -195,7 +199,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
--- 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,13 @@
+@@ -221,13 +221,12 @@
/* preferences for the Get Add-ons pane */
pref("extensions.getAddons.cache.enabled", true);
pref("extensions.getAddons.maxResults", 15);
@@ -212,11 +216,10 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
+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", "");
-@@ -247,7 +247,7 @@
+@@ -247,7 +246,7 @@
pref("dom.disable_window_open_dialog_feature", true);
pref("keyword.enabled", true);
@@ -228,7 +231,7 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
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,16 @@
+@@ -1,18 +1,18 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -243,8 +246,10 @@ diff -urN iceweasel-13.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.contentHandlers.types.0.title=
-+#browser.contentHandlers.types.0.uri=about:blank
++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=
@@ -252,24 +257,25 @@ diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties icew
# 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,9 @@
+@@ -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
++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
-
-diff -urN iceweasel-14.0.1.orig/modules/libpref/src/init/all.js iceweasel-14.0.1/modules/libpref/src/init/all.js
++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 @@
@@ -325,22 +331,24 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
+
+
Free Software Foundation
+
-+
- Free Software Foundation
++
- Free Software Foundation
+
- LibrePlanet
+
- Free addons
+
- h-node
-diff -Naur iceweasel-14.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-14.0.1/browser/base/content/abouthome/aboutHome.js
---- mozilla-build.orig/browser/base/content/abouthome/aboutHome.js 2012-07-12 14:27:37.000000000 -0300
-+++ mozilla-build/browser/base/content/abouthome/aboutHome.js 2012-07-17 23:19:05.593724417 -0300
-@@ -41,99 +41,348 @@
- // If a definition requires additional params, check that the final search url
- // is handled correctly by the engine.
- const SEARCH_ENGINES = {
+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": {
-+ "Duck Duck Go (Lite)": {
- image: "data:image/png;base64," +
+- image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -400,159 +408,11 @@ diff -Naur iceweasel-14.0.1.orig/browser/base/content/abouthome/aboutHome.js ice
- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
- , params: "source=hp&channel=np"
-+ "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" +
-+ "RU5ErkJggg%3D%3D"
- }
-
+- }
+-
-, "Яндекс":
- {
-+ "Seeks Search": {
- image: "data:image/png;base64," +
+- image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
- "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
@@ -579,199 +439,13 @@ diff -Naur iceweasel-14.0.1.orig/browser/base/content/abouthome/aboutHome.js ice
- "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%3D%3D"
- }
-+
-+ "YaCy": {
-+ }
-+
- };
-
+- }
+-};
+-
// The process of adding a new default snippet involves:
-@@ -143,7 +392,7 @@
+ // * 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"
--
cgit v1.2.3
From 8bc3a2868afec2c6135260d21fc89a5f44e6af7c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 05:30:59 -0300
Subject: iceweasel-i18n-14.0.1.1-2: updating version
---
libre/iceweasel-i18n/PKGBUILD | 176 +++++++++++++++++++++---------------------
1 file changed, 88 insertions(+), 88 deletions(-)
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 9e0469437..2f2c1be72 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,8 +9,8 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=13.0.1
-_debrel=2
+_debver=14.0.1
+_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -20,9 +20,9 @@ pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=13.0.1
+_pkgver=14.0.1
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
@@ -56,87 +56,87 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('757e700b430500bd1bc4a32531c9c5c2'
- 'beb404a571e3e666de849e3ccd6887c4'
- '3bef09f6330c11c43eaa3b2349d65172'
- '8abaeec4486169bb85be05f289c0eae9'
- '55d5c50733a1d08acbd85292cb596589'
- '10ed3b7da37259a870507287b026f69c'
- '8ef3e6cea973059a328eb5792a507e5d'
- '64a37cd546b0e092ddd2495e8ee8fb33'
- 'ce9a0bbdc6715ba9350050dcb640201a'
- '5506b1e58bb9e8a100b1c7a527f95dcf'
- '6920f4fb2d266d5839872a254a41c760'
- '73f6d4a70be7b0f0c15627e72685d402'
- '695fb3e883e6949d1ad13460389dbec2'
- 'c0ed06cb371edb89d2c42f4175dd8ab7'
- '074429b21f92d61db196d49d60fef32d'
- '9e4b3ecf3ecc9b577e5f8c33df68c006'
- '8e3b3090910d5d2b40b5deb0ee589359'
- 'a6c969cb9a8c97a548a16422ac4e2664'
- '6394347deb1924c46992eb9d5e9498c9'
- 'de44e8a2e3e8de215fdf6b6f6399f88f'
- '57b8a69ff712d6416160a5c5c61e6ba7'
- 'dd453683292ad2f2181e720a6b834f11'
- '04d2d05e22208106b67cc136d2b66892'
- 'f5474e87498f8da3ed27b11816a64906'
- '6d60eabb499c2e672a5ebc5ea32c6c58'
- '91b86461bfc8f1728d1b4e55d102622c'
- '525e770773177bbdb2c8ad14ffb4534b'
- '98139e2c2c1cc11e6d47a46b2483c290'
- '295ee591cc1480da7b2adacf470c1ab1'
- 'a95c27e109eb5768b1ce4dbf3e58ddca'
- 'b8dccb786a16c6ebf8c015997aa96577'
- 'a647e17fd8c7c9d039c140e36c3e18a7'
- 'd20309e9a6092e9a7a92c1ded0d55f62'
- 'e0e5948c8353d3de76912884edc20297'
- '8d0bf7dbb40e06495d8c749758163246'
- 'f34d9ec431acc2b1178ac3cdbfae3856'
- 'cb68c4036bdb9ac69428a035e04668dc'
- '2949b4e18de48b29c62ef03b3ba4f94d'
- 'aec2a61b12f7e5dac2f46251407c6b47'
- '60285cbb93249fea5d5afba3dbaf115f'
- 'c3f33724ded35468760aac7816b2b591'
- 'dc9b02972a247dc5fbeabcc42942c4ac'
- '512bffe5f782e92da15bc4c9b2035ded'
- '3c04ca7f6d726e417dc1459eaa8bc068'
- 'd8526259b9560e9164862df34db555a7'
- 'af3630dbd3a327ce99edf96b8cb35dce'
- 'ffeb0437949a5e623b12dbcde41b6d39'
- 'c653d9c9101394d29c5f5a3b7bf510e1'
- 'b31c230e4cbf3d1f73b499509ff3e805'
- '548228527e6772ee5f457fff41826b02'
- '40b5e98319effec4f1605a831c393cda'
- '09899eacc5d1e61767a87ecd093267d8'
- '1907de3acaa8e4c99539f99c0442770e'
- 'dc4cdef93b037e40ee6fd3f4c0848e29'
- '409e9fa01c0b2982ba7e335d7001b905'
- 'c30fed12e22cf16ea86374ca541a32aa'
- 'a9cc0798968851f51521399171e1454f'
- '6b53e84454a196870e631db5859fa9f3'
- '7939907fff93c0b984b445d8ea603baf'
- '7370eca015e6ed0289a9db4e5f4cd908'
- '84eaa820922b25b9b16724099a78c139'
- '23f15310ffd0d70d3aaf9b37436a16bb'
- 'a4063289c46317f0d351f11e8a0d1527'
- '012417e2c4b0d2e597273f988b9f877b'
- '3feaddb7edef32adfc561aa3eeedafe8'
- '69fc663f9951867c9139a3a39973e0a5'
- 'a9c3fed813c45fd32b17576a32ccf35a'
- '01fe030c2949facb8512a667e9e6e9ee'
- 'f8d63b2ae7d24753422e266224de32d2'
- '335ce46bda9f0a69414dc180ea780a70'
- 'a0b4ef73ad4322ea536d08918d630c9f'
- '39380afb97827cde59536c81310de562'
- '06930aeffde351d14554de1f0f93728b'
- '3d1fe2feefd0e44c213360c405006a98'
- '3f0af6bbd75b45b7703f35e3e594a7a7'
- '89f90e0a35b81423257b113a37a71681'
- '24fc060c80197d73585902fec40de1bf'
- '7738a9596bf1e198c6de3ec3e694e7eb'
- '8fbf72bb8c1d5cfc7dbcb02af506da3c'
- '8790e5d8e5317fba199bfb3f135847bc'
- 'd768e2190bcea36233625d948d879b39'
- '3bac90764599a61b14f82e9a51d72d36'
- 'eb3d0fa986f6ffd54f2bb48fc482227e'
- '3c8166c380597924871688c8c6bf795c')
+md5sums=('8492bffee2bd98cb7d98a8a53e0f17ae'
+ '5497ed6ceb6e975eba24a5bf05f86a89'
+ '314f16038bdb82e59bf3522efe3a6b70'
+ '20d404c6f61846e7bf5c4d2474d3a394'
+ 'f80eefbad17d03ff38514f3bcc179f1a'
+ '8b2a7ec06160c973a323c38a7a0b25d5'
+ '8b5496a243674eb3960ac6dc5a2f6b88'
+ 'b75cae5fb01515ab9aeb8ca941ce88eb'
+ '89f20e820d1aaf08cef2a59ee3859239'
+ '4431e91bbbe395b86da48b66ac689fb9'
+ '9fab9ef9ad5dd46c8ae51973dfaffaaa'
+ '32f8d7861a46407d76b1310566845afe'
+ 'e000671c0b3fd89e76b763a7980f707e'
+ 'd14e72cddb190f0a58275624b1982e4c'
+ 'd55c847a44918c6fee6bbf4ac8d9e4a7'
+ 'c5a4568e1dac75a863f281bfeb000ead'
+ 'fe51ca24871979a37bcca24d7b3b2da1'
+ 'e702787ad3ff4c1d20dedf55321dc335'
+ 'dfcb47fda64599a5704da757c7c04377'
+ 'b0a1cbb9cfe5265989cf3b26e8109fd8'
+ 'cd060b883cd7586e249c541c26dd642e'
+ '5d23943dff2735703e4995fc8321bf3d'
+ 'e389f9cb80945608c198a890258377cb'
+ '32a1798b0e137097e7f00c27f0e6aa2a'
+ '9003c830b3f8ee4b8950b1f406acf0b0'
+ '5e7e3f5ff49d7070f6de4bc6d64875d6'
+ '891331124222b316a13ba45bc87a7c23'
+ '21aa289ad236bf6849d96b0b9d985fbe'
+ '64c9579f00c738bd824466a7212e76fe'
+ 'b89e729d09c3c54e9849f665bedf60db'
+ 'e40fda3e233e042447a9e10cc0cd0f76'
+ '8c813e20e712dc3d62cde69ee2df2d28'
+ '7fff1d836a0c4f8a5ef41c9f4b56b2a9'
+ '916f163b9e0814bc23f1545d18238c79'
+ '2cdab3c133f7d7d5abc54bed1ac654a9'
+ '2d9d97bbdb568296380cdee5ec61ba88'
+ '43e6ce7d51e734bf3aaff68504d8ebee'
+ 'af8f80eefcf1d795a7aaf25f694b6e97'
+ 'c4336d1a4eb59cc4e415a69d22a682a7'
+ 'be4a6850f76eb144079c7a47de678b66'
+ 'a4826c1b2e19216759224252f09ba552'
+ '47ee1757a64cdfcb9c0ba461fb934377'
+ '4f144397e5235862f90e09a6ebae1571'
+ '16e4bb054604c5cdb583a10456a35a2c'
+ '0dfaf8cc5efaf39b4ed2422497a3043f'
+ 'e5b809e55fe4e3b16229a7e1faa160b6'
+ '8f317ab44eed90cb59be734dd805287b'
+ '3797507f353a6978924a273802d178b9'
+ 'a1a7df582e476a7993ebbcb427835256'
+ 'a833481b7c6d26cc679f1a551014ab7c'
+ 'fb5d99c278d75c30891bae95f8337fd1'
+ '7f02751d991432d72c46247520d3ed67'
+ '96fde2477e2e661794c4ddabe1c9d024'
+ '7b1948761da836466f567ec35b54ff82'
+ '0d8cc6d0b2a53d15e32740a463cff1cc'
+ '571b6d2d461f7cb3ec95632b8d75c65c'
+ 'a01e65b75b8dd78dcaf0ff746fc71b92'
+ 'de2a327304a0f659944e7ae9e39fa877'
+ 'a12943272a14455a19761e4564c2f0f8'
+ '9eca996185f4995dc971f27c22447404'
+ 'cf248c1ea91e55c9aa306437abbcf212'
+ 'f2cbcdf897307bdd95f886d95504264b'
+ '2863ef939be42a0422d7e903122ee89c'
+ '2df4ff00f83b650cf69e8b3a27099c20'
+ 'cda3838e681f461c9ea833ed71fb72b8'
+ 'c6bf73b7e7357e050cbe772cf460f442'
+ '5f61a368a50280f0b293a8b11631c673'
+ '418d85a6fae1e9cdde6e8aaeea594b99'
+ 'e7e145a331920a2fcd1c00a80f3d9279'
+ 'b9bc820720e8fbb1c28229c66310dcbf'
+ 'bb9d826ead65c23bd45090206f0f6f25'
+ '7a72bd76a2087efca618c4cf7cd6ea60'
+ 'a06bf452b96c0dcef7d30a390b5c755d'
+ '0f6605afb8dddab2d2dc4110e3a62c3f'
+ '3dd7cc1afef4d2bfcfadb3093fe979c1'
+ '6a63bd1463f7d75172170e8e18c3443b'
+ '1c9887f019c8ffb71b3d9faa3b2120ba'
+ '38c750ddb41b8d61a2073d0cb67bc6d9'
+ 'e1d6e4b2f34af391c2037b331fd566f8'
+ 'a950f7a77c9ba4fb0142107afdcc4a01'
+ '0fe08f2659b34b1ee8ebd7debf2d9d13'
+ 'af8af0b941b1bd26ee4122f4e99f7f55'
+ 'e3d1f71617331226bbeb4cb829a2c0be'
+ '6623cab16c266630f9f56427d22cb5df')
--
cgit v1.2.3
From 7150a34876ccafdef4eca5f497e2be209fb21931 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 07:33:06 -0300
Subject: iceweasel-libre-14.0.1.2-1: updating version
---
libre/iceweasel-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 212782495..6116867fa 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -15,14 +15,14 @@ _pgo=false
# We're getting this from Debian Sid
_debname=iceweasel
_debver=14.0.1
-_debrel=1
+_debrel=2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -53,7 +53,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
shared-libs.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
md5sums=('8e4f3987d37c8e73b168948d0771b872'
- 'fca50bc0a4327c1389349be7939c14bd'
+ '8689c150a4d3a0a688ad2db6044feac6'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
--
cgit v1.2.3
From 1e4417fa238cd61e969e3e0892f253064bf5ee07 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 11:18:30 -0300
Subject: adding new package called parabola-keyring
---
libre/parabola-keyring/PKGBUILD | 20 ++++++++++++++++++++
libre/parabola-keyring/parabola-keyring.install | 11 +++++++++++
2 files changed, 31 insertions(+)
create mode 100644 libre/parabola-keyring/PKGBUILD
create mode 100644 libre/parabola-keyring/parabola-keyring.install
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
new file mode 100644
index 000000000..989887ad9
--- /dev/null
+++ b/libre/parabola-keyring/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id$
+# Maintainer: André Silva
+
+pkgname=parabola-keyring
+pkgver=20120719
+pkgrel=1
+pkgdesc='Parabola GNU/Linux-libre PGP keyring'
+arch=('any')
+url='https://projects.parabolagnulinux.org/hackers.git/'
+license=('GPL')
+install="${pkgname}.install"
+source=("ftp://ftp.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "ftp://ftp.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('35b53004acde18e02acd29889302d40a'
+ '4929c51b019dfba1a85320396631e4c0')
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make PREFIX=/usr DESTDIR=${pkgdir} install
+}
diff --git a/libre/parabola-keyring/parabola-keyring.install b/libre/parabola-keyring/parabola-keyring.install
new file mode 100644
index 000000000..1c70f1a8d
--- /dev/null
+++ b/libre/parabola-keyring/parabola-keyring.install
@@ -0,0 +1,11 @@
+post_upgrade() {
+ if usr/bin/pacman-key -l >/dev/null 2>&1; then
+ usr/bin/pacman-key --populate parabola
+ fi
+}
+
+post_install() {
+ if [ -x usr/bin/pacman-key ]; then
+ post_upgrade
+ fi
+}
--
cgit v1.2.3
From 9c87491d3f89760db988664f092bfbdbb66a1e92 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Thu, 19 Jul 2012 11:34:20 -0300
Subject: libre/pacman-4.0.3-3
recovered rePKGBUILD
---
...flict-for-replacing-owned-empty-directory.patch | 152 +++++++++++++++++++++
.../0002-Check-empty-subdirectory-ownership.patch | 61 +++++++++
libre/pacman/PKGBUILD | 39 +++---
libre/pacman/pacman.conf | 25 ++--
libre/pacman/pacman.conf.mips64el | 31 ++---
libre/pacman/pacman.conf.x86_64 | 27 ++--
libre/pacman/pacman.install | 10 +-
libre/pacman/rePKGBUILD | 37 +++++
8 files changed, 312 insertions(+), 70 deletions(-)
create mode 100644 libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
create mode 100644 libre/pacman/0002-Check-empty-subdirectory-ownership.patch
create mode 100644 libre/pacman/rePKGBUILD
diff --git a/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
new file mode 100644
index 000000000..85622aaac
--- /dev/null
+++ b/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
@@ -0,0 +1,152 @@
+From 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Mon Sep 17 00:00:00 2001
+From: Allan McRae
+Date: Sun, 8 Jul 2012 21:36:36 +1000
+Subject: [PATCH 1/4] Add conflict for replacing owned empty directory
+
+When two packages own an empty directory, pacman finds no conflict when
+one of those packages wants to replace the directory with a file or a
+symlink. When it comes to actually extracting the new file/symlink,
+pacman sees the directory is still there (we do not remove empty
+directories if they are owned by a package) and refuses to extract.
+
+Detect this potential conflict early and bail. Note that it is a
+_potential_ conflict and not a guaranteed one as the other package owning
+the directory could be updated or removed first which would remove
+the conflict. However, pacman currently can not sort package installation
+order to ensure this, so this conflict requires manual upgrade ordering.
+
+Signed-off-by: Allan McRae
+Signed-off-by: Dan McGee
+---
+ lib/libalpm/conflict.c | 32 ++++++++++++++++++++++++++------
+ test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++
+ test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++
+ 3 files changed, 66 insertions(+), 6 deletions(-)
+ create mode 100644 test/pacman/tests/fileconflict009.py
+ create mode 100644 test/pacman/tests/fileconflict010.py
+
+diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
+index 32f6f30..efa1a87 100644
+--- a/lib/libalpm/conflict.c
++++ b/lib/libalpm/conflict.c
+@@ -328,15 +328,35 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist,
+ return NULL;
+ }
+
+-static int dir_belongsto_pkg(const char *root, const char *dirpath,
++static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
+ alpm_pkg_t *pkg)
+ {
++ alpm_list_t *i;
+ struct stat sbuf;
+ char path[PATH_MAX];
+ char abspath[PATH_MAX];
+- struct dirent *ent = NULL;
+ DIR *dir;
++ struct dirent *ent = NULL;
++ const char *root = handle->root;
++
++ /* TODO: this is an overly strict check but currently pacman will not
++ * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
++ * is not simple as even if the directory is being unowned by a conflicting
++ * package, pacman does not sort this to ensure all required directory
++ * "removals" happen before installation of file/symlink */
++
++ /* check that no other _installed_ package owns the directory */
++ for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
++ if(pkg == i->data) {
++ continue;
++ }
++
++ if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) {
++ return 0;
++ }
++ }
+
++ /* check all files in directory are owned by the package */
+ snprintf(abspath, PATH_MAX, "%s%s", root, dirpath);
+ dir = opendir(abspath);
+ if(dir == NULL) {
+@@ -349,13 +369,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath,
+ if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+ continue;
+ }
+- snprintf(path, PATH_MAX, "%s/%s", dirpath, name);
++ snprintf(path, PATH_MAX, "%s%s", dirpath, name);
+ snprintf(abspath, PATH_MAX, "%s%s", root, path);
+ if(stat(abspath, &sbuf) != 0) {
+ continue;
+ }
+ if(S_ISDIR(sbuf.st_mode)) {
+- if(dir_belongsto_pkg(root, path, pkg)) {
++ if(dir_belongsto_pkg(handle, path, pkg)) {
+ continue;
+ } else {
+ closedir(dir);
+@@ -529,9 +549,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
+ sprintf(dir, "%s/", filestr);
+ if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
+ _alpm_log(handle, ALPM_LOG_DEBUG,
+- "check if all files in %s belongs to %s\n",
++ "check if all files in %s belong to %s\n",
+ dir, dbpkg->name);
+- resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg);
++ resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
+ }
+ free(dir);
+ }
+diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py
+new file mode 100644
+index 0000000..904af4a
+--- /dev/null
++++ b/test/pacman/tests/fileconflict009.py
+@@ -0,0 +1,20 @@
++self.description = "dir->symlink change during package upgrade (directory conflict)"
++
++lp1 = pmpkg("pkg1")
++lp1.files = ["dir/"]
++self.addpkg2db("local", lp1)
++
++lp2 = pmpkg("pkg2")
++lp2.files = ["dir/"]
++self.addpkg2db("local", lp2)
++
++p = pmpkg("pkg1", "1.0-2")
++p.files = ["dir -> /usr/dir"]
++self.addpkg2db("sync", p)
++
++self.args = "-S pkg1"
++
++self.addrule("PACMAN_RETCODE=1")
++self.addrule("PKG_VERSION=pkg1|1.0-1")
++self.addrule("PKG_VERSION=pkg2|1.0-1")
++self.addrule("DIR_EXIST=dir/")
+diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py
+new file mode 100644
+index 0000000..0a3ce83
+--- /dev/null
++++ b/test/pacman/tests/fileconflict010.py
+@@ -0,0 +1,20 @@
++self.description = "dir->file change during package upgrade (directory conflict)"
++
++lp1 = pmpkg("pkg1")
++lp1.files = ["dir/"]
++self.addpkg2db("local", lp1)
++
++lp2 = pmpkg("pkg2")
++lp2.files = ["dir/"]
++self.addpkg2db("local", lp2)
++
++p = pmpkg("pkg1", "1.0-2")
++p.files = ["dir"]
++self.addpkg2db("sync", p)
++
++self.args = "-S pkg1"
++
++self.addrule("PACMAN_RETCODE=1")
++self.addrule("PKG_VERSION=pkg1|1.0-1")
++self.addrule("PKG_VERSION=pkg2|1.0-1")
++self.addrule("DIR_EXIST=dir/")
+--
+1.7.11.1
+
diff --git a/libre/pacman/0002-Check-empty-subdirectory-ownership.patch b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch
new file mode 100644
index 000000000..6cf496d16
--- /dev/null
+++ b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch
@@ -0,0 +1,61 @@
+From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001
+From: Allan McRae
+Date: Sun, 8 Jul 2012 23:58:37 +1000
+Subject: [PATCH 2/4] Check empty subdirectory ownership
+
+When checking if a package owns a directory, it is important to check
+not only that all the files in the directory are part of the package,
+but also if the directory is part of a package. This catches empty
+subdirectories during conflict checking for directory to file/symlink
+replacements.
+
+Signed-off-by: Allan McRae
+Signed-off-by: Dan McGee
+---
+ lib/libalpm/conflict.c | 5 +++++
+ test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++
+ 2 files changed, 22 insertions(+)
+ create mode 100644 test/pacman/tests/fileconflict012.py
+
+diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
+index efa1a87..d6e5d8c 100644
+--- a/lib/libalpm/conflict.c
++++ b/lib/libalpm/conflict.c
+@@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
+ struct dirent *ent = NULL;
+ const char *root = handle->root;
+
++ /* check directory is actually in package - used for subdirectory checks */
++ if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) {
++ return 0;
++ }
++
+ /* TODO: this is an overly strict check but currently pacman will not
+ * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
+ * is not simple as even if the directory is being unowned by a conflicting
+diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py
+new file mode 100644
+index 0000000..421b739
+--- /dev/null
++++ b/test/pacman/tests/fileconflict012.py
+@@ -0,0 +1,17 @@
++self.description = "dir->file change during package upgrade (filesystem file conflict)"
++
++lp1 = pmpkg("pkg1")
++lp1.files = ["dir/"]
++self.addpkg2db("local", lp1)
++
++self.filesystem = ["dir/file"]
++
++p = pmpkg("pkg1", "1.0-2")
++p.files = ["dir"]
++self.addpkg2db("sync", p)
++
++self.args = "-S pkg1"
++
++self.addrule("PACMAN_RETCODE=1")
++self.addrule("PKG_VERSION=pkg1|1.0-1")
++self.addrule("DIR_EXIST=dir/")
+--
+1.7.11.1
+
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index d8d3a6d26..94f5453b5 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -4,38 +4,34 @@
# Maintainer: Dave Reisner
pkgname=pacman
-pkgver=4.0.2
-pkgrel=1
+pkgver=4.0.3
+pkgrel=3
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base')
depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
- 'gpgme' 'pacman-mirrorlist')
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
makedepends=('asciidoc')
optdepends=('fakeroot: for makepkg usage as normal user')
backup=(etc/pacman.conf etc/makepkg.conf)
install=pacman.install
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
pacman.conf
pacman.conf.x86_64
pacman.conf.mips64el
makepkg.conf)
-md5sums=('289ba4a19a16393096e065cec1cb9b0a'
- '575140dce3ea597d91b6d081aa3f6a00'
- '858d1ffb284afc6b15f72578ba3cac50'
- '7dade0c0a4d597c480d779afa4f5097c'
- 'd4ca1a1d8e6708c0302a225628a489eb'
- 'debc512689a1aa8c124fe0ccf27f5758')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
build() {
cd $srcdir/$pkgname-$pkgver
+ patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+ patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-doc
make
@@ -83,8 +79,19 @@ package() {
-e "s|@CARCHFLAGS[@]|$myflags|g"
# install completion files
- mkdir -p $pkgdir/etc/bash_completion.d/
- install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
- mkdir -p $pkgdir/usr/share/zsh/site-functions/
- install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
+ install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
+ for f in makepkg pacman-key; do
+ ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
+ done
+
+ install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}
+
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+ '1a70392526c8768470da678b31905a6e'
+ '1a9b79788640907a2b34e8671cacc94a'
+ 'a9ddd43891bed364e1e97d27b2887bf1'
+ '080d9f76f56e135cc62205874636aa0f'
+ 'ce9943fc8086d491890565e91ea1a0d8'
+ 'eb8dba9bd0b315230fbf0e5dc0a7335b'
+ 'debc512689a1aa8c124fe0ccf27f5758')
diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf
index 92befa5fa..115217b59 100644
--- a/libre/pacman/pacman.conf
+++ b/libre/pacman/pacman.conf
@@ -36,18 +36,13 @@ Architecture = auto
CheckSpace
#VerbosePkgLists
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
#SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
@@ -77,7 +72,7 @@ SigLevel = Never
#Include = /etc/pacman.d/mirrorlist
[libre]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[testing]
@@ -85,11 +80,11 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
@@ -97,7 +92,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[community]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# Parabola also supports community projects and personal repositories, to find
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index a74f2d3da..f286c3290 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -16,9 +16,7 @@
#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc
# If upgrades are available for these packages they will be asked for first
-# Don't list pacman here unless you want it broken when there is a
-# libarchive or glibc update.
-#SyncFirst =
+SyncFirst = pacman
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
@@ -35,21 +33,16 @@ Architecture = mips64el
#UseSyslog
#UseDelta
#TotalDownload
-#CheckSpace
+CheckSpace
#VerbosePkgLists
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
#SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
@@ -79,7 +72,7 @@ SigLevel = Never
#Include = /etc/pacman.d/mirrorlist
[libre]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[testing]
@@ -87,11 +80,11 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
@@ -99,7 +92,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[community]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# Parabola also supports community projects and personal repositories, to find
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 0eddc159c..4c67b089f 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -36,18 +36,13 @@ Architecture = auto
CheckSpace
#VerbosePkgLists
-# PGP signature checking
-# NOTE: None of this will work without running `pacman-key --init` first.
-# The compiled in default is equivalent to the following line. This requires
-# you to locally sign and trust packager keys using `pacman-key` for them to be
-# considered valid.
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
#SigLevel = Optional TrustedOnly
-# If you wish to check signatures but avoid local sign and trust issues, use
-# the following line. This will treat any key imported into pacman's keyring as
-# trusted.
-#SigLevel = Optional TrustAll
-# For now, off by default unless you read the above.
-SigLevel = Never
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
@@ -77,7 +72,7 @@ SigLevel = Never
#Include = /etc/pacman.d/mirrorlist
[libre]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[testing]
@@ -85,11 +80,11 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[core]
-#SigLevel = PackageRequired
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
@@ -97,7 +92,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
[community]
-#SigLevel = PackageOptional
+SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
@@ -108,7 +103,7 @@ Include = /etc/pacman.d/mirrorlist
#Include = /etc/pacman.d/mirrorlist
#[multilib]
-#SigLevel = PackageOptional
+#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
# Parabola also supports community projects and personal repositories, to find
diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install
index 4369edab1..487819ab7 100644
--- a/libre/pacman/pacman.install
+++ b/libre/pacman/pacman.install
@@ -9,7 +9,9 @@ post_upgrade() {
if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
_warnupgrade
fi
- _check_pubring
+ if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
+ _check_pubring
+ fi
}
post_install() {
@@ -17,9 +19,9 @@ post_install() {
}
_check_pubring() {
- if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ]; then
- echo " >>> Run \`pacman-key --init\` to set up your pacman keyring."
- fi
+ echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`"
+ echo " >>> to import the data required by pacman for package verification."
+ echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
}
_warnupgrade() {
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
new file mode 100644
index 000000000..810eff5b9
--- /dev/null
+++ b/libre/pacman/rePKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Nicolas Reynolds
+source PKGBUILD
+unset build package md5sums source check
+_repo=core
+source=(PKGBUILD
+ ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+ # files for pkg modifications
+ pacman.conf
+ pacman.conf.x86_64
+ )
+options=(!strip)
+
+build() {
+ cd "${srcdir}/"
+ rm -vf .{INSTALL,PKGINFO} ${srcdir}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+ # put actions for package modifications below this line
+
+}
+
+package() {
+ cp -a ${srcdir}/* ${pkgdir}
+
+ rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
+
+# No need to repackage for mips64el
+ case "$CARCH" in
+ i686)
+ install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+ ;;
+ x86_64)
+ install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
+ ;;
+ esac
+}
+
+
+# vim:set ts=2 sw=2 et:
--
cgit v1.2.3
From 75dbb01140b11651ab65c00de6c7bf0b8b3a64fa Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Thu, 19 Jul 2012 11:55:58 -0300
Subject: Use parabola-keyring too
---
libre/pacman/PKGBUILD | 19 +++++++++----------
libre/pacman/pacman.install | 1 +
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 94f5453b5..4f05be586 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -12,7 +12,7 @@ url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base')
depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
- 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+ 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
makedepends=('asciidoc')
optdepends=('fakeroot: for makepkg usage as normal user')
backup=(etc/pacman.conf etc/makepkg.conf)
@@ -25,6 +25,14 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
pacman.conf.x86_64
pacman.conf.mips64el
makepkg.conf)
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+ '1a70392526c8768470da678b31905a6e'
+ '1a9b79788640907a2b34e8671cacc94a'
+ 'a9ddd43891bed364e1e97d27b2887bf1'
+ '080d9f76f56e135cc62205874636aa0f'
+ 'ce9943fc8086d491890565e91ea1a0d8'
+ 'eb8dba9bd0b315230fbf0e5dc0a7335b'
+ 'debc512689a1aa8c124fe0ccf27f5758')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -86,12 +94,3 @@ package() {
install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}
-
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
- '1a70392526c8768470da678b31905a6e'
- '1a9b79788640907a2b34e8671cacc94a'
- 'a9ddd43891bed364e1e97d27b2887bf1'
- '080d9f76f56e135cc62205874636aa0f'
- 'ce9943fc8086d491890565e91ea1a0d8'
- 'eb8dba9bd0b315230fbf0e5dc0a7335b'
- 'debc512689a1aa8c124fe0ccf27f5758')
diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install
index 487819ab7..5dc55c0c2 100644
--- a/libre/pacman/pacman.install
+++ b/libre/pacman/pacman.install
@@ -20,6 +20,7 @@ post_install() {
_check_pubring() {
echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`"
+ echo " >>> And \`pacman-key --populate parabola\`"
echo " >>> to import the data required by pacman for package verification."
echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
}
--
cgit v1.2.3
From c3c327822e2ae451edf70d9a2d2fbc3900244147 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Thu, 19 Jul 2012 12:01:38 -0300
Subject: Remove python2-libre since it's free now (starting from 2.7.3)
---
...13156-revert-tls-changeset-subinterpreter.patch | 61 ------------
libre/python2-libre/PKGBUILD | 109 ---------------------
libre/python2-libre/SRCBUILD | 36 -------
libre/python2-libre/WDAS.patch | 109 ---------------------
libre/python2-libre/doc_license_change.patch | 44 ---------
libre/python2-libre/gdbm-magic-values.patch | 12 ---
libre/python2-libre/linux2.patch | 23 -----
7 files changed, 394 deletions(-)
delete mode 100644 libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch
delete mode 100644 libre/python2-libre/PKGBUILD
delete mode 100644 libre/python2-libre/SRCBUILD
delete mode 100644 libre/python2-libre/WDAS.patch
delete mode 100644 libre/python2-libre/doc_license_change.patch
delete mode 100644 libre/python2-libre/gdbm-magic-values.patch
delete mode 100644 libre/python2-libre/linux2.patch
diff --git a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch b/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch
deleted file mode 100644
index ed8154df5..000000000
--- a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-
-# HG changeset patch
-# User Charles-François Natali
-# Date 1318446474 -7200
-# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304
-# Parent f6feed6ec3f9b024cecd0fd587595c403f55624f
-Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native
-TLS implementations, and fails with the ad-hoc TLS implementation when a thread
-doesn't have an auto thread state (e.g. a thread created outside of Python
-calling into a subinterpreter).
-
-diff --git a/Include/pystate.h b/Include/pystate.h
---- a/Include/pystate.h
-+++ b/Include/pystate.h
-@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT
- PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
- #ifdef WITH_THREAD
- PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
--PyAPI_FUNC(void) _PyGILState_Reinit(void);
- #endif
-
- PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
---- a/Modules/signalmodule.c
-+++ b/Modules/signalmodule.c
-@@ -976,7 +976,6 @@ void
- PyOS_AfterFork(void)
- {
- #ifdef WITH_THREAD
-- _PyGILState_Reinit();
- PyEval_ReInitThreads();
- main_thread = PyThread_get_thread_ident();
- main_pid = getpid();
-diff --git a/Python/pystate.c b/Python/pystate.c
---- a/Python/pystate.c
-+++ b/Python/pystate.c
-@@ -537,23 +537,6 @@ void
- autoInterpreterState = NULL;
- }
-
--/* Reset the TLS key - called by PyOS_AfterFork.
-- * This should not be necessary, but some - buggy - pthread implementations
-- * don't flush TLS on fork, see issue #10517.
-- */
--void
--_PyGILState_Reinit(void)
--{
-- PyThreadState *tstate = PyGILState_GetThisThreadState();
-- PyThread_delete_key(autoTLSkey);
-- if ((autoTLSkey = PyThread_create_key()) == -1)
-- Py_FatalError("Could not allocate TLS entry");
--
-- /* re-associate the current thread state with the new key */
-- if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0)
-- Py_FatalError("Couldn't create autoTLSkey mapping");
--}
--
- /* When a thread state is created for a thread by some mechanism other than
- PyGILState_Ensure, it's important that the GILState machinery knows about
- it so it doesn't try to create another thread state for the thread (this is
-
diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD
deleted file mode 100644
index e743151b0..000000000
--- a/libre/python2-libre/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $
-# Maintainer: Stéphane Gaudreault
-# Contributer: Allan McRae
-# Contributer: Jason Chu
-
-_pkgname=python2
-pkgname=python2-libre
-pkgver=2.7.2
-pkgrel=6
-_pybasever=2.7
-pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
-license=('PSF')
-url="http://www.python.org/"
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python<3')
-options=('!makeflags')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-4-any.src.tar.xz
- doc_license_change.patch
- WDAS.patch
- linux2.patch
- gdbm-magic-values.patch
- 13156-revert-tls-changeset-subinterpreter.patch)
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- # Temporary workaround for FS#22322
- # See http://bugs.python.org/issue10835 for upstream report
- sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
-
- # Enable built-in SQLite module to load extensions (fix FS#22122)
- sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-
- # FS#23997
- sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
-
- # Make sure sys.platform is set to linux2, even on kernel 3.X
- # cf http://bugs.python.org/issue12326
- patch -Np1 -i ../linux2.patch
-
- # gdbm has new magic that whichdb does not recognize
- # http://bugs.python.org/issue13007
- patch -Np1 -i ../gdbm-magic-values.patch
-
- # http://bugs.python.org/issue13156
- patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch
-
- # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
- # rather than copies shipped in the tarball
- rm -r Modules/expat
- rm -r Modules/zlib
- rm -r Modules/_ctypes/{darwin,libffi}*
-
- export OPT="${CFLAGS}"
- ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
- --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
- --with-dbmliborder=gdbm:ndbm
-
- make MACHDEP=linux2
-}
-
-package() {
- cd "${srcdir}/Python-${pkgver}"
- make DESTDIR="${pkgdir}" altinstall maninstall
-
- ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2"
- ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
- ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1"
-
- ln -sf ../../libpython${_pybasever}.so \
- "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
-
- mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
-
- # some useful "stuff"
- install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
- install -m755 Tools/i18n/{msgfmt,pygettext}.py \
- "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
- install -m755 Tools/scripts/{README,*py} \
- "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
-
- # fix conflicts with python
- mv "${pkgdir}"/usr/bin/idle{,2}
- mv "${pkgdir}"/usr/bin/pydoc{,2}
- mv "${pkgdir}"/usr/bin/2to3{,-2.7}
-
- # clean up #!s
- find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
- xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
- # clean-up reference to build directory
- sed -i "s#${srcdir}/Python-${pkgver}:##" \
- "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
-
- # license
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('456d053a5d418adc913a4971e95fe918'
- '1e6595f85a1da7f42b69456119924d50'
- '3f8c0e310a0be0bd8b319d6c46bbd427'
- '6099a7c1aed80cf04943ee4affa84b5c'
- '6de394351179c2ada82e95458ceb13e5'
- 'daa5110f092f1406c17de23171529e62')
diff --git a/libre/python2-libre/SRCBUILD b/libre/python2-libre/SRCBUILD
deleted file mode 100644
index f021d6624..000000000
--- a/libre/python2-libre/SRCBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $
-# Maintainer: AndyRTR
-# Maintainer (Parabola): xihh
-
-pkgname=python2-libre
-pkgver=2.7.2
-pkgrel=4
-pkgdesc="A high-level scripting language"
-arch=('any')
-license=('PSF')
-url="http://www.python.org/"
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
- doc_license_change.patch
- WDAS.patch)
-md5sums=('75c87a80c6ddb0b785a57ea3583e04fa'
- '1e6595f85a1da7f42b69456119924d50'
- '3f8c0e310a0be0bd8b319d6c46bbd427')
-options=(!strip docs libtool emptydirs !zipman !purge)
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- export PKGEXT=.src.tar.xz
-
- patch -Np1 -i ../WDAS.patch
- patch -Np0 -i ../doc_license_change.patch
-
-}
-
-package() {
- export PKGEXT=.src.tar.xz
- export PKGDEST=${startdir}
-
- mv "${srcdir}/Python-${pkgver}" ${pkgdir}
-
-}
diff --git a/libre/python2-libre/WDAS.patch b/libre/python2-libre/WDAS.patch
deleted file mode 100644
index 86bc75e8c..000000000
--- a/libre/python2-libre/WDAS.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -r ac562d86ab71 Lib/profile.py
---- a/Lib/profile.py Fri Jun 03 17:50:59 2011 -0500
-+++ b/Lib/profile.py Mon Jun 27 00:02:20 2011 -0700
-@@ -2,35 +2,26 @@
- #
- # Class for profiling python code. rev 1.0 6/2/94
- #
-+# Written by James Roskind
- # Based on prior profile module by Sjoerd Mullender...
- # which was hacked somewhat by: Guido van Rossum
-
- """Class for profiling Python code."""
-
--# Copyright 1994, by InfoSeek Corporation, all rights reserved.
--# Written by James Roskind
--#
--# Permission to use, copy, modify, and distribute this Python software
--# and its associated documentation for any purpose (subject to the
--# restriction in the following sentence) without fee is hereby granted,
--# provided that the above copyright notice appears in all copies, and
--# that both that copyright notice and this permission notice appear in
--# supporting documentation, and that the name of InfoSeek not be used in
--# advertising or publicity pertaining to distribution of the software
--# without specific, written prior permission. This permission is
--# explicitly restricted to the copying and modification of the software
--# to remain in Python, compiled Python, or other languages (such as C)
--# wherein the modified or derived code is exclusively imported into a
--# Python module.
--#
--# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
--# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
--# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
--# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
--# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
--# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
--# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--
-+# Copyright Disney Enterprises, Inc. All Rights Reserved.
-+# Licensed to PSF under a Contributor Agreement
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-+# either express or implied. See the License for the specific language
-+# governing permissions and limitations under the License.
-
-
- import sys
-diff -r ac562d86ab71 Lib/pstats.py
---- a/Lib/pstats.py Fri Jun 03 17:50:59 2011 -0500
-+++ b/Lib/pstats.py Mon Jun 27 00:02:20 2011 -0700
-@@ -2,34 +2,26 @@
-
- # Class for printing reports on profiled python code. rev 1.0 4/1/94
- #
-+# Written by James Roskind
- # Based on prior profile module by Sjoerd Mullender...
- # which was hacked somewhat by: Guido van Rossum
--#
--# see profile.py for more info.
-
--# Copyright 1994, by InfoSeek Corporation, all rights reserved.
--# Written by James Roskind
--#
--# Permission to use, copy, modify, and distribute this Python software
--# and its associated documentation for any purpose (subject to the
--# restriction in the following sentence) without fee is hereby granted,
--# provided that the above copyright notice appears in all copies, and
--# that both that copyright notice and this permission notice appear in
--# supporting documentation, and that the name of InfoSeek not be used in
--# advertising or publicity pertaining to distribution of the software
--# without specific, written prior permission. This permission is
--# explicitly restricted to the copying and modification of the software
--# to remain in Python, compiled Python, or other languages (such as C)
--# wherein the modified or derived code is exclusively imported into a
--# Python module.
--#
--# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
--# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
--# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
--# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
--# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
--# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
--# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+"""Class for profiling Python code."""
-+
-+# Copyright Disney Enterprises, Inc. All Rights Reserved.
-+# Licensed to PSF under a Contributor Agreement
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-+# either express or implied. See the License for the specific language
-+# governing permissions and limitations under the License.
-
-
- import sys
diff --git a/libre/python2-libre/doc_license_change.patch b/libre/python2-libre/doc_license_change.patch
deleted file mode 100644
index 18f9447d7..000000000
--- a/libre/python2-libre/doc_license_change.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Doc/library/profile.rst 2011-06-11 12:46:23.000000000 -0300
-+++ Doc/library/profile.rst.orig 2011-08-12 11:35:25.000000000 -0300
-@@ -12,27 +12,23 @@
-
- .. index:: single: InfoSeek Corporation
-
--Copyright © 1994, by InfoSeek Corporation, all rights reserved.
-+Copyright Disney Enterprises, Inc. All Rights Reserved.
-
- Written by James Roskind. [#]_
-
--Permission to use, copy, modify, and distribute this Python software and its
--associated documentation for any purpose (subject to the restriction in the
--following sentence) without fee is hereby granted, provided that the above
--copyright notice appears in all copies, and that both that copyright notice and
--this permission notice appear in supporting documentation, and that the name of
--InfoSeek not be used in advertising or publicity pertaining to distribution of
--the software without specific, written prior permission. This permission is
--explicitly restricted to the copying and modification of the software to remain
--in Python, compiled Python, or other languages (such as C) wherein the modified
--or derived code is exclusively imported into a Python module.
--
--INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
--INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
--SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
--DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
--WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
--OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+Licensed to PSF under a Contributor Agreement
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-+either express or implied. See the License for the specific language
-+governing permissions and limitations under the License.
-
- .. _profiler-introduction:
-
diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch
deleted file mode 100644
index 471faf2c7..000000000
--- a/libre/python2-libre/gdbm-magic-values.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
---- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.000000000 -0400
-+++ Python-2.7.2/Lib/whichdb.py 2011-09-30 15:45:21.778872290 -0400
-@@ -91,7 +91,7 @@ def whichdb(filename):
- return ""
-
- # Check for GNU dbm
-- if magic == 0x13579ace:
-+ if magic in (0x13579ace, 0x13579acd, 0x13579acf):
- return "gdbm"
-
- # Check for old Berkeley db hash file format v2
diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch
deleted file mode 100644
index 670510fde..000000000
--- a/libre/python2-libre/linux2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://hg.python.org/cpython/rev/c816479f6aaf/
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -2995,6 +2995,7 @@ then
- MACHDEP="$ac_md_system$ac_md_release"
-
- case $MACHDEP in
-+ linux*) MACHDEP="linux2";;
- cygwin*) MACHDEP="cygwin";;
- darwin*) MACHDEP="darwin";;
- atheos*) MACHDEP="atheos";;
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -293,6 +293,7 @@ then
- MACHDEP="$ac_md_system$ac_md_release"
-
- case $MACHDEP in
-+ linux*) MACHDEP="linux2";;
- cygwin*) MACHDEP="cygwin";;
- darwin*) MACHDEP="darwin";;
- atheos*) MACHDEP="atheos";;
--
cgit v1.2.3
From edd9e0552225a939030f45f80a1be9fe0dd82fae Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Thu, 19 Jul 2012 12:02:32 -0300
Subject: libre/parabola-keyring-20120719-1
---
libre/parabola-keyring/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 989887ad9..f6fa2f548 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -9,10 +9,10 @@ arch=('any')
url='https://projects.parabolagnulinux.org/hackers.git/'
license=('GPL')
install="${pkgname}.install"
-source=("ftp://ftp.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- "ftp://ftp.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('35b53004acde18e02acd29889302d40a'
- '4929c51b019dfba1a85320396631e4c0')
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
+ "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('57c2bc04d4a65b61e696ab3b01c9761f'
+ '419e7dcb3ee2cb8f9d20624f83c5d938')
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
--
cgit v1.2.3
From f6fa033cd8ddd7cf0efcc84b93ca8f27d5b1059b Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds
Date: Thu, 19 Jul 2012 12:59:39 -0300
Subject: libre/parabola-keyring-20120719-2
---
libre/parabola-keyring/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index f6fa2f548..432a5cf75 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=parabola-keyring
pkgver=20120719
-pkgrel=1
+pkgrel=2
pkgdesc='Parabola GNU/Linux-libre PGP keyring'
arch=('any')
url='https://projects.parabolagnulinux.org/hackers.git/'
@@ -11,10 +11,10 @@ license=('GPL')
install="${pkgname}.install"
source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
"http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('57c2bc04d4a65b61e696ab3b01c9761f'
- '419e7dcb3ee2cb8f9d20624f83c5d938')
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make PREFIX=/usr DESTDIR=${pkgdir} install
}
+md5sums=('de7f518935faea83aaa4d74001be8ecc'
+ '22dd9f76911e4984a6cc625d9d1f9465')
--
cgit v1.2.3
From 050167114c83d87da8228b170c5bfc35d00d8953 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Thu, 19 Jul 2012 13:59:49 -0300
Subject: icecat: updating package
---
libre/icecat/PKGBUILD | 4 +-
libre/icecat/libre.patch | 412 ++++++-----------------------------------------
2 files changed, 47 insertions(+), 369 deletions(-)
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 9347d3785..88bd70c09 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -17,7 +17,7 @@ _pgo=false
_pkgname=icecat
pkgver=13.0.1
-pkgrel=1
+pkgrel=2
if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
if $_pgo; then
@@ -81,7 +81,7 @@ md5sums=('ba249f3e889089dc64615333dd324791'
'3117865902d1a20ab61d75707be9888e'
'ac29b01c189f20abae2f3eef1618ffc0'
'683c4540ab84c220937feb7d1a1450ee'
- 'bae9a078edc6797f9de9ab68e5f4827e'
+ 'cd52a6e3f138fa92267600cc53ff4247'
'e81ad01dbc16ba28bf92ba4b7c309ca7'
'd93fe402b87cd000a869e1fd6badc6c9'
'268e65c8fcae6152e156c09760a18dfd'
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index b7bb7cd50..a4c76b6f5 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -27,16 +27,18 @@ diff -Naur icecat-13.0.1/browser/app/profile/firefox.js icecat-13.0.1-libre/brow
// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-diff -Naur icecat-13.0.1/browser/base/content/abouthome/aboutHome.js icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js
+diff -Naur icecat-13.0.1/browser/base/content/aboutHome.js icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js
--- icecat-13.0.1/browser/base/content/abouthome/aboutHome.js 2012-07-12 14:27:37.000000000 -0300
+++ icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js 2012-07-17 23:19:05.593724417 -0300
-@@ -41,99 +41,348 @@
- // If a definition requires additional params, check that the final search url
- // is handled correctly by the engine.
- const SEARCH_ENGINES = {
+@@ -37,104 +37,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": {
-+ "Duck Duck Go (Lite)": {
- image: "data:image/png;base64," +
+- image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -96,159 +98,11 @@ diff -Naur icecat-13.0.1/browser/base/content/abouthome/aboutHome.js icecat-13.0
- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
- , params: "source=hp&channel=np"
-+ "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" +
-+ "RU5ErkJggg%3D%3D"
- }
-
+- }
+-
-, "Яндекс":
- {
-+ "Seeks Search": {
- image: "data:image/png;base64," +
+- image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
- "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
@@ -275,199 +129,13 @@ diff -Naur icecat-13.0.1/browser/base/content/abouthome/aboutHome.js icecat-13.0
- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
-+ "iVBORw0KGgoAAAANSUhEUgAAAIYAAABRCAYAAAAXQt4GAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz" +
-+ "AAABfgAAAX4BzURP7gAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACAASURB" +
-+ "VHic7Z13eBVV+sc/t7cU0gghQAgJCUlo0kLvuCDIIqgo64qrIi5EBXd/KFhgVXSFxY51sSA2EFcE" +
-+ "UXqTJi20ECAQIJ2QTpLb7++POJOZufcmAddd2If3eea5N3fOnDPznu+85z3f9z0nKo/H4+E6Femt" +
-+ "S7+rVCqf329I00X7376BqxEBBB6PB4/Hg9vtlp1XqVTiIf3thjRdrjtgSMGgPARRq9XiodFoRFDc" +
-+ "AEfT5boBhmAl3G43LpcLl8uF0+kkvySXbcc34HA6CAkIo2VIKzq26YpWqxUPjUaDRqMBboCjqXLd" +
-+ "AAPqQeFwONh/eg+vrH6ezNyjeJC7SZ3adOOhYTPoFpeKXq9Hr9cD3ADHFYjqenA+heHD6XTicDj4" +
-+ "bu8KXvj6SRwue4PXzbzlGW5LvRuj0YjBYBCth9L/uCHecl1YDMGncLlc/HR8M3O/elw81yK4Jant" +
-+ "BtI8KIqKmjK2ZP5IcVUhAG/8+BJRwa3o3WGACAa1Wn0DFE2Qa95iCNbC4XBgs9m459UxZOYfA6Bv" +
-+ "/GDShs3BoDOIlsDusPHOln+wOWMtABGBkSxLW0uAJQCTyYTBYLhhNZog6v/2DTRFhFnH9uMbRVBE" +
-+ "Bbfi0eFPYzKYMBqNmM1mLBYLQYHBPPq7OcQ1TwSguKqI4xcO43A4cLlcuN1urvF34ZqQax4YgsVw" +
-+ "uVycKTgl/j66y+3odXoMBoMICuEz0BLIsJTRYtmfTm7C6XTeAMYVyDXtYyiJrNLLl8RzLYKjUavV" +
-+ "6HQ69Po6gKjValwuFx6Ph/ZRHcSyl61V4hT3BiiaJtc0MKTi8XiwOW3i3xU1pTISS/j0eDyo1Wqq" +
-+ "bVVi2WBTMy+Q3ZCG5aqGEkG5vo7fSlQqFV3b9hT/3pz5g+h7CEOE8Ol2u9l0/AexbGhAhIz9vOF0" +
-+ "Ni5XBAwpAHxR0sLv/y6QKDuzZ1xf9No6sioj7zCbjn+P3W7HZrPJjvXpq9mRuREAiyGQgYkjRPbz" +
-+ "akHxn34R/tuimTdv3rzGCknNsPINFQ5lvEKQX/t2SoGoRoPKreZA9h4A9mfv4mJFESGmUFSoOVNw" +
-+ "ks92fMD7m14Vr5/Y6z56xPURSS6dTtfk6ar0uaX34gsU/2tWqFEew1eMQohTlFQVE2RqhkZdp2jh" +
-+ "rZQev9Z0CzMSu91OTU0NlVWVTHx9BBW1ZY1e2ztuIH8Z9TeCA4OxWCxN5jF8RW+VsxklYaZWq8Xf" +
-+ "/xekSc6n2+3G6XTidDr5+eROvj/wDT9lbqb08iVUqAgyB5MaP5AHhqbROqItOp0OnU6Hx+MRHcNf" +
-+ "Y8Kl8q99nzcKChUqxve4h3v6PYTJWMdz6PV6tFqteC+NgUJqGYWprsvlEq+TOr7C8b8EjgYthvC2" +
-+ "CDGKTza/yxtr/47H4z1kAGg1Ou7pP4U/DZl+VabbV/tCjMRms3Hk7EEeem+iGCO5o9tk7C47mUVH" +
-+ "cbjsWAwB9Go3gD7xg4hsFoXBYMBgMIiWoimxEukzO51Ojp47xJr9K9mVuZX8shyCzSGEBoQxJGUU" +
-+ "E/tOJtASJL4I/y4reS2IX2AoA1evffcin2x9RzyvUWuJb56IzWmjoCIXm8Mqnnv0d3OY0OcPGI1G" +
-+ "jEYjOp1OfMOaKlJiy+l0UlFVzh9fv5Xzl84C0DduCGlDZ6PRaGSdolarxXC7wG9IO66poHA4HHy0" +
-+ "6W3e/nEhLrfLZ/kQSyiP/G42N990KwaDQbRK/wvgaHAoEcxpVv5Jlm1/X/x9VKfxTOx1HwHGIFQq" +
-+ "FZW15Szb/T6bMr4HYPGGl2nfIomucT1kQ4nH47kiZQnAcDgcLPruOREUEYEtmDr4L5hMJvR6PTqd" +
-+ "ThwmpKZdq9U2+U2WAtHhcLDwX/P44qcPZWWaB0Vhc9RSWVuBBw9l1aXM/3Y2QaZmpCb2B/ifCdT5" +
-+ "BIbU6XK5XLy77hXxrRnd5Xbu6zdd7AyNRoPJZGLGyKdRqVRsPL4Gl9vFusPfkdSqkyxZpimiHOOd" +
-+ "Ticb09eyat9XAKhVah4b8TTBAc0wmUyiRZL6DwIYpUdTQeF0Ojl0Zh9f7vxYPN+1dU/GdZtESnRX" +
-+ "VCoV5y5l8dFPb3E8Lx2X28nfVv6F96esoHXzGC+f6noFiF/bLlXWrpNbATDrLdze/V50Oh1GoxGL" +
-+ "xUJAQAABAQGYzWYeGPwIalVdlbuztmKz27xiFMqRS8mNSAHpcDjIv5TLi9/MEcvf3uNeOrbuitFo" +
-+ "xGQyYTKZMJvN4rAlHTqkZl3ZlnLGITiXDoeD19a8IPpRAxKGM2fMy3Ru011sM6l1J56b8DqJUR0B" +
-+ "qLJWsvnoD9jtdjFYd71zHA0O+m63m2rrZWrtNQBEh8QQaApCq9WKTp1wGI1GIppFilHNksvFXKq4" +
-+ "6DOq6Q8IwhvrcDjEMPvcrx6nsrYcgA5RHbkz9T70er3YptKH8DfGNwQGwdG02+1UVVdyIvcoAFq1" +
-+ "ljt7/gmtVitGcAMCAuqiuAFBTB1anxeyO2sbDocDp9Ppc3p7vUmj09WyyyXid71GL5pqaU6loGyN" +
-+ "RoNWoxPL69QGsZMFUy8VKTCUh9PpZOnW9zhwto7MMustPDbiGYwGozjb0Ov1DU6HBcKtIQpf2p7D" +
-+ "4eBI9kGcbicA3dv2JTIoCr1eL3OkPR4PdrudjjFdCTaHUFFTxqnCjP+pCG6jwAgPjMSgM2JzWMks" +
-+ "PEpZdQkmk8knC1hjq+Z00QmgbmytsVYTaA/Ebrej1WpRqVS43W7RERU6pKgsn59ObMHhdBBoDOKm" +
-+ "tqnkXjrPPze/Id7HlIEziQqJls00pIBQ3ou/IUr6Pa8kh1P5GWQVZpJVcJKsokzyy3LFNg0ag/gi" +
-+ "CFZJp9OJdWjtWrG9AEOgrC1BrtThvlakQWCoVCr0Oj2dWt/E/rO7cbldfHvwC6YOexyHw4FGoxHf" +
-+ "SrvdzgebXsPpcgB1Cpm+7G6Gp4zhzj6TadO8LS6XSwSIx+Nhffpqvt69jMPnD8i4EY1ai0lnEusa" +
-+ "0H4E/ROGibMMoQ5A1tm+4jgej4fLtVWcLsgkqyCTrMJMzhSe5MzFU9TYqhtUzvH8dBnYlB18sbKQ" +
-+ "qtoKAIJMzZqs9OtBGgWGWq3mDwOmsP/sbgDWHF6B1VHL9JufwO12o9VqKaoo4INNr7Hp2FrZ9Tan" +
-+ "le8Pf82PR79lcNLvuLvf/cS1SEClUvHlro94d8Min+263E4u/xI2jwiIZHKfabLZBtQBwuFwyADh" +
-+ "crm4UJxdB4LCTLIKT3Km8CSF5XlemeT+JNgUgs1pxeqopaS6mHXHVjGu512yF8HjqUs1XLL5TbHe" +
-+ "pJadfU5Vr0drAQ0QXIJzZrPZqKmp4cWVc1ib/o14XqPW0CK4FeGBEZzIP4pdkisxImkspdXFHLyw" +
-+ "R9YhKlT0jOtPVHBLVh38Svw9KrgVPWP7odPoyS07z96z28VzAYZA/j7+PSJDosTZh06no8Ze/UvH" +
-+ "Z3K6IJOzRac4e/E0Vkdtkx5cq9bSKrQtMWFxxIS3o21YPDHh7QjQB7HlxI+8u22heM/3D3yE8al/" +
-+ "wGgwotVqcbqcLF63gG9+/gwAg9bAO5O/IjqitThDk/o/glxPgbcGmU/hrbRarVyuvszra+bLOtSr" +
-+ "MpWKyX2nM7LjOFQqFfkVOaw69CU7Tm3E9YtDp5Tbuv2Bu3rdLzqnHo+H3ae3snjzy9TY60x99zZ9" +
-+ "6J8wjLyKC+SUZpNdnMXFyoImP2SIOayu88PjiQmLIzaiPa1C26DT6r2CYB6PB4fTwVMr0jiely7W" +
-+ "YdZbaNe8Pc3MoaRf2Mdla30i0F2p93NP/4fE1EIBvFLuxpear2Wuo1FKXJjb19bWUlNTw96TP/HF" +
-+ "7iUczT0olrUYAukR05ehSaPo1KabzDH0eDwUleezct9nbDy+WpaF1Tt2EI+NeFq27gPA4XBwpuAU" +
-+ "Mz6fjNtPXMaX6DQ6WoW0JSY8jrbi0Z5mlhAZAJQEmHR6K4QBKi6X89w3/8eh83v9K0+l4t6+f2ZC" +
-+ "r3tEXkdgY5V+kNQxVUZmr0X6vElBNCHsbbVaqamp4di5w8z4bDIACZEpzB75EmZTfVhbqhjB6tjt" +
-+ "di6WFTHrq4coqswH4Lmxb5DcujNms1lUKCACcc5XaX47JtQS/sswEEdseDxtI+KIDolBp9WJSvfF" +
-+ "hErTAH0xowIw7HY7NbU1rNzzGWsPryS39LzYtl5roEvrHozqPJ6ecX1FTkcKcKkFkvIlgrqlnEtj" +
-+ "zOx/Q5rkfALiNM3lclHtqBTLNA+MwvhLCr9AdgnjqwAMp9OJVqulOZHotQax7rYR8SJZJphfoSPd" +
-+ "bjc3xfQSgREf0YEeMf2IjWhPu+YJhASEispVdrrybVRaC1+UuXBPHo9Htt717gF/YkLqH8guyqKy" +
-+ "pgK700Z8ZBIWo0UWqPPFqwigWLduHdOnT5cNJ9u3byc8PFycAl9LoIAm5mNI5/JOp5NKa7l4LsQS" +
-+ "JhJA0tiFML4KihZAAvU8g81pRaMJETtMGEqE2U5uWf1b2q/dcAYl3Cx2gsBlCJ0ojZUIokys8WdF" +
-+ "lNdJgSZ0fgdDikh1C3UJ02dfYXehfbfbTWVlJTk5OTKdVldXExgYeM2uyG8UGMq8S7VaTVl1qXg+" +
-+ "NKAe9dJIpxQYKpUKl8uFTqejU5tu5JSeA2Bn1iZuC5kkG7IEABVXFLEloz6hd1f2ZgJNQaTG9Rc7" +
-+ "QBkTkU5lXS4XxZVFbD22HrfHRYglnNbhMWJgD5CZfCUwpBZGsGpS8spfoo4SFMIwohSr1YrdbvfS" +
-+ "17UiV7R8QACHdH1HqCVMNl76S7oV/u4a01Oc9n5zYBnd2/YmXt9BHD5UKhUOh4Nl29/H8QvBBXD6" +
-+ "YganL2awdG8zhnQYyS033Ua7Fgk+Gc6fMjbz2Y5/kn5+v1dSUffYPjw0fAYdY7qKPo1g0aTjvPRF" +
-+ "kPIXSl34Su2TlvOXCyuNqwj3f61YC7iKdSUej4fS6npghFjC/JpkobzQaUVl+Szd8a54rtJawZyV" +
-+ "adzZazLDO48mLCiCrMJMlu/+hK0n1onl9BoDdlfdbKaytpxVh75k1aEvSY7uzKiu4xnacSQWYwAq" +
-+ "lYpNR9cy/19P+k2uOZC9m4c/2MOccS/xu5vGyjrR1zYJAgCENStSUQLJl66kn1KRguJalCsChtDJ" +
-+ "UoshBYZUUUJZITiVXZhF2pJ7KarIl9VZZa1gyfY3WLL9DVSovBjKwe1HcsdN93Ewdw8/ndnIyaJj" +
-+ "4rmMvCNk5B3h7Q0LGNhhBNEhbfh4+2JxihsdEkO/+CGEWsK5dPkim058T1l1CR48LFzzLBFBLege" +
-+ "n+oX2NJO9/dGN/aW+0o1UP5+LYLj6iyGdCgJCPc5F5eC4sSFYzy6ZDIll4sBCDAEcX+/R9l1Zgv7" +
-+ "z++sv8YHba3T6DHqTQxKvJnhHUdzsaqAzZlr2XpyHRU1dUnBtfYa1h1ZJbtuWNIYHhz4GHpd/Qzp" +
-+ "jl738vr6+ezK2oLdaWfRmnl8+PC/vHyEqwFAYzrz9Zs/0FwL8qsshk6jx2II8LIUQujZ4XCQfmYf" +
-+ "Mz56QMypCDGHMWf032kdGkv/xKGcKDjK9lPrKb18idLqSxi0RqKCW7H91Ho8eNiQ+R0JLVLonzAU" +
-+ "g8FArCWeB6Me476B09mTtZ2Nx1Zz6MLPMiKsXXgCDwx4FIPeIIvEGo1G/jr6bzz6aTa5pefIKT3H" +
-+ "2cJTJLZOkWWBXWvj/dXKr6HgmwwMARR2h02kg5uZQ2UNSh1Ah8PBnswd/N/SqSK13TwoimfHLqJl" +
-+ "SCvRWe3Zvg894nt7Jc8Em0P4Lv1LAJbsfI24FgnERyXKOJKhnUYyoMMwCkrzWLj2WU4VHQfg5uSx" +
-+ "aDVacSW8Xq8XZ0YajYZhyaP45Ke6xOadJ7cQF5Uogvl6lsaGJingGwNJk9K2pWbvUlWx+HuIOdSn" +
-+ "tbDb7Ww5so7HP35ABEV0SAwvjH+TVmFtxGwogfGUZoEJ3+8bOI3OrboDYHXUsujHudTaa8QV7gLb" +
-+ "aDabiQ5vTURQpHhfMeFxslXwAoEmfI+PShLLVlkrvUL315soZ2bKTDhhBtRQiqVSGgWGFIVut5tL" +
-+ "lRfFc80sYbJzApW8dv+/eHLZNDEu0i6iPS+Mf4PmwS1kiTZKFlJKKJmMJp649QXCA5oDkFd+gdfW" +
-+ "vSDSymq1WkasGXQG8b4qasu8OAZpW5WSBUvBppBr3hH0J8qUAyH0IKzntVqtskOZk9rQszY4lCgT" +
-+ "X1wuF8UVReL5Zr8oVTjn8Xj4bt9yFnw3V+QPkqI6M2fMSwSag0UCTKVSUVRUxKFDh0hPTyc/P19m" +
-+ "xkePHs2wYcMIC4rgqd//nVlfTsXhcrA7aysr9i5lUv8HvFILeycMYvMvhNies9vokzhINjRJn2PD" +
-+ "0TViW2G/rIS/1pjHxkQJCiFvNT8/n3379nHw4EHy8vJkQbtx48YxevRodLq69MuGdjH0CwylaRJM" +
-+ "khQYQcZm4k3ZbDZW/ryMdzb8QzzftU0vZo16HrPRIlqIjIwMZs2axbFjx3w1C0BsbCxDhw5Fq9WS" +
-+ "0qYrDw/9K29ueAmAT3a8TUKLZHol9BNpabVaTb8Og9Fp9DhcdradXE9q/EAGp9yM3W4XLYzL5eKb" +
-+ "PZ+Tfn4fUDfV7h0/sElLDK4l8dU3Bw8eJC0tjaNHj/q9LjY2lmHDhnmFB3yJz6FE2rAwPJzMyeCf" +
-+ "G99kxZ6lYrmc0mxKq0qwWq0s2fymDBS94wYxe/SLWEwBIsP41ltvMXbs2AZBAfVhao1Gg16vZ2zP" +
-+ "OxnR8da6cx43f1/9FPkludjtdpFuDjIHc0fqH+vuHw+LfpjL4vULyDh/hNziHPZm/sRL3zzFq2uf" +
-+ "F9u5o+dkGWivZKXcf1sES1FTU8P8+fMZNmxYg6AAxKFGGuX1J14WQwmKyssVPPvF42w+9oPXxXuz" +
-+ "d3Ak9wAJLVI4nLNP/H1wh5FMH/YEBn29L/HCCy+wZMmSJj+0wDYKx4xbnia7+DRZRZlU1JbxwrdP" +
-+ "sOief6JSqcTh6YFhj3Ku+Cy7Tm/B6XayJn0Fa9JX+GxjUOLvGNl5nNdKtmvdYihTIWbPns177713" +
-+ "Rdc2hUPxuxKtLnu7kEf/eR8nco/4raDWUSMDxciOt3H/wEcw6OvzMvbv389HH33kda1KpSIqKorm" +
-+ "zZvLSLJWrVrJlhh6PB6CCGLuhEVM+3ASVdYKThYc4+31C3ls1BwRRFqNljnjXuSDTa+x9vA3sliL" +
-+ "tM2Jve7n7j73y6K0DRFcSgVeLQvaFGnsTZa+tFu3buWDDz7weR/R0dGEh8vJx+jo6Cbnf8iAoXRm" +
-+ "Xln1vAgKk87MLZ0nMCRxFHanjfMlZ9mU+T3H8uozufq0G8Ifez+MVqMVt2p2OBz89a9/9eIIhg8f" +
-+ "zowZM4iIiJAtY1TmNwiRUICYyFieHDufp1c8isfjZu3hlXRo2ZGRXX+PXl+XpmcxBTDt5ln8vttd" +
-+ "rD64gqLKAsprStFp9PSK7Ufv+EFEBEfKkmuk3Iiyg6Sfyrfs3+m0Kutu6LvT6aSyspK0tDQvvY4a" +
-+ "NYq0tDTCw8N96tVXLqov8TmUuFwuTued4Mf0OprZpLfw9JgFJEaliJW2i2pP7/YDeG7VXzhRUDe2" +
-+ "lVRf9AqH79u3j+zsbFkb48aNY9asWbJFPNKVZMKU1VfeZL+kwfyx/1SW7qgjqBZveJnY8HgSW6WI" +
-+ "UVK1Wk2LkGgmD5gmy6EQ7k1QknTfDH9LGZVLEaQdqEwGkib9NHXa6ys6LP3bV11Op5OdO3dy4cIF" +
-+ "2e8TJ07kscceE/UqfTZl7khjw6aXxRDGr5W7PxOnnGO63E5iVIrXW2wymZg7/hVmLruPgoo8Thdl" +
-+ "UF5bSlBQkKigQ4cOyRoMCgoiLS0No9FIQECALEdSmnYn5Tek4na7uXfQVE7mH2PvmR3YnFZe+O4J" +
-+ "Xp30Ec0CQkDlIftiFqcLThBiDqddRAJmvUWWWCNYM2Ueh7SjpESRy+XC4awLBGbkHiHIFExyq86E" +
-+ "BIR5ra5X5o82BRTC0ADItq1yu91YrVaxHpVKhV6vx+PxcODAAVldYWFhTJ069Yr02tBw4tNiuN1u" +
-+ "LlYUir8NSBguW68qOHsOhwO1Ws2AxBEs//ljPHg4dGEPMS1ixQbT09Nl9ScnJxMYGCgSU8pUe2We" +
-+ "g9K86/V6XC4Xs259nrSP76GgPJeiinye+PJhzAYz2cWnsUs2n1epVLQIiqZ9iyR6xw9iaMeRDVLG" +
-+ "0ilgUVkBn+/4kGPnD3Ey/7jI4grSPCiKDi1TSG0/gDHdb5cBToi5NNSW0J5AOtXU1PD111+zYcMG" +
-+ "srOzyc7Oprpa3uYPP/xAcnIyhw8flv2ekpIiZqg3Va9NshjKsbS0un7NarApRPa2CcAQsq0CTIH1" +
-+ "Farr1656PB6Ki+spdICQkBCvJX++NjXxFfKWDjXNAkKYPeZF/vrlFFxuJzll8uFKeg8FFbkUVOSy" +
-+ "/eQGtmWuZ+YtTxMVFi1rT+hIARTrDq5m4XdzKZdkqynlYmUBFysL2J65kR8PrWLW2OeIiWwnJgQL" +
-+ "+vF3X9K9xV555RU+++wzysoa3kbKarVis9n+LXptSPx6IAHGIPF79qXT4ncp2gT0FVbkieeDLSGy" +
-+ "Rjt27CirNysry6suZb2+HkKZJ3GxspAl297A7rT5TcrxJXvPbGfKB3ew7tBqampqsNlssphCcflF" +
-+ "Zn+axlNfPNIgKJRyNPcgUz64gy93fMzly5fFev1tiSAA8MSJE4wcOZK33nqrUVAA4n0mJibKfs/K" +
-+ "yvKrS396bUi8gCFU0D9xqPjb+mOrZGOu9LhUWczmXzZbValUtA5tK3PEunTp4vUA+/fvFxUj3fjM" +
-+ "33YJSoestOoS05bczeGc/Y0+oC+pslbw4qon+Wb351RXV1NbW4vVaqXycgUPLr6dDUfWNF6JD7E6" +
-+ "anl74wLe2/Aq1dXV2Gw2MVNLKU6nkz179jB+/HhOnTrlozb/olKpSElJkf124sQJ0tPTvfpI6rNc" +
-+ "STxIHEqkJlutVjMgaSiL1szD5XaxK2srX+35iEn9HxSpZZVKxaXKYuZ8kSYuC+zffjitwmJkeZ89" +
-+ "evSQOWIej4d58+axePFiunTpglqtxu12y7gEfxlhwkMv+PZZWUKyIKHmCIYm3kKbsHa0bNaKKmsl" +
-+ "+eUXOHB+Nwdz9niV/2Dra3Ru3YOYyFg0Gg3vb3qVc8VnvMoFGoMZmnALbcPjiW7WBquzloKKXI7k" +
-+ "HmD32S1ei6K+/nkpvWL706ntTbKF31IpKiriySef9PIhAMLDw0lOTiYlJYWoqChRH1qtltjYWPR6" +
-+ "Pd26dZNd43a7mTt3LosXLyYlJaVRvfpKgpaKbMGRdNyrra3l820f8ua6l8TCsRHtGdhhBMHmZmQV" +
-+ "ZbLz1BYxi0qn0fHGPZ/SNjIOi8WCwVC3hYDNZmPWrFksXbpU1rBOp2PChAl0796d7t27k5iY6LUc" +
-+ "QOo4ud1u7HY7q/euZO7ymbK61CoNE7rey83Jt2IxB8gWPAnPdCwnnXe2LKCwMk92bUrLm/jbba+S" +
-+ "VZzJnBXTvDp5VPJ4xt00iUBzkMyZE+o9W3Sa97b9g6yLmbLrokPa8OqkjzAbLWzYsIG0tDTZ+fbt" +
-+ "23P69GnZb3q9nilTpjBp0iQZ8SbVieDYOp1OZs2axVdffeVVxx133EG3bt3o1q0bCQkJPvXaaMaa" +
-+ "EhjC1ElYzLxw1TxWH1zudaFUAo3BPDF6Pl3b9hDzLKSryoqLixk+fLjX2gqpBAQE0KlTJwYMGMC0" +
-+ "adOwWCwyD9/tdlNQksddr4wUwQh1e3I92Hcm/doPFRc9+wKG3W6noDSfZ795lIKKXFnbf+g1lc0n" +
-+ "v/f6/fauk7m1650yIky6OEjIeSivKuNv3/5FTBQS5NYudzK5/zQ2b97MzJlyMCslMjKSRYsWkZiY" +
-+ "KK7oUy6NEKacQtuXLl1ixIgR5OXl+a03MDCQzp07M2jQIKZOnYrFYhEnEVLLrgSHbMtopYMH0KNd" +
-+ "X1o1iyH74mkqrRXyi9VaurTuwewxL5HYMlm2Ek1Komi1WpKSkli/fj1WqxVfYrfbyc3NZefOnaxZ" +
-+ "s4akpCQiIyNF38LpdLJm30q2HP9Rdt0tKbdzc/JY2V5c/pRq0pnoEt2DdcdWIV1WUFieR1GVPEk5" +
-+ "NWYQd/W8X0wqEuqVcgNC3VqNjp5t+7Hh+Boxmx0gr+w8t3ScQHZ2Nhs2bPDbeSqVivnz59OtWzfZ" +
-+ "nmbSZY9C29KhQa/Xk5SUxIYNGxrUa05ODjt27BCnuhEREQBeFkPa/z73EpdO4dQqNTERcdzSdTxJ" +
-+ "UZ3p0qYHSVGdGJg4grQRTzKqy22EBoWJoJDSrlI2sWXLlowePZozZ85w7tw5v0oCKC0tZfny5YSF" +
-+ "hZGUlFRPuu1ZRlbRSbGcWWfhwT4zMRstMg5B6ZtI+QmDxkRheR7nS+p9iVpnDUgSkdUqDVP6zCTY" +
-+ "EiIDg3TpoZIVVXnU2OxWMgrq+QWHy05qzEAuFZSwceNGv887btw47rrrLhEUAh/hb38xKfHXsmVL" +
-+ "xowZ0yS9lpSUsHz5cqKioujQoYNX+F1mGDw+XFQl8yeEa6WLZEC+dFFAszKELR2ahEXR3377Ldu2" +
-+ "bSMjI4OzZ8/6XKkFYDabWb16NbGxdYTZlPdv53zJWfF8kCGYViFtZcv8/FG90s6sqCnnXEmWVxlB" +
-+ "jFoTsWHtG1zG6KveGlsNpy9myM5P6fsXHHkqnnrqKb/tffjhh3Tr1o3g4GCRtZRyEIKupW1KF4vX" +
-+ "1tZSW1vLt99+y9atW8nIyCA7O9uvXi0WCz/88APx8fGiNVRGl5u0DYKUGpYmzSpT8nyNWdI6lP9C" +
-+ "wm63c/nyZTIzMzly5AiffPKJF3GTmprKkiVLcLodTFw8/Iq2RbgWZETiWKJq4nnmmWd8ntfr9Wza" +
-+ "tImwsDARGMoV876ivU3R64kTJzh69Cgff/wxly5dktXRp08fli1bRmBgoIwlFfrObwaXcDNSnl05" +
-+ "H/YVQPI5XkkaFCyMwVC3o5/FYiE0NJSePXsybtw4HnnkEVl8Ze/evezaQV63dQAACGFJREFUtYvQ" +
-+ "mKDrDhQA+RU5tNDG+T3frl07cahq6rYI0r6R9oEvvfbq1YuxY8cyffp0WSLP7t272blzJ0OGDPEa" +
-+ "KqGRZGBpo9JEXemh3GjVF0sp1CFcL90zMzAwkKCgIIKCgoiKimLBggWYzWbZfaSnp6NT6xvpgmtT" +
-+ "zAZLg0xjWVlZgyylP1HqVYgW+9JrdHQ0CxYswGg0yupIT08XmVTlcskmr3ZXfm+onL9zSqApfRmt" +
-+ "VktcXBypqals2bJFvD4jI4M7776D+OZ1/wDPX25EYyKUr7FXe81CpKLXGGgRGH1FHSWtX3o/8c2T" +
-+ "0F7yr+aioiLKyspo1kz+f9uaIk3Vq0ajITExkZ49e7Jjxw7x+uPHj4u0vbCjoiBNXnDUFMU09Xql" +
-+ "DyJ1Vp1OJwkJCTJgnDlzBrPBwku3vyNyGkr6XOp4KkP10imvw+Hgk11vy4AhZWahLq/0wdTHxYQe" +
-+ "X6ZWLKvYRkkQ6dC6adOmBnVz8OBB2rRpI+sgt9vdKDspvXclgKV6FZ49KSlJBoysrCyfdHmDPsa/" +
-+ "W5RvgfKBpH5KQYF847WoqChZ5BDqglB2h43zl87SNjxeljGuzImQRk0LSvL46aycU2hmCKXMWh9N" +
-+ "drodbMpawx97PyxLepGO/8pp8OXaKkqqimnZrLXoSwkdK9yzP3nrrbcYMmQIJpNJ3DZSqqcrEX96" +
-+ "1Wg0XkRYVFSU30yx3xQYvtLjfJ2Xrluprq7m559/lpVLTk6W+TeF5fmsPrCCdUe+pbK2ggcHzWDM" +
-+ "TbfLNoiVdqAwZa6xV7Nw3bNeuaC9Ygax98JWymvr4y/bz6wjPjKRmzuPlU3HBdBJQVFSWcwz3zxK" +
-+ "VlEmnVp3Z1Tn2xjQYSh6XZ1f1NimKHl5eSxcuJD58+fLGFuPx+PXoW+K3qU8S0VFBXv2yONFApch" +
-+ "iPT7bwYM5c35S1VT0vDz5s2jsLBQVlfHjh3FTl9/9Dv+sXqebIby/tZXqLJWMKnvg7J9LKQPmlNy" +
-+ "jpdXPc3Z4pOyumNC4/h9l7voENWR17c+V39fePho95vYPTbG9bhL9tZL6y0qL2DW51PFzduO5hzg" +
-+ "aM4Blu1qzbsPfIVJb/KZX6nVasWsLYCVK1dit9uZO3cukZGR4g5EUstzJdZDqddnn32WkpISWZnk" +
-+ "5GSvnYCEz98EGFJQSMPA0qVxUividDo5ceIE8+fPZ/PmzbK6WrVqRb9+/URLcHOXsazY8ynZF+UB" +
-+ "qC/2LGHX6a10adOdrm170TmmO9W2Ks4Vn2HXqS1sOPo9bo+c8NGqdUzp9ziBAYGkBvdnSOEotmTW" +
-+ "L5Nwe9x8uvtd1h1fxe+7TaRDdCfaRbanuKqII+f3c+jcPtLP/0y17bKXDm7v8UcMWoNfx/WBBx7w" +
-+ "SvtfvXo1P//8M3/+85/p3r07HTt2xGg0XtViKEGvGRkZPP/882zbts1Lr3379pVNkxtlPn+tSJ29" +
-+ "JUuW8NJLLzWY5lZaWkptrfeOviqVirfffpsBAwaI6YAqlYqs/JM89MGdsn+3dTVyR7f7mNDzHpFQ" +
-+ "qrZe5pFP76G4qqjxixuQwYkjmTnqGUwmExqNhrVr1/Lwww/LyqxYsYKlS5eyevVqv/Xo9XpxCcDV" +
-+ "iD+9qtVq3n33Xfr16yeSakr28zcbSgRrUV5e3mBUtSGZMGECffr0kcVgAOJbJvL6vR/z7IqZV7RD" +
-+ "sCAGrYE7u/+JMTfdIcYltFotZrOZhZM+YNH3f+No7oHGK/IhozqO574B0718Ha97MBiYOXMmBoOB" +
-+ "r7/+2mdddrud/Hz/0+qrlYkTJ5KamipLGFbe52+yJk+ZcXWlotPpSEtLY/bs2WKUUQCGcCS36cxb" +
-+ "kz+lW0zvK6o7PiKJF297h9/3uIvAwEAsFgsWi0Xc7rldy3gWTHqXKYNmYNAZG6/wFzHpzEwf/CR/" +
-+ "GpCGxWyRhel9+RhGo5GgoCCefvppXn75ZSwWyxU9x9WIwWBgxowZzJo1S6ZXKTB+Ux9DkIaGD1+i" +
-+ "0Wjo3LkzTz75JElJSZhMJq9tmKHeQWoR3pKX7l7M0XOH+O7gcnad2SL+KwupWPQBxITF0aNtX0Z1" +
-+ "Ho/JKN+TQ3Dy3G636Izd2W8yPeP68cWuDzldlEF+eY5PSj4ysCU3J49laPItBAc0k+13KqzElxJH" +
-+ "ggjPptPpGD9+PIMHD+brr7/myy+/vGoL60+0Wi1dunRhzpw5tG/fXmxb+uxNiq7+WpHyBjt27ODH" +
-+ "H3+U5XcqmwwNDSU5OZkOHTqIAR2B4vW1DbPgbQv/Hks4yqvKuHApm/yyXIqrCgkPiCSueQItgqO9" +
-+ "FhspN5EVpojSfSakQamq6kqyijI5c/EkGrWWyKCWtAhuSVSzVn7rFdIgjx07xvLly0XqGWDatGkE" +
-+ "BQWJiT/C4nGbzcbp06c5f/48OTk5lJWVXTUjKqQIJiQkiHqV6rSh/0X7mwFDulJeunGHsNLaVyBO" +
-+ "umJKMMO+cjsaSwtQbpskkF/K1VjKoJWUDPO1I41yC0aByJLes/BdqFMAmgAyp9OJSqWSlRfYXKEd" +
-+ "5XNczbaPDelVysn4y+D6zYYSaSQV6oYJ5e660rL+Qvj+oo1S+ltoR5pt7oue9rW7jpJKlv6trNdX" +
-+ "dNlXvcqpn1BWoLoFfUjfVo/H4/UMv3YLKH96le6/7m8a/JtYDPDOnGroIaXolj6MNO6hvHmpeZXG" +
-+ "Kny14av+hoJjUufZV93KepX3LK1TmeklXC8NASjLKj+lz3sl4k+vTWFTfzNggO91IdJzvuhYX29w" +
-+ "Y2009OmrbuXvTanb3zjv616VwPB1vT9gKsv6i2U0JP4Cllei198UGOB/Ob/Xjfgwvb+mraa285+o" +
-+ "90qe21fZX9NFV6vX3xwYN+T6lOtn06kb8h+V/wcIaMCGoyfFqQAAAABJRU5ErkJggg%3D%3D"
- }
-+
-+ "YaCy": {
-+ }
-+
- };
-
+- }
+-};
+-
// The process of adding a new default snippet involves:
-@@ -143,7 +392,7 @@
+ // * add a new entity to aboutHome.dtd
+ // * add a for it in aboutHome.xhtml
+@@ -142,7 +44,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"
@@ -479,7 +147,7 @@ diff -Naur icecat-13.0.1/browser/base/content/abouthome/aboutHome.js icecat-13.0
diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties
--- icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-12 14:27:37.000000000 -0300
+++ icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-17 22:01:56.786224684 -0300
-@@ -1,28 +1,24 @@
+@@ -1,28 +1,28 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -500,8 +168,12 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop
-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.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
++browser.contentHandlers.types.2.title=
++browser.contentHandlers.types.2.uri=about:blank
# Keyword URL (for location bar searches)
-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
@@ -516,18 +188,20 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop
# 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 +26,19 @@
+@@ -30,3 +30,21 @@
# 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
++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.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
@@ -560,7 +234,7 @@ diff -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in iceca
+
+
Free Software Foundation
+
-+
- Free Software Foundation
++
- Free Software Foundation
+
- LibrePlanet
+
- Free addons
+
- h-node
@@ -636,7 +310,7 @@ diff -Naur icecat-13.0.1/mobile/android/app/mobile.js icecat-13.0.1-libre/mobile
diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties
--- icecat-13.0.1/mobile/locales/en-US/chrome/region.properties 2012-07-12 14:27:37.000000000 -0300
+++ icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties 2012-07-17 22:01:03.952816711 -0300
-@@ -1,18 +1,16 @@
+@@ -1,18 +1,18 @@
# Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=Duck Duck Go (Lite)
@@ -651,8 +325,10 @@ diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13
-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.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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
@@ -660,22 +336,24 @@ diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13
# 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,9 @@
+@@ -22,11 +20,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
++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.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 -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul/app/mobile.js
--- icecat-13.0.1/mobile/xul/app/mobile.js 2012-07-12 14:27:37.000000000 -0300
+++ icecat-13.0.1-libre/mobile/xul/app/mobile.js 2012-07-17 22:08:34.513828987 -0300
--
cgit v1.2.3
From f424dc07b1a9dd6064f40260255fae7607db3f78 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 14:25:43 -0300
Subject: cups-filters-libre-1.0.19-1: updating version
---
libre/cups-filters-libre/PKGBUILD | 34 ++--
libre/cups-filters-libre/buildfix_dlopen.diff | 31 ++++
libre/cups-filters-libre/buildfix_poppler.diff | 224 +++++++++++++++++++++++++
3 files changed, 279 insertions(+), 10 deletions(-)
create mode 100644 libre/cups-filters-libre/buildfix_dlopen.diff
create mode 100644 libre/cups-filters-libre/buildfix_poppler.diff
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 662ed4d1a..1f4ba1f6e 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,37 +1,51 @@
-# $Id$
+# $Id: PKGBUILD 163769 2012-07-19 15:52:39Z andyrtr $
# Maintainer: Andreas Radke
pkgname=cups-filters-libre
_pkgname=cups-filters
-pkgver=1.0.18
-pkgrel=3
+pkgver=1.0.19
+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.1')
-makedepends=('ghostscript')
+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'
'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly')
backup=(etc/fonts/conf.d/99pdftoopvp.conf)
-source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=(63972b426b7224915cdbb42b2a937374'')
-
+options=(!libtool)
+source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
+ buildfix_poppler.diff
+ buildfix_dlopen.diff)
+md5sums=('e3c9ad58ec005eda2f0ac2f3190a63b3'
+ 'b3d5b60a50568d06d1ef43c285ce7802'
+ '8b0c8874ef5c985287cada55db75d8d1')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
build() {
cd "$srcdir/$_pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc
+ # https://bugs.linuxfoundation.org/show_bug.cgi?id=1055
+ patch -Np0 -i ${srcdir}/buildfix_poppler.diff
+ patch -Np0 -i ${srcdir}/buildfix_dlopen.diff
+ autoreconf -v
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
make
}
+check() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ make -k check
+}
+
package() {
cd "$srcdir/$_pkgname-$pkgver"
- #make DESTDIR="$pkgdir/" install
- make install BUILDROOT="$pkgdir/"
+ make DESTDIR="$pkgdir/" install
# drop static lib
rm -f ${pkgdir}/usr/lib/*.a
}
diff --git a/libre/cups-filters-libre/buildfix_dlopen.diff b/libre/cups-filters-libre/buildfix_dlopen.diff
new file mode 100644
index 000000000..eea5f506c
--- /dev/null
+++ b/libre/cups-filters-libre/buildfix_dlopen.diff
@@ -0,0 +1,31 @@
+=== modified file 'Makefile.am'
+--- Makefile.am 2012-06-22 15:40:53 +0000
++++ Makefile.am 2012-07-19 09:36:30 +0000
+@@ -329,7 +329,8 @@
+ $(FREETYPE_LIBS) \
+ $(FONTCONFIG_LIBS) \
+ $(LIBPNG_LIBS) \
+- $(POPPLER_LIBS)
++ $(POPPLER_LIBS) \
++ $(DLOPEN_LIBS)
+
+ EXTRA_DIST += $(pkgfontconfig_DATA)
+
+=== modified file 'configure.ac'
+--- configure.ac 2012-07-19 14:02:32 +0000
++++ configure.ac 2012-07-19 14:39:25 +0000
+@@ -110,6 +110,13 @@
+ AC_DEFINE(PDFTOPDF, [], [Needed for pdftopdf filter compilation])
+ AC_DEFINE_DIR(BANNERTOPDF_DATADIR, "{CUPS_DATADIR}/data", [Directory where bannertopdf finds its data files (PDF templates)])
+
++AC_SEARCH_LIBS([dlopen],
++ [dl],
++ DLOPEN_LIBS="-ldl",
++ AC_MSG_ERROR([unable to find the dlopen() function])
++)
++AC_SUBST(DLOPEN_LIBS)
++
+ # ======================
+ # Check system functions
+ # ======================
+
diff --git a/libre/cups-filters-libre/buildfix_poppler.diff b/libre/cups-filters-libre/buildfix_poppler.diff
new file mode 100644
index 000000000..6f3cbc0b3
--- /dev/null
+++ b/libre/cups-filters-libre/buildfix_poppler.diff
@@ -0,0 +1,224 @@
+=== modified file 'NEWS'
+--- NEWS 2012-07-11 19:48:23 +0000
++++ NEWS 2012-07-19 14:02:32 +0000
+@@ -1,6 +1,11 @@
+-NEWS - OpenPrinting CUPS Filters v1.0.19 - 2012-07-11
++NEWS - OpenPrinting CUPS Filters v1.0.20 - 2012-07-19
+ -----------------------------------------------------
+
++CHANGES IN V1.0.20
++
++ - Made the Poppler-based filters pdftopdf and pdftoopvp build with
++ both Poppler 0.18.x and 0.20.x (Bug #1055).
++
+ CHANGES IN V1.0.19
+
+ - Fixes according to Coverity scan results (Bug #1054).
+
+=== modified file 'configure.ac'
+--- configure.ac 2012-07-11 19:48:23 +0000
++++ configure.ac 2012-07-19 14:02:32 +0000
+@@ -202,6 +202,7 @@
+ # ================
+ POPPLER_INCLUDEDIR=`pkg-config poppler --variable includedir`
+ AC_CHECK_HEADER([UGooString.h], [AC_DEFINE([HAVE_UGOOSTRING_H],,[Have UGooString.h])], [])
++AC_CHECK_HEADER([poppler/cpp/poppler-version.h], [AC_DEFINE([HAVE_CPP_POPPLER_VERSION_H],,[Define if you have Poppler's "cpp/poppler-version.h" header file.])], [])
+ # FIXME:
+ # Use proper c compile check not greps and then just link again poppler with all the features
+ # instead of this and all the libs.
+
+=== modified file 'filter/PDFError.h'
+--- filter/PDFError.h 2012-03-29 14:06:07 +0000
++++ filter/PDFError.h 2012-07-19 14:02:32 +0000
+@@ -31,6 +31,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+ #define pdfError(pos,...) error(errInternal,pos,__VA_ARGS__)
+
+=== modified file 'filter/pdftoijs.cxx'
+--- filter/pdftoijs.cxx 2012-06-04 16:46:44 +0000
++++ filter/pdftoijs.cxx 2012-07-19 14:02:32 +0000
+@@ -30,6 +30,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include
+ #include
+ #include
+
+=== modified file 'filter/pdftoopvp/OPVPError.h'
+--- filter/pdftoopvp/OPVPError.h 2012-03-29 14:06:07 +0000
++++ filter/pdftoopvp/OPVPError.h 2012-07-19 14:02:32 +0000
+@@ -31,6 +31,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+ #define opvpError(pos,...) error(errInternal,pos,__VA_ARGS__)
+
+=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
+--- filter/pdftoopvp/OPVPOutputDev.cxx 2012-03-29 09:42:35 +0000
++++ filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-19 14:02:32 +0000
+@@ -8,6 +8,9 @@
+ //========================================================================
+
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+
+=== modified file 'filter/pdftoopvp/oprs/OPVPSplash.cxx'
+--- filter/pdftoopvp/oprs/OPVPSplash.cxx 2012-03-29 09:42:35 +0000
++++ filter/pdftoopvp/oprs/OPVPSplash.cxx 2012-07-19 14:02:32 +0000
+@@ -5,6 +5,9 @@
+ //========================================================================
+
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+
+=== modified file 'filter/pdftoopvp/oprs/OPVPSplashState.cxx'
+--- filter/pdftoopvp/oprs/OPVPSplashState.cxx 2012-03-29 09:42:35 +0000
++++ filter/pdftoopvp/oprs/OPVPSplashState.cxx 2012-07-19 14:02:32 +0000
+@@ -11,6 +11,9 @@
+ #endif
+
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "goo/gmem.h"
+ #include "splash/SplashPattern.h"
+ #include "splash/SplashScreen.h"
+
+=== modified file 'filter/pdftoopvp/oprs/OPVPSplashState.h'
+--- filter/pdftoopvp/oprs/OPVPSplashState.h 2012-03-29 09:42:35 +0000
++++ filter/pdftoopvp/oprs/OPVPSplashState.h 2012-07-19 14:02:32 +0000
+@@ -11,6 +11,9 @@
+ #pragma interface
+ #endif
+
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "splash/SplashTypes.h"
+ #include "splash/SplashState.h"
+ #include "splash/Splash.h"
+
+=== modified file 'filter/pdftoopvp/oprs/OPVPSplashXPath.cxx'
+--- filter/pdftoopvp/oprs/OPVPSplashXPath.cxx 2012-03-29 09:42:35 +0000
++++ filter/pdftoopvp/oprs/OPVPSplashXPath.cxx 2012-07-19 14:02:32 +0000
+@@ -1,5 +1,8 @@
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "splash/Splash.h"
+ #include "splash/SplashMath.h"
+ #include "OPVPSplashClip.h"
+
+=== modified file 'filter/pdftoopvp/oprs/OPVPSplashXPath.h'
+--- filter/pdftoopvp/oprs/OPVPSplashXPath.h 2012-03-29 09:42:35 +0000
++++ filter/pdftoopvp/oprs/OPVPSplashXPath.h 2012-07-19 14:02:32 +0000
+@@ -2,6 +2,9 @@
+ #define OPVPSPLASHXPATH_H
+
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "splash/SplashXPath.h"
+ #include "OPVPSplashPath.h"
+ #include "OPVPSplashState.h"
+
+=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
+--- filter/pdftoopvp/pdftoopvp.cxx 2012-06-04 16:46:44 +0000
++++ filter/pdftoopvp/pdftoopvp.cxx 2012-07-19 14:02:32 +0000
+@@ -13,6 +13,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "goo/GooString.h"
+ #define GSTRING_H // for old GooString.h
+ #include "goo/gmem.h"
+
+=== modified file 'filter/pdftopdf/P2PError.h'
+--- filter/pdftopdf/P2PError.h 2012-03-29 14:06:07 +0000
++++ filter/pdftopdf/P2PError.h 2012-07-19 14:02:32 +0000
+@@ -31,6 +31,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+ #define p2pError(pos,...) error(errInternal,pos,__VA_ARGS__)
+
+=== modified file 'filter/pdftopdf/P2PFont.cxx'
+--- filter/pdftopdf/P2PFont.cxx 2012-03-29 09:42:35 +0000
++++ filter/pdftopdf/P2PFont.cxx 2012-07-19 14:02:32 +0000
+@@ -32,6 +32,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "goo/gmem.h"
+ #include "P2PFont.h"
+ #include "GfxFont.h"
+
+=== modified file 'filter/pdftopdf/pdftopdf.cxx'
+--- filter/pdftopdf/pdftopdf.cxx 2012-06-04 16:46:44 +0000
++++ filter/pdftopdf/pdftopdf.cxx 2012-07-19 14:02:32 +0000
+@@ -29,6 +29,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "goo/GooString.h"
+ #include "goo/gmem.h"
+ #include "Object.h"
+
+=== modified file 'filter/pdftoraster.cxx'
+--- filter/pdftoraster.cxx 2012-06-04 16:46:44 +0000
++++ filter/pdftoraster.cxx 2012-07-19 14:02:32 +0000
+@@ -31,6 +31,9 @@
+ #include
+ #include
+ #include
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ #include "goo/GooString.h"
+ #include "goo/gmem.h"
+ #include "Object.h"
+
--
cgit v1.2.3
From 0322e10d39b6d8c7453e408296f87bd322e14e4f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 14:37:40 -0300
Subject: virtualbox-modules-4.1.18-3: rebuild due linux-libre-3.4.5-1
---
libre/virtualbox-modules/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 50e9b0721..6406715b1 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=virtualbox-modules
pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
pkgver=4.1.18
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
--
cgit v1.2.3
From 907a30610d91abd77f8ad34c6350a0b3cb4fc676 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Thu, 19 Jul 2012 15:30:42 -0300
Subject: luxrender-libre: updating PKGBUILD
---
libre/luxrender-libre/PKGBUILD | 12 ++-
libre/luxrender-libre/boost_1.50_fix.diff | 131 ++++++++++++++++++++++++++++++
2 files changed, 140 insertions(+), 3 deletions(-)
create mode 100644 libre/luxrender-libre/boost_1.50_fix.diff
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index c802e1200..44df6f3c2 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=luxrender-libre
pkgver=1.0rc2
_pkgver=008805644181
-pkgrel=1
+pkgrel=2
pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.luxrender.net/"
@@ -18,12 +18,18 @@ makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
replaces=('luxrender')
conflicts=('luxrender')
provides=("luxrender=$pkgver")
-source=(https://bitbucket.org/luxrender/lux/get/"$_pkgver".tar.bz2)
-md5sums=('1922ccce6f70e7d707b340e2415875cd')
+source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
+ boost_1.50_fix.diff)
+md5sums=('1922ccce6f70e7d707b340e2415875cd'
+ '8c7774bb0c97aadd77d9e665d8fa4aab')
build() {
cd "$srcdir"/luxrender-lux-$_pkgver
+ # fix for boost 1.50
+ # the boost::TIME_UTC has been renamed due to the conflict with C++11
+ patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true
+
export CXXFLAGS="$CXXFLAGS -lpthread"
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DLUXRAYS_DISABLE_OPENCL=ON \
diff --git a/libre/luxrender-libre/boost_1.50_fix.diff b/libre/luxrender-libre/boost_1.50_fix.diff
new file mode 100644
index 000000000..c1aa0a8e2
--- /dev/null
+++ b/libre/luxrender-libre/boost_1.50_fix.diff
@@ -0,0 +1,131 @@
+diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp
+--- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200
+@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte
+ int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth);
+ samplePerPass = xRealWidth * yRealHeight;
+
+- boost::xtime_get(&creationTime, boost::TIME_UTC);
++ boost::xtime_get(&creationTime, boost::TIME_UTC_);
+
+ //Queryable parameters
+ AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution);
+@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) {
+ if (haltTime > 0) {
+ // Check if we have met the enough rendering time condition
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ if (t.sec - creationTime.sec > haltTime)
+ enoughSamplesPerPixel = true;
+ }
+diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp
+--- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200
+@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen
+
+ boost::xtime photonShootingStartTime;
+ boost::xtime lastUpdateTime;
+- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC);
+- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC);
++ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_);
++ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_);
+ u_int nshot = 0;
+ while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) {
+ // Dade - print some progress information
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ if (currentTime.sec - lastUpdateTime.sec > 5) {
+ ss.str("");
+ ss << "Photon shooting progress: Direct[" << directPhotons.size();
+@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen
+ return;
+
+ boost::xtime photonShootingEndTime;
+- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC);
++ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_);
+ LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)";
+
+ if (computeRadianceMap) {
+@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen
+ for (u_int i = 0; i < radiancePhotons.size(); ++i) {
+ // Dade - print some progress info
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ if (currentTime.sec - lastUpdateTime.sec > 5) {
+ LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)";
+
+@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen
+
+
+ boost::xtime radianceComputeEndTime;
+- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC);
++ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_);
+ LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)";
+ }
+
+diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp
+--- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200
+@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+ // Dade - thread to update the film with data from servers
+
+ boost::xtime reft;
+- boost::xtime_get(&reft, boost::TIME_UTC);
++ boost::xtime_get(&reft, boost::TIME_UTC_);
+
+ while (filmUpdaterThread->signal == SIG_NONE) {
+ // Dade - check signal every 1 sec
+@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU
+ for(;;) {
+ // Dade - sleep for 1 sec
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.sec += 1;
+ boost::thread::sleep(xt);
+
+diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp
+--- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200
+@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres,
+ m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != "";
+
+ // init timer
+- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC);
++ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_);
+ lastWriteFLMTime = lastWriteImageTime;
+ }
+
+@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter
+ {
+ // Check write output interval
+ boost::xtime currentTime;
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+ bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval);
+ bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval);
+
+@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter
+ // WriteImage can take a very long time to be executed (i.e. by saving
+ // the film. It is better to refresh timestamps after the
+ // execution of WriteImage instead than before.
+- boost::xtime_get(¤tTime, boost::TIME_UTC);
++ boost::xtime_get(¤tTime, boost::TIME_UTC_);
+
+ if (timeToWriteImage)
+ lastWriteImageTime = currentTime;
+diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h
+--- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200
++++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200
+@@ -126,7 +126,7 @@ public:
+ {
+ while (state == PAUSE && !boost::this_thread::interruption_requested()) {
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.sec += 1;
+ boost::thread::sleep(xt);
+ }
--
cgit v1.2.3
From 8a5908231eb873a22ff14fb9945899caccf8d2d3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 15:32:53 -0300
Subject: sdl-libre-1.2.15-1.2: updating revision due sign failures
---
libre/sdl-libre/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 3024bd9bf..662bcba99 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -2,12 +2,12 @@
#mips64el Maintainer: Allan McRae
# Contributor: dorphell
# Maintainer (Connochaetos): Henry Jensen
-# Maintainer (Parabola): André Silva
-# Maintainer (Parabola): Márcio Silva
+# Maintainer (Parabola): André Silva
+# Maintainer (Parabola): Márcio Silva
pkgname=sdl-libre
pkgver=1.2.15
-pkgrel=1.1
+pkgrel=1.2
pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
arch=('i686' 'x86_64')
url="http://www.libsdl.org"
--
cgit v1.2.3
From edbaf3e51f132c484cb2d24a21c8855e34300512 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Thu, 19 Jul 2012 15:34:01 -0300
Subject: luxrender-libre: drop PKGBUILD in libre-testing repo
---
libre-testing/luxrender-libre/PKGBUILD | 54 ---------
libre-testing/luxrender-libre/boost_1.50_fix.diff | 131 ----------------------
2 files changed, 185 deletions(-)
delete mode 100644 libre-testing/luxrender-libre/PKGBUILD
delete mode 100644 libre-testing/luxrender-libre/boost_1.50_fix.diff
diff --git a/libre-testing/luxrender-libre/PKGBUILD b/libre-testing/luxrender-libre/PKGBUILD
deleted file mode 100644
index 44df6f3c2..000000000
--- a/libre-testing/luxrender-libre/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky
-# Initial contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya
-# Maintainer (Parabola): Márcio Silva
-pkgname=luxrender-libre
-pkgver=1.0rc2
-_pkgver=008805644181
-pkgrel=2
-pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
- 'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
-replaces=('luxrender')
-conflicts=('luxrender')
-provides=("luxrender=$pkgver")
-source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
- boost_1.50_fix.diff)
-md5sums=('1922ccce6f70e7d707b340e2415875cd'
- '8c7774bb0c97aadd77d9e665d8fa4aab')
-
-build() {
- cd "$srcdir"/luxrender-lux-$_pkgver
-
- # fix for boost 1.50
- # the boost::TIME_UTC has been renamed due to the conflict with C++11
- patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true
-
- export CXXFLAGS="$CXXFLAGS -lpthread"
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DLUXRAYS_DISABLE_OPENCL=ON \
- -DPYTHON_CUSTOM=ON \
- -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
- -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
- .
- make
-}
-
-package() {
- cd "$srcdir"/luxrender-lux-$_pkgver
- make DESTDIR="$pkgdir" install
-
- # fix library path on x86_64
- [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
- #install pylux
- install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/luxrender-libre/boost_1.50_fix.diff b/libre-testing/luxrender-libre/boost_1.50_fix.diff
deleted file mode 100644
index c1aa0a8e2..000000000
--- a/libre-testing/luxrender-libre/boost_1.50_fix.diff
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp
---- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200
-@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte
- int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth);
- samplePerPass = xRealWidth * yRealHeight;
-
-- boost::xtime_get(&creationTime, boost::TIME_UTC);
-+ boost::xtime_get(&creationTime, boost::TIME_UTC_);
-
- //Queryable parameters
- AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution);
-@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) {
- if (haltTime > 0) {
- // Check if we have met the enough rendering time condition
- boost::xtime t;
-- boost::xtime_get(&t, boost::TIME_UTC);
-+ boost::xtime_get(&t, boost::TIME_UTC_);
- if (t.sec - creationTime.sec > haltTime)
- enoughSamplesPerPixel = true;
- }
-diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp
---- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200
-@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen
-
- boost::xtime photonShootingStartTime;
- boost::xtime lastUpdateTime;
-- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC);
-- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC);
-+ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_);
-+ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_);
- u_int nshot = 0;
- while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) {
- // Dade - print some progress information
- boost::xtime currentTime;
-- boost::xtime_get(¤tTime, boost::TIME_UTC);
-+ boost::xtime_get(¤tTime, boost::TIME_UTC_);
- if (currentTime.sec - lastUpdateTime.sec > 5) {
- ss.str("");
- ss << "Photon shooting progress: Direct[" << directPhotons.size();
-@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen
- return;
-
- boost::xtime photonShootingEndTime;
-- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC);
-+ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_);
- LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)";
-
- if (computeRadianceMap) {
-@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen
- for (u_int i = 0; i < radiancePhotons.size(); ++i) {
- // Dade - print some progress info
- boost::xtime currentTime;
-- boost::xtime_get(¤tTime, boost::TIME_UTC);
-+ boost::xtime_get(¤tTime, boost::TIME_UTC_);
- if (currentTime.sec - lastUpdateTime.sec > 5) {
- LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)";
-
-@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen
-
-
- boost::xtime radianceComputeEndTime;
-- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC);
-+ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_);
- LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)";
- }
-
-diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp
---- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200
-@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU
- // Dade - thread to update the film with data from servers
-
- boost::xtime reft;
-- boost::xtime_get(&reft, boost::TIME_UTC);
-+ boost::xtime_get(&reft, boost::TIME_UTC_);
-
- while (filmUpdaterThread->signal == SIG_NONE) {
- // Dade - check signal every 1 sec
-@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU
- for(;;) {
- // Dade - sleep for 1 sec
- boost::xtime xt;
-- boost::xtime_get(&xt, boost::TIME_UTC);
-+ boost::xtime_get(&xt, boost::TIME_UTC_);
- xt.sec += 1;
- boost::thread::sleep(xt);
-
-diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp
---- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200
-@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres,
- m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != "";
-
- // init timer
-- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC);
-+ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_);
- lastWriteFLMTime = lastWriteImageTime;
- }
-
-@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter
- {
- // Check write output interval
- boost::xtime currentTime;
-- boost::xtime_get(¤tTime, boost::TIME_UTC);
-+ boost::xtime_get(¤tTime, boost::TIME_UTC_);
- bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval);
- bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval);
-
-@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter
- // WriteImage can take a very long time to be executed (i.e. by saving
- // the film. It is better to refresh timestamps after the
- // execution of WriteImage instead than before.
-- boost::xtime_get(¤tTime, boost::TIME_UTC);
-+ boost::xtime_get(¤tTime, boost::TIME_UTC_);
-
- if (timeToWriteImage)
- lastWriteImageTime = currentTime;
-diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h
---- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200
-+++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200
-@@ -126,7 +126,7 @@ public:
- {
- while (state == PAUSE && !boost::this_thread::interruption_requested()) {
- boost::xtime xt;
-- boost::xtime_get(&xt, boost::TIME_UTC);
-+ boost::xtime_get(&xt, boost::TIME_UTC_);
- xt.sec += 1;
- boost::thread::sleep(xt);
- }
--
cgit v1.2.3
From 72f45487934cf3df94e92869c53c5daf37d4ba79 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Thu, 19 Jul 2012 15:48:56 -0300
Subject: blender-libre: updating package for boost dependency library
---
libre/blender-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index b4ba9f827..2788e21d9 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=blender
pkgname=blender-libre
pkgver=2.63a
-pkgrel=3
+pkgrel=4
epoch=4
pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
arch=('i686' 'x86_64' 'mips64el')
--
cgit v1.2.3
From 94dd188f20b42552c4758371d2007a0a9d7f701a Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Thu, 19 Jul 2012 15:59:47 -0300
Subject: luxrender-libre: updating PKGBUILD
---
libre/luxrender-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 44df6f3c2..1430ae826 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Lukas Jirkovsky
# Initial contributor: flixie <69one@gmx.net>
# Contributor: Imanol Celaya
-# Maintainer (Parabola): Márcio Silva
+# Maintainer (Parabola): Márcio Silva
pkgname=luxrender-libre
pkgver=1.0rc2
_pkgver=008805644181
--
cgit v1.2.3
From 274160f84f8ddc005659c5041c6e5b8488513836 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Thu, 19 Jul 2012 16:20:23 -0300
Subject: blender-spacenav-libre: updating package for boost dependency library
---
artistic/blender-spacenav-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
index f8fc7fd46..99ddd75ba 100644
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ b/artistic/blender-spacenav-libre/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=blender
pkgname=blender-spacenav-libre
pkgver=2.63a
-pkgrel=3
+pkgrel=4
epoch=4
pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)"
arch=('i686' 'x86_64' 'mips64el')
--
cgit v1.2.3
From 6a786c7dc640e38ce3f8485ef30669d03ababd62 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Thu, 19 Jul 2012 16:32:18 -0300
Subject: spacenavd: updating package for systemd
---
artistic/spacenavd/PKGBUILD | 13 ++++++++++---
artistic/spacenavd/spacenav.service | 10 ++++++++++
2 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 artistic/spacenavd/spacenav.service
diff --git a/artistic/spacenavd/PKGBUILD b/artistic/spacenavd/PKGBUILD
index 1c117b804..cf8a43c32 100644
--- a/artistic/spacenavd/PKGBUILD
+++ b/artistic/spacenavd/PKGBUILD
@@ -3,21 +3,28 @@
pkgname=spacenavd
pkgver=0.5
-pkgrel=1
+pkgrel=2
pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
arch=('i686' 'x86_64' 'mips64el')
url="http://spacenav.sourceforge.net/"
license=('GPL')
depends=('libx11')
backup=('etc/spnavrc')
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz spacenavd )
+source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz
+ spacenavd
+ spacenav.service)
md5sums=('0bb21da5315bd376aa508157a9455aaa'
- '27a739300d4de07920879af2d2bdd47f')
+ '27a739300d4de07920879af2d2bdd47f'
+ 'b404c8021254636b861651a7a48d17a6')
+
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=$pkgdir/usr
make || return 1
make DESTDIR=$pkgdir install || return 1
+ # for initscript service
install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1
+ # for systend service
+ install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1
}
diff --git a/artistic/spacenavd/spacenav.service b/artistic/spacenavd/spacenav.service
new file mode 100644
index 000000000..30e8019e9
--- /dev/null
+++ b/artistic/spacenavd/spacenav.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Spacenavigator Daemon Service
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/spacenavd
+
+[Install]
+WantedBy=multi-user.target
+
--
cgit v1.2.3
From c1c2ac8fe58842488caf6885dd54f822347d0810 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 17:48:15 -0300
Subject: iceweasel-libre-14.0.1.2-2: adding FSF oficial logo on bookmarks
---
libre/iceweasel-libre/PKGBUILD | 4 ++--
libre/iceweasel-libre/libre.patch | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6116867fa..39e7dd77e 100644
--- 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=('8e4f3987d37c8e73b168948d0771b872'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'cd793fac6a572fe5db09e275ca038125'
+ '742b72d83d6afcc9f18e5ba445ad48b8'
'e529742c0a425648087bc3ce537fe4c5'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index b7efb7dc1..e1982fadc 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -315,7 +315,8 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
- @bookmarks_toolbarfolder_description@
-
- @getting_started@
-+
- Parabola GNU/Linux-libre
++
- Parabola GNU/Linux-libre
-
@firefox_heading@
+ Parabola GNU/Linux-libre
@@ -331,7 +332,7 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
+
+
Free Software Foundation
+
-+
- Free Software Foundation
++
- Free Software Foundation
+
- LibrePlanet
+
- Free addons
+
- h-node
--
cgit v1.2.3
From da8d64508cbb16da2a2a60e426590ea91538885c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 17:51:57 -0300
Subject: iceweasel-libre-14.0.1.2-2: fixing error on libre.patch
---
libre/iceweasel-libre/libre.patch | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index e1982fadc..9ffaf3a9a 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -315,8 +315,7 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
- @bookmarks_toolbarfolder_description@
-
- @getting_started@
-+
- Parabola GNU/Linux-libre
++
- Parabola GNU/Linux-libre
-
@firefox_heading@
+ Parabola GNU/Linux-libre
--
cgit v1.2.3
From a23c05909ae00206ee3824ef5e0773a7edf04523 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 19 Jul 2012 17:53:13 -0300
Subject: iceweasel-libre-14.0.1.2-2: updating md5sum on PKGBUILD
---
libre/iceweasel-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 39e7dd77e..23423e428 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -57,7 +57,7 @@ md5sums=('8e4f3987d37c8e73b168948d0771b872'
'eab149c1994ab14392e55af3abb08e80'
'ac29b01c189f20abae2f3eef1618ffc0'
'a485a2b5dc544a8a2bd40c985d2e5813'
- '742b72d83d6afcc9f18e5ba445ad48b8'
+ '6d8816d2577263556d76f1aa4527b55b'
'e529742c0a425648087bc3ce537fe4c5'
'0d053487907de4376d67d8f499c5502b'
'52e52f840a49eb1d14be1c0065b03a93'
--
cgit v1.2.3
From 233b7b4902222f9186a10609bf99a9a2cf1fa649 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 03:41:29 -0300
Subject: licenses-libre: updating package
---
libre/licenses-libre/PKGBUILD | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 6097d67b8..8a3d62929 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -1,9 +1,10 @@
# $Id: PKGBUILD 82120 2010-06-08 16:36:51Z dan $
# Maintainer: Dan McGee
# Maintainer (Parabola): fauno
+# Maintainer (Parabola): Márcio Silva
pkgname=licenses-libre
-pkgver=2.8
+pkgver=2.9
pkgrel=1
pkgdesc="The standard licenses distribution package"
arch=('any')
@@ -13,6 +14,7 @@ groups=('base')
provides=("licenses=${pkgver}")
conflicts=('licenses')
replaces=('licenses')
+makedepends=(links)
source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
cc-by-3.0.txt
cc-by-sa-3.0.txt
@@ -120,7 +122,7 @@ md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
'd09c120ca7db95ef2aeecec0cb08293b'
'b4a94da2a1f918b217ef5156634fc9e0'
'a45bb1bbeed9e26b26c5763df1d3913d'
- '68d59ff8306e3a9f5f1c01462c77a317'
+ 'bfecdc446cd2a6a4410ac9e6d0064b3a'
'f083e41c43db25e18f36c91e57750b64'
'a055911c32fb4ed6e96c453ceaeba857'
'dc8502850eab9e1ff330a12d7ca18a19')
--
cgit v1.2.3
From d64a889536a2bf1e15aaca5f7a68e1bb6bc7cb7d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 20 Jul 2012 15:48:55 -0300
Subject: linux-libre-3.4.6-1: updating version for i686, x86_64 and mips64el
---
libre/linux-libre/PKGBUILD | 8 ++++----
libre/linux-libre/linux-libre.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index d36ba4da2..759a5fea1 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,9 +12,9 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE
_basekernel=3.4
-_sublevel=5
+_sublevel=6
pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'3.4.4-fix-backlight-regression.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- '0882e254b12df2c8d73df29de85223a7'
+ 'fe16da96e942fcfc195fc53ff93e3864'
'669c3f9d5c6a2109bad8e511287826c3'
'454231e14419e56a5281eb7bc6fde83e'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -45,7 +45,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'80a46681386bb87813989faeb92bdd9a'
- '86910efeadb5d1e5d5416ff1a9dacb33')
+ 'a9338d11a2b23fe0cd43cc4fee5aed42')
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 7d7e7a1db..38394ad7b 100644
--- 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.4.5-1-LIBRE
+KERNEL_VERSION=3.4.6-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 4e0aa8718e03a6cb1ff591eef3a76d139b279053 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 20 Jul 2012 16:06:14 -0300
Subject: linux-libre-lts-3.0.38-1: updating version (3.0.37-1 for mips64el)
---
libre/linux-libre-lts/PKGBUILD | 8 ++++----
libre/linux-libre-lts/linux-libre-lts.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 9793f599e..d2a5610df 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-LTS
_basekernel=3.0
-_sublevel=37
+_sublevel=38
pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.37 # nearly always the same as pkgver
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'ext4-options.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- '5fbdf641fc8962f875d1e9e8ce8f2969'
+ '8a2416fd6ac323184ab563958a6eb560'
'9cfcf3807201ce44aa720571232a10ce'
'8bb5c5aa217202c3ac3798ba7798e07d'
'c072b17032e80debc6a8626299245d46'
@@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'f36222e7ce20c8e4dc27376f9be60f6c'
- '7102cdd847f0bd7102f0ad01fa43f454')
+ 'f0c4e2fa00e3f9fd9d666742c32beefb')
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 12b654f19..226061525 100644
--- 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.37-1-LIBRE-LTS
+KERNEL_VERSION=3.0.38-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 f8adbe6b116e471c9e9b0d3188db3bd7b625d5e1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 20 Jul 2012 16:11:10 -0300
Subject: lirc-libre-1:0.9.0-22: updating revision
---
libre/lirc-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index c4d8b1e95..1738c0aae 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=21
+pkgrel=22
epoch=1
_extramodules=extramodules-3.4-LIBRE
arch=('i686' 'x86_64' 'mips64el')
--
cgit v1.2.3
From b0fea8929becb015e8917281d65d1dfa89490f73 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 16:37:22 -0300
Subject: atool-libre: updating package
---
libre/atool-libre/ChangeLog | 9 ---------
libre/atool-libre/PKGBUILD | 8 ++++----
libre/atool-libre/atool.changelog | 18 ++++++++++++++++++
3 files changed, 22 insertions(+), 13 deletions(-)
delete mode 100644 libre/atool-libre/ChangeLog
create mode 100644 libre/atool-libre/atool.changelog
diff --git a/libre/atool-libre/ChangeLog b/libre/atool-libre/ChangeLog
deleted file mode 100644
index aec63e70f..000000000
--- a/libre/atool-libre/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2009-08-16 Jaroslav Lichtblau
- * Updated to major version 0.37.0
-
-2008-10-05 Jaroslav Lichtblau
- * Updated to major version 0.36.0
-
-2008-10-05 Jaroslav Lichtblau
- * Moved to [community] repo
-
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index 7ec4d7c1e..ea1dfec52 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -3,12 +3,12 @@
# Contributor: leif_thande
# Contributor: tranquility
# Contributor: Daniel J Griffiths
-# Contributor (Parabola): Márcio Silva
+# Contributor (Parabola): Márcio Silva
_pkgname=atool
pkgname=atool-libre
-pkgver=0.38.0
-pkgrel=3
+pkgver=0.39.0
+pkgrel=1
pkgdesc="A script for managing file archives of various types"
arch=('any')
url="http://www.nongnu.org/atool/"
@@ -29,7 +29,7 @@ optdepends=('bzip2: for using atool with bzip2 compressed archives'
'unzip: for using atool for unpacking archives')
source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz)
-sha256sums=('b967195facbe5e7c6535ac117aaa7f633b0eca174137c30c36a5200efb80047d')
+sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b')
build() {
diff --git a/libre/atool-libre/atool.changelog b/libre/atool-libre/atool.changelog
new file mode 100644
index 000000000..ce0b12c2b
--- /dev/null
+++ b/libre/atool-libre/atool.changelog
@@ -0,0 +1,18 @@
+2012-04-19 Jaroslav Lichtblau
+ * atool 0.39.0-1
+
+2012-02-21 Jaroslav Lichtblau
+ * atool 0.38.0-2
+ * signing package
+
+2011-08-20 Jaroslav Lichtblau
+ * Updated to major version 0.38.0
+
+2009-08-16 Jaroslav Lichtblau
+ * Updated to major version 0.37.0
+
+2008-10-05 Jaroslav Lichtblau
+ * Updated to major version 0.36.0
+
+2008-10-05 Jaroslav Lichtblau
+ * Moved to [community] repo
--
cgit v1.2.3
From 42e739b1e46d55fcc041fb98f8818d3f339f9633 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 18:11:18 -0300
Subject: crosstool-ng: updating package
---
libre/crosstool-ng/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index 2aa38fca6..c366df3dd 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer (Parabola): fauno
pkgname=crosstool-ng
-pkgver=1.15.2
+pkgver=1.15.3
pkgrel=1
pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
arch=('i686' 'x86_64')
@@ -26,4 +26,4 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
}
-md5sums=('0d03314debb73de37a72014632bf1ab3')
+md5sums=('a56d55f7173161b5200c144cdff6f564')
--
cgit v1.2.3
From a381391ca281d88c768e6a5f3919c17ad864a3b6 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 18:15:53 -0300
Subject: crosstool-ng: updating package
---
libre/crosstool-ng/PKGBUILD | 1 +
1 file changed, 1 insertion(+)
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index c366df3dd..425e3d9e4 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -1,5 +1,6 @@
# Contributor: jwwolf
# Maintainer (Parabola): fauno
+# Contributor (Parabola): Márcio Silva
pkgname=crosstool-ng
pkgver=1.15.3
--
cgit v1.2.3
From 5f57eaf1ba85f55f9ac44a9b913c026ea84d157f Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 18:21:47 -0300
Subject: dvdrip-libre: updating package
---
libre/dvdrip-libre/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD
index b9cd0c8ff..2069f1c8a 100644
--- a/libre/dvdrip-libre/PKGBUILD
+++ b/libre/dvdrip-libre/PKGBUILD
@@ -1,12 +1,12 @@
# $Id$
# Maintainer: Giovanni Scafora
# Contributor: Fredrik Hammar
-# Maintainer (Parabola): Márcio Silva
+# Maintainer (Parabola): Márcio Silva
_pkgname=dvdrip
pkgname=dvdrip-libre
pkgver=0.98.11
-pkgrel=10
+pkgrel=10.1
pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies"
arch=('i686' 'x86_64')
license=('custom')
--
cgit v1.2.3
From b80aeb99f8c10ffa6fa779a7290a4a94dcdc4feb Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 18:56:45 -0300
Subject: epdfview-libre: updating package
---
libre/epdfview-libre/PKGBUILD | 6 +++++-
libre/epdfview-libre/glib2_headers.patch | 12 ++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 libre/epdfview-libre/glib2_headers.patch
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 9923ad1cf..bbe9901a1 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -3,11 +3,12 @@
# Maintainer: schuay
# Contributor: Tom K
# Contributor: Thayer Williams
+# Maintainer (Parabola): Márcio Silva
pkgname=epdfview-libre
_pkgname=epdfview
pkgver=0.1.8
-pkgrel=3
+pkgrel=4
pkgdesc="A free lightweight PDF document viewer."
url="http://www.emma-soft.com/projects/epdfview/"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,9 +21,11 @@ replaces=('epdfview')
install='epdfview.install'
source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2"
"${_pkgname}.desktop.patch"
+ "glib2_headers.patch"
"0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
md5sums=('e50285b01612169b2594fea375f53ae4'
'fbf22bbabdbb7544db615ac5775d57e2'
+ '2fffa9c7cd4c5f0744803591c2f162a3'
'7f9ea101a41f5b4e999fd024f423d41f')
build() {
@@ -30,6 +33,7 @@ build() {
patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch"
patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
+ patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
# Use xdg-open as default browser.
sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/glib2_headers.patch
new file mode 100644
index 000000000..b5bc5c211
--- /dev/null
+++ b/libre/epdfview-libre/glib2_headers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
+index c142a7a..58fcf2e 100644
+--- a/src/gtk/StockIcons.h
++++ b/src/gtk/StockIcons.h
+@@ -18,7 +18,7 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+
+-#include
++#include
+
+ G_BEGIN_DECLS
--
cgit v1.2.3
From 14c7045a4129f7479097fc1619dc85b38ecf8ff3 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 19:07:10 -0300
Subject: epdfview-libre: updating package
---
libre/epdfview-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index bbe9901a1..28c77eed8 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -25,7 +25,7 @@ source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_p
"0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
md5sums=('e50285b01612169b2594fea375f53ae4'
'fbf22bbabdbb7544db615ac5775d57e2'
- '2fffa9c7cd4c5f0744803591c2f162a3'
+ '41b30f53f20472cbc2fcd4eae161125e'
'7f9ea101a41f5b4e999fd024f423d41f')
build() {
--
cgit v1.2.3
From f61aa010c7032d0a78d604cf829803e4d9dcef8c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Fri, 20 Jul 2012 19:33:51 -0300
Subject: virtualbox-modules-4.1.18-4: updating revision for linux-libre-3.4.6
---
libre/virtualbox-modules/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 6406715b1..f965869f7 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=virtualbox-modules
pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
pkgver=4.1.18
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
--
cgit v1.2.3
From 60d347b46508dd5117ff1f1855bbe893fc440668 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 20:08:58 -0300
Subject: hardinfo: drop .directory file
---
libre/hardinfo/.directory | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 libre/hardinfo/.directory
diff --git a/libre/hardinfo/.directory b/libre/hardinfo/.directory
deleted file mode 100644
index 725259ee6..000000000
--- a/libre/hardinfo/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,4,11,16,57,42
--
cgit v1.2.3
From 5a53cb06a1fe85f14be5a345dd8df6a01ac18d1d Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 20:15:12 -0300
Subject: hardinfo: drop ChangeLog file
---
libre/hardinfo/ChangeLog | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 libre/hardinfo/ChangeLog
diff --git a/libre/hardinfo/ChangeLog b/libre/hardinfo/ChangeLog
deleted file mode 100644
index faf242a7b..000000000
--- a/libre/hardinfo/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-2009-04-06 Eric Belanger
-
- * hardinfo 0.5.1-1
- * Upstream update
-
-2009-03-29 Eric Belanger
-
- * hardinfo 0.5c-1
- * Upstream update
-
-2008-08-13 Eric Belanger
-
- * hardinfo 0.4.2.3-3
- * Rebuilt against gnutls 2.4.1
-
-2008-04-06 Eric Belanger
-
- * hardinfo 0.4.2.3-2
- * Rebuilt against libsoup 2.4
- * Added ChangeLog
--
cgit v1.2.3
From b6aed6d8620fbc5b21ec5073748e5409da7da124 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 20:21:17 -0300
Subject: hardinfo: updating package
---
libre/hardinfo/PKGBUILD | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 47f4c1330..1987e191e 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -1,9 +1,10 @@
# $Id$
# Maintainer: Eric Bélanger
+# Contributor (Parabola): Márcio Silva
pkgname=hardinfo
pkgver=0.5.1
-pkgrel=4
+pkgrel=5
pkgdesc="A system information and benchmark tool."
arch=('i686' 'x86_64')
url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
@@ -12,9 +13,6 @@ depends=('gtk2' 'libsoup')
options=('!emptydirs')
source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
fixsensors.patch hardinfo.distro)
-md5sums=('6fb38992e140f2fab16518ae1f38e188'
- '05c212db07b9f152cdea052ff7bb28fa'
- '2c609f4b3c7f202d043bdef082c2bef0')
sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
'd2151dce76dca238102937d0e15541f172bca530'
'9425e09191cd3a365a3afce57ca1973a6439fa57')
@@ -25,8 +23,6 @@ build() {
sed -i 's|/usr/lib64|/usr/lib|' configure
./configure --prefix=/usr
sed -i 's|lib64|lib|' binreloc.c
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h
- sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h
sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "parabola" },{ DB_PREFIX "debian_version", "deb" },|' computer.h
make
}
--
cgit v1.2.3
From caf4236bc1859f2f767e50d4a3b3ca158bdbc391 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 20:48:31 -0300
Subject: iceape-i18n: updating package
---
libre/iceape-i18n/PKGBUILD | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 5f4db3101..7bfca020f 100644
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -1,5 +1,6 @@
# Maintainer: Luke Shumaker
-# Maintainer: André Silva
+# Maintainer (Parabola): André Silva
+# Maintainer (Parabola): Márcio Silva
# Contributor: fauno
# Contributor: Figue
# Based on icecat-i18n package, which is in turn based on firefox-i18n
@@ -15,7 +16,7 @@ _debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(be ca cs de en-GB es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
+_langpacks=(be ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
pkgbase=iceape-i18n
pkgname=($(for lang in ${_langpacks[@]}
@@ -23,7 +24,7 @@ pkgname=($(for lang in ${_langpacks[@]}
done))
_pkgver=2.7.5
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="Language packs for Debian Iceape."
arch=('any')
@@ -62,6 +63,7 @@ md5sums=('03a75ce1325fc748d0943cd39659e8ca'
'6cb55fe51fca1de674ca32b10edc7c8b'
'138121b288c269aa418ca0c33eb65326'
'8fd47eed7c79fe29c74a81d9b4a4864a'
+ '71f6007df53b17361965f38c01869738'
'f253842c0a377e86c6c62f7db27db32d'
'b93caebe5ceb08d2cde78fe40fff3c0c'
'a36d0776b736609b1e72b8530cc9e755'
--
cgit v1.2.3
From ffc2b72d09363baafbadbececc37bdd21dafd41d Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 21:35:18 -0300
Subject: iceape-libre: updating package
---
libre/iceape-libre/PKGBUILD | 8 ++++----
libre/iceape-libre/libre.patch | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 25498025b..ca386c03a 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer : Márcio Silva
-# Maintainer : André Silva
+# Maintainer : Márcio Silva
+# Maintainer : André Silva
# We're getting this from Debian Sid
_debname=iceape
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=3
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=('7a6e671485a75cd9495f346e0f8e4dcb'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- '92d3feecf8d80ae6a3f06aa8c5f06eb4')
+ '98f054a054558d5e3f6603486faef11f')
build() {
export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index be471eea3..96fefccbb 100644
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -270,9 +270,9 @@
- - @mozilla_org@
-
- @mozillazine@
-
- @mozdev@
-+
- Parabola GNU/Linux-libre
-+
- Free Software Foundation
-+
- LibrePlanet
++
- Parabola GNU/Linux-libre
++
- Free Software Foundation
++
- LibrePlanet
-
@seamonkey_and_mozilla@
+ GNUzilla
@@ -300,8 +300,8 @@
- @mozillazine@
- @seamonkey_support@
-
-+
GNUzilla and IceCat
-+ Free addons
++ GNUzilla and IceCat
++ Free addons
#include bookmarks.extra
--
cgit v1.2.3
From 12f2acae474f3f4b2c39f8738a7cd6e446676c5d Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 21:37:37 -0300
Subject: icedove-libre: drop .directory file
---
libre/icedove-libre/.directory | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 libre/icedove-libre/.directory
diff --git a/libre/icedove-libre/.directory b/libre/icedove-libre/.directory
deleted file mode 100644
index ef6a156b3..000000000
--- a/libre/icedove-libre/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,5,10,17,26,4
--
cgit v1.2.3
From f249b798a5684282a14c64d45bddcc7466dc0984 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Fri, 20 Jul 2012 21:38:37 -0300
Subject: iceweasel-i18n: drop .directory file
---
libre/iceweasel-i18n/.directory | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 libre/iceweasel-i18n/.directory
diff --git a/libre/iceweasel-i18n/.directory b/libre/iceweasel-i18n/.directory
deleted file mode 100644
index afc87a727..000000000
--- a/libre/iceweasel-i18n/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,6,29,21,18,45
--
cgit v1.2.3
From 73553791b91522a89585ac8fd3c0fbc6a48e95f5 Mon Sep 17 00:00:00 2001
From: Shackra Sislock
Date: Fri, 20 Jul 2012 20:34:51 -0600
Subject: Adding kervala_libsquish and minetest
---
pcr/kervala_libsquish-hg/PKGBUILD | 46 ---------------------------------------
1 file changed, 46 deletions(-)
delete mode 100644 pcr/kervala_libsquish-hg/PKGBUILD
diff --git a/pcr/kervala_libsquish-hg/PKGBUILD b/pcr/kervala_libsquish-hg/PKGBUILD
deleted file mode 100644
index f75e1aba7..000000000
--- a/pcr/kervala_libsquish-hg/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Jorge Araya
-
-pkgname=kervala_libsquish-hg
-pkgver=220
-pkgrel=1
-pkgdesc="Free Software DXT compression library, kervala's version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish/"
-license=('MIT')
-makedepends=('mercurial' 'gcc-libs')
-provides=('libsquish')
-conflicts=('libsquish')
-source=()
-
-_hgroot="http://hg.kervala.net"
-_hgrepo="packaging"
-
-build() {
- cd "$srcdir"
- msg "Connecting to Mercurial server...."
-
- if [[ -d "$_hgrepo" ]]; then
- cd "$_hgrepo"
- hg pull -u
- msg "The local files are updated."
- else
- hg clone "${_hgroot}/${_hgrepo}"
- fi
-
- msg "Mercurial checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_hgrepo-build"
- cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
- cd "$srcdir/$_hgrepo-build/squish"
- make
-}
-
-package() {
- cd "$srcdir/$_hgrepo-build/squish"
- mkdir -p ${pkgdir}/usr/local/include
- mkdir -p ${pkgdir}/usr/local/lib
- make -e INSTALL_DIR="$pkgdir/usr/local" install
-}
-
-# vim:set ts=2 sw=2 et:
--
cgit v1.2.3
From 87f7586d42d09da78b0599740380d7fbeac35004 Mon Sep 17 00:00:00 2001
From: "Shackra Sislock ext:(%22)"
Date: Fri, 20 Jul 2012 21:09:11 -0600
Subject: Adding ryzom-data, kervala_libsquish and minetest
---
pcr/kervala_libsquish/PKGBUILD | 46 ++++++++++++++++++++++++++++++++++++
pcr/minetest/PKGBUILD | 53 ++++++++++++++++++++++++++++++++++++++++++
pcr/ryzom-data/PKGBUILD | 43 ++++++++++++++++++++++++++++++++++
3 files changed, 142 insertions(+)
create mode 100644 pcr/kervala_libsquish/PKGBUILD
create mode 100644 pcr/minetest/PKGBUILD
create mode 100644 pcr/ryzom-data/PKGBUILD
diff --git a/pcr/kervala_libsquish/PKGBUILD b/pcr/kervala_libsquish/PKGBUILD
new file mode 100644
index 000000000..033dd19ec
--- /dev/null
+++ b/pcr/kervala_libsquish/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Jorge Araya
+
+pkgname=kervala_libsquish-hg
+pkgver=220
+pkgrel=1
+pkgdesc="Open source DXT compression library, kervala's version"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libsquish/"
+license=('MIT')
+makedepends=('mercurial' 'gcc-libs')
+provides=('libsquish')
+conflicts=('libsquish')
+source=()
+
+_hgroot="http://hg.kervala.net"
+_hgrepo="packaging"
+
+build() {
+ cd "$srcdir"
+ msg "Connecting to Mercurial server...."
+
+ if [[ -d "$_hgrepo" ]]; then
+ cd "$_hgrepo"
+ hg pull -u
+ msg "The local files are updated."
+ else
+ hg clone "${_hgroot}/${_hgrepo}"
+ fi
+
+ msg "Mercurial checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "$srcdir/$_hgrepo-build"
+ cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
+ cd "$srcdir/$_hgrepo-build/squish"
+ make
+}
+
+package() {
+ cd "$srcdir/$_hgrepo-build/squish"
+ install -d -m 755 ${pkgdir}/usr/include
+ install -d -m 755 ${pkgdir}/usr/lib
+ make -e INSTALL_DIR="$pkgdir/usr/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD
new file mode 100644
index 000000000..8d11e3747
--- /dev/null
+++ b/pcr/minetest/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Jorge Araya Navarro
+pkgname=minetest-git
+pkgver=20120409
+pkgrel=1
+pkgdesc="An Infiniminer/Minecraft inspired game, git version."
+arch=('i686' 'x86_64')
+url="http://celeron.55.lt/~celeron55/minetest/"
+license=('GPL')
+makedepends=('git' 'cmake' 'irrlicht' 'mesa' 'libjpeg' 'bzip2' 'libpng' 'zlib' 'libvorbis')
+depends=('libjpeg' 'bzip2' 'sqlite3' 'libgl' 'libxxf86vm' 'openal')
+conflicts=('minetest' 'minetest-hg')
+
+_srcroot="https://github.com/celeron55/minetest.git"
+_srcname="minetest"
+
+_gameroot="https://github.com/celeron55/minetest_game.git"
+_gamename="minetest_game"
+
+build() {
+ cd "$srcdir"
+
+ msg "Pulling sources..."
+
+ if [ -d $_srcname ] ; then
+ cd $_srcname && git pull origin
+ msg "The local files are updated."
+ else
+ git clone $_srcroot $_gitname
+ fi
+
+ msg "Pulling game..."
+
+ cd "$srcdir/$_srcname/games/"
+
+ if [ -d $_gamename ] ; then
+ cd $_gamename && git pull origin
+ msg "The local files are updated."
+ else
+ git clone $_gameroot $_gamename
+ fi
+
+
+ msg "GIT checkout done or server timeout"
+ msg "Starting make..."
+
+ cd "$srcdir/$_srcname"
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ #install -d -m 755 ${pkgdir}/usr/share/applications
+ #install -d -m 755 ${pkgdir}/usr/share/icons/scalable/apps
+ #install -m 644 ${srcdir}/minetest.svg ${pkgdir}/usr/share/icons/scalable/apps
+ #install -m 644 ${srcdir}/minetest-git.desktop ${pkgdir}/usr/share/applications
+ make DESTDIR=${pkgdir} install
+}
diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD
new file mode 100644
index 000000000..272db5c07
--- /dev/null
+++ b/pcr/ryzom-data/PKGBUILD
@@ -0,0 +1,43 @@
+# Mantainer: Jorge Araya Navarro
+pkgname='ryzom-data'
+group='ryzom'
+pkgver=0.8.0
+pkgrel=1
+arch=('any')
+url="http://media.ryzom.com/"
+license=('CCPL:by-sa')
+makedepends=('rsync' 'p7zip-libre')
+conflicts=('ryzom-data')
+pkgdesc="An awesome free software 3D MMORPG game. Game data."
+source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download")
+noextract=("download")
+sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f')
+
+package() {
+ cd "$srcdir/"
+
+ if [[ -d "data" ]]; then
+ rm -rf data
+ fi
+
+ mv "download" "ryzom_client.7z"
+ msg "Extracting game data..."
+ 7z x ryzom_client.7z ryzom/data/ >& /dev/null
+ cd ryzom/data/
+
+ msg "Updating the official Ryzom game data, this can take a while..."
+ rsync -rtzvu --progress --stats --recursive --timeout=30 www.ryzom.com::ryzom/data/ ./ >& /dev/null
+ msg 'Update completed...'
+
+ cd "$srcdir/ryzom/data"
+
+ # creating directories
+ install -d -m 755 "${pkgdir}/usr/share/ryzom/data/fonts/"
+
+ # installing files
+ install -m 644 fonts/* "${pkgdir}/usr/share/ryzom/data/fonts/"
+ rm -rf fonts
+
+ install -m 644 * "${pkgdir}/usr/share/ryzom/data/"
+}
+
--
cgit v1.2.3
From 91d3ac424045a8836a54c372a9c40bf21dcbde0c Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sat, 21 Jul 2012 01:05:43 -0300
Subject: lilo: drop .directory file
---
libre/lilo/.directory | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 libre/lilo/.directory
diff --git a/libre/lilo/.directory b/libre/lilo/.directory
deleted file mode 100644
index ba03b0e05..000000000
--- a/libre/lilo/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,5,3,19,29,58
--
cgit v1.2.3
From db350dd1af3ec66481bc862ea32c67f466f66569 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sat, 21 Jul 2012 01:26:49 -0300
Subject: iceweasel-i18n-14.0.1.2-1: updating version
---
libre/iceweasel-i18n/PKGBUILD | 172 +++++++++++++++++++++---------------------
1 file changed, 86 insertions(+), 86 deletions(-)
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 2f2c1be72..bdcb2ddc7 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -10,7 +10,7 @@
_debname=iceweasel
_debver=14.0.1
-_debrel=1
+_debrel=2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ pkgname=($(for lang in ${_langpacks[@]}
done))
_pkgver=14.0.1
pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
@@ -56,87 +56,87 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('8492bffee2bd98cb7d98a8a53e0f17ae'
- '5497ed6ceb6e975eba24a5bf05f86a89'
- '314f16038bdb82e59bf3522efe3a6b70'
- '20d404c6f61846e7bf5c4d2474d3a394'
- 'f80eefbad17d03ff38514f3bcc179f1a'
- '8b2a7ec06160c973a323c38a7a0b25d5'
- '8b5496a243674eb3960ac6dc5a2f6b88'
- 'b75cae5fb01515ab9aeb8ca941ce88eb'
- '89f20e820d1aaf08cef2a59ee3859239'
- '4431e91bbbe395b86da48b66ac689fb9'
- '9fab9ef9ad5dd46c8ae51973dfaffaaa'
- '32f8d7861a46407d76b1310566845afe'
- 'e000671c0b3fd89e76b763a7980f707e'
- 'd14e72cddb190f0a58275624b1982e4c'
- 'd55c847a44918c6fee6bbf4ac8d9e4a7'
- 'c5a4568e1dac75a863f281bfeb000ead'
- 'fe51ca24871979a37bcca24d7b3b2da1'
- 'e702787ad3ff4c1d20dedf55321dc335'
- 'dfcb47fda64599a5704da757c7c04377'
- 'b0a1cbb9cfe5265989cf3b26e8109fd8'
- 'cd060b883cd7586e249c541c26dd642e'
- '5d23943dff2735703e4995fc8321bf3d'
- 'e389f9cb80945608c198a890258377cb'
- '32a1798b0e137097e7f00c27f0e6aa2a'
- '9003c830b3f8ee4b8950b1f406acf0b0'
- '5e7e3f5ff49d7070f6de4bc6d64875d6'
- '891331124222b316a13ba45bc87a7c23'
- '21aa289ad236bf6849d96b0b9d985fbe'
- '64c9579f00c738bd824466a7212e76fe'
- 'b89e729d09c3c54e9849f665bedf60db'
- 'e40fda3e233e042447a9e10cc0cd0f76'
- '8c813e20e712dc3d62cde69ee2df2d28'
- '7fff1d836a0c4f8a5ef41c9f4b56b2a9'
- '916f163b9e0814bc23f1545d18238c79'
- '2cdab3c133f7d7d5abc54bed1ac654a9'
- '2d9d97bbdb568296380cdee5ec61ba88'
- '43e6ce7d51e734bf3aaff68504d8ebee'
- 'af8f80eefcf1d795a7aaf25f694b6e97'
- 'c4336d1a4eb59cc4e415a69d22a682a7'
- 'be4a6850f76eb144079c7a47de678b66'
- 'a4826c1b2e19216759224252f09ba552'
- '47ee1757a64cdfcb9c0ba461fb934377'
- '4f144397e5235862f90e09a6ebae1571'
- '16e4bb054604c5cdb583a10456a35a2c'
- '0dfaf8cc5efaf39b4ed2422497a3043f'
- 'e5b809e55fe4e3b16229a7e1faa160b6'
- '8f317ab44eed90cb59be734dd805287b'
- '3797507f353a6978924a273802d178b9'
- 'a1a7df582e476a7993ebbcb427835256'
- 'a833481b7c6d26cc679f1a551014ab7c'
- 'fb5d99c278d75c30891bae95f8337fd1'
- '7f02751d991432d72c46247520d3ed67'
- '96fde2477e2e661794c4ddabe1c9d024'
- '7b1948761da836466f567ec35b54ff82'
- '0d8cc6d0b2a53d15e32740a463cff1cc'
- '571b6d2d461f7cb3ec95632b8d75c65c'
- 'a01e65b75b8dd78dcaf0ff746fc71b92'
- 'de2a327304a0f659944e7ae9e39fa877'
- 'a12943272a14455a19761e4564c2f0f8'
- '9eca996185f4995dc971f27c22447404'
- 'cf248c1ea91e55c9aa306437abbcf212'
- 'f2cbcdf897307bdd95f886d95504264b'
- '2863ef939be42a0422d7e903122ee89c'
- '2df4ff00f83b650cf69e8b3a27099c20'
- 'cda3838e681f461c9ea833ed71fb72b8'
- 'c6bf73b7e7357e050cbe772cf460f442'
- '5f61a368a50280f0b293a8b11631c673'
- '418d85a6fae1e9cdde6e8aaeea594b99'
- 'e7e145a331920a2fcd1c00a80f3d9279'
- 'b9bc820720e8fbb1c28229c66310dcbf'
- 'bb9d826ead65c23bd45090206f0f6f25'
- '7a72bd76a2087efca618c4cf7cd6ea60'
- 'a06bf452b96c0dcef7d30a390b5c755d'
- '0f6605afb8dddab2d2dc4110e3a62c3f'
- '3dd7cc1afef4d2bfcfadb3093fe979c1'
- '6a63bd1463f7d75172170e8e18c3443b'
- '1c9887f019c8ffb71b3d9faa3b2120ba'
- '38c750ddb41b8d61a2073d0cb67bc6d9'
- 'e1d6e4b2f34af391c2037b331fd566f8'
- 'a950f7a77c9ba4fb0142107afdcc4a01'
- '0fe08f2659b34b1ee8ebd7debf2d9d13'
- 'af8af0b941b1bd26ee4122f4e99f7f55'
- 'e3d1f71617331226bbeb4cb829a2c0be'
- '6623cab16c266630f9f56427d22cb5df')
+md5sums=('5dbcf3c8505ea994eff5d0acb15212e2'
+ '093fb9d627ea2bcc39e95cda8308c07c'
+ '427f4163eae1095e0e3be610f5f846d0'
+ '50119c3ffdac18ae2df52a46e4655e5a'
+ 'd0707bb9946c0a27f2b33af081cef4a5'
+ '1ada65da05be04a6ad914fad2aa298bc'
+ '06d3ff7c4204f7b426168fe2d585770a'
+ 'd033fdd61508953a0722c6328fe075d8'
+ '67e56c4382d44040f30d2a0e9aa062aa'
+ 'e98bc2ddd0c4f14e03def6c2df3957a6'
+ '4b1859cd09bbeecb237c96489900e5cf'
+ '73b919dcf6ae7f99f720e1663d90ea6e'
+ '116c9ff17523c2f266534b525e37d9d6'
+ '7d3b4380052ff083fad73c1d67b5dd44'
+ '90ae8638c6ba5e206d723282e92e2b4a'
+ '382d425cecf79d03122700a49dc0a1e1'
+ '689264c005413858c23ba36d85bc70e9'
+ '296e06f04ad3a4ec08c782679c4648f5'
+ '144ffb16d13c246c1614ed4a47ddb91a'
+ '5a7189208bb083164a37294b0906df6b'
+ '324ce70af22e92d1f27899cb68f73045'
+ '7e8bd44385e0dd1b7fddd24763d53d0d'
+ '9f93cedb8c0944c84b9521d80a8f1df8'
+ 'bb86603af183212d7ea21850fc6b29de'
+ '407f885a228a9749f85f0196d91d2fc2'
+ '8d0d5d304b19476469a5e420a0f4cc6c'
+ '0a73d219723c014024adea95e16d1f05'
+ '948e672aecb65d8b106df4a07e69a81e'
+ '6d1dece438ee2ef35e7cd18a48a04a6a'
+ 'cfb060a8b9587895c892b1741120bd30'
+ '7c9389eb1992d1b90bd3d13bad4ea99e'
+ '7ada62ede579765142804eb7fbf31556'
+ '068454a1f2e4e95a9ca6be00cb7ae679'
+ 'd24b9b2bb4924d179f2685735a823054'
+ '5e957199698370322cece21d774c7f68'
+ 'a60e60ac350a81b2ac547a7c1fe1c4a0'
+ 'd86486dee2f1a316c5a386b39b3bd717'
+ '054229f80d2df10247870c0b65330b67'
+ '1725e81231cc3ff6d95781e749f2b959'
+ 'ac404aa939294948ad3d6e70df1cede1'
+ '59c1192284bcbde4656b3319131e2eec'
+ '9f29e2ed16768b1d7a78bf5640ed2332'
+ 'd704d145dc15203ab0e5687d0aad8bfe'
+ '53b610ec98c5d8b956f2a893bec24e27'
+ 'bff195ac895b92333323c2bf22e1f61e'
+ '95c70c4c5dd7d1c456ca36ec346a9c12'
+ '24e936478bcb8b8dfe7c905c3ca2a8dc'
+ '306172bd7802fb9d8da86101add3de9c'
+ 'c104bb81dd70d6ec3dfe864ef03474c1'
+ '3b2cf401cbce2339f2b7c54bb817af1c'
+ '16815d1d5e2a8748a1074bc878f34919'
+ '231db84b5ef6ee4c1f72cf3eaa920952'
+ '84a5a5e773a9340557d8e4b92031d9f2'
+ 'cc8a65ce72f818ce2a65bcba592b5493'
+ 'a9e0f71ef5e221b78395da7581eca0c1'
+ '4b9c21aeccd082e2241987ea8a1885bc'
+ '5d7a0e8d58729c4263449044c23b5f09'
+ '7e42a0bf231e4935d3320b102a314da1'
+ '94f318cc46669eeaf67c4367f9701511'
+ '5c70c86327d806e58e6c5f204849ba51'
+ 'c569a5c51b711d7403e0f8c99647ea34'
+ '076ca5bc5b46894160e6015f0e888d0f'
+ '252851999ea99ce03cd9c50e6ab6c348'
+ '8db75829b397159116cd06c1992bbc5f'
+ '7516889bc11013f08b95ceea06e57aa2'
+ '915bfc417d1cfd7cb44c2ba571c9b152'
+ '356ba91ec47e31dc22a6898b72010a34'
+ 'bca1dcf5cd3be873b6a1e64e33f3c581'
+ 'b83cfa17f58a8394bd19253a304a1792'
+ 'b40cdb01f00b94ea3ca4d6bf29cf69ba'
+ '88b5c9176131ddf792b94e197094eef4'
+ 'a2903206a4b309636ec38d478b268946'
+ 'b4ad0c985f48c6fefb125bf7bfc853c6'
+ '764fcdff3486b68b724f0975d4f6451d'
+ 'b0dae765abfac086c464c8fe975219e9'
+ '7dd864a7f81dc54534ce3ee4abf8c8e6'
+ 'c5d5e5189b9c7bf705b18c8030d09b58'
+ '1bfaa781fe701baa51c9089571686cd1'
+ '27e8c25b11e9e305ca4c3b9f5661936d'
+ 'b2b8fbbd0b42bdc79c7abae3443da189'
+ '5210197343b334229fb8f07ad6aa33ea'
+ '06771b3e460077b5fb994d415168b548'
+ '9804d07cb3bc46c490c1c9e7d0d10edc'
+ '0917b254d82079138c76878d10ad631e')
--
cgit v1.2.3
From 642331a18d51ef5a2ad31a52e360bdd7b5b2a6ec Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sat, 21 Jul 2012 02:06:03 -0300
Subject: iceweasel-i18n: updating package
---
libre/iceweasel-i18n/PKGBUILD | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index bdcb2ddc7..16f117255 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -14,7 +14,7 @@ _debrel=2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(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 fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(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)
pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
@@ -22,7 +22,7 @@ pkgname=($(for lang in ${_langpacks[@]}
done))
_pkgver=14.0.1
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
@@ -84,6 +84,7 @@ md5sums=('5dbcf3c8505ea994eff5d0acb15212e2'
'8d0d5d304b19476469a5e420a0f4cc6c'
'0a73d219723c014024adea95e16d1f05'
'948e672aecb65d8b106df4a07e69a81e'
+ '8ab485858ffb7d7a2318eb23cdbad9bc'
'6d1dece438ee2ef35e7cd18a48a04a6a'
'cfb060a8b9587895c892b1741120bd30'
'7c9389eb1992d1b90bd3d13bad4ea99e'
@@ -101,10 +102,12 @@ md5sums=('5dbcf3c8505ea994eff5d0acb15212e2'
'd704d145dc15203ab0e5687d0aad8bfe'
'53b610ec98c5d8b956f2a893bec24e27'
'bff195ac895b92333323c2bf22e1f61e'
+ '69f039841fbd31b32a583ad8737c3aca'
'95c70c4c5dd7d1c456ca36ec346a9c12'
'24e936478bcb8b8dfe7c905c3ca2a8dc'
'306172bd7802fb9d8da86101add3de9c'
'c104bb81dd70d6ec3dfe864ef03474c1'
+ '2be0cce97e74762a01b47ee2c647ca4c'
'3b2cf401cbce2339f2b7c54bb817af1c'
'16815d1d5e2a8748a1074bc878f34919'
'231db84b5ef6ee4c1f72cf3eaa920952'
@@ -130,8 +133,8 @@ md5sums=('5dbcf3c8505ea994eff5d0acb15212e2'
'a2903206a4b309636ec38d478b268946'
'b4ad0c985f48c6fefb125bf7bfc853c6'
'764fcdff3486b68b724f0975d4f6451d'
- 'b0dae765abfac086c464c8fe975219e9'
'7dd864a7f81dc54534ce3ee4abf8c8e6'
+ 'b0dae765abfac086c464c8fe975219e9'
'c5d5e5189b9c7bf705b18c8030d09b58'
'1bfaa781fe701baa51c9089571686cd1'
'27e8c25b11e9e305ca4c3b9f5661936d'
--
cgit v1.2.3
From fed70cf0df44cfd7e12017d8b09db6a7362177c9 Mon Sep 17 00:00:00 2001
From: "Shackra Sislock ext:(%22)"
Date: Sat, 21 Jul 2012 22:11:21 -0600
Subject: Updating ryzom-data, adding ryzom-client and ryzom-nel
---
pcr/ryzom-client | 41 ++++++++++++++++++++++++++++++++++++++
pcr/ryzom-data/PKGBUILD | 8 +++++---
pcr/ryzom-nel | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 98 insertions(+), 3 deletions(-)
create mode 100644 pcr/ryzom-client
create mode 100644 pcr/ryzom-nel
diff --git a/pcr/ryzom-client b/pcr/ryzom-client
new file mode 100644
index 000000000..d3d077d4f
--- /dev/null
+++ b/pcr/ryzom-client
@@ -0,0 +1,41 @@
+# Maintainer: Jorge Araya Navarro
+pkgname=('ryzom-client')
+pkgver=0.8.0
+pkgrel=1
+arch=('x86_64' 'i686')
+url="http://www.ryzom.com"
+license=('AGPL3')
+pkgdesc="An awesome free software 3D MMORPG game"
+depends=('ryzom-data' 'ryzom-nel')
+conflicts=('ryzom-client')
+groups=('ryzom')
+options=(!strip)
+makedepends=('kervala_libsquish-hg' 'cmake' 'bison'
+ 'lua' 'luabind' 'curl' 'libpng' 'libwww'
+ 'boost' 'ryzom-nel')
+
+auser="shackra"
+achangeset="3222b96eed75"
+
+source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
+
+build() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code"
+ if [[ -d "ryzom-client" ]]; then
+ rm -rf "ryzom-client"
+ mkdir "ryzom-client"
+ else
+ mkdir "ryzom-client"
+ fi
+
+ cd "ryzom-client"
+ cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin -DWITH_SYMBOLS=ON
+
+ make -j3
+}
+
+package() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+ make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD
index 272db5c07..dfb8a116c 100644
--- a/pcr/ryzom-data/PKGBUILD
+++ b/pcr/ryzom-data/PKGBUILD
@@ -9,9 +9,10 @@ license=('CCPL:by-sa')
makedepends=('rsync' 'p7zip-libre')
conflicts=('ryzom-data')
pkgdesc="An awesome free software 3D MMORPG game. Game data."
-source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download")
+source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download" "updateryzomdata")
noextract=("download")
-sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f')
+sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f'
+ 'b42f74fd21cdbf6734214e5576dbbe7e4cf171bf5d712011fbea6529bd0123fd')
package() {
cd "$srcdir/"
@@ -33,11 +34,12 @@ package() {
# creating directories
install -d -m 755 "${pkgdir}/usr/share/ryzom/data/fonts/"
+ install -d -m 755 "${pkgdir}/etc/cron.d/"
# installing files
install -m 644 fonts/* "${pkgdir}/usr/share/ryzom/data/fonts/"
rm -rf fonts
install -m 644 * "${pkgdir}/usr/share/ryzom/data/"
+ install -m 644 ${srcdir}/updateryzomdata "${pkgdir}/etc/cron.d/"
}
-
diff --git a/pcr/ryzom-nel b/pcr/ryzom-nel
new file mode 100644
index 000000000..aff8ec5e4
--- /dev/null
+++ b/pcr/ryzom-nel
@@ -0,0 +1,52 @@
+# Maintainer: Jorge Araya Navarro
+pkgname='ryzom-nel'
+pkgver=0.8.0
+pkgrel=7
+arch=('x86_64' 'i686')
+conflicts=('ryzom-nel')
+groups=('ryzom')
+options=(!strip)
+pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
+url="http://www.ryzom.com"
+license=('AGPL3')
+depends=('freetype2'
+ 'libx11'
+ 'mesa'
+ 'libxxf86vm'
+ 'openal'
+ 'freealut'
+ 'libogg'
+ 'libvorbis'
+ 'libxml2'
+ 'libjpeg'
+ 'rrdtool' )
+makedepends=('cmake' 'bison' 'kervala_libsquish-hg')
+
+auser="shackra"
+achangeset="3222b96eed75"
+
+source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+
+build() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code"
+
+ if [[ -d $pkgname ]]; then
+ rm -rf $pkgname
+ mkdir $pkgname
+ else
+ mkdir $pkgname
+ fi
+
+ cd $pkgname
+
+ #CMAKE_USE_RELATIVE_PATHS=true
+ cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
+
+ make -j3
+}
+
+package() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+ make DESTDIR="$pkgdir" install
+}
+sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
--
cgit v1.2.3
From 5ea6bd4adb27568407f942c7b4dfcc6013a72a39 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 22 Jul 2012 02:42:36 -0300
Subject: linux-libre-tools-3.5-1: updating version
---
libre/linux-libre-tools/PKGBUILD | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index def346093..1c3e94361 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -5,11 +5,11 @@
pkgbase=linux-libre-tools
_pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre')
-_basekernel=3.4
+_basekernel=3.5
#_sublevel=1
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=3
+pkgrel=1
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -37,8 +37,9 @@ build() {
msg2 'Build perf'
pushd linux-$pkgver/tools/perf
make \
+ WERROR=0 \
DESTDIR="$pkgdir/usr" \
- perfexecdir="lib/$_pkgname" \
+ perfexecdir='lib/perf' \
PYTHON=python2 \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
@@ -67,8 +68,9 @@ package_perf-libre() {
cd linux-$pkgver/tools/perf
make \
+ WERROR=0 \
DESTDIR="$pkgdir/usr" \
- perfexecdir="lib/$_pkgname" \
+ perfexecdir='lib/perf' \
PYTHON=python2 \
NO_GTK2=1 \
PERF_VERSION=$pkgver-$pkgrel \
--
cgit v1.2.3
From dda5c8f94faac28a09ce78edd9999d1b022d24b6 Mon Sep 17 00:00:00 2001
From: Shackra Sislock
Date: Sat, 21 Jul 2012 23:47:31 -0600
Subject: Oops!, fixing an error
--HG--
rename : pcr/ryzom-client => pcr/ryzom-client/PKGBUILD
rename : pcr/ryzom-nel => pcr/ryzom-nel/PKGBUILD
---
pcr/ryzom-client | 41 -------------------------------------
pcr/ryzom-client/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++
pcr/ryzom-nel | 52 -----------------------------------------------
pcr/ryzom-nel/PKGBUILD | 52 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 93 insertions(+), 93 deletions(-)
delete mode 100644 pcr/ryzom-client
create mode 100644 pcr/ryzom-client/PKGBUILD
delete mode 100644 pcr/ryzom-nel
create mode 100644 pcr/ryzom-nel/PKGBUILD
diff --git a/pcr/ryzom-client b/pcr/ryzom-client
deleted file mode 100644
index d3d077d4f..000000000
--- a/pcr/ryzom-client
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Jorge Araya Navarro
-pkgname=('ryzom-client')
-pkgver=0.8.0
-pkgrel=1
-arch=('x86_64' 'i686')
-url="http://www.ryzom.com"
-license=('AGPL3')
-pkgdesc="An awesome free software 3D MMORPG game"
-depends=('ryzom-data' 'ryzom-nel')
-conflicts=('ryzom-client')
-groups=('ryzom')
-options=(!strip)
-makedepends=('kervala_libsquish-hg' 'cmake' 'bison'
- 'lua' 'luabind' 'curl' 'libpng' 'libwww'
- 'boost' 'ryzom-nel')
-
-auser="shackra"
-achangeset="3222b96eed75"
-
-source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
-sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
-
-build() {
- cd "$srcdir/$auser-ryzom-$achangeset/code"
- if [[ -d "ryzom-client" ]]; then
- rm -rf "ryzom-client"
- mkdir "ryzom-client"
- else
- mkdir "ryzom-client"
- fi
-
- cd "ryzom-client"
- cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin -DWITH_SYMBOLS=ON
-
- make -j3
-}
-
-package() {
- cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
- make DESTDIR="$pkgdir" install
-}
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
new file mode 100644
index 000000000..d3d077d4f
--- /dev/null
+++ b/pcr/ryzom-client/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Jorge Araya Navarro
+pkgname=('ryzom-client')
+pkgver=0.8.0
+pkgrel=1
+arch=('x86_64' 'i686')
+url="http://www.ryzom.com"
+license=('AGPL3')
+pkgdesc="An awesome free software 3D MMORPG game"
+depends=('ryzom-data' 'ryzom-nel')
+conflicts=('ryzom-client')
+groups=('ryzom')
+options=(!strip)
+makedepends=('kervala_libsquish-hg' 'cmake' 'bison'
+ 'lua' 'luabind' 'curl' 'libpng' 'libwww'
+ 'boost' 'ryzom-nel')
+
+auser="shackra"
+achangeset="3222b96eed75"
+
+source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
+
+build() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code"
+ if [[ -d "ryzom-client" ]]; then
+ rm -rf "ryzom-client"
+ mkdir "ryzom-client"
+ else
+ mkdir "ryzom-client"
+ fi
+
+ cd "ryzom-client"
+ cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin -DWITH_SYMBOLS=ON
+
+ make -j3
+}
+
+package() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+ make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/ryzom-nel b/pcr/ryzom-nel
deleted file mode 100644
index aff8ec5e4..000000000
--- a/pcr/ryzom-nel
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Jorge Araya Navarro
-pkgname='ryzom-nel'
-pkgver=0.8.0
-pkgrel=7
-arch=('x86_64' 'i686')
-conflicts=('ryzom-nel')
-groups=('ryzom')
-options=(!strip)
-pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
-url="http://www.ryzom.com"
-license=('AGPL3')
-depends=('freetype2'
- 'libx11'
- 'mesa'
- 'libxxf86vm'
- 'openal'
- 'freealut'
- 'libogg'
- 'libvorbis'
- 'libxml2'
- 'libjpeg'
- 'rrdtool' )
-makedepends=('cmake' 'bison' 'kervala_libsquish-hg')
-
-auser="shackra"
-achangeset="3222b96eed75"
-
-source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
-
-build() {
- cd "$srcdir/$auser-ryzom-$achangeset/code"
-
- if [[ -d $pkgname ]]; then
- rm -rf $pkgname
- mkdir $pkgname
- else
- mkdir $pkgname
- fi
-
- cd $pkgname
-
- #CMAKE_USE_RELATIVE_PATHS=true
- cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
-
- make -j3
-}
-
-package() {
- cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
- make DESTDIR="$pkgdir" install
-}
-sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
new file mode 100644
index 000000000..aff8ec5e4
--- /dev/null
+++ b/pcr/ryzom-nel/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Jorge Araya Navarro
+pkgname='ryzom-nel'
+pkgver=0.8.0
+pkgrel=7
+arch=('x86_64' 'i686')
+conflicts=('ryzom-nel')
+groups=('ryzom')
+options=(!strip)
+pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
+url="http://www.ryzom.com"
+license=('AGPL3')
+depends=('freetype2'
+ 'libx11'
+ 'mesa'
+ 'libxxf86vm'
+ 'openal'
+ 'freealut'
+ 'libogg'
+ 'libvorbis'
+ 'libxml2'
+ 'libjpeg'
+ 'rrdtool' )
+makedepends=('cmake' 'bison' 'kervala_libsquish-hg')
+
+auser="shackra"
+achangeset="3222b96eed75"
+
+source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+
+build() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code"
+
+ if [[ -d $pkgname ]]; then
+ rm -rf $pkgname
+ mkdir $pkgname
+ else
+ mkdir $pkgname
+ fi
+
+ cd $pkgname
+
+ #CMAKE_USE_RELATIVE_PATHS=true
+ cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
+
+ make -j3
+}
+
+package() {
+ cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+ make DESTDIR="$pkgdir" install
+}
+sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568')
--
cgit v1.2.3
From b57a9248281bb12b690122cb2c04b14a789a00dd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Sun, 22 Jul 2012 02:54:46 -0300
Subject: linux-libre-tools-3.5-1: updating md5sum
---
libre/linux-libre-tools/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 1c3e94361..3803b520c 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'cpupower.rc'
'cpupower.conf'
'cpupower.service')
-md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
+md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
'73dbc931e86b3b73d6e2338dcbee81a4'
'18d5aa9e4c6bb23bb02bf65e155e0f0e'
'20870541e88109d2f153be3c58a277f1')
--
cgit v1.2.3
From 98b9141f47309f331d969a4fcbc21d47a8b609f7 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sun, 22 Jul 2012 16:59:58 -0300
Subject: mozilla-devscripts: updating package
---
libre/mozilla-devscripts/PKGBUILD | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD
index faa4b3a2a..ef7ea7641 100644
--- a/libre/mozilla-devscripts/PKGBUILD
+++ b/libre/mozilla-devscripts/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: Michał Masłowski
+# Contributor: Márcio Silva
pkgname=mozilla-devscripts
-pkgver=0.30
-pkgrel=1.1
+pkgver=0.32
+pkgrel=1
pkgdesc="Development scripts used by Debian Mozilla's addons packages"
arch=("any")
url="http://packages.debian.org/source/unstable/mozilla-devscripts"
@@ -11,8 +12,8 @@ depends=("python2" "zip" "unzip")
_debrepo=http://ftp.debian.org/debian/pool/main/
source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
"${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
-md5sums=("6e517cef69c115356eb808866fd29268"
- "4e95fb93d0d93b56543d2a789d457309")
+md5sums=("386a5854601f29dca4a293f90f6c2a69"
+ "230126afa15fa654eb254bb4e61b4a93")
build() {
cd "$srcdir/$pkgname-$pkgver"
--
cgit v1.2.3
From 28e3a130ba71f25ba564a49faace57e6ce246f9d Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sun, 22 Jul 2012 18:43:19 -0300
Subject: psutils-libre: deleting .directory file
---
libre/psutils-libre/.directory | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 libre/psutils-libre/.directory
diff --git a/libre/psutils-libre/.directory b/libre/psutils-libre/.directory
deleted file mode 100644
index 60ed4bded..000000000
--- a/libre/psutils-libre/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,4,11,16,24,1
--
cgit v1.2.3
From e8a1c3baadc9539b355cec98771effc89ede53c6 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sun, 22 Jul 2012 22:53:58 -0300
Subject: texlive-bin-libre: updating package
---
libre/texlive-bin-libre/PKGBUILD | 22 ++++++++++++---------
.../luatex-r4449-radical-rule-thickness.patch | 23 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 9 deletions(-)
create mode 100644 libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 68c71284c..3dd2a8620 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=texlive-bin-libre
pkgver=2012.0
-pkgrel=1
+pkgrel=2
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
@@ -25,19 +25,19 @@ source=('texmf.cnf'
'poppler-0.20.patch'
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
+ 'luatex-r4449-radical-rule-thickness.patch'
)
backup=(etc/texmf/web2c/texmf.cnf \
- etc/texmf/chktex/chktexrc \
- etc/texmf/web2c/mktex.cnf \
- etc/texmf/web2c/updmap.cfg \
- etc/texmf/web2c/fmtutil.cnf \
+ etc/texmf/chktex/chktexrc \
+ etc/texmf/dvipdfm/config/config \
+ etc/texmf/dvipdfmx/dvipdfmx.cfg \
+ etc/texmf/dvips/config/config.ps \
etc/texmf/tex/generic/config/language.dat \
etc/texmf/tex/generic/config/language.def \
etc/texmf/tex/generic/config/pdftexconfig.tex \
etc/texmf/ttf2pk/ttf2pk.cfg \
- etc/texmf/dvips/config/config.ps \
- etc/texmf/dvipdfmx/dvipdfmx.cfg \
- etc/texmf/dvipdfm/config/config \
+ etc/texmf/web2c/fmtutil.cnf \
+ etc/texmf/web2c/mktex.cnf \
etc/texmf/xdvi/XDvi)
md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
@@ -45,7 +45,8 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
'393a4bf67adc7ca5df2b386759d1a637'
'e3a664d5a7f0923f35060fe9d25d2573'
'ac2c3c3aa765581f8504e21a5edbfb9f'
- 'f315a860158cfc952c82a6d759961024')
+ 'f315a860158cfc952c82a6d759961024'
+ '5190f3295eb9a604c5f17f5bd607299b')
build() {
if [ "${CARCH}" != "i686" ]; then
@@ -58,6 +59,9 @@ build() {
patch -Np0 -i fix-fontforge-encoding.patch
# fix build with poppler >= 0.20
patch -Np0 -i poppler-0.20.patch
+ # fix radical rule thickness regression in Luatex
+ # http://tex.stackexchange.com/q/61952/729
+ patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
# t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
#############################################################
diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
new file mode 100644
index 000000000..f925a1a93
--- /dev/null
+++ b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
@@ -0,0 +1,23 @@
+Index: source/texk/web2c/luatexdir/tex/mlist.w
+===================================================================
+--- source/texk/web2c/luatexdir/tex/mlist.w (revision 4448)
++++ source/texk/web2c/luatexdir/tex/mlist.w (revision 4449)
+@@ -1798,7 +1798,17 @@
+ theta = fraction_rule(cur_style);
+ y = var_delimiter(left_delimiter(q), cur_size,
+ height(x) + depth(x) + clr + theta, NULL, cur_style);
+- theta = height(y);
++ /* If |y| is a composite then set |theta| to the height of its top
++ character, else set it to the height of |y|. */
++ if (list_ptr(y) != null
++ && type(list_ptr(y)) == hlist_node
++ && list_ptr(list_ptr(y)) != null
++ && type(list_ptr(list_ptr(y))) == glyph_node) { /* and it should be */
++ theta = char_height(font(list_ptr(list_ptr(y))),
++ character(list_ptr(list_ptr(y))));
++ } else {
++ theta = height(y);
++ }
+ } else {
+ y = var_delimiter(left_delimiter(q), cur_size,
+ height(x) + depth(x) + clr + theta, NULL, cur_style);
--
cgit v1.2.3
From 22d7d514590e6e2f08bdb1593b9060cbff38f974 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado
Date: Sun, 22 Jul 2012 22:55:49 -0300
Subject: texlive-core-libre: deleting .directory file
---
libre/texlive-core-libre/.directory | 5 -----
1 file changed, 5 deletions(-)
delete mode 100644 libre/texlive-core-libre/.directory
diff --git a/libre/texlive-core-libre/.directory b/libre/texlive-core-libre/.directory
deleted file mode 100644
index 9d572f361..000000000
--- a/libre/texlive-core-libre/.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Dolphin]
-Timestamp=2012,6,26,20,37,17
-
-[Settings]
-HiddenFilesShown=true
--
cgit v1.2.3
From f4845199ed567d98e95fcc7f1961922e13a6b248 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 00:00:00 -0300
Subject: parabola-keyring-20120723-1: updating version
---
libre/parabola-keyring/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 432a5cf75..385790ccd 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -2,8 +2,8 @@
# Maintainer: André Silva
pkgname=parabola-keyring
-pkgver=20120719
-pkgrel=2
+pkgver=20120723
+pkgrel=1
pkgdesc='Parabola GNU/Linux-libre PGP keyring'
arch=('any')
url='https://projects.parabolagnulinux.org/hackers.git/'
@@ -16,5 +16,5 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make PREFIX=/usr DESTDIR=${pkgdir} install
}
-md5sums=('de7f518935faea83aaa4d74001be8ecc'
- '22dd9f76911e4984a6cc625d9d1f9465')
+md5sums=('f9ab13c8c969c3bf136e302a666e32d9'
+ '5c27394f0575ab9fb27bf3ab9cb212e3')
--
cgit v1.2.3
From 0bd206bfb0dcaf7b5e8ee531ac7e07a70babd40a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 03:43:41 -0300
Subject: xulrunner-libre-14.0.1.2-1: updating version
---
libre/xulrunner-libre/PKGBUILD | 59 +++++++++++++++---------------------------
1 file changed, 21 insertions(+), 38 deletions(-)
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 001eb5f48..8c332db12 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -4,10 +4,10 @@
# With many changes from iceweasel-libre.
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=13.0
-_debrel=1
+_debver=14.0.1
+_debrel=2
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -23,7 +23,6 @@ makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mes
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
mozconfig
mozilla-pkgconfig.patch
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
@@ -31,15 +30,13 @@ options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('e440446bb92dc1c0311346c68024590b'
- 'cb8bfb543002a5d78db7e8661f9f87ec'
- 'a9848e41461776bc4bf8d2de824b1204'
+md5sums=('8e4f3987d37c8e73b168948d0771b872'
+ '8689c150a4d3a0a688ad2db6044feac6'
'f2f4f4a573f549e8b494e33b3ad226bc'
'27271ce647a83906ef7a24605e840d61'
- '41ce105f0c1877fe22e0c0ec45e09565')
+ '88350bc611361a1ff635f5c960c6d6ee')
-dpkg-source() {
- # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+build() {
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
@@ -47,31 +44,18 @@ dpkg-source() {
mv debian "${_debname}-${_debver}"
cd "${_debname}-${_debver}"
-# Doesn't apply and seems unimportant
+ # Doesn't apply and seems unimportant
rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
+ # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
quilt push -a
find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
- cd ..
-}
-
-build() {
-# Don't run this if we're using -e
-if [ $NOEXTRACT -eq 0 ]; then
- msg2 "Applying Debian patches..."
- cd "${srcdir}"
- dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-
- msg2 "Starting normal build..."
- mv "${_debname}-${_debver}" "$srcdir/mozilla-release"
- cd "$srcdir/mozilla-release"
cp "$srcdir/mozconfig" .mozconfig
-# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+ # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
# Fails, claiming the page size to have changed.
@@ -79,29 +63,28 @@ if [ $NOEXTRACT -eq 0 ]; then
#fix libdir/sdkdir - fedora
patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-fi
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver}"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
export PYTHON="/usr/bin/python2"
make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
}
package() {
- cd "$srcdir/mozilla-release"
+ cd "${_debname}-${_debver}"
make -j1 -f client.mk DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver}/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver}/hyphenation"
+ rm -rf "$pkgdir"/usr/lib/xulrunner-${_debver::4}/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver::4}/dictionaries"
+ ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver::4}/hyphenation"
# add xulrunner library path to ld.so.conf
install -d $pkgdir/etc/ld.so.conf.d
- echo "/usr/lib/xulrunner-${_debver}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
+ echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
- chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/header.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/typelib.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpidl.py"
+ 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"
}
--
cgit v1.2.3
From 89935048066b26fde378d2254e65c548333729bb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 03:44:43 -0300
Subject: xulrunner-libre-14.0.1.2-1: removing obsolete gcc47.patch file
---
libre/xulrunner-libre/gcc47.patch | 77 ---------------------------------------
1 file changed, 77 deletions(-)
delete mode 100644 libre/xulrunner-libre/gcc47.patch
diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch
deleted file mode 100644
index 5cea6769d..000000000
--- a/libre/xulrunner-libre/gcc47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User Martin Stránský
-# Date 1328886461 -3600
-# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349
-# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049
-Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
-
-diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
---- a/ipc/chromium/src/base/file_util_linux.cc
-+++ b/ipc/chromium/src/base/file_util_linux.cc
-@@ -1,15 +1,18 @@
- // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/file_util.h"
-
- #include
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include
-+#endif
-
- #include
- #include
-
- #include "base/eintr_wrapper.h"
- #include "base/file_path.h"
- #include "base/string_util.h"
-
-diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
---- a/ipc/chromium/src/base/message_pump_libevent.cc
-+++ b/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -1,16 +1,19 @@
- // Copyright (c) 2008 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
- #include "base/message_pump_libevent.h"
-
- #include
- #include
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include
-+#endif
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "third_party/libevent/event.h"
-
-diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
---- a/ipc/chromium/src/base/time_posix.cc
-+++ b/ipc/chromium/src/base/time_posix.cc
-@@ -8,16 +8,19 @@
- #include
- #endif
- #include
- #ifdef ANDROID
- #include
- #else
- #include
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include
-+#endif
-
- #include
-
- #include "base/basictypes.h"
- #include "base/logging.h"
-
- namespace base {
-
-
--
cgit v1.2.3
From e37f740d95f8f2d9db25c5f24cea29deae14e107 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 03:55:05 -0300
Subject: iceweasel-libre-14.0.1.2-2: fixing some comments on PKGBUILD
---
libre/iceweasel-libre/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 23423e428..259413591 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -12,7 +12,7 @@
_pgo=false
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
_debname=iceweasel
_debver=14.0.1
_debrel=2
--
cgit v1.2.3
From fcd5a0c490ce3d5f0c171c974946b0f236627ea1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 04:21:24 -0300
Subject: xulrunner-libre-14.0.1.2-1: updating
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
---
...Make-the-Reset-Firefox-feature-more-gener.patch | 215 +++++++++++----------
1 file changed, 116 insertions(+), 99 deletions(-)
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 4da03a569..4a0507271 100644
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -2,35 +2,20 @@ From: Mike Hommey
Date: Tue, 5 Jun 2012 08:57:06 +0200
Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
----
- browser/components/migration/content/migration.js | 15 ++++++++++-----
- browser/components/migration/content/migration.xul | 2 +-
- .../migration/src/BrowserProfileMigrators.manifest | 2 +-
- .../components/migration/src/FirefoxProfileMigrator.js | 2 +-
- browser/components/migration/src/ProfileMigrator.js | 4 ++++
- .../en-US/chrome/browser/migration/migration.dtd | 2 --
- .../en-US/chrome/browser/migration/migration.properties | 11 +++++------
- toolkit/content/aboutSupport.js | 8 ++++----
- toolkit/content/jar.mn | 2 +-
- toolkit/content/resetProfile.js | 6 ++----
- toolkit/profile/nsIProfileMigrator.idl | 10 +++++++++-
- toolkit/xre/nsAppRunner.cpp | 2 +-
- 83 files changed, 394 insertions(+), 382 deletions(-)
-
diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index ffb0c34..442a5ff 100644
+index 0e8ccf5..fa46c08 100644
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
-@@ -314,7 +314,7 @@ var MigrationWizard = {
+@@ -249,7 +249,7 @@ var MigrationWizard = {
}
- var bundle = document.getElementById("brandBundle");
+ var brandBundle = document.getElementById("brandBundle");
- // These strings don't exist when not using official branding. If that's
+ // These strings may not exist when not using official branding. If that's
// the case, just skip this page.
try {
- var pageTitle = bundle.getString("homePageMigrationPageTitle");
-@@ -346,8 +346,8 @@ var MigrationWizard = {
+ var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
+@@ -281,8 +281,8 @@ var MigrationWizard = {
case "chrome":
source = "sourceNameChrome";
break;
@@ -41,75 +26,107 @@ index ffb0c34..442a5ff 100644
break;
}
-@@ -357,8 +357,13 @@ var MigrationWizard = {
+@@ -292,7 +292,12 @@ var MigrationWizard = {
var oldHomePageURL = this._migrator.sourceHomePageURL;
if (oldHomePageURL && source) {
-- var bundle2 = document.getElementById("bundle");
-- var appName = bundle2.getString(source);
+- var appName = MigrationUtils.getLocalizedString(source);
+ var appName;
+ if (source == "brand") {
-+ appName = bundle.GetStringFromName("brandFullName");
++ appName = brandBundle.GetStringFromName("brandFullName");
+ } else {
-+ var bundle2 = document.getElementById("bundle");
-+ appName = bundle2.getString(source);
++ appName = MigrationUtils.getLocalizedString(source);
+ }
- var oldHomePageLabel = bundle.getFormattedString("homePageImport",
- [appName]);
+ var oldHomePageLabel =
+ brandBundle.getFormattedString("homePageImport", [appName]);
var oldHomePage = document.getElementById("oldHomePage");
diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index f8653b1..f3ac62a 100644
+index 4bcc1d9..c4db956 100644
--- a/browser/components/migration/content/migration.xul
+++ b/browser/components/migration/content/migration.xul
-@@ -76,7 +76,7 @@
- #endif
- #endif
+@@ -74,7 +74,7 @@
+ #elifdef XP_UNIX
+ #endif
-
+
-
+
diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index f49e481..e490ddf 100644
+index 527771f..782b38f 100644
--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,4 +3,4 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
+@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+ component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
+ contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
+ component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js
diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 7b4a6e4..add5bc4 100644
+index 8f14f49..8dc175d 100644
--- a/browser/components/migration/src/FirefoxProfileMigrator.js
+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {
- ]),
+@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
- classDescription: "Firefox Profile Migrator",
-- contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",
-+ contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",
- classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")
- };
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index ea66675..fe4df10 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {
- params);
+ FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
+-FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
++FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
+ FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
+
+ const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
+index 9460e6d..8db6827 100644
+--- a/browser/components/migration/src/MigrationUtils.jsm
++++ b/browser/components/migration/src/MigrationUtils.jsm
+@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+ * @see nsIStringBundle
+ */
+ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
+- const OVERRIDES = {
+- "4_firefox": "4_firefox_history_and_bookmarks"
+- };
+- aKey = OVERRIDES[aKey] || aKey;
+-
+ if (aReplacements === undefined)
+ return getMigrationBundle().GetStringFromName(aKey);
+ return getMigrationBundle().formatStringFromName(
+@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
},
-+ canMigrate: function PM__canMigrate(aMigratorKey) {
+ /**
++ * Returns whether a given migration type is supported.
++ *
++ * @param aKey Migrator key
++ * @returns whether the migrator key is supported.
++ */
++ canMigrate:
++ function MU_canMigrate(aMigratorKey) {
+ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
+ },
+
- _toCString: function PM__toCString(aStr) {
- let cstr = Cc["@mozilla.org/supports-cstring;1"].
- createInstance(Ci.nsISupportsCString);
++ /**
+ * Cleans up references to migrators and nsIProfileInstance instances.
+ */
+ finishMigration: function MU_finishMigration() {
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index 744f117..59e5a4c 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -12,6 +12,7 @@ function ProfileMigrator() {
+
+ ProfileMigrator.prototype = {
+ migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
++ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
+ QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
+ classDescription: "Profile Migrator",
+ contractID: "@mozilla.org/toolkit/profile-migrator;1",
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 86e9d0b..8df7864 100644
+index 0b4b776..ce26fbd 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
@@ -13,8 +13,6 @@
@@ -118,11 +135,11 @@ index 86e9d0b..8df7864 100644
-
-
-
-
+
+
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 495ed78..0272654 100644
+index f522a66..be26460 100644
--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
@@ -4,7 +4,6 @@ profileName_format=%S %S
@@ -132,8 +149,8 @@ index 495ed78..0272654 100644
-sourceNameFirefox=Mozilla Firefox
importedBookmarksFolder=From %S
- importedSearchURLsFolder=Keyword Searches (From %S)
-@@ -21,27 +20,27 @@ importedSafariBookmarks=From Safari
+
+@@ -18,29 +17,29 @@ importedSafariReadingList=Reading List (From Safari)
2_ie=Cookies
2_safari=Cookies
2_chrome=Cookies
@@ -143,8 +160,8 @@ index 495ed78..0272654 100644
4_ie=Browsing History
4_safari=Browsing History
4_chrome=Browsing History
--4_firefox=Browsing History
-+4_self=Browsing History
+-4_firefox_history_and_bookmarks=Browsing History and Bookmarks
++4_self=Browsing History and Bookmarks
8_ie=Saved Form History
8_safari=Saved Form History
@@ -166,11 +183,14 @@ index 495ed78..0272654 100644
64_ie=Other Data
64_safari=Other Data
+ 64_chrome=Other Data
+-64_firefox=Bookmarks Backups
++64_self=Bookmarks Backups
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
-index c86d80c..ff1ccfe 100644
+index 957d4d8..1af3629 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
-@@ -608,13 +608,13 @@ function populateResetBox() {
+@@ -616,13 +616,13 @@ function populateResetBox() {
.getService(Ci.nsIToolkitProfileService);
let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
@@ -188,46 +208,43 @@ index c86d80c..ff1ccfe 100644
return;
document.getElementById("reset-box").style.visibility = "visible";
} catch (e) {
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 6f0d2d6..da7342b 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -38,7 +38,7 @@ toolkit.jar:
- + content/global/mozilla.xhtml (mozilla.xhtml)
- *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
- content/global/resetProfile.css (resetProfile.css)
--* content/global/resetProfile.js (resetProfile.js)
-+ content/global/resetProfile.js (resetProfile.js)
- * content/global/resetProfile.xul (resetProfile.xul)
- * content/global/treeUtils.js (treeUtils.js)
- *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index 975a9ed..d8e46b1 100644
+index 84de6cd..3126da6 100644
--- a/toolkit/content/resetProfile.js
+++ b/toolkit/content/resetProfile.js
-@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+@@ -6,6 +6,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
// based on onImportItemsPageShow from migration.js
function onResetProfileLoad() {
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
- const MAX_MIGRATED_TYPES = 16;
++<<<<<<< HEAD
+ #expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+ #expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+
+@@ -16,16 +17,22 @@ function onResetProfileLoad() {
+ "8_" + MOZ_APP_NAME, // Form History
+ "2_" + MOZ_APP_NAME, // Cookies
+ ];
++=======
++ Components.utils.import("resource:///modules/MigrationUtils.jsm");
++ const MAX_MIGRATED_TYPES = 16;
++>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
var migratedItems = document.getElementById("migratedItems");
- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
-+ var bundle = Services.strings.createBundle("chrome://browser" +
- "/locale/migration/migration.properties");
+- "/locale/migration/migration.properties");
- // Loop over possible data to migrate to give the user a list of what will be preserved. This
-@@ -21,7 +19,7 @@ function onResetProfileLoad() {
- var itemID = Math.pow(2, i);
+ // Loop over possible data to migrate to give the user a list of what will be preserved.
+ for (var itemStringName of MIGRATED_TYPES) {
try {
var checkbox = document.createElement("label");
-- checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));
-+ checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));
++<<<<<<< HEAD
+ checkbox.setAttribute("value", bundle.GetStringFromName(itemStringName));
++=======
++ checkbox.setAttribute("value", MigrationUtils.getLocalizedString(itemID + "_self"));
++>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
migratedItems.appendChild(checkbox);
} catch (x) {
- // Catch exceptions when the string for a data type doesn't exist because it's not migrated
+ // Catch exceptions when the string for a data type doesn't exist.
diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
index e941336..5b264af 100644
--- a/toolkit/profile/nsIProfileMigrator.idl
@@ -257,15 +274,15 @@ index e941336..5b264af 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 32eef5c..dbe1580 100644
+index d2db0e2..45a4b0d 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
- if (gDoProfileReset) {
- // Automatically migrate from the current application if we just
- // reset the profile.
-- aKey = MOZ_APP_NAME;
-+ aKey = "self";
- pm->Migrate(&dirProvider, aKey);
- // Set the new profile as the default after migration.
- rv = SetCurrentProfileAsDefault(profileSvc, profD);
+@@ -3642,7 +3642,7 @@ XREMain::XRE_mainRun()
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ pm->Migrate(&mDirProvider, aKey);
+ // Set the new profile as the default after migration.
+ rv = SetCurrentProfileAsDefault(mProfileSvc, mProfD);
--
cgit v1.2.3
From 22c966c2c09dc164c22d9fa6925d801f36000793 Mon Sep 17 00:00:00 2001
From: Michał Masłowski
Date: Mon, 23 Jul 2012 23:13:24 +0200
Subject: Update h-client.
---
libre/h-client/PKGBUILD | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD
index e77a2437e..821517397 100644
--- a/libre/h-client/PKGBUILD
+++ b/libre/h-client/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Michał Masłowski
pkgname=h-client
-_pkgver=0.0a0.dev-r107
+_pkgver=0.0a0.dev-r118
pkgver=${_pkgver/-/.}
pkgrel=1
-pkgdesc="A client for an h-source server (such as http://www.h-node.com)"
+pkgdesc="A client for an h-source server (such as http://www.h-node.org/)"
arch=('any')
url="https://savannah.nongnu.org/projects/h-client/"
license=('GPL3')
@@ -12,8 +12,9 @@ depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
options=(!emptydirs)
# Official source is in SVN, this is made by "python2 setup.py sdist"
# on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0).
-source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz")
-sha512sums=('d820871fcf3f92e6e31aa02273ae413bf066524eaf245f1d4cf7dc8b0ba5799eb07bf86dd28861c8878c73147bbcae563668cb3a6fa9c3382c751e6717d85f0c')
+source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz"{,.sig})
+sha512sums=('af962c67b363435cfa74f7c420760b0254ba3e7c1e6611d5ff276e6595e30dadf1b5d588cd2469647efdbb0099f70a027b9f65d8aeefc70ea712c9ef5d7cbace'
+ '7d4746297c4a0bd328b1e57f596e827b4a12d2f703d074f7e87ea0c9e3f747c2cfd48da971e81fdaf27939d463b359fac4638820f08486ef28502e769168692d')
build() {
cd "$srcdir/hclient-${_pkgver}"
--
cgit v1.2.3
From faf6b0455a5f63fe760bbce7ef548e6ee599f90f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 19:06:47 -0300
Subject: linux-libre-3.5-1: removing obsolete patch
---
.../3.4.4-fix-backlight-regression.patch | 38 ----------------------
1 file changed, 38 deletions(-)
delete mode 100644 libre/linux-libre/3.4.4-fix-backlight-regression.patch
diff --git a/libre/linux-libre/3.4.4-fix-backlight-regression.patch b/libre/linux-libre/3.4.4-fix-backlight-regression.patch
deleted file mode 100644
index a0cf0b1db..000000000
--- a/libre/linux-libre/3.4.4-fix-backlight-regression.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: Still use ACPI backlight control if _DOS doesn't exist
-
-This is a regression introduced by commit
-ea9f8856bd6d4ed45885b06a338f7362cd6c60e5
-
-https://bugzilla.kernel.org/show_bug.cgi?id=43168
-
-Some platforms don't have _DOS control method, but the ACPI
-backlight still works.
-We do not want to lose the backlight control ability on these platforms.
-
-CC : Igor Murzov
-Signed-off-by: Zhang Rui
----
- drivers/acpi/video.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-Index: rtd3/drivers/acpi/video.c
-===================================================================
---- rtd3.orig/drivers/acpi/video.c
-+++ rtd3/drivers/acpi/video.c
-@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus
- video->dos_setting = arg0.integer.value;
- status = acpi_evaluate_object(video->device->handle, "_DOS",
- &args, NULL);
-- if (ACPI_FAILURE(status))
-- return -EIO;
-+ if (ACPI_FAILURE(status)) {
-+ /*
-+ * some platforms don't have _DOS, but the ACPI
-+ * backlight control still works
-+ */
-+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _DOS\n"));
-+ return 0;
-+ }
-
- return 0;
- }
--
cgit v1.2.3
From f3826a9ba20a321220b1c1b052b59ece0d5e0145 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 19:08:04 -0300
Subject: linux-libre-3.5-1: update version
---
libre/linux-libre/PKGBUILD | 23 ++--
libre/linux-libre/config.i686 | 245 +++++++++++++++++++++++++---------
libre/linux-libre/config.x86_64 | 242 ++++++++++++++++++++++++---------
libre/linux-libre/linux-libre.install | 2 +-
4 files changed, 375 insertions(+), 137 deletions(-)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 759a5fea1..b552dcca5 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -11,9 +11,10 @@ pkgbase=linux-libre
pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE
-_basekernel=3.4
-_sublevel=6
-pkgver=${_basekernel}.${_sublevel}
+_basekernel=3.5
+#_sublevel=6
+#pkgver=${_basekernel}.${_sublevel}
+pkgver=${_basekernel}
_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +23,7 @@ license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
options=('!strip')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
- "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+ #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
@@ -32,19 +33,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'i915-fix-ghost-tv-output.patch'
- '3.4.4-fix-backlight-regression.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
- 'fe16da96e942fcfc195fc53ff93e3864'
- '669c3f9d5c6a2109bad8e511287826c3'
- '454231e14419e56a5281eb7bc6fde83e'
+md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
+ 'a89ff57fd3ce5833d51f7cdef17a9a3c'
+ '978a58bebbdfe04d6e91523e09da5ad5'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
- '80a46681386bb87813989faeb92bdd9a'
'a9338d11a2b23fe0cd43cc4fee5aed42')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
@@ -71,9 +69,6 @@ build() {
# needed.
patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
- # Fix backlight control on some laptops:
- # https://bugzilla.kernel.org/show_bug.cgi?id=43168
- patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch"
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
@@ -286,7 +281,7 @@ package_linux-libre-headers() {
cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
- for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
+ 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}"
done
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index a6e1a6310..114841394 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.4.0-1 Kernel Configuration
+# Linux/i386 3.5.0-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -9,10 +9,6 @@ CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -26,9 +22,7 @@ CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -46,11 +40,12 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
@@ -101,6 +96,20 @@ CONFIG_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
#
# RCU Subsystem
@@ -108,6 +117,7 @@ CONFIG_SPARSE_IRQ=y
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
@@ -139,7 +149,6 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_SCHED_AUTOGROUP=y
@@ -182,7 +191,6 @@ CONFIG_HAVE_PERF_EVENTS=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
@@ -206,7 +214,9 @@ CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -218,6 +228,8 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
#
# GCOV-based kernel profiling
@@ -312,11 +324,6 @@ CONFIG_FREEZER=y
# Processor type and features
#
CONFIG_ZONE_DMA=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_SMP=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_BIGSMP is not set
@@ -451,7 +458,9 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -496,6 +505,10 @@ CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
@@ -632,7 +645,6 @@ CONFIG_PCI_LABEL=y
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
# CONFIG_EISA is not set
-# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
CONFIG_OLPC=y
CONFIG_OLPC_XO1_PM=y
@@ -678,6 +690,7 @@ CONFIG_RAPIDIO=y
CONFIG_RAPIDIO_TSI721=y
CONFIG_RAPIDIO_DISC_TIMEOUT=30
# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
@@ -705,6 +718,7 @@ CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
@@ -843,6 +857,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -1003,7 +1018,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1099,11 +1113,11 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
CONFIG_PHONET=m
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
#
@@ -1127,6 +1141,8 @@ CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1162,6 +1178,7 @@ CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1339,6 +1356,8 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
# CONFIG_NFC_LLCP is not set
#
@@ -1370,6 +1389,7 @@ CONFIG_EXTRA_FIRMWARE=""
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_CMA is not set
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1500,7 +1520,6 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
CONFIG_OF=y
#
@@ -1512,7 +1531,6 @@ CONFIG_OF_PROMTREE=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
CONFIG_OF_I2C=m
CONFIG_OF_NET=y
CONFIG_OF_MDIO=m
@@ -1599,7 +1617,8 @@ CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
# CONFIG_PCH_PHUB is not set
CONFIG_USB_SWITCH_FSA9480=m
CONFIG_C2PORT=m
@@ -1629,6 +1648,7 @@ CONFIG_SENSORS_LIS3_I2C=m
# Altera FPGA firmware download module
#
CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1764,6 +1784,7 @@ CONFIG_SCSI_PAS16=m
CONFIG_SCSI_QLOGIC_FAS=m
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1936,6 +1957,7 @@ CONFIG_TCM_PSCSI=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_TCM_FC=m
CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1972,10 +1994,12 @@ CONFIG_EQUALIZER=m
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_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_NETCONSOLE=m
@@ -2118,10 +2142,13 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
+CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ELPLUS=m
@@ -2211,8 +2238,8 @@ CONFIG_EPIC100=m
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STMMAC_PCI=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
# CONFIG_STMMAC_DEBUG_FS is not set
# CONFIG_STMMAC_DA is not set
CONFIG_STMMAC_RING=y
@@ -2230,6 +2257,12 @@ CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
CONFIG_NET_VENDOR_XIRCOM=y
CONFIG_PCMCIA_XIRC2PS=m
# CONFIG_FDDI is not set
@@ -2256,6 +2289,8 @@ CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2274,7 +2309,6 @@ CONFIG_SLHC=m
# CONFIG_SLIP_COMPRESSED is not set
# CONFIG_SLIP_SMART is not set
# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_TR is not set
#
# USB Network Adapters
@@ -2389,6 +2423,7 @@ CONFIG_BRCMUTIL=m
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
@@ -2470,17 +2505,19 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
CONFIG_WL1251=m
CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL12XX_SDIO=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
#
# WiMAX Wireless Broadband devices
@@ -2647,6 +2684,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
#
# Userland interfaces
@@ -2675,6 +2713,7 @@ CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_TCA8418=m
CONFIG_KEYBOARD_MATRIX=m
# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
# CONFIG_KEYBOARD_MAX7359 is not set
CONFIG_KEYBOARD_MCS=m
CONFIG_KEYBOARD_MPR121=m
@@ -2762,6 +2801,7 @@ CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
CONFIG_TOUCHSCREEN_MAX11801=m
CONFIG_TOUCHSCREEN_MCS5000=m
CONFIG_TOUCHSCREEN_MTOUCH=m
@@ -2778,6 +2818,7 @@ CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2802,11 +2843,11 @@ CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_APANEL=m
@@ -2953,7 +2994,6 @@ CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -3054,6 +3094,7 @@ CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -3063,6 +3104,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
#
@@ -3217,6 +3259,7 @@ CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP401=m
@@ -3236,6 +3279,7 @@ CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
#
# ACPI drivers
@@ -3266,6 +3310,7 @@ CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
@@ -3344,21 +3389,23 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
+CONFIG_MFD_LM3533=m
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
CONFIG_MFD_PCF50633=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_I2C=m
CONFIG_ABX500_CORE=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
CONFIG_MFD_CS5535=m
# CONFIG_MFD_TIMBERDALE is not set
CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
CONFIG_MFD_RDC321X=m
# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
@@ -3430,7 +3477,9 @@ 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_TDA18212=m
+CONFIG_MEDIA_TUNER_TUA9001=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
@@ -3549,6 +3598,7 @@ CONFIG_VIDEO_THS7303=m
CONFIG_VIDEO_M52790=m
CONFIG_VIDEO_VIVI=m
CONFIG_V4L_USB_DRIVERS=y
+CONFIG_VIDEO_AU0828=m
CONFIG_USB_VIDEO_CLASS=m
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
CONFIG_USB_GSPCA=m
@@ -3606,7 +3656,7 @@ CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
+CONFIG_VIDEO_EM28XX_RC=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
@@ -3616,7 +3666,6 @@ CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
CONFIG_USB_SN9C102=m
CONFIG_USB_PWC=m
# CONFIG_USB_PWC_DEBUG is not set
@@ -3626,7 +3675,6 @@ CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_BT848=m
CONFIG_VIDEO_BT848_DVB=y
CONFIG_VIDEO_CX18=m
@@ -3741,6 +3789,7 @@ 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
@@ -3890,8 +3939,11 @@ CONFIG_DVB_OR51132=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
CONFIG_DVB_S5H1409=m
CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
CONFIG_DVB_S5H1411=m
#
@@ -3923,6 +3975,7 @@ CONFIG_DVB_TDA665x=m
CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
#
# Tools to develop new frontends
@@ -3975,6 +4028,9 @@ CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
CONFIG_DRM_GMA3600=y
CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -4048,12 +4104,14 @@ CONFIG_FB_VIRTUAL=m
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
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
@@ -4084,6 +4142,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
@@ -4229,7 +4288,6 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
CONFIG_SND_HDA_INPUT_JACK=y
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
@@ -4287,16 +4345,13 @@ CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
#
-# USB Input Devices
+# HID support
#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_HID_GENERIC=m
#
# Special HID drivers
@@ -4305,6 +4360,7 @@ CONFIG_HID_A4TECH=m
CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=m
+CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
CONFIG_HID_CHICONY=m
@@ -4362,12 +4418,18 @@ CONFIG_HID_TOPSEED=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
CONFIG_HID_WIIMOTE=m
CONFIG_HID_WIIMOTE_EXT=y
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4381,8 +4443,6 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
@@ -4421,9 +4481,15 @@ CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_RENESAS_USBHS_HCD=m
CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_RENESAS_USBHS=m
#
@@ -4537,6 +4603,7 @@ CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4563,6 +4630,11 @@ CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_ISP1301=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4574,6 +4646,10 @@ CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
CONFIG_USB_FUSB300=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
@@ -4581,12 +4657,10 @@ CONFIG_USB_MV_UDC=m
CONFIG_USB_GADGET_MUSB_HDRC=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_CI13XXX_PCI=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
CONFIG_USB_NET2280=m
CONFIG_USB_GOKU=m
-CONFIG_USB_LANGWELL=m
CONFIG_USB_EG20T=m
CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_GADGET_DUALSPEED=y
@@ -4606,6 +4680,7 @@ CONFIG_USB_FUNCTIONFS_GENERIC=y
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
CONFIG_USB_G_PRINTER=m
@@ -4625,7 +4700,6 @@ CONFIG_USB_G_WEBCAM=m
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AB8500_USB is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -4680,6 +4754,7 @@ CONFIG_LEDS_CLASS=y
# LED drivers
#
CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
@@ -4693,6 +4768,7 @@ CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_TRIGGERS=y
@@ -4709,6 +4785,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
#
# iptables trigger is under Netfilter config (LED target)
#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
@@ -4796,11 +4873,11 @@ CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
#
# on-CPU RTC drivers
#
+CONFIG_RTC_DRV_MC13XXX=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4843,6 +4920,7 @@ CONFIG_VIRTIO_RING=y
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
# Microsoft Hyper-V guest support
@@ -4861,6 +4939,8 @@ CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
CONFIG_COMEDI=m
# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
CONFIG_COMEDI_MISC_DRIVERS=m
CONFIG_COMEDI_KCOMEDILIB=m
CONFIG_COMEDI_BOND=m
@@ -4880,9 +4960,13 @@ CONFIG_COMEDI_PCL816=m
CONFIG_COMEDI_PCL818=m
CONFIG_COMEDI_PCM3724=m
CONFIG_COMEDI_PCM3730=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
CONFIG_COMEDI_RTI800=m
CONFIG_COMEDI_RTI802=m
CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
CONFIG_COMEDI_DAS16=m
CONFIG_COMEDI_DAS800=m
CONFIG_COMEDI_DAS1800=m
@@ -4934,12 +5018,13 @@ CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1723=m
CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
CONFIG_COMEDI_AMPLC_PCI224=m
CONFIG_COMEDI_AMPLC_PCI230=m
CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
CONFIG_COMEDI_UNIOXX5=m
@@ -4986,8 +5071,11 @@ CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIO=m
CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_DAS08=m
# CONFIG_FB_OLPC_DCON is not set
CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
@@ -5013,12 +5101,9 @@ CONFIG_LINE6_USB=m
# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
-# CONFIG_VME_BUS is not set
CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
CONFIG_ZCACHE=y
@@ -5056,7 +5141,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_INTEL_MEI=m
CONFIG_STAGING_MEDIA=y
CONFIG_DVB_AS102=m
CONFIG_DVB_CXD2099=m
@@ -5094,6 +5178,16 @@ CONFIG_LIRC_ZILOG=m
# CONFIG_ANDROID is not set
# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5166,6 +5260,15 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
#
CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
#
# Firmware Drivers
@@ -5315,11 +5418,9 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
@@ -5338,6 +5439,7 @@ CONFIG_OMFS_FS=m
# CONFIG_QNX6FS_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_PSTORE=y
+CONFIG_PSTORE_RAM=m
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -5347,6 +5449,7 @@ CONFIG_EXOFS_FS=m
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
+CONFIG_NFS_V2=y
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
@@ -5435,6 +5538,17 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set
@@ -5450,6 +5564,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
@@ -5462,6 +5577,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -5518,7 +5635,6 @@ CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5529,7 +5645,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5549,6 +5664,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+# CONFIG_UPROBE_EVENT is not set
+# CONFIG_PROBE_EVENTS is not set
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5759,6 +5876,7 @@ CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -5773,6 +5891,8 @@ CONFIG_BINARY_PRINTF=y
#
CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
@@ -5811,6 +5931,8 @@ CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=m
CONFIG_BCH_CONST_PARAMS=y
@@ -5829,3 +5951,4 @@ CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
+CONFIG_DDR=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 9f3698ac2..fcc8b37dd 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.4.1-1 Kernel Configuration
+# Linux/x86_64 3.5.0-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -9,11 +9,6 @@ CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -28,9 +23,7 @@ CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -48,11 +41,12 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
@@ -99,8 +93,25 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
#
# RCU Subsystem
@@ -108,6 +119,7 @@ CONFIG_SPARSE_IRQ=y
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
CONFIG_RCU_FANOUT=64
+CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
@@ -139,7 +151,6 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_SCHED_AUTOGROUP=y
@@ -182,7 +193,6 @@ CONFIG_HAVE_PERF_EVENTS=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
@@ -207,6 +217,7 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
@@ -219,6 +230,8 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
#
# GCOV-based kernel profiling
@@ -313,11 +326,6 @@ CONFIG_FREEZER=y
# Processor type and features
#
CONFIG_ZONE_DMA=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_SMP=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
@@ -439,7 +447,9 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
@@ -484,6 +494,10 @@ CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
@@ -633,6 +647,7 @@ CONFIG_RAPIDIO=y
CONFIG_RAPIDIO_TSI721=y
CONFIG_RAPIDIO_DISC_TIMEOUT=30
# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
@@ -657,6 +672,7 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_X86_DEV_DMA_OPS=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -667,6 +683,7 @@ CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
@@ -805,6 +822,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -965,7 +983,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1057,11 +1074,11 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
CONFIG_PHONET=m
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
CONFIG_NET_SCHED=y
#
@@ -1085,6 +1102,8 @@ CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1120,6 +1139,7 @@ CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1127,7 +1147,6 @@ CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
CONFIG_BQL=y
-CONFIG_HAVE_BPF_JIT=y
CONFIG_BPF_JIT=y
#
@@ -1294,6 +1313,8 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
# CONFIG_NFC_LLCP is not set
#
@@ -1302,6 +1323,7 @@ CONFIG_NFC_NCI=m
CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
+CONFIG_HAVE_BPF_JIT=y
#
# Device Drivers
@@ -1452,7 +1474,6 @@ CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
@@ -1532,7 +1553,8 @@ CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
CONFIG_PCH_PHUB=m
CONFIG_USB_SWITCH_FSA9480=m
CONFIG_C2PORT=m
@@ -1562,6 +1584,7 @@ CONFIG_SENSORS_LIS3_I2C=m
# Altera FPGA firmware download module
#
CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1685,6 +1708,7 @@ CONFIG_SCSI_IPR=m
# CONFIG_SCSI_IPR_DUMP is not set
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
# CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1844,6 +1868,7 @@ CONFIG_TCM_PSCSI=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_TCM_FC=m
CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
CONFIG_FUSION_FC=m
@@ -1881,10 +1906,12 @@ CONFIG_EQUALIZER=m
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_ROUNDROBIN=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
CONFIG_NETCONSOLE=m
@@ -2015,10 +2042,13 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
+CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ZNET=m
@@ -2091,8 +2121,8 @@ CONFIG_EPIC100=m
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_STMMAC_PCI=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
# CONFIG_STMMAC_DEBUG_FS is not set
# CONFIG_STMMAC_DA is not set
CONFIG_STMMAC_RING=y
@@ -2110,6 +2140,12 @@ CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
CONFIG_NET_VENDOR_XIRCOM=y
CONFIG_PCMCIA_XIRC2PS=m
# CONFIG_FDDI is not set
@@ -2154,7 +2190,6 @@ CONFIG_SLHC=m
# CONFIG_SLIP_COMPRESSED is not set
# CONFIG_SLIP_SMART is not set
# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_TR is not set
#
# USB Network Adapters
@@ -2269,6 +2304,7 @@ CONFIG_BRCMUTIL=m
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
@@ -2350,17 +2386,19 @@ CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
CONFIG_WL1251=m
CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
CONFIG_WL12XX=m
-CONFIG_WL12XX_SDIO=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
CONFIG_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
#
# WiMAX Wireless Broadband devices
@@ -2513,6 +2551,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
#
# Userland interfaces
@@ -2541,6 +2580,7 @@ CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_TCA8418=m
CONFIG_KEYBOARD_MATRIX=m
# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
# CONFIG_KEYBOARD_MAX7359 is not set
CONFIG_KEYBOARD_MCS=m
CONFIG_KEYBOARD_MPR121=m
@@ -2623,6 +2663,7 @@ CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
CONFIG_TOUCHSCREEN_MAX11801=m
CONFIG_TOUCHSCREEN_MCS5000=m
CONFIG_TOUCHSCREEN_MTOUCH=m
@@ -2638,6 +2679,7 @@ CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2662,11 +2704,11 @@ CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_APANEL=m
@@ -2809,7 +2851,6 @@ CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -2916,6 +2957,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
#
@@ -3068,6 +3110,7 @@ CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
CONFIG_SENSORS_TMP401=m
@@ -3087,6 +3130,7 @@ CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
#
# ACPI drivers
@@ -3117,6 +3161,7 @@ CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
@@ -3183,26 +3228,28 @@ CONFIG_BCMA_HOST_PCI=y
#
# Multifunction device drivers
#
-CONFIG_MFD_CORE=y
+CONFIG_MFD_CORE=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
+CONFIG_MFD_LM3533=m
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
CONFIG_MFD_PCF50633=m
CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_I2C=m
CONFIG_ABX500_CORE=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
CONFIG_MFD_CS5535=m
# CONFIG_MFD_TIMBERDALE is not set
CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
CONFIG_MFD_RDC321X=m
# CONFIG_MFD_JANZ_CMODIO is not set
CONFIG_MFD_VX855=m
@@ -3274,7 +3321,9 @@ 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_TDA18212=m
+CONFIG_MEDIA_TUNER_TUA9001=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_SG=m
@@ -3393,6 +3442,7 @@ CONFIG_VIDEO_THS7303=m
CONFIG_VIDEO_M52790=m
CONFIG_VIDEO_VIVI=m
CONFIG_V4L_USB_DRIVERS=y
+CONFIG_VIDEO_AU0828=m
CONFIG_USB_VIDEO_CLASS=m
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
CONFIG_USB_GSPCA=m
@@ -3450,7 +3500,7 @@ CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
+CONFIG_VIDEO_EM28XX_RC=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
@@ -3460,7 +3510,6 @@ CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
CONFIG_USB_SN9C102=m
CONFIG_USB_PWC=m
# CONFIG_USB_PWC_DEBUG is not set
@@ -3470,7 +3519,6 @@ CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_BT848=m
CONFIG_VIDEO_BT848_DVB=y
CONFIG_VIDEO_CX18=m
@@ -3584,6 +3632,7 @@ 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
@@ -3733,8 +3782,11 @@ CONFIG_DVB_OR51132=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
CONFIG_DVB_S5H1409=m
CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
CONFIG_DVB_S5H1411=m
#
@@ -3766,6 +3818,7 @@ CONFIG_DVB_TDA665x=m
CONFIG_DVB_IX2505V=m
CONFIG_DVB_IT913X_FE=m
CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
#
# Tools to develop new frontends
@@ -3812,6 +3865,9 @@ CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
CONFIG_DRM_GMA3600=y
CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3883,12 +3939,14 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
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
@@ -3918,6 +3976,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
@@ -4027,7 +4086,6 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
CONFIG_SND_HDA_INPUT_JACK=y
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
CONFIG_SND_HDA_CODEC_ANALOG=y
CONFIG_SND_HDA_CODEC_SIGMATEL=y
CONFIG_SND_HDA_CODEC_VIA=y
@@ -4084,16 +4142,13 @@ CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
#
-# USB Input Devices
+# HID support
#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_HID_GENERIC=m
#
# Special HID drivers
@@ -4102,6 +4157,7 @@ CONFIG_HID_A4TECH=m
CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=m
+CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
CONFIG_HID_CHICONY=m
@@ -4159,12 +4215,18 @@ CONFIG_HID_TOPSEED=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
CONFIG_HID_WIIMOTE=m
CONFIG_HID_WIIMOTE_EXT=y
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4178,8 +4240,6 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
@@ -4218,9 +4278,15 @@ CONFIG_USB_R8A66597_HCD=m
CONFIG_USB_RENESAS_USBHS_HCD=m
CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_RENESAS_USBHS=m
#
@@ -4334,6 +4400,7 @@ CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_ZIO=m
CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4360,6 +4427,11 @@ CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_ISP1301=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4371,13 +4443,16 @@ CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_USB_MV_UDC=m
CONFIG_USB_GADGET_MUSB_HDRC=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_CI13XXX_PCI=m
CONFIG_USB_NET2272=m
CONFIG_USB_NET2272_DMA=y
CONFIG_USB_NET2280=m
@@ -4401,6 +4476,7 @@ CONFIG_USB_FUNCTIONFS_GENERIC=y
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
CONFIG_USB_G_PRINTER=m
@@ -4420,7 +4496,6 @@ CONFIG_USB_G_WEBCAM=m
CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AB8500_USB is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -4475,6 +4550,7 @@ CONFIG_LEDS_CLASS=y
# LED drivers
#
CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
@@ -4488,6 +4564,7 @@ CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_TRIGGERS=y
@@ -4504,6 +4581,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
#
# iptables trigger is under Netfilter config (LED target)
#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
@@ -4589,11 +4667,11 @@ CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
#
# on-CPU RTC drivers
#
+CONFIG_RTC_DRV_MC13XXX=m
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4636,6 +4714,7 @@ CONFIG_VIRTIO_RING=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
# Microsoft Hyper-V guest support
@@ -4675,6 +4754,8 @@ CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
CONFIG_COMEDI=m
# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
CONFIG_COMEDI_MISC_DRIVERS=m
CONFIG_COMEDI_KCOMEDILIB=m
CONFIG_COMEDI_BOND=m
@@ -4706,12 +4787,13 @@ CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1723=m
CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
CONFIG_COMEDI_AMPLC_PCI224=m
CONFIG_COMEDI_AMPLC_PCI230=m
CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
CONFIG_COMEDI_UNIOXX5=m
@@ -4758,8 +4840,11 @@ CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIO=m
CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_DAS08=m
CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
@@ -4784,12 +4869,9 @@ CONFIG_LINE6_USB=m
# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
-# CONFIG_VME_BUS is not set
CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
CONFIG_ZCACHE=y
@@ -4827,7 +4909,6 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_INTEL_MEI=m
CONFIG_STAGING_MEDIA=y
CONFIG_DVB_AS102=m
CONFIG_DVB_CXD2099=m
@@ -4865,6 +4946,16 @@ CONFIG_LIRC_ZILOG=m
# CONFIG_ANDROID is not set
# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -4938,6 +5029,15 @@ CONFIG_IRQ_REMAP=y
#
CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
#
# Firmware Drivers
@@ -5088,11 +5188,9 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
@@ -5111,6 +5209,7 @@ CONFIG_OMFS_FS=m
# CONFIG_QNX6FS_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_PSTORE=y
+CONFIG_PSTORE_RAM=m
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -5120,6 +5219,7 @@ CONFIG_EXOFS_FS=m
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
+CONFIG_NFS_V2=y
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
@@ -5208,6 +5308,17 @@ CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
CONFIG_NLS_UTF8=m
CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set
@@ -5223,6 +5334,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_FRAME_WARN=2048
CONFIG_MAGIC_SYSRQ=y
CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
@@ -5235,6 +5347,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
@@ -5290,7 +5404,6 @@ CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
# CONFIG_DEBUG_PAGEALLOC is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5301,7 +5414,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
CONFIG_EVENT_TRACING=y
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -5321,6 +5433,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ALL_BRANCHES is not set
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
+# CONFIG_UPROBE_EVENT is not set
+# CONFIG_PROBE_EVENTS is not set
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5533,6 +5647,7 @@ CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -5546,6 +5661,8 @@ CONFIG_BINARY_PRINTF=y
#
CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
@@ -5583,6 +5700,8 @@ CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=m
CONFIG_BCH_CONST_PARAMS=y
@@ -5601,3 +5720,4 @@ CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
CONFIG_CORDIC=m
+CONFIG_DDR=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 38394ad7b..87de3c8d5 100644
--- 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.4.6-1-LIBRE
+KERNEL_VERSION=3.5.0-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 6a08718270b33228f9548dc419dcc3750482df76 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 23:20:47 -0300
Subject: lirc-libre-1:0.9.0-24: updating version due kernel 3.5 depend
---
libre/lirc-libre/PKGBUILD | 6 +++---
libre/lirc-libre/lirc.install | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 1738c0aae..4442712f0 100644
--- 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=22
+pkgrel=24
epoch=1
-_extramodules=extramodules-3.4-LIBRE
+_extramodules=extramodules-3.5-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.4' 'linux-libre-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.5' 'linux-libre-headers<3.6' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index c50e384c8..b39282da6 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.4-LIBRE
+EXTRAMODULES=extramodules-3.5-LIBRE
post_install() {
# updating module dependencies
--
cgit v1.2.3
From a4191b41602acd70ee0100468aa961073bf73664 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 23:42:10 -0300
Subject: virtualbox-modules-4.1.18-5: updating revision due linux-libre-3.5
---
libre/virtualbox-modules/PKGBUILD | 8 ++++----
libre/virtualbox-modules/virtualbox-modules.install | 6 +++---
libre/virtualbox-modules/virtualbox-parabola-modules.install | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index f965869f7..5e0feec6d 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=virtualbox-modules
pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
pkgver=4.1.18
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -18,7 +18,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'4c88bd122677a35f68abd76eb01b378b'
'ed1341881437455d9735875ddf455fbe')
-_extramodules=extramodules-3.4-LIBRE
+_extramodules=extramodules-3.5-LIBRE
_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
export KERN_DIR=/usr/lib/modules/${_kernver}/build
@@ -53,7 +53,7 @@ package_virtualbox-parabola-modules(){
pkgdesc="Additions only for Parabola guests (kernel modules)"
license=('GPL')
install=virtualbox-parabola-modules.install
- depends=('linux-libre>=3.4' 'linux-libre<3.5')
+ depends=('linux-libre>=3.5' 'linux-libre<3.6')
replaces=('virtualbox-archlinux-modules')
conflicts=('virtualbox-archlinux-modules')
provides=("virtualbox-archlinux-modules=$pkgver")
@@ -79,7 +79,7 @@ package_virtualbox-modules(){
pkgdesc="Kernel modules for VirtualBox"
license=('GPL')
install=virtualbox-modules.install
- depends=('linux-libre>=3.4' 'linux-libre<3.5')
+ depends=('linux-libre>=3.5' 'linux-libre<3.6')
source "$srcdir/VirtualBox-${pkgver}/env.sh"
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index b178686e2..3f2a12a3f 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
===> You must load vboxdrv module before starting VirtualBox:
===> # modprobe vboxdrv
EOF
- EXTRAMODULES='extramodules-3.4-LIBRE'
+ EXTRAMODULES='extramodules-3.5-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.4-LIBRE'
+ EXTRAMODULES='extramodules-3.5-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.4-LIBRE'
+ EXTRAMODULES='extramodules-3.5-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index 31575fb9d..c3419c991 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
- EXTRAMODULES='extramodules-3.4-LIBRE'
+ EXTRAMODULES='extramodules-3.5-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.4-LIBRE'
+ EXTRAMODULES='extramodules-3.5-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.4-LIBRE'
+ EXTRAMODULES='extramodules-3.5-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
--
cgit v1.2.3
From fecda1c35086e350c5264c4631e7c4f27e401f5e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Mon, 23 Jul 2012 23:43:11 -0300
Subject: virtualbox-modules-4.1.18-5: removing obsolete patch
---
libre/virtualbox-modules/linux34.patch | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 libre/virtualbox-modules/linux34.patch
diff --git a/libre/virtualbox-modules/linux34.patch b/libre/virtualbox-modules/linux34.patch
deleted file mode 100644
index 05ec78557..000000000
--- a/libre/virtualbox-modules/linux34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur VirtualBox-4.1.14.orig/Config.kmk VirtualBox-4.1.14/Config.kmk
---- VirtualBox-4.1.14.orig/Config.kmk 2012-04-26 16:56:21.000000000 +0000
-+++ VirtualBox-4.1.14/Config.kmk 2012-05-21 14:35:22.348398884 +0000
-@@ -2856,7 +2856,7 @@
- TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
- -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
- -Wno-sign-compare -Wdeclaration-after-statement
--TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti
-+TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti -fpermissive
- ifndef VBOX_LINUX_VERSION_2_4
- # 2.6
- TEMPLATE_VBOXR0DRV_SYSSUFF = .ko
--
cgit v1.2.3
From 8f4802b2d269869354619e783ec9be78f18c5c8a Mon Sep 17 00:00:00 2001
From: Shackra Sislock
Date: Thu, 26 Jul 2012 01:03:45 -0600
Subject: moving kervala_libsquish to kervalasquish and adding the common.cmake
CMake module, see http://dev.ryzom.com/issues/1485#note-5
--HG--
rename : pcr/kervala_libsquish/PKGBUILD => pcr/kervalasquish-hg/PKGBUILD
---
pcr/kervala_libsquish/PKGBUILD | 46 ---------------------------
pcr/kervalasquish-hg/PKGBUILD | 70 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 46 deletions(-)
delete mode 100644 pcr/kervala_libsquish/PKGBUILD
create mode 100644 pcr/kervalasquish-hg/PKGBUILD
diff --git a/pcr/kervala_libsquish/PKGBUILD b/pcr/kervala_libsquish/PKGBUILD
deleted file mode 100644
index 033dd19ec..000000000
--- a/pcr/kervala_libsquish/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Jorge Araya
-
-pkgname=kervala_libsquish-hg
-pkgver=220
-pkgrel=1
-pkgdesc="Open source DXT compression library, kervala's version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish/"
-license=('MIT')
-makedepends=('mercurial' 'gcc-libs')
-provides=('libsquish')
-conflicts=('libsquish')
-source=()
-
-_hgroot="http://hg.kervala.net"
-_hgrepo="packaging"
-
-build() {
- cd "$srcdir"
- msg "Connecting to Mercurial server...."
-
- if [[ -d "$_hgrepo" ]]; then
- cd "$_hgrepo"
- hg pull -u
- msg "The local files are updated."
- else
- hg clone "${_hgroot}/${_hgrepo}"
- fi
-
- msg "Mercurial checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_hgrepo-build"
- cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
- cd "$srcdir/$_hgrepo-build/squish"
- make
-}
-
-package() {
- cd "$srcdir/$_hgrepo-build/squish"
- install -d -m 755 ${pkgdir}/usr/include
- install -d -m 755 ${pkgdir}/usr/lib
- make -e INSTALL_DIR="$pkgdir/usr/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
new file mode 100644
index 000000000..c9ca2e7cd
--- /dev/null
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -0,0 +1,70 @@
+# Maintainer: Jorge Araya
+
+pkgname=kervalasquish-hg
+pkgver=220
+pkgrel=1
+pkgdesc="Free Software DXT compression library, kervala's version"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libsquish/"
+license=('MIT')
+makedepends=('mercurial' 'gcc-libs')
+provides=('libsquish')
+conflicts=('libsquish' 'kervala_libsquish-hg')
+
+_hgroot="http://hg.kervala.net"
+_hgrepo="packaging"
+cmakerepo="cmake"
+
+build() {
+ cd "$srcdir"
+ msg "Connecting to Kervala's Mercurial server for libsquish..."
+
+ if [[ -d "$_hgrepo" ]]; then
+ cd "$_hgrepo"
+ hg pull -u
+ msg "The local files are updated."
+ else
+ hg clone "${_hgroot}/${_hgrepo}"
+ fi
+
+ msg "Connecting to Kervala's Mercurial server for cmake modules..."
+
+ if [[ -d $srcdir/$cmakerepo ]]; then
+ cd $srcdir/$cmakerepo
+ hg pull -u
+ msg "The local files are updated."
+ else
+ cd $srcdir
+ hg clone ${_hgroot}/${cmakerepo}
+ fi
+
+ msg "Mercurial checkout done or server timeout"
+ msg "Starting build..."
+
+ if [[ -d $_hgrepo-build ]]; then
+ rm -rf "$srcdir/$_hgrepo-build"
+ fi
+
+ cp -r "$srcdir/$_hgrepo/squish" "$srcdir/$_hgrepo-build"
+
+ if [[ ! -d $_hgrepo-build/CMakeModules ]]; then
+ mkdir "$srcdir/$_hgrepo-build/CMakeModules"
+ cp $srcdir/cmake/modules/common.cmake $srcdir/$_hgrepo-build/CMakeModules/
+ fi
+
+ if [[ -d $srcdir/$_hgrepo-build/build ]]; then
+ rm -rf $srcdir/$_hgrepo-build/build
+ fi
+
+ mkdir "$srcdir/$_hgrepo-build/build"
+ cd "$srcdir/$_hgrepo-build/build"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+ make
+}
+
+package() {
+ cd "$srcdir/$_hgrepo-build/build"
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
--
cgit v1.2.3
From abc224032aafb39cc6b95515dd5825d49dae44e4 Mon Sep 17 00:00:00 2001
From: Shackra Sislock
Date: Thu, 26 Jul 2012 01:09:44 -0600
Subject: moving kervala_libsquish to kervalasquish and adding the common.cmake
CMake module, see http://dev.ryzom.com/issues/1485#note-5
---
libre/virtualbox-modules/PKGBUILD | 8 ++++----
libre/virtualbox-modules/virtualbox-modules.install | 6 +++---
libre/virtualbox-modules/virtualbox-parabola-modules.install | 6 +++---
pcr/kervalasquish-hg/PKGBUILD | 4 +++-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 5e0feec6d..f965869f7 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=virtualbox-modules
pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
pkgver=4.1.18
-pkgrel=5
+pkgrel=4
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -18,7 +18,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'4c88bd122677a35f68abd76eb01b378b'
'ed1341881437455d9735875ddf455fbe')
-_extramodules=extramodules-3.5-LIBRE
+_extramodules=extramodules-3.4-LIBRE
_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
export KERN_DIR=/usr/lib/modules/${_kernver}/build
@@ -53,7 +53,7 @@ package_virtualbox-parabola-modules(){
pkgdesc="Additions only for Parabola guests (kernel modules)"
license=('GPL')
install=virtualbox-parabola-modules.install
- depends=('linux-libre>=3.5' 'linux-libre<3.6')
+ depends=('linux-libre>=3.4' 'linux-libre<3.5')
replaces=('virtualbox-archlinux-modules')
conflicts=('virtualbox-archlinux-modules')
provides=("virtualbox-archlinux-modules=$pkgver")
@@ -79,7 +79,7 @@ package_virtualbox-modules(){
pkgdesc="Kernel modules for VirtualBox"
license=('GPL')
install=virtualbox-modules.install
- depends=('linux-libre>=3.5' 'linux-libre<3.6')
+ depends=('linux-libre>=3.4' 'linux-libre<3.5')
source "$srcdir/VirtualBox-${pkgver}/env.sh"
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index 3f2a12a3f..b178686e2 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
===> You must load vboxdrv module before starting VirtualBox:
===> # modprobe vboxdrv
EOF
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.4-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.4-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.4-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index c3419c991..31575fb9d 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.4-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.4-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.5-LIBRE'
+ EXTRAMODULES='extramodules-3.4-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
index c9ca2e7cd..0f2dd8124 100644
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -9,7 +9,9 @@ url="http://code.google.com/p/libsquish/"
license=('MIT')
makedepends=('mercurial' 'gcc-libs')
provides=('libsquish')
-conflicts=('libsquish' 'kervala_libsquish-hg')
+conflicts=('libsquish'
+ 'kervala_libsquish-hg'
+ 'kervalasquish-hg')
_hgroot="http://hg.kervala.net"
_hgrepo="packaging"
--
cgit v1.2.3
From d856ddfb2f4cd3c50f1a3a85e35e075ebbd3774d Mon Sep 17 00:00:00 2001
From: Shackra Sislock
Date: Thu, 26 Jul 2012 01:30:46 -0600
Subject: adding cmake in makedepends, duh!
---
pcr/kervalasquish-hg/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
index 0f2dd8124..e5e489950 100644
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -2,12 +2,12 @@
pkgname=kervalasquish-hg
pkgver=220
-pkgrel=1
+pkgrel=2
pkgdesc="Free Software DXT compression library, kervala's version"
arch=('i686' 'x86_64')
url="http://code.google.com/p/libsquish/"
license=('MIT')
-makedepends=('mercurial' 'gcc-libs')
+makedepends=('mercurial' 'gcc-libs' 'cmake')
provides=('libsquish')
conflicts=('libsquish'
'kervala_libsquish-hg'
--
cgit v1.2.3
From 7f7fe0b75ce9d23467e21df43964bb2c3de73324 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 26 Jul 2012 05:52:31 -0300
Subject: removing obsolete files
---
libre/virtualbox-libre/vbox-service.conf | 2 --
libre/virtualbox-libre/vbox-service.rc | 39 ------------------------
libre/virtualbox-libre/virtualbox-source.install | 12 --------
libre/virtualbox-libre/virtualbox.install | 34 ---------------------
4 files changed, 87 deletions(-)
delete mode 100644 libre/virtualbox-libre/vbox-service.conf
delete mode 100644 libre/virtualbox-libre/vbox-service.rc
delete mode 100644 libre/virtualbox-libre/virtualbox-source.install
delete mode 100644 libre/virtualbox-libre/virtualbox.install
diff --git a/libre/virtualbox-libre/vbox-service.conf b/libre/virtualbox-libre/vbox-service.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/libre/virtualbox-libre/vbox-service.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/libre/virtualbox-libre/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc
deleted file mode 100644
index 96233f66d..000000000
--- a/libre/virtualbox-libre/vbox-service.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vbox-service
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
- start)
- stat_busy "Starting $name service"
- [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon vbox-service; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- stop)
- stat_busy "Stopping $name service"
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon vbox-service; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- stat_busy "Checking $name status";
- ck_status vbox-service
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status}"
- exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-source.install b/libre/virtualbox-libre/virtualbox-source.install
deleted file mode 100644
index 24d90b1c2..000000000
--- a/libre/virtualbox-libre/virtualbox-source.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> To compile the modules do /usr/bin/vboxbuild
-EOF
-
-}
-
-post_upgrade() {
-/bin/cat << EOF
-===> To recompile the modules do /usr/bin/vboxbuild
-EOF
-}
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
deleted file mode 100644
index 29646e973..000000000
--- a/libre/virtualbox-libre/virtualbox.install
+++ /dev/null
@@ -1,34 +0,0 @@
-utils() {
- if [ -x usr/bin/update-mime-database ]; then
- update-mime-database usr/share/mime > /dev/null 2>&1
- fi
-
- if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
- fi
-
- if [ -x usr/bin/update-desktop-database ]; then
- usr/bin/update-desktop-database -q
- fi
-}
-
-post_install() {
- getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- utils
-}
-
-post_upgrade() {
- getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- utils
- if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
-/bin/cat << EOF
-===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux-libre package.
-EOF
- fi
-}
-
-post_remove() {
- groupdel vboxusers >/dev/null 2>&1 || true
- utils
-}
--
cgit v1.2.3
From ff0071716aa6bf9100e49508b815da77cb735942 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado
Date: Thu, 26 Jul 2012 05:55:03 -0300
Subject: virtualbox-libre: adding free patches and free distros icons
---
libre/virtualbox-libre/.directory | 3 +
libre/virtualbox-libre/PKGBUILD | 162 +-
libre/virtualbox-libre/free-distros.patch | 1359 +++++
libre/virtualbox-libre/ipv6_vnc.patch | 20 +
libre/virtualbox-libre/libre.patch | 5765 ++++++++++++++++++++
libre/virtualbox-libre/os_blag.png | Bin 0 -> 1411 bytes
libre/virtualbox-libre/os_blag_64.png | Bin 0 -> 1549 bytes
libre/virtualbox-libre/os_dragora.png | Bin 0 -> 2375 bytes
libre/virtualbox-libre/os_dragora_64.png | Bin 0 -> 2430 bytes
libre/virtualbox-libre/os_dynebolic.png | Bin 0 -> 1621 bytes
libre/virtualbox-libre/os_gnewsense.png | Bin 0 -> 2315 bytes
libre/virtualbox-libre/os_gnewsense_64.png | Bin 0 -> 2470 bytes
libre/virtualbox-libre/os_gnu.png | Bin 0 -> 2728 bytes
libre/virtualbox-libre/os_gnu_64.png | Bin 0 -> 2705 bytes
libre/virtualbox-libre/os_gnuhurd.png | Bin 0 -> 2728 bytes
libre/virtualbox-libre/os_gnulinux.png | Bin 0 -> 2728 bytes
libre/virtualbox-libre/os_gnulinux_64.png | Bin 0 -> 2705 bytes
libre/virtualbox-libre/os_musix.png | Bin 0 -> 2451 bytes
libre/virtualbox-libre/os_musix_64.png | Bin 0 -> 2581 bytes
libre/virtualbox-libre/os_os64base.png | Bin 0 -> 1300 bytes
libre/virtualbox-libre/os_os64base.xcf | Bin 0 -> 2844 bytes
libre/virtualbox-libre/os_osbase.png | Bin 0 -> 1042 bytes
libre/virtualbox-libre/os_osbase.xcf | Bin 0 -> 2748 bytes
libre/virtualbox-libre/os_parabola.png | Bin 0 -> 1931 bytes
libre/virtualbox-libre/os_parabola_64.png | Bin 0 -> 2096 bytes
libre/virtualbox-libre/os_trisquel.png | Bin 0 -> 2451 bytes
libre/virtualbox-libre/os_trisquel_64.png | Bin 0 -> 2592 bytes
libre/virtualbox-libre/os_ututo.png | Bin 0 -> 2615 bytes
libre/virtualbox-libre/os_ututo_64.png | Bin 0 -> 2751 bytes
libre/virtualbox-libre/os_venenux.png | Bin 0 -> 1653 bytes
libre/virtualbox-libre/vboxservice.conf | 2 +
libre/virtualbox-libre/vboxservice.rc | 39 +
libre/virtualbox-libre/vboxservice.service | 9 +
libre/virtualbox-libre/vboxweb.service | 11 +
.../virtualbox-libre-parabola-additions.install | 31 +
.../virtualbox-libre-parabola-source.install | 29 +
.../virtualbox-libre-source.install | 29 +
libre/virtualbox-libre/virtualbox-libre.install | 45 +
38 files changed, 7462 insertions(+), 42 deletions(-)
create mode 100644 libre/virtualbox-libre/.directory
create mode 100644 libre/virtualbox-libre/free-distros.patch
create mode 100644 libre/virtualbox-libre/ipv6_vnc.patch
create mode 100644 libre/virtualbox-libre/libre.patch
create mode 100644 libre/virtualbox-libre/os_blag.png
create mode 100644 libre/virtualbox-libre/os_blag_64.png
create mode 100644 libre/virtualbox-libre/os_dragora.png
create mode 100644 libre/virtualbox-libre/os_dragora_64.png
create mode 100644 libre/virtualbox-libre/os_dynebolic.png
create mode 100644 libre/virtualbox-libre/os_gnewsense.png
create mode 100644 libre/virtualbox-libre/os_gnewsense_64.png
create mode 100644 libre/virtualbox-libre/os_gnu.png
create mode 100644 libre/virtualbox-libre/os_gnu_64.png
create mode 100644 libre/virtualbox-libre/os_gnuhurd.png
create mode 100644 libre/virtualbox-libre/os_gnulinux.png
create mode 100644 libre/virtualbox-libre/os_gnulinux_64.png
create mode 100644 libre/virtualbox-libre/os_musix.png
create mode 100644 libre/virtualbox-libre/os_musix_64.png
create mode 100644 libre/virtualbox-libre/os_os64base.png
create mode 100644 libre/virtualbox-libre/os_os64base.xcf
create mode 100644 libre/virtualbox-libre/os_osbase.png
create mode 100644 libre/virtualbox-libre/os_osbase.xcf
create mode 100644 libre/virtualbox-libre/os_parabola.png
create mode 100644 libre/virtualbox-libre/os_parabola_64.png
create mode 100644 libre/virtualbox-libre/os_trisquel.png
create mode 100644 libre/virtualbox-libre/os_trisquel_64.png
create mode 100644 libre/virtualbox-libre/os_ututo.png
create mode 100644 libre/virtualbox-libre/os_ututo_64.png
create mode 100644 libre/virtualbox-libre/os_venenux.png
create mode 100644 libre/virtualbox-libre/vboxservice.conf
create mode 100644 libre/virtualbox-libre/vboxservice.rc
create mode 100644 libre/virtualbox-libre/vboxservice.service
create mode 100644 libre/virtualbox-libre/vboxweb.service
create mode 100644 libre/virtualbox-libre/virtualbox-libre-parabola-additions.install
create mode 100644 libre/virtualbox-libre/virtualbox-libre-parabola-source.install
create mode 100644 libre/virtualbox-libre/virtualbox-libre-source.install
create mode 100644 libre/virtualbox-libre/virtualbox-libre.install
diff --git a/libre/virtualbox-libre/.directory b/libre/virtualbox-libre/.directory
new file mode 100644
index 000000000..0de6ba6b0
--- /dev/null
+++ b/libre/virtualbox-libre/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2012,7,26,5,49,47
+ViewMode=2
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 942aa5d1c..5d1263a5c 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,18 +1,17 @@
# $Id$
# Maintainer (Parabola): Nicolas Reynolds
# Maintainer (Parabola): Jorge López
-# Contributor (Parabola): André Silva
-# Changes:
-# * Adapt to linux-libre
-# * virtualbox-{archlinux,parabola}-*
-# * Removed unfree user manual
-# * Package with --pkg "virtualbox-parabola-additions virtualbox-parabola-modules"
-# Based on
-#Maintainer: Ionut Biru
+# Maintainer (Parabola): André Silva
+# Maintainer (Parabola): Márcio Silva
+# Maintainer: Ionut Biru
pkgbase=virtualbox-libre
-pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
+pkgname=('virtualbox-libre'
+ 'virtualbox-libre-parabola-additions'
+ 'virtualbox-libre-sdk'
+ 'virtualbox-libre-source'
+ 'virtualbox-libre-parabola-source')
pkgver=4.1.18
-pkgrel=2
+pkgrel=4
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -21,11 +20,16 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor
#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
- change_default_driver_dir.patch vbox-service.conf vbox-service.rc
- vboxweb.conf vboxweb.rc)
-
-_extramodules=extramodules-3.4-LIBRE
+ 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk ipv6_vnc.patch
+ change_default_driver_dir.patch vboxservice.conf vboxservice.rc vboxservice.service
+ vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png
+ os_dragora_64.png os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png
+ os_gnu_64.png os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png
+ os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png
+ os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch
+ free-distros.patch)
+
+_extramodules=extramodules-3.5-LIBRE
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
build() {
@@ -33,6 +37,29 @@ build() {
patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+ patch -Np1 -i "$srcdir/libre.patch"
+ patch -Np1 -i "$srcdir/free-distros.patch"
+ # FS#30401
+ patch -Np2 -i "$srcdir/ipv6_vnc.patch"
+
+ ## Removing Nonfree directories
+ rm -rv "./include/VBox/ExtPack"
+ rm -rv "./src/VBox/ExtPacks"
+ rm -rv "./src/VBox/Main/src-helper-apps"
+
+ ## Removing Oracle VM VirtualBox Extension Pack icons
+ rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns"
+ rm -v "./src/VBox/Resources/other/virtualbox-vbox-extpack-"{16px,20px,24px,32px,40px,48px,64px,72px,80px,96px,128px,256px,512px}.png
+ rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico"
+ rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
+
+ ## Adding free distros icons
+ for i in {gnuhurd,dynebolic,venenux,{gnu{,linux},parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
+ cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
+ done
+
+ ## Removing non-free OS icons
+ rm -v "./src/VBox/Frontends/VirtualBox/images/os_"{{{arch,turbo}linux,debian,fedora,gentoo,linux{24,26},macosx,mandriva,{free,net,open}bsd,opensuse,oracle{,solaris},ubuntu,win{2k{3,8},7,8,vista,xp},xandros}{,_64},dos,jrockitve,l4,linux{,22,_other},netware,os2{_other,ecs,warp{3,4,45}},win{2k,31,95,98,_other,me,nt4}}.png
cp "$srcdir/LocalConfig.kmk" .
@@ -48,24 +75,24 @@ build() {
}
package_virtualbox-libre() {
- pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
- depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
+ pkgdesc="Powerful x86 virtualization for enterprise as well as home use (without Oracle VM VirtualBox Extension Pack and non-free OS options support)"
+ depends=('virtualbox-libre-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
optdepends=('qt: for VirtualBox GUI'
'vde2: Virtual Distributed Ethernet support'
- 'virtualbox-sdk: developer kit'
- 'virtualbox-source: host kernel source modules for non-stock kernels'
+ 'virtualbox-libre-sdk: developer kit'
+ 'virtualbox-libre-source: host kernel source modules for non-stock kernels'
'net-tools: for host-only or bridged networking')
backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox' 'virtualbox-ose')
conflicts=('virtualbox' 'virtualbox-ose')
provides=("virtualbox=$pkgver")
- install=virtualbox.install
+ install=virtualbox-libre.install
source "$srcdir/VirtualBox-${pkgver}/env.sh"
cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
+ install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
#Binaries and Wrapper with Launchers
@@ -86,7 +113,7 @@ package_virtualbox-libre() {
#setuid root binaries
install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
#other binaries
- install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
+ install -m 0755 VBoxManage VBoxSVC VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
#language
install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
@@ -120,35 +147,38 @@ package_virtualbox-libre() {
# install rc.d script
install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
+ # install systemd service
+ install -D -m644 "$srcdir/vboxweb.service" \
+ "$pkgdir/usr/lib/systemd/system/vboxweb.service"
# install sample config
install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
}
-package_virtualbox-source() {
+package_virtualbox-libre-source() {
pkgdesc="VirtualBox kernel modules source"
- depends=(gcc make)
- provides=(virtualbox-modules)
+ depends=(dkms gcc make)
+ replaces=('virtualbox-source' 'virtualbox-libre-modules')
+ conflicts=('virtualbox-source')
+ provides=("virtualbox-source=$pkgver" "virtualbox-libre-modules=$pkgver")
optdepends=('linux-libre-headers'
'linux-libre-lts-headers')
- install=virtualbox-source.install
+ install=virtualbox-libre-source.install
+ install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver"
source "$srcdir/VirtualBox-${pkgver}/env.sh"
- mkdir -p $pkgdir/usr/lib/virtualbox
-
cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
- #sources for modules
- cp -r src ${pkgdir}/usr/lib/virtualbox
- #install compilation script
- install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
+ cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source"
}
-package_virtualbox-sdk() {
+package_virtualbox-libre-sdk() {
pkgdesc="VirtualBox Software Developer Kit (SDK)"
depends=('python2')
+ replaces=('virtualbox-sdk')
+ conflicts=('virtualbox-sdk')
+ provides=("virtualbox-sdk=$pkgver")
- mkdir -p "$pkgdir/usr/lib/virtualbox"
+ install -dm755 "$pkgdir/usr/lib/virtualbox"
source "$srcdir/VirtualBox-${pkgver}/env.sh"
cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
@@ -162,12 +192,14 @@ package_virtualbox-sdk() {
mv sdk "$pkgdir/usr/lib/virtualbox"
}
-package_virtualbox-parabola-additions(){
+package_virtualbox-libre-parabola-additions(){
pkgdesc="Additions only for Parabola guests (userspace tools)"
- depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
+ depends=('virtualbox-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
provides=("virtualbox-archlinux-additions=${pkgver}")
+ backup=('etc/conf.d/vboxservice')
+ install=virtualbox-libre-parabola-additions.install
source "$srcdir/VirtualBox-${pkgver}/env.sh"
@@ -189,18 +221,64 @@ package_virtualbox-parabola-additions(){
install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
# install rc.d script
- install -D -m755 "$srcdir/vbox-service.rc" "$pkgdir/etc/rc.d/vbox-service"
+ install -D -m755 "$srcdir/vboxservice.rc" "$pkgdir/etc/rc.d/vboxservice"
# install sample config
- install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
+ install -D -m644 "$srcdir/vboxservice.conf" "$pkgdir/etc/conf.d/vboxservice"
+
+ # install systemd service file
+ install -D -m644 "$srcdir/vboxservice.service" \
+ "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+}
+
+package_virtualbox-libre-parabola-source() {
+ pkgdesc='VirtualBox Additions kernel modules source'
+ depends=(dkms gcc make)
+ replaces=('virtualbox-archlinux-source' 'virtualbox-libre-parabola-modules')
+ conflicts=('virtualbox-archlinux-source')
+ provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}" "virtualbox-libre-parabola-modules=${pkgver}")
+ optdepends=('linux-libre-headers'
+ 'linux-libre-lts-headers')
+ install=virtualbox-libre-parabola-source.install
+
+ install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver"
+ source "$srcdir/VirtualBox-${pkgver}/env.sh"
+ cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source"
}
+
md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'5f85710e0b8606de967716ded7b2d351'
'755ab0dd9bcacf2c00d2275b1ca69547'
'a1ff1d1b4423556887e48a32978226a6'
- '248078ab922f27424ba9919d4aa90dcc'
+ '4ff559f2bea335d59c4012048983ca91'
'97e193f050574dd272a38e5ee5ebe62b'
'3c08ad30b89add47d3f45121200a5360'
- '208cf5f842eb2e3a5b6dcfc59080d26c'
+ '7d9823507206de9b8528a72af2f18d74'
+ '07c5f6d86c4b7839d719c8ee0c53653b'
'3ac185709bfe688bb753c46e170d0546'
- 'c159d683ba1947290fc2ad2c64194150')
+ 'c159d683ba1947290fc2ad2c64194150'
+ 'bc9efed88e0469cd7fc460d5a5cd7b4b'
+ '8538dba8686d7449cb481c9bae9d722a'
+ '545c925b46f2ac95e5f8ae407fad101a'
+ 'f6416f509c2e5460e4dc624e0a57f3c1'
+ 'bbfb59dd517c020a23701b480187a355'
+ 'efacfdb61918286ea9bc89866b8fd239'
+ '7c3eb09995e8bafeef414374e44ad4ce'
+ 'a49ed3ab6bd0fb084de0ab3dd97ae93e'
+ '6b432b3305ed446125eef052c38355a6'
+ 'a70022a468bd3e9daf01818d2d74ac3c'
+ '6b432b3305ed446125eef052c38355a6'
+ 'a70022a468bd3e9daf01818d2d74ac3c'
+ 'a70022a468bd3e9daf01818d2d74ac3c'
+ '380eb2ab6cad3da198094585853c129c'
+ 'a60bb9a98abcc3c34156f9051d00df9a'
+ '3a908ef6952bcf987e63ef2fe4e98d24'
+ '02e87c39c353634cecacf98f1707fa15'
+ '0cf41a41e7a415d404d5584e047fd450'
+ '449cde3b58390284b59c5d663de3edc9'
+ 'c7951fe6888d939f3a7d0dafe477e82b'
+ '4da8eeb2ece7e475fc7a0d1003da26c6'
+ '5e4187af59726d71c5be48d0cd816c34'
+ 'a9e4724b56ddf99bb2e9a8fab8ad43ba'
+ 'bff9fb57834202fb715a4f138f945cb6')
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
new file mode 100644
index 000000000..64c876512
--- /dev/null
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -0,0 +1,1359 @@
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.569003667 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.652333615 -0300
+@@ -44,94 +44,38 @@
+ * first matching string found, will be used. */
+ static const osTypePattern gs_OSTypePattern[] =
+ {
+- { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
+
+- /* Windows */
+- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
+- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
+- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
+- { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
+- { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
+- { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
+- { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
+- { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
+- { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
+- { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
+- { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
+- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
+- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
+- { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
+- { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
+- { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
+- { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
+- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
+- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
+-
+- /* Solaris */
+- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
+- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
+- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
+- { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
+-
+- /* OS/2 */
+- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
+- { 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 */
+- { 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" },
+- { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "Debian" },
+- { 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" },
+-
+- /* Regular names of Linux distributions */
+- { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
+- { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
+- { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
+- { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
+- { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
+- { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
+- { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
+- { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
+- { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
+- { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
+- { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
+- { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
+- { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
+- { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
+- { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
+- { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
+- { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
+- { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
+- { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
+- { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
+- { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
+- { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
+- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
+- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
+- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
+- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
++ /* Code names for GNU/Linux distributions */
++ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
++ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
++
++ /* Regular names of GNU/Linux distributions and GNU-Hurd */
++ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
++ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
++ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
++ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
++ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
++ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
++ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
++ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
++ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
++ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
++ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
++ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" },
++ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" },
+
+ /* Other */
+- { QRegExp("L4", Qt::CaseInsensitive), "L4" },
+- { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
+- { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
+- { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "OpenBSD_64" },
+- { QRegExp("Op.*B", Qt::CaseInsensitive), "OpenBSD" },
+- { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "NetBSD_64" },
+- { QRegExp("Ne.*B", Qt::CaseInsensitive), "NetBSD" },
+- { QRegExp("QN", Qt::CaseInsensitive), "QNX" },
+- { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "MacOS_64" },
+- { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
+- { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
+- { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
+ { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
+ };
+
+--- VirtualBox-4.1.18.orig/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.498764160 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.548761649 -0300
+@@ -3227,40 +3227,18 @@
+ } aConvertOSTypes[] =
+ {
+ { "unknown", "Other" },
+- { "dos", "DOS" },
+- { "win31", "Windows31" },
+- { "win95", "Windows95" },
+- { "win98", "Windows98" },
+- { "winme", "WindowsMe" },
+- { "winnt4", "WindowsNT4" },
+- { "win2k", "Windows2000" },
+- { "winxp", "WindowsXP" },
+- { "win2k3", "Windows2003" },
+- { "winvista", "WindowsVista" },
+- { "win2k8", "Windows2008" },
+- { "os2warp3", "OS2Warp3" },
+- { "os2warp4", "OS2Warp4" },
+- { "os2warp45", "OS2Warp45" },
+- { "ecs", "OS2eCS" },
+- { "linux22", "Linux22" },
+- { "linux24", "Linux24" },
+- { "linux26", "Linux26" },
+- { "archlinux", "ArchLinux" },
+- { "debian", "Debian" },
+- { "opensuse", "OpenSUSE" },
+- { "fedoracore", "Fedora" },
+- { "gentoo", "Gentoo" },
+- { "mandriva", "Mandriva" },
+- { "redhat", "RedHat" },
+- { "ubuntu", "Ubuntu" },
+- { "xandros", "Xandros" },
+- { "freebsd", "FreeBSD" },
+- { "openbsd", "OpenBSD" },
+- { "netbsd", "NetBSD" },
+- { "netware", "Netware" },
+- { "solaris", "Solaris" },
+- { "opensolaris", "OpenSolaris" },
+- { "l4", "L4" }
++ { "gnu", "GNU" },
++ { "gnuhurd", "GNUHurd" },
++ { "gnulinux", "GNULinux" },
++ { "parabola", "Parabola" },
++ { "gnewsense", "gNewSense" },
++ { "blag", "Blag" },
++ { "dragora", "Dragora" },
++ { "ututo", "Ututo" },
++ { "musix", "Musix" },
++ { "trisquel", "Trisquel" },
++ { "dynebolic", "Dynebolic" },
++ { "venenux", "Venenux" },
+ };
+
+ void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
+--- VirtualBox-4.1.18.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-07-25 15:21:04.553581275 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/xml/SettingsConverter.xsl 2012-07-25 15:21:04.593579427 -0300
+@@ -729,40 +729,18 @@
+
+
+ Other
+- DOS
+- Windows31
+- Windows95
+- Windows98
+- WindowsMe
+- WindowsNT4
+- Windows2000
+- WindowsXP
+- Windows2003
+- WindowsVista
+- Windows2008
+- OS2Warp3
+- OS2Warp4
+- OS2Warp45
+- OS2eCS
+- Linux22
+- Linux24
+- Linux26
+- ArchLinux
+- Debian
+- OpenSUSE
+- Fedora
+- Gentoo
+- Mandriva
+- RedHat
+- Ubuntu
+- Xandros
+- FreeBSD
+- OpenBSD
+- NetBSD
+- Netware
+- Solaris
+- OpenSolaris
+- L4
++ GNU
++ GNUHurd
++ GNULinux
++ Parabola
++ gNewSense
++ Blag
++ Dragora
++ Ututo
++ Musix
++ Trisquel
++ Dynebolic
++ Venenux
+
+
+
+--- VirtualBox-4.1.18.orig/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.856003691 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.892668156 -0300
+@@ -137,75 +137,27 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.733096866 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.796426519 -0300
+@@ -1,75 +1,27 @@
+
+
+- images/os_archlinux.png
+- images/os_archlinux_64.png
+- images/os_debian.png
+- images/os_debian_64.png
+- images/os_dos.png
+- images/os_fedora.png
+- images/os_fedora_64.png
+- images/os_freebsd.png
+- images/os_freebsd_64.png
+- images/os_gentoo.png
+- images/os_gentoo_64.png
+- images/os_jrockitve.png
+- images/os_l4.png
+- images/os_linux_other.png
+- images/os_linux22.png
+- images/os_linux24.png
+- images/os_linux24_64.png
+- images/os_linux26.png
+- images/os_linux26_64.png
+- images/os_mandriva.png
+- images/os_mandriva_64.png
+- images/os_netbsd.png
+- images/os_netbsd_64.png
+- images/os_netware.png
+- images/os_openbsd.png
+- images/os_openbsd_64.png
+- images/os_oraclesolaris.png
+- images/os_oraclesolaris_64.png
+- images/os_opensuse.png
+- images/os_opensuse_64.png
+- images/os_os2_other.png
+- images/os_os2ecs.png
+- images/os_os2warp3.png
+- images/os_os2warp4.png
+- images/os_os2warp45.png
++ images/os_parabola.png
++ images/os_parabola_64.png
++ images/os_gnewsense.png
++ images/os_gnewsense_64.png
++ images/os_blag.png
++ images/os_blag_64.png
++ images/os_ututo.png
++ images/os_ututo_64.png
++ images/os_gnu.png
++ images/os_gnu_64.png
++ images/os_gnuhurd.png
++ images/os_gnulinux.png
++ images/os_gnulinux_64.png
++ images/os_musix.png
++ images/os_musix_64.png
++ images/os_dragora.png
++ images/os_dragora_64.png
+ images/os_other.png
+- images/os_qnx.png
+- images/os_redhat.png
+- images/os_redhat_64.png
+- images/os_turbolinux.png
+- images/os_turbolinux_64.png
+- images/os_solaris.png
+- images/os_solaris_64.png
+- images/os_ubuntu.png
+- images/os_ubuntu_64.png
+- images/os_win_other.png
+- images/os_win2k.png
+- images/os_win2k3.png
+- images/os_win2k3_64.png
+- images/os_win2k8.png
+- images/os_win2k8_64.png
+- images/os_win31.png
+- images/os_win7.png
+- images/os_win7_64.png
+- images/os_win8.png
+- images/os_win8_64.png
+- images/os_win95.png
+- images/os_win98.png
+- images/os_winme.png
+- images/os_winnt4.png
+- images/os_winvista.png
+- images/os_winvista_64.png
+- images/os_winxp.png
+- images/os_winxp_64.png
+- images/os_xandros.png
+- images/os_xandros_64.png
+- images/os_oracle.png
+- images/os_oracle_64.png
+- images/os_macosx.png
+- images/os_macosx_64.png
++ images/os_dynebolic.png
++ images/os_venenux.png
++ images/os_trisquel.png
++ images/os_trisquel_64.png
+ images/hd_16px.png
+ images/hd_disabled_16px.png
+ images/hd_32px.png
+--- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/Global.cpp 2012-06-20 10:17:34.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/src-all/Global.cpp 2012-07-25 19:32:44.482993976 -0300
+@@ -35,284 +35,90 @@
+ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
+ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows31, "Windows 3.1",
+- VBOXOSTYPE_Win31, VBOXOSHINT_NONE,
+- 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows95, "Windows 95",
+- VBOXOSTYPE_Win95, VBOXOSHINT_NONE,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows98, "Windows 98",
+- VBOXOSTYPE_Win98, VBOXOSHINT_NONE,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsMe, "Windows Me",
+- VBOXOSTYPE_WinMe, VBOXOSHINT_NONE,
+- 64, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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_AC97 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8_64, "Windows 8 (64 bit)",
+- VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 1536,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_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 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux22, "Linux 2.2",
+- VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24, "Linux 2.4",
+- VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC,
+- 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24_64, "Linux 2.4 (64 bit)",
+- VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+- 128, 4, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU, "GNU",
++ VBOXOSTYPE_GNU, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU_64, "GNU (64 bit)",
++ VBOXOSTYPE_GNU_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
++ { "GNU-Hurd", "GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd, "GNU-Hurd",
++ VBOXOSTYPE_GNUHurd, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26, "Linux 2.6",
+- VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux, "GNU/Linux",
++ VBOXOSTYPE_GNULinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26_64, "Linux 2.6 (64 bit)",
+- VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux_64, "GNU/Linux (64 bit)",
++ VBOXOSTYPE_GNULinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux, "Arch Linux",
+- VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola, "Parabola GNU/Linux-libre",
++ VBOXOSTYPE_Parabola, 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", SchemaDefs_OSTypeId_ArchLinux_64, "Arch Linux (64 bit)",
+- VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola_64, "Parabola GNU/Linux-libre (64 bit)",
++ VBOXOSTYPE_Parabola_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", SchemaDefs_OSTypeId_Debian, "Debian",
+- VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense, "gNewSense",
++ VBOXOSTYPE_gNewSense, 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", SchemaDefs_OSTypeId_Debian_64, "Debian (64 bit)",
+- VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense_64, "gNewSense (64 bit)",
++ VBOXOSTYPE_gNewSense_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_Fedora, "Fedora",
+- VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag, "Blag Linux and GNU",
++ VBOXOSTYPE_Blag, 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", SchemaDefs_OSTypeId_Fedora_64, "Fedora (64 bit)",
+- VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag_64, "Blag Linux and GNU (64 bit)",
++ VBOXOSTYPE_Blag_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", SchemaDefs_OSTypeId_Gentoo, "Gentoo",
+- VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora, "Dragora",
++ VBOXOSTYPE_Dragora, 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", SchemaDefs_OSTypeId_Gentoo_64, "Gentoo (64 bit)",
+- VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora_64, "Dragora (64 bit)",
++ VBOXOSTYPE_Dragora_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_RedHat, "Red Hat",
+- VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo, "Ututo XS",
++ VBOXOSTYPE_Ututo, 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", SchemaDefs_OSTypeId_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,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo_64, "Ututo XS (64 bit)",
++ VBOXOSTYPE_Ututo_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", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux",
+- VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix, "Musix",
++ VBOXOSTYPE_Musix, 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", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux (64 bit)",
+- VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix_64, "Musix (64 bit)",
++ VBOXOSTYPE_Musix_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", SchemaDefs_OSTypeId_Ubuntu, "Ubuntu",
+- VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel, "Trisquel",
++ VBOXOSTYPE_Trisquel, 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", SchemaDefs_OSTypeId_Ubuntu_64, "Ubuntu (64 bit)",
+- VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel_64, "Trisquel (64 bit)",
++ VBOXOSTYPE_Trisquel_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_Oracle, "Oracle",
+- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dynebolic, "Dyne:bolic",
++ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)",
+- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Venenux, "Venenux",
++ 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 },
+- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux",
+- VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+- 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "Solaris", "Solaris", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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 },
+- { "BSD", "BSD", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_OS2Warp3, "OS/2 Warp 3",
+- VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX,
+- 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp4, "OS/2 Warp 4",
+- VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX,
+- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp45, "OS/2 Warp 4.5",
+- VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX,
+- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2eCS, "eComStation",
+- VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX,
+- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2, "Other OS/2",
+- VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX,
+- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS, "Mac OS X Server",
+- VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
+- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
+- ChipsetType_ICH9, AudioControllerType_HDA },
+- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS_64, "Mac OS X Server (64 bit)",
+- VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
+- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
+- ChipsetType_ICH9, AudioControllerType_HDA },
+- { "Other", "Other", SchemaDefs_OSTypeId_DOS, "DOS",
+- VBOXOSTYPE_DOS, VBOXOSHINT_NONE,
+- 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "Other", "Other", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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", SchemaDefs_OSTypeId_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.1.18.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 21:44:01.290876720 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 22:00:57.819380802 -0300
+@@ -4875,75 +4875,27 @@
+ static const char *kOSTypeIcons [][2] =
+ {
+ {"Other", ":/os_other.png"},
+- {"DOS", ":/os_dos.png"},
+- {"Netware", ":/os_netware.png"},
+- {"L4", ":/os_l4.png"},
+- {"Windows31", ":/os_win31.png"},
+- {"Windows95", ":/os_win95.png"},
+- {"Windows98", ":/os_win98.png"},
+- {"WindowsMe", ":/os_winme.png"},
+- {"WindowsNT4", ":/os_winnt4.png"},
+- {"Windows2000", ":/os_win2k.png"},
+- {"WindowsXP", ":/os_winxp.png"},
+- {"WindowsXP_64", ":/os_winxp_64.png"},
+- {"Windows2003", ":/os_win2k3.png"},
+- {"Windows2003_64", ":/os_win2k3_64.png"},
+- {"WindowsVista", ":/os_winvista.png"},
+- {"WindowsVista_64", ":/os_winvista_64.png"},
+- {"Windows2008", ":/os_win2k8.png"},
+- {"Windows2008_64", ":/os_win2k8_64.png"},
+- {"Windows7", ":/os_win7.png"},
+- {"Windows7_64", ":/os_win7_64.png"},
+- {"Windows8", ":/os_win8.png"},
+- {"Windows8_64", ":/os_win8_64.png"},
+- {"WindowsNT", ":/os_win_other.png"},
+- {"OS2Warp3", ":/os_os2warp3.png"},
+- {"OS2Warp4", ":/os_os2warp4.png"},
+- {"OS2Warp45", ":/os_os2warp45.png"},
+- {"OS2eCS", ":/os_os2ecs.png"},
+- {"OS2", ":/os_os2_other.png"},
+- {"Linux22", ":/os_linux22.png"},
+- {"Linux24", ":/os_linux24.png"},
+- {"Linux24_64", ":/os_linux24_64.png"},
+- {"Linux26", ":/os_linux26.png"},
+- {"Linux26_64", ":/os_linux26_64.png"},
+- {"ArchLinux", ":/os_archlinux.png"},
+- {"ArchLinux_64", ":/os_archlinux_64.png"},
+- {"Debian", ":/os_debian.png"},
+- {"Debian_64", ":/os_debian_64.png"},
+- {"OpenSUSE", ":/os_opensuse.png"},
+- {"OpenSUSE_64", ":/os_opensuse_64.png"},
+- {"Fedora", ":/os_fedora.png"},
+- {"Fedora_64", ":/os_fedora_64.png"},
+- {"Gentoo", ":/os_gentoo.png"},
+- {"Gentoo_64", ":/os_gentoo_64.png"},
+- {"Mandriva", ":/os_mandriva.png"},
+- {"Mandriva_64", ":/os_mandriva_64.png"},
+- {"RedHat", ":/os_redhat.png"},
+- {"RedHat_64", ":/os_redhat_64.png"},
+- {"Turbolinux", ":/os_turbolinux.png"},
+- {"Turbolinux_64", ":/os_turbolinux_64.png"},
+- {"Ubuntu", ":/os_ubuntu.png"},
+- {"Ubuntu_64", ":/os_ubuntu_64.png"},
+- {"Xandros", ":/os_xandros.png"},
+- {"Xandros_64", ":/os_xandros_64.png"},
+- {"Oracle", ":/os_oracle.png"},
+- {"Oracle_64", ":/os_oracle_64.png"},
+- {"Linux", ":/os_linux_other.png"},
+- {"FreeBSD", ":/os_freebsd.png"},
+- {"FreeBSD_64", ":/os_freebsd_64.png"},
+- {"OpenBSD", ":/os_openbsd.png"},
+- {"OpenBSD_64", ":/os_openbsd_64.png"},
+- {"NetBSD", ":/os_netbsd.png"},
+- {"NetBSD_64", ":/os_netbsd_64.png"},
+- {"Solaris", ":/os_solaris.png"},
+- {"Solaris_64", ":/os_solaris_64.png"},
+- {"OpenSolaris", ":/os_oraclesolaris.png"},
+- {"OpenSolaris_64", ":/os_oraclesolaris_64.png"},
+- {"QNX", ":/os_qnx.png"},
+- {"MacOS", ":/os_macosx.png"},
+- {"MacOS_64", ":/os_macosx_64.png"},
+- {"JRockitVE", ":/os_jrockitve.png"},
++ {"GNU", ":/os_gnu.png"},
++ {"GNU_64", ":/os_gnu_64.png"},
++ {"GNUHurd", ":/os_gnuhurd.png"},
++ {"GNULinux", ":/os_gnulinux.png"},
++ {"GNULinux_64", ":/os_gnulinux_64.png"},
++ {"Parabola", ":/os_parabola.png"},
++ {"Parabola_64", ":/os_parabola_64.png"},
++ {"gNewSense", ":/os_gnewsense.png"},
++ {"gNewSense_64", ":/os_gnewsense_64.png"},
++ {"Blag", ":/os_blag.png"},
++ {"Blag_64", ":/os_blag_64.png"},
++ {"Dragora", ":/os_dragora.png"},
++ {"Dragora_64", ":/os_dragora_64.png"},
++ {"Ututo", ":/os_ututo.png"},
++ {"Ututo_64", ":/os_ututo_64.png"},
++ {"Musix", ":/os_musix.png"},
++ {"Musix_64", ":/os_musix_64.png"},
++ {"Trisquel", ":/os_trisquel.png"},
++ {"Trisquel_64", ":/os_trisquel_64.png"},
++ {"Dynebolic", ":/os_dynebolic.png"},
++ {"Venenux", ":/os_venenux.png"},
+ };
+ for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
+ {
+--- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp.orig 2012-06-20 10:16:38.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-07-25 22:07:51.232436783 -0300
+@@ -192,17 +192,10 @@
+ if (typeIndex != -1)
+ mCbType->setCurrentIndex (typeIndex);
+ }
+- /* Or select WinXP item for Windows family as default */
+- else if (familyId == "Windows")
++ /* Or select Parabola GNU/Linux-libre item for GNU/Linux family as default */
++ else if (familyId == "GNU/Linux")
+ {
+- int xpIndex = mCbType->findData ("WindowsXP", RoleTypeID);
+- if (xpIndex != -1)
+- mCbType->setCurrentIndex (xpIndex);
+- }
+- /* Or select Ubuntu item for Linux family as default */
+- else if (familyId == "Linux")
+- {
+- int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID);
++ int ubIndex = mCbType->findData ("Parabola", RoleTypeID);
+ if (ubIndex != -1)
+ mCbType->setCurrentIndex (ubIndex);
+ }
+--- VirtualBox-4.1.18.orig/include/VBox/ostypes.h 2012-06-20 10:07:51.000000000 -0300
++++ VirtualBox-4.1.18/include/VBox/ostypes.h 2012-07-25 23:20:57.322757456 -0300
+@@ -43,77 +43,27 @@
+ typedef enum VBOXOSTYPE
+ {
+ VBOXOSTYPE_Unknown = 0,
+- VBOXOSTYPE_DOS = 0x10000,
+- VBOXOSTYPE_Win31 = 0x15000,
+- VBOXOSTYPE_Win9x = 0x20000,
+- VBOXOSTYPE_Win95 = 0x21000,
+- VBOXOSTYPE_Win98 = 0x22000,
+- VBOXOSTYPE_WinMe = 0x23000,
+- VBOXOSTYPE_WinNT = 0x30000,
+- VBOXOSTYPE_WinNT4 = 0x31000,
+- VBOXOSTYPE_Win2k = 0x32000,
+- VBOXOSTYPE_WinXP = 0x33000,
+- VBOXOSTYPE_WinXP_x64 = 0x33100,
+- VBOXOSTYPE_Win2k3 = 0x34000,
+- VBOXOSTYPE_Win2k3_x64 = 0x34100,
+- VBOXOSTYPE_WinVista = 0x35000,
+- VBOXOSTYPE_WinVista_x64 = 0x35100,
+- VBOXOSTYPE_Win2k8 = 0x36000,
+- VBOXOSTYPE_Win2k8_x64 = 0x36100,
+- VBOXOSTYPE_Win7 = 0x37000,
+- VBOXOSTYPE_Win7_x64 = 0x37100,
+- VBOXOSTYPE_Win8 = 0x38000,
+- VBOXOSTYPE_Win8_x64 = 0x38100,
+- VBOXOSTYPE_OS2 = 0x40000,
+- VBOXOSTYPE_OS2Warp3 = 0x41000,
+- VBOXOSTYPE_OS2Warp4 = 0x42000,
+- VBOXOSTYPE_OS2Warp45 = 0x43000,
+- VBOXOSTYPE_ECS = 0x44000,
+- VBOXOSTYPE_Linux = 0x50000,
+- VBOXOSTYPE_Linux_x64 = 0x50100,
+- VBOXOSTYPE_Linux22 = 0x51000,
+- VBOXOSTYPE_Linux24 = 0x52000,
+- VBOXOSTYPE_Linux24_x64 = 0x52100,
+- VBOXOSTYPE_Linux26 = 0x53000,
+- VBOXOSTYPE_Linux26_x64 = 0x53100,
+- VBOXOSTYPE_ArchLinux = 0x54000,
+- VBOXOSTYPE_ArchLinux_x64 = 0x54100,
+- VBOXOSTYPE_Debian = 0x55000,
+- VBOXOSTYPE_Debian_x64 = 0x55100,
+- VBOXOSTYPE_OpenSUSE = 0x56000,
+- VBOXOSTYPE_OpenSUSE_x64 = 0x56100,
+- VBOXOSTYPE_FedoraCore = 0x57000,
+- VBOXOSTYPE_FedoraCore_x64 = 0x57100,
+- VBOXOSTYPE_Gentoo = 0x58000,
+- VBOXOSTYPE_Gentoo_x64 = 0x58100,
+- VBOXOSTYPE_Mandriva = 0x59000,
+- VBOXOSTYPE_Mandriva_x64 = 0x59100,
+- VBOXOSTYPE_RedHat = 0x5A000,
+- VBOXOSTYPE_RedHat_x64 = 0x5A100,
+- VBOXOSTYPE_Turbolinux = 0x5B000,
+- VBOXOSTYPE_Turbolinux_x64 = 0x5B100,
+- VBOXOSTYPE_Ubuntu = 0x5C000,
+- VBOXOSTYPE_Ubuntu_x64 = 0x5C100,
+- VBOXOSTYPE_Xandros = 0x5D000,
+- VBOXOSTYPE_Xandros_x64 = 0x5D100,
+- VBOXOSTYPE_Oracle = 0x5E000,
+- VBOXOSTYPE_Oracle_x64 = 0x5E100,
+- VBOXOSTYPE_FreeBSD = 0x60000,
+- VBOXOSTYPE_FreeBSD_x64 = 0x60100,
+- VBOXOSTYPE_OpenBSD = 0x61000,
+- VBOXOSTYPE_OpenBSD_x64 = 0x61100,
+- VBOXOSTYPE_NetBSD = 0x62000,
+- VBOXOSTYPE_NetBSD_x64 = 0x62100,
+- VBOXOSTYPE_Netware = 0x70000,
+- VBOXOSTYPE_Solaris = 0x80000,
+- VBOXOSTYPE_Solaris_x64 = 0x80100,
+- VBOXOSTYPE_OpenSolaris = 0x81000,
+- VBOXOSTYPE_OpenSolaris_x64 = 0x81100,
+- VBOXOSTYPE_L4 = 0x90000,
+- VBOXOSTYPE_QNX = 0xA0000,
+- VBOXOSTYPE_MacOS = 0xB0000,
+- VBOXOSTYPE_MacOS_x64 = 0xB0100,
+- VBOXOSTYPE_JRockitVE = 0xC0000,
++ VBOXOSTYPE_GNU = 0x10000,
++ VBOXOSTYPE_GNU_x64 = 0x10100,
++ VBOXOSTYPE_GNUHurd = 0x20000,
++ VBOXOSTYPE_GNULinux = 0x30000,
++ VBOXOSTYPE_GNULinux_x64 = 0x30100,
++ VBOXOSTYPE_Parabola = 0x31000,
++ VBOXOSTYPE_Parabola_x64 = 0x31100,
++ VBOXOSTYPE_gNewSense = 0x32000,
++ VBOXOSTYPE_gNewSense_x64 = 0x32100,
++ VBOXOSTYPE_Blag = 0x33000,
++ VBOXOSTYPE_Blag_x64 = 0x33100,
++ VBOXOSTYPE_Dragora = 0x34000,
++ VBOXOSTYPE_Dragora_x64 = 0x34100,
++ VBOXOSTYPE_Ututo = 0x35000,
++ VBOXOSTYPE_Ututo_x64 = 0x35100,
++ VBOXOSTYPE_Musix = 0x36000,
++ VBOXOSTYPE_Musix_x64 = 0x36100,
++ VBOXOSTYPE_Trisquel = 0x37000,
++ VBOXOSTYPE_Trisquel_x64 = 0x37100,
++ VBOXOSTYPE_Dynebolic = 0x38000,
++ VBOXOSTYPE_Venenux = 0x39000,
+ /** The bit number which indicates 64-bit or 32-bit. */
+ #define VBOXOSTYPE_x64_BIT 8
+ /** The mask which indicates 64-bit. */
+@@ -129,16 +79,11 @@
+ typedef enum VBOXOSFAMILY
+ {
+ VBOXOSFAMILY_Unknown = 0,
+- VBOXOSFAMILY_Windows32 = 1,
+- VBOXOSFAMILY_Windows64 = 2,
+- VBOXOSFAMILY_Linux32 = 3,
+- VBOXOSFAMILY_Linux64 = 4,
+- VBOXOSFAMILY_FreeBSD32 = 5,
+- VBOXOSFAMILY_FreeBSD64 = 6,
+- VBOXOSFAMILY_Solaris32 = 7,
+- VBOXOSFAMILY_Solaris64 = 8,
+- VBOXOSFAMILY_MacOSX32 = 9,
+- VBOXOSFAMILY_MacOSX64 = 10,
++ VBOXOSFAMILY_GNU32 = 1,
++ VBOXOSFAMILY_GNU64 = 2,
++ VBOXOSFAMILY_GNUHurd = 3,
++ VBOXOSFAMILY_GNULinux32 = 4,
++ VBOXOSFAMILY_GNULinux64 = 5,
+ /** The usual 32-bit hack. */
+ VBOXOSFAMILY_32BIT_HACK = 0x7fffffff
+ } VBOXOSFAMILY;
+--- VirtualBox-4.1.18.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-06-20 10:17:35.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-07-26 01:28:50.033551279 -0300
+@@ -49,94 +49,33 @@
+ g_osTypes[] =
+ {
+ { ovf::CIMOSType_CIMOS_Unknown, SchemaDefs_OSTypeId_Other },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2 },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp3 },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp4 },
+- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp45 },
+- { ovf::CIMOSType_CIMOS_MSDOS, SchemaDefs_OSTypeId_DOS },
+- { ovf::CIMOSType_CIMOS_WIN3x, SchemaDefs_OSTypeId_Windows31 },
+- { ovf::CIMOSType_CIMOS_WIN95, SchemaDefs_OSTypeId_Windows95 },
+- { ovf::CIMOSType_CIMOS_WIN98, SchemaDefs_OSTypeId_Windows98 },
+- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT },
+- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT4 },
+- { ovf::CIMOSType_CIMOS_NetWare, SchemaDefs_OSTypeId_Netware },
+- { ovf::CIMOSType_CIMOS_NovellOES, SchemaDefs_OSTypeId_Netware },
+- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_Solaris },
+- { ovf::CIMOSType_CIMOS_SunOS, SchemaDefs_OSTypeId_Solaris },
+- { ovf::CIMOSType_CIMOS_FreeBSD, SchemaDefs_OSTypeId_FreeBSD },
+- { ovf::CIMOSType_CIMOS_NetBSD, SchemaDefs_OSTypeId_NetBSD },
+- { ovf::CIMOSType_CIMOS_QNX, SchemaDefs_OSTypeId_QNX },
+- { ovf::CIMOSType_CIMOS_Windows2000, SchemaDefs_OSTypeId_Windows2000 },
+- { ovf::CIMOSType_CIMOS_WindowsMe, SchemaDefs_OSTypeId_WindowsMe },
+- { ovf::CIMOSType_CIMOS_OpenBSD, SchemaDefs_OSTypeId_OpenBSD },
+- { ovf::CIMOSType_CIMOS_WindowsXP, SchemaDefs_OSTypeId_WindowsXP },
+- { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, SchemaDefs_OSTypeId_WindowsXP },
+- { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, SchemaDefs_OSTypeId_WindowsXP },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, SchemaDefs_OSTypeId_Windows2003 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, SchemaDefs_OSTypeId_Windows2003_64 },
+- { ovf::CIMOSType_CIMOS_WindowsXP_64, SchemaDefs_OSTypeId_WindowsXP_64 },
+- { ovf::CIMOSType_CIMOS_WindowsVista, SchemaDefs_OSTypeId_WindowsVista },
+- { ovf::CIMOSType_CIMOS_WindowsVista_64, SchemaDefs_OSTypeId_WindowsVista_64 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, SchemaDefs_OSTypeId_Windows2008 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, SchemaDefs_OSTypeId_Windows2008_64 },
+- { ovf::CIMOSType_CIMOS_FreeBSD_64, SchemaDefs_OSTypeId_FreeBSD_64 },
+- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS },
+- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS_64 }, // there is no CIM 64-bit type for this
+-
+- // Linuxes
+- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, SchemaDefs_OSTypeId_RedHat },
+- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, SchemaDefs_OSTypeId_RedHat_64 },
+- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_Solaris_64 },
+- { ovf::CIMOSType_CIMOS_SUSE, SchemaDefs_OSTypeId_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_SLES, SchemaDefs_OSTypeId_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, SchemaDefs_OSTypeId_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_SUSE_64, SchemaDefs_OSTypeId_OpenSUSE_64 },
+- { ovf::CIMOSType_CIMOS_SLES_64, SchemaDefs_OSTypeId_OpenSUSE_64 },
+- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux },
+- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux22 },
+- { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, SchemaDefs_OSTypeId_Linux },
+- { ovf::CIMOSType_CIMOS_TurboLinux, SchemaDefs_OSTypeId_Turbolinux },
+- { ovf::CIMOSType_CIMOS_TurboLinux_64, SchemaDefs_OSTypeId_Turbolinux_64 },
+- { ovf::CIMOSType_CIMOS_Mandriva, SchemaDefs_OSTypeId_Mandriva },
+- { ovf::CIMOSType_CIMOS_Mandriva_64, SchemaDefs_OSTypeId_Mandriva_64 },
+- { ovf::CIMOSType_CIMOS_Ubuntu, SchemaDefs_OSTypeId_Ubuntu },
+- { ovf::CIMOSType_CIMOS_Ubuntu_64, SchemaDefs_OSTypeId_Ubuntu_64 },
+- { ovf::CIMOSType_CIMOS_Debian, SchemaDefs_OSTypeId_Debian },
+- { ovf::CIMOSType_CIMOS_Debian_64, SchemaDefs_OSTypeId_Debian_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_4_x, SchemaDefs_OSTypeId_Linux24 },
+- { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, SchemaDefs_OSTypeId_Linux24_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Linux26 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Linux26_64 },
+- { ovf::CIMOSType_CIMOS_Linux_64, SchemaDefs_OSTypeId_Linux26_64 },
+-
+- // types that we have support for but CIM doesn't
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_ArchLinux },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_ArchLinux_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Fedora },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Fedora_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Gentoo },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Gentoo_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Xandros },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Xandros_64 },
+- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_OpenSolaris },
+- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_OpenSolaris_64 },
+-
+- // types added with CIM 2.25.0 follow:
+- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, SchemaDefs_OSTypeId_Windows2008 }, // duplicate, see above
+-// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM
+- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7 },
+- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7_64 }, // there is no CIM 64-bit type for this
+- { ovf::CIMOSType_CIMOS_CentOS, SchemaDefs_OSTypeId_RedHat },
+- { ovf::CIMOSType_CIMOS_CentOS_64, SchemaDefs_OSTypeId_RedHat_64 },
+- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, SchemaDefs_OSTypeId_Oracle },
+- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, SchemaDefs_OSTypeId_Oracle_64 },
+- { ovf::CIMOSType_CIMOS_eComStation, SchemaDefs_OSTypeId_OS2eCS }
+-
+- // there are no CIM types for these, so these turn to "other" on export:
+- // SchemaDefs_OSTypeId_OpenBSD
+- // SchemaDefs_OSTypeId_OpenBSD_64
+- // SchemaDefs_OSTypeId_NetBSD
+- // SchemaDefs_OSTypeId_NetBSD_64
++
++ // Custom OS
++ { ovf::CIMOSType_CIMOS_GNU, SchemaDefs_OSTypeId_GNU },
++ { ovf::CIMOSType_CIMOS_GNU_64, SchemaDefs_OSTypeId_GNU_64 },
++ { ovf::CIMOSType_CIMOS_GNUHurd, SchemaDefs_OSTypeId_GNUHurd },
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_GNULinux },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_GNULinux_64 },
++
++ // GNU/Linux free distros
++ { ovf::CIMOSType_CIMOS_gNewSense, SchemaDefs_OSTypeId_gNewSense },
++ { ovf::CIMOSType_CIMOS_gNewSense_64, SchemaDefs_OSTypeId_gNewSense_64 },
++ { ovf::CIMOSType_CIMOS_Dragora, SchemaDefs_OSTypeId_Dragora },
++ { ovf::CIMOSType_CIMOS_Dragora_64, SchemaDefs_OSTypeId_Dragora_64 },
++ { ovf::CIMOSType_CIMOS_Musix, SchemaDefs_OSTypeId_Musix },
++ { ovf::CIMOSType_CIMOS_Musix_64, SchemaDefs_OSTypeId_Musix_64 },
++ { ovf::CIMOSType_CIMOS_Trisquel, SchemaDefs_OSTypeId_Trisquel },
++ { ovf::CIMOSType_CIMOS_Trisquel_64, SchemaDefs_OSTypeId_Trisquel_64 },
++ { ovf::CIMOSType_CIMOS_Dynebolic, SchemaDefs_OSTypeId_Dynebolic },
++ { ovf::CIMOSType_CIMOS_Venenux, SchemaDefs_OSTypeId_Venenux },
++
++ // GNU/Linux free distros that we have support for but CIM doesn't
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Parabola },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Parabola_64 },
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Blag },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Blag_64 },
++ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Ututo },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Ututo_64 },
+
+ };
+
+@@ -150,53 +89,34 @@
+ /* These are the 32-Bit ones. They are sorted by priority. */
+ static const osTypePattern g_osTypesPattern[] =
+ {
+- {"Windows NT", SchemaDefs_OSTypeId_WindowsNT4},
+- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP},
+- {"Windows 2000", SchemaDefs_OSTypeId_Windows2000},
+- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003},
+- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista},
+- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008},
+- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE},
+- {"Novell", SchemaDefs_OSTypeId_OpenSUSE},
+- {"Red Hat", SchemaDefs_OSTypeId_RedHat},
+- {"Mandriva", SchemaDefs_OSTypeId_Mandriva},
+- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu},
+- {"Debian", SchemaDefs_OSTypeId_Debian},
+- {"QNX", SchemaDefs_OSTypeId_QNX},
+- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24},
+- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26},
+- {"Linux", SchemaDefs_OSTypeId_Linux},
+- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris},
+- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris},
+- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD},
+- {"NetBSD", SchemaDefs_OSTypeId_NetBSD},
+- {"Windows 95", SchemaDefs_OSTypeId_Windows95},
+- {"Windows 98", SchemaDefs_OSTypeId_Windows98},
+- {"Windows Me", SchemaDefs_OSTypeId_WindowsMe},
+- {"Windows 3.", SchemaDefs_OSTypeId_Windows31},
+- {"DOS", SchemaDefs_OSTypeId_DOS},
+- {"OS2", SchemaDefs_OSTypeId_OS2}
++
++ {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola},
++ {"gNewSense", SchemaDefs_OSTypeId_gNewSense},
++ {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag},
++ {"Dragora", SchemaDefs_OSTypeId_Dragora},
++ {"Ututo XS", SchemaDefs_OSTypeId_Ututo},
++ {"Musix", SchemaDefs_OSTypeId_Musix},
++ {"Trisquel", SchemaDefs_OSTypeId_Trisquel},
++ {"Dyne:bolic", SchemaDefs_OSTypeId_Dynebolic},
++ {"Venenux", SchemaDefs_OSTypeId_Venenux},
++ {"GNU", SchemaDefs_OSTypeId_GNU},
++ {"GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd},
++ {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux},
++
+ };
+
+ /* These are the 64-Bit ones. They are sorted by priority. */
+ static const osTypePattern g_osTypesPattern64[] =
+ {
+- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP_64},
+- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003_64},
+- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista_64},
+- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008_64},
+- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE_64},
+- {"Novell", SchemaDefs_OSTypeId_OpenSUSE_64},
+- {"Red Hat", SchemaDefs_OSTypeId_RedHat_64},
+- {"Mandriva", SchemaDefs_OSTypeId_Mandriva_64},
+- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu_64},
+- {"Debian", SchemaDefs_OSTypeId_Debian_64},
+- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24_64},
+- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26_64},
+- {"Linux", SchemaDefs_OSTypeId_Linux26_64},
+- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris_64},
+- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris_64},
+- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD_64},
++ {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola_64},
++ {"gNewSense", SchemaDefs_OSTypeId_gNewSense_64},
++ {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag_64},
++ {"Dragora", SchemaDefs_OSTypeId_Dragora_64},
++ {"Ututo XS", SchemaDefs_OSTypeId_Ututo_64},
++ {"Musix", SchemaDefs_OSTypeId_Musix_64},
++ {"Trisquel", SchemaDefs_OSTypeId_Trisquel_64},
++ {"GNU", SchemaDefs_OSTypeId_GNU_64},
++ {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux_64},
+ };
+
+ /**
+--- VirtualBox-4.1.18.orig/src/VBox/Main/include/ovfreader.h 2012-06-20 10:17:34.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Main/include/ovfreader.h 2012-07-26 03:51:21.807619186 -0300
+@@ -34,119 +34,24 @@
+
+ enum CIMOSType_T
+ {
+- CIMOSType_CIMOS_Unknown = 0,
+- CIMOSType_CIMOS_Other = 1,
+- CIMOSType_CIMOS_MACOS = 2,
+- CIMOSType_CIMOS_ATTUNIX = 3,
+- CIMOSType_CIMOS_DGUX = 4,
+- CIMOSType_CIMOS_DECNT = 5,
+- CIMOSType_CIMOS_Tru64UNIX = 6,
+- CIMOSType_CIMOS_OpenVMS = 7,
+- CIMOSType_CIMOS_HPUX = 8,
+- CIMOSType_CIMOS_AIX = 9,
+- CIMOSType_CIMOS_MVS = 10,
+- CIMOSType_CIMOS_OS400 = 11,
+- CIMOSType_CIMOS_OS2 = 12,
+- CIMOSType_CIMOS_JavaVM = 13,
+- CIMOSType_CIMOS_MSDOS = 14,
+- CIMOSType_CIMOS_WIN3x = 15,
+- CIMOSType_CIMOS_WIN95 = 16,
+- CIMOSType_CIMOS_WIN98 = 17,
+- CIMOSType_CIMOS_WINNT = 18,
+- CIMOSType_CIMOS_WINCE = 19,
+- CIMOSType_CIMOS_NCR3000 = 20,
+- CIMOSType_CIMOS_NetWare = 21,
+- CIMOSType_CIMOS_OSF = 22,
+- CIMOSType_CIMOS_DCOS = 23,
+- CIMOSType_CIMOS_ReliantUNIX = 24,
+- CIMOSType_CIMOS_SCOUnixWare = 25,
+- CIMOSType_CIMOS_SCOOpenServer = 26,
+- CIMOSType_CIMOS_Sequent = 27,
+- CIMOSType_CIMOS_IRIX = 28,
+- CIMOSType_CIMOS_Solaris = 29,
+- CIMOSType_CIMOS_SunOS = 30,
+- CIMOSType_CIMOS_U6000 = 31,
+- CIMOSType_CIMOS_ASERIES = 32,
+- CIMOSType_CIMOS_HPNonStopOS = 33,
+- CIMOSType_CIMOS_HPNonStopOSS = 34,
+- CIMOSType_CIMOS_BS2000 = 35,
+- CIMOSType_CIMOS_LINUX = 36,
+- CIMOSType_CIMOS_Lynx = 37,
+- CIMOSType_CIMOS_XENIX = 38,
+- CIMOSType_CIMOS_VM = 39,
+- CIMOSType_CIMOS_InteractiveUNIX = 40,
+- CIMOSType_CIMOS_BSDUNIX = 41,
+- CIMOSType_CIMOS_FreeBSD = 42,
+- CIMOSType_CIMOS_NetBSD = 43,
+- CIMOSType_CIMOS_GNUHurd = 44,
+- CIMOSType_CIMOS_OS9 = 45,
+- CIMOSType_CIMOS_MACHKernel = 46,
+- CIMOSType_CIMOS_Inferno = 47,
+- CIMOSType_CIMOS_QNX = 48,
+- CIMOSType_CIMOS_EPOC = 49,
+- CIMOSType_CIMOS_IxWorks = 50,
+- CIMOSType_CIMOS_VxWorks = 51,
+- CIMOSType_CIMOS_MiNT = 52,
+- CIMOSType_CIMOS_BeOS = 53,
+- CIMOSType_CIMOS_HPMPE = 54,
+- CIMOSType_CIMOS_NextStep = 55,
+- CIMOSType_CIMOS_PalmPilot = 56,
+- CIMOSType_CIMOS_Rhapsody = 57,
+- CIMOSType_CIMOS_Windows2000 = 58,
+- CIMOSType_CIMOS_Dedicated = 59,
+- CIMOSType_CIMOS_OS390 = 60,
+- CIMOSType_CIMOS_VSE = 61,
+- CIMOSType_CIMOS_TPF = 62,
+- CIMOSType_CIMOS_WindowsMe = 63,
+- CIMOSType_CIMOS_CalderaOpenUNIX = 64,
+- CIMOSType_CIMOS_OpenBSD = 65,
+- CIMOSType_CIMOS_NotApplicable = 66,
+- CIMOSType_CIMOS_WindowsXP = 67,
+- CIMOSType_CIMOS_zOS = 68,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2003 = 69,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2003_64 = 70,
+- CIMOSType_CIMOS_WindowsXP_64 = 71,
+- CIMOSType_CIMOS_WindowsXPEmbedded = 72,
+- CIMOSType_CIMOS_WindowsVista = 73,
+- CIMOSType_CIMOS_WindowsVista_64 = 74,
+- CIMOSType_CIMOS_WindowsEmbeddedforPointofService = 75,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2008 = 76,
+- CIMOSType_CIMOS_MicrosoftWindowsServer2008_64 = 77,
+- CIMOSType_CIMOS_FreeBSD_64 = 78,
+- CIMOSType_CIMOS_RedHatEnterpriseLinux = 79,
+- CIMOSType_CIMOS_RedHatEnterpriseLinux_64 = 80,
+- CIMOSType_CIMOS_Solaris_64 = 81,
+- CIMOSType_CIMOS_SUSE = 82,
+- CIMOSType_CIMOS_SUSE_64 = 83,
+- CIMOSType_CIMOS_SLES = 84,
+- CIMOSType_CIMOS_SLES_64 = 85,
+- CIMOSType_CIMOS_NovellOES = 86,
+- CIMOSType_CIMOS_NovellLinuxDesktop = 87,
+- CIMOSType_CIMOS_SunJavaDesktopSystem = 88,
+- CIMOSType_CIMOS_Mandriva = 89,
+- CIMOSType_CIMOS_Mandriva_64 = 90,
+- CIMOSType_CIMOS_TurboLinux = 91,
+- CIMOSType_CIMOS_TurboLinux_64 = 92,
+- CIMOSType_CIMOS_Ubuntu = 93,
+- CIMOSType_CIMOS_Ubuntu_64 = 94,
+- CIMOSType_CIMOS_Debian = 95,
+- CIMOSType_CIMOS_Debian_64 = 96,
+- CIMOSType_CIMOS_Linux_2_4_x = 97,
+- CIMOSType_CIMOS_Linux_2_4_x_64 = 98,
+- CIMOSType_CIMOS_Linux_2_6_x = 99,
+- CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
+- CIMOSType_CIMOS_Linux_64 = 101,
+- CIMOSType_CIMOS_Other_64 = 102,
+- // types added with CIM 2.25.0 follow:
+- CIMOSType_CIMOS_WindowsServer2008R2 = 103,
+- CIMOSType_CIMOS_VMwareESXi = 104,
+- CIMOSType_CIMOS_Windows7 = 105,
+- CIMOSType_CIMOS_CentOS = 106,
+- CIMOSType_CIMOS_CentOS_64 = 107,
+- CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
+- CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
+- CIMOSType_CIMOS_eComStation = 110
+- // no new types added with CIM 2.26.0
++ CIMOSType_CIMOS_Unknown = 0,
++ CIMOSType_CIMOS_Other = 1,
++ CIMOSType_CIMOS_Other_64 = 2,
++ CIMOSType_CIMOS_gNewSense = 3,
++ CIMOSType_CIMOS_gNewSense_64 = 4,
++ CIMOSType_CIMOS_Dragora = 5,
++ CIMOSType_CIMOS_Dragora_64 = 6,
++ CIMOSType_CIMOS_Musix = 7,
++ CIMOSType_CIMOS_Musix_64 = 8,
++ CIMOSType_CIMOS_Trisquel = 9,
++ CIMOSType_CIMOS_Trisquel_64 = 10,
++ CIMOSType_CIMOS_Dynebolic = 11,
++ CIMOSType_CIMOS_Venenux = 12,
++ CIMOSType_CIMOS_GNU = 13,
++ CIMOSType_CIMOS_GNU_64 = 14,
++ CIMOSType_CIMOS_GNUHurd = 15,
++ CIMOSType_CIMOS_GNULinux = 16,
++ CIMOSType_CIMOS_GNULinux_64 = 17
+ };
+
+
diff --git a/libre/virtualbox-libre/ipv6_vnc.patch b/libre/virtualbox-libre/ipv6_vnc.patch
new file mode 100644
index 000000000..8f50aba1c
--- /dev/null
+++ b/libre/virtualbox-libre/ipv6_vnc.patch
@@ -0,0 +1,20 @@
+diff -aur vanilla/VirtualBox-4.1.18/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp changed/VirtualBox-4.1.18/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp
+--- vanilla/VirtualBox-4.1.18/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp 2012-06-20 15:15:53.000000000 +0200
++++ changed/VirtualBox-4.1.18/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp 2012-07-16 16:24:22.448349886 +0200
+@@ -88,8 +88,16 @@
+
+ vncServer = rfbGetScreen(0, NULL, mWidth, mHeight, 8, 3, 1);
+ vncServer->screenData = (void*)this;
++#ifdef LIBVNCSERVER_IPv6
++ if (mVncPort) {
++ vncServer->port = mVncPort;
++ vncServer->ipv6port = mVncPort;
++ }
++#else
+ if (mVncPort)
+ vncServer->port = mVncPort;
++#endif
++
+ char *pszDesktopName;
+ rc = RTStrAPrintf(&pszDesktopName, "%s - VirtualBox", pszName);
+ if (rc >= 0)
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
new file mode 100644
index 000000000..e51d0c0a7
--- /dev/null
+++ b/libre/virtualbox-libre/libre.patch
@@ -0,0 +1,5765 @@
+--- VirtualBox-4.1.18.orig/Config.kmk 2012-07-24 16:38:43.981310996 -0300
++++ VirtualBox-4.1.18/Config.kmk 2012-07-24 16:38:44.001309865 -0300
+@@ -56,9 +56,6 @@
+ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES
+ PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES
+
+-# Misc names used bye the install paths below.
+-VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
+-
+ # Install paths
+ ## @todo This will change after 4.1 is branched off!
+ # What is now 'bin' and 'lib' will be moved down under 'staged/', except on
+@@ -125,9 +122,6 @@
+ endif
+
+ INST_DOC = doc/
+-INST_EXTPACK = $(INST_BIN)ExtensionPacks/
+-INST_EXTPACK_CERTS = $(INST_BIN)ExtPackCertificates/
+-INST_EXTPACK_PUEL = $(INST_EXTPACK)$(VBOX_PUEL_MANGLED_NAME)/
+ INST_PACKAGES = packages/
+
+ VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
+@@ -136,7 +130,6 @@
+ VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
+ VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
+ VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
+-VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
+ VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
+
+
+@@ -208,7 +201,6 @@
+ export VBOX_ADDITIONS_SH_MODE = release
+ export VBOX_DOCUMENTATION_SH_MODE = release
+ export VBOX_EFI_SH_MODE = release
+- export VBOX_EXTPACKS_SH_MODE = release
+ endif
+
+ # Some info on the vendor
+@@ -361,8 +353,6 @@
+ VBOX_WITH_USB = 1
+ # Enable the USB 1.1 controller plus virtual USB HID devices.
+ VBOX_WITH_VUSB = 1
+-# Enable the USB 2.0 controller.
+-VBOX_WITH_EHCI = 1
+ # Enable the ISCSI feature.
+ VBOX_WITH_ISCSI = 1
+ # Enable INIP support in the ISCSI feature.
+@@ -430,9 +420,6 @@
+ ifdef VBOX_WITH_USB
+ VBOX_WITH_VUSB = 1
+ endif
+-ifdef VBOX_WITH_EHCI
+- VBOX_WITH_EHCI_IMPL = 1
+-endif
+ ifdef VBOX_WITH_PCI_PASSTHROUGH
+ VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
+ endif
+@@ -591,15 +578,6 @@
+ ## @}
+
+
+-## @name Extension pack
+-## @{
+-# Enables the extension pack feature.
+-VBOX_WITH_EXTPACK = 1
+-# Enables separating code into the Oracle VM VirtualBox Extension Pack, dubbed PUEL.
+-VBOX_WITH_EXTPACK_PUEL = 1
+-# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
+-VBOX_WITH_EXTPACK_PUEL_BUILD = 1
+-## @}
+
+ ## @name Misc
+ ## @{
+@@ -777,14 +755,6 @@
+ # Skip stuff.
+ #
+
+-ifdef VBOX_ONLY_EXTPACKS
+- # Clear some VBOX_WITH_XXX variables instead of adding ifdefs all over the place.
+- VBOX_WITH_DEBUGGER =
+- VBOX_WITH_ADDITIONS =
+- VBOX_WITH_VBOXDRV =
+- VBOX_WITH_TESTCASES =
+-endif
+-
+ # VBOX_QUICK can be used by core developers to speed to the build
+ ifdef VBOX_QUICK
+ # undefine variables by assigning blank.
+@@ -848,7 +818,6 @@
+ VBOX_WITH_TESTSUITE=
+ VBOX_WITH_QTGUI=
+ VBOX_WITH_USB=
+- VBOX_WITH_EHCI=
+ VBOX_WITH_DOCS=
+ VBOX_WITH_PDM_ASYNC_COMPLETION=
+ VBOX_WITH_KCHMVIEWER=
+@@ -870,7 +839,6 @@
+ VBOX_WITH_CROGL=
+ VBOX_WITH_DEBUGGER=
+ VBOX_WITH_DOCS=
+- VBOX_WITH_EHCI=
+ VBOX_WITH_HARDENING=
+ VBOX_WITH_HEADLESS=
+ VBOX_WITH_HGCM=
+@@ -952,9 +920,6 @@
+ #
+ ifdef VBOX_OSE
+ VBOX_WITH_VRDP=
+- VBOX_WITH_EHCI_IMPL=
+- VBOX_WITH_EXTPACK_PUEL=
+- VBOX_WITH_EXTPACK_PUEL_BUILD=
+ VBOX_WITH_PCI_PASSTHROUGH_IMPL=
+ VBOX_WITH_OS2_ADDITIONS_BIN=
+ VBOX_WITH_SECURELABEL=
+@@ -1082,10 +1047,6 @@
+ VBOX_WITH_KCHMVIEWER=
+ endif
+
+-ifdef VBOX_WITH_EXTPACK_PUEL_BUILD
+- VBOX_WITH_EXTPACK_PUEL = 1
+-endif
+-
+ #
+ # Mark OSE builds clearly, helps figuring out limitations more easily.
+ #
+@@ -1679,9 +1640,6 @@
+ # biossums (set BIOS checksums)
+ VBOX_BIOSSUMS ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE)
+
+-# RTManifest (extension pack manifest utility)
+-VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
+-
+ # filesplitter (splits java files)
+ VBOX_FILESPLIT ?= $(PATH_OBJ)/filesplitter/filesplitter$(HOSTSUFF_EXE)
+
+@@ -2461,13 +2419,6 @@
+ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
+ endif
+
+-SDK_VBoxOpenSslExtPack = Internal use only.
+-SDK_VBoxOpenSslExtPack_INCS = $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
+-SDK_VBoxOpenSslExtPack_ORDERDEPS = $(crypto-headers_1_TARGET)
+-SDK_VBoxOpenSslExtPack_LIBS = \
+- $(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB)
+-
+ SDK_VBOX_BLD_OPENSSL = .
+ SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
+ SDK_VBOX_BLD_OPENSSL_LIBS ?= \
+@@ -3817,100 +3768,6 @@
+ endif
+ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
+
+-
+-
+-#
+-# Templates used for building the extension packs.
+-#
+-ifdef VBOX_WITH_EXTPACK
+- # Base templates (native or portable).
+- TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
+- if 1 # Native for now.
+- TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
+- TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
+- else
+- TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXNOCRTGCC
+- TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXNOCRTGCC_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3 IPRT_NO_CRT IN_RING3
+- TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
+- endif
+- ifneq ($(KBUILD_TARGET),win)
+- TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
+- endif
+- TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+- ifeq ($(KBUILD_TARGET),linux)
+- TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
+- else
+- if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
+- TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
+- endif
+- endif
+- ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+- if1of ($(KBUILD_TARGET), win os2)
+- TEMPLATE_VBoxR3ExtPack_LIBS = \
+- $(TEMPLATE_LIBS_VBOXR3) \
+- $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
+- else
+- TEMPLATE_VBoxR3ExtPack_LIBS = \
+- $(TEMPLATE_LIBS_VBOXR3) \
+- $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
+- $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
+- endif
+- else
+- TEMPLATE_VBoxR3ExtPack_LIBS = \
+- $(TEMPLATE_LIBS_VBOXR3) \
+- $(LIB_RUNTIME) \
+- $(LIB_VMM)
+- endif
+-
+- TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.
+- TEMPLATE_VBoxR0ExtPack_EXTENDS = VBoxR0
+- TEMPLATE_VBoxR0ExtPack_EXTENDS_BY = appending
+- TEMPLATE_VBoxR0ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+- TEMPLATE_VBoxR0ExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R0
+- if1of ($(VBOX_LDR_FMT), pe lx)
+- TEMPLATE_VBoxR0ExtPack_LIBS = \
+- $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
+- endif
+-
+- TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.
+- TEMPLATE_VBoxRcExtPack_EXTENDS = VBoxRc
+- TEMPLATE_VBoxRcExtPack_EXTENDS_BY = appending
+- TEMPLATE_VBoxRcExtPack_SYSSUFF = .rc
+- TEMPLATE_VBoxRcExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+- TEMPLATE_VBoxRcExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_RC
+- if1of ($(VBOX_LDR_FMT32), pe lx)
+- TEMPLATE_VBoxRcExtPack_LIBS = \
+- $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
+- $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
+- endif
+-
+- TEMPLATE_VBoxInsExtPack = For the install targets of an extension pack.
+- TEMPLATE_VBoxInsExtPack_MODE = 0644
+- TEMPLATE_VBoxInsExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+-
+- # For each individual extension pack
+- ifdef VBOX_WITH_EXTPACK_PUEL
+- TEMPLATE_VBoxR3ExtPackPuel = For the ring-3 context modules in the PUEL extension pack.
+- TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
+- TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+-
+- TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
+- TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
+- TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+-
+- TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
+- TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
+- TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+-
+- TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.
+- TEMPLATE_VBoxInsExtPackPuel_EXTENDS = VBoxR0ExtPack
+- TEMPLATE_VBoxInsExtPackPuel_INST = $(INST_EXTPACK_PUEL)
+-endif
+-endif # VBOX_WITH_EXTPACK
+-
+-
+ #
+ # Qt 4
+ # Qt 4
+--- VirtualBox-4.1.18.orig/Makefile.kmk 2012-07-24 17:16:47.078929150 -0300
++++ VirtualBox-4.1.18/Makefile.kmk 2012-07-24 17:16:47.125592981 -0300
+@@ -446,7 +446,6 @@
+ include/VBox \
+ include/VBox/vmm \
+ include/VBox/com \
+- include/VBox/ExtPack \
+ include/VBox/HostServices \
+ include/VBox/GuestHost \
+ include/VBox/HGSMI \
+@@ -862,191 +861,6 @@
+ additions-build-linux.x86.combined \
+ additions-packing
+
+-
+-#
+-# Build the extension packs, all of them.
+-#
+-# This is tailored (hardcoded) for the extension pack build box.
+-#
+-# The fetching must be done in serial fashion, while the building should be
+-# more flexible wrt to -jN.
+-#
+-extpacks-fetch:
+- + $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=darwin BUILD_TARGET_ARCH=x86 BUILD_TARGET=darwin VBOX_ONLY_EXTPACKS=1
+-# + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd VBOX_ONLY_EXTPACKS=1
+-# + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86 BUILD_TARGET=freebsd VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=linux BUILD_TARGET_ARCH=x86 BUILD_TARGET=linux VBOX_ONLY_EXTPACKS=1
+-# + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=os2 BUILD_TARGET_ARCH=x86 BUILD_TARGET=os2 VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86 BUILD_TARGET=solaris VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win VBOX_ONLY_EXTPACKS=1
+- + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=win BUILD_TARGET_ARCH=x86 BUILD_TARGET=win VBOX_ONLY_EXTPACKS=1
+-
+-
+-extpacks-build: \
+- extpacks-build-win.amd64 \
+- extpacks-build-win.x86 \
+- extpacks-build-solaris.amd64 \
+- extpacks-build-solaris.x86 \
+- extpacks-build-os2.x86 \
+- extpacks-build-linux.amd64 \
+- extpacks-build-linux.x86 \
+- extpacks-build-darwin.amd64 \
+- extpacks-build-darwin.x86 \
+- extpacks-build-freebsd.amd64 \
+- extpacks-build-freebsd.x86
+-
+-VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 \
+- KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
+- KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
+- VBOX_SVN_REV=$(VBOX_SVN_REV)
+-
+-VBOX_EXTPACKS_BUILD.x86 = VBOX_ONLY_EXTPACKS=1 \
+- KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
+- KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
+- VBOX_SVN_REV=$(VBOX_SVN_REV)
+-
+-# Automatically determine the extpack build subdir name. Used for figuring out
+-# directory names inside the extension pack building VMs.
+-VBOX_EXTPACKS_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
+-
+-# When building in parallel on a Windows host, make sure we finish the host
+-# bit before kicking off any UNIX guest or we'll run into file sharing issues.
+-ifeq ($(KBUILD_TARGET),win)
+-VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
+-else
+-VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
+-endif
+-
+-extpacks-build-win.amd64:
+-ifeq ($(KBUILD_TARGET),win)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call MSG_L1,Building Windows/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.6 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-endif
+-
+-extpacks-build-win.x86:
+-ifeq ($(KBUILD_TARGET),win)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call MSG_L1,Building Windows/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.16 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-endif
+-
+-ifeq ($(KBUILD_TARGET),solaris)
+-extpacks-build-solaris.amd64:
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-
+-extpacks-build-solaris.x86: extpacks-build-solaris.amd64
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-
+-else
+-# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
+-extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+-
+-extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
+- $(call MSG_L1,Building Solaris/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call MSG_L1,Building Solaris/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-
+-extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
+- $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
+- $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
+-
+-.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
+-.PHONY: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
+-
+-extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
+-extpacks-build-solaris.x86: extpacks-build-solaris.rsync-out-of-vm
+-endif
+-
+-extpacks-build-os2.x86:
+-#ifeq ($(KBUILD_TARGET),os2)
+-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-#else
+-# $(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
+-#endif
+-
+-extpacks-build-linux.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call MSG_L1,Building Linux/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.12 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-endif
+-
+-extpacks-build-linux.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call MSG_L1,Building Linux/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.11 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-endif
+-
+-extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
+-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-#else
+-# $(call MSG_L1,Building FreeBSD/amd64 extension packs)
+-# $(VBOX_KMK_TIME) ssh vbox@192.168.27.17 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-#endif
+-
+-extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
+-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-#else
+-# $(call MSG_L1,Building FreeBSD/x86 extension packs)
+-# $(VBOX_KMK_TIME) ssh vbox@192.168.27.7 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-#endif
+-
+-extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call MSG_L1,Building Darwin/amd64 extension packs)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.15 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
+-endif
+-
+-extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
+- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+-else
+- $(call MSG_L1,Building Darwin/x86 extension packs)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+- $(VBOX_KMK_TIME) ssh vbox@192.168.27.5 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
+-endif
+-
+-
+-extpacks-packing:
+- + $(KMK) VBOX_ONLY_EXTPACKS=1 \
+- VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86 win.amd64 win.x86" \
+- packing
+-# +++ freebsd.amd64 freebsd.x86 os2.x86 ^^^
+-
+-.PHONY: \
+- extpacks-build-win.x86 \
+- extpacks-build-win.amd64 \
+- extpacks-build-solaris.amd64 \
+- extpacks-build-solaris.x86 \
+- extpacks-build-os2.x86 \
+- extpacks-build-linux.amd64 \
+- extpacks-build-linux.x86 \
+- extpacks-build-freebsd.amd64 \
+- extpacks-build-freebsd.x86 \
+- extpacks-build-darwin.amd64 \
+- extpacks-build-darwin.x86 \
+- extpacks-packing
+-
+-
+ #
+ # Build the test suite, all of it.
+ #
+--- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp 2012-06-20 10:15:51.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp 2012-07-24 16:18:03.964493454 -0300
+@@ -132,11 +132,6 @@
+ if (RT_FAILURE(rc))
+ return rc;
+ #endif
+-#ifdef VBOX_WITH_EHCI_IMPL
+- rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
+- if (RT_FAILURE(rc))
+- return rc;
+-#endif
+ #ifdef VBOX_ACPI
+ rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
+ if (RT_FAILURE(rc))
+--- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.h 2012-06-20 10:15:51.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.h 2012-07-24 16:20:35.939205389 -0300
+@@ -62,7 +62,6 @@
+ extern const PDMDEVREG g_DeviceICH6_HDA;
+ extern const PDMDEVREG g_DeviceAudioSniffer;
+ extern const PDMDEVREG g_DeviceOHCI;
+-extern const PDMDEVREG g_DeviceEHCI;
+ extern const PDMDEVREG g_DeviceACPI;
+ extern const PDMDEVREG g_DeviceDMA;
+ extern const PDMDEVREG g_DeviceFloppyController;
+--- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackManagerImpl.h 2012-06-20 10:17:33.000000000 -0300
++++ /dev/null 2012-07-24 14:48:18.638572110 -0300
+@@ -1,245 +0,0 @@
+-/* $Id: ExtPackManagerImpl.h $ */
+-/** @file
+- * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC.
+- */
+-
+-/*
+- * Copyright (C) 2010 Oracle Corporation
+- *
+- * This file is part of VirtualBox Open Source Edition (OSE), as
+- * available from http://www.virtualbox.org. This file is free software;
+- * you can redistribute it and/or modify it under the terms of the GNU
+- * General Public License (GPL) as published by the Free Software
+- * Foundation, in version 2 as it comes in the "COPYING" file of the
+- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+- */
+-
+-#ifndef ____H_EXTPACKMANAGERIMPL
+-#define ____H_EXTPACKMANAGERIMPL
+-
+-#include "VirtualBoxBase.h"
+-#include
+-#include
+-
+-/**
+- * An extension pack file.
+- */
+-class ATL_NO_VTABLE ExtPackFile :
+- public VirtualBoxBase,
+- VBOX_SCRIPTABLE_IMPL(IExtPackFile)
+-{
+-public:
+- /** @name COM and internal init/term/mapping cruft.
+- * @{ */
+- VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(ExtPackFile, IExtPackFile)
+- DECLARE_NOT_AGGREGATABLE(ExtPackFile)
+- DECLARE_PROTECT_FINAL_CONSTRUCT()
+- BEGIN_COM_MAP(ExtPackFile)
+- VBOX_DEFAULT_INTERFACE_ENTRIES(IExtPackFile)
+- COM_INTERFACE_ENTRY(IExtPackBase)
+- END_COM_MAP()
+- DECLARE_EMPTY_CTOR_DTOR(ExtPackFile)
+-
+- HRESULT FinalConstruct();
+- void FinalRelease();
+- HRESULT initWithFile(const char *a_pszFile, const char *a_pszDigest, class ExtPackManager *a_pExtPackMgr, VirtualBox *a_pVirtualBox);
+- void uninit();
+- RTMEMEF_NEW_AND_DELETE_OPERATORS();
+- /** @} */
+-
+- /** @name IExtPackBase interfaces
+- * @{ */
+- STDMETHOD(COMGETTER(Name))(BSTR *a_pbstrName);
+- STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription);
+- STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion);
+- STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision);
+- STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
+- STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
+- STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
+- STDMETHOD(COMGETTER(WhyUnusable))(BSTR *a_pbstrWhy);
+- STDMETHOD(COMGETTER(ShowLicense))(BOOL *a_pfShowIt);
+- STDMETHOD(COMGETTER(License))(BSTR *a_pbstrHtmlLicense);
+- STDMETHOD(QueryLicense)(IN_BSTR a_bstrPreferredLocale, IN_BSTR a_bstrPreferredLanguage,
+- IN_BSTR a_bstrFormat, BSTR *a_pbstrLicense);
+- /** @} */
+-
+- /** @name IExtPackFile interfaces
+- * @{ */
+- STDMETHOD(COMGETTER(FilePath))(BSTR *a_pbstrPath);
+- STDMETHOD(Install)(BOOL a_fReplace, IN_BSTR a_bstrDisplayInfo, IProgress **a_ppProgress);
+- /** @} */
+-
+-private:
+- /** @name Misc init helpers
+- * @{ */
+- HRESULT initFailed(const char *a_pszWhyFmt, ...);
+- /** @} */
+-
+-private:
+- struct Data;
+- /** Pointer to the private instance. */
+- Data *m;
+-
+- friend class ExtPackManager;
+-};
+-
+-
+-/**
+- * An installed extension pack.
+- */
+-class ATL_NO_VTABLE ExtPack :
+- public VirtualBoxBase,
+- VBOX_SCRIPTABLE_IMPL(IExtPack)
+-{
+-public:
+- /** @name COM and internal init/term/mapping cruft.
+- * @{ */
+- VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(ExtPack, IExtPack)
+- DECLARE_NOT_AGGREGATABLE(ExtPack)
+- DECLARE_PROTECT_FINAL_CONSTRUCT()
+- BEGIN_COM_MAP(ExtPack)
+- VBOX_DEFAULT_INTERFACE_ENTRIES(IExtPack)
+- COM_INTERFACE_ENTRY(IExtPackBase)
+- END_COM_MAP()
+- DECLARE_EMPTY_CTOR_DTOR(ExtPack)
+-
+- HRESULT FinalConstruct();
+- void FinalRelease();
+- HRESULT initWithDir(VBOXEXTPACKCTX a_enmContext, const char *a_pszName, const char *a_pszDir);
+- void uninit();
+- RTMEMEF_NEW_AND_DELETE_OPERATORS();
+- /** @} */
+-
+- /** @name IExtPackBase interfaces
+- * @{ */
+- STDMETHOD(COMGETTER(Name))(BSTR *a_pbstrName);
+- STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription);
+- STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion);
+- STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision);
+- STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
+- STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
+- STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
+- STDMETHOD(COMGETTER(WhyUnusable))(BSTR *a_pbstrWhy);
+- STDMETHOD(COMGETTER(ShowLicense))(BOOL *a_pfShowIt);
+- STDMETHOD(COMGETTER(License))(BSTR *a_pbstrHtmlLicense);
+- STDMETHOD(QueryLicense)(IN_BSTR a_bstrPreferredLocale, IN_BSTR a_bstrPreferredLanguage,
+- IN_BSTR a_bstrFormat, BSTR *a_pbstrLicense);
+- /** @} */
+-
+- /** @name IExtPack interfaces
+- * @{ */
+- STDMETHOD(QueryObject)(IN_BSTR a_bstrObjectId, IUnknown **a_ppUnknown);
+- /** @} */
+-
+- /** @name Internal interfaces used by ExtPackManager.
+- * @{ */
+- bool callInstalledHook(IVirtualBox *a_pVirtualBox, AutoWriteLock *a_pLock, PRTERRINFO pErrInfo);
+- HRESULT callUninstallHookAndClose(IVirtualBox *a_pVirtualBox, bool a_fForcedRemoval);
+- bool callVirtualBoxReadyHook(IVirtualBox *a_pVirtualBox, AutoWriteLock *a_pLock);
+- bool callConsoleReadyHook(IConsole *a_pConsole, AutoWriteLock *a_pLock);
+- bool callVmCreatedHook(IVirtualBox *a_pVirtualBox, IMachine *a_pMachine, AutoWriteLock *a_pLock);
+- bool callVmConfigureVmmHook(IConsole *a_pConsole, PVM a_pVM, AutoWriteLock *a_pLock, int *a_pvrc);
+- bool callVmPowerOnHook(IConsole *a_pConsole, PVM a_pVM, AutoWriteLock *a_pLock, int *a_pvrc);
+- bool callVmPowerOffHook(IConsole *a_pConsole, PVM a_pVM, AutoWriteLock *a_pLock);
+- HRESULT checkVrde(void);
+- HRESULT getVrdpLibraryName(Utf8Str *a_pstrVrdeLibrary);
+- bool wantsToBeDefaultVrde(void) const;
+- HRESULT refresh(bool *pfCanDelete);
+- /** @} */
+-
+-protected:
+- /** @name Internal helper methods.
+- * @{ */
+- void probeAndLoad(void);
+- bool findModule(const char *a_pszName, const char *a_pszExt, VBOXEXTPACKMODKIND a_enmKind,
+- Utf8Str *a_ppStrFound, bool *a_pfNative, PRTFSOBJINFO a_pObjInfo) const;
+- static bool objinfoIsEqual(PCRTFSOBJINFO pObjInfo1, PCRTFSOBJINFO pObjInfo2);
+- /** @} */
+-
+- /** @name Extension Pack Helpers
+- * @{ */
+- static DECLCALLBACK(int) hlpFindModule(PCVBOXEXTPACKHLP pHlp, const char *pszName, const char *pszExt,
+- VBOXEXTPACKMODKIND enmKind, char *pszFound, size_t cbFound, bool *pfNative);
+- static DECLCALLBACK(int) hlpGetFilePath(PCVBOXEXTPACKHLP pHlp, const char *pszFilename, char *pszPath, size_t cbPath);
+- static DECLCALLBACK(VBOXEXTPACKCTX) hlpGetContext(PCVBOXEXTPACKHLP pHlp);
+- static DECLCALLBACK(int) hlpReservedN(PCVBOXEXTPACKHLP pHlp);
+- /** @} */
+-
+-private:
+- struct Data;
+- /** Pointer to the private instance. */
+- Data *m;
+-
+- friend class ExtPackManager;
+-};
+-
+-
+-/**
+- * Extension pack manager.
+- */
+-class ATL_NO_VTABLE ExtPackManager :
+- public VirtualBoxBase,
+- VBOX_SCRIPTABLE_IMPL(IExtPackManager)
+-{
+- /** @name COM and internal init/term/mapping cruft.
+- * @{ */
+- VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(ExtPackManager, IExtPackManager)
+- DECLARE_NOT_AGGREGATABLE(ExtPackManager)
+- DECLARE_PROTECT_FINAL_CONSTRUCT()
+- BEGIN_COM_MAP(ExtPackManager)
+- VBOX_DEFAULT_INTERFACE_ENTRIES(IExtPackManager)
+- END_COM_MAP()
+- DECLARE_EMPTY_CTOR_DTOR(ExtPackManager)
+-
+- HRESULT FinalConstruct();
+- void FinalRelease();
+- HRESULT initExtPackManager(VirtualBox *a_pVirtualBox, VBOXEXTPACKCTX a_enmContext);
+- void uninit();
+- RTMEMEF_NEW_AND_DELETE_OPERATORS();
+- /** @} */
+-
+- /** @name IExtPack interfaces
+- * @{ */
+- STDMETHOD(COMGETTER(InstalledExtPacks))(ComSafeArrayOut(IExtPack *, a_paExtPacks));
+- STDMETHOD(Find)(IN_BSTR a_bstrName, IExtPack **a_pExtPack);
+- STDMETHOD(OpenExtPackFile)(IN_BSTR a_bstrTarball, IExtPackFile **a_ppExtPackFile);
+- STDMETHOD(Uninstall)(IN_BSTR a_bstrName, BOOL a_fForcedRemoval, IN_BSTR a_bstrDisplayInfo, IProgress **a_ppProgress);
+- STDMETHOD(Cleanup)(void);
+- STDMETHOD(QueryAllPlugInsForFrontend)(IN_BSTR a_bstrFrontend, ComSafeArrayOut(BSTR, a_pabstrPlugInModules));
+- STDMETHOD(IsExtPackUsable(IN_BSTR a_bstrExtPack, BOOL *aUsable));
+- /** @} */
+-
+- /** @name Internal interfaces used by other Main classes.
+- * @{ */
+- static DECLCALLBACK(int) doInstallThreadProc(RTTHREAD hThread, void *pvJob);
+- HRESULT doInstall(ExtPackFile *a_pExtPackFile, bool a_fReplace, Utf8Str const *a_pstrDisplayInfo);
+- static DECLCALLBACK(int) doUninstallThreadProc(RTTHREAD hThread, void *pvJob);
+- HRESULT doUninstall(const Utf8Str *a_pstrName, bool a_fForcedRemoval, const Utf8Str *a_pstrDisplayInfo);
+- void callAllVirtualBoxReadyHooks(void);
+- void callAllConsoleReadyHooks(IConsole *a_pConsole);
+- void callAllVmCreatedHooks(IMachine *a_pMachine);
+- int callAllVmConfigureVmmHooks(IConsole *a_pConsole, PVM a_pVM);
+- int callAllVmPowerOnHooks(IConsole *a_pConsole, PVM a_pVM);
+- void callAllVmPowerOffHooks(IConsole *a_pConsole, PVM a_pVM);
+- HRESULT checkVrdeExtPack(Utf8Str const *a_pstrExtPack);
+- int getVrdeLibraryPathForExtPack(Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrVrdeLibrary);
+- HRESULT getDefaultVrdeExtPack(Utf8Str *a_pstrExtPack);
+- bool isExtPackUsable(const char *a_pszExtPack);
+- void dumpAllToReleaseLog(void);
+- /** @} */
+-
+-private:
+- HRESULT runSetUidToRootHelper(Utf8Str const *a_pstrDisplayInfo, const char *a_pszCommand, ...);
+- ExtPack *findExtPack(const char *a_pszName);
+- void removeExtPack(const char *a_pszName);
+- HRESULT refreshExtPack(const char *a_pszName, bool a_fUnsuableIsError, ExtPack **a_ppExtPack);
+-
+-private:
+- struct Data;
+- /** Pointer to the private instance. */
+- Data *m;
+-};
+-
+-#endif
+-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
+--- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackUtil.h 2012-06-20 10:17:33.000000000 -0300
++++ /dev/null 2012-07-24 14:48:18.638572110 -0300
+@@ -1,137 +0,0 @@
+-/* $Id: ExtPackUtil.h $ */
+-/** @file
+- * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++.
+- */
+-
+-/*
+- * Copyright (C) 2010 Oracle Corporation
+- *
+- * This file is part of VirtualBox Open Source Edition (OSE), as
+- * available from http://www.virtualbox.org. This file is free software;
+- * you can redistribute it and/or modify it under the terms of the GNU
+- * General Public License (GPL) as published by the Free Software
+- * Foundation, in version 2 as it comes in the "COPYING" file of the
+- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+- */
+-
+-#ifndef ____H_EXTPACKUTIL
+-#define ____H_EXTPACKUTIL
+-
+-#include
+-#include
+-#include
+-
+-
+-/** @name VBOX_EXTPACK_DESCRIPTION_NAME
+- * The name of the description file in an extension pack. */
+-#define VBOX_EXTPACK_DESCRIPTION_NAME "ExtPack.xml"
+-/** @name VBOX_EXTPACK_DESCRIPTION_NAME
+- * The name of the manifest file in an extension pack. */
+-#define VBOX_EXTPACK_MANIFEST_NAME "ExtPack.manifest"
+-/** @name VBOX_EXTPACK_SIGNATURE_NAME
+- * The name of the signature file in an extension pack. */
+-#define VBOX_EXTPACK_SIGNATURE_NAME "ExtPack.signature"
+-/** @name VBOX_EXTPACK_LICENSE_NAME_PREFIX
+- * The name prefix of a license file in an extension pack. There can be
+- * several license files in a pack, the variations being on locale, language
+- * and format (HTML, RTF, plain text). All extension packages shall include
+- * a */
+-#define VBOX_EXTPACK_LICENSE_NAME_PREFIX "ExtPack-license"
+-/** @name VBOX_EXTPACK_SUFFIX
+- * The suffix of a extension pack tarball. */
+-#define VBOX_EXTPACK_SUFFIX ".vbox-extpack"
+-
+-/** The minimum length (strlen) of a extension pack name. */
+-#define VBOX_EXTPACK_NAME_MIN_LEN 3
+-/** The max length (strlen) of a extension pack name. */
+-#define VBOX_EXTPACK_NAME_MAX_LEN 64
+-
+-/** The architecture-dependent application data subdirectory where the
+- * extension packs are installed. Relative to RTPathAppPrivateArch. */
+-#define VBOX_EXTPACK_INSTALL_DIR "ExtensionPacks"
+-/** The architecture-independent application data subdirectory where the
+- * certificates are installed. Relative to RTPathAppPrivateNoArch. */
+-#define VBOX_EXTPACK_CERT_DIR "ExtPackCertificates"
+-
+-/** The maximum entry name length.
+- * Play short and safe. */
+-#define VBOX_EXTPACK_MAX_MEMBER_NAME_LENGTH 128
+-
+-
+-/**
+- * Plug-in descriptor.
+- */
+-typedef struct VBOXEXTPACKPLUGINDESC
+-{
+- /** The name. */
+- RTCString strName;
+- /** The module name. */
+- RTCString strModule;
+- /** The description. */
+- RTCString strDescription;
+- /** The frontend or component which it plugs into. */
+- RTCString strFrontend;
+-} VBOXEXTPACKPLUGINDESC;
+-/** Pointer to a plug-in descriptor. */
+-typedef VBOXEXTPACKPLUGINDESC *PVBOXEXTPACKPLUGINDESC;
+-
+-/**
+- * Extension pack descriptor
+- *
+- * This is the internal representation of the ExtPack.xml.
+- */
+-typedef struct VBOXEXTPACKDESC
+-{
+- /** The name. */
+- RTCString strName;
+- /** The description. */
+- RTCString strDescription;
+- /** The version string. */
+- RTCString strVersion;
+- /** The edition string. */
+- RTCString strEdition;
+- /** The internal revision number. */
+- uint32_t uRevision;
+- /** The name of the main module. */
+- RTCString strMainModule;
+- /** The name of the VRDE module, empty if none. */
+- RTCString strVrdeModule;
+- /** The number of plug-in descriptors. */
+- uint32_t cPlugIns;
+- /** Pointer to an array of plug-in descriptors. */
+- PVBOXEXTPACKPLUGINDESC paPlugIns;
+- /** Whether to show the license prior to installation. */
+- bool fShowLicense;
+-} VBOXEXTPACKDESC;
+-
+-/** Pointer to a extension pack descriptor. */
+-typedef VBOXEXTPACKDESC *PVBOXEXTPACKDESC;
+-/** Pointer to a const extension pack descriptor. */
+-typedef VBOXEXTPACKDESC const *PCVBOXEXTPACKDESC;
+-
+-
+-void VBoxExtPackInitDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
+-RTCString *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
+-RTCString *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
+-RTCString *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
+-void VBoxExtPackFreeDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
+-bool VBoxExtPackIsValidName(const char *pszName);
+-bool VBoxExtPackIsValidMangledName(const char *pszMangledName, size_t cchMax = RTSTR_MAX);
+-RTCString *VBoxExtPackMangleName(const char *pszName);
+-RTCString *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
+-int VBoxExtPackCalcDir(char *pszExtPackDir, size_t cbExtPackDir, const char *pszParentDir, const char *pszName);
+-bool VBoxExtPackIsValidVersionString(const char *pszVersion);
+-bool VBoxExtPackIsValidEditionString(const char *pszEdition);
+-bool VBoxExtPackIsValidModuleString(const char *pszModule);
+-
+-int VBoxExtPackValidateMember(const char *pszName, RTVFSOBJTYPE enmType, RTVFSOBJ hVfsObj, char *pszError, size_t cbError);
+-int VBoxExtPackOpenTarFss(RTFILE hTarballFile, char *pszError, size_t cbError, PRTVFSFSSTREAM phTarFss, PRTMANIFEST phFileManifest);
+-int VBoxExtPackValidateTarball(RTFILE hTarballFile, const char *pszExtPackName,
+- const char *pszTarball, const char *pszTarballDigest,
+- char *pszError, size_t cbError,
+- PRTMANIFEST phValidManifest, PRTVFSFILE phXmlFile, RTCString *pStrDigest);
+-
+-
+-#endif
+-
+--- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/ExtPackManagerImpl.cpp 2012-06-20 10:17:34.000000000 -0300
++++ /dev/null 2012-07-24 14:48:18.638572110 -0300
+@@ -1,3126 +0,0 @@
+-/* $Id: ExtPackManagerImpl.cpp $ */
+-/** @file
+- * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC.
+- */
+-
+-/*
+- * Copyright (C) 2010 Oracle Corporation
+- *
+- * This file is part of VirtualBox Open Source Edition (OSE), as
+- * available from http://www.virtualbox.org. This file is free software;
+- * you can redistribute it and/or modify it under the terms of the GNU
+- * General Public License (GPL) as published by the Free Software
+- * Foundation, in version 2 as it comes in the "COPYING" file of the
+- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+- */
+-
+-
+-/*******************************************************************************
+-* Header Files *
+-*******************************************************************************/
+-#include "ExtPackManagerImpl.h"
+-#include "ExtPackUtil.h"
+-
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include "AutoCaller.h"
+-#include "Global.h"
+-#include "ProgressImpl.h"
+-#include "SystemPropertiesImpl.h"
+-#include "VirtualBoxImpl.h"
+-
+-
+-/*******************************************************************************
+-* Defined Constants And Macros *
+-*******************************************************************************/
+-/** @name VBOX_EXTPACK_HELPER_NAME
+- * The name of the utility application we employ to install and uninstall the
+- * extension packs. This is a set-uid-to-root binary on unixy platforms, which
+- * is why it has to be a separate application.
+- */
+-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+-# define VBOX_EXTPACK_HELPER_NAME "VBoxExtPackHelperApp.exe"
+-#else
+-# define VBOX_EXTPACK_HELPER_NAME "VBoxExtPackHelperApp"
+-#endif
+-
+-
+-/*******************************************************************************
+-* Structures and Typedefs *
+-*******************************************************************************/
+-struct ExtPackBaseData
+-{
+-public:
+- /** The extension pack descriptor (loaded from the XML, mostly). */
+- VBOXEXTPACKDESC Desc;
+- /** The file system object info of the XML file.
+- * This is for detecting changes and save time in refresh(). */
+- RTFSOBJINFO ObjInfoDesc;
+- /** Whether it's usable or not. */
+- bool fUsable;
+- /** Why it is unusable. */
+- Utf8Str strWhyUnusable;
+-};
+-
+-/**
+- * Private extension pack data.
+- */
+-struct ExtPackFile::Data : public ExtPackBaseData
+-{
+-public:
+- /** The path to the tarball. */
+- Utf8Str strExtPackFile;
+- /** The SHA-256 hash of the file (as string). */
+- Utf8Str strDigest;
+- /** The file handle of the extension pack file. */
+- RTFILE hExtPackFile;
+- /** Our manifest for the tarball. */
+- RTMANIFEST hOurManifest;
+- /** Pointer to the extension pack manager. */
+- ComObjPtr ptrExtPackMgr;
+- /** Pointer to the VirtualBox object so we can create a progress object. */
+- VirtualBox *pVirtualBox;
+-
+- RTMEMEF_NEW_AND_DELETE_OPERATORS();
+-};
+-
+-/**
+- * Private extension pack data.
+- */
+-struct ExtPack::Data : public ExtPackBaseData
+-{
+-public:
+- /** Where the extension pack is located. */
+- Utf8Str strExtPackPath;
+- /** The file system object info of the extension pack directory.
+- * This is for detecting changes and save time in refresh(). */
+- RTFSOBJINFO ObjInfoExtPack;
+- /** The full path to the main module. */
+- Utf8Str strMainModPath;
+- /** The file system object info of the main module.
+- * This is used to determin whether to bother try reload it. */
+- RTFSOBJINFO ObjInfoMainMod;
+- /** The module handle of the main extension pack module. */
+- RTLDRMOD hMainMod;
+-
+- /** The helper callbacks for the extension pack. */
+- VBOXEXTPACKHLP Hlp;
+- /** Pointer back to the extension pack object (for Hlp methods). */
+- ExtPack *pThis;
+- /** The extension pack registration structure. */
+- PCVBOXEXTPACKREG pReg;
+- /** The current context. */
+- VBOXEXTPACKCTX enmContext;
+- /** Set if we've made the pfnVirtualBoxReady or pfnConsoleReady call. */
+- bool fMadeReadyCall;
+-
+- RTMEMEF_NEW_AND_DELETE_OPERATORS();
+-};
+-
+-/** List of extension packs. */
+-typedef std::list< ComObjPtr > ExtPackList;
+-
+-/**
+- * Private extension pack manager data.
+- */
+-struct ExtPackManager::Data
+-{
+- /** The directory where the extension packs are installed. */
+- Utf8Str strBaseDir;
+- /** The directory where the certificates this installation recognizes are
+- * stored. */
+- Utf8Str strCertificatDirPath;
+- /** The list of installed extension packs. */
+- ExtPackList llInstalledExtPacks;
+- /** Pointer to the VirtualBox object, our parent. */
+- VirtualBox *pVirtualBox;
+- /** The current context. */
+- VBOXEXTPACKCTX enmContext;
+-#if !defined(RT_OS_WINDOWS) && !defined(RT_OS_DARWIN)
+- /** File handle for the VBoxVMM libary which we slurp because ExtPacks depend on it. */
+- RTLDRMOD hVBoxVMM;
+-#endif
+-
+- RTMEMEF_NEW_AND_DELETE_OPERATORS();
+-};
+-
+-/**
+- * Extension pack installation job.
+- */
+-typedef struct EXTPACKINSTALLJOB
+-{
+- /** Smart pointer to the extension pack file. */
+- ComPtr ptrExtPackFile;
+- /** The replace argument. */
+- bool fReplace;
+- /** The display info argument. */
+- Utf8Str strDisplayInfo;
+- /** Smart pointer to the extension manager. */
+- ComPtr ptrExtPackMgr;
+- /** Smart pointer to the progress object for this job. */
+- ComObjPtr