[arch-commits] Commit in hplip/trunk (PKGBUILD hp-mkuri.patch)

[Andreas Radke]

    Date: Friday, April 12, 2013 @ 16:26:14
  Author: andyrtr
Revision: 182674

upgpkg: hplip 3.13.4-1

upstream update 3.13.4; fix linking libnotify FS#34283

Added:
  hplip/trunk/hp-mkuri.patch
Modified:
  hplip/trunk/PKGBUILD

----------------+
 PKGBUILD       |   17 +++++++++++------
 hp-mkuri.patch |   11 +++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-12 14:23:59 UTC (rev 182673)
+++ PKGBUILD	2013-04-12 14:26:14 UTC (rev 182674)
@@ -4,8 +4,8 @@
 # Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.13.3
-pkgrel=2
+pkgver=3.13.4
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -26,10 +26,12 @@
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-        cups-1.6-buildfix.diff)
-md5sums=('4a378cc08f7a4f131968c0966c1ceb8c'
-         'f37ad6d95a36d7547a2c60374fc4d1ec'
-         'ef64578c6cb3ce252dbdcb0f1c2f4a47')
+        cups-1.6-buildfix.diff
+        hp-mkuri.patch)
+md5sums=('e5c247161e2fd7685e0520e968393d19'
+         'SKIP'
+         'ef64578c6cb3ce252dbdcb0f1c2f4a47'
+         '0bd7779fdbc4d7a9386df04dce2cb8d4')
 
 build() {
  cd "$srcdir/$pkgname-$pkgver"
@@ -37,6 +39,9 @@
  # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
  patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
  
+ # fix linking libnotify, FS#34283
+ patch -Np0 -i ${srcdir}/hp-mkuri.patch
+ 
  export PYTHON=python2
  
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +

Added: hp-mkuri.patch
===================================================================
--- hp-mkuri.patch	                        (rev 0)
+++ hp-mkuri.patch	2013-04-12 14:26:14 UTC (rev 182674)
@@ -0,0 +1,11 @@
+--- io/hpmud/hp-mkuri.c.orig	2013-03-17 09:15:15.360624061 -0400
++++ io/hpmud/hp-mkuri.c	2013-03-17 09:15:30.924316847 -0400
+@@ -266,7 +266,7 @@
+ 
+     /* Bypass glib build dependencies by loading libnotify manually. */  
+ 
+-    if ((handle = load_library("libnotify.so.1")) == NULL)
++    if ((handle = load_library("libnotify.so.4")) == NULL)
+     {
+        BUG("failed to open libnotify: %m\n");
+        goto bugout;