diff options
| author | hasso <hasso> | 2009-07-08 05:41:29 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2009-07-08 05:41:29 +0000 |
| commit | e330e830b276ed561033a570714dc17c3bba3cae (patch) | |
| tree | 60ff13fd00d85c73554bfff5e48741b78972f4c9 /x11/py-qt4 | |
| parent | 882474901d36bf26a38accdbae43e0dad8ab75ae (diff) | |
| download | pkgsrc-e330e830b276ed561033a570714dc17c3bba3cae.tar.gz | |
Make it build with Qt 4.5.2 - ActiveQt seems (no changelog entry or smth)
to be under open source license now.
Diffstat (limited to 'x11/py-qt4')
| -rw-r--r-- | x11/py-qt4/distinfo | 4 | ||||
| -rw-r--r-- | x11/py-qt4/patches/patch-aa | 24 |
2 files changed, 22 insertions, 6 deletions
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo index 52d4cd99477..04c5d4d001d 100644 --- a/x11/py-qt4/distinfo +++ b/x11/py-qt4/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2009/06/17 07:57:49 hasso Exp $ +$NetBSD: distinfo,v 1.4 2009/07/08 05:41:29 hasso Exp $ SHA1 (PyQt-x11-gpl-4.5.1.tar.gz) = b50b58c3e6f9a15e0986fe63d978eb85db363a46 RMD160 (PyQt-x11-gpl-4.5.1.tar.gz) = ef0ace225b66d21aa83106364850cfa960e67705 Size (PyQt-x11-gpl-4.5.1.tar.gz) = 6942490 bytes -SHA1 (patch-aa) = 9ba0e372d817bda27282da3632db71869cf2a6d6 +SHA1 (patch-aa) = 04a94719d57043b9d729a8dc536fcee16acbbb94 diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa index c541dad7d24..db8ca416bbc 100644 --- a/x11/py-qt4/patches/patch-aa +++ b/x11/py-qt4/patches/patch-aa @@ -1,11 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/12/13 05:19:12 epg Exp $ +$NetBSD: patch-aa,v 1.2 2009/07/08 05:41:30 hasso Exp $ Force shared libraries, from http://cvs.fedora.redhat.com/viewvc/devel/PyQt4/PyQt-x11-gpl-4.4.4-QT_SHARED.patch?revision=1.1&view=markup&pathrev=HEAD ---- configure.py.orig 2008-11-08 03:55:49.000000000 -0800 -+++ configure.py -@@ -1584,11 +1584,7 @@ int main(int, char **) +ActiveQt seems to be under open source license starting from 4.5.2. + +--- configure.py.orig 2009-06-16 11:37:38 +0300 ++++ configure.py 2009-06-26 10:10:30 +0300 +@@ -1675,11 +1675,7 @@ int main(int, char **) out << QT_VERSION << '\\n'; out << QT_EDITION << '\\n'; @@ -17,3 +19,17 @@ http://cvs.fedora.redhat.com/viewvc/devel/PyQt4/PyQt-x11-gpl-4.4.4-QT_SHARED.pat // Determine which features should be disabled. +@@ -1786,10 +1782,10 @@ int main(int, char **) + + # Now convert the edition to a descriptive string. The order of testing is + # important. +- if qt_edition & 0x200: ++ # if qt_edition & 0x200: + # It has ActiveQt. +- qt_edition = "Desktop" +- elif qt_edition & 0x008: ++ # qt_edition = "Desktop" ++ if qt_edition & 0x008: + # It has OpenGL. + qt_edition = "free" + elif qt_edition & 0x002: |