git: 152c5915f656 - main - net-im/cawbird: unbreak build with Meson 1.4.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Mar 2024 05:59:42 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=152c5915f6568ffb5164a26c577f72b8ec649606
commit 152c5915f6568ffb5164a26c577f72b8ec649606
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-03-15 01:35:40 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
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);