From edf068b8fd90974d7d16ef32a727a8bc866a7dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Mon, 29 Aug 2022 16:33:09 +0200 Subject: groups/231.native_packages_etc.group: slang: bump to v2.3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/231.native_packages_etc.group | 4 +- patches/slang-2.3.2.local.patch | 113 ----------------------------------- patches/slang-2.3.3.local.patch | 113 +++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 115 deletions(-) delete mode 100644 patches/slang-2.3.2.local.patch create mode 100644 patches/slang-2.3.3.local.patch diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index a96df99f..3c028594 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -444,8 +444,8 @@ have_shm_mmap_posix=yes"}; : ${PKG_SHARED_MIME_INFO_CONFIGURE_ARGS_EXTRA:=--disable-update-mimedb}; : ${PKG_SHARED_MIME_INFO_MAKEFLAGS_BUILD:=-j1}; : ${PKG_SLANG_DEPENDS:="libpng ncursesw"}; -: ${PKG_SLANG_SHA256SUM:=fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a}; -: ${PKG_SLANG_VERSION:=2.3.2}; +: ${PKG_SLANG_SHA256SUM:=f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18}; +: ${PKG_SLANG_VERSION:=2.3.3}; : ${PKG_SLANG_URL:=https://www.jedsoft.org/releases/slang/slang-${PKG_SLANG_VERSION}.tar.bz2}; : ${PKG_SLANG_IN_TREE:=1}; : ${PKG_SLANG_MAKEFLAGS_BUILD_EXTRA:=-j1}; diff --git a/patches/slang-2.3.2.local.patch b/patches/slang-2.3.2.local.patch deleted file mode 100644 index 33ea1090..00000000 --- a/patches/slang-2.3.2.local.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -ru slang-2.3.2.orig/configure slang-2.3.2/configure ---- slang-2.3.2.orig/configure 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/configure 2020-09-15 12:16:06.735950835 +0200 -@@ -7082,8 +7082,8 @@ - fi - fi - --OBJDIR=$SRCDIR/"\$(ARCH)"objs --ELFDIR=$SRCDIR/"\$(ARCH)"elfobjs -+OBJDIR=$SRCDIR/objs -+ELFDIR=$SRCDIR/elfobjs - - - missingmodules="" -diff -ru slang-2.3.2.orig/demo/Makefile.in slang-2.3.2/demo/Makefile.in ---- slang-2.3.2.orig/demo/Makefile.in 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/demo/Makefile.in 2020-09-15 12:13:09.195956393 +0200 -@@ -10,7 +10,7 @@ - # Directory where the various libraries are located. - #----------------------------------------------------------------------------- - SLANG_INCLUDE = ../src# location of slang.h --SLANG_LIB = $(SLANG_INCLUDE)/$(ARCH)objs# location of libslang.a -+SLANG_LIB = $(SLANG_INCLUDE)/objs# location of libslang.a - - #--------------------------------------------------------------------------- - # Other libraries -diff -ru slang-2.3.2.orig/modules/Makefile.in slang-2.3.2/modules/Makefile.in ---- slang-2.3.2.orig/modules/Makefile.in 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/modules/Makefile.in 2020-09-15 12:19:04.808713632 +0200 -@@ -16,14 +16,14 @@ - # --------------------------------------------------------------------------- - CC = @CC@ - CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -L../../src/elfobjs -lslang - CC_SHARED_FLAGS = @CC_SHARED_FLAGS@ - CC_SHARED = $(CC) $(INCS) $(CC_SHARED_FLAGS) $(CFLAGS) - CONFIG_DIR = @CONFIG_DIR@ - SRCDIR = $(CONFIG_DIR)/modules - CONFIG_H = $(SRCDIR)/config.h - SLINT_H = $(SRCDIR)/slint.h --OBJDIR = $(ARCH)objs -+OBJDIR = objs - OBJDIR_TSTAMP = $(OBJDIR)/tstamp - # --------------------------------------------------------------------------- - # Installation location of the slang library -diff -ru slang-2.3.2.orig/slsh/Makefile.in slang-2.3.2/slsh/Makefile.in ---- slang-2.3.2.orig/slsh/Makefile.in 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/slsh/Makefile.in 2020-09-15 12:19:42.948712438 +0200 -@@ -4,7 +4,7 @@ - LDFLAGS = @LDFLAGS@ - DLINK_FLAGS = @DYNAMIC_LINK_FLAGS@ - CONFIG_DIR = @CONFIG_DIR@ --OBJDIR = $(ARCH)objs -+OBJDIR = objs - SOBJDIR = static_objs - SRCDIR = $(CONFIG_DIR)/slsh - #--------------------------------------------------------------------------- -@@ -15,7 +15,6 @@ - datarootdir = @datarootdir@ - INST_LIB_DIR = @libdir@ - SLANG_INST_INC = -I@includedir@ --SLANG_INST_LIB = -L$(INST_LIB_DIR) - #--------------------------------------------------------------------------- - SLANG_SRCINC = -I@SRCDIR@ - SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked -diff -ru slang-2.3.2.orig/src/curses/Makefile slang-2.3.2/src/curses/Makefile ---- slang-2.3.2.orig/src/curses/Makefile 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/src/curses/Makefile 2020-09-15 12:14:23.903954054 +0200 -@@ -1,5 +1,5 @@ - COMPILE = $(CC) $(CFLAGS) -g -DSLANG -I.. --LFLAGS = -L../$(ARCH)objs -lslang -+LFLAGS = -L../objs -lslang - M_LIB = -lm - - CURSES_H = ../curses.h -diff -ru slang-2.3.2.orig/src/Makefile.in slang-2.3.2/src/Makefile.in ---- slang-2.3.2.orig/src/Makefile.in 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/src/Makefile.in 2020-09-15 12:13:33.371955636 +0200 -@@ -244,7 +244,7 @@ - # The symlinks target is for my own private use. It simply creates the object - # directory as a symbolic link to a local disk instead of an NFS mounted one. - symlinks: -- -/bin/rm -f $(ARCH)objs -+ -/bin/rm -f objs - mkdir -p $(HOME)/sys/$(ARCH)/objs/slang/src - ln -s $(HOME)/sys/$(ARCH)/objs/slang/src $(ARCH)objs - @echo "Also try: make elfsymlinks" -diff -ru slang-2.3.2.orig/src/test/Makefile slang-2.3.2/src/test/Makefile ---- slang-2.3.2.orig/src/test/Makefile 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/src/test/Makefile 2020-09-15 12:14:49.723953246 +0200 -@@ -13,7 +13,7 @@ - MEMCHECK = valgrind --tool=memcheck --leak-check=yes --leak-resolution=med --num-callers=20 - RUN_TEST_PGM = ./$(TEST_PGM) - SLANGINC = .. --SLANGLIB = ../$(ARCH)objs -+SLANGLIB = ../objs - OTHER_LIBS = -lm - OTHER_CFLAGS = - -diff -ru slang-2.3.2.orig/src/util/Makefile slang-2.3.2/src/util/Makefile ---- slang-2.3.2.orig/src/util/Makefile 2018-03-05 00:16:36.000000000 +0100 -+++ slang-2.3.2/src/util/Makefile 2020-09-15 12:15:07.135952701 +0200 -@@ -1,7 +1,7 @@ - INCS = -I.. --LIBS = -L../$(ARCH)objs -lslang -lm -+LIBS = -L../objs -lslang -lm - --bcdump: bcdump.c ../$(ARCH)objs/libslang.a -+bcdump: bcdump.c ../objs/libslang.a - $(CC) $(CFLAGS) $(INCS) bcdump.c -o bcdump $(LIBS) - clean: - /bin/rm -f *.o bcdump diff --git a/patches/slang-2.3.3.local.patch b/patches/slang-2.3.3.local.patch new file mode 100644 index 00000000..33ea1090 --- /dev/null +++ b/patches/slang-2.3.3.local.patch @@ -0,0 +1,113 @@ +diff -ru slang-2.3.2.orig/configure slang-2.3.2/configure +--- slang-2.3.2.orig/configure 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/configure 2020-09-15 12:16:06.735950835 +0200 +@@ -7082,8 +7082,8 @@ + fi + fi + +-OBJDIR=$SRCDIR/"\$(ARCH)"objs +-ELFDIR=$SRCDIR/"\$(ARCH)"elfobjs ++OBJDIR=$SRCDIR/objs ++ELFDIR=$SRCDIR/elfobjs + + + missingmodules="" +diff -ru slang-2.3.2.orig/demo/Makefile.in slang-2.3.2/demo/Makefile.in +--- slang-2.3.2.orig/demo/Makefile.in 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/demo/Makefile.in 2020-09-15 12:13:09.195956393 +0200 +@@ -10,7 +10,7 @@ + # Directory where the various libraries are located. + #----------------------------------------------------------------------------- + SLANG_INCLUDE = ../src# location of slang.h +-SLANG_LIB = $(SLANG_INCLUDE)/$(ARCH)objs# location of libslang.a ++SLANG_LIB = $(SLANG_INCLUDE)/objs# location of libslang.a + + #--------------------------------------------------------------------------- + # Other libraries +diff -ru slang-2.3.2.orig/modules/Makefile.in slang-2.3.2/modules/Makefile.in +--- slang-2.3.2.orig/modules/Makefile.in 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/modules/Makefile.in 2020-09-15 12:19:04.808713632 +0200 +@@ -16,14 +16,14 @@ + # --------------------------------------------------------------------------- + CC = @CC@ + CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -L../../src/elfobjs -lslang + CC_SHARED_FLAGS = @CC_SHARED_FLAGS@ + CC_SHARED = $(CC) $(INCS) $(CC_SHARED_FLAGS) $(CFLAGS) + CONFIG_DIR = @CONFIG_DIR@ + SRCDIR = $(CONFIG_DIR)/modules + CONFIG_H = $(SRCDIR)/config.h + SLINT_H = $(SRCDIR)/slint.h +-OBJDIR = $(ARCH)objs ++OBJDIR = objs + OBJDIR_TSTAMP = $(OBJDIR)/tstamp + # --------------------------------------------------------------------------- + # Installation location of the slang library +diff -ru slang-2.3.2.orig/slsh/Makefile.in slang-2.3.2/slsh/Makefile.in +--- slang-2.3.2.orig/slsh/Makefile.in 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/slsh/Makefile.in 2020-09-15 12:19:42.948712438 +0200 +@@ -4,7 +4,7 @@ + LDFLAGS = @LDFLAGS@ + DLINK_FLAGS = @DYNAMIC_LINK_FLAGS@ + CONFIG_DIR = @CONFIG_DIR@ +-OBJDIR = $(ARCH)objs ++OBJDIR = objs + SOBJDIR = static_objs + SRCDIR = $(CONFIG_DIR)/slsh + #--------------------------------------------------------------------------- +@@ -15,7 +15,6 @@ + datarootdir = @datarootdir@ + INST_LIB_DIR = @libdir@ + SLANG_INST_INC = -I@includedir@ +-SLANG_INST_LIB = -L$(INST_LIB_DIR) + #--------------------------------------------------------------------------- + SLANG_SRCINC = -I@SRCDIR@ + SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked +diff -ru slang-2.3.2.orig/src/curses/Makefile slang-2.3.2/src/curses/Makefile +--- slang-2.3.2.orig/src/curses/Makefile 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/src/curses/Makefile 2020-09-15 12:14:23.903954054 +0200 +@@ -1,5 +1,5 @@ + COMPILE = $(CC) $(CFLAGS) -g -DSLANG -I.. +-LFLAGS = -L../$(ARCH)objs -lslang ++LFLAGS = -L../objs -lslang + M_LIB = -lm + + CURSES_H = ../curses.h +diff -ru slang-2.3.2.orig/src/Makefile.in slang-2.3.2/src/Makefile.in +--- slang-2.3.2.orig/src/Makefile.in 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/src/Makefile.in 2020-09-15 12:13:33.371955636 +0200 +@@ -244,7 +244,7 @@ + # The symlinks target is for my own private use. It simply creates the object + # directory as a symbolic link to a local disk instead of an NFS mounted one. + symlinks: +- -/bin/rm -f $(ARCH)objs ++ -/bin/rm -f objs + mkdir -p $(HOME)/sys/$(ARCH)/objs/slang/src + ln -s $(HOME)/sys/$(ARCH)/objs/slang/src $(ARCH)objs + @echo "Also try: make elfsymlinks" +diff -ru slang-2.3.2.orig/src/test/Makefile slang-2.3.2/src/test/Makefile +--- slang-2.3.2.orig/src/test/Makefile 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/src/test/Makefile 2020-09-15 12:14:49.723953246 +0200 +@@ -13,7 +13,7 @@ + MEMCHECK = valgrind --tool=memcheck --leak-check=yes --leak-resolution=med --num-callers=20 + RUN_TEST_PGM = ./$(TEST_PGM) + SLANGINC = .. +-SLANGLIB = ../$(ARCH)objs ++SLANGLIB = ../objs + OTHER_LIBS = -lm + OTHER_CFLAGS = + +diff -ru slang-2.3.2.orig/src/util/Makefile slang-2.3.2/src/util/Makefile +--- slang-2.3.2.orig/src/util/Makefile 2018-03-05 00:16:36.000000000 +0100 ++++ slang-2.3.2/src/util/Makefile 2020-09-15 12:15:07.135952701 +0200 +@@ -1,7 +1,7 @@ + INCS = -I.. +-LIBS = -L../$(ARCH)objs -lslang -lm ++LIBS = -L../objs -lslang -lm + +-bcdump: bcdump.c ../$(ARCH)objs/libslang.a ++bcdump: bcdump.c ../objs/libslang.a + $(CC) $(CFLAGS) $(INCS) bcdump.c -o bcdump $(LIBS) + clean: + /bin/rm -f *.o bcdump -- cgit v1.2.3