From nobody Mon Dec 27 09:24:27 2021 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 9C4E9191CECD; Mon, 27 Dec 2021 09:24:28 +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 4JMsgb64Qbz4r23; Mon, 27 Dec 2021 09:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B0FCA1BB00; Mon, 27 Dec 2021 09:24:27 +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 1BR9ORxa050464; Mon, 27 Dec 2021 09:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BR9ORkj050463; Mon, 27 Dec 2021 09:24:27 GMT (envelope-from git) Date: Mon, 27 Dec 2021 09:24:27 GMT Message-Id: <202112270924.1BR9ORkj050463@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 53cb979642b0 - main - x11-fm/nautilus: unbreak build after deskutils/libportal upgrade (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53cb979642b065331d26cd25a566b30ed88170a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640597067; 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=V/FGPMaSOvnEMk0BHfRjmZH0gIOVriup8+5p2ZRA69s=; b=YOFCaeRFcaRv0fvrRjR1cAebQA/5QqxQdkau/UnATdn5rSpfilipziIswi4FBsMp61Mbc8 7/ROvAhHmJi8rg5H9GIEEytHdRCsx7kusTzf0UWjxlEM/LaWi6RTN96hbgp1074jKXj9/W mrerUDedXrpkmvG74kJttvB7H2CmqhoTWpO3LU+j7+KjauLbZe9Yfp/5drafX+uflLm95B lukakockrXomnJFMOmMMbthmENbGEnlZm6NuNRONNo8+rWu9o5rAntTxdmexFxl1W+iNFM pBBkTdVvbu8znrM99luNYca5FSjGdoH3inl7eS/HRPUA6p8vF1L5NDYDNQUKSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640597067; a=rsa-sha256; cv=none; b=r+6nQZZmPEwz8wwlCENBBk14lktfrMXAU7xnkKrkZ2GAjeM2Uyg+SfBqU+Qd9r4TClqdqq cqTr9sVOTnQzJq8lk7Ziwiqhj58FBPuGaemZxM/8/RlqacomExhG7eED4CyBt83z29Mmuw D0Eats+0OrGTDpiUaU9SQri1kz6GPgxEH8oaAPQv63oIZlzUDETo9LnPcuX1LswcuWrzRH 9oJfPqRstpJa6cBrmb0K7bIpAQ+0asVUdHE+I12h3+ehfxaFjt8fMRZ8BlOi9YA7UZxte1 0OEyTCaN5RrZ9pl0YPvUm5ZtyakZ/oFAe0T3KU11p+qKt4OrTPAREG8CqZnUKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=53cb979642b065331d26cd25a566b30ed88170a4 commit 53cb979642b065331d26cd25a566b30ed88170a4 Author: Dima Panov AuthorDate: 2021-12-27 09:20:14 +0000 Commit: Dima Panov CommitDate: 2021-12-27 09:24:11 +0000 x11-fm/nautilus: unbreak build after deskutils/libportal upgrade (+) The portal-gtk3.h header has been moved into a separate subdir. Backport patch from upstream. Reported by: poudriere With hat: desktop Sponsored by: Netzkommune GmbH --- x11-fm/nautilus/Makefile | 1 + ...ch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 7a96e3e40c71..3ca17bbf89e4 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -2,6 +2,7 @@ PORTNAME= nautilus PORTVERSION= 41.1 +PORTREVISION= 1 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/x11-fm/nautilus/files/patch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d b/x11-fm/nautilus/files/patch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d new file mode 100644 index 000000000000..f3ea5fbf66c6 --- /dev/null +++ b/x11-fm/nautilus/files/patch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d @@ -0,0 +1,41 @@ +diff --git meson.build meson.build +index 927216636a21bfc0a4de3336e084c4d0084b6624..4626fa0bb7f69f84a3ba79f13bd869b641bad428 100644 +--- meson.build ++++ meson.build +@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0') + gtk = dependency('gtk+-3.0', version: '>= 3.22.27') + libhandy = dependency('libhandy-1', version: '>= 1.1.90') + libportal = [] ++libportal_gtk3 = [] + if get_option('libportal') +- libportal = dependency('libportal', version: '>= 0.3') ++ libportal = dependency('libportal', version: '>= 0.5') ++ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') + endif + selinux = [] + if get_option('selinux') +diff --git src/meson.build src/meson.build +index 682d6f3a3cd0899985ddd7a8b2a9479e5f1a5d79..d7fb76d53d5f3e6e28931734a7c55bf5443c06f7 100644 +--- src/meson.build ++++ src/meson.build +@@ -285,6 +285,7 @@ nautilus_deps = [ + libgd_dep, + libhandy, + libportal, ++ libportal_gtk3, + nautilus_extension, + selinux, + tracker_sparql, +diff --git src/nautilus-files-view.c src/nautilus-files-view.c +index dfb7fb26c0c8d2c55d76c1d4fc3a2b39fbec817b..a24005a110c40c9a1dd4954aa2d6beccd9b17182 100644 +--- src/nautilus-files-view.c ++++ src/nautilus-files-view.c +@@ -93,7 +93,7 @@ + + #ifdef HAVE_LIBPORTAL + #include +-#include ++#include + #endif + + /* Minimum starting update inverval */