Mon Jul 29 01:31:45 PDT 2013

4 files changed, 30 insertions, 15 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 1b030ecd5..af128c250 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94300 2013-07-19 10:21:35Z jelle $
+# $Id: PKGBUILD 94576 2013-07-27 12:09:03Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.40
+pkgver=0.9.41
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('f63b0e5697c5e997ecaaeaa82a14cd60'
+md5sums=('2037b44c90a66e97823a637edfa194ca'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 prepare(){
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 56d994beb..2221fb7fe 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043"
 pkgname=grub
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
 pkgver=2.00.${_GRUB_BZR_REV}
-pkgrel=2
+pkgrel=3
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
 license=('GPL3')
@@ -40,19 +40,20 @@ optdepends=('freetype2: For grub-mkfont usage'
 source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}"
         'parabola_grub_mkconfig_fixes.patch'
         '60_memtest86+'
-        'grub.default')
+        'grub.default'
+        'grub-2.00-mkinitcpio-0.15.patch')
+md5sums=('SKIP'
+         'b3068b52b6f1dcd2850b5c7585bb185f'
+         'be55eabc102f2c60b38ed35c203686d6'
+         '52d374e0194e3f2e39ff7c92ecd58a6c'
+         'd25d2dcf8ba708dcf768fcaea799f59c'
+         'SKIP'
+         'SKIP')
 
 for _DIR_ in 915resolution ntldr-img ; do
 	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
 done
 
-# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
-sha1sums=('SKIP'
-          '513172d91d1a2e2cda7c0a744c766d5868cb28bf'
-          '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
-          '06b926320cb2add6c157d59d46e553b89dd3aa03'
-          'SKIP'
-          'SKIP')
 
 _build_grub-common_and_bios() {
 	
@@ -173,6 +174,9 @@ prepare() {
 	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
 	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
 	echo
+
+	## fix 10_linux
+	patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
 	
 	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
 	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
new file mode 100644
index 000000000..1af848fa3
--- /dev/null
+++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
@@ -0,0 +1,11 @@
+--- util/grub.d/10_linux.in.old	2013-07-28 08:55:47.825946239 +0200
++++ util/grub.d/10_linux.in	2013-07-28 08:56:14.082201512 +0200
+@@ -138,7 +138,7 @@
+   message="$(gettext_printf "Loading Linux %s ..." "${version}")"
+   sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
+-	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
+ EOF
+   if test -n "${initrd}" ; then
+     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index d70fde92d..13f61ecec 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188976 2013-06-27 14:29:36Z andyrtr $
+# $Id: PKGBUILD 191569 2013-07-25 20:33:03Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,7 +6,7 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.6
+pkgver=3.13.7
 pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
@@ -31,7 +31,7 @@ options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
         hp-mkuri.patch)
-md5sums=('3dd5052864052b8cd4ce013bb71f4d6c'
+md5sums=('e834c8dd270f441c963f5d883d2d48f3'
          'SKIP'
          '0bd7779fdbc4d7a9386df04dce2cb8d4')