ncurses: Increment build revision number
authorFredrik Fornwall <fredrik@fornwall.net>
Sat, 11 Jul 2015 20:50:36 +0000 (16:50 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Sat, 11 Jul 2015 20:50:36 +0000 (16:50 -0400)
packages/ncurses/build.sh
packages/ncurses/ncurses-tinfo-lib_setup.c.patch [new file with mode: 0644]
packages/ncurses/ncurses-tinfo-tinfo_driver.c.patch [new file with mode: 0644]

index 8cf1808..42b7301 100755 (executable)
@@ -5,6 +5,7 @@ _MAJOR_VERSION=5.9
 # in termux_step_post_extract_package below:
 _MINOR_VERSION=20141206
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/pub/gnu/ncurses/ncurses-${_MAJOR_VERSION}.tar.gz
 # --without-normal disables static libraries:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-overwrite --enable-const --without-cxx-binding --without-normal --without-static --with-shared --without-debug --enable-widec --enable-ext-colors --enable-ext-mouse --enable-pc-files --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR --without-ada --without-tests --mandir=$TERMUX_PREFIX/share/man ac_cv_header_locale_h=no"
diff --git a/packages/ncurses/ncurses-tinfo-lib_setup.c.patch b/packages/ncurses/ncurses-tinfo-lib_setup.c.patch
new file mode 100644 (file)
index 0000000..efa3f38
--- /dev/null
@@ -0,0 +1,25 @@
+diff -u -r ../src-patched/ncurses/tinfo/lib_setup.c ./ncurses/tinfo/lib_setup.c
+--- ../src-patched/ncurses/tinfo/lib_setup.c   2015-07-11 10:03:50.340357853 -0400
++++ ./ncurses/tinfo/lib_setup.c        2015-07-11 14:42:01.049867165 -0400
+@@ -352,21 +352,6 @@
+                   _nc_setenv_num("COLUMNS", *colp);
+               }
+           }
+-
+-          /*
+-           * Finally, look for environment variables.
+-           *
+-           * Solaris lets users override either dimension with an environment
+-           * variable.
+-           */
+-          if ((value = _nc_getenv_num("LINES")) > 0) {
+-              *linep = value;
+-              T(("screen size: environment LINES = %d", *linep));
+-          }
+-          if ((value = _nc_getenv_num("COLUMNS")) > 0) {
+-              *colp = value;
+-              T(("screen size: environment COLUMNS = %d", *colp));
+-          }
+       }
+       /* if we can't get dynamic info about the size, use static */
diff --git a/packages/ncurses/ncurses-tinfo-tinfo_driver.c.patch b/packages/ncurses/ncurses-tinfo-tinfo_driver.c.patch
new file mode 100644 (file)
index 0000000..5a53d34
--- /dev/null
@@ -0,0 +1,25 @@
+diff -u -r ../src-patched/ncurses/tinfo/tinfo_driver.c ./ncurses/tinfo/tinfo_driver.c
+--- ../src-patched/ncurses/tinfo/tinfo_driver.c        2015-07-11 10:03:50.340357853 -0400
++++ ./ncurses/tinfo/tinfo_driver.c     2015-07-11 10:04:02.836153796 -0400
+@@ -417,21 +417,6 @@
+                   _nc_setenv_num("COLUMNS", *colp);
+               }
+           }
+-
+-          /*
+-           * Finally, look for environment variables.
+-           *
+-           * Solaris lets users override either dimension with an environment
+-           * variable.
+-           */
+-          if ((value = _nc_getenv_num("LINES")) > 0) {
+-              *linep = value;
+-              T(("screen size: environment LINES = %d", *linep));
+-          }
+-          if ((value = _nc_getenv_num("COLUMNS")) > 0) {
+-              *colp = value;
+-              T(("screen size: environment COLUMNS = %d", *colp));
+-          }
+       }
+       /* if we can't get dynamic info about the size, use static */