From nobody Sat Aug 12 10:36:55 2023 X-Original-To: dev-commits-ports-branches@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 4RNHCX1xSlz4mKk7; Sat, 12 Aug 2023 10:36: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 4RNHCX1MT9z4Y1v; Sat, 12 Aug 2023 10:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691836616; 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=NtDoKB/x97Jm3YI1YqUF8RX4gE2rfOVKX6g5aIiTuOA=; b=cOLIw0gc/DTE96cDONDK0ANak6SbmS7wGkZAqj03luLQNGv8G+1RZrJBeofn+GxmnxjpVU WL4XifLIjxes76/ALsiDjoLXOeiaDKQwOdQjtrwctd9RdzVWJjqWT2fb1uD7+/ASNLIzJN 4wX6+iDf5b5r4lhM4h+R3KOxw73qMw4phWZwqxeKuHlUeJnllQxeV2fArFo6SD69FHD4Be KUiJQkediV6nVBfOwF7AkYSPMn4RsAfG/27XVt/eoRrb56HNJ6bx4xaghmhxjE5kks7oFJ WXttDB+i0/pBMJlQdIJewar4nXuKXxU6WQmbsZrc8A8Eymc5om1gThr4I+ElZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691836616; 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=NtDoKB/x97Jm3YI1YqUF8RX4gE2rfOVKX6g5aIiTuOA=; b=CDRZsvYzPSAA2ANCFtVdFDxtVw9YTPgADqnUh6+YfDX6QenwObx5Fy66srGu/BQWC/l13T SiIVCsQpcmhjKU2zcnzABwFxJKz2bl3zaa5ZAifsMNC+rL1d1fJ3glSRyUpKW8U7ThQ6FV NGOFiZL8v2dsKOaFdkTYql7XdLJhKNLTTkl3DFNc7pA5drOIA/gfN55sfv1qrvliTG6VbD xFpszInR050fivCLtLrOehlW766UTfzO11Bh8jAW2YMHe0yEyO6pveQlj45bJ37NB9U8NR eEzDP7I6PCLOO6tu/f+MOoCdcvfIFctEUdGMQZwab8sDPc8A2fVSt9OdOyauWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691836616; a=rsa-sha256; cv=none; b=WgpW1ShIcng0zJ8WDhvVMVn1qKETPJxL3gpELMuVRXThIw2lqQt+ChKDaa4ZpHhraLjMtq avGQph1GwR1mFbrRDVVQ4g7y0+k2nqy7fb757flfHkSCs2iOZN6pEIDPCequISU+U4Tk7n 0lBGRVjKhL5gdfTJ0uxghWGOQvG+cZ1mMMzyLe4eNlP2/sZNS7hcWo7VWHgNUEmZ96ND+H Ak8mHdt4HX35nA7WC6EuE337UW7vbFg6xwCFm/pjoWZgm9mjoQaxBvqjwugwiTc2dHAoOE RUgRbqHn3Y8iRxyr8JPSDLRTS2sOQk2T54ckizmJQ8aWtzGltW/YYo8TLKliXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNHCX0RBfz2lY; Sat, 12 Aug 2023 10:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37CAat4h041482; Sat, 12 Aug 2023 10:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CAatGZ041479; Sat, 12 Aug 2023 10:36:55 GMT (envelope-from git) Date: Sat, 12 Aug 2023 10:36:55 GMT Message-Id: <202308121036.37CAatGZ041479@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: 8bddb87fd7ce - 2023Q3 - sysutils/consolekit2: Switch to my fork. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 8bddb87fd7ce06eb09fdb6d8459a9891feae4e23 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bddb87fd7ce06eb09fdb6d8459a9891feae4e23 commit 8bddb87fd7ce06eb09fdb6d8459a9891feae4e23 Author: Gleb Popov AuthorDate: 2023-08-11 14:57:02 +0000 Commit: Gleb Popov CommitDate: 2023-08-12 10:36:53 +0000 sysutils/consolekit2: Switch to my fork. My fork incorporates optional X11 support from files/, Val Packett's patches for Wayland and my own fixes for systemd login1 compatibility required for the newest sysutils/accountsservice. Sponsored by: Serenity Cybersecurity, LLC (cherry picked from commit 503c15c3e1a5416017d83d66768e06b91f07f630) --- sysutils/consolekit2/Makefile | 11 ++----- sysutils/consolekit2/distinfo | 14 ++------- sysutils/consolekit2/files/patch-configure.ac | 35 ---------------------- sysutils/consolekit2/files/patch-tools_Makefile.am | 19 ------------ 4 files changed, 6 insertions(+), 73 deletions(-) diff --git a/sysutils/consolekit2/Makefile b/sysutils/consolekit2/Makefile index 72c352e1d8b9..bc7aafb2d57b 100644 --- a/sysutils/consolekit2/Makefile +++ b/sysutils/consolekit2/Makefile @@ -1,15 +1,9 @@ PORTNAME= consolekit PORTVERSION= 1.2.6 +PORTREVISION= 1 CATEGORIES= sysutils gnome PKGNAMESUFFIX= 2 -# https://github.com/ConsoleKit2/ConsoleKit2/pull/116 -PATCH_SITES= https://github.com/ConsoleKit2/ConsoleKit2/commit/ -PATCHFILES= 03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch:-p1 \ - 05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch:-p1 \ - ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch:-p1 \ - 42b8c93b2b7c2a57a74580531c73ab736e95336a.patch:-p1 - MAINTAINER= desktop@FreeBSD.org COMMENT= Framework for defining and tracking users WWW= https://github.com/ConsoleKit2/ConsoleKit2 @@ -36,8 +30,9 @@ X11_USE= XORG=x11 X11_CONFIGURE_WITH= x USE_GITHUB= yes -GH_ACCOUNT= ConsoleKit2 +GH_ACCOUNT= arrowd GH_PROJECT= ConsoleKit2 +GH_TAGNAME= 3ead222361800ca2b893354741ad43e6526c9b8b USES= autoreconf gettext gmake gnome libtool localbase pathfix pkgconfig \ tar:bzip2 diff --git a/sysutils/consolekit2/distinfo b/sysutils/consolekit2/distinfo index 5e45454440d9..7f0487158e0c 100644 --- a/sysutils/consolekit2/distinfo +++ b/sysutils/consolekit2/distinfo @@ -1,11 +1,3 @@ -TIMESTAMP = 1691584826 -SHA256 (ConsoleKit2-ConsoleKit2-1.2.6_GH0.tar.gz) = d41224129c5a689469ebd8fe87e34c4a76afdb7b2f6201eb246320262ea5a942 -SIZE (ConsoleKit2-ConsoleKit2-1.2.6_GH0.tar.gz) = 258252 -SHA256 (03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch) = c8d58acf770a782bb02006f401bdd2ffa8777d9c07f0b0c87e9b76465758ede0 -SIZE (03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch) = 1459 -SHA256 (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = beb21938d8b337faeaf39d799e58b639157b364efcec58998f6a475324139fbb -SIZE (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = 1411 -SHA256 (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = ae28133cebd7aa85841bb0afe104c9cfac5b33efa5be81b1e791f67f3d88df05 -SIZE (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = 2338 -SHA256 (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = b7d0939060f1a70c1448ffbe55f7ad38e63f328caf1b8ed35d7496f7be4dd1a2 -SIZE (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = 918 +TIMESTAMP = 1691771274 +SHA256 (arrowd-ConsoleKit2-1.2.6-3ead222361800ca2b893354741ad43e6526c9b8b_GH0.tar.gz) = dc6bcb44e182725489136ab46fb76b81b81da9ff0e6be432e3d24a5e42664aca +SIZE (arrowd-ConsoleKit2-1.2.6-3ead222361800ca2b893354741ad43e6526c9b8b_GH0.tar.gz) = 260631 diff --git a/sysutils/consolekit2/files/patch-configure.ac b/sysutils/consolekit2/files/patch-configure.ac deleted file mode 100644 index 4a348e7597ea..000000000000 --- a/sysutils/consolekit2/files/patch-configure.ac +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.ac.orig 2021-06-03 10:22:08 UTC -+++ configure.ac -@@ -96,7 +96,11 @@ AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_40, - - - # Check for X11 installed --XDT_CHECK_LIBX11_REQUIRE() -+XDT_CHECK_LIBX11() -+if test "x$with_x" = "xyes" ; then -+ XDT_CHECK_LIBX11_REQUIRE() -+fi -+AM_CONDITIONAL([USE_LIBX11], [test "x$with_x" = xyes]) - - # Check for Polkit/PolicyKit - XDT_CHECK_OPTIONAL_PACKAGE([POLKIT], [polkit-gobject-1], [polkit_minimum_version], -@@ -439,11 +443,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc]) - - - # check for gtk-doc --m4_ifdef([GTK_DOC_CHECK], [ --GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) --],[ - AM_CONDITIONAL([ENABLE_GTK_DOC], false) --]) - - dnl --------------------------------------------------------------------------- - dnl check for inotify -@@ -553,7 +553,6 @@ doc/dbus/Makefile - doc/console-kit-daemon.1m - doc/dbus/ConsoleKit.xml - doc/dbus/Makefile --doc/libconsolekit/Makefile - libconsolekit/Makefile - libconsolekit/libconsolekit.pc - libck-connector/Makefile diff --git a/sysutils/consolekit2/files/patch-tools_Makefile.am b/sysutils/consolekit2/files/patch-tools_Makefile.am deleted file mode 100644 index fdc8efa10f08..000000000000 --- a/sysutils/consolekit2/files/patch-tools_Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/Makefile.am.orig 2020-04-11 15:14:59 UTC -+++ tools/Makefile.am -@@ -148,10 +148,14 @@ ck_log_system_stop_LDADD = \ - - libexec_PROGRAMS = \ - ck-collect-session-info \ -- ck-get-x11-server-pid \ -- ck-get-x11-display-device \ - ck-remove-directory \ - $(NULL) -+ -+if USE_LIBX11 -+libexec_PROGRAMS += \ -+ ck-get-x11-server-pid \ -+ ck-get-x11-display-device -+endif - - ck_collect_session_info_SOURCES = \ - ck-collect-session-info.c \