From nobody Wed Oct 4 20:04:41 2023 X-Original-To: dev-commits-ports-all@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 4S15JC42g0z4w4wV; Wed, 4 Oct 2023 20:04:43 +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 4S15JC2DRnz4J6P; Wed, 4 Oct 2023 20:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449883; 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=BYq/sFYIavDI2fO2A+QDvAJLoL1k10v0Ap41Bb/SWXE=; b=TOlgHu/oElpKoCBOwDW2IRJAB4Fcx8HLo6tAQ1BRI0cvoYr+yRa3WBE63GHsKsRnsx7Z/7 QR+IPvI9sk9VJ7thckx2Py2dkdV+7lHftv7xddCjeeZtDFIksQY3r82/icdST0c4VCsND5 i7xhQHQS4mv8YZ9SD5QuXAmmuR4z5oweVQv/58yLJkUDAuGoRQjv6qrbOzU9sD2andDPOL /nddR4VZuJXgXy8UJ122s6qSQEk+s/XFpIavkf+BMpnJ2ADN1hDupN6IkL4euvXO7YeGdz uOM4pNPd8md3QxiWIi5UkBQVUloz5vfpqGYfVkCSgDcfsMs3UE6UTR9nwfMfqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696449883; a=rsa-sha256; cv=none; b=QZdAWZO81fIyW8ZPL0UTTis+D/Xz8ns173USdLeoZdFE7fd8c7SgeBliuVdcG5Q3UYw+E5 6EE78mRUBinpM4c3VRKEx7A8g8dTYVSItlatBacl1WJV3MaqTVpT2fhaRi9ubLeD4ROayt //F3kDr+tNz2yfGgjm9tu0c0FmbPHVGbVd14Q5InGL7Id6ORYYiLogc4gk1ZLtq3ALOGPd +XaD7X3b34pBQZGp9fqk/ANivBBlHizwyRr87VqWMpTeQQ9NhBfF/VrkYBmWdcUUVtVcZg PoWGRq7rFgKt+dR+htSzROQ9usAqKRYe2P1mIfXLYW04ofJrJHteoWRgZhD4wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696449883; 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=BYq/sFYIavDI2fO2A+QDvAJLoL1k10v0Ap41Bb/SWXE=; b=ds/D5+8zBmyZyhE/3TQhov9o6TqAGxGk5Xhkg1HuRBcVE47tVZLDnpTuLEnmk4xWIQI1pj VRC0FeXMT5aSe9dqOMRd7GfEJUz7BZSi+RsmdGv6WAWv1k1B8/5o+twvWmDezRQP7fnisP /0G4YiSIWJRIKGqrqgOPobMel3XsMfXy59HVeTyAjWFNrTnq7ax59q0Q710dnTRYWb4M/e Mhb/kUMxXphyIRb7P42ObZJGpT//eKxVLh4XzuC0J4jWvmdbxiMseTV/3REEWtiQMn9FO4 o2BOcovx71au6a0xYcNfZPFU+oY42GZNa54FU48KEyA2XmPTbu2FeBJTar1rJg== 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 4S15J96Nmczrgt; Wed, 4 Oct 2023 20:04:41 +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 394K4fcs057696; Wed, 4 Oct 2023 20:04:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394K4fWp057693; Wed, 4 Oct 2023 20:04:41 GMT (envelope-from git) Date: Wed, 4 Oct 2023 20:04:41 GMT Message-Id: <202310042004.394K4fWp057693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: c742165f18eb - 2023Q4 - sysutils/budgie-control-center: add fix to display hostname device List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: c742165f18eb39f2276f98ba1d9199108ed1fc9f Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=c742165f18eb39f2276f98ba1d9199108ed1fc9f commit c742165f18eb39f2276f98ba1d9199108ed1fc9f Author: Olivier Duchateau AuthorDate: 2023-10-02 22:47:37 +0000 Commit: Robert Clausecker CommitDate: 2023-10-04 20:04:14 +0000 sysutils/budgie-control-center: add fix to display hostname device - Add fix to display hostname device (by default it is searched by the 'org.freedesktop.hostname1' service. It comes from systemd/elogind) - Bump PORTREVISION PR: 274224 MFH: 2023Q4 (cherry picked from commit 53f3134b74bb18b06b6f2d25dbf2fadfbda004df) --- sysutils/budgie-control-center/Makefile | 1 + ...h-panels_info-overview_cc-info-overview-panel.c | 70 ++++++++++++++++++++++ ...-panels_info-overview_cc-info-overview-panel.ui | 24 ++++++++ 3 files changed, 95 insertions(+) diff --git a/sysutils/budgie-control-center/Makefile b/sysutils/budgie-control-center/Makefile index e2e49bba9863..9366403235b6 100644 --- a/sysutils/budgie-control-center/Makefile +++ b/sysutils/budgie-control-center/Makefile @@ -1,5 +1,6 @@ PORTNAME= budgie-control-center DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= sysutils budgie MASTER_SITES= BUDGIE diff --git a/sysutils/budgie-control-center/files/patch-panels_info-overview_cc-info-overview-panel.c b/sysutils/budgie-control-center/files/patch-panels_info-overview_cc-info-overview-panel.c new file mode 100644 index 000000000000..0e21eb5c856f --- /dev/null +++ b/sysutils/budgie-control-center/files/patch-panels_info-overview_cc-info-overview-panel.c @@ -0,0 +1,70 @@ +--- panels/info-overview/cc-info-overview-panel.c.orig 2023-08-01 19:09:00 UTC ++++ panels/info-overview/cc-info-overview-panel.c +@@ -40,6 +40,9 @@ + #include + #include + ++#include ++#include ++ + #include + + #ifdef GDK_WINDOWING_WAYLAND +@@ -64,6 +67,7 @@ struct _CcInfoOverviewPanel + CcListRow *graphics_row; + GtkListBox *hardware_box; + CcListRow *hardware_model_row; ++ GtkListBox *hostname_box; + GtkDialog *hostname_editor; + CcHostnameEntry *hostname_entry; + CcListRow *hostname_row; +@@ -701,6 +705,21 @@ info_overview_panel_setup_virt (CcInfoOverviewPanel *s + set_virtualization_label (self, g_variant_get_string (inner, NULL)); + } + ++static char * ++get_hostname_fallback (void) ++{ ++ char localhost[_POSIX_HOST_NAME_MAX + 1] = ""; ++ if (gethostname (localhost, _POSIX_HOST_NAME_MAX) == 0) ++ { ++ if (g_strcmp0 ((char *)localhost, "") > 0) ++ return (char *)localhost; ++ else ++ return "localhost"; ++ } ++ else ++ return "localhost"; ++} ++ + static const char * + get_windowing_system (void) + { +@@ -771,6 +790,8 @@ info_overview_panel_setup_overview (CcInfoOverviewPane + if (load_budgie_version (&budgie_version)) + cc_list_row_set_secondary_label (self->budgie_version_row, budgie_version); + ++ cc_list_row_set_secondary_label (self->hostname_row, get_hostname_fallback ()); ++ + cc_list_row_set_secondary_label (self->windowing_system_row, get_windowing_system ()); + + hardware_model_text = get_hardware_model_string (); +@@ -948,9 +969,7 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *s + g_assert (CC_IS_INFO_OVERVIEW_PANEL (self)); + g_assert (CC_IS_LIST_ROW (row)); + +- if (row == self->hostname_row) +- open_hostname_edit_dialog (self); +- else if (row == self->software_updates_row) ++ if (row == self->software_updates_row) + open_software_update (self); + } + +@@ -1018,6 +1037,7 @@ cc_info_overview_panel_class_init (CcInfoOverviewPanel + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, graphics_row); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hardware_box); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hardware_model_row); ++ gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_box); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_editor); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_entry); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_row); diff --git a/sysutils/budgie-control-center/files/patch-panels_info-overview_cc-info-overview-panel.ui b/sysutils/budgie-control-center/files/patch-panels_info-overview_cc-info-overview-panel.ui new file mode 100644 index 000000000000..adbe74b033ce --- /dev/null +++ b/sysutils/budgie-control-center/files/patch-panels_info-overview_cc-info-overview-panel.ui @@ -0,0 +1,24 @@ +--- panels/info-overview/cc-info-overview-panel.ui.orig 2023-08-01 19:09:00 UTC ++++ panels/info-overview/cc-info-overview-panel.ui +@@ -37,10 +37,9 @@ + + + +- ++ + True + none +- + +@@ -50,8 +49,7 @@ + + True + Device Name +- +- go-next-symbolic ++ False + + +