From 7fda2d75d749cb87bc7e7df60b37f6365fa85212 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Thu, 6 Feb 2020 21:12:13 +0200 Subject: [PATCH] emacs-x: switch to lucid x toolkit Issue https://github.com/termux/x11-packages/issues/184. --- x11-packages/emacs-x/build.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh index e3934e97a..01d6fd168 100644 --- a/x11-packages/emacs-x/build.sh +++ b/x11-packages/emacs-x/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more (with X11 TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=26.3 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485 -TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, giflib, glib, gtk3, libandroid-shmem, libcairo, libgnutls, libice, libjpeg-turbo, libpng, librsvg, libsm, libtiff, libx11, libxcb, libxext, libxfixes, libxft, libxinerama, libxml2, libxpm, libxrandr, libxrender, littlecms, ncurses, pango, zlib" +TERMUX_PKG_DEPENDS="fontconfig, freetype, gdk-pixbuf, giflib, glib, libgnutls, libice, libjpeg-turbo, libpng, librsvg, libsm, libtiff, libx11, libxaw, libxcb, libxext, libxfixes, libxft, libxinerama, libxml2, libxmu, libxpm, libxrandr, libxrender, libxt, littlecms, ncurses, zlib" TERMUX_PKG_CONFLICTS="emacs" TERMUX_PKG_REPLACES="emacs" TERMUX_PKG_PROVIDES="emacs" @@ -35,6 +35,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --without-gconf --without-gsettings --with-x +--with-x-toolkit=lucid " # Ensure use of system malloc: TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_sanitize_address=yes" @@ -82,10 +83,6 @@ termux_step_host_build() { make -j $TERMUX_MAKE_PROCESSES } -ermux_step_pre_configure() { - export LIBS="-landroid-shmem" -} - termux_step_post_configure() { cp $TERMUX_PKG_HOSTBUILD_DIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-docfile $TERMUX_PKG_BUILDDIR/lib-src/make-docfile