emacs: remove dbus flag, enable for gtk variants.
This commit is contained in:
parent
1a0d7c8df2
commit
687554b981
1 changed files with 14 additions and 13 deletions
|
@ -1,24 +1,24 @@
|
|||
# Template file for 'emacs'
|
||||
pkgname=emacs
|
||||
version=25.1
|
||||
revision=2
|
||||
revision=3
|
||||
nocross=yes
|
||||
nopie=yes
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkitgtk-devel
|
||||
$(vopt_if dbus dbus-devel)
|
||||
$(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
|
||||
$(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
|
||||
$(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel)
|
||||
$(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
|
||||
$(vopt_if sound alsa-lib-devel) acl-devel"
|
||||
dbus-devel acl-devel
|
||||
$(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
|
||||
$(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
|
||||
$(vopt_if svg librsvg-devel) $(vopt_if imagemagick libmagick-devel)
|
||||
$(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
|
||||
$(vopt_if sound alsa-lib-devel)"
|
||||
depends="emacs-common-${version}_${revision}"
|
||||
replaces="emacs>=0"
|
||||
build_style="gnu-configure"
|
||||
configure_args="--with-file-notification=inotify
|
||||
$(vopt_with dbus) $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif)
|
||||
$(vopt_with png) $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
|
||||
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound)"
|
||||
$(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
|
||||
$(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
|
||||
$(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound)"
|
||||
short_desc="GNU Emacs editor"
|
||||
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
|
||||
license="GPL-3"
|
||||
|
@ -27,7 +27,7 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
|||
checksum=19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33
|
||||
|
||||
# Package build options
|
||||
build_options="dbus jpeg tiff gif png xpm svg xml imagemagick gnutls sound"
|
||||
build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound"
|
||||
desc_option_xpm="Enable support for XPM images"
|
||||
desc_option_sound="Enable support for sound"
|
||||
build_options_default="jpeg tiff gif png xpm svg xml gnutls sound"
|
||||
|
@ -50,10 +50,11 @@ pre_configure() {
|
|||
|
||||
do_configure() {
|
||||
cd $wrksrc/nox
|
||||
./configure --without-x ${configure_args}
|
||||
./configure --without-x --without-dbus ${configure_args}
|
||||
|
||||
cd $wrksrc/x11
|
||||
./configure --with-x-toolkit=athena --without-toolkit-scroll-bars ${configure_args}
|
||||
./configure --with-x-toolkit=athena --without-toolkit-scroll-bars \
|
||||
--without-dbus ${configure_args}
|
||||
|
||||
cd $wrksrc/gtk2
|
||||
./configure --with-x-toolkit=gtk2 ${configure_args}
|
||||
|
|
Loading…
Reference in a new issue