aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2022-03-14 06:16:44 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2022-03-15 21:50:06 +0000
commita628b9f27a3f34756a14d3ad9cce29a1ed93f002 (patch)
tree42bcc3ed6b87f3f8a9a84d93b23c8de7a539b7e7
parent52adc1acee684ee656d50977505fc15580df6572 (diff)
downloadports-a628b9f27a3f34756a14d3ad9cce29a1ed93f002.tar.gz
ports-a628b9f27a3f34756a14d3ad9cce29a1ed93f002.zip
editors/emacs-devel: Update to git snapshot 1a07854
Fix pkg-plist for GSettings schema, as it's now also dependent on PGTK option, in addition to GSETTINGS option PR: 262512
-rw-r--r--editors/emacs-devel/Makefile11
-rw-r--r--editors/emacs-devel/distinfo6
-rw-r--r--editors/emacs-devel/pkg-plist2
3 files changed, 12 insertions, 7 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 0321aa6d00ff..375415dc87b4 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,7 +1,7 @@
# Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk>
PORTNAME= emacs
-DISTVERSION= 29.0.50.20220228
+DISTVERSION= 29.0.50.20220315
PORTEPOCH= 2
CATEGORIES= editors
PKGNAMESUFFIX= -devel
@@ -25,7 +25,7 @@ USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
CPE_VENDOR= gnu
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
-GH_TAGNAME= 0470ef0
+GH_TAGNAME= d932e25
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-details \
@@ -143,7 +143,6 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
GSETTINGS_USE= GNOME=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
-GSETTINGS_VARS= GLIB_SCHEMAS+=org.gnu.emacs.defaults.gschema.xml
GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
GTK2_USE= GNOME=cairo,gtk20
@@ -240,6 +239,12 @@ USE_XORG+= ice sm x11 xcb xext xfixes xinerama xmu xrandr xrender xt
CONFIGURE_ARGS+= --with-x-toolkit=no
.endif
+# Schema generation is dependent on both PGTK, and GSETTINGS options
+# as per https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=183936ee8e5
+.if ${PORT_OPTIONS:MGSETTINGS} && ${PORT_OPTIONS:MPGTK}
+GLIB_SCHEMAS+= org.gnu.emacs.defaults.gschema.xml
+.endif
+
.if ${FLAVOR} == nox
# With a desktop entry stage-qa will give a warning about requiring
# desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS,
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index d11efb32e31e..22c0858074c2 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646012370
-SHA256 (emacs-mirror-emacs-29.0.50.20220228-0470ef0_GH0.tar.gz) = 7c78b8296fb1aaa44a75cc33e11607a07a54a36a5a3186aeb08a520d61520405
-SIZE (emacs-mirror-emacs-29.0.50.20220228-0470ef0_GH0.tar.gz) = 45346844
+TIMESTAMP = 1647369496
+SHA256 (emacs-mirror-emacs-29.0.50.20220315-d932e25_GH0.tar.gz) = b17305d0401baf273b0aecceac1a3fa19823bc9ee7e90bc6d360b97027b10abb
+SIZE (emacs-mirror-emacs-29.0.50.20220315-d932e25_GH0.tar.gz) = 45373553
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 1475c5229964..adb9627ca612 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -779,7 +779,7 @@ share/applications/emacsclient-mail.desktop
%%DATADIR%%/%%EMACS_VER%%/etc/nxml/README
%%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-invalid.xml
%%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-valid.xml
-%%GSETTINGS%%%%DATADIR%%/%%EMACS_VER%%/etc/org.gnu.emacs.defaults.gschema.valid
+%%PGTK%%%%GSETTINGS%%%%DATADIR%%/%%EMACS_VER%%/etc/org.gnu.emacs.defaults.gschema.valid
%%DATADIR%%/%%EMACS_VER%%/etc/org.gnu.emacs.defaults.gschema.xml
%%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtContentTemplate.xml
%%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtStyles.xml