[pkgsrc/trunk]: pkgsrc/misc/calibre Fix rpath entries.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be692afe9772
branches:  trunk
changeset: 347942:be692afe9772
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jun 04 12:06:07 2016 +0000

description:
Fix rpath entries.

diffstat:

 misc/calibre/distinfo                          |   4 ++--
 misc/calibre/patches/patch-setup_extensions.py |  23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 8f8dd7ecf33e -r be692afe9772 misc/calibre/distinfo
--- a/misc/calibre/distinfo     Sat Jun 04 07:59:56 2016 +0000
+++ b/misc/calibre/distinfo     Sat Jun 04 12:06:07 2016 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.65 2016/05/21 06:37:00 wiz Exp $
+$NetBSD: distinfo,v 1.66 2016/06/04 12:06:07 joerg Exp $
 
 SHA1 (calibre-2.57.1.tar.xz) = 25ac0fcc480c2416f70e3231192642df78f36792
 RMD160 (calibre-2.57.1.tar.xz) = e762ea9889e12ab30ecfe036d9613f7e2c7cdcff
 SHA512 (calibre-2.57.1.tar.xz) = 482dec810d0ca2220a7c2b291750aefd3133c9969a0237841283995ee5c07bda0e6fa2a266a7fd876be283dcfb71d5bb8aca6c9270e7f6772ab40cc0cb410ca0
 Size (calibre-2.57.1.tar.xz) = 40495212 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
-SHA1 (patch-setup_extensions.py) = 698abb3609a3f576ae1d194422d10ffaa698e3db
+SHA1 (patch-setup_extensions.py) = 18edee06e64294ba87a60aafa3e34dfa6f09cd94
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
diff -r 8f8dd7ecf33e -r be692afe9772 misc/calibre/patches/patch-setup_extensions.py
--- a/misc/calibre/patches/patch-setup_extensions.py    Sat Jun 04 07:59:56 2016 +0000
+++ b/misc/calibre/patches/patch-setup_extensions.py    Sat Jun 04 12:06:07 2016 +0000
@@ -1,10 +1,27 @@
-$NetBSD: patch-setup_extensions.py,v 1.6 2015/12/30 00:08:33 wiz Exp $
+$NetBSD: patch-setup_extensions.py,v 1.7 2016/06/04 12:06:07 joerg Exp $
 
 Fix build for pictureflow.
 
---- setup/extensions.py.orig   2015-12-21 03:57:33.000000000 +0000
+--- setup/extensions.py.orig   2016-02-26 03:04:36.000000000 +0000
 +++ setup/extensions.py
-@@ -636,7 +636,7 @@ class Build(Command):
+@@ -549,6 +549,7 @@ class Build(Command):
+             INCLUDEPATH += {freetype}
+             DESTDIR = {destdir}
+             CONFIG -= create_cmake  # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
++            QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
+             QMAKE_LIBS_PRIVATE += {glib} {fontconfig}
+             ''').format(
+                 headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
+@@ -603,6 +604,8 @@ class Build(Command):
+         SOURCES = {sources}
+         INCLUDEPATH += {sipinc} {pyinc}
+         VERSION = {ver}
++        QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
++
+         win32 {{
+             LIBS += {py_lib}
+             TARGET_EXT = .dll
+@@ -633,7 +636,7 @@ class Build(Command):
          if iswindows:
              qmc += ['-spec', qmakespec]
          fext = 'dll' if iswindows else 'dylib' if isosx else 'so'