mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
wxqt, bump revision, fix build (#5052)
This commit is contained in:
59
dev-qt/wxqt/patches/wxqt-3.1.3.patchset
Normal file
59
dev-qt/wxqt/patches/wxqt-3.1.3.patchset
Normal file
@@ -0,0 +1,59 @@
|
||||
From 6d06aabb48f10849b1e29a4dddf6f49bc40cd56a Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Sun, 12 Feb 2017 15:40:59 -0500
|
||||
Subject: [PATCH] sckaddr: Fix build on Haiku.
|
||||
|
||||
|
||||
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
|
||||
index 0388132..49a6481 100644
|
||||
--- a/src/common/sckaddr.cpp
|
||||
+++ b/src/common/sckaddr.cpp
|
||||
@@ -109,6 +109,11 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress);
|
||||
#endif
|
||||
#endif // __WINDOWS__
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ #define HAVE_GETHOSTBYNAME
|
||||
+ #define HAVE_GETSERVBYNAME
|
||||
+#endif
|
||||
+
|
||||
// we assume that we have gethostbyaddr_r() if and only if we have
|
||||
// gethostbyname_r() and that it uses the similar conventions to it (see
|
||||
// comment in configure)
|
||||
--
|
||||
2.26.0
|
||||
|
||||
|
||||
From 319ef050e1a7f882efe96a737ee82c31abf1851c Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Tue, 2 Jun 2020 22:23:59 +0000
|
||||
Subject: Fix build, kudos to waddlesplash for the solution
|
||||
|
||||
|
||||
diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
|
||||
index 5f1324a..e304b54 100644
|
||||
--- a/src/qt/dc.cpp
|
||||
+++ b/src/qt/dc.cpp
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <QtGui/QBitmap>
|
||||
#include <QtGui/QPen>
|
||||
#include <QtGui/QPainter>
|
||||
+#include <QtGui/QPainterPath>
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/icon.h"
|
||||
diff --git a/src/qt/graphics.cpp b/src/qt/graphics.cpp
|
||||
index 9e06148..1c4d654 100644
|
||||
--- a/src/qt/graphics.cpp
|
||||
+++ b/src/qt/graphics.cpp
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QPicture>
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
--
|
||||
2.26.0
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 006dc02277d977d13a67f31a1c5fbb3f2e155cb9 Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Sun, 12 Feb 2017 15:40:59 -0500
|
||||
Subject: [PATCH] sckaddr: Fix build on Haiku.
|
||||
|
||||
---
|
||||
src/common/sckaddr.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
|
||||
index 0388132..49a6481 100644
|
||||
--- a/src/common/sckaddr.cpp
|
||||
+++ b/src/common/sckaddr.cpp
|
||||
@@ -109,6 +109,11 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress);
|
||||
#endif
|
||||
#endif // __WINDOWS__
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ #define HAVE_GETHOSTBYNAME
|
||||
+ #define HAVE_GETSERVBYNAME
|
||||
+#endif
|
||||
+
|
||||
// we assume that we have gethostbyaddr_r() if and only if we have
|
||||
// gethostbyname_r() and that it uses the similar conventions to it (see
|
||||
// comment in configure)
|
||||
--
|
||||
2.7.0
|
||||
|
||||
Reference in New Issue
Block a user