From nobody Wed Mar 13 16:21:45 2024 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 4Tvwkd2LPFz5DBwP; Wed, 13 Mar 2024 16:21:45 +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 4Tvwkd1Vtwz4FcG; Wed, 13 Mar 2024 16:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710346905; 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=6SNsXlBCpdW6CZ6UxUnZI1HwFcYNkjBWJZ5HIYQkz0w=; b=Y1zXT9x3ZK3PMLcf9K/zaisp+HhylzvVGcRUsivNAjYad9y6w+skmBf94YTQBnHjCXTcHU X9VzdBXcwJ3FKfu6SOR0J8S+e/ZVcEPYGfnhALtobFSMEA5nk47+vmQbjVXJGVGFJTMhzE 0+ya5IImUuijc+IGb+h149s3NRKC48l3f7Q8hzy2qRchdZIMXyTiKk0rpd2wLc++Xozw0e i5TZXohm8zk8JBCNyXFTAlcFnvK/V5ZW90po5cxfWQ/tlUFcv9s+xf7OKDYV7Ryl9gPndG IxJPZ7yVQuimrWXhOZ5eWo96q3Fnf11nOu61QUyilztfhEf6K5LoJ/F4I92f9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710346905; a=rsa-sha256; cv=none; b=g+6cTczgc3hxD25AxQMaSTN1WPMYqke+ENSr7FQU9d6b8ld4E0kqnqifxETJ7ryIRUUaVu SRrz9msnfvt6MF6b/S+Zs5SE/pfQR26ckfsx4Yj670efwItMiuYkJ+I+oCfGspg9jvYJ+A iBkyoaJd18QBJrWxM8doq7WJU2C9xzh/3eChaIzt5yh1vIzkbj63i8jDKIqTM+KekaJ1WL dka1Yr1pszE/Kx4QoDBADuC1BWNir9ZugH91YbQ9ykUC7s6VRyMPs8+GfP00vpP4BjXdoS zVrFS3FWj2JoAEqNWJp8W/NCDN4qGbEGhW9Yb+uwhXG0xjvqnzUXe1GVhlEazA== 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=1710346905; 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=6SNsXlBCpdW6CZ6UxUnZI1HwFcYNkjBWJZ5HIYQkz0w=; b=IDkiK1ms/VKO8KB4aSKzc1Qjm8N3rz5MlGa+pZtWljH0WkMhr9jrRYm30G/9Us3GRvo+fr 4VAyl2V1c7jrdcWsz6tNBLidT9cyq1ZNiH0LSs86o7Qz/BfgG1og1P05lyIM0LIBoekwJf SHyIaqh0wwKTzu9gyxCavABrboYkbIM2mt0WhpH1PNJvbIQyFRQQ3ubMkSOLyRTppX7oa9 6epMnFKtRVSKrdAaBbCoAaf6Gx1bGHiIDO1MjHjXuaPrPB23EAtnlas4EtmsvtR7BIQxrK 3HtBA+/N7ebBsRkCK1M7vff2dEpqbXx44hyHCrLvbKiUt85RCOHQ10a6nZpSfw== 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 4Tvwkd15yJzqsJ; Wed, 13 Mar 2024 16:21:45 +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 42DGLjt3079164; Wed, 13 Mar 2024 16:21:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42DGLjvb079161; Wed, 13 Mar 2024 16:21:45 GMT (envelope-from git) Date: Wed, 13 Mar 2024 16:21:45 GMT Message-Id: <202403131621.42DGLjvb079161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: d00fb2a9b6d7 - main - x11/rofi-file-browser-extended: Fix build 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: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d00fb2a9b6d70929ca38a14b8d095daa7bef2865 Auto-Submitted: auto-generated The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=d00fb2a9b6d70929ca38a14b8d095daa7bef2865 commit d00fb2a9b6d70929ca38a14b8d095daa7bef2865 Author: Nicola Vitale AuthorDate: 2024-03-13 16:15:29 +0000 Commit: Nicola Vitale CommitDate: 2024-03-13 16:15:29 +0000 x11/rofi-file-browser-extended: Fix build The build fails with the following error: FAILED: CMakeFiles/filebrowser.dir/src/filebrowser.c.o /usr/bin/cc -D_XOPEN_SOURCE=700 -Dfilebrowser_EXPORTS -I/wrkdirs/usr/ports/x11/rofi-file-browser-extended/work/rofi-file-browser-extended-1.3.1/include -I/usr/local/include/cairo -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/pixman-1 -I/usr/local/include/libpng16 -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -DNDEBUG -fPIC -MD -MT CMakeFiles/filebrowser.dir/src/filebrowser.c.o -MF CMakeFiles/filebrowser.dir/src/filebrowser.c.o.d -o CMakeFiles/filebrowser.dir/src/filebrowser.c.o -c /wrkdirs/usr/ports/x11/rofi-file-browser-extended/work/rofi-file-browser-extended-1.3.1/src/filebrowser.c /wrkdirs/usr/ports/x11/rofi-file-browser-extended/work/rofi-file-browser-extended-1.3.1/src/filebrowser.c:380:27: error: incompatible function pointer types initializing '_mode_get_icon' (aka 'struct _cairo_surface *(*)(const struct rofi_mode *, unsigned int, unsigned int)') with an expression of type 'cairo_surface_t *(const Mode *, unsigned int, int)' (aka 'struct _cairo_surface *(const struct rofi_mode *, unsigned int, int)') [-Wincompatible-function-pointer-types] ._get_icon = file_browser_get_icon, ^~~~~~~~~~~~~~~~~~~~~ 1 error generated. So apply the patch provided at https://github.com/marvinkreis/rofi-file-browser-extended/pull/49 and used by the Gentoo port too: https://bugs.gentoo.org/880985 Reported by: pkg-fallout --- x11/rofi-file-browser-extended/Makefile | 4 ++++ x11/rofi-file-browser-extended/distinfo | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/x11/rofi-file-browser-extended/Makefile b/x11/rofi-file-browser-extended/Makefile index e2228c14c2af..e96030acc608 100644 --- a/x11/rofi-file-browser-extended/Makefile +++ b/x11/rofi-file-browser-extended/Makefile @@ -3,6 +3,10 @@ DISTVERSION= 1.3.1 PORTREVISION= 1 CATEGORIES= x11 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4.patch:-p1 # Fix function pointer initialization +PATCHFILES+= 4d402e599e209a072492cc8c0e35a5e039e7bfd6.patch:-p1 # Check that 'height' is within INT_MAX + MAINTAINER= nivit@FreeBSD.org COMMENT= Use rofi to quickly open files WWW= https://github.com/marvinkreis/rofi-file-browser-extended diff --git a/x11/rofi-file-browser-extended/distinfo b/x11/rofi-file-browser-extended/distinfo index 054b9d945aba..033885f2e77c 100644 --- a/x11/rofi-file-browser-extended/distinfo +++ b/x11/rofi-file-browser-extended/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1669926301 +TIMESTAMP = 1710338595 SHA256 (marvinkreis-rofi-file-browser-extended-1.3.1_GH0.tar.gz) = 9e010e671533dd747e6e7ae4ed290b6e2829e758ca073381fa8a8fe53e004660 SIZE (marvinkreis-rofi-file-browser-extended-1.3.1_GH0.tar.gz) = 27169 +SHA256 (6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4.patch) = b7bc88eb8c810cbcc8c5a818870b7e9f435ca608f29c16306204cbb4ee3b75b5 +SIZE (6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4.patch) = 1426 +SHA256 (4d402e599e209a072492cc8c0e35a5e039e7bfd6.patch) = 6ad8680393b22ee363a7e1e0dacc72f02917133ea24a7ddcb34e9ee3700cb662 +SIZE (4d402e599e209a072492cc8c0e35a5e039e7bfd6.patch) = 1226