summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authorwiz <wiz>2009-09-29 06:39:29 +0000
committerwiz <wiz>2009-09-29 06:39:29 +0000
commit78f8471b9161c4e8382c11da0941fb0991c1ef2c (patch)
tree46e04b965d073b5c2db19e4e991cb5a6dff6464d /x11/qt4-libs
parentcad597608ef35c95c5e45d6dbfe06cc38152fc26 (diff)
downloadpkgsrc-78f8471b9161c4e8382c11da0941fb0991c1ef2c.tar.gz
Give unsigned char argument to toupper.
Fixes coredumps in Sigil when pressing "CTRL" or "BACKSPACE". Bump PKGREVISION.
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/Makefile4
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-at13
3 files changed, 17 insertions, 3 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index ea1d0899e3c..c06aa04293e 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2009/08/26 19:56:38 sno Exp $
+# $NetBSD: Makefile,v 1.33 2009/09/29 06:39:29 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 1c18e0f0027..ef9ea72d3f4 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2009/07/24 10:56:46 drochner Exp $
+$NetBSD: distinfo,v 1.33 2009/09/29 06:39:30 wiz Exp $
SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b
RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7
@@ -22,6 +22,7 @@ SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
SHA1 (patch-aq) = f6d48cad9461fd40f4c54669cc275e99cdbb7a34
SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b
+SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
SHA1 (patch-ba) = 669bd9b71edfe861b2945d696cf5fa151d0d48af
diff --git a/x11/qt4-libs/patches/patch-at b/x11/qt4-libs/patches/patch-at
new file mode 100644
index 00000000000..815583c4b6d
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.4 2009/09/29 06:39:30 wiz Exp $
+
+--- src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp.orig 2009-06-20 04:57:56.000000000 +0000
++++ src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
+@@ -134,7 +134,7 @@ static String keyIdentifierForQtKeyCode(
+ case Qt::Key_Backtab:
+ return "U+0009";
+ default:
+- return String::format("U+%04X", toupper(keyCode));
++ return String::format("U+%04X", toupper((unsigned char)keyCode));
+ }
+ }
+