<pre style='margin:0'>
Jimmy Yuen Ho Wong (wyuenho) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/614c7e416d72203892b3f383b5ecbe999fdb75c6">https://github.com/macports/macports-ports/commit/614c7e416d72203892b3f383b5ecbe999fdb75c6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 614c7e416d72203892b3f383b5ecbe999fdb75c6
</span>Author: Jimmy Yuen Ho Wong <wyuenho@gmail.com>
AuthorDate: Wed Aug 12 11:06:53 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> emacs: fix dependencies and clean up
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove multicolor
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove configure patch leftover from the removed inline variant
</span><span style='display:block; white-space:pre;color:#404040;'> * Require giflib, jpeg, tiff, libpng, lcms2, xpm for emacs-app and
</span><span style='display:block; white-space:pre;color:#404040;'> emacs-app-devel
</span><span style='display:block; white-space:pre;color:#404040;'> * Require jansson and gmp for all variants
</span><span style='display:block; white-space:pre;color:#404040;'> * Default rsvg variant for emacs-app and emacs-app-devel
</span>---
editors/emacs/Portfile | 55 ++++++++++++----------
editors/emacs/files/patch-configure.diff | 11 -----
.../emacs/files/patch-enable-multicolor-fonts.diff | 15 ------
3 files changed, 29 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54cf3116fd9..b19d082f636 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,17 +42,20 @@ configure.args --without-ns \
</span> --without-gconf \
--without-libotf \
--without-m17n-flt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gpm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gpm \
</span> --with-gnutls \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-json \
</span> --with-xml2 \
--with-modules \
--infodir ${prefix}/share/info/${name}
depends_build-append port:pkgconfig \
port:texinfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnutls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jansson \
</span> port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnutls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span>
post-destroot {
xinstall -d ${destroot}${prefix}/share/emacs/${version}/leim
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,23 +82,17 @@ platform darwin {
</span>
if {$subport eq $name || $subport eq "emacs-app"} {
version 27.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 9ddfd28ab54c4aee168eeecb783d13599e5b5288 \
sha256 ffbfa61dc951b92cf31ebe3efc86c5a9d4411a1222b8a4ae6716cfd0e2a584db \
size 65782481
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "sh ./autogen.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
epoch 1
version 20200811
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
fetch.type git
git.url https://github.com/emacs-mirror/emacs.git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,10 +102,6 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span> system -W ${worksrcpath} "sh ./autogen.sh"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:jansson \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
} else {
livecheck.type regex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,10 +187,26 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
categories-append aqua
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-ns --with-lcms2 --without-harfbuzz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-ns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xpm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-imagemagick \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-rsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xaw3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-delete --without-ns --without-x
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:lcms2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:giflib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xpm \
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,7 +214,7 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> patchfiles-append patch-Info.plist.in-devel.diff
} else {
patchfiles-append patch-Info.plist.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> post-patch {
reinplace "s,@PATH@,${prefix}/bin:${prefix}/sbin:/usr/bin:/bin:/usr/sbin:/sbin," ${worksrcpath}/nextstep/templates/Info.plist.in
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,14 +232,6 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$subport eq "emacs-app"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant multicolor_font description {Apply multicolor font patch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Revert "Disable multicolor fonts on OS X..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This reverts commit 9344612d3cd164317170b6189ec43175757e4231.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-enable-multicolor-fonts.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant imagemagick description {Use ImageMagick} {
depends_lib-append port:ImageMagick
configure.args-append --with-imagemagick
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,4 +241,6 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> depends_lib-append port:librsvg
configure.args-append --with-rsvg
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +rsvg
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-configure.diff b/editors/emacs/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 32bb69e9edc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-04-06 10:26:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-04-06 10:27:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -602,7 +602,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Apple Darwin / macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-apple-darwin* )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${canonical}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-apple-darwin[0-9].*) unported=yes ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-apple-darwin[0-8].*) unported=yes ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i[3456]86-* | x86_64-* ) ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * ) unported=yes ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-enable-multicolor-fonts.diff b/editors/emacs/files/patch-enable-multicolor-fonts.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b8717ebb9f3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-enable-multicolor-fonts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/macfont.m.orig 2017-04-14 15:02:47.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/macfont.m 2017-11-18 14:00:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2373,9 +2373,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- != (spacing >= FONT_SPACING_MONO)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Don't use a color bitmap font until it is supported on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- free platforms. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sym_traits & kCTFontTraitColorGlyphs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Don't use a color bitmap font unless its family is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ explicitly specified. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((sym_traits & kCTFontTraitColorGlyphs) && NILP (family))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (j > 0
</span></pre><pre style='margin:0'>
</pre>