summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpancho horrillo2021-12-12 06:06:28 +0100
committerpancho horrillo2021-12-12 06:06:28 +0100
commit52fb9297c8daca6354c828af050acaa5c880a22a (patch)
tree07bd9d057ce2d905eb366467d11c5f5e0444d3d3
parent20908ee1d722c0dcacfe5ea869f2dea62c48d815 (diff)
downloadaur-52fb9297c8daca6354c828af050acaa5c880a22a.tar.gz
Drop libotf and m17n-lib
Use harfbuzz and native methods instead. Cherry-picked from emacs-git¹. [1]: https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=emacs-git&id=48b2a70e648ff5cfc4c75636ee1f2338150b7791
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9cdbaa07bfce..7bcece2499fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = emacs28-git
pkgdesc = GNU Emacs. emacs-28 release branch.
pkgver = 28.0.90.151062
- pkgrel = 1
+ pkgrel = 2
url = http://www.gnu.org/software/emacs/
install = emacs28-git.install
arch = x86_64
@@ -13,8 +13,6 @@ pkgbase = emacs28-git
depends = libxml2
depends = jansson
depends = gpm
- depends = m17n-lib
- depends = libotf
depends = harfbuzz
depends = libgccjit
depends = gtk3
diff --git a/PKGBUILD b/PKGBUILD
index e3017d618bab..abe9ddd1e325 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -67,13 +67,13 @@ else
pkgname="emacs28-git"
fi
pkgver=28.0.90.151062
-pkgrel=1
+pkgrel=2
pkgdesc="GNU Emacs. emacs-28 release branch."
arch=('x86_64')
url="http://www.gnu.org/software/emacs/"
license=('GPL3')
depends_nox=('alsa-lib' 'gnutls' 'libxml2' 'jansson' 'gpm')
-depends=("${depends_nox[@]}" 'm17n-lib' 'libotf' 'harfbuzz')
+depends=("${depends_nox[@]}" 'harfbuzz')
makedepends=('git')
provides=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox')
conflicts=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs-git' 'emacs-seq' 'emacs-nox')
@@ -196,6 +196,8 @@ build() {
--with-gameuser=:games
--with-sound=alsa
--with-modules
+ --without-libotf
+ --without-m17n-flt
# Beware https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25228
# dconf and gconf break font settings you set in ~/.emacs.
# If you insist you'll need to read that bug report in *full*.