[caja-dropbox] 01/02: debian/patches: Drop 2003_execute_via_dbus_launch.patch. It doesn't work as intended.
Martin Wimpress
flexiondotorg-guest at moszumanska.debian.org
Thu Mar 1 14:07:48 UTC 2018
This is an automated email from the git hooks/post-receive script.
flexiondotorg-guest pushed a commit to branch master
in repository caja-dropbox.
commit de3eafa8398060c66f110da926d258d0c87bec6a
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date: Thu Mar 1 09:19:06 2018 +0000
debian/patches: Drop 2003_execute_via_dbus_launch.patch. It doesn't work as intended.
---
debian/patches/2003_execute_via_dbus_launch.patch | 21 ---------------------
debian/patches/series | 1 -
2 files changed, 22 deletions(-)
diff --git a/debian/patches/2003_execute_via_dbus_launch.patch b/debian/patches/2003_execute_via_dbus_launch.patch
deleted file mode 100644
index a1074ec..0000000
--- a/debian/patches/2003_execute_via_dbus_launch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Execute via dbus-launch to ensure the tray icon works. Closes (LP: #1559249)
-Author: Martin Wimpress <code at flexion.org>
-Abstract:
- This works around broken dropbox binary that will only activate the
- try icon on Ubuntu Unity. This patch works around that issue by
- coercing QT to use GTK theming and executing dropbox via dbus-launch.
- .
- This patch is valid for Debian and Ubuntu alike.
-
---- a/caja-dropbox.in
-+++ b/caja-dropbox.in
-@@ -731,7 +731,8 @@
- if os.access(db_path, os.X_OK):
- f = open("/dev/null", "w")
- # we don't reap the child because we're gonna die anyway, let init do it
-- a = subprocess.Popen([db_path], preexec_fn=os.setsid, cwd=os.path.expanduser("~"),
-+ os.environ["QT_STYLE_OVERRIDE"] = "gtk"
-+ a = subprocess.Popen(['dbus-launch', db_path], preexec_fn=os.setsid, cwd=os.path.expanduser("~"),
- stderr=sys.stderr, stdout=f, close_fds=True)
-
- # in seconds
diff --git a/debian/patches/series b/debian/patches/series
index 039c683..028ea08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@
# Patches below are not really upstreamable
2001_non-interactive-update.patch
2002_use-dpkg-to-select-platform.patch
-2003_execute_via_dbus_launch.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja-dropbox.git
More information about the pkg-mate-commits
mailing list