haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

geany, bump version (#9750)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-11-12 15:37:27 +00:00
committed by GitHub
parent 52eb3366d0
commit b18d12ea63
3 changed files with 66 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dev-util/geany/geany-1.38.0.recipe → dev-util/geany/geany-2.0.0.recipe
View File

@@ -9,9 +9,9 @@ HOMEPAGE="https://www.geany.org"
COPYRIGHT="2005 The Geany-contributors
1998-2003 by Neil Hodgson"
LICENSE="GNU GPL v2"
REVISION="5"
REVISION="1"
SOURCE_URI="https://github.com/geany/geany/archive/refs/tags/$portVersion.tar.gz"
CHECKSUM_SHA256="d3b23a61f6ec3893671bac4f988f6ec3856092a233a47e3a170dc64212827e92"
CHECKSUM_SHA256="a744ab9ae3e58b371de4b50990c44227c499f82e2a8ee6753307ef107748e4df"
PATCHES="geany-$portVersion.patchset"
ADDITIONAL_FILES="geany.rdef.in"
@@ -28,17 +28,6 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
# cmd:javac >= 14
# cmd:fpc
# cmd:grep
# cmd:latex
# cmd:make
# cmd:perl
# cmd:python3
# cmd:tidy
# cmd:ruby
# cmd:valac #can't seem to find gobject_2.0
# php8$secondaryArchSuffix
lib:libatk_1.0$secondaryArchSuffix
lib:libcairo$secondaryArchSuffix
lib:libcairo_gobject$secondaryArchSuffix

34
dev-util/geany/patches/geany-1.38.0.patchset
View File

@@ -1,34 +0,0 @@
From a7ff274d2397677bfc9734c56d3b67fe53e02c6d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 28 Jul 2022 11:26:13 +0200
Subject: Add Haiku specifics
diff --git a/src/keyfile.c b/src/keyfile.c
index 90ad79a..6474a1e 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -78,6 +78,8 @@
#define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe /Q /C %c"
#elif defined(__APPLE__)
#define GEANY_DEFAULT_TOOLS_TERMINAL "open -a terminal %c"
+#elif defined(__HAIKU__)
+#define GEANY_DEFAULT_TOOLS_TERMINAL "Terminal"
#else
#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm -e \"/bin/sh %c\""
#endif
@@ -86,6 +88,11 @@
#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Helvetica Medium 12"
#define GEANY_DEFAULT_FONT_MSG_WINDOW "Menlo Medium 12"
#define GEANY_DEFAULT_FONT_EDITOR "Menlo Medium 12"
+#elif defined(__HAIKU__)
+#define GEANY_DEFAULT_TOOLS_BROWSER "WebPositive"
+#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Noto Sans Display Regular 10"
+#define GEANY_DEFAULT_FONT_MSG_WINDOW "Noto Sans Display Regular 10"
+#define GEANY_DEFAULT_FONT_EDITOR "Noto Sans Display Regular 10"
#else
#define GEANY_DEFAULT_TOOLS_BROWSER "firefox"
#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9"
--
2.36.1

64
dev-util/geany/patches/geany-2.0.0.patchset Normal file
View File

@@ -0,0 +1,64 @@
From 4e3bcdcdb8189d95fc8481ebedb4037046e6a241 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 12 Nov 2023 15:10:18 +0100
Subject: Build fix
diff --git a/ctags/main/portable-scandir.c b/ctags/main/portable-scandir.c
index 5e7c400..2d7609a 100644
--- a/ctags/main/portable-scandir.c
+++ b/ctags/main/portable-scandir.c
@@ -184,9 +184,15 @@ scandir(const char *directory_name,
int namelength = strlen(entry->d_name) + 1; /* length with NULL */
int extra = 0;
+#ifdef __HAIKU__
+ if (offsetof(struct dirent, d_name) <= namelength) {
+ /* allocated space <= required space */
+ extra += namelength - offsetof(struct dirent, d_name);
+#else
if (sizeof(entry->d_name) <= namelength) {
/* allocated space <= required space */
extra += namelength - sizeof(entry->d_name);
+#endif
}
if (copy = (struct dirent *)eMalloc(sizeof(struct dirent) + extra), copy == NULL) {
--
2.42.0
From 50f16e34aa860bd19a0d101d9e71be80d5dde0a3 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 12 Nov 2023 16:06:59 +0100
Subject: Add Haiku specifics
diff --git a/src/keyfile.c b/src/keyfile.c
index 05f3c65..42be885 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -82,6 +82,8 @@
#define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe /Q /C %c"
#elif defined(__APPLE__)
#define GEANY_DEFAULT_TOOLS_TERMINAL "open -a terminal %c"
+#elif defined(__HAIKU__)
+#define GEANY_DEFAULT_TOOLS_TERMINAL "Terminal"
#else
#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm -e \"/bin/sh %c\""
#endif
@@ -90,6 +92,11 @@
#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Helvetica Medium 12"
#define GEANY_DEFAULT_FONT_MSG_WINDOW "Menlo Medium 12"
#define GEANY_DEFAULT_FONT_EDITOR "Menlo Medium 12"
+#elif defined(__HAIKU__)
+#define GEANY_DEFAULT_TOOLS_BROWSER "WebPositive"
+#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Noto Sans Regular 10"
+#define GEANY_DEFAULT_FONT_MSG_WINDOW "Noto Sans Regular 10"
+#define GEANY_DEFAULT_FONT_EDITOR "Noto Sans Regular 10"
#else
/* Browser chosen by GTK */
#define GEANY_DEFAULT_TOOLS_BROWSER ""
--
2.42.0