diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2019-01-29 14:16:59 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2019-01-29 14:16:59 +0000 |
| commit | a61d22e33a7e8d5d0869e6c018e76e9ad3a21f81 (patch) | |
| tree | afd9d910f421a8607f58c0a9a4171cc7824d2c59 | |
| parent | 99d25560c86ecd8cc7e36627c59686c3cf3b688d (diff) | |
| download | pkgsrc-a61d22e33a7e8d5d0869e6c018e76e9ad3a21f81.tar.gz | |
Pullup ticket #5902 - requested by markd
x11/qt5-qtxmlpatterns: build fix
Revisions pulled up:
- x11/qt5-qtxmlpatterns/distinfo 1.9
- x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro 1.1
---
Module Name: pkgsrc
Committed By: markd
Date: Sun Jan 6 10:21:12 UTC 2019
Modified Files:
pkgsrc/x11/qt5-qtxmlpatterns: distinfo
Added Files:
pkgsrc/x11/qt5-qtxmlpatterns/patches: patch-src_imports_imports.pro
Log Message:
qt5-qtxmlpatterns: never try to build xmllistmodel
depends on qml module from qt5-qtdeclarative which would be a cyclic
dependency
| -rw-r--r-- | x11/qt5-qtxmlpatterns/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/x11/qt5-qtxmlpatterns/distinfo b/x11/qt5-qtxmlpatterns/distinfo index c4a6e82bb6d..cbe15dbdd63 100644 --- a/x11/qt5-qtxmlpatterns/distinfo +++ b/x11/qt5-qtxmlpatterns/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2018/12/18 09:57:20 adam Exp $ +$NetBSD: distinfo,v 1.8.2.1 2019/01/29 14:16:59 bsiegert Exp $ SHA1 (qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = e8aef630f34c93b9a169f7ea4f10a92b531bed60 RMD160 (qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = 9b29676bec7f53cf3146b098967e89eff8eeb666 SHA512 (qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = 9e9fe5d99957a0079eada985d8b9837cee27c0025851d00024951bb12cf23d0fb2483cbf3a39cb4c5a23b9d453e42d667b0434e73d87447d9b4e84a9dca37ece Size (qtxmlpatterns-everywhere-src-5.12.0.tar.xz) = 1389248 bytes +SHA1 (patch-src_imports_imports.pro) = 6bcac62bbfe46fc3e245b2cda5b9bbd172eac6cd diff --git a/x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro b/x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro new file mode 100644 index 00000000000..af3f1522ed0 --- /dev/null +++ b/x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro @@ -0,0 +1,11 @@ +$NetBSD: patch-src_imports_imports.pro,v 1.1.2.2 2019/01/29 14:16:59 bsiegert Exp $ + +Don't try to detect qml module. Would be cyclic dependency. + +--- src/imports/imports.pro.orig 2018-11-02 15:13:28.000000000 +0000 ++++ src/imports/imports.pro +@@ -1,3 +1,3 @@ + TEMPLATE = subdirs + +-qtHaveModule(qml): SUBDIRS += xmllistmodel ++#qtHaveModule(qml): SUBDIRS += xmllistmodel |