ports/xbanan: Update to new version
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
NAME='xbanan'
|
||||
VERSION='git'
|
||||
DOWNLOAD_URL="https://git.bananymous.com/Bananymous/xbanan.git#b2c642f03d2e498e9d6acd55cc89a5e76c220811"
|
||||
DOWNLOAD_URL="https://git.bananymous.com/Bananymous/xbanan.git#a02355eb20007e81cca9cad9267b170fba8b7a1f"
|
||||
DEPENDENCIES=('xorgproto')
|
||||
|
||||
configure() {
|
||||
@@ -10,6 +10,8 @@ configure() {
|
||||
--toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DPLATFORM=banan-os \
|
||||
-DFONT_PATH=/usr/share/fonts/X11 \
|
||||
|| exit 1
|
||||
}
|
||||
|
||||
|
||||
25
ports/xbanan/patches/0001-fix-keymap-path.patch
Normal file
25
ports/xbanan/patches/0001-fix-keymap-path.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
From ee48f2a3a6a8fe829b1250c06850f2360ec8d17c Mon Sep 17 00:00:00 2001
|
||||
From: Oskari Alaranta <oskari.alaranta@bananymous.com>
|
||||
Date: Tue, 23 Jun 2026 23:53:51 +0300
|
||||
Subject: [PATCH] fix keymap path
|
||||
|
||||
---
|
||||
xbanan/banan-os/banan-os.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbanan/banan-os/banan-os.cpp b/xbanan/banan-os/banan-os.cpp
|
||||
index 99cb7ea..bc1709e 100644
|
||||
--- a/xbanan/banan-os/banan-os.cpp
|
||||
+++ b/xbanan/banan-os/banan-os.cpp
|
||||
@@ -258,7 +258,7 @@ static BAN::ErrorOr<void> bananos_initialize_keymap()
|
||||
};
|
||||
|
||||
// FIXME: get this from somewhere (gui command? enviroment? tmp file?)
|
||||
- const auto keymap_path = "./us.keymap"_sv;
|
||||
+ const auto keymap_path = "/usr/share/keymaps/us.keymap"_sv;
|
||||
TRY(LibInput::KeyboardLayout::initialize());
|
||||
auto& keyboard_layout = LibInput::KeyboardLayout::get();
|
||||
TRY(keyboard_layout.load_from_file(keymap_path));
|
||||
--
|
||||
2.54.0
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 49bebc56e29918b97dd7b56e925a0904f0d78a1b Mon Sep 17 00:00:00 2001
|
||||
From: Oskari Alaranta <oskari.alaranta@bananymous.com>
|
||||
Date: Sat, 21 Feb 2026 19:34:56 +0200
|
||||
Subject: [PATCH] use unix sockets instead of TCP
|
||||
|
||||
---
|
||||
xbanan/main.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbanan/main.cpp b/xbanan/main.cpp
|
||||
index b5d1d41..cafff69 100644
|
||||
--- a/xbanan/main.cpp
|
||||
+++ b/xbanan/main.cpp
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
-#define USE_UNIX_SOCKET 0
|
||||
+#define USE_UNIX_SOCKET 1
|
||||
|
||||
#if USE_UNIX_SOCKET
|
||||
#include <sys/un.h>
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 9cdbb61482f062bfc66bb0fa4c4fd4b590aaf885 Mon Sep 17 00:00:00 2001
|
||||
From: Oskari Alaranta <oskari.alaranta@bananymous.com>
|
||||
Date: Sat, 21 Feb 2026 19:27:47 +0200
|
||||
Subject: [PATCH] fix font path
|
||||
|
||||
---
|
||||
xbanan/Font.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbanan/Font.cpp b/xbanan/Font.cpp
|
||||
index 135d97f..051f289 100644
|
||||
--- a/xbanan/Font.cpp
|
||||
+++ b/xbanan/Font.cpp
|
||||
@@ -391,7 +391,7 @@ static BAN::ErrorOr<BAN::RefPtr<PCFFont>> parse_font(const BAN::String& path)
|
||||
__attribute__((constructor))
|
||||
static void initialize_fonts()
|
||||
{
|
||||
- const char* font_path = "fonts/misc";
|
||||
+ const char* font_path = "/usr/share/fonts/X11/misc";
|
||||
|
||||
do
|
||||
{
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 72f6d748c9448d362ff70be456016ceaa9d746d6 Mon Sep 17 00:00:00 2001
|
||||
From: Oskari Alaranta <oskari.alaranta@bananymous.com>
|
||||
Date: Sat, 21 Feb 2026 19:38:17 +0200
|
||||
Subject: [PATCH] fix keymap path
|
||||
|
||||
---
|
||||
xbanan/Keymap.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbanan/Keymap.cpp b/xbanan/Keymap.cpp
|
||||
index c02a1ca..21218ea 100644
|
||||
--- a/xbanan/Keymap.cpp
|
||||
+++ b/xbanan/Keymap.cpp
|
||||
@@ -323,7 +323,7 @@ BAN::ErrorOr<void> initialize_keymap()
|
||||
keysym = NoSymbol;
|
||||
|
||||
// FIXME: get this from somewhere (gui command? enviroment? tmp file?)
|
||||
- const auto keymap_path = "./us.keymap"_sv;
|
||||
+ const auto keymap_path = "/usr/share/keymaps/us.keymap"_sv;
|
||||
|
||||
TRY(LibInput::KeyboardLayout::initialize());
|
||||
|
||||
--
|
||||
2.53.0
|
||||
|
||||
Reference in New Issue
Block a user