From 1d18b53ed419c49eb3f71637ccd58a431c1368d4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Apr 2023 05:44:50 +0100 Subject: gentoo auto-resync : 14:04:2023 - 05:44:49 --- net-im/Manifest.gz | Bin 9904 -> 9900 bytes net-im/cawbird/Manifest | 3 +- net-im/cawbird/cawbird-1.5-r2.ebuild | 77 ----------------------- net-im/cawbird/cawbird-1.5-r3.ebuild | 81 +++++++++++++++++++++++++ net-im/cawbird/files/cawbird-1.5-clang16.patch | 28 +++++++++ 5 files changed, 111 insertions(+), 78 deletions(-) delete mode 100644 net-im/cawbird/cawbird-1.5-r2.ebuild create mode 100644 net-im/cawbird/cawbird-1.5-r3.ebuild create mode 100644 net-im/cawbird/files/cawbird-1.5-clang16.patch (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 6e251bec5f23..679ccf453c47 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest index 1f1ab3aa068c..2d8d05e8a54f 100644 --- a/net-im/cawbird/Manifest +++ b/net-im/cawbird/Manifest @@ -1,3 +1,4 @@ +AUX cawbird-1.5-clang16.patch 1355 BLAKE2B ca51fb1f70ff2604a2802145316f41a61260c4ddca0e3683b78ff5446dcdcdc9893d14eb19d44e4e0b1b3c3ef203e1e97d6e108a1ed685ecdbf35b9165d8e314 SHA512 e3c2b81a38931cc814a9223b8f444cd9c20231d832e1dcfca470bff666975a73095743dabd96dddecccaf7da5625fd8be34ad4f0e161d6e3cfea39a77f6658ef DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1 -EBUILD cawbird-1.5-r2.ebuild 1621 BLAKE2B 3c07dde77e3207fd382d4e3eab1ab6c775591f57eb4bc4d57cc168126d4b688293e0795574dc321069dd18c769b9c66af0d5433d415845ef15283030778c5255 SHA512 581ca96bca82dd7820145bbf6f80e5acf8e89ce8499eda803323a97cb2d9d387b310dae9da5c7cf66261935cdfd84f6e4f89aacd4521868716186b10bb149edc +EBUILD cawbird-1.5-r3.ebuild 1678 BLAKE2B 47a17756199e591c48d082a5817a834fc9d95054d934156e96656bb887581cbf76abe1b4b30ce493b9a2e14040a37437350ff2542f8f64ba08fd4d43a7de1af5 SHA512 46275212bd95ed90625f7f4b969285df0fccb4ab0839132568517c9a37131d06a263f8b3c1a00160b6c1df5e27a063315131d02832a095c35725e7f1649b1ca1 MISC metadata.xml 245 BLAKE2B 676b53eacb2672a796da88ec3c22837faaa0ac5a37c539f9e284f8cf5fe72d6684f5c037fdc836017bf9e5318346e3b6e7b6606dd0a6a8c75198aad9d98de789 SHA512 e7f643ef44d596d37a400947aaa0061e15b1f4ba0e4305e0dad0dd44f7c5ff34464d3303e5ef0be1909d0aba264bd940f0e317874d3541db5e100bb5c9af4e7d diff --git a/net-im/cawbird/cawbird-1.5-r2.ebuild b/net-im/cawbird/cawbird-1.5-r2.ebuild deleted file mode 100644 index 356538a344b1..000000000000 --- a/net-im/cawbird/cawbird-1.5-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome2-utils meson vala xdg - -DESCRIPTION="Twitter client" -HOMEPAGE="https://ibboard.co.uk/cawbird/ https://github.com/IBBoard/cawbird" -SRC_URI="https://github.com/IBBoard/cawbird/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${P} - -LICENSE="CC-BY-3.0 GPL-3+" -SLOT="0" -KEYWORDS="amd64" -IUSE="gstreamer spell" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/atk - dev-libs/glib:2 - dev-libs/json-glib - net-libs/liboauth - net-libs/libsoup:2.4 - net-libs/rest:0.7 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - gstreamer? ( - media-plugins/gst-plugins-gtk - media-plugins/gst-plugins-hls - media-plugins/gst-plugins-meta[ffmpeg,http,X] - ) - spell? ( app-text/gspell:=[vala] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - $(vala_depend) - virtual/pkgconfig -" - -src_prepare() { - default - - # Remove tests that require the network. - for test in avatardownload filters inlinemediadownloader \ - texttransform tweetparsing; do - sed -i "/${test}/d" tests/meson.build || die - done - - vala_setup -} - -src_configure() { - local emesonargs=( - # these keys are taken from the readme of cawbird - -Dconsumer_key_base64='VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==' - -Dconsumer_secret_base64='MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=' - -Dexamples=false - $(meson_use spell spellcheck) - $(meson_use gstreamer video) - -Dx11=true - ) - meson_src_configure -} - -pkg_postinst() { - gnome2_schemas_update - xdg_pkg_postinst -} - -pkg_postrm() { - gnome2_schemas_update - xdg_pkg_postrm -} diff --git a/net-im/cawbird/cawbird-1.5-r3.ebuild b/net-im/cawbird/cawbird-1.5-r3.ebuild new file mode 100644 index 000000000000..4a184bcbe2d3 --- /dev/null +++ b/net-im/cawbird/cawbird-1.5-r3.ebuild @@ -0,0 +1,81 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils meson vala xdg + +DESCRIPTION="Twitter client" +HOMEPAGE="https://ibboard.co.uk/cawbird/ https://github.com/IBBoard/cawbird" +SRC_URI="https://github.com/IBBoard/cawbird/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${P} + +LICENSE="CC-BY-3.0 GPL-3+" +SLOT="0" +KEYWORDS="amd64" +IUSE="gstreamer spell" + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/atk + dev-libs/glib:2 + dev-libs/json-glib + net-libs/liboauth + net-libs/libsoup:2.4 + net-libs/rest:0.7 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + gstreamer? ( + media-plugins/gst-plugins-gtk + media-plugins/gst-plugins-hls + media-plugins/gst-plugins-meta[ffmpeg,http,X] + ) + spell? ( app-text/gspell:=[vala] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(vala_depend) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5-clang16.patch +) + +src_prepare() { + default + + # Remove tests that require the network. + for test in avatardownload filters inlinemediadownloader \ + texttransform tweetparsing; do + sed -i "/${test}/d" tests/meson.build || die + done + + vala_setup +} + +src_configure() { + local emesonargs=( + # these keys are taken from the readme of cawbird + -Dconsumer_key_base64='VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==' + -Dconsumer_secret_base64='MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=' + -Dexamples=false + $(meson_use spell spellcheck) + $(meson_use gstreamer video) + -Dx11=true + ) + meson_src_configure +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/net-im/cawbird/files/cawbird-1.5-clang16.patch b/net-im/cawbird/files/cawbird-1.5-clang16.patch new file mode 100644 index 000000000000..62137f4abda8 --- /dev/null +++ b/net-im/cawbird/files/cawbird-1.5-clang16.patch @@ -0,0 +1,28 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=2185474 +https://src.fedoraproject.org/rpms/cawbird/raw/40963504cc61b410cf82b0f4e5938f1e66d3cf12/f/cawbird-c99.patch + +Declare cb_tweet_model_set_thread_mode in CbTweetModel.h, so that it +can be called from TweetInfoPage.vala. Likewise for +cb_tweet_has_quoted_inline_media, CbTweet.h and TweetListEntry.vala. + +--- a/src/CbTweet.h ++++ b/src/CbTweet.h +@@ -104,6 +104,7 @@ CbMedia ** cb_tweet_get_quoted_medias(CbTweet *tweet, + 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); +--- a/src/CbTweetModel.h ++++ b/src/CbTweetModel.h +@@ -56,6 +56,7 @@ GType cb_tweet_model_get_type (void) G_GNUC_CONST; + 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); + -- cgit v1.2.3