From nobody Fri Mar 15 05:59:42 2024 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 4Twtqy5XTKz5FNg2; Fri, 15 Mar 2024 05:59:42 +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 4Twtqy2JRZz4Tp7; Fri, 15 Mar 2024 05:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710482382; 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=bi8OFROBMcyuZQpAUDV8KxI5pCHScOgqLELZtzVAOBk=; b=Ksf0O3xce5vGo2G+hzk9hoOAiwTVFUfRrUlmXH7dgJmGGRoqy+i2aPK0AwweWMZvhx66/F 44j5POlU6Lf/USHKWGgVsMO8+EXQ9sd53N/i+cp332Vnnf4gOX+oehkIJPtM7WFsUq/Uxi 4OQewQpenRrPIUEtmolJfqe9j5K9hv9zQuGc5bpw6cZjaltEcCkMNR9WHC17zFG2G2ttNC zZjqJaelML9VVYYuqwmKBKvD0aGeeNfQHmfF8m0ODETeEpIpWxUGA5cWrv209coRwfU3u+ cd5yXeVFaCD/Tm1/6CY4DVoTWOg2g5TVnRoUtxbxHW1bNysoFNasjHTYzYw2qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710482382; a=rsa-sha256; cv=none; b=p3Rs3N/5DT+8rLgVIJQRoWz5kzHY4vFUnrEqm/9pN9BrtrCPsuNgBiEllyZTFFFMSW0Ih2 Hl79QyyanLKw2Lz6eKLLn2fk69VMUnHpryRX6Rb7NZS9S0Ct/VrIUJbDnMk03/ZXQlCaeP ekitTD0yxkBbgvkn8cT7FDlM5slUNY9gxNOsZ6p2/wLWRieyH6g+n3PwjOzolSHXQREjb/ d7Rm2BBjnKulamy+NHv3OuPjSaLOvv6avhkN+6Vuhl+C7QyPd7OqhbMDH/wuPRzlWFnQ9g u/aT9b/OcWRS5X671lZWedwMGN0+oNQ1oCbNTm2pDiCVh65sdnGgPUK0p/y1TQ== 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=1710482382; 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=bi8OFROBMcyuZQpAUDV8KxI5pCHScOgqLELZtzVAOBk=; b=Tome0xyflcf03n4x5B0pSm65UXKZuInTQljJevPzQVe9QS1BkURKF+J0GTNvbHjg9lAVXk VDT9yp186jAHviNCaMtPFDI8BNk9B9oN/D7i6gMwtLjL5m3qsZRJIXKKpnSGVo2Jr5DECd bzwzd23vFgAjkfssg5WJEAWf9dOAS/R1XujFjl9BEkW72QiPVy6axTJfczljuRh6vq/0j7 CWNMWJhhbZ2quN4ZqY4obCtG6GuJQyamZHn7IXVForKMe1SrNPW0GTUKEW8+p0yBClvnE/ 4MKaGLNk/5wMkhpm9Da91GtGTdxBzAfd9huyn9b8C+oUsOWVCW0x4IHpnrkvVA== 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 4Twtqy1vThzywp; Fri, 15 Mar 2024 05:59:42 +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 42F5xgfE083554; Fri, 15 Mar 2024 05:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42F5xgto083551; Fri, 15 Mar 2024 05:59:42 GMT (envelope-from git) Date: Fri, 15 Mar 2024 05:59:42 GMT Message-Id: <202403150559.42F5xgto083551@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 152c5915f656 - main - net-im/cawbird: unbreak build with Meson 1.4.0 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 152c5915f6568ffb5164a26c577f72b8ec649606 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=152c5915f6568ffb5164a26c577f72b8ec649606 commit 152c5915f6568ffb5164a26c577f72b8ec649606 Author: Jan Beich AuthorDate: 2024-03-15 01:35:40 +0000 Commit: Jan Beich CommitDate: 2024-03-15 05:54:48 +0000 net-im/cawbird: unbreak build with Meson 1.4.0 libcawbird.a.p/src/list/TweetListEntry.c:1215:6: error: implicit declaration of function 'cb_tweet_has_quoted_inline_media' is invalid in C99 [-Werror,-Wimplicit-function-declaration] if (cb_tweet_has_quoted_inline_media (tweet)) { ^ libcawbird.a.p/src/TweetInfoPage.c:3374:20: error: implicit declaration of function 'cb_tweet_model_index_of_retweet' is invalid in C99 [-Werror,-Wimplicit-function-declaration] replied_to_idx = cb_tweet_model_index_of_retweet (_tmp3_, reply_id); ^ PR: 277354 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/5f659af87001 --- net-im/cawbird/Makefile | 2 +- net-im/cawbird/files/patch-src_CbTweet.h | 14 ++++++++++++++ net-im/cawbird/files/patch-src_CbTweetModel.h | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/net-im/cawbird/Makefile b/net-im/cawbird/Makefile index 0c29f17974e7..4d415ec743f6 100644 --- a/net-im/cawbird/Makefile +++ b/net-im/cawbird/Makefile @@ -1,7 +1,7 @@ PORTNAME= cawbird PORTVERSION= 1.5 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MAINTAINER= ports@FreeBSD.org diff --git a/net-im/cawbird/files/patch-src_CbTweet.h b/net-im/cawbird/files/patch-src_CbTweet.h new file mode 100644 index 000000000000..b1c9e6ade2de --- /dev/null +++ b/net-im/cawbird/files/patch-src_CbTweet.h @@ -0,0 +1,14 @@ +libcawbird.a.p/src/list/TweetListEntry.c:1215:6: error: implicit declaration of function 'cb_tweet_has_quoted_inline_media' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + if (cb_tweet_has_quoted_inline_media (tweet)) { + ^ + +--- src/CbTweet.h.orig 2022-03-18 20:59:56 UTC ++++ src/CbTweet.h +@@ -110,6 +110,7 @@ gboolean cb_tweet_has_inline_media (CbTweet + char ** cb_tweet_get_mentions (CbTweet *tweet, + int *n_mentions); + gboolean cb_tweet_has_inline_media (CbTweet *tweet); ++gboolean cb_tweet_has_quoted_inline_media (CbTweet *tweet); + gint64 cb_tweet_get_user_id (CbTweet *tweet); + const char * cb_tweet_get_screen_name (CbTweet *tweet); + const char * cb_tweet_get_user_name (CbTweet *tweet); diff --git a/net-im/cawbird/files/patch-src_CbTweetModel.h b/net-im/cawbird/files/patch-src_CbTweetModel.h new file mode 100644 index 000000000000..0b5b01aba460 --- /dev/null +++ b/net-im/cawbird/files/patch-src_CbTweetModel.h @@ -0,0 +1,14 @@ +libcawbird.a.p/src/TweetInfoPage.c:3374:20: error: implicit declaration of function 'cb_tweet_model_index_of_retweet' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + replied_to_idx = cb_tweet_model_index_of_retweet (_tmp3_, reply_id); + ^ + +--- src/CbTweetModel.h.orig 2022-03-18 20:59:56 UTC ++++ src/CbTweetModel.h +@@ -56,6 +56,7 @@ int cb_tweet_model_index_of (CbTweetModel *self, gint6 + CbTweetModel *cb_tweet_model_new (void); + + int cb_tweet_model_index_of (CbTweetModel *self, gint64 id); ++int cb_tweet_model_index_of_retweet (CbTweetModel *self, gint64 id); + + gboolean cb_tweet_model_contains_id (CbTweetModel *self, + gint64 id);