mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
zeal, bump to 0.7.2 (#12441)
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
From 49e8c3eace8cd82a18f6dd97d9f01f42f6632991 Mon Sep 17 00:00:00 2001
|
||||
From 5799550a2d51d563409ca5d3f9deee20756b93f5 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 3 Sep 2018 20:03:29 +1000
|
||||
Subject: Fix build for Haiku
|
||||
|
||||
|
||||
diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
|
||||
index f1c6a05..36660e4 100644
|
||||
index 476c2f5..0807de6 100644
|
||||
--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
|
||||
+++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
|
||||
@@ -6,6 +6,10 @@ if(APPLE)
|
||||
@@ -57,17 +57,17 @@ index 0000000..1bb9cde
|
||||
+ return false;
|
||||
+}
|
||||
--
|
||||
2.42.1
|
||||
2.48.1
|
||||
|
||||
|
||||
From 4be5166fb38d193b6aea2362d82df8e6de9e8ad7 Mon Sep 17 00:00:00 2001
|
||||
From 0e2eda970a52414e3cd844c76ad6672cc5e9053b Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Wed, 6 Dec 2023 17:04:14 +0100
|
||||
Subject: Fix linking with libnetwork
|
||||
|
||||
|
||||
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
|
||||
index 5c0e6d1..8742741 100644
|
||||
index 46fdd92..c5ee837 100644
|
||||
--- a/src/app/CMakeLists.txt
|
||||
+++ b/src/app/CMakeLists.txt
|
||||
@@ -45,6 +45,10 @@ endif()
|
||||
@@ -82,5 +82,35 @@ index 5c0e6d1..8742741 100644
|
||||
OUTPUT_NAME ${_project_output_name}
|
||||
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
--
|
||||
2.42.1
|
||||
2.48.1
|
||||
|
||||
|
||||
From 36d2814f154c8c282e9c7b96130c0f4aca5dd205 Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Wed, 28 May 2025 09:29:04 +0200
|
||||
Subject: Fix: undefined reference to `QxtGlobalShortcutPrivate::isSupported()'
|
||||
|
||||
|
||||
diff --git a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp
|
||||
index 1bb9cde..654766f 100644
|
||||
--- a/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp
|
||||
+++ b/src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_haiku.cpp
|
||||
@@ -1,9 +1,15 @@
|
||||
#include "qxtglobalshortcut_p.h"
|
||||
|
||||
+#include <QGuiApplication>
|
||||
#include <QKeySequence>
|
||||
#include <QScopedPointer>
|
||||
#include <QVector>
|
||||
|
||||
+bool QxtGlobalShortcutPrivate::isSupported()
|
||||
+{
|
||||
+ return QGuiApplication::platformName() == QLatin1String("haiku");
|
||||
+}
|
||||
+
|
||||
bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray &eventType,
|
||||
void *message, long *result)
|
||||
{
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@@ -6,9 +6,9 @@ with Dash docsets."
|
||||
HOMEPAGE="https://zealdocs.org/"
|
||||
COPYRIGHT="2013-2023 Oleg Shparber and other contributors"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/zealdocs/zeal/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="937cbfe3ca49a7ee2d908baa3c5b008f425ae88cf2dade0abb2651b14f0f89ca"
|
||||
CHECKSUM_SHA256="9c4ce9ab5700985f4c562e995301f98767f14cd045f047dee2520ec4ce1855cf"
|
||||
PATCHES="zeal-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="zeal.rdef.in"
|
||||
|
||||
@@ -59,7 +59,9 @@ BUILD()
|
||||
{
|
||||
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
|
||||
$cmakeDirArgs \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DZEAL_RELEASE_BUILD=ON
|
||||
|
||||
make -Cbuild $jobArgs
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user