diff options
| author | hans <hans> | 2012-02-16 19:59:53 +0000 |
|---|---|---|
| committer | hans <hans> | 2012-02-16 19:59:53 +0000 |
| commit | 7c3f266bb4109091e4e5710cc583c6bbb4d588f0 (patch) | |
| tree | 6492bf74f485f36c0753964bb5308e029d1ab0fd /x11 | |
| parent | 6c2f479852aa6039e42e12cf9727715847273109 (diff) | |
| download | pkgsrc-7c3f266bb4109091e4e5710cc583c6bbb4d588f0.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XaoS/Makefile | 4 | ||||
| -rw-r--r-- | x11/py-qt4/distinfo | 4 | ||||
| -rw-r--r-- | x11/py-qt4/patches/patch-aa | 19 |
3 files changed, 19 insertions, 8 deletions
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile index 8c134f31a1c..0dfd8111a7d 100644 --- a/x11/XaoS/Makefile +++ b/x11/XaoS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2011/04/22 13:45:15 obache Exp $ +# $NetBSD: Makefile,v 1.31 2012/02/16 20:09:00 hans Exp $ # DISTNAME= XaoS-3.4 @@ -32,6 +32,8 @@ INSTALLATION_DIRS= ${PKGINFODIR} CHECK_PORTABILITY_SKIP+= help/applehelpconv BUILDLINK_DEPMETHOD.libXt?= build +LDFLAGS.SunOS+= -liconv + .include "../../math/gsl/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo index 4cb69d0506d..162e6d84563 100644 --- a/x11/py-qt4/distinfo +++ b/x11/py-qt4/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.22 2012/01/17 19:04:46 drochner Exp $ +$NetBSD: distinfo,v 1.23 2012/02/16 20:12:12 hans Exp $ SHA1 (PyQt-x11-gpl-4.9.tar.gz) = 0bd0b39abbc117e812863f37a63b7364904e754a RMD160 (PyQt-x11-gpl-4.9.tar.gz) = b21bf092e46b6f7d1bfa87ca89f26be3547d8dad Size (PyQt-x11-gpl-4.9.tar.gz) = 9741275 bytes -SHA1 (patch-aa) = 2313842ad3dd2650bc89d06e88b5cd75e5affdbd +SHA1 (patch-aa) = 519c32dc5924e399ad1616c400993fa4847f614e diff --git a/x11/py-qt4/patches/patch-aa b/x11/py-qt4/patches/patch-aa index 8c4951bdd88..6b9166ffdd0 100644 --- a/x11/py-qt4/patches/patch-aa +++ b/x11/py-qt4/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.4 2010/09/02 09:20:19 drochner Exp $ +$NetBSD: patch-aa,v 1.5 2012/02/16 20:12:12 hans Exp $ ---- configure.py.orig 2010-08-31 08:28:48.000000000 +0000 -+++ configure.py -@@ -365,8 +365,8 @@ class ConfigurePyQt4: +--- configure.py.orig 2011-08-02 11:18:51.000000000 +0200 ++++ configure.py 2011-10-11 16:36:11.233813486 +0200 +@@ -355,7 +355,7 @@ class ConfigurePyQt4: + pyqt_modules.append("QtCore") + + check_module("QtGui", "qwidget.h", "new QWidget()") +- check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") ++ check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"]) + check_module("QtMultimedia", "QAudioDeviceInfo", + "new QAudioDeviceInfo()") + check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()") +@@ -372,8 +372,8 @@ class ConfigurePyQt4: check_module("QtWebKit", "qwebpage.h", "new QWebPage()") check_module("QtXml", "qdom.h", "new QDomDocument()") check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") @@ -13,7 +22,7 @@ $NetBSD: patch-aa,v 1.4 2010/09/02 09:20:19 drochner Exp $ check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, extra_libs=ass_libs) -@@ -1855,11 +1855,7 @@ int main(int, char **) +@@ -1981,11 +1981,7 @@ int main(int, char **) out << QLibraryInfo::licensee() << '\\n'; |