From 191faac17c3282abb2b02d8b2b7cce77d28815b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Fri, 25 Sep 2020 22:56:24 +0200
Subject: groups/231.native_packages_etc.group: adds hexer v1.0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
---
groups/231.native_packages_etc.group | 10 +++++++-
patches/hexer-1.0.6.local.patch | 45 ++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 patches/hexer-1.0.6.local.patch
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index c7d6a744..4bfa5930 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -5,7 +5,7 @@ GROUP_TARGET="native_packages";
NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
alsa_lib apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante dbus
dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl
-giflib gnuchess gzip hastyhex hexcurse htop icoutils imagemagick infounzip infozip
+giflib gnuchess gzip hastyhex hexcurse hexer htop icoutils imagemagick infounzip infozip
john lcms2 less libmetalink lolcode mintty mlogin musl_compat musl_fts ncdu
ncurses ncursestw ncursesw npth openjpeg p7zip pcre popt potrace procps_ng qemu
qpdf qrencode rpm rw shared_mime_info slang sqlite3 tcl tdnf texinfo
@@ -158,6 +158,14 @@ zstd")";
: ${PKG_HEXCURSE_URLS_GIT:="hexcurse=https://github.com/LonnyGomes/hexcurse@master"};
: ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncurses};
: ${PKG_HEXCURSE_MAKEFLAGS_BUILD:="LIBS=-Wl,-lncurses,-ltinfo"};
+: ${PKG_HEXER_DEPENDS:="ncurses"};
+: ${PKG_HEXER_SHA256SUM:=e6b84ace5283825943f88ce7ec4ae836ec15ba41978b3a858d6d478cfe09ff94};
+: ${PKG_HEXER_VERSION:=1.0.6};
+: ${PKG_HEXER_URL:=https://devel.ringlet.net/files/editors/hexer/hexer-${PKG_HEXER_VERSION}.tar.xz};
+: ${PKG_HEXER_CFLAGS_BUILD_EXTRA:="-isystem${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncurses"};
+: ${PKG_HEXER_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib"};
+: ${PKG_HEXER_ENV_VARS_EXTRA:="CC_FOR_BUILD=gcc"};
+: ${PKG_HEXER_IN_TREE:=1};
: ${PKG_HTOP_DEPENDS:="ncursesw"};
: ${PKG_HTOP_SHA256SUM:=d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57};
: ${PKG_HTOP_VERSION:=2.2.0};
diff --git a/patches/hexer-1.0.6.local.patch b/patches/hexer-1.0.6.local.patch
new file mode 100644
index 00000000..15b200d0
--- /dev/null
+++ b/patches/hexer-1.0.6.local.patch
@@ -0,0 +1,45 @@
+diff -ru hexer-1.0.6.orig/edit.c hexer-1.0.6/edit.c
+--- hexer-1.0.6.orig/edit.c 2020-04-24 15:06:48.000000000 +0200
++++ hexer-1.0.6/edit.c 2020-09-25 22:48:48.412100792 +0200
+@@ -51,7 +51,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ #include <unistd.h>
+-#include <curses.h>
++#include <ncurses.h>
+ #include <term.h>
+
+ #include "buffer.h"
+diff -ru hexer-1.0.6.orig/Makefile hexer-1.0.6/Makefile
+--- hexer-1.0.6.orig/Makefile 2020-04-24 15:06:48.000000000 +0200
++++ hexer-1.0.6/Makefile 2020-09-25 22:53:09.703828744 +0200
+@@ -19,7 +19,7 @@
+ #LTERMCAP ?= -ltermcap
+ #
+ # ...or this one if you want to use curses.
+-LTERMCAP ?= -lcurses
++LTERMCAP ?= -lncurses -ltinfo
+
+ CPPFLAGS_STD ?= -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 \
+ -D_FILE_OFFSET_BITS=64
+@@ -72,7 +72,7 @@
+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -DMYCALC=1 -o $@ calc.c -lm
+
+ bin2c: bin2c.c
+- $(CC_FOR_BUILD) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ bin2c.c
++ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ bin2c.c
+
+ helptext.c: help.txt bin2c
+ ./bin2c -n helptext -o $@ help.txt
+diff -ru hexer-1.0.6.orig/tio.c hexer-1.0.6/tio.c
+--- hexer-1.0.6.orig/tio.c 2020-04-24 15:06:48.000000000 +0200
++++ hexer-1.0.6/tio.c 2020-09-25 22:48:26.032101493 +0200
+@@ -73,7 +73,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <signal.h>
+-#include <curses.h>
++#include <ncurses.h>
+ #include <term.h>
+
+ #ifndef bzero
--
cgit v1.2.3