pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/qt5-qtwebkit



Module Name:    pkgsrc
Committed By:   minskim
Date:           Tue Nov 21 17:00:28 UTC 2017

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_JavaScriptCore_runtime_DatePrototype.cpp

Log Message:
x11/qt5-qtwebkit: Make this build on macOS


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.9 pkgsrc/x11/qt5-qtwebkit/distinfo:1.10
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.9        Wed Apr 26 10:27:43 2017
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Tue Nov 21 17:00:28 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2017/04/26 10:27:43 wiz Exp $
+$NetBSD: distinfo,v 1.10 2017/11/21 17:00:28 minskim Exp $
 
 SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7
 RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9
@@ -13,6 +13,7 @@ SHA1 (patch-Source_JavaScriptCore_assemb
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37
+SHA1 (patch-Source_JavaScriptCore_runtime_DatePrototype.cpp) = b87c0e9d453d4f4d2a8fc2dac077b79ba761a62a
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = da6e2627337be1d6a4692697f23381b1bc80d08a
 SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288
 SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp:1.1
--- /dev/null   Tue Nov 21 17:00:28 2017
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp       Tue Nov 21 17:00:28 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-Source_JavaScriptCore_runtime_DatePrototype.cpp,v 1.1 2017/11/21 17:00:28 minskim Exp $
+
+Cast ICU's UChar (char16_t) to pass as UniChar.
+
+--- Source/JavaScriptCore/runtime/DatePrototype.cpp.orig       2015-10-13 04:37:10.000000000 +0000
++++ Source/JavaScriptCore/runtime/DatePrototype.cpp
+@@ -167,7 +167,7 @@ static JSCell* formatLocaleDate(ExecStat
+     CFRelease(locale);
+ 
+     if (useCustomFormat) {
+-        CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, customFormatString.characters(), customFormatString.length());
++        CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, (const UniChar*)customFormatString.characters(), customFormatString.length());
+         CFDateFormatterSetFormat(formatter, customFormatCFString);
+         CFRelease(customFormatCFString);
+     }
+@@ -184,7 +184,7 @@ static JSCell* formatLocaleDate(ExecStat
+     ASSERT(length <= bufferLength);
+     if (length > bufferLength)
+         length = bufferLength;
+-    CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
++    CFStringGetCharacters(string, CFRangeMake(0, length), (UniChar*)buffer);
+ 
+     CFRelease(string);
+ 



Home | Main Index | Thread Index | Old Index