Browse Source

links: enable graphics support

Requires libice, libsm, libxt to be moved from x11-packages repo.
master
Leonid Plyushch 5 years ago
parent
commit
893efbfdd0
No known key found for this signature in database GPG Key ID: 45F2964132545795
  1. 10
      packages/libice/build.sh
  2. 12
      packages/libice/src-authutil.c.patch
  3. 11
      packages/libsm/build.sh
  4. 17
      packages/libxt/build.sh
  5. 60
      packages/libxt/configure.patch
  6. 13
      packages/libxt/include-x11-InitialI.h.patch
  7. 13
      packages/libxt/src-Shell.c.patch
  8. 11
      packages/links/build.sh

10
packages/libice/build.sh

@ -0,0 +1,10 @@
# X11 package
TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="X11 Inter-Client Exchange library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=1.0.10
TERMUX_PKG_REVISION=13
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libICE-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348
TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros, xtrans"

12
packages/libice/src-authutil.c.patch

@ -0,0 +1,12 @@
diff -uNr libICE-1.0.10/src/authutil.c libICE-1.0.10.mod/src/authutil.c
--- libICE-1.0.10/src/authutil.c 2019-07-14 20:43:16.000000000 +0300
+++ libICE-1.0.10.mod/src/authutil.c 2020-01-05 16:10:46.039276106 +0200
@@ -188,7 +188,7 @@
if (creat_fd != -1)
{
- if (link (creat_name, link_name) != -1)
+ if (symlink (creat_name, link_name) != -1)
return (IceAuthLockSuccess);
if (errno == ENOENT)

11
packages/libsm/build.sh

@ -0,0 +1,11 @@
# X11 package
TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="X11 Session Management library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=1.2.3
TERMUX_PKG_REVISION=15
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libSM-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb
TERMUX_PKG_DEPENDS="libice, libuuid"
TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros, xtrans"

17
packages/libxt/build.sh

@ -0,0 +1,17 @@
# X11 package
TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="X11 toolkit intrinsics library"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=1.2.0
TERMUX_PKG_REVISION=12
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libXt-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831
TERMUX_PKG_DEPENDS="libice, libsm, libuuid, libx11, libxau, libxcb, libxdmcp"
TERMUX_PKG_BUILD_DEPENDS="xorg-util-macros"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-malloc0returnsnull"
termux_step_pre_configure() {
export CFLAGS_FOR_BUILD=" "
export LDFLAGS_FOR_BUILD=" "
}

60
packages/libxt/configure.patch

@ -0,0 +1,60 @@
diff -uNr libXt-1.2.0/configure libXt-1.2.0.mod/configure
--- libXt-1.2.0/configure 2019-06-22 02:30:06.000000000 +0300
+++ libXt-1.2.0.mod/configure 2019-06-29 23:10:33.160835538 +0300
@@ -19231,56 +19231,6 @@
fi
-# Check for flag to avoid builtin definitions - assumes unix is predefined,
-# which is not the best choice for supporting other OS'es, but covers most
-# of the ones we need for now.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5
-$as_echo_n "checking if $RAWCPP requires -undef... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-Does cpp redefine unix ?
-_ACEOF
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- RAWCPPFLAGS=-undef
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- # under Cygwin unix is still defined even with -undef
- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
- RAWCPPFLAGS="-undef -ansi"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5
-$as_echo "yes, with -ansi" >&6; }
- else
- as_fn_error $? "${RAWCPP} defines unix with or without -undef. I don't know what to do." "$LINENO" 5
- fi
-fi
-rm -f conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5
-$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-Does cpp preserve "whitespace"?
-_ACEOF
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- TRADITIONALCPPFLAGS="-traditional"
- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- as_fn_error $? "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5
- fi
-fi
-rm -f conftest.$ac_ext
-
-

13
packages/libxt/include-x11-InitialI.h.patch

@ -0,0 +1,13 @@
diff -uNr libXt-1.2.0/include/X11/InitialI.h libXt-1.2.0.mod/include/X11/InitialI.h
--- libXt-1.2.0/include/X11/InitialI.h 2019-06-22 02:29:53.000000000 +0300
+++ libXt-1.2.0.mod/include/X11/InitialI.h 2019-06-29 23:39:02.027977057 +0300
@@ -271,9 +271,7 @@
_XtBoolean /* ignoreInputs */,
_XtBoolean /* ignoreSignals */,
_XtBoolean /* block */,
-#ifdef XTHREADS
_XtBoolean /* drop_lock */,
-#endif
unsigned long* /* howlong */
);

13
packages/libxt/src-Shell.c.patch

@ -0,0 +1,13 @@
diff -uNr libXt-1.2.0/src/Shell.c libXt-1.2.0.mod/src/Shell.c
--- libXt-1.2.0/src/Shell.c 2019-06-22 02:29:55.000000000 +0300
+++ libXt-1.2.0.mod/src/Shell.c 2019-06-29 23:41:30.634530801 +0300
@@ -1961,9 +1961,7 @@
if (_XtWaitForSomething (app,
FALSE, TRUE, TRUE, TRUE,
TRUE,
-#ifdef XTHREADS
FALSE,
-#endif
&timeout) != -1) {
while (XCheckIfEvent(XtDisplay(w),event,isMine,(char*)&q)) {
if (q.done) return TRUE;

11
packages/links/build.sh

@ -3,8 +3,13 @@ TERMUX_PKG_DESCRIPTION="Links is a text and graphics mode WWW browser"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=2.20.2
TERMUX_PKG_REVISION=3
TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=http://links.twibright.com/download/links-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=f0ec13b019e5501ef29858bf61a3bf89cece0b0f065b5064be242bce84e675bd
TERMUX_PKG_DEPENDS="libbz2, libevent, liblzma, openssl, zlib, zstd"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --mandir=$TERMUX_PREFIX/share/man"
TERMUX_PKG_DEPENDS="libbz2, libevent, liblzma, libpng, librsvg, libtiff, libx11, openssl, zlib, zstd"
TERMUX_PKG_BUILD_DEPENDS="libxt"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--mandir=$TERMUX_PREFIX/share/man
--enable-graphics
"

Loading…
Cancel
Save