9 files changed, 32 insertions, 109 deletions
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index 41dea657a..af8125f1f 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=cdrkit
 pkgname=cdrkit-libre
 pkgver=1.1.11
-pkgrel=2.3
+pkgrel=2.4
 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdrkit.org/"
@@ -13,9 +13,9 @@ license=('GPL2')
 depends=('file' 'bzip2')
 optdepends=('perl: for dirsplit')
 makedepends=('cmake')
-provides=("cdrkit=${pkgver}")
-conflicts=('cdrkit')
-replaces=('cdrkit')
+provides=("cdrkit=${pkgver}" 'cdrtools')
+conflicts=('cdrkit' 'cdrtools')
+replaces=('cdrkit' 'cdrtools')
 source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
 md5sums=('efe08e2f3ca478486037b053acd512e9')
 
diff --git a/libre/cdrtools-libre/PKGBUILD b/libre/cdrtools-libre/PKGBUILD
deleted file mode 100644
index 453979842..000000000
--- a/libre/cdrtools-libre/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-_pkgname=cdrtools
-pkgname=cdrtools-libre
-pkgver=3.01a12
-pkgrel=1
-pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning (without nonfree apple_driver utility)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://cdrecord.berlios.de/private/cdrecord.html"
-license=('CDDL')
-depends=('acl')
-replaces=('cdrtools')
-conflicts=('cdrtools' 'cdrkit')
-provides=("cdrtools=${pkgver}" 'cdrkit')
-options=(!makeflags)
-backup=('etc/default/cdrecord' 'etc/default/rscsi')
-install=cdrtools.install
-source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2)
-md5sums=('563d80a7102175bea3e41fbfc269b914')
-
-build() {
-  cd "$srcdir"/cdrtools-${pkgver%%a*}
-
-  # Remove nonfree apple_driver utility
-  rm -rvf mkisofs/{apple_driver{.c,.8,.mk,_man.mk},README.hfs_boot,Rhfs_boot.mk}
-  sed -i -e '/apple_driver/d' mkisofs/Makefile
-  sed -i -e '/README.hfs_boot/d' pkgdefs/CSW/CSWcdrtools/prototype
-  sed -i -e '/README.hfs_boot/d' pkgdefs/OCSW/CSWcdrtools/prototype
-  sed -i -e '/README.hfs_boot/d' vms/vms_name_fix.sh
-
-  sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
-  sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
-  
-  export GMAKE_NOWARN=true
-  make INS_BASE=/usr INS_RBASE=/
-}
-
-package() {
-  cd "$srcdir"/cdrtools-${pkgver%%a*}
-
-  export GMAKE_NOWARN=true
-  make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir"/usr/include
-  rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
-
-  # autoload 'sg' module needed by cdrecord
-  install -d -m755 "$pkgdir"/usr/lib/modules-load.d/
-  echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf
-
-  # create symlinks for cdrkit compatibility
-  cd "$pkgdir"/usr/bin
-  ln -s cdrecord wodim
-  ln -s readcd readom
-  ln -s mkisofs genisoimage
-  ln -s cdda2wav icedax
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/cdrtools-libre/cdrtools.install b/libre/cdrtools-libre/cdrtools.install
deleted file mode 100644
index 3f49eb1bb..000000000
--- a/libre/cdrtools-libre/cdrtools.install
+++ /dev/null
@@ -1,14 +0,0 @@
-
-post_install() {
-  echo "To allow other users than root execute rscsi add an entry"
-  echo "to /etc/default/rscsi or use an \"rscsi\" user"
-  echo ""
-  post_upgrade
-}
-
-post_upgrade() {
-  echo "The manual loading (or loading using rc.conf)"
-  echo "of the 'sg' module is no longer necessary."
-  echo "It is automatically loaded during boot by systemd-tools (udev 185)."
-}
-
diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD
index 821517397..5e988d060 100644
--- a/libre/h-client/PKGBUILD
+++ b/libre/h-client/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 
 pkgname=h-client
-_pkgver=0.0a0.dev-r118
+_pkgver=0.0a0.dev-r129
 pkgver=${_pkgver/-/.}
 pkgrel=1
 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')
-depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
+depends=('python2' 'python2-distribute' 'python2-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"{,.sig})
-sha512sums=('af962c67b363435cfa74f7c420760b0254ba3e7c1e6611d5ff276e6595e30dadf1b5d588cd2469647efdbb0099f70a027b9f65d8aeefc70ea712c9ef5d7cbace'
-            '7d4746297c4a0bd328b1e57f596e827b4a12d2f703d074f7e87ea0c9e3f747c2cfd48da971e81fdaf27939d463b359fac4638820f08486ef28502e769168692d')
+sha512sums=('e4f8f88db5cd27bb3304c1421bd661da9c52a15297d273cd6fa81ccfd0f1c9b210dc87373ecc6d414585c525a570c7f783d706fa67e247562fd8c7fa5e59a9e7'
+            '5712b41c4a4d45482e96825762955855212c3594b61624495e6ddec0b85a4718e080da1c99be22cb91aa644ee65d3708cc06b004f84b6facf2531b7b4c897c03')
 
 build() {
   cd "$srcdir/hclient-${_pkgver}"
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index c5a35a16c..785e3e077 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -77,7 +77,7 @@ source=(
 md5sums=(
   c88a29aa92fc41a07e777a0e63ac5f7e
   2a35cf0054d0459993e3c3bae3d9841d
-  383e8e2a97a8b13fe56d153adb6878b6
+  dfeb4ab2c96aae3356a4c347eee0b97b
   3009b176cc5f9b1e416b1bf7c45b064b
   fcd2d895a0335c1b5fb652401e9da0d5
   b41f82994fa056ffa5f8e6d99570e27a
@@ -137,20 +137,12 @@ build() {
   chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
 
   if $_pgo; then
-    export MOZ_PGO=1
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-    _fail=0
-
-    make -f client.mk build || _fail=1
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS
+    kill $! || true
   else
-    _fail=0
-
-    make -f client.mk build || _fail=1
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
   fi
-
-  kill $! || true
-  return $_fail
 }
 
 package() {
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index 2f4ebe32b..30464c38c 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
@@ -1,3 +1,5 @@
 
 # PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
+ac_add_options --enable-profile-guided-optimization
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index b78d365db..7152ca13c 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.6
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=7
+pkgrel=7.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -36,7 +36,7 @@ package_virtualbox-libre-host-modules(){
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-  depends=('linux-libre>=3.7' 'linux-libre<3.8')
+  depends=('linux-libre>=3.8' 'linux-libre<3.9')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
@@ -54,7 +54,7 @@ package_virtualbox-libre-guest-modules(){
 
   pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
-  depends=('linux-libre>=3.7' 'linux-libre<3.8')
+  depends=('linux-libre>=3.8' 'linux-libre<3.9')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
diff --git a/libre/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 f59454192..b7bd659a0 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
@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
 -64_firefox=Bookmarks Backups
 +64_self=Bookmarks Backups
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 687c8d8..203d8cf 100644
+index 96cedd3..a0f8a75 100644
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -39,7 +39,7 @@ toolkit.jar:
+@@ -42,7 +42,7 @@ toolkit.jar:
  +  content/global/mozilla.xhtml               (mozilla.xhtml)
     content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
     content/global/resetProfile.css            (resetProfile.css)
@@ -267,10 +267,10 @@ index f35c227..7062886 100644
  
  %{C++
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e3dd0df..ef7bb74 100644
+index 1045665..04bd1aa 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
+@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
          if (gDoProfileReset) {
            // Automatically migrate from the current application if we just
            // reset the profile.
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index c2847b2e8..66154fb0c 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=18.0.1
+_debver=19.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -15,7 +15,7 @@ _pkgname=xulrunner
 pkgname=xulrunner-libre
 pkgver=${_debver}.${_debrel}
 pkgrel=1
-pkgdesc="Mozilla Runtime Environment"
+pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2')
@@ -31,12 +31,12 @@ options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${_debver}")
 replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('5d481dd35a304702d1f311eeb3f1149f'
-         '6a4781e8ddc1b166f36930c4864e095f'
+md5sums=('b4c109e987f869f94220188a901d4425'
+         'e1d6920cb49c9de88b8e00eb14b1b0e7'
          '7f3317c25308a631ca31d8d280991bb4'
          '27271ce647a83906ef7a24605e840d61'
          '52e52f840a49eb1d14be1c0065b03a93'
-         '46a4b19b414065b99b870ea79b454f6e')
+         '2fde2f4bc158b217f3d71b33ef0bc626')
 
 build() {
   # WebRTC build tries to execute "python" and expects Python 2
@@ -45,9 +45,13 @@ build() {
   ln -s /usr/bin/python2 "$srcdir/python2-path/python"
   export PATH="$srcdir/python2-path:$PATH"
 
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
+  export PYTHON="/usr/bin/python2"
+
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
+
   mv mozilla-release "${_debname}-${_debver}"
   mv debian "${_debname}-${_debver}"
   cd "${_debname}-${_debver}"
@@ -73,9 +77,6 @@ build() {
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
   patch -Np1 -i "$srcdir/shared-libs.patch"
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
-  export PYTHON="/usr/bin/python2"
-
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }