mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
konversation, bump to 25.04.0 (#12204)
This commit is contained in:
@@ -6,9 +6,8 @@ COPYRIGHT="2010-2025 KDE Organisation"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/konversation-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="3b6e0d6b0bbf055893780a18026eef682ccffe44df2580d923089a0acedc220c"
|
||||
CHECKSUM_SHA256="92d1dfc7cbafa9e1c9e3a426ac4e80e28df4a157e08f076f0654c3ce6e9894d4"
|
||||
SOURCE_DIR="konversation-$portVersion"
|
||||
PATCHES="konversation-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="konversation.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -1,36 +0,0 @@
|
||||
From f35f1999f7d55ad6f54ec0b1e00b7e7c85b262cb Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Fri, 27 Dec 2024 16:58:54 +0100
|
||||
Subject: Haiku build fixes
|
||||
|
||||
Co-authored-by: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4e8208a..c40d119 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -71,7 +71,7 @@ find_package(KF6 REQUIRED COMPONENTS
|
||||
WindowSystem
|
||||
)
|
||||
|
||||
-if(NOT WIN32)
|
||||
+if(NOT WIN32 AND NOT HAIKU)
|
||||
find_package(KF6 REQUIRED GlobalAccel)
|
||||
endif()
|
||||
set(HAVE_KGLOBALACCEL ${KF6GlobalAccel_FOUND})
|
||||
diff --git a/src/dcc/dcccommon.cpp b/src/dcc/dcccommon.cpp
|
||||
index 5d93c74..f419caf 100644
|
||||
--- a/src/dcc/dcccommon.cpp
|
||||
+++ b/src/dcc/dcccommon.cpp
|
||||
@@ -107,7 +107,7 @@ namespace Konversation
|
||||
QHostAddress ip(address);
|
||||
if (ip.protocol() == QAbstractSocket::IPv6Protocol)
|
||||
{
|
||||
-#ifndef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
/* This is fucking ugly but there is no KDE way to do this yet :| -cartman */
|
||||
struct ifreq ifr;
|
||||
const QByteArray addressBa = Preferences::self()->dccIPv4FallbackIface().toLatin1();
|
||||
--
|
||||
2.45.2
|
||||
|
||||
Reference in New Issue
Block a user