diff --git a/srcpkgs/emacs-gtk2 b/srcpkgs/emacs-gtk2 deleted file mode 120000 index a7642dd168d..00000000000 --- a/srcpkgs/emacs-gtk2 +++ /dev/null @@ -1 +0,0 @@ -emacs \ No newline at end of file diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 1cd4d18bd6a..9c4405ffc88 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -9,7 +9,7 @@ configure_args="--with-file-notification=inotify --with-modules $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt) $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)" hostmakedepends="pkg-config tar" -makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel +makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-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) @@ -41,7 +41,6 @@ pre_configure() { mkdir -p nox mv * nox || true cp -a nox x11 - cp -a nox gtk2 cp -a nox gtk3 } @@ -54,9 +53,6 @@ do_configure() { $(vopt_with dbus) --without-gconf --without-gsettings \ ${configure_args} - cd $wrksrc/gtk2 - ./configure --with-x-toolkit=gtk2 ${configure_args} - cd $wrksrc/gtk3 ./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args} } @@ -64,7 +60,6 @@ do_configure() { do_build() { make ${makejobs} -C nox make ${makejobs} -C x11 - make ${makejobs} -C gtk2 make ${makejobs} -C gtk3 } @@ -101,19 +96,6 @@ emacs-x11_package() { } } -emacs-gtk2_package() { - depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme" - provides="emacs-${version}_${revision}" - replaces="emacs>=0" - short_desc+=" - GTK+2 version" - pkg_install() { - make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk2 install - rm -f ${PKGDESTDIR}/usr/bin/ctags - rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info} - rm -rf ${PKGDESTDIR}/usr/lib - } -} - emacs-gtk3_package() { depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme" provides="emacs-${version}_${revision}" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index df264c9d750..d5a5e66b8b1 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -68,6 +68,7 @@ replaces=" eclipse-ecj<=4.9_3 electron7<=7.3.3_1 electron9<=9.4.1_1 + emacs-gtk2<=27.2_1 enventor<=1.0.0_2 epstopdf<=2.27_3 flickcurl-devel<=1.26_4