haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dooble: fix build for Qt 5.15

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-06-10 17:08:08 +10:00
parent 817706fa1e
commit 300e7ab27e
2 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www-client/dooble/dooble-1.56f.recipe
View File

@@ -6,7 +6,7 @@ manager, and many others."
HOMEPAGE="https://textbrowser.github.io/dooble/"
COPYRIGHT="Dooble"
LICENSE="BSD (3-clause)"
REVISION="3"
REVISION="4"
SOURCE_URI="https://github.com/textbrowser/dooble/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="e4ec2f1eec438a185840df5ca0b024b20f00d1d180a2e21fb4f78a1c96695203"
SOURCE_DIR="dooble-$portVersion/$portVersion"

57
www-client/dooble/patches/dooble-1.56f.patchset
View File

@@ -1,4 +1,4 @@
From 4193db642c95f836627ad0c36426d20d84aaf29d Mon Sep 17 00:00:00 2001
From be939a4d30fecb5eaa5a035e45da6e41e18d50b4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 27 May 2017 04:59:44 +1000
Subject: Fix build for haiku
@@ -97,10 +97,10 @@ index 0be7be8..a005adf 100644
(const int secure_memory_pool_size)
{
--
2.16.2
2.26.0
From 72d136b4c5cda9ba4684e65124c586e74ae559cc Mon Sep 17 00:00:00 2001
From 1f9b9f31e8267e11411f0d68bf823d7ac7204c63 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 10 Jun 2017 21:00:42 +1000
Subject: Change current directory to application path
@@ -123,10 +123,10 @@ index f2ff75f..7b13e94 100644
splash.show();
--
2.16.2
2.26.0
From 2a847b87c84031e604a279c5ca579a498afed058 Mon Sep 17 00:00:00 2001
From e867d951bd761029b5570576c2eb4e9d82573855 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 3 Aug 2017 11:06:11 +1000
Subject: Fix path for settings dir
@@ -151,10 +151,10 @@ index 7b13e94..44e5f35 100644
QDir homeDir(QDir::home());
--
2.16.2
2.26.0
From 3f2968fd3d2e2e00d0c691fbbbc8ffe650d2b60c Mon Sep 17 00:00:00 2001
From 5b20823962dc941a89c39645e974029ae7e1f47e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 27 May 2018 19:14:13 +1000
Subject: Default fonts for Haiku (Noto)
@@ -316,10 +316,10 @@ index a18c5de..f3f6a7e 100644
text = "Serif";
#endif
--
2.16.2
2.26.0
From 6ad88d86af4e2fdb6f072a91636c927d81eb1e80 Mon Sep 17 00:00:00 2001
From 3e7adce69b40031b0f69c236fac986665804401d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 27 May 2018 19:37:48 +1000
Subject: Set Haiku theme by default
@@ -389,5 +389,42 @@ index f3f6a7e..11d3a45 100644
if(dooble::s_settings.value("settingsWindow/iconSet1", "").toString().
--
2.16.2
2.26.0
From 6d21fcba51db50f9e4ec3519969eac56a7ce32db Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 10 Jun 2020 16:48:59 +1000
Subject: Fix build for Qt 5.15
diff --git a/Include/dtypes.h b/Include/dtypes.h
index 88227fc..bb1e081 100644
--- a/Include/dtypes.h
+++ b/Include/dtypes.h
@@ -36,7 +36,7 @@ namespace DoobleDownloadType
Http
};
- Q_ENUMS(DoobleDownloadTypeEnum)
+// Q_ENUMS(DoobleDownloadTypeEnum)
}
#endif
diff --git a/dooble.qt5.pro b/dooble.qt5.pro
index fd01093..375b4d9 100644
--- a/dooble.qt5.pro
+++ b/dooble.qt5.pro
@@ -33,7 +33,8 @@ QMAKE_CXXFLAGS_RELEASE += -fPIE -fwrapv \
-Wall -Wcast-align -Wcast-qual \
-Werror -Wextra \
-Woverloaded-virtual -Wpointer-arith \
- -Wstrict-overflow=5
+ -Wstrict-overflow=5 \
+ -Wno-deprecated-declarations
QMAKE_DISTCLEAN += -r temp .qmake.cache .qmake.stash
QMAKE_EXTRA_TARGETS = libspoton purge
QMAKE_LFLAGS_RELEASE += -Wl,-rpath,/usr/local/dooble/Lib
--
2.26.0