From nobody Tue Mar 15 21:50:59 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5ECB21A2EEC8; Tue, 15 Mar 2022 21:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJ6Xz2F7Tz3hQc; Tue, 15 Mar 2022 21:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647381059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLjlgOC615hJa07ooE8bF86JpQFy3uWR4jKJKOGnIiM=; b=bj7mScIcUtSV+mGZ3v8JbtAxmYwAgw///XEHq+07wldD4L934cy2xmXetd4gYAUz8sBQ+u eUOX7eDTCkFPqSIlWFAMJdaLAwOfhzr2vZS+qzVc/dEddV9xP4+G/X80tlyd2PUqAMPLV0 O8KmGNhqE71uB6COqq3mt47UW9B/I6XZnBSUcWTLKzx0Q/Rp81hWtE7JZoGepHlYIIQJBh +RYPoEifYeCiMyCum2J0eXPrNTCbqJm2ZhMxDxbZ/Qq2LMV3rpV7OQJwuxrbEUq7lNoGun vao5C/7urvVKdX1RYE11Q4qYJRDdVYmM8jPmtP0FnVAz6fyC9+7Lf4+Md3ZGsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CA6B1AA7; Tue, 15 Mar 2022 21:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FLoxNT069511; Tue, 15 Mar 2022 21:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FLoxmQ069510; Tue, 15 Mar 2022 21:50:59 GMT (envelope-from git) Date: Tue, 15 Mar 2022 21:50:59 GMT Message-Id: <202203152150.22FLoxmQ069510@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: a628b9f27a3f - main - editors/emacs-devel: Update to git snapshot 1a07854 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a628b9f27a3f34756a14d3ad9cce29a1ed93f002 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647381059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLjlgOC615hJa07ooE8bF86JpQFy3uWR4jKJKOGnIiM=; b=UUYbHnKSitNLahKwvgWff0GH4L8FXWL5aNI7ZqJdr49HYDbZC4cIQx27SOjfE2GvWSp2RX 247dKq+aCqYGqI4YWw020TqVj1OxwHfTXfNUZAIRrSFTsdyZ+JM7lVlXFYSmyMKEvIUd/I UG/f3u0iOepR0ZHyXMOc7nRFAjGHYH7Q5X80KybU3vQc9BFVdo5pmDfHXxJz6TQwGczkCW isnBrwO9tycWpKU2WlmEodyzm+Q9osZaoRu30Nn77bg5/iqPEl3Rm2+ZoWVl2Hx2OKu5vB 71ISUhK5+JRSeJUXDmT9c8PcBMtHtLbIr+X5zQdifxuLl0QT90Wg6ZaQyiGo/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647381059; a=rsa-sha256; cv=none; b=tbzcbNvM+EjG3HSVumqch02mpSowRHwZN5e7f/xkNeHIC/IYa1ci/Y/2pUsPzbqWE04QJG /EoiQPlI1AEG11J9b/WvvNsed+gxgWb2m7b37cOkms1puEe0b+6vqaAX+T4ra7QCTKf/NF nK9l377rMI8+mDql96njIj5mT7qxr8b3RBmEvEGaWTeio5ERHpn9iaY1X8GKDCUa0qb9c+ AHlkI2s/6LrtaED+n1ScVymPs9t9uMBBbzCCa+i+Hotxcwolno5Q8XV2lpapvlWmxiSyTO q1uQdvhEI+wLtx6wx7CKl8YRNqkZEdHHitSgq9KoiA1TB8I9M6mUHOOYZe0jjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=a628b9f27a3f34756a14d3ad9cce29a1ed93f002 commit a628b9f27a3f34756a14d3ad9cce29a1ed93f002 Author: Ashish SHUKLA AuthorDate: 2022-03-14 06:16:44 +0000 Commit: Ashish SHUKLA CommitDate: 2022-03-15 21:50:06 +0000 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 --- editors/emacs-devel/Makefile | 11 ++++++++--- editors/emacs-devel/distinfo | 6 +++--- editors/emacs-devel/pkg-plist | 2 +- 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 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