Sat Jun 4 12:06:07 2016 UTC ()
Fix rpath entries.


(joerg)
diff -r1.65 -r1.66 pkgsrc/misc/calibre/distinfo
diff -r1.6 -r1.7 pkgsrc/misc/calibre/patches/patch-setup_extensions.py
cvs diff -r1.65 -r1.66 pkgsrc/misc/calibre/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/calibre/distinfo 2016/05/21 06:37:00 1.65
+++ pkgsrc/misc/calibre/distinfo 2016/06/04 12:06:07 1.66
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.65 2016/05/21 06:37:00 wiz Exp $ 1$NetBSD: distinfo,v 1.66 2016/06/04 12:06:07 joerg Exp $
2 2
3SHA1 (calibre-2.57.1.tar.xz) = 25ac0fcc480c2416f70e3231192642df78f36792 3SHA1 (calibre-2.57.1.tar.xz) = 25ac0fcc480c2416f70e3231192642df78f36792
4RMD160 (calibre-2.57.1.tar.xz) = e762ea9889e12ab30ecfe036d9613f7e2c7cdcff 4RMD160 (calibre-2.57.1.tar.xz) = e762ea9889e12ab30ecfe036d9613f7e2c7cdcff
5SHA512 (calibre-2.57.1.tar.xz) = 482dec810d0ca2220a7c2b291750aefd3133c9969a0237841283995ee5c07bda0e6fa2a266a7fd876be283dcfb71d5bb8aca6c9270e7f6772ab40cc0cb410ca0 5SHA512 (calibre-2.57.1.tar.xz) = 482dec810d0ca2220a7c2b291750aefd3133c9969a0237841283995ee5c07bda0e6fa2a266a7fd876be283dcfb71d5bb8aca6c9270e7f6772ab40cc0cb410ca0
6Size (calibre-2.57.1.tar.xz) = 40495212 bytes 6Size (calibre-2.57.1.tar.xz) = 40495212 bytes
7SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c 7SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
8SHA1 (patch-setup_extensions.py) = 698abb3609a3f576ae1d194422d10ffaa698e3db 8SHA1 (patch-setup_extensions.py) = 18edee06e64294ba87a60aafa3e34dfa6f09cd94
9SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662 9SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
cvs diff -r1.6 -r1.7 pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py (expand / switch to unified diff)

--- pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py 2015/12/30 00:08:33 1.6
+++ pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py 2016/06/04 12:06:07 1.7
@@ -1,15 +1,32 @@ @@ -1,15 +1,32 @@
1$NetBSD: patch-setup_extensions.py,v 1.6 2015/12/30 00:08:33 wiz Exp $ 1$NetBSD: patch-setup_extensions.py,v 1.7 2016/06/04 12:06:07 joerg Exp $
2 2
3Fix build for pictureflow. 3Fix build for pictureflow.
4 4
5--- setup/extensions.py.orig 2015-12-21 03:57:33.000000000 +0000 5--- setup/extensions.py.orig 2016-02-26 03:04:36.000000000 +0000
6+++ setup/extensions.py 6+++ setup/extensions.py
7@@ -636,7 +636,7 @@ class Build(Command): 7@@ -549,6 +549,7 @@ class Build(Command):
 8 INCLUDEPATH += {freetype}
 9 DESTDIR = {destdir}
 10 CONFIG -= create_cmake # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
 11+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
 12 QMAKE_LIBS_PRIVATE += {glib} {fontconfig}
 13 ''').format(
 14 headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
 15@@ -603,6 +604,8 @@ class Build(Command):
 16 SOURCES = {sources}
 17 INCLUDEPATH += {sipinc} {pyinc}
 18 VERSION = {ver}
 19+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
 20+
 21 win32 {{
 22 LIBS += {py_lib}
 23 TARGET_EXT = .dll
 24@@ -633,7 +636,7 @@ class Build(Command):
8 if iswindows: 25 if iswindows:
9 qmc += ['-spec', qmakespec] 26 qmc += ['-spec', qmakespec]
10 fext = 'dll' if iswindows else 'dylib' if isosx else 'so' 27 fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
11- name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext) 28- name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
12+ name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext) 29+ name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)
13 try: 30 try:
14 os.chdir(src_dir) 31 os.chdir(src_dir)
15 if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers): 32 if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers):