mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
QtWebKit: fix build on GCC7
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 1759ee77655dc4ea51a0a503da2faaf04e12b912 Mon Sep 17 00:00:00 2001
|
||||
From 3404f2fc0b1ec5aab7b310122f662623716efaa6 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 16 Jun 2017 21:38:08 +1000
|
||||
Subject: Fix build
|
||||
@@ -874,10 +874,10 @@ index 1930027..9c827a3 100644
|
||||
set(USE_GSTREAMER_DEFAULT OFF)
|
||||
set(USE_QT_MULTIMEDIA_DEFAULT ON)
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 325149e72c50af26fbec29a93762040d32183882 Mon Sep 17 00:00:00 2001
|
||||
From 6b375beeea26a4a37954d66cce4ba818309ecc98 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 17 Jun 2017 12:22:33 +1000
|
||||
Subject: Add libnetwork
|
||||
@@ -901,10 +901,10 @@ index e5d08ed..deb9f68 100644
|
||||
find_library(LIBRT_LIBRARIES NAMES rt)
|
||||
mark_as_advanced(LIBRT_LIBRARIES)
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From c7f2d0969a331bdacd713135fe82c6e0150072a5 Mon Sep 17 00:00:00 2001
|
||||
From 4718dffa9ef6f2a5ffe1b835d5514099c09f350e Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 17 Jun 2017 12:23:20 +1000
|
||||
Subject: Add Haiku detection to useragent string
|
||||
@@ -924,10 +924,10 @@ index 4b88762..fa564f9 100644
|
||||
"GNU Hurd"
|
||||
#elif OS(LINUX)
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 1894964d742e0ff8f87a4bd34d62a2d200949d0d Mon Sep 17 00:00:00 2001
|
||||
From 4db4d772bb95451345d9687c251fd96ff521ec43 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 17 Jul 2017 19:43:24 +1000
|
||||
Subject: Use gstreamer instead qtmulimadia
|
||||
@@ -947,10 +947,10 @@ index 9c827a3..1930027 100644
|
||||
set(USE_GSTREAMER_DEFAULT OFF)
|
||||
set(USE_QT_MULTIMEDIA_DEFAULT ON)
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From c1e7cfabf2536da7efb84d3a910632dc5bf34f4b Mon Sep 17 00:00:00 2001
|
||||
From 4bca27643de38432bfbd8110598f79885da1ef95 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 17 Jul 2017 19:44:23 +1000
|
||||
Subject: UserAgent improvements
|
||||
@@ -983,10 +983,10 @@ index fa564f9..71920ff 100644
|
||||
"GNU Hurd"
|
||||
#elif OS(LINUX)
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From b6e0bf0ab4922dd86d9b543e8dc7401db2c1f3db Mon Sep 17 00:00:00 2001
|
||||
From 806f7fdf8d79f89c495204348a2691aea657b6b2 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 21 Jul 2017 21:58:31 +1000
|
||||
Subject: Add support for notification icon
|
||||
@@ -1133,10 +1133,10 @@ index f53fe51..9f69a31 100644
|
||||
};
|
||||
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From bafda3f8666ef79384eb889b484b6d506f1a1973 Mon Sep 17 00:00:00 2001
|
||||
From 3a6a7fff67f5e2fabf18c5710ad67210fa333207 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
|
||||
Date: Wed, 13 Nov 2013 18:13:36 +0100
|
||||
Subject: Trigger layout after resizing the FrameView.
|
||||
@@ -1168,10 +1168,10 @@ index e6145b6..941d8df 100644
|
||||
|
||||
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 8474c1f3cec7165ad860feae5d95bc2a61e755b5 Mon Sep 17 00:00:00 2001
|
||||
From 121f09f0652294a5280e5206b76723ac75c3887d Mon Sep 17 00:00:00 2001
|
||||
From: Konstantin Tokarev <annulen@yandex.ru>
|
||||
Date: Thu, 12 Oct 2017 20:15:15 +0300
|
||||
Subject: Fix for 451c5a10: run adjustViewSize() after relayout
|
||||
@@ -1202,10 +1202,10 @@ index 941d8df..df28e9f 100644
|
||||
|
||||
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 22eaa8f9831e8bc42f9d11f92597ce7fee4bfb4c Mon Sep 17 00:00:00 2001
|
||||
From 695a072cc768ff5ac50479fa2daaf979e5e7b65d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 21 Apr 2018 22:27:07 +1000
|
||||
Subject: Update Safari version for UserAgent string
|
||||
@@ -1225,5 +1225,28 @@ index 71920ff..89a5035 100644
|
||||
// Platform.
|
||||
ua = ua.arg(
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 4b1d87a0c8f53f045987612c45ffdafe36d93dcc Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 12 Jun 2018 21:21:51 +1000
|
||||
Subject: Fix build with gcc7
|
||||
|
||||
|
||||
diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h
|
||||
index 0fcd4df..6672ce3 100644
|
||||
--- a/Source/WebCore/dom/SlotAssignment.h
|
||||
+++ b/Source/WebCore/dom/SlotAssignment.h
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
|
||||
|
||||
+#include <functional>
|
||||
+
|
||||
#include <wtf/HashMap.h>
|
||||
#include <wtf/HashSet.h>
|
||||
#include <wtf/Vector.h>
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/annulen/webkit"
|
||||
COPYRIGHT="2015-2017 The Qt Company Ltd."
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU LGPL v3"
|
||||
REVISION="10"
|
||||
REVISION="11"
|
||||
SOURCE_URI="https://github.com/annulen/webkit/releases/download/qtwebkit-${portVersion/\~/-}/qtwebkit-${portVersion/\~/-}.tar.xz"
|
||||
CHECKSUM_SHA256="f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a"
|
||||
SOURCE_DIR="qtwebkit-${portVersion/\~/-}"
|
||||
|
||||
Reference in New Issue
Block a user