From nobody Mon Jan 17 17:53:10 2022 X-Original-To: dev-commits-ports-main@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 A8F671966C1E; Mon, 17 Jan 2022 17:53:10 +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 4Jczyt4QF6z4gDG; Mon, 17 Jan 2022 17:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642441990; 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=Bs1k6GJexZ5Uto+sBMEPnTyvPYrhUJZZ6gvVRlN1IuU=; b=YS4kaPEMhfGAP2JMJSVp8PkDoQaMapBRkNjepVYfo0wON9NLVuGzomMf+cgLeHN8g67PAL auoAUZguTFIcbB1hhohtvgGo0XkbuizKm+QQo1lNZrToLZ/qffGCAzY0AP5IvU0dHGAPSw jN+lLWv9Cun4a8Q1XPUYfsQ6R3r78WzKK7JmqM27vSjHT9ns9NSn0DsdUs/zvKp/1ShcAD ZfREppkseglMhUFFq15sXdLVyVQFDj77Jmbwa9h4B05+ZSA/uChuejv6doDk+w2ulDoNV1 heagikTyj5d/7mP/3fU0FrKjgdA9ROhoBAWr4Bkx4GhJ0xEB+MFT0D2xzKeFog== 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 77D9B125BE; Mon, 17 Jan 2022 17:53:10 +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 20HHrAvk038994; Mon, 17 Jan 2022 17:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HHrA21038993; Mon, 17 Jan 2022 17:53:10 GMT (envelope-from git) Date: Mon, 17 Jan 2022 17:53:10 GMT Message-Id: <202201171753.20HHrA21038993@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: f95666b0e173 - main - editors/emacs-devel: Set GLIB_SCHEMAS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f95666b0e173824fc79966167e4e34a76a58edf2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642441990; 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=Bs1k6GJexZ5Uto+sBMEPnTyvPYrhUJZZ6gvVRlN1IuU=; b=knpYF2xLenxcfhGAA7ivXBRoqCkFNZCDZ7w0RBXRbfBNq6XsH5N8Lpfq9aq8LeXP9pR2Sy /7yOEY26e9f1GLoeaK0IN/7phabKmjw/lR0jMeKbYmttBctyslanPs8MMEJeIXQPoNivCs GN6s41BEJdEh+GlvYrs4nFW4PVFgUeFeR93JP4yBgzNDMRM24wNUQgtUsB8Lv6rO1a1Yoo LstUt/ILWndJaZfvZCCOvH4UQALyISD7E/SBhL1Srboho077FToCiJxYrlb2HnFoYvBQUU W56iU/t6earY3F0lNrMZfjrLqqWwOXAWbzvQ0VQlD5ubYBVSV5NE7gpnRJ0f6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642441990; a=rsa-sha256; cv=none; b=qmoSnzanR4Qwow+KbUWf+Q9lvGzgZFMVoKNWeJkqbthtK7cCeohY5omRonr/5KDyKxpDTk 4WbFshyllEao6A2q9W8BjqBjazIuJQIhP8441pIesyHjuotlbnkJf5NJA6/cV6/Tf/8FL/ maIbMLzlwfCmo4cK3jZGsoyTrAGM1iiWvFfunSyJ9B1Z+CKmyg9BGxTa3+rIQU8hwwJqU5 4RNJWGDSzv7Z/u9iCu506WkBvHvudOLlPyNOBvrxD99VwGhjywIhZdedsMg0bK1nALvCcC uL38qewlqxqU8ihscj6VcsSdWDJVWdj6pvPuUwWN3juuCKobHol4onLcxuCA0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f95666b0e173824fc79966167e4e34a76a58edf2 commit f95666b0e173824fc79966167e4e34a76a58edf2 Author: Joseph Mingrone AuthorDate: 2022-01-16 18:05:14 +0000 Commit: Joseph Mingrone CommitDate: 2022-01-17 17:52:43 +0000 editors/emacs-devel: Set GLIB_SCHEMAS ...rather than guarding the file in pkg-plist. glib-compile-schemas is run during the build, but use the macro regardless. It could make certain changes like a major version bump of glib easier to deal with. Reported by: jbeich Sponsored by: The FreeBSD Foundation --- editors/emacs-devel/Makefile | 1 + editors/emacs-devel/pkg-plist | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 460a88666b19..5fdaee6aba5d 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -142,6 +142,7 @@ 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 diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index 08a11436f060..32344d122cbc 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -4265,7 +4265,6 @@ share/applications/emacsclient-mail.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h include/emacs-module.h -%%GSETTINGS%%share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml share/icons/hicolor/128x128/apps/emacs.png share/icons/hicolor/16x16/apps/emacs.png share/icons/hicolor/24x24/apps/emacs.png