Tue Sep 29 06:39:30 2009 UTC ()
Give unsigned char argument to toupper.
Fixes coredumps in Sigil when pressing "CTRL" or "BACKSPACE".

Bump PKGREVISION.


(wiz)
diff -r1.32 -r1.33 pkgsrc/x11/qt4-libs/Makefile
diff -r1.32 -r1.33 pkgsrc/x11/qt4-libs/distinfo
diff -r0 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-at
cvs diff -r1.32 -r1.33 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2009/08/26 19:56:38 1.32
+++ pkgsrc/x11/qt4-libs/Makefile 2009/09/29 06:39:29 1.33
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.32 2009/08/26 19:56:38 sno Exp $ 1# $NetBSD: Makefile,v 1.33 2009/09/29 06:39:29 wiz Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-libs-${QTVERSION} 7PKGNAME= qt4-libs-${QTVERSION}
8PKGREVISION= 1 8PKGREVISION= 2
9COMMENT= C++ X GUI toolkit 9COMMENT= C++ X GUI toolkit
10 10
11BUILD_TARGET= sub-src 11BUILD_TARGET= sub-src
12INSTALL_TARGET= install_flat_headers install_targ_headers 12INSTALL_TARGET= install_flat_headers install_targ_headers
13 13
14PTHREAD_OPTS+= require 14PTHREAD_OPTS+= require
15UNLIMIT_RESOURCES= datasize 15UNLIMIT_RESOURCES= datasize
16BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} 16BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
17 17
18PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST 18PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
19 19
20# built as plugins 20# built as plugins
21CONFIGURE_ARGS+= -no-sql-sqlite 21CONFIGURE_ARGS+= -no-sql-sqlite
cvs diff -r1.32 -r1.33 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2009/07/24 10:56:46 1.32
+++ pkgsrc/x11/qt4-libs/distinfo 2009/09/29 06:39:30 1.33
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1$NetBSD: distinfo,v 1.32 2009/07/24 10:56:46 drochner Exp $ 1$NetBSD: distinfo,v 1.33 2009/09/29 06:39:30 wiz Exp $
2 2
3SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b 3SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b
4RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7 4RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7
5Size (qt-x11-opensource-src-4.5.2.tar.bz2) = 116015284 bytes 5Size (qt-x11-opensource-src-4.5.2.tar.bz2) = 116015284 bytes
6SHA1 (patch-aa) = b3a0cbdd927ef7d3e2af6a49fc87048f2cd8012c 6SHA1 (patch-aa) = b3a0cbdd927ef7d3e2af6a49fc87048f2cd8012c
7SHA1 (patch-ab) = b0853b2ddfa53948e91c4f93e4d089c7dd56db43 7SHA1 (patch-ab) = b0853b2ddfa53948e91c4f93e4d089c7dd56db43
8SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b 8SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
9SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5 9SHA1 (patch-ad) = bfa4b61e32b26dac23a33ab29ce68eb62d6f5fb5
10SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9 10SHA1 (patch-ae) = a23a2cc4271b5613f59ab5550e9aeccca15573a9
11SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d 11SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d
12SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e 12SHA1 (patch-ag) = 0ae6efe5f9283a567bd069779ba36b77fa61006e
13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
15SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203 15SHA1 (patch-aj) = 9d3bbda1523ef1ca3ad25646d6c0457a30c3e203
16SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a 16SHA1 (patch-ak) = 9aaf62149ec555f990e2216710ba5b88d532224a
17SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c 17SHA1 (patch-al) = ae85006d95f8a55521219442cc642dfa4377671c
18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
19SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1 19SHA1 (patch-an) = 34c50ed3a7e4e985d372b89dca9453df2f5b40e1
20SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9 20SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9
21SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7 21SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
22SHA1 (patch-aq) = f6d48cad9461fd40f4c54669cc275e99cdbb7a34 22SHA1 (patch-aq) = f6d48cad9461fd40f4c54669cc275e99cdbb7a34
23SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65 23SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
24SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b 24SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b
 25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
25SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf 26SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
26SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061 27SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
27SHA1 (patch-ba) = 669bd9b71edfe861b2945d696cf5fa151d0d48af 28SHA1 (patch-ba) = 669bd9b71edfe861b2945d696cf5fa151d0d48af
28SHA1 (patch-bb) = 00b1c40fa1c1874cc61dcbb5f80eedcc8863dbc9 29SHA1 (patch-bb) = 00b1c40fa1c1874cc61dcbb5f80eedcc8863dbc9
29SHA1 (patch-bc) = 6376bdd6789567725fbb183518f06c55bb57864d 30SHA1 (patch-bc) = 6376bdd6789567725fbb183518f06c55bb57864d
File Added: pkgsrc/x11/qt4-libs/patches/Attic/patch-at
$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));
     }
 }