diff options
| author | pancho horrillo | 2021-11-30 13:46:36 +0100 |
|---|---|---|
| committer | pancho horrillo | 2021-11-30 13:46:36 +0100 |
| commit | 956945771a98a3dae05a0bc0dd09cc4c1ef0cfd2 (patch) | |
| tree | 8e3482401914f1159713613177e494479f17e5b8 | |
| parent | 98453b69b255f2c4a5c599441ef696499d2a1ac1 (diff) | |
| download | aur-956945771a98a3dae05a0bc0dd09cc4c1ef0cfd2.tar.gz | |
Drop GTK+2 configuaration
Cherry-picked from emacs-git¹.
https://aur.archlinux.org/cgit/aur.git/commit/?h=emacs-git&id=e9198eeda18785494a33fa7b8d0406340354e3f7
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
2 files changed, 4 insertions, 10 deletions
@@ -1,7 +1,7 @@ pkgbase = emacs28-git pkgdesc = GNU Emacs. emacs-28 release branch. pkgver = 28.0.60.152178 - pkgrel = 2 + pkgrel = 3 url = http://www.gnu.org/software/emacs/ install = emacs28-git.install arch = x86_64 @@ -53,7 +53,6 @@ LUCID= # Use the lucid, a.k.a athena, toolkit. Like XEmacs, sorta. # for some tips on using outline fonts with # Xft, if you choose no toolkit or Lucid. # -GTK2= # GTK2 support. Why would you? NOCAIRO= # Disable here. XWIDGETS= # Use GTK+ widgets pulled from webkit2gtk. Usable. DOCS_HTML= # Generate and install html documentation. @@ -71,7 +70,7 @@ else pkgname="emacs28-git" fi pkgver=28.0.60.152178 -pkgrel=2 +pkgrel=3 pkgdesc="GNU Emacs. emacs-28 release branch." arch=('x86_64') url="http://www.gnu.org/software/emacs/" @@ -131,9 +130,6 @@ elif [[ $NOTKIT == "YES" ]]; then elif [[ $LUCID == "YES" ]]; then depends+=( 'dbus' 'hicolor-icon-theme' 'libxinerama' 'libxfixes' 'lcms2' 'librsvg' 'xaw3d' 'libxrandr' ); makedepends+=( 'xorgproto' ); -elif [[ $GTK2 == "YES" ]]; then - depends+=( 'gtk2' 'lcms2' ); - makedepends+=( 'xorgproto' ); else depends+=( 'gtk3' ); makedepends+=( 'xorgproto' ); @@ -152,10 +148,10 @@ if [[ ! $NOCAIRO == "YES" ]] && [[ ! $CLI == "YES" ]] ; then fi if [[ $XWIDGETS == "YES" ]]; then - if [[ $GTK2 == "YES" ]] || [[ $LUCID == "YES" ]] || [[ $NOTKIT == "YES" ]] || [[ $CLI == "YES" ]]; then + if [[ $LUCID == "YES" ]] || [[ $NOTKIT == "YES" ]] || [[ $CLI == "YES" ]]; then echo ""; echo ""; - echo "Xwidgets support *requires* gtk+3!!!"; + echo "Xwidgets support *requires* GTK+3!!!"; echo ""; echo ""; exit 1; @@ -235,8 +231,6 @@ elif [[ $NOTKIT == "YES" ]]; then _conf+=( '--with-x-toolkit=no' '--without-toolkit-scroll-bars' '--with-xft' '--without-xaw3d' ); elif [[ $LUCID == "YES" ]]; then _conf+=( '--with-x-toolkit=lucid' '--with-xft' '--with-xaw3d' ); -elif [[ $GTK2 == "YES" ]]; then - _conf+=( '--with-x-toolkit=gtk2' '--without-gsettings' '--without-xaw3d' ); else _conf+=( '--with-x-toolkit=gtk3' '--without-xaw3d' ); fi |