diff options
| author | markd <markd@pkgsrc.org> | 2018-01-17 19:39:57 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2018-01-17 19:39:57 +0000 |
| commit | f126f5943a831f196796797cf1feda8d50152380 (patch) | |
| tree | 0227c69e6b92c94f9bd6fade7c78a3c19094c99c /x11/py-qt5/patches | |
| parent | 45aef69ceb65d99c353c9bbda681ce3b6d433092 (diff) | |
| download | pkgsrc-f126f5943a831f196796797cf1feda8d50152380.tar.gz | |
py-qt5: update to 5.9.1
Diffstat (limited to 'x11/py-qt5/patches')
| -rw-r--r-- | x11/py-qt5/patches/patch-configure.py | 50 | ||||
| -rw-r--r-- | x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in | 6 |
2 files changed, 3 insertions, 53 deletions
diff --git a/x11/py-qt5/patches/patch-configure.py b/x11/py-qt5/patches/patch-configure.py deleted file mode 100644 index 8728fd4a0ef..00000000000 --- a/x11/py-qt5/patches/patch-configure.py +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-configure.py,v 1.4 2016/04/23 07:38:38 wiz Exp $ - -On Darwin, do not expect application bundle. -Adapt for pkgsrc change to make qmake create libtool files. - ---- configure.py.orig 2015-10-25 11:42:16.000000000 +0000 -+++ configure.py -@@ -1932,10 +1932,7 @@ def run_make(target_config, verbose, exe - make = 'make' - makefile_target = '' - -- if target_config.py_platform == 'darwin': -- platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe) -- else: -- platform_exe = os.path.join('.', exe) -+ platform_exe = os.path.join('.', exe) - - remove_file(platform_exe) - -@@ -2441,8 +2438,10 @@ win32 { - target.files = %s%s.pyd - LIBS += %s - } else { -- PY_MODULE = %s.so -- target.files = %s.so -+ PY_MODULE = %s.la -+ target.files = %s.la -+ LIBS += -Wl,-rpath,@X11LIB@ -+ LIBS += -Wl,-rpath,@PREFIX@/lib/pulseaudio - } - ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name) - -@@ -2517,9 +2514,6 @@ win32 { - # common case where the PyQt configuration reflects the Qt - # configuration. - fwks = [] -- for m in ('QtPrintSupport', 'QtDBus', 'QtWidgets'): -- if m in target_config.pyqt_modules: -- fwks.append('-framework ' + m) - - if len(fwks) != 0: - extra_lflags = 'QMAKE_LFLAGS += "%s"\n ' % ' '.join(fwks) -@@ -2532,7 +2526,6 @@ win32 { - } - macx { - QMAKE_LFLAGS += "-undefined dynamic_lookup" -- QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)" - - greaterThan(QT_MINOR_VERSION, 4) { - %sQMAKE_RPATHDIR += $$[QT_INSTALL_LIBS] diff --git a/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in b/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in index 1d14d80ceae..d021d0af269 100644 --- a/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in +++ b/x11/py-qt5/patches/patch-qmlscene_qmlscene.pro-in @@ -1,14 +1,14 @@ -$NetBSD: patch-qmlscene_qmlscene.pro-in,v 1.1 2016/04/23 07:38:38 wiz Exp $ +$NetBSD: patch-qmlscene_qmlscene.pro-in,v 1.2 2018/01/17 19:39:57 markd Exp $ Add rpath to X11 libraries. ---- qmlscene/qmlscene.pro-in.orig 2014-12-25 10:18:22.000000000 +0000 +--- qmlscene/qmlscene.pro-in.orig 2017-03-07 08:52:16.000000000 +0000 +++ qmlscene/qmlscene.pro-in @@ -9,6 +9,7 @@ TEMPLATE = lib INCLUDEPATH += @PYINCDIR@ @SIPINCDIR@ LIBS += @PYLINK@ +LIBS += -Wl,-rpath,@X11LIB@ + DEFINES += PYTHON_LIB=\\\"@PYSHLIB@\\\" SOURCES = pluginloader.cpp - HEADERS = pluginloader.h |