[pkgsrc/pkgsrc-2018Q4]: pkgsrc/x11/qt5-qtxmlpatterns Pullup ticket #5902 - re...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf25925c368e
branches:  pkgsrc-2018Q4
changeset: 334061:cf25925c368e
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Tue Jan 29 14:16:59 2019 +0000

description:
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

diffstat:

 x11/qt5-qtxmlpatterns/distinfo                              |   3 ++-
 x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro |  11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r a0fb0400df29 -r cf25925c368e x11/qt5-qtxmlpatterns/distinfo
--- a/x11/qt5-qtxmlpatterns/distinfo    Tue Jan 29 14:01:28 2019 +0000
+++ b/x11/qt5-qtxmlpatterns/distinfo    Tue Jan 29 14:16:59 2019 +0000
@@ -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 -r a0fb0400df29 -r cf25925c368e x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtxmlpatterns/patches/patch-src_imports_imports.pro       Tue Jan 29 14:16:59 2019 +0000
@@ -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