Index: head/devel/dconf/files/patch-userconfigdir =================================================================== --- head/devel/dconf/files/patch-userconfigdir (revision 539280) +++ head/devel/dconf/files/patch-userconfigdir (nonexistent) @@ -1,40 +0,0 @@ -From e01be93304fdff9e4c5109ae50f1bc9e64524b0b Mon Sep 17 00:00:00 2001 -From: Sebastien Bacher -Date: Thu, 29 Mar 2018 10:59:34 +0200 -Subject: Don't create the user config dir as world readable - -https://bugzilla.gnome.org/show_bug.cgi?id=792677 ---- - service/dconf-gvdb-utils.c | 2 +- - service/dconf-keyfile-writer.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/service/dconf-gvdb-utils.c b/service/dconf-gvdb-utils.c -index 0ff4bdc..099a9f3 100644 ---- service/dconf-gvdb-utils.c -+++ service/dconf-gvdb-utils.c -@@ -174,7 +174,7 @@ dconf_gvdb_utils_write_file (const gchar *filename, - * again, after mkdir(). - */ - dirname = g_path_get_dirname (filename); -- g_mkdir_with_parents (dirname, 0777); -+ g_mkdir_with_parents (dirname, 0700); - g_free (dirname); - - g_clear_error (error); -diff --git a/service/dconf-keyfile-writer.c b/service/dconf-keyfile-writer.c -index 88f0305..f4951bb 100644 ---- service/dconf-keyfile-writer.c -+++ service/dconf-keyfile-writer.c -@@ -207,7 +207,7 @@ dconf_keyfile_writer_begin (DConfWriter *writer, - * again, after mkdir(). - */ - dirname = g_path_get_dirname (kfw->lock_filename); -- g_mkdir_with_parents (dirname, 0777); -+ g_mkdir_with_parents (dirname, 0700); - g_free (dirname); - - kfw->lock_fd = open (kfw->lock_filename, O_RDWR | O_CREAT, 0666); --- -cgit v0.12 - Property changes on: head/devel/dconf/files/patch-userconfigdir ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/dconf/files/patch-docs_meson.build =================================================================== --- head/devel/dconf/files/patch-docs_meson.build (revision 539280) +++ head/devel/dconf/files/patch-docs_meson.build (nonexistent) @@ -1,34 +0,0 @@ ---- docs/meson.build.orig 2018-05-12 08:26:06.064672000 +0200 -+++ docs/meson.build 2018-05-12 08:27:30.954842000 +0200 -@@ -1,16 +1,18 @@ --gnome.gtkdoc( -- meson.project_name(), -- main_xml: meson.project_name() + '-docs.xml', -- src_dir: [ -- common_inc, -- client_inc -- ], -- dependencies: libdconf_dep, -- scan_args: '--rebuild-types', -- gobject_typesfile: meson.project_name() + '.types', -- install: true, -- install_dir: join_paths(dconf_datadir, 'gtk-doc', 'html', meson.project_name()) --) -+if get_option('enable-gtk-doc') -+ gnome.gtkdoc( -+ meson.project_name(), -+ main_xml: meson.project_name() + '-docs.xml', -+ src_dir: [ -+ common_inc, -+ client_inc -+ ], -+ dependencies: libdconf_dep, -+ scan_args: '--rebuild-types', -+ gobject_typesfile: meson.project_name() + '.types', -+ install: true, -+ install_dir: join_paths(dconf_datadir, 'gtk-doc', 'html', meson.project_name()) -+ ) -+endif - - if get_option('enable-man') - xsltproc = find_program('xsltproc', required: false) Property changes on: head/devel/dconf/files/patch-docs_meson.build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/dconf/files/patch-meson.build =================================================================== --- head/devel/dconf/files/patch-meson.build (revision 539280) +++ head/devel/dconf/files/patch-meson.build (nonexistent) @@ -1,13 +0,0 @@ ---- meson.build.orig 2018-05-12 08:27:37.460446000 +0200 -+++ meson.build 2018-05-12 08:27:52.259649000 +0200 -@@ -105,9 +105,5 @@ - subdir('gsettings') - subdir('client') - subdir('bin') -- --if get_option('enable-gtk-doc') -- subdir('docs') --endif -- -+subdir('docs') - subdir('tests') Property changes on: head/devel/dconf/files/patch-meson.build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/dconf/Makefile =================================================================== --- head/devel/dconf/Makefile (revision 539280) +++ head/devel/dconf/Makefile (revision 539281) @@ -1,44 +1,37 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= dconf -PORTVERSION= 0.28.0 +PORTVERSION= 0.36.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DISTNAME= dconf-${PORTVERSION} DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Configuration database system for GNOME LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vala>=0.18.1:lang/vala \ - docbook-xsl>=0:textproc/docbook-xsl + docbook-xsl>=0:textproc/docbook-xsl \ + ${LOCALBASE}/libdata/pkgconfig/bash-completion.pc:shells/bash-completion LIB_DEPENDS= libdbus-1.so:devel/dbus PORTSCOUT= limitw:1,even USES= gettext gnome localbase meson pkgconfig python:3.6+,build tar:xz USE_GNOME= glib20 libxslt:build USE_LDCONFIG= yes BINARY_ALIAS= python3=${PYTHON_VERSION} -MESON_ARGS= -Denable-man=true - -post-patch: - @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ - -e 's|"/etc"|"${PREFIX}/etc"|g' \ - ${WRKSRC}/docs/dconf-overview.xml \ - ${WRKSRC}/engine/dconf-engine.c \ - ${WRKSRC}/engine/dconf-engine-profile.c \ - ${WRKSRC}/engine/dconf-engine-source-system.c \ - ${WRKSRC}/bin/dconf-update.vala \ - ${WRKSRC}/tests/engine.c +MESON_ARGS= -Dman=true \ + -Dgtk_doc=false \ + -Dvapi=true post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/db @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/profile .include Index: head/devel/dconf/distinfo =================================================================== --- head/devel/dconf/distinfo (revision 539280) +++ head/devel/dconf/distinfo (revision 539281) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525984843 -SHA256 (gnome3/dconf-0.28.0.tar.xz) = 61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742 -SIZE (gnome3/dconf-0.28.0.tar.xz) = 99340 +TIMESTAMP = 1592252835 +SHA256 (gnome3/dconf-0.36.0.tar.xz) = 9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d +SIZE (gnome3/dconf-0.36.0.tar.xz) = 114828