diff options
-rw-r--r-- | x11/libunique/distinfo | 3 | ||||
-rw-r--r-- | x11/libunique/patches/patch-aa | 13 | ||||
-rw-r--r-- | x11/py-gnome2/Makefile | 7 | ||||
-rw-r--r-- | x11/py-sip/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h | 13 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_webkit_WebCore_WebCore.pro | 13 |
7 files changed, 52 insertions, 4 deletions
diff --git a/x11/libunique/distinfo b/x11/libunique/distinfo index 20380d01c79..ff5477ec144 100644 --- a/x11/libunique/distinfo +++ b/x11/libunique/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2009/11/20 11:32:38 drochner Exp $ +$NetBSD: distinfo,v 1.5 2011/09/14 17:56:08 hans Exp $ SHA1 (libunique-1.1.6.tar.gz) = ff9a50781291212d97df0d21ac4bbdbd8443d210 RMD160 (libunique-1.1.6.tar.gz) = 15ae8cc81f978554395fcb194ecb11c7bc6a1938 Size (libunique-1.1.6.tar.gz) = 450569 bytes +SHA1 (patch-aa) = 03304df00cc8a793c4937f32daa4cd0719d7e8c0 diff --git a/x11/libunique/patches/patch-aa b/x11/libunique/patches/patch-aa new file mode 100644 index 00000000000..dd24561087a --- /dev/null +++ b/x11/libunique/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2011/09/14 17:56:08 hans Exp $ + +--- unique/bacon/uniquebackend-bacon.c.orig 2009-09-21 14:31:14.000000000 +0200 ++++ unique/bacon/uniquebackend-bacon.c 2011-08-05 17:34:20.504049255 +0200 +@@ -186,7 +186,7 @@ find_socket_file (const gchar *name) + + g_free (basename); + +- basename = g_strdup_printf ("%s.%s.%d", name, token, getpid ()); ++ basename = g_strdup_printf ("%s.%s.%ld", name, token, (long)getpid ()); + + path = g_build_filename (tmpdir, basename, NULL); + diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index 80c0d972c05..399ca0d46f5 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2011/07/21 13:06:07 obache Exp $ +# $NetBSD: Makefile,v 1.76 2011/09/14 17:56:42 hans Exp $ # DISTNAME= gnome-python-2.28.1 @@ -21,6 +21,11 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= pkg-config gmake +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "SunOS" +BUILDLINK_TRANSFORM+= rm:-std=c9x +.endif + PYTHON_VERSIONS_ACCEPTED= 27 26 25 .include "../../lang/python/extension.mk" diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile index 64d693f398c..49ccf36733e 100644 --- a/x11/py-sip/Makefile +++ b/x11/py-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2011/09/12 18:17:30 drochner Exp $ +# $NetBSD: Makefile,v 1.25 2011/09/14 17:57:12 hans Exp $ DISTNAME= sip-4.12.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -41,6 +41,7 @@ CONFIGURE_ARGS+= LFLAGS_PLUGIN="-bundle -flat_namespace -undefined suppress" CONFIGURE_ARGS+= CFLAGS_SHLIB=-fPIC CONFIGURE_ARGS+= CXXFLAGS_SHLIB=-fPIC . if ${OPSYS} == "SunOS" && !empty(CC_VERSION:Mgcc*) +CONFIGURE_ARGS+= -p solaris-g++ # gcc3 uses -mimpure-text to not pass -assert pure-text to the linker CONFIGURE_ARGS+= LFLAGS_SHLIB="-shared -mimpure-text" . else diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index f20368f04d1..764e4b6c5ea 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.61 2011/09/04 15:42:51 adam Exp $ +$NetBSD: distinfo,v 1.62 2011/09/14 17:58:32 hans Exp $ SHA1 (qt-everywhere-opensource-src-4.7.4.tar.gz) = ac7b4df34adaa6e9d1fb41743d1f15f5aac481db RMD160 (qt-everywhere-opensource-src-4.7.4.tar.gz) = 347ba2c4f855b40bf3ce90adb19c1a87925e6c61 @@ -46,5 +46,7 @@ SHA1 (patch-cg) = c5948cea47fb4134c626415b0b2c36660beea64a SHA1 (patch-ch) = 8efaa05e564022710ff978b59581c017bbece979 SHA1 (patch-ci) = a2ac5703503afcdb2a87f80a8ba373c8ff7a2697 SHA1 (patch-cj) = 49fd8ae10c5fc026101355596b91fcf3e1701b9d +SHA1 (patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h) = f619b189991c3b29033970320dbf5a0ec564248a +SHA1 (patch-src_3rdparty_webkit_WebCore_WebCore.pro) = 41fbce9872c2d6b4977772d88391b1194ec37b2e SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 87c48f97ba2026f4bb553aa0b855bc1b1f653abf SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = e05f420bd532a8964d293e4bad848636dc716d0f diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h new file mode 100644 index 00000000000..90c8bd36994 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_MathExtras.h,v 1.1 2011/09/14 17:58:32 hans Exp $ + +--- src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h.orig 2010-11-06 02:55:19.000000000 +0100 ++++ src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h 2011-01-16 11:57:37.742721037 +0100 +@@ -190,7 +190,7 @@ inline float deg2turn(float d) { return + inline float rad2grad(float r) { return r * 200.0f / piFloat; } + inline float grad2rad(float g) { return g * piFloat / 200.0f; } + +-#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW) ++#if !COMPILER(MSVC) && !COMPILER(WINSCW) && !(COMPILER(RVCT) && (OS(SYMBIAN) || PLATFORM(BREWMP))) && !OS(SOLARIS) + using std::isfinite; + using std::isinf; + using std::isnan; diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_WebCore_WebCore.pro b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_WebCore_WebCore.pro new file mode 100644 index 00000000000..77c219609ec --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_WebCore_WebCore.pro @@ -0,0 +1,13 @@ +$NetBSD: patch-src_3rdparty_webkit_WebCore_WebCore.pro,v 1.1 2011/09/14 17:58:32 hans Exp $ + +--- src/3rdparty/webkit/WebCore/WebCore.pro.orig 2010-11-06 02:55:21.000000000 +0100 ++++ src/3rdparty/webkit/WebCore/WebCore.pro 2011-01-15 17:31:40.334667952 +0100 +@@ -90,7 +90,7 @@ unix { + } + + unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections ++unix:!mac:!solaris-*:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections + linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF + + CONFIG(release):!CONFIG(standalone_package) { |