Merge branch 'master' of https://projects.parabolagnulinux.org/abslibre

9 files changed, 28 insertions, 50 deletions

diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index e412dd86e..8e8908ce6 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100783 2013-11-10 20:06:17Z spupykin $
+# $Id: PKGBUILD 102928 2013-12-24 09:48:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.8.5
+pkgver=2.6.8.8
 pkgrel=1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('cef9d5060b1c1931028e802a251a820d')
+md5sums=('55c2fe321a121b9708afb147d655adeb')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 0d26fd734..17a9da2b9 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,4 +1,4 @@
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
@@ -27,9 +27,10 @@ if $_pgo; then
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
-            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
             'gstreamer0.10-good-plugins: webm and mp4 demuxing'
-            'gstreamer0.10-ugly-plugins: h.264 decoding'
+            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
+            'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding'
+            'gstreamer0.10-ffmpeg: more decoders'
             'libpulse: PulseAudio audio driver')
 url=http://www.gnu.org/software/gnuzilla/
 install=$pkgname.install
@@ -49,7 +50,7 @@ md5sums=(
   0d3fdcec3f5fde494dedb595387e8f21
   71dce16848bc51503a154841ce99427b
   df08eaa1ac3bc6c2356be4fbf8ec8932
-  b5198ac730fc09e3d0297523b28289c4
+  21b5014c55aa97983f833886e047f55c
   b41f82994fa056ffa5f8e6d99570e27a
   b30ba2b5562558d510fdd09d626d0faa
   64826fcf48816b13090042eefddbaa58
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 244592db8..c8a0a5f0d 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -80,27 +80,3 @@ index e925c1e..5101035 100644
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </DL><p>
  </DL><p>
-diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul
-index 25efdb6..8162c73 100644
---- a/dom/ipc/test.xul
-+++ b/dom/ipc/test.xul
-@@ -299,6 +299,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
-   <label id="messageLog" value="" crop="center"/>
- </window>
-diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
-index 237ba61..7603d7d 100644
---- a/layout/ipc/test-ipcbrowser.xul
-+++ b/layout/ipc/test-ipcbrowser.xul
-@@ -73,6 +73,6 @@
-        label="setViewportScale"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
-            remote="true"/>
- </window>
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 8e5900967..9cd3b1a43 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100783 2013-11-10 20:06:17Z spupykin $
+# $Id: PKGBUILD 102928 2013-12-24 09:48:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.8.5
+pkgver=2.6.8.8
 pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('cef9d5060b1c1931028e802a251a820d')
+md5sums=('55c2fe321a121b9708afb147d655adeb')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 3573d362e..8205a1b43 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201476 2013-12-12 16:19:43Z andyrtr $
+# $Id: PKGBUILD 202368 2013-12-21 13:18:01Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=24
+_sublevel=25
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.24 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.25 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.10.6-logitech-dj.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '3de8dbf8d6d40c74b914aae4dff5e7a6'
-         '59a0759df09a59d48d0c470895c50cbb'
-         'ad7f5988deb617e3789f95d7e675860d'
+         '2b357d6f2048c46ed2f4ecee1b539fd8'
+         '85ce008eaacbb2fc54b81116d35cf946'
+         '16867e648e4b9f89bec949cb643888c2'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
          '3ff40ca684cfe719723e627e2cef7cea'
-         'f768e9abd6fb84f038a80324389fb3f3')
+         'a294af0fcd2398c39d3d3b6dd2961323')
 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/config.i686 b/libre/linux-libre-lts/config.i686
index 00d4f295b..942c1a052 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1425,7 +1425,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_DEBUG_DRIVER is not set
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 8dc57a685..b798887e7 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1396,7 +1396,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_DEBUG_DRIVER is not set
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 80797ffe5..c06de343e 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -106,7 +106,7 @@ package_lirc-libre-utils() {
   options=('strip')
   replaces=('lirc-utils' 'lirc-utils-libre')
   conflicts=('lirc-utils' 'lirc-utils-libre')
-  provides=("lirc-utils=$pkgver" "lirc-utils-libre=$pkgver")
+  provides=("lirc-utils=$pkgver" 'lirc-utils-libre')
   install=lirc-utils.install
 
   cd "${srcdir}/lirc-${pkgver}"
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index fbd577a90..bf945b53f 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -16,6 +16,7 @@ source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/$_pkgbase/tarball
          'searchenginesmanager.cpp.sed'
          'speeddial.cpp.sed'
          'start.html.sed')
+noextract=("$_pkgbase-$pkgver.tar.gz")
 install="$_pkgbase.install"
 md5sums=('cfbf5cd23d184275c389c79a39a28631'
          '1d926e97a5b287d40fb695f6516f2a06'
@@ -25,8 +26,8 @@ md5sums=('cfbf5cd23d184275c389c79a39a28631'
 prepare() {
   # extract
   mkdir -p qt{4,5}
-  bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt4
-  bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt5
+  bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4
+  bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt5
 
   # configure
   export USE_WEBGL=true \
@@ -57,9 +58,9 @@ build() {
 package_qupzilla-libre() {
   pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
   depends=('qtwebkit' 'hunspell')
-  replaces=qupzilla
-  conflicts=qupzilla
   provides=qupzilla=$pkgver
+  conflicts=qupzilla
+  replaces=qupzilla
 
   cd qt4
   make INSTALL_ROOT="$pkgdir/" install
@@ -72,9 +73,9 @@ package_qupzilla-libre() {
 package_qupzilla-libre-qt5() {
   pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers"
   depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
-  provides=('qupzilla-qt5' 'qupzilla-libre')
+  provides=("qupzilla-qt5=$pkgver" 'qupzilla-libre')
   conflicts=('qupzilla-qt5' 'qupzilla-libre')
-  provides=qupzilla-qt5=$pkgver
+  replaces=qupzilla-qt5
 
   cd qt5
   make INSTALL_ROOT="$pkgdir/" install