summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2024-04-18 14:07:09 +0200
committerØrjan Malde <red@foxi.me>2024-04-18 14:07:09 +0200
commitc89e0bde94df5daf7f85f97db6ae01f637c58746 (patch)
tree6eb663534acef2972dd79ae671b69808a50f382e
parentdb28b13be77c0582890345d02be048468e57f558 (diff)
downloadmidipix_build-c89e0bde94df5daf7f85f97db6ae01f637c58746.tar.bz2
midipix_build-c89e0bde94df5daf7f85f97db6ae01f637c58746.tar.xz
groups.d/231.native_packages_etc.group: drop yabasic
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups.d/231.native_packages_etc.group9
-rw-r--r--patches/yabasic-2.83.0.local.patch40
2 files changed, 1 insertions, 48 deletions
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index 59051f23..a452983f 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -9,8 +9,7 @@ giflib gnuchess graphicsmagick gzip hastyhex hexcurse hexer htop icoutils imagem
john lbreakout2 lcms less libmetalink lolcode ltris minizip mintty mlogin musl_compat musl_fts ncdu
ncurses ncursestw ncursesw npth openjazz openjpeg p7zip pcre pcre2 php popt potrace procps_ng qemu
qpdf qrencode rpm rw sdlquake shared_mime_info slang sqlite3 tcl tdnf texinfo
-tiff tmux tzdb utf8proc util_linux vim vorbis_tools w32api w32lib xorriso xpdf xz yabasic
-zstd";
+tiff tmux tzdb utf8proc util_linux vim vorbis_tools w32api w32lib xorriso xpdf xz zstd";
: ${PKG_APR_SHA256SUM:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105};
: ${PKG_APR_VERSION:=1.6.5};
: ${PKG_APR_URL:=http://ftp.fau.de/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
@@ -550,12 +549,6 @@ vim_cv_timer_create=yes"};
: ${PKG_XZ_VERSION:=5.2.5};
: ${PKG_XZ_URL:=https://mirror.midipix.org/xz/xz-${PKG_XZ_HOST_VERSION}.tar.xz};
: ${PKG_XZ_CFLAGS_BUILD_EXTRA:="-DLZMA_RANGE_DECODER_CONFIG=3"};
-
-: ${PKG_YABASIC_SHA256SUM:=24eaca1a520817ec266d132d89b4a657d5adf3e6bad54f13b103991afdca6d40};
-: ${PKG_YABASIC_VERSION:=2.83.0};
-: ${PKG_YABASIC_URL:=http://www.yabasic.de/download/yabasic-${PKG_YABASIC_VERSION}.tar.gz};
-: ${PKG_YABASIC_CONFIG_CACHE_EXTRA:="ac_cv_func_strtod=yes"};
-: ${PKG_YABASIC_DISABLED:=1};
: ${PKG_ZSTD_SHA256SUM:=98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1};
: ${PKG_ZSTD_VERSION:=1.5.5};
: ${PKG_ZSTD_URL:=https://github.com/facebook/zstd/archive/v${PKG_ZSTD_VERSION}.tar.gz};
diff --git a/patches/yabasic-2.83.0.local.patch b/patches/yabasic-2.83.0.local.patch
deleted file mode 100644
index 8dee7982..00000000
--- a/patches/yabasic-2.83.0.local.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru yabasic-2.83.0.orig/configure yabasic-2.83.0/configure
---- yabasic-2.83.0.orig/configure 2019-06-15 16:58:01.081213787 +0200
-+++ yabasic-2.83.0/configure 2019-06-15 16:58:27.697212954 +0200
-@@ -13304,7 +13304,7 @@
- return 0;
- }
- _ACEOF
--for ac_lib in '' curses; do
-+for ac_lib in '' ncurses; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
-Only in yabasic-2.83.0: configure.orig
-diff -ru yabasic-2.83.0.orig/graphic.c yabasic-2.83.0/graphic.c
---- yabasic-2.83.0.orig/graphic.c 2019-05-16 06:01:06.000000000 +0200
-+++ yabasic-2.83.0/graphic.c 2019-06-15 17:03:51.116903177 +0200
-@@ -19,7 +19,11 @@
- #include "yabasic.h" /* all prototypes and structures */
- #endif
- #ifdef UNIX
-+#ifdef HAVE_NCURSES_H
-+#include <ncurses.h>
-+#elif HAVE_CURSES_H
- #include <curses.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-diff -ru yabasic-2.83.0.orig/whereami.c yabasic-2.83.0/whereami.c
---- yabasic-2.83.0.orig/whereami.c 2019-03-10 16:36:25.000000000 +0100
-+++ yabasic-2.83.0/whereami.c 2019-06-15 17:08:39.723539493 +0200
-@@ -164,7 +164,7 @@
- return length;
- }
-
--#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-+#elif defined(__linux__) || defined(__midipix__) || defined(__CYGWIN__) || defined(__sun) || (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-
- #include <stdio.h>
- #include <stdlib.h>