git: f95666b0e173 - main - editors/emacs-devel: Set GLIB_SCHEMAS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 17 Jan 2022 17:53:10 UTC
The branch main has been updated by jrm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f95666b0e173824fc79966167e4e34a76a58edf2
commit f95666b0e173824fc79966167e4e34a76a58edf2
Author: Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2022-01-16 18:05:14 +0000
Commit: Joseph Mingrone <jrm@FreeBSD.org>
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