Browse Source

ne: Update from 3.1.0 to 3.1.1

android-5
Fredrik Fornwall 8 years ago
parent
commit
9c43e1f914
  1. 14
      packages/ne/build.sh
  2. 24
      packages/ne/makefile.patch
  3. 21
      packages/ne/src-makefile.patch

14
packages/ne/build.sh

@ -1,19 +1,13 @@
TERMUX_PKG_HOMEPAGE=http://ne.di.unimi.it/
TERMUX_PKG_DESCRIPTION="Easy-to-use and powerful text editor"
TERMUX_PKG_MAINTAINER="David Martínez @vaites"
TERMUX_PKG_VERSION=3.1.0
TERMUX_PKG_VERSION=3.1.1
TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/ne-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=1b7e63b6f6db1671e19af05fb4230b86b4d0c25679e240d52a5c094a191dd683
TERMUX_PKG_SHA256=361aeeda179ac2904efe35f0c5d4c90e6e9a246485ddd9fa6fb74581803435e2
TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
TERMUX_PKG_RM_AFTER_INSTALL="info/"
TERMUX_PKG_BUILD_IN_SRC=yes
termux_step_make() {
CPPFLAGS+=" -Dindex=strchr"
CFLAGS+=" -I${TERMUX_PREFIX}"
sed -i -e "s%usr/local%$TERMUX_PREFIX%" makefile
sed -i -e "s%usr/local%$TERMUX_PREFIX%" src/makefile
make PREFIX=$TERMUX_PREFIX NE_GLOBAL_DIR=$TERMUX_PREFIX/share/ne
termux_step_pre_configure() {
export OPTS="$CFLAGS $CPPFLAGS"
}

24
packages/ne/makefile.patch

@ -1,7 +1,7 @@
diff -u -r ../ne-3.1.0/makefile ./makefile
--- ../ne-3.1.0/makefile 2017-04-29 12:22:39.000000000 +0200
+++ ./makefile 2017-05-04 23:14:54.916199058 +0200
@@ -8,7 +8,7 @@
diff -u -r ../ne-3.1.1/makefile ./makefile
--- ../ne-3.1.1/makefile 2017-06-04 22:43:12.000000000 +0200
+++ ./makefile 2017-06-06 09:45:51.221176799 +0200
@@ -8,10 +8,12 @@
# and installed under the $(PREFIX) hierarchy. You can even use "make install PREFIX=$HOME/<dir>"
# to install ne locally into the directory <dir>.
@ -10,7 +10,12 @@ diff -u -r ../ne-3.1.0/makefile ./makefile
PROGRAM = ne
@@ -20,7 +20,7 @@
+STRIP?=strip
+
ifeq ($(OS), Windows_NT)
OS := Windows
else
@@ -20,7 +22,7 @@
build: docs
@ -19,12 +24,3 @@ diff -u -r ../ne-3.1.0/makefile ./makefile
docs:
( cd doc; make )
@@ -82,7 +82,7 @@
ifneq ($(OS), Darwin)
$(error This target can only be run under Mac OS X)
endif
- ( cd src; make clean; make NE_GLOBAL_DIR=/usr/share/ne; strip ne )
+ ( cd src; make clean; make NE_GLOBAL_DIR=/usr/share/ne; $(STRIP) ne )
-rm -fr /tmp/package-ne-$(VERSION)
make install DESTDIR=/tmp/package-ne-$(VERSION)
pkgbuild --root /tmp/package-ne-$(VERSION) --install-location "/" --version $(VERSION) --identifier ne-$(VERSION) ne-$(VERSION).pkg

21
packages/ne/src-makefile.patch

@ -1,16 +1,16 @@
diff -u -r ../ne-3.1.0/src/makefile ./src/makefile
--- ../ne-3.1.0/src/makefile 2017-04-04 12:35:59.000000000 +0200
+++ ./src/makefile 2017-05-04 23:26:27.136260906 +0200
diff -u -r ../ne-3.1.1/src/makefile ./src/makefile
--- ../ne-3.1.1/src/makefile 2017-04-04 12:35:59.000000000 +0200
+++ ./src/makefile 2017-06-06 10:07:56.594364223 +0200
@@ -28,7 +28,7 @@
# where ne tries to read system-wide information (configuration
# files, etc.).
-NE_GLOBAL_DIR = /usr/local/share/ne
+NE_GLOBAL_DIR = $(PREFIX)/share/ne
+NE_GLOBAL_DIR ?= /usr/local/share/ne
PROGRAM = ne
@@ -81,13 +81,14 @@
@@ -81,7 +81,7 @@
NE_DEBUG=
NE_TEST=
@ -19,19 +19,12 @@ diff -u -r ../ne-3.1.0/src/makefile ./src/makefile
ifeq ($(CC),gcc)
GCCFLAGS=-std=c99 -Wall -Wno-parentheses
endif
CFLAGS=$(OPTS) $(GCCFLAGS) \
+ $(CPPFLAGS) \
-D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -Dinline=__inline__ \
$(if $(NE_NOWCHAR), -DNOWCHAR,) \
$(if $(NE_TEST), -DNE_TEST -coverage,) \
@@ -96,7 +97,7 @@
@@ -96,7 +96,7 @@
$(if $(NE_ANSI), -DTERMCAP -DANSI,)
-LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lcurses)
+LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lncurses)
+LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lncursesw)
ne: $(OBJS) $(if $(NE_TERMCAP)$(NE_ANSI),$(TERMCAPOBJS),)
$(CC) $(OPTS) $(LDFLAGS) $(if $(NE_TEST), -coverage -lefence,) $^ -lm $(LIBS) -o $(PROGRAM)

Loading…
Cancel
Save