mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Falkon: bump (#6614)
This commit is contained in:
extrowerk
GitHub
@@ -6,8 +6,8 @@ HOMEPAGE="https://falkon.org/"
|
||||
COPYRIGHT="2009-2019 Falkon Browser Team"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="4"
|
||||
SOURCE_URI="https://download.kde.org/stable/falkon/3.1/falkon-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587"
|
||||
SOURCE_URI="https://github.com/KDE/falkon/archive/refs/tags/v3.2.0.tar.gz"
|
||||
CHECKSUM_SHA256="5b8fba93ca53b8e5f69ea913e36b01084b65ccb3f399281dbc1b0df89916f4ca"
|
||||
PATCHES="falkon-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
falkon.rdef.in
|
||||
@@ -24,9 +24,11 @@ PROVIDES="
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5DBus$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libKF5Archive$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5Positioning$secondaryArchSuffix
|
||||
lib:libQt5PrintSupport$secondaryArchSuffix
|
||||
@@ -45,7 +47,9 @@ REQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libKF5I18n$secondaryArchSuffix
|
||||
devel:libKF5Archive$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5DBus$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
@@ -1,105 +0,0 @@
|
||||
From 495e96a778ae2529fd9e28bf0aa4ff384660f207 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 17 Nov 2021 18:37:27 +0100
|
||||
Subject: upstream patches
|
||||
|
||||
|
||||
diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp
|
||||
index 499b225..04f19b7 100644
|
||||
--- a/src/lib/tools/qztools.cpp
|
||||
+++ b/src/lib/tools/qztools.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <QByteArray>
|
||||
#include <QPixmap>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QBuffer>
|
||||
#include <QFile>
|
||||
#include <QDir>
|
||||
diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
|
||||
index 7320925..44cb57e 100644
|
||||
--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp
|
||||
+++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "desktopfile.h"
|
||||
|
||||
#include <QSettings>
|
||||
+#include <QFile>
|
||||
|
||||
VerticalTabsPlugin::VerticalTabsPlugin()
|
||||
: QObject()
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From 1ec5a48b8bf54552db3a1b59f066fcfc8826fefe Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 17 Nov 2021 18:37:35 +0100
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9b637fb..1575c7c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -53,7 +53,7 @@ if (NOT DISABLE_DBUS)
|
||||
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus)
|
||||
endif()
|
||||
|
||||
-if (UNIX AND NOT APPLE AND NOT NO_X11)
|
||||
+if (UNIX AND NOT APPLE AND NOT HAIKU AND NOT NO_X11)
|
||||
add_definitions(-DQZ_WS_X11)
|
||||
find_package(XCB REQUIRED COMPONENTS XCB UTIL)
|
||||
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
|
||||
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
|
||||
index b4aff59..92f79d5 100644
|
||||
--- a/src/lib/CMakeLists.txt
|
||||
+++ b/src/lib/CMakeLists.txt
|
||||
@@ -352,7 +352,7 @@ target_link_libraries(FalkonPrivate
|
||||
)
|
||||
|
||||
if (UNIX AND NOT APPLE)
|
||||
- if (NOT NO_X11)
|
||||
+ if (NOT NO_X11 AND NOT HAIKU)
|
||||
target_link_libraries(FalkonPrivate XCB::XCB Qt5::X11Extras)
|
||||
endif()
|
||||
|
||||
diff --git a/src/main/main.cpp b/src/main/main.cpp
|
||||
index c1af1b6..0deeb7c 100644
|
||||
--- a/src/main/main.cpp
|
||||
+++ b/src/main/main.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <QMessageBox> // For QT_REQUIRE_VERSION
|
||||
#include <iostream>
|
||||
|
||||
-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__)
|
||||
+#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
|
||||
#include <signal.h>
|
||||
#include <execinfo.h>
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From e95f12835484656b0237d90d30ff20dac4daaa8c Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 27 Nov 2021 22:09:34 +1000
|
||||
Subject: Set default theme for Haiku
|
||||
|
||||
|
||||
diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h
|
||||
index 92a453c..2c7e061 100644
|
||||
--- a/src/lib/app/qzcommon.h
|
||||
+++ b/src/lib/app/qzcommon.h
|
||||
@@ -117,6 +117,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags)
|
||||
#define DEFAULT_THEME_NAME QSL("windows")
|
||||
#elif defined(Q_OS_MACOS)
|
||||
#define DEFAULT_THEME_NAME QSL("mac")
|
||||
+#elif defined(Q_OS_HAIKU)
|
||||
+#define DEFAULT_THEME_NAME QSL("haiku")
|
||||
#elif defined(Q_OS_UNIX)
|
||||
#define DEFAULT_THEME_NAME QSL("linux")
|
||||
#else
|
||||
--
|
||||
2.30.2
|
||||
|
||||
58
www-client/falkon/patches/falkon-3.2.0.patchset
Normal file
58
www-client/falkon/patches/falkon-3.2.0.patchset
Normal file
@@ -0,0 +1,58 @@
|
||||
From b2de5b318456f2a045e247c25dc5512aebf28ec5 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 17 Nov 2021 18:37:35 +0100
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7505747..4529ad0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -55,7 +55,7 @@ if (NOT DISABLE_DBUS)
|
||||
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus)
|
||||
endif()
|
||||
|
||||
-if (UNIX AND NOT APPLE AND NOT NO_X11)
|
||||
+if (UNIX AND NOT APPLE AND NOT HAIKU AND NOT NO_X11)
|
||||
add_definitions(-DQZ_WS_X11)
|
||||
find_package(XCB REQUIRED COMPONENTS XCB UTIL)
|
||||
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
|
||||
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
|
||||
index 3b7efff..03d61c2 100644
|
||||
--- a/src/lib/CMakeLists.txt
|
||||
+++ b/src/lib/CMakeLists.txt
|
||||
@@ -362,7 +362,7 @@ if (HAVE_LIBINTL)
|
||||
endif()
|
||||
|
||||
if (UNIX AND NOT APPLE)
|
||||
- if (NOT NO_X11)
|
||||
+ if (NOT NO_X11 AND NOT HAIKU)
|
||||
target_link_libraries(FalkonPrivate XCB::XCB Qt5::X11Extras)
|
||||
endif()
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From 18fb7b7ed48d7cf3d2678f7d4af6ad02bc44cba3 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 27 Nov 2021 22:09:34 +1000
|
||||
Subject: Set default theme for Haiku
|
||||
|
||||
|
||||
diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h
|
||||
index 92a453c..2c7e061 100644
|
||||
--- a/src/lib/app/qzcommon.h
|
||||
+++ b/src/lib/app/qzcommon.h
|
||||
@@ -117,6 +117,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags)
|
||||
#define DEFAULT_THEME_NAME QSL("windows")
|
||||
#elif defined(Q_OS_MACOS)
|
||||
#define DEFAULT_THEME_NAME QSL("mac")
|
||||
+#elif defined(Q_OS_HAIKU)
|
||||
+#define DEFAULT_THEME_NAME QSL("haiku")
|
||||
#elif defined(Q_OS_UNIX)
|
||||
#define DEFAULT_THEME_NAME QSL("linux")
|
||||
#else
|
||||
--
|
||||
2.30.2
|
||||
|
||||
Reference in New Issue
Block a user