* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission-remote-gtk/files/, net-p2p/transmission-remote-gtk/
@ 2020-03-20 20:15 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-03-20 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 5801471187c94578ce69daaee1f2fe9fda3d4256
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 20:14:57 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 20:14:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58014711
net-p2p/transmission-remote-gtk: Replace with updated upstream patch
Bug: https://bugs.gentoo.org/706980
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...mission-remote-gtk-1.4.1-gcc10-fno-common.patch | 24 +++++++---------------
.../transmission-remote-gtk-1.4.1.ebuild | 3 +--
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
index 5cba628a07c..1c445b50854 100644
--- a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
+++ b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
@@ -1,18 +1,17 @@
-From 617aaf628962af85bf9b44ab517fec2b6fa178f9 Mon Sep 17 00:00:00 2001
+From b20655081332847426a7d10189bb1e2369efea42 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
-Date: Tue, 10 Mar 2020 11:20:12 +0100
+Date: Fri, 20 Mar 2020 20:30:24 +0100
Subject: [PATCH] Fix building under GCC 10 / -fno-common
-* Define an enum type `TrgColumnType`, not an anonymous
- enum with an object called `TrgColumnType`.
+* Add a `typedef` to avoid defining a variable.
Bug: https://bugs.gentoo.org/706980
---
- src/trg-tree-view.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/trg-tree-view.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h
-index 435848f..363f662 100644
+index 435848f..78cd76e 100644
--- a/src/trg-tree-view.h
+++ b/src/trg-tree-view.h
@@ -51,7 +51,7 @@ GtkWidget *trg_tree_view_new(void);
@@ -20,16 +19,7 @@ index 435848f..363f662 100644
G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv);
-enum {
-+enum TrgColumnType {
++typedef enum {
TRG_COLTYPE_ICONTEXT,
TRG_COLTYPE_FILEICONTEXT,
TRG_COLTYPE_WANTED,
-@@ -65,7 +65,7 @@ enum {
- TRG_COLTYPE_PRIO,
- TRG_COLTYPE_NUMGTZERO,
- TRG_COLTYPE_NUMGTEQZERO
--} TrgColumnType;
-+};
-
- typedef struct {
- gint model_column;
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
index c769e211f47..38e770e754b 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
" # eautoreconf needs sys-devel/autoconf-archive
PATCHES=(
- # https://github.com/transmission-remote-gtk/transmission-remote-gtk/pull/92
- "${FILESDIR}"/${PN}-1.4.1-gcc10-fno-common.patch
+ "${FILESDIR}"/${PN}-1.4.1-gcc10-fno-common.patch # merged, remove on bump
)
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission-remote-gtk/files/, net-p2p/transmission-remote-gtk/
@ 2022-08-30 14:32 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2022-08-30 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 8f102d279fd37cf63d2837746d36da9c704ce1a0
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 14:32:15 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 14:32:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f102d27
net-p2p/transmission-remote-gtk: drop 1.4.1
Closes: https://bugs.gentoo.org/867214
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-p2p/transmission-remote-gtk/Manifest | 1 -
...mission-remote-gtk-1.4.1-gcc10-fno-common.patch | 25 -----------
.../transmission-remote-gtk-1.4.1.ebuild | 51 ----------------------
3 files changed, 77 deletions(-)
diff --git a/net-p2p/transmission-remote-gtk/Manifest b/net-p2p/transmission-remote-gtk/Manifest
index bfce6f67c02f..1826905e5f79 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -1,2 +1 @@
-DIST transmission-remote-gtk-1.4.1.tar.xz 543620 BLAKE2B dea556138a7f554a6cbe5c3e0d5bdd9057cb61d2d80e2d89beb96b2926218e19ce85759fd079375ba8896e185bbdec74979372a9413dc5c513204f47b93e4304 SHA512 c1a2c26d01bc2557bafae9baa370f713e0412ac8445e12b19e9b3027c1a269745dbb865195d683af397d43a2956f51aad8bdfcaff93e4f07015e33715770de48
DIST transmission-remote-gtk-1.5.1.tar.xz 236804 BLAKE2B b2aeb4641a0ab55d2a212cdb04e8929c8c580e2f20a9a60fce7977404d1f0af64b5fc9ff2f9d7dd7d5744dddc34181d689c8dcab34cc23a0989a7e7f03d84395 SHA512 4488714f483dfbf539e39dc4b742127dc47799b255e7bc0e27c33aea92cea26d229616a484b566f5d85034d841a34546b113fc0428908ada4876840ff25cc824
diff --git a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
deleted file mode 100644
index 1c445b508546..000000000000
--- a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b20655081332847426a7d10189bb1e2369efea42 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Fri, 20 Mar 2020 20:30:24 +0100
-Subject: [PATCH] Fix building under GCC 10 / -fno-common
-
-* Add a `typedef` to avoid defining a variable.
-
-Bug: https://bugs.gentoo.org/706980
----
- src/trg-tree-view.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h
-index 435848f..78cd76e 100644
---- a/src/trg-tree-view.h
-+++ b/src/trg-tree-view.h
-@@ -51,7 +51,7 @@ GtkWidget *trg_tree_view_new(void);
-
- G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv);
-
--enum {
-+typedef enum {
- TRG_COLTYPE_ICONTEXT,
- TRG_COLTYPE_FILEICONTEXT,
- TRG_COLTYPE_WANTED,
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
deleted file mode 100644
index ee61ccb864e8..000000000000
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GTK+ client for management of the Transmission BitTorrent client, over HTTP RPC"
-HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="appindicator debug geoip libnotify libproxy rss"
-
-# RESTRICT="test"
-
-# FIXME: bundles rss-glib-0.2.3
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/json-glib-0.12.6
- net-misc/curl
- >=x11-libs/gtk+-3.16:3
- appindicator? ( dev-libs/libappindicator:3 )
- geoip? ( dev-libs/geoip )
- libnotify? ( >=x11-libs/libnotify-0.7 )
- libproxy? ( net-libs/libproxy )
- rss? ( >=net-libs/libmrss-0.18 )
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- >=sys-devel/gettext-0.19.6
- virtual/pkgconfig
-" # eautoreconf needs sys-devel/autoconf-archive
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.1-gcc10-fno-common.patch # merged, remove on bump
-)
-
-src_configure() {
- # Disable overly strict appdata validation
- gnome2_src_configure \
- $(use_enable debug) \
- $(use_with geoip libgeoip) \
- $(use_with libnotify) \
- $(use_with libproxy) \
- $(use_with appindicator libappindicator) \
- $(use_with rss libmrss) \
- APPSTREAM_UTIL="$(type -P true)"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission-remote-gtk/files/, net-p2p/transmission-remote-gtk/
@ 2023-05-08 17:48 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2023-05-08 17:48 UTC (permalink / raw
To: gentoo-commits
commit: f5769c7e63403b4ff4b2db142fcd114ed6c0957e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon May 8 15:48:08 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon May 8 17:48:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5769c7e
net-p2p/transmission-remote-gtk: backport support for libayatana-appindicator3
Closes: https://bugs.gentoo.org/887373
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...-remote-gtk-1.5.1-libayatana-appindicator.patch | 138 +++++++++++++++++++++
...ild => transmission-remote-gtk-1.5.1-r1.ebuild} | 8 +-
2 files changed, 144 insertions(+), 2 deletions(-)
diff --git a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.5.1-libayatana-appindicator.patch b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.5.1-libayatana-appindicator.patch
new file mode 100644
index 000000000000..5638ce01ab06
--- /dev/null
+++ b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.5.1-libayatana-appindicator.patch
@@ -0,0 +1,138 @@
+https://bugs.gentoo.org/887373
+
+From e23030df5743ce645e919066b68370e394a710a2 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Sat, 16 Apr 2022 19:18:57 -0500
+Subject: [PATCH] Support libayatana-appindicator as drop-in for
+ libappindicator
+
+Closes #184
+
+Co-Author: "Barak A. Pearlmutter" <barak+git@pearlmutter.net>
+---
+ README.md | 2 +-
+ meson.build | 7 +++++--
+ src/trg-main-window.c | 4 +++-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/README.md b/README.md
+index b7564d64..e814003c 100644
+--- a/README.md
++++ b/README.md
+@@ -29,7 +29,7 @@ The following packages are optional dependencies:
+ - libmrss >= 0.18, RSS feed support
+ - libproxy, HTTP proxy support
+ - libgeoip, country of origin of peers
+- - libappindicator, Application tray support
++ - libappindicator or libayatana-appindicator3, Application tray support
+
+ If these libraries are installed at build time they will be automatically
+ detected and linked for additional functionality.
+diff --git a/meson.build b/meson.build
+index 2acac209..9e26e227 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('transmission-remote-gtk', 'c',
+ license: 'GPL2+',
+ version: '1.5.1',
+- meson_version: '>= 0.59.0',
++ meson_version: '>= 0.60.0',
+ default_options: ['b_pie=true',
+ 'c_std=gnu99',
+ 'warning_level=2',
+@@ -48,7 +48,7 @@ trg_deps = [gtk_dep, glib_dep, gio_dep, json_dep, libcurl_dep, gthread_dep]
+ rss_dep = dependency('mrss', version: '>=0.18', required: get_option('mrss'))
+ geoip_dep = dependency('geoip', required: get_option('geoip'))
+ libproxy_dep = dependency('libproxy-1.0', required: get_option('libproxy'))
+-libappindicator_dep = dependency('appindicator3-0.1', required: get_option('libappindicator'))
++libappindicator_dep = dependency('libayatana-appindicator', 'appindicator3-0.1', required: get_option('libappindicator'))
+
+ trg_deps += [geoip_dep, libproxy_dep, libappindicator_dep]
+
+@@ -89,7 +89,10 @@ conf_data.set10('HAVE_RSS', rss_dep.found())
+ conf_data.set10('HAVE_GEOIP', geoip_dep.found())
+ conf_data.set10('HAVE_LIBPROXY', libproxy_dep.found())
+ conf_data.set10('ENABLE_NL_LANGINFO', nl_langinfo)
++
++libappindicator_name = libappindicator_dep.get_variable('Name')
+ conf_data.set10('HAVE_LIBAPPINDICATOR', libappindicator_dep.found())
++conf_data.set10('HAVE_LIBAYATANA_APPINDICATOR', libappindicator_dep.found() and libappindicator_name == 'ayatana-appindicator-0.1')
+
+ # compiler/linker flags
+ flags = ['-funsigned-char',
+diff --git a/src/trg-main-window.c b/src/trg-main-window.c
+index f2c6ab32..0fe41a82 100644
+--- a/src/trg-main-window.c
++++ b/src/trg-main-window.c
+@@ -32,7 +32,9 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gdk/gdkkeysyms-compat.h>
+ #include <curl/curl.h>
+-#if HAVE_LIBAPPINDICATOR
++#if HAVE_LIBAYATANA_APPINDICATOR
++#include <libayatana-appindicator/app-indicator.h>
++#elif HAVE_LIBAPPINDICATOR
+ #include <libappindicator/app-indicator.h>
+ #endif
+
+From aed8b115708bc8b69d28cd0875c289fe246f049b Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Sat, 16 Apr 2022 19:21:36 -0500
+Subject: [PATCH] Fix pkg-config name for ayatana-appindicator
+
+---
+ meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 9e26e227..2ff29c2f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -48,7 +48,7 @@ trg_deps = [gtk_dep, glib_dep, gio_dep, json_dep, libcurl_dep, gthread_dep]
+ rss_dep = dependency('mrss', version: '>=0.18', required: get_option('mrss'))
+ geoip_dep = dependency('geoip', required: get_option('geoip'))
+ libproxy_dep = dependency('libproxy-1.0', required: get_option('libproxy'))
+-libappindicator_dep = dependency('libayatana-appindicator', 'appindicator3-0.1', required: get_option('libappindicator'))
++libappindicator_dep = dependency('ayatana-appindicator3-0.1', 'appindicator3-0.1', required: get_option('libappindicator'))
+
+ trg_deps += [geoip_dep, libproxy_dep, libappindicator_dep]
+
+@@ -90,9 +90,8 @@ conf_data.set10('HAVE_GEOIP', geoip_dep.found())
+ conf_data.set10('HAVE_LIBPROXY', libproxy_dep.found())
+ conf_data.set10('ENABLE_NL_LANGINFO', nl_langinfo)
+
+-libappindicator_name = libappindicator_dep.get_variable('Name')
+ conf_data.set10('HAVE_LIBAPPINDICATOR', libappindicator_dep.found())
+-conf_data.set10('HAVE_LIBAYATANA_APPINDICATOR', libappindicator_dep.found() and libappindicator_name == 'ayatana-appindicator-0.1')
++conf_data.set10('HAVE_LIBAYATANA_APPINDICATOR', libappindicator_dep.found() and libappindicator_dep.get_variable('Name') == 'ayatana-appindicator3-0.1')
+
+ # compiler/linker flags
+ flags = ['-funsigned-char',
+From 4e5bd0baab479583dc798317d89e822c280d7b7a Mon Sep 17 00:00:00 2001
+From: LaserEyess <LaserEyess@users.noreply.github.com>
+Date: Wed, 12 Oct 2022 09:09:01 -0400
+Subject: [PATCH] Use dep.name() to find ayatana name
+
+pkg-config variables are defined as `key=value`, and the `Key: Value`
+versions are just metadata. Therefore most pkg-config files do not have
+'Name' as a variable and `get_variable('Name')` will not work. However,
+meson provides a way to find this with the dep.name() method, so use
+that instead.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9c65488..e2cb6d4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -89,7 +89,7 @@ conf_data.set10('HAVE_LIBPROXY', libproxy_dep.found())
+ conf_data.set10('ENABLE_NL_LANGINFO', nl_langinfo)
+
+ conf_data.set10('HAVE_LIBAPPINDICATOR', libappindicator_dep.found())
+-conf_data.set10('HAVE_LIBAYATANA_APPINDICATOR', libappindicator_dep.found() and libappindicator_dep.get_variable('Name') == 'ayatana-appindicator3-0.1')
++conf_data.set10('HAVE_LIBAYATANA_APPINDICATOR', libappindicator_dep.found() and libappindicator_dep.name() == 'ayatana-appindicator3-0.1')
+
+ # compiler/linker flags
+ flags = ['-funsigned-char',
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1-r1.ebuild
similarity index 84%
rename from net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild
rename to net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1-r1.ebuild
index e7d30a60671a..2cdcdf4d2a09 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-libs/json-glib-1.2.8
net-misc/curl
>=x11-libs/gtk+-3.22:3
- appindicator? ( dev-libs/libappindicator:3 )
+ appindicator? ( dev-libs/libayatana-appindicator )
geoip? ( dev-libs/geoip )
libproxy? ( net-libs/libproxy )
rss? ( >=net-libs/libmrss-0.18 )
@@ -34,6 +34,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/transmission-remote-gtk-1.5.1-libayatana-appindicator.patch"
+)
+
src_configure() {
local emesonargs=(
$(meson_feature rss mrss)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-08 17:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-20 20:15 [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission-remote-gtk/files/, net-p2p/transmission-remote-gtk/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-08-30 14:32 Mike Gilbert
2023-05-08 17:48 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox