Dooble: bumped to 2024.09.29 (#11202)

This commit is contained in:
kenmays
2024-10-09 23:04:15 -07:00
committed by GitHub
parent a322e38e56
commit 69a3444b25
4 changed files with 123 additions and 43 deletions

View File

@@ -13,6 +13,22 @@ resource app_version {
resource app_signature "application/x-vnd.dooble";
resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK";
resource file_types message {
"types" = "text/html",
"types" = "multipart/related",
"types" = "image/gif",
"types" = "image/jpeg",
"types" = "image/png",
"types" = "image/svg+xml",
"types" = "application/xhtml+xml",
"types" = "application/x-vnd.Be.URL.file",
"types" = "application/x-vnd.Be.URL.ftp",
"types" = "application/x-vnd.Be.URL.http",
"types" = "application/x-vnd.Be.URL.https"
};
resource vector_icon {
$"6E6369660C03EED32A03E1612704016C0501020106033E1FF20000000000003E"
$"1FF248800048800000D9ECFFC3007FFFFF0061BF020112023D3FE50000000000"

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2008-present Alexis Megas"
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="https://github.com/textbrowser/dooble/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="dbacd6adf762964983a1943496cd435ea9e4cf269568141d85a3c12d67acbc1e"
CHECKSUM_SHA256="f25d52bf20385061c5125a1a99182c001dbf2e7624e67254e0dcb4cee5d9859a"
SOURCE_DIR="dooble-$portVersion"
PATCHES="dooble-$portVersion.patchset"
ADDITIONAL_FILES="

View File

@@ -1,42 +0,0 @@
From 03ce595e89d5b6517c1c3d5dc3f23e00b435c174 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 8 Jan 2024 17:28:24 +0100
Subject: Haiku: set translations path
diff --git a/Source/dooble_main.cc b/Source/dooble_main.cc
index 17e1252..0e968f2 100644
--- a/Source/dooble_main.cc
+++ b/Source/dooble_main.cc
@@ -45,6 +45,10 @@ extern "C"
#if defined(Q_OS_MACOS)
#include <sys/resource.h>
#endif
+#if defined(Q_OS_HAIKU)
+#include<libgen.h>
+#include<OS.h>
+#endif
}
#ifdef Q_OS_MACOS
@@ -93,6 +97,17 @@ int main(int argc, char *argv[])
qputenv("QT_ENABLE_REGEXP_JIT", "0");
qputenv("QV4_FORCE_INTERPRETER", "1");
+#if defined(Q_OS_HAIKU)
+ char *binpath = realpath(argv[0], NULL);
+ if (binpath != NULL) {
+ char buffer[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
+ strlcpy(buffer, dirname(binpath), sizeof(buffer));
+ strlcat(buffer, "/Translations", sizeof(buffer));
+ qputenv("DOOBLE_TRANSLATIONS_PATH", buffer);
+ free(binpath);
+ }
+#endif
+
QList<QUrl> urls;
auto attach = false;
auto full_screen = false;
--
2.42.1

View File

@@ -0,0 +1,106 @@
From f25ec3711ee7429cca981b416b0f4646875e6b37 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 8 Jan 2024 17:28:24 +0100
Subject: Haiku: set translations path
diff --git a/Source/dooble_main.cc b/Source/dooble_main.cc
index 742564a..45452ef 100644
--- a/Source/dooble_main.cc
+++ b/Source/dooble_main.cc
@@ -46,6 +46,10 @@ extern "C"
#if defined(Q_OS_MACOS)
#include <sys/resource.h>
#endif
+#if defined(Q_OS_HAIKU)
+#include<libgen.h>
+#include<OS.h>
+#endif
}
#ifdef Q_OS_MACOS
@@ -94,6 +98,17 @@ int main(int argc, char *argv[])
qputenv("QT_ENABLE_REGEXP_JIT", "0");
qputenv("QV4_FORCE_INTERPRETER", "1");
+#if defined(Q_OS_HAIKU)
+ char *binpath = realpath(argv[0], NULL);
+ if (binpath != NULL) {
+ char buffer[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
+ strlcpy(buffer, dirname(binpath), sizeof(buffer));
+ strlcat(buffer, "/Translations", sizeof(buffer));
+ qputenv("DOOBLE_TRANSLATIONS_PATH", buffer);
+ free(binpath);
+ }
+#endif
+
QList<QUrl> urls;
QString screen_mode("");
auto attach = false;
--
2.45.2
From 3640109b935affdf22898dc93b112c71eb9e57ea Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Mon, 30 Sep 2024 06:04:16 +0001
Subject: Enable experiment features and SIGNAL compat
diff --git a/Source/dooble_main.cc b/Source/dooble_main.cc
index 45452ef..c66be24 100644
--- a/Source/dooble_main.cc
+++ b/Source/dooble_main.cc
@@ -97,6 +97,9 @@ int main(int argc, char *argv[])
{
qputenv("QT_ENABLE_REGEXP_JIT", "0");
qputenv("QV4_FORCE_INTERPRETER", "1");
+#ifdef Q_OS_HAIKU
+ qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--enable-experimental-web-platform-features");
+#endif
#if defined(Q_OS_HAIKU)
char *binpath = realpath(argv[0], NULL);
@@ -245,18 +248,18 @@ int main(int argc, char *argv[])
#endif
QList<int> list;
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX) || defined(Q_OS_HAIKU)
struct sigaction signal_action = {};
#endif
list << SIGABRT
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX) || defined(Q_OS_HAIKU)
<< SIGBUS
#endif
<< SIGFPE
<< SIGILL
<< SIGINT
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX) || defined(Q_OS_HAIKU)
<< SIGQUIT
#endif
<< SIGSEGV
@@ -264,7 +267,7 @@ int main(int argc, char *argv[])
foreach(auto const i, list)
{
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX) || defined(Q_OS_HAIKU)
memset(&signal_action, 0, sizeof(struct sigaction));
signal_action.sa_handler = signal_handler;
sigemptyset(&signal_action.sa_mask);
@@ -279,7 +282,7 @@ int main(int argc, char *argv[])
#endif
}
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) || defined(Q_OS_UNIX) || defined(Q_OS_HAIKU)
/*
** Ignore SIGPIPE.
*/
--
2.45.2