mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-18 09:40:05 +02:00
100 lines
3.2 KiB
Plaintext
100 lines
3.2 KiB
Plaintext
From 7286faf7c2cbeea757946050fa7ac9c3064cd67a Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sun, 25 Nov 2018 11:10:17 +0100
|
|
Subject: applying patch libqt4-4.8.7.patch
|
|
|
|
|
|
diff --git a/src/gui/kernel/qclipboard_haiku.cpp b/src/gui/kernel/qclipboard_haiku.cpp
|
|
index 761ba29..e5df7af 100644
|
|
--- a/src/gui/kernel/qclipboard_haiku.cpp
|
|
+++ b/src/gui/kernel/qclipboard_haiku.cpp
|
|
@@ -37,7 +37,7 @@ const QMimeData *QClipboard::mimeData(Mode mode) const
|
|
|
|
for ( int i = 0; msg->GetInfo(B_MIME_TYPE, i, &name, &type, &count) == B_OK; i++ ) {
|
|
const void *data;
|
|
- int32 dataLen = 0;
|
|
+ ssize_t dataLen = 0;
|
|
qDebug() << "mimeData " << name;
|
|
status_t stat = msg->FindData(name,B_MIME_TYPE,&data,&dataLen);
|
|
if(dataLen && stat==B_OK) {
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From 6b0cbd139e5e6aac71259c092b8b64532f76c115 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sun, 25 Nov 2018 11:59:24 +0100
|
|
Subject: gcc7 fix
|
|
|
|
|
|
diff --git a/configure b/configure
|
|
index 2a93bbd..3961f1f 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -7762,7 +7762,7 @@ case "$XPLATFORM" in
|
|
*-g++*)
|
|
# Check gcc's version
|
|
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
|
- 5*|4*|3.4*)
|
|
+ 8*|7*|6*|5*|4*|3.4*)
|
|
;;
|
|
3.3*)
|
|
canBuildWebKit="no"
|
|
@@ -8078,7 +8078,7 @@ g++*)
|
|
3.*)
|
|
COMPILER_VERSION="3.*"
|
|
;;
|
|
- 5*|4.*)
|
|
+ 8*|7*|6*|5*|4.*)
|
|
COMPILER_VERSION="4"
|
|
;;
|
|
*)
|
|
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
|
|
index 847f69c..2360f62 100644
|
|
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
|
|
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
|
|
@@ -234,3 +234,4 @@ SOURCES += \
|
|
SOURCES += wtf/TCSystemAlloc.cpp
|
|
}
|
|
|
|
+QMAKE_CXXFLAGS += -std=gnu++98
|
|
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
|
|
index 9e2e638..0825cdb 100644
|
|
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
|
|
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
|
|
@@ -27,7 +27,6 @@
|
|
#define WTF_MathExtras_h
|
|
|
|
#include <float.h>
|
|
-#include <math.h>
|
|
#include <stdlib.h>
|
|
|
|
#if OS(SOLARIS)
|
|
diff --git a/src/plugins/accessible/qaccessiblebase.pri b/src/plugins/accessible/qaccessiblebase.pri
|
|
index 95c1fad..a28f289 100644
|
|
--- a/src/plugins/accessible/qaccessiblebase.pri
|
|
+++ b/src/plugins/accessible/qaccessiblebase.pri
|
|
@@ -1,2 +1,4 @@
|
|
target.path += $$[QT_INSTALL_PLUGINS]/accessible
|
|
INSTALLS += target
|
|
+
|
|
+QMAKE_CXXFLAGS += -std=gnu++98
|
|
diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h
|
|
index 7911e89..be284d1 100644
|
|
--- a/src/xmlpatterns/api/qcoloroutput_p.h
|
|
+++ b/src/xmlpatterns/api/qcoloroutput_p.h
|
|
@@ -70,8 +70,8 @@ namespace QPatternist
|
|
ForegroundShift = 10,
|
|
BackgroundShift = 20,
|
|
SpecialShift = 20,
|
|
- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
|
|
- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
|
|
+ ForegroundMask = 0x1f << ForegroundShift,
|
|
+ BackgroundMask = 0x7 << BackgroundShift
|
|
};
|
|
|
|
public:
|
|
--
|
|
2.19.1
|
|
|