From 5505774f85df146ea3f1a9d4125fa5d55762a27c Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 12 Sep 2018 23:35:26 +0300 Subject: [PATCH] emacs-x: this package conflicts with 'emacs' (cli version) and should replace it --- x11-packages/emacs-x/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh index 0759263c0..1dfdadedb 100644 --- a/x11-packages/emacs-x/build.sh +++ b/x11-packages/emacs-x/build.sh @@ -6,6 +6,9 @@ TERMUX_PKG_VERSION=26.1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c TERMUX_PKG_DEPENDS="giflib, libandroid-shmem, libgnutls, libgtk3, libjpeg-turbo, libpng, librsvg, libtiff, libxml2, libxpm, littlecms, ncurses" +TERMUX_PKG_CONFLICTS="emacs" +TERMUX_PKG_REPLACES="emacs" +TERMUX_PKG_PROVIDES="emacs" TERMUX_PKG_HOSTBUILD=yes TERMUX_PKG_KEEP_INFOPAGES=yes