[pkgsrc/trunk]: pkgsrc/sysutils/k3b Allow newer versions of libraries to be f...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/81564b4da470
branches:  trunk
changeset: 626378:81564b4da470
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Nov 09 22:20:36 2013 +0000

description:
Allow newer versions of libraries to be found.
Also fix problem where by k3b wont rip the first track when it is not
alphabetically the first track to be ripped.
Fixes PR pkg/48369 and pkg/48371.  Bump PKGREVISION

diffstat:

 sysutils/k3b/Makefile                                        |   4 +-
 sysutils/k3b/distinfo                                        |   3 +-
 sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp |  54 ++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)

diffs (87 lines):

diff -r 5ea3cc47403b -r 81564b4da470 sysutils/k3b/Makefile
--- a/sysutils/k3b/Makefile     Sat Nov 09 22:17:45 2013 +0000
+++ b/sysutils/k3b/Makefile     Sat Nov 09 22:20:36 2013 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2013/10/17 07:56:42 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2013/11/09 22:20:36 markd Exp $
 #
 
 DISTNAME=              k3b-2.0.2
-PKGREVISION=           21
+PKGREVISION=           22
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 5ea3cc47403b -r 81564b4da470 sysutils/k3b/distinfo
--- a/sysutils/k3b/distinfo     Sat Nov 09 22:17:45 2013 +0000
+++ b/sysutils/k3b/distinfo     Sat Nov 09 22:20:36 2013 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.20 2012/11/11 18:32:23 markd Exp $
+$NetBSD: distinfo,v 1.21 2013/11/09 22:20:36 markd Exp $
 
 SHA1 (k3b-2.0.2.tar.bz2) = 8b30a4d07942e82559b01bc07dea6bcf2defd532
 RMD160 (k3b-2.0.2.tar.bz2) = a0289eb9ccec9607c2bdac3fc7c69102eec5ee40
 Size (k3b-2.0.2.tar.bz2) = 12833321 bytes
 SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 124d5ba1a3384d012a8b471f55fd624ffe9df5d4
+SHA1 (patch-libk3b_tools_k3bcdparanoialib.cpp) = a7033c2697abea2d3f7acb2af14a90016483ba2f
 SHA1 (patch-libk3bdevice_k3bdevice.cpp) = 8533f0c08551ef9b8429792f607a52675f79e419
 SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = fe07915854808758ab9d989d11b61fdc3b4b95bd
 SHA1 (patch-libk3bdevice_k3bscsicommand_netbsd.cpp) = f2326f21219178443535fc4a80b8bdd46479b1ad
diff -r 5ea3cc47403b -r 81564b4da470 sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp      Sat Nov 09 22:20:36 2013 +0000
@@ -0,0 +1,54 @@
+$NetBSD: patch-libk3b_tools_k3bcdparanoialib.cpp,v 1.1 2013/11/09 22:20:36 markd Exp $
+
+Allow newer versions of libraries to be found.
+Also fix problem where by k3b wont rip the first track when it is not
+alphabetically the first track to be ripped.
+
+--- libk3b/tools/k3bcdparanoialib.cpp.orig     2011-01-15 20:47:29.000000000 +0000
++++ libk3b/tools/k3bcdparanoialib.cpp
+@@ -69,7 +69,7 @@ typedef short int int16_t;
+ #define LIBCDIO_PARANOIA "cdio_paranoia.dll"
+ #else
+ #define LIBCDIO_CDDA "libcdio_cdda.so"
+-#define LIBCDIO_PARANOIA "libcdio_paranoia.so.0"
++#define LIBCDIO_PARANOIA "libcdio_paranoia.so"
+ #endif
+ 
+ static bool s_haveLibCdio = false;
+@@ -532,11 +532,11 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::
+     if( s_libInterface == 0 ) {
+         s_haveLibCdio = false;
+ #ifndef Q_OS_WIN32
+-        s_libInterface = dlopen( "libcdda_interface.so.0", RTLD_NOW|RTLD_GLOBAL );
++        s_libInterface = dlopen( "libcdda_interface.so", RTLD_NOW|RTLD_GLOBAL );
+ 
+         // try the redhat & Co. location
+         if( s_libInterface == 0 )
+-            s_libInterface = dlopen( "cdda/libcdda_interface.so.0", RTLD_NOW|RTLD_GLOBAL );
++            s_libInterface = dlopen( "cdda/libcdda_interface.so", RTLD_NOW|RTLD_GLOBAL );
+ #endif
+         // try the new cdio lib
+         if( s_libInterface == 0 ) {
+@@ -550,11 +550,11 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::
+         }
+ 
+ #ifndef Q_OS_WIN32
+-        s_libParanoia = dlopen( "libcdda_paranoia.so.0", RTLD_NOW );
++        s_libParanoia = dlopen( "libcdda_paranoia.so", RTLD_NOW );
+ 
+         // try the redhat & Co. location
+         if( s_libParanoia == 0 )
+-            s_libParanoia = dlopen( "cdda/libcdda_paranoia.so.0", RTLD_NOW );
++            s_libParanoia = dlopen( "cdda/libcdda_paranoia.so", RTLD_NOW );
+ #endif
+         // try the new cdio lib
+         if( s_haveLibCdio && s_libParanoia == 0 )
+@@ -736,7 +736,7 @@ char* K3b::CdparanoiaLib::read( int* sta
+ 
+     if( d->currentSector != d->data->sector() ) {
+         kDebug() << "(K3b::CdparanoiaLib) need to seek before read. Looks as if we are reusing the paranoia instance.";
+-        if( !d->data->paranoiaSeek( d->currentSector, SEEK_SET ) )
++        if( d->data->paranoiaSeek( d->currentSector, SEEK_SET ) == -1 )
+             return 0;
+     }
+