* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nautilus-dropbox/, gnome-extra/nautilus-dropbox/files/
@ 2020-04-09 8:58 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-04-09 8:58 UTC (permalink / raw
To: gentoo-commits
commit: 1f2848ebd89b13bb6098fa3b613eea2d2fe0a8ab
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Thu Feb 20 22:04:04 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 08:56:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2848eb
gnome-extra/nautilus-dropbox: Version Bump to 2019.02.14
Closes: https://bugs.gentoo.org/546024
Bug: https://bugs.gentoo.org/706486
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Closes: https://github.com/gentoo/gentoo/pull/14720
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
| 1 +
.../nautilus-dropbox-2019-system-rst2man.patch | 13 +++++
| 12 +++-
.../nautilus-dropbox-2019.02.14.ebuild | 67 ++++++++++++++++++++++
4 files changed, 92 insertions(+), 1 deletion(-)
--git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index b40b6c54a9e..4628fcad4a1 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1 +1,2 @@
DIST nautilus-dropbox-1.6.2.tar.bz2 354408 BLAKE2B 7a3d1cee88dc595fc43f92d84328cf112755d2aa98a99e84e24d132b6167fb5378cc4e9914c31510d38deadc952caed1debdea7ae07dcd0a7b58e72790af428a SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3
+DIST nautilus-dropbox-2019.02.14.tar.bz2 381416 BLAKE2B 0765196974d88caa477d962311efe05941cd2d25e35fa028720c8abed5120fea5abede74f39e00cb2ac9eb08d6d4bbdf1d1fe6db8d604c1803570209e654d55a SHA512 c5758d97fa40af1b27388c23289e5d1d98ef1c6db04ed7fb5cfee387723f72c34f3583fb6e0158a39f30d5ff649cb2de6d92fc4ad6e976e301dc239bda9d554b
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2019-system-rst2man.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2019-system-rst2man.patch
new file mode 100644
index 00000000000..06e59229164
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2019-system-rst2man.patch
@@ -0,0 +1,13 @@
+Index: nautilus-dropbox-0.7.0/configure.ac
+===================================================================
+--- nautilus-dropbox-0.7.0.orig/configure.ac
++++ nautilus-dropbox-0.7.0/configure.ac
+@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
+
+ AC_PATH_PROG([PYTHON], [python])
+
+-AC_PATH_PROG([RST2MAN], [rst2man], [python3 rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
+ AC_SUBST(RST2MAN)
+
+ # define module checking macro
--git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
index 1b2becffa26..55dbd3b953f 100644
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <name>Jonas Licht</name>
+ <email>jonas.licht@gmail.com</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ A extension of nautilus to display the sync state of an Dropbox folder and add a right click menu to mange files in the Dropbox folder.
+ </longdescription>
</pkgmetadata>
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
new file mode 100644
index 00000000000..73781040d6c
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools python-single-r1 xdg-utils
+
+DESCRIPTION="Dropbox Nautilus Extension"
+HOMEPAGE="https://github.com/dropbox/nautilus-dropbox"
+SRC_URI="https://linux.dropboxstatic.com/packages/${P}.tar.bz2"
+
+LICENSE="GPL-3 CC-BY-ND-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ gnome-base/nautilus
+ net-misc/dropbox
+ >=dev-libs/glib-2.14
+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ $(python_gen_cond_dep 'dev-python/docutils[${PYTHON_MULTI_USEDEP}]' )
+ virtual/pkgconfig"
+
+# use system rst2man
+PATCHES=( "${FILESDIR}/nautilus-dropbox-2019-system-rst2man.patch" )
+
+src_prepare() {
+ default
+
+ # use system dropbox
+ sed \
+ -e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
+ -e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
+ -i dropbox.in || die
+ AT_NOELIBTOOLIZE=yes eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ --disable-static
+}
+
+src_install() {
+ default
+
+ # removes files which conflicts with system dropbox
+ rm -r "${D}/usr/share/applications" || die
+ rm -r "${D}/usr/bin" || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update;
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update;
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nautilus-dropbox/, gnome-extra/nautilus-dropbox/files/
@ 2025-02-24 9:07 Petr Vaněk
0 siblings, 0 replies; 2+ messages in thread
From: Petr Vaněk @ 2025-02-24 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 8d6aabdbc546d06f061f4412acdb725d2fd4806e
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 09:02:20 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 09:02:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6aabdb
gnome-extra/nautilus-dropbox: drop 2020.03.04-r1
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
| 1 -
.../nautilus-dropbox-2020.03.04-nautilus43.patch | 416 ---------------------
.../nautilus-dropbox-2020.03.04-r1.ebuild | 73 ----
3 files changed, 490 deletions(-)
--git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 2fa91c0255f3..abf803a20207 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,2 +1 @@
-DIST nautilus-dropbox-2020.03.04.tar.bz2 387351 BLAKE2B ff25716ef10759e014cffec8a7e9b1a40931686d6de3c69e9060c77cbf3aee65ffeed91ba809ba8cffc372f284180c74a8cb5b0ca4b342aa137d9e574a2a1abf SHA512 8f26165a48d1767b3bccb34f95f19357e8fd209f383270ac2d40f773df139d640c3fb33db28cf1fa7e2d7063a7a37b15ed7f4f22f85019e05885c097cea39a48
DIST nautilus-dropbox-2024.04.17.tar.bz2 394725 BLAKE2B e617f02fcb6c11fd6937a99c0e2faaebd564d533e6ed44fc0492504fb41612fb297b3c98c84b8c3ecc314e33b27a820e8b655bc6ae92de43ffbb2f4e4d370f9f SHA512 43b7a0eaf3b7ebc35fa21a5d11dc1089b62fd0a414079a55fbb4ef7cb8211923123c46bec06c3b73eacd5897b7b8b2ae336de7b15750f0802eb28a23ec9e56bd
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2020.03.04-nautilus43.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2020.03.04-nautilus43.patch
deleted file mode 100644
index efd0574115ca..000000000000
--- a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-2020.03.04-nautilus43.patch
+++ /dev/null
@@ -1,416 +0,0 @@
-From 5587be23bec68281e5d6de2b302dbd2a79ea47aa Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Tue, 13 Sep 2022 15:03:59 -0700
-Subject: [PATCH 1/9] Bump to libnautilus-extension-4
-
-Nautilus 43 comes with libnautilus-extension-4 which has several
-breaking changes
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 025289c..737dc26 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h)
- #AC_PROG_INTLTOOL([0.29])
-
- # Dependency checks
--NAUTILUS_REQUIRED=2.16.0
-+NAUTILUS_REQUIRED=43.rc
- GLIB_REQUIRED=2.14.0
-
- # Used programs
-@@ -26,7 +26,7 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
- AC_MSG_ERROR(you need to have pkgconfig installed !)
- fi
-
--PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
-+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED)
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-
- AC_PATH_PROG([PYTHON3], [python3])
-@@ -84,10 +84,10 @@ AC_MSG_CHECKING([for nautilus extension directory])
- if test -n "$with_nautilus_extension_dir"; then
- NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir
- else
-- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-+ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4`
- fi
- if test -z "$NAUTILUS_EXTENSION_DIR"; then
-- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0'
-+ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4'
- fi
-
- AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}])
-
-From 90067c37aa0894b3e090dc5bdbaa963224226614 Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Tue, 13 Sep 2022 15:06:07 -0700
-Subject: [PATCH 2/9] Update / remove deprecated (now removed) symbols and
- headers
-
----
- src/nautilus-dropbox.c | 9 +++------
- src/nautilus-dropbox.h | 2 +-
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
-index c75ccbf..837f9ab 100644
---- a/src/nautilus-dropbox.c
-+++ b/src/nautilus-dropbox.c
-@@ -37,9 +37,7 @@
- #include <glib-object.h>
- #include <gtk/gtk.h>
-
--#include <libnautilus-extension/nautilus-extension-types.h>
--#include <libnautilus-extension/nautilus-menu-provider.h>
--#include <libnautilus-extension/nautilus-info-provider.h>
-+#include <nautilus-extension.h>
-
- #include "g-util.h"
- #include "dropbox-command-client.h"
-@@ -661,7 +659,6 @@ get_file_items_callback(GHashTable *response, gpointer ud)
-
- static GList *
- nautilus_dropbox_get_file_items(NautilusMenuProvider *provider,
-- GtkWidget *window,
- GList *files)
- {
- /*
-@@ -888,13 +885,13 @@ on_disconnect(NautilusDropbox *cvs) {
-
-
- static void
--nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) {
-+nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) {
- iface->get_file_items = nautilus_dropbox_get_file_items;
- return;
- }
-
- static void
--nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) {
-+nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) {
- iface->update_file_info = nautilus_dropbox_update_file_info;
- iface->cancel_update = nautilus_dropbox_cancel_update;
- return;
-diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h
-index 65734be..44faa27 100644
---- a/src/nautilus-dropbox.h
-+++ b/src/nautilus-dropbox.h
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <glib-object.h>
-
--#include <libnautilus-extension/nautilus-info-provider.h>
-+#include <nautilus-extension.h>
-
- #include "dropbox-command-client.h"
- #include "nautilus-dropbox-hooks.h"
-
-From 3f778e011daad826882893812e0d6290bdf12cba Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Tue, 13 Sep 2022 15:06:46 -0700
-Subject: [PATCH 3/9] Include gtk4 directly
-
-This used to be included from libnautilus-extension, but now that
-Nautilus has been ported to gtk4, there is a desire to separate gtk
-from the extensions
----
- configure.ac | 3 +++
- src/Makefile.am | 1 +
- src/dropbox.c | 3 ---
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 737dc26..42b49fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -28,6 +28,9 @@ fi
-
- PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED)
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-+PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0)
-+
-+AC_SUBST(GTK_CFLAGS)
-
- AC_PATH_PROG([PYTHON3], [python3])
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 15d6687..c521ec5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(NAUTILUS_CFLAGS) \
-+ $(GTK_CFLAGS) \
- $(GLIB_CFLAGS)
-
- if DEBUG
-diff --git a/src/dropbox.c b/src/dropbox.c
-index 0d59559..f52e0fb 100644
---- a/src/dropbox.c
-+++ b/src/dropbox.c
-@@ -27,9 +27,6 @@
-
- #include <glib-object.h>
-
--#include <gdk/gdk.h>
--#include <gtk/gtk.h>
--
- #include "nautilus-dropbox.h"
-
- static GType type_list[1];
-
-From 4188fea5ce15a5bd0ac359e4c18eaa9039413c83 Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Tue, 13 Sep 2022 15:07:54 -0700
-Subject: [PATCH 4/9] Remove old / unnecessary fix
-
-This was causes problems with the build and doesn't appear
-to be necessary anymore
----
- src/dropbox.c | 3 ---
- src/nautilus-dropbox.c | 9 +--------
- 2 files changed, 1 insertion(+), 11 deletions(-)
-
-diff --git a/src/dropbox.c b/src/dropbox.c
-index f52e0fb..8162aa9 100644
---- a/src/dropbox.c
-+++ b/src/dropbox.c
-@@ -38,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) {
- nautilus_dropbox_register_type (module);
- type_list[0] = NAUTILUS_TYPE_DROPBOX;
-
-- dropbox_use_nautilus_submenu_workaround
-- = (NAUTILUS_VERSION_MAJOR < 2 ||
-- (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22));
- dropbox_use_operation_in_progress_workaround = TRUE;
- }
-
-diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
-index 837f9ab..bc1b5bd 100644
---- a/src/nautilus-dropbox.c
-+++ b/src/nautilus-dropbox.c
-@@ -47,7 +47,7 @@
- static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"};
- gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL };
-
--gboolean dropbox_use_nautilus_submenu_workaround;
-+
- gboolean dropbox_use_operation_in_progress_workaround;
-
- static GType dropbox_type = 0;
-@@ -628,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar **options,
- g_object_set_property (G_OBJECT(item), "sensitive", &sensitive);
- }
-
-- /* taken from nautilus-file-repairer (http://repairer.kldp.net/):
-- * this code is a workaround for a bug of nautilus
-- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */
-- if (dropbox_use_nautilus_submenu_workaround) {
-- toret = g_list_append(toret, item);
-- }
--
- g_object_unref(item);
- g_string_free(new_action_string, TRUE);
- ret++;
-
-From def0ce2b69a5d3fec6e2fab360473c5560b947e6 Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Tue, 13 Sep 2022 15:08:16 -0700
-Subject: [PATCH 5/9] Update code for gtk4
-
----
- src/nautilus-dropbox.c | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
-index bc1b5bd..b9c10b4 100644
---- a/src/nautilus-dropbox.c
-+++ b/src/nautilus-dropbox.c
-@@ -768,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response)
-
- gchar **emblem_paths_list;
- int i;
--
-- GtkIconTheme *theme = gtk_icon_theme_get_default();
-+ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
-
- if (emblem_paths_response &&
- (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) {
- for (i = 0; emblem_paths_list[i] != NULL; i++) {
- if (emblem_paths_list[i][0])
-- gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]);
-+ gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]);
- }
- }
- g_hash_table_unref(emblem_paths_response);
-@@ -794,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
- goto exit;
-
- // We need to remove the old paths.
-- GtkIconTheme * icon_theme = gtk_icon_theme_get_default();
- gchar ** paths;
-- gint path_count;
-+ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
-
-- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count);
-+ paths = gtk_icon_theme_get_search_path(theme);
-
- gint i, j, out = 0;
- gboolean found = FALSE;
-- for (i = 0; i < path_count; i++) {
-+ for (i = 0; paths[i] != NULL; i++) {
- gboolean keep = TRUE;
- for (j = 0; emblem_paths_list[j] != NULL; j++) {
- if (emblem_paths_list[j][0]) {
-@@ -824,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
- accomodate the changes */
- if (found) {
- paths[out] = NULL; /* Clear the last one */
-- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out);
-+ gtk_icon_theme_set_search_path(theme, (const gchar **)paths);
- }
-
- g_strfreev(paths);
-
-From d0bb693ce7d2e48562e516771afcd310ccb14ae1 Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Sun, 20 Nov 2022 13:56:38 -0800
-Subject: [PATCH 6/9] dropbox: Drop threads_init()
-
-This became unnecessary long ago
-
-https://pygobject.readthedocs.io/en/latest/guide/threading.html#threads-faq
----
- dropbox.in | 3 ---
- 1 file changed, 3 deletions(-)
- mode change 100755 => 100644 dropbox.in
-
-diff --git a/dropbox.in b/dropbox.in
-old mode 100755
-new mode 100644
-index 4a480bb..31519e2
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -294,14 +294,11 @@ if GUI_AVAILABLE:
- import gi
- gi.require_version('Gdk', '3.0')
- gi.require_version('Gtk', '3.0')
-- from gi.repository import GObject
- from gi.repository import Gdk
- from gi.repository import Gtk
- from gi.repository import Pango
- import webbrowser
-
-- GObject.threads_init()
--
- load_serialized_images()
-
- global FatalVisibleError
-
-From 1e878e57023370f8932791e90bc6cd8814219c25 Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Sun, 20 Nov 2022 13:57:17 -0800
-Subject: [PATCH 7/9] dropbox: Replace deprecated GObject.idle_add with
- GLib.idle_add
-
----
- dropbox.in | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/dropbox.in b/dropbox.in
-index 31519e2..fc306b0 100644
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -294,6 +294,7 @@ if GUI_AVAILABLE:
- import gi
- gi.require_version('Gdk', '3.0')
- gi.require_version('Gtk', '3.0')
-+ from gi.repository import GLib
- from gi.repository import Gdk
- from gi.repository import Gtk
- from gi.repository import Pango
-@@ -328,17 +329,17 @@ if GUI_AVAILABLE:
- ret = ()
- if not isinstance(ret, tuple):
- ret = (ret,)
-- GObject.idle_add(self.loop_callback, *ret)
-+ GLib.idle_add(self.loop_callback, *ret)
-
- if self._stopped:
- _thread.exit()
- except Exception as e:
- print(e)
- if self.on_exception is not None:
-- GObject.idle_add(self.on_exception, e)
-+ GLib.idle_add(self.on_exception, e)
- else:
- if self.on_done is not None:
-- GObject.idle_add(self.on_done)
-+ GLib.idle_add(self.on_done)
-
- def start(self, *args, **kwargs):
- t = threading.Thread(target=self._run, args=args, kwargs=kwargs)
-
-From de01c7f7cab560b226eeb1f1cbcfd348c922e5d4 Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Sun, 20 Nov 2022 13:58:15 -0800
-Subject: [PATCH 8/9] dropbox: Threading set daemon as property
-
-setDaemon() is deprecated
-
-https://docs.python.org/3/library/threading.html#threading.Thread.setDaemon
----
- dropbox.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/dropbox.in b/dropbox.in
-index fc306b0..4b7f923 100644
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -342,8 +342,7 @@ if GUI_AVAILABLE:
- GLib.idle_add(self.on_done)
-
- def start(self, *args, **kwargs):
-- t = threading.Thread(target=self._run, args=args, kwargs=kwargs)
-- t.setDaemon(True)
-+ t = threading.Thread(target=self._run, args=args, kwargs=kwargs, daemon=True)
- t.start()
-
- def stop(self):
-
-From 34024ef1ccc60d905e810057c3e28e0e185eac78 Mon Sep 17 00:00:00 2001
-From: Corey Berla <corey@berla.me>
-Date: Sun, 20 Nov 2022 13:59:46 -0800
-Subject: [PATCH 9/9] dropbox: Stop using GtkStock
-
-It was deprecated in 3.10
-
-https://docs.gtk.org/gtk3/ctor.Button.new_from_stock.html
----
- dropbox.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dropbox.in b/dropbox.in
-index 4b7f923..380818f 100644
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -447,12 +447,12 @@ if GUI_AVAILABLE:
- self.user_cancelled = False
- self.task = None
-
-- self.ok = ok = Gtk.Button(stock=Gtk.STOCK_OK)
-+ self.ok = ok = Gtk.Button.new_with_mnemonic("_OK")
- ok.connect('clicked', self.handle_ok)
- self.action_area.add(ok)
- ok.show()
-
-- cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
-+ cancel = Gtk.Button.new_with_mnemonic("_Cancel")
- cancel.connect('clicked', self.handle_cancel)
- self.action_area.add(cancel)
- cancel.show()
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04-r1.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04-r1.ebuild
deleted file mode 100644
index 061550b13cc2..000000000000
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools python-single-r1 xdg-utils
-
-DESCRIPTION="Dropbox Nautilus Extension"
-HOMEPAGE="https://github.com/dropbox/nautilus-dropbox"
-SRC_URI="https://linux.dropboxstatic.com/packages/${P}.tar.bz2"
-
-LICENSE="GPL-3 CC-BY-ND-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
- dev-libs/glib:2
- >=gnome-base/nautilus-43
- net-misc/dropbox"
-DEPEND="${RDEPEND}"
-BDEPEND="
- $(python_gen_cond_dep 'dev-python/docutils[${PYTHON_USEDEP}]' )
- virtual/pkgconfig"
-
-# use system rst2man
-PATCHES=(
- # use system rst2man
- "${FILESDIR}/${PN}-2019-system-rst2man.patch"
-
- # https://github.com/dropbox/nautilus-dropbox/pull/105
- "${FILESDIR}/${P}-nautilus43.patch"
-)
-
-src_prepare() {
- default
-
- # use system dropbox
- sed \
- -e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
- -e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
- -i dropbox.in || die
- AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- --disable-static
-}
-
-src_install() {
- default
-
- # removes files which conflicts with system dropbox
- rm -r "${ED}"/usr/share/applications || die
- rm -r "${ED}"/usr/bin || die
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-24 9:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-24 9:07 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nautilus-dropbox/, gnome-extra/nautilus-dropbox/files/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2020-04-09 8:58 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox