haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

okteta, bump to 0.26.23 (#12721)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-08-09 09:13:51 +02:00
committed by GitHub
parent ce98eb6661
commit 72b2eac721
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kde-apps/okteta/okteta-0.26.15.recipe → kde-apps/okteta/okteta-0.26.23.recipe
View File

@@ -14,12 +14,12 @@ in rows with the value on top of the character
* Undo/redo support
* Structures tool for analyzing and editing based on user-creatable structure definitions"
HOMEPAGE="https://apps.kde.org/okteta/"
COPYRIGHT="2010-2024 KDE Organisation"
COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2
GNU GPL v3"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/okteta/$portVersion/src/okteta-$portVersion.tar.xz"
CHECKSUM_SHA256="0533500ef7068c1246e218f537af726e836d878ff275e392ed3d8a8aa6cf7c63"
CHECKSUM_SHA256="b04c50988eac26c50768ab5bd40f5b35a348c44d6e0e6a8d560563cf0eb1a3b1"
PATCHES="okteta-$portVersion.patchset"
ADDITIONAL_FILES="okteta.rdef.in"
@@ -39,7 +39,7 @@ fi
PROVIDES="
okteta$secondaryArchSuffix = $portVersion
app:Okteta$secondaryArchSuffix = $portVersion
app:Okteta = $portVersion
cmd:struct2osd$commandSuffix = $portVersion
lib:libKasten4Controllers$secondaryArchSuffix = 0.4.1 compat >= 0.4
lib:libKasten4Core$secondaryArchSuffix = 0.4.1 compat >= 0.4
@@ -93,6 +93,21 @@ REQUIRES="
lib:libQt5Xml$secondaryArchSuffix
"
PROVIDES_devel="
okteta${secondaryArchSuffix}_devel = $portVersion
devel:libKasten4Controllers$secondaryArchSuffix = 0.4.1 compat >= 0.4
devel:libKasten4Core$secondaryArchSuffix = 0.4.1 compat >= 0.4
devel:libKasten4Gui$secondaryArchSuffix = 0.4.1 compat >= 0.4
devel:libKasten4Okteta2Controllers$secondaryArchSuffix = 0.4.0 compat >= 0.4
devel:libKasten4Okteta2Core$secondaryArchSuffix = 0.4.0 compat >= 0.4
devel:libKasten4Okteta2Gui$secondaryArchSuffix = 0.4.0 compat >= 0.4
devel:libOkteta3Core$secondaryArchSuffix = 0.10.0 compat >= 0.10
devel:libOkteta3Gui$secondaryArchSuffix = 0.10.0 compat >= 0.10
"
REQUIRES_devel="
okteta$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix
@@ -137,22 +152,6 @@ BUILD_REQUIRES="
devel:libQt5Widgets$secondaryArchSuffix
devel:libQt5Xml$secondaryArchSuffix
"
PROVIDES_devel="
okteta${secondaryArchSuffix}_devel = $portVersion
devel:libKasten4Controllers$secondaryArchSuffix = 0.4.1 compat >= 0.4
devel:libKasten4Core$secondaryArchSuffix = 0.4.1 compat >= 0.4
devel:libKasten4Gui$secondaryArchSuffix = 0.4.1 compat >= 0.4
devel:libKasten4Okteta2Controllers$secondaryArchSuffix = 0.4.0 compat >= 0.4
devel:libKasten4Okteta2Core$secondaryArchSuffix = 0.4.0 compat >= 0.4
devel:libKasten4Okteta2Gui$secondaryArchSuffix = 0.4.0 compat >= 0.4
devel:libOkteta3Core$secondaryArchSuffix = 0.10.0 compat >= 0.10
devel:libOkteta3Gui$secondaryArchSuffix = 0.10.0 compat >= 0.10
"
REQUIRES_devel="
okteta$secondaryArchSuffix == $portVersion base
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix

26
kde-apps/okteta/patches/okteta-0.26.15.patchset → kde-apps/okteta/patches/okteta-0.26.23.patchset
View File

@@ -1,14 +1,14 @@
From 6ee1bb28686e898640e8dd25422667645c68b4e3 Mon Sep 17 00:00:00 2001
From 65c501c81ffb3e9b8e26b987a72b1d114bbc336a Mon Sep 17 00:00:00 2001
From: Ivan Holmes <ivan@ivanholmes.co.uk>
Date: Wed, 11 May 2022 04:32:47 +0100
Subject: patch out knsrcfiles
diff --git a/kasten/controllers/CMakeLists.txt b/kasten/controllers/CMakeLists.txt
index 332176a..13fe28a 100644
index 9c04962..f052c09 100644
--- a/kasten/controllers/CMakeLists.txt
+++ b/kasten/controllers/CMakeLists.txt
@@ -661,7 +661,7 @@ target_include_directories(OktetaKastenControllers
@@ -647,7 +647,7 @@ target_include_directories(OktetaKastenControllers
${LIBFRAMESPRINT_REL_DIR}
)
@@ -18,20 +18,20 @@ index 332176a..13fe28a 100644
else()
install( FILES view/structures/kns/okteta-structures.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
--
2.30.2
2.50.1
From 6d36ec689c0762d0ce5ee55b5fec18a609a6a942 Mon Sep 17 00:00:00 2001
From 29c3c4d1eb2a61e89a28546ef1ed5c49ae3e04b8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 17 May 2022 15:25:22 +1000
Subject: Workaround for mainWindow size bug
diff --git a/program/mainwindow.cpp b/program/mainwindow.cpp
index 7cc22dc..38a4ea9 100644
index 2a08986..e683ea0 100644
--- a/program/mainwindow.cpp
+++ b/program/mainwindow.cpp
@@ -102,6 +102,7 @@
@@ -105,6 +105,7 @@
// Qt
#include <QUrl>
#include <QMimeData>
@@ -39,7 +39,7 @@ index 7cc22dc..38a4ea9 100644
namespace Kasten {
@@ -148,6 +149,11 @@ OktetaMainWindow::OktetaMainWindow(OktetaProgram* program)
@@ -154,6 +155,11 @@ OktetaMainWindow::OktetaMainWindow(OktetaProgram* program)
// tmp
addXmlGuiControllerFromFactory(ToolListMenuControllerFactory(this));
addXmlGuiControllerFromFactory(ViewListMenuControllerFactory(viewManager(), viewArea()));
@@ -52,20 +52,20 @@ index 7cc22dc..38a4ea9 100644
OktetaMainWindow::~OktetaMainWindow() = default;
--
2.30.2
2.50.1
From ccc9dceed0390e50037d901485775fe2708f4c1e Mon Sep 17 00:00:00 2001
From d0ab5455c99d852c2d95059cdbb7cfa485ecc6c8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 17 May 2022 15:25:52 +1000
Subject: Disable color scheme
diff --git a/libs/kasten/controllers/CMakeLists.txt b/libs/kasten/controllers/CMakeLists.txt
index 78fcb01..53d61ed 100644
index 824d347..e98c64e 100644
--- a/libs/kasten/controllers/CMakeLists.txt
+++ b/libs/kasten/controllers/CMakeLists.txt
@@ -209,7 +209,7 @@ kastencontrollers_add_sublibrary(shellwindow/fullscreen
@@ -211,7 +211,7 @@ kastencontrollers_add_sublibrary(shellwindow/fullscreen
)
# KColorSchemeManager::createSchemeSelectionMenu misses to set UI string before 5.67
@@ -75,5 +75,5 @@ index 78fcb01..53d61ed 100644
kastencontrollers_add_sublibrary(program/uicolorscheme
PUBLIC
--
2.30.2
2.50.1