From nobody Mon Mar 28 19:43:38 2022 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 F07D21A312EC; Mon, 28 Mar 2022 19:43:38 +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 4KS3626LhFz3Q1Y; Mon, 28 Mar 2022 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648496618; 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=Mq0oNaGzFqofey+Rzjnep3MGH3QxA9+S1kJ2zHOrfRY=; b=eK4DtaEFnF0wJynGbqruduR9AAlP8q0EkKWV2GrD63/8hqIkSh0JPLGlHOVOmu2iCpYkke phesebL/azliMH8LCe0uyZyjDXZmiRJWF6bcY+9Mc0XRDnuTN2qEabjSejcLkjLF4Jo60S sAD9DHOwQz7qwvbZurEwHHgKcya+NwB1wrKaOs2ed35b/N2rO3XV7RbNndECjfGCC7ykjZ Ysz8euXP06RsTQgER67tq4c4kT/R6XxAYsXAOt4rpZDcIIWu8t5KZwU95QbrMSTPNK+4xs km7vraT3zgE2cmA7U4ZfggCOWx4RLn8F+tkBcnTowNejQW6j75i2W+EimDW8rg== 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 B9E07105BD; Mon, 28 Mar 2022 19:43:38 +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 22SJhceX039826; Mon, 28 Mar 2022 19:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SJhcUv039825; Mon, 28 Mar 2022 19:43:38 GMT (envelope-from git) Date: Mon, 28 Mar 2022 19:43:38 GMT Message-Id: <202203281943.22SJhcUv039825@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 2be33351230f - main - sysutils/upower: Replace my patch with upstream fix 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2be33351230f23d4382b8e4b929492cbe38976f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648496618; 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=Mq0oNaGzFqofey+Rzjnep3MGH3QxA9+S1kJ2zHOrfRY=; b=wD6PV2wd65QHpF96V3Hk1l1ldvkBD8iL/C2eTr3f0fb1sErFanTtHTMikQgBNzoNS3MMh1 T8o4y2XzAtxWvh7O1HvhH6nAMlT/hkGcf+Z+R1bn0M/oZW72nO1bTQ+bAgIBsr9wKswpIu Fa7KdkJ6ZZMkklPGlk5QIZ7owWjxByIlWW1zMq4F81Ne75VbnE+Oxk2kd3J7ylaK4+4vDn xqnBj+6gHcNeAvCQb0wg+A5QBQUGXoxV4eyq2fTlNgLAb9T2mSrb++FtHjA4LNXIXJh02d /ZY/ZofYYuNMmybo6qL9+TM2wchwAvyVzEtiA4H/4f9ZlEHqLfZ7sI7vcZEhIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648496618; a=rsa-sha256; cv=none; b=JG5tQG2mhq+VC9CPrxebyyc89KemgH2aaAp19BZQa+w7lDLwl3Oy19FAjxG7a7HAUx+0/i vimA3nVZuAycu234PEhN07+FLENMQG1Eo2KuqBIkPsGjFO9c3zcz86XuoY5gJjKEIbQerP 9iaGpixI9hqOdNFWH+pE5lb9GqQTfr9F2P/U/qa6J4XGWq2+0LVRCE5i0WZB6JjmYFI/TW bMP7i4psLY/bOMucJ3Gb5mt79kqzqp4NH/ogwBuOwaX1vHsVfnTKg4QtuRKkVIN1IIjCJs k31UVTcLzSa6g+JxJeAJck5qZ5i7dmSbMa2X3ouFk1DLWX/hUg0kOmjM04FfqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2be33351230f23d4382b8e4b929492cbe38976f5 commit 2be33351230f23d4382b8e4b929492cbe38976f5 Author: Guido Falsi AuthorDate: 2022-03-28 19:42:17 +0000 Commit: Guido Falsi CommitDate: 2022-03-28 19:43:34 +0000 sysutils/upower: Replace my patch with upstream fix PR: 262885 Obtained from: https://cgit.freedesktop.org/upower/commit/?id=1003d5c2a69e6c28dcf68adf10181b5180b5defa --- sysutils/upower/files/patch-doc_meson.build | 44 +++++++++++++++++++++++++++++ sysutils/upower/files/patch-meson.build | 15 +--------- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/sysutils/upower/files/patch-doc_meson.build b/sysutils/upower/files/patch-doc_meson.build new file mode 100644 index 000000000000..5ec319677ffc --- /dev/null +++ b/sysutils/upower/files/patch-doc_meson.build @@ -0,0 +1,44 @@ +--- doc/meson.build.orig 2022-03-09 17:46:34 UTC ++++ doc/meson.build +@@ -27,21 +27,23 @@ version_xml = configure_file( + input: 'version.xml.in', + configuration: cdata) + +-gnome.gtkdoc('UPower', +- main_xml: 'upower-docs.xml', +- src_dir: meson.source_root() / 'libupower-glib', +- dependencies: [ libupower_glib_dep ], +- scan_args: ['--rebuild-types', '--rebuild-sections'], +- content_files: [ +- version_xml, +- ifaces_refs, +- 'man/UPower.xml', +- 'man/upowerd.xml', +- 'man/upower.xml', +- '../COPYING', +- ], +- ignore_headers: [ +- 'config.h', +- ], +- install: get_option('gtk-doc') +-) ++if get_option('gtk-doc') ++ gnome.gtkdoc('UPower', ++ main_xml: 'upower-docs.xml', ++ src_dir: meson.source_root() / 'libupower-glib', ++ dependencies: [ libupower_glib_dep ], ++ scan_args: ['--rebuild-types', '--rebuild-sections'], ++ content_files: [ ++ version_xml, ++ ifaces_refs, ++ 'man/UPower.xml', ++ 'man/upowerd.xml', ++ 'man/upower.xml', ++ '../COPYING', ++ ], ++ ignore_headers: [ ++ 'config.h', ++ ], ++ install: get_option('gtk-doc') ++ ) ++endif diff --git a/sysutils/upower/files/patch-meson.build b/sysutils/upower/files/patch-meson.build index 42a7e4747166..e1258e52df16 100644 --- a/sysutils/upower/files/patch-meson.build +++ b/sysutils/upower/files/patch-meson.build @@ -1,19 +1,6 @@ --- meson.build.orig 2022-03-09 17:46:34 UTC +++ meson.build -@@ -47,7 +47,11 @@ m_dep = cc.find_library('m', required: true) - gio_unix_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version) - m_dep = cc.find_library('m', required: true) - --xsltproc = find_program('xsltproc', disabler: true, required: get_option('gtk-doc') or get_option('man')) -+if get_option('gtk-doc') or get_option('man') -+ xsltproc = find_program('xsltproc', disabler: true, required: get_option('gtk-doc') or get_option('man')) -+else -+ xsltproc = disabler() -+endif - - # Resolve OS backend - os_backend = get_option('os_backend') -@@ -105,7 +109,7 @@ subdir('etc') +@@ -105,7 +105,7 @@ subdir('etc') config_h = configure_file(output: 'config.h', configuration: cdata) subdir('etc')