From nobody Tue Mar 15 18:06:55 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 28BA21A209DB; Tue, 15 Mar 2022 18:06:56 +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 4KJ1ZS0FNKz56Cn; Tue, 15 Mar 2022 18:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647367616; 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=8TTRAeIDM3yVghqdIKsgaYAZfF3atpg+pHmyXSM1430=; b=Q8U7WqAtwP+A+YFY+wfFEjf/I2xnp6woAhgaT7Fn6Wq5T+geJbMRPPHlX60xHnv+OrY3pE NZyQDl9uvdd+c1qMeZ+CfLof2WWj63eB+7gqsG+ZyftJEoZnQTwzsyGOVl6blUtC0RXQpX a/2NvfyKTCs/5EqSc7lrqMKezqysEJlHEePh+xgK9zTpe+bm9Pu0yUiG3U5nqAGGo79tYF lgeSk2UX7GMnknWdMkCjPj3XzOq2kG6eAUIZKU3XebtkN5yqyIMldT5h7jHGHhAGh2qidK KMaa7cVbhJ0+DWTWhe9Mu49J3OaPXpoaDmzkpcOD2Ux9b9b0wvPkaRemvMxAgg== 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 C61C9268A4; Tue, 15 Mar 2022 18:06:55 +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 22FI6tuJ061011; Tue, 15 Mar 2022 18:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FI6t6V061010; Tue, 15 Mar 2022 18:06:55 GMT (envelope-from git) Date: Tue, 15 Mar 2022 18:06:55 GMT Message-Id: <202203151806.22FI6t6V061010@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 23f68b9f7364 - main - devel/gconf2: cleanup and reduce the number of dependency 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23f68b9f73641a8c35fcc81e19d87927a5681b14 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647367616; 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=8TTRAeIDM3yVghqdIKsgaYAZfF3atpg+pHmyXSM1430=; b=Q7fwNK1y19uHPGE0mGTnNbU16HLu/demNcerQDfGkS2lpm9a3mGdegWeHtA4F8eNw5U+Uk pRiBuGxKMwwdqW9mmy6orLzXZbvsEj7JeKo5oKxnXiA+ZXdqKpmCzxxfh2Xhh+2AmwlJ03 REGFOwXS3Vh/n0zvF8BPXNv79Zuoo7ypFxz03fl90zSZuBp1FzlW++XsBBtLpg42Q76GtO wG/i+TdLoB2e5Y8LSNZNpIgTgbGkiC/PJZHhLvZAoF1FkXDxxpXMaUkhMrYwdCzS4ezH0T D88KnfS8+/Aj8RkZk7VIWj9chM5rp+2ajnZ1UKKwHbsB5fMjDikOYIu2DjJWgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647367616; a=rsa-sha256; cv=none; b=rU1opbV6cF61qvVBkPWCnkDfVlnkFQ2xbFmEcGYjY5oT1gesr5WwtAsue4igcQ6X3BMPTH 05tWkYV3PWyu0LfIBFOeKjGXmGpQdg9O0xvNiLT4rgu6DZGn63tg34PMqbqSYsiBNq4rN2 4j5Bm2NxuFl3LL5yXW4EqijSspu2aNc2L5DXNLM/lmHtV/jHOVGv4hfzE1aj9cQVC8bGpB ZF5h5VW0UflMvm3XLLYFfH76IJjpPW/MJcwthDe0a77HraLJg3775bE1MthPsiL65wfvXM pm8T6wnbrAJ90F6E/L7SKvB25jGXlR+WtAgLtComCaqWTv6OHwwe1ipeqz78tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=23f68b9f73641a8c35fcc81e19d87927a5681b14 commit 23f68b9f73641a8c35fcc81e19d87927a5681b14 Author: Baptiste Daroussin AuthorDate: 2022-03-15 17:52:09 +0000 Commit: Baptiste Daroussin CommitDate: 2022-03-15 18:06:50 +0000 devel/gconf2: cleanup and reduce the number of dependency Switch the ipc mecanism from Orbit2 to dbus (ORBit2 is not used anywhere anymore). While here remove the default services, since gconf is not used anymore by any desktop, having the default service started to allow configuring system wide configuration is pointless. Drop the option for ldap, given that no desktop uses it anymore, the ability so deal with ldap is now pointless as well Drop the dependency on gtk only used for gconf-sanity check This shave the dependency lits removing rust, polkit and orbit from it while not changing the features for the few left consumers. --- Mk/Uses/gnome.mk | 2 +- devel/gconf2/Makefile | 25 ++++++++++--------------- devel/gconf2/pkg-plist | 29 ----------------------------- 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 8329b4ab78d1..d6a4e203fa05 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -206,7 +206,7 @@ introspection_USE_GNOME_IMPL= glib20 introspection_MAKE_ENV= GI_SCANNER_DISABLE_CACHE=1 gconf2_LIB_DEPENDS= libgconf-2.so:devel/gconf2 -gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 +gconf2_USE_GNOME_IMPL= libxml2 libgnomecanvas_LIB_DEPENDS= libgnomecanvas-2.so:graphics/libgnomecanvas libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 4d9e268c35c0..992e08073ad7 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gconf2 PORTVERSION= 3.2.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel gnome MASTER_SITES= GNOME/sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= GConf-${PORTVERSION} @@ -17,31 +17,26 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= tar:xz -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libpolkit-gobject-1.so:sysutils/polkit +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib USES+= gettext gmake gnome libtool pathfix pkgconfig python:run \ - shebangfix -USE_GNOME= orbit2 gtk20 libxml2 \ - referencehack intlhack dconf introspection:build + shebangfix localbase +USE_GNOME= libxml2 dconf intltool introspection:build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-gtk=2.0 \ - --disable-gtk-doc -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib + --without-openldap \ + --disable-gtk \ + --disable-gtk-doc-html \ + --disable-gtk-doc \ + --disable-orbit \ + --disable-defaults-service INSTALL_TARGET= install-strip SHEBANG_FILES= gsettings/gsettings-schema-convert DOCSDIR= ${PREFIX}/share/doc/gconf -OPTIONS_DEFINE= LDAP DOCS -OPTIONS_SUB= yes - -LDAP_USE= OPENLDAP=yes -LDAP_CONFIGURE_WITH= openldap - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/gconf.xml.system diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 0a84c9d002ee..50f6d2dc2b61 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -2,8 +2,6 @@ bin/gconf-merge-tree bin/gconftool-2 bin/gsettings-data-convert bin/gsettings-schema-convert -etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf -%%LDAP%%etc/gconf/2/evoldap.conf etc/gconf/2/path etc/xdg/autostart/gsettings-data-convert.desktop include/gconf/2/gconf/gconf-changeset.h @@ -15,8 +13,6 @@ include/gconf/2/gconf/gconf-listeners.h include/gconf/2/gconf/gconf-schema.h include/gconf/2/gconf/gconf-value.h include/gconf/2/gconf/gconf.h -%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.a -%%LDAP%%lib/GConf/2/libgconfbackend-evoldap.so lib/GConf/2/libgconfbackend-oldxml.a lib/GConf/2/libgconfbackend-oldxml.so lib/GConf/2/libgconfbackend-xml.a @@ -29,36 +25,12 @@ lib/libgconf-2.so lib/libgconf-2.so.4 lib/libgconf-2.so.4.1.5 libdata/pkgconfig/gconf-2.0.pc -libexec/gconf-defaults-mechanism libexec/gconfd-2 man/man1/gconftool-2.1.gz man/man1/gsettings-data-convert.1.gz man/man1/gsettings-schema-convert.1.gz -%%LDAP%%share/GConf/schema/evoldap.schema share/aclocal/gconf-2.m4 -share/dbus-1/system-services/org.gnome.GConf.Defaults.service share/dbus-1/services/org.gnome.GConf.service -%%PORTDOCS%%%%DOCSDIR%%/ch01.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-backend.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-changeset.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-client.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-engine.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-error.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-internals.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-listeners.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-locale.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-schema.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-sources.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf-value.html -%%PORTDOCS%%%%DOCSDIR%%/gconf-gconf.html -%%PORTDOCS%%%%DOCSDIR%%/gconf.devhelp2 -%%PORTDOCS%%%%DOCSDIR%%/home.png -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/index.sgml -%%PORTDOCS%%%%DOCSDIR%%/left.png -%%PORTDOCS%%%%DOCSDIR%%/right.png -%%PORTDOCS%%%%DOCSDIR%%/style.css -%%PORTDOCS%%%%DOCSDIR%%/up.png share/gir-1.0/GConf-2.0.gir share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo @@ -146,7 +118,6 @@ share/locale/yi/LC_MESSAGES/GConf2.mo share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_HK/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo -share/polkit-1/actions/org.gnome.gconf.defaults.policy share/sgml/gconf/gconf-1.0.dtd @dir etc/gconf/gconf.xml.defaults @dir etc/gconf/gconf.xml.mandatory