Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (bab4623eda5d5d406547d3ef7b2c18eeeb3746c4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (bab4623eda5d5d406547d3ef7b2c18eeeb3746c4)
  • Date: Sun, 17 Apr 2016 07:47:09 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

x11/xpra/DETAILS | 1
x11/xpra/HISTORY | 4 +++
x11/xpra/PRE_BUILD | 3 ++
x11/xpra/xpra-r12402-clipmenu.patch | 39
++++++++++++++++++++++++++++++++++++
4 files changed, 47 insertions(+)

New commits:
commit bab4623eda5d5d406547d3ef7b2c18eeeb3746c4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xpra: import upstream fix for clipboard menu offering bad choices

diff --git a/x11/xpra/DETAILS b/x11/xpra/DETAILS
index 3e329da..40ceb16 100755
--- a/x11/xpra/DETAILS
+++ b/x11/xpra/DETAILS
@@ -6,6 +6,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.xpra.org
ENTERED=20051125
+ PATCHLEVEL=1
LICENSE[0]=GPL
SHORT="multi-platform X11 screen and application forwarding
system"
cat << EOF
diff --git a/x11/xpra/HISTORY b/x11/xpra/HISTORY
index 49567bc..caf90bf 100644
--- a/x11/xpra/HISTORY
+++ b/x11/xpra/HISTORY
@@ -1,3 +1,7 @@
+2016-04-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, xpra-r12402-clipmenu.patch: add upstream fix for bad
+ clipboard menu on Unix platforms
+
2016-04-15 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: GL added (probably mostly runtime dep)

diff --git a/x11/xpra/PRE_BUILD b/x11/xpra/PRE_BUILD
new file mode 100755
index 0000000..642360f
--- /dev/null
+++ b/x11/xpra/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np3 < "$SCRIPT_DIRECTORY/xpra-r12402-clipmenu.patch"
diff --git a/x11/xpra/xpra-r12402-clipmenu.patch
b/x11/xpra/xpra-r12402-clipmenu.patch
new file mode 100644
index 0000000..b2961c3
--- /dev/null
+++ b/x11/xpra/xpra-r12402-clipmenu.patch
@@ -0,0 +1,39 @@
+Index: /trunk/src/xpra/client/gtk2/client.py
+===================================================================
+--- /trunk/src/xpra/client/gtk2/client.py (revision 12401)
++++ /trunk/src/xpra/client/gtk2/client.py (revision 12402)
+@@ -200,6 +200,18 @@
+ clipboardlog.warn("Warning: no clipboard types matching
'%s'", self.client_clipboard_type)
+ clipboard_options = filtered
+- clipboardlog("get_clipboard_helper_classes()=%s", clipboard_options)
+- return clipboard_options
++ #now try to load them:
++ clipboardlog("get_clipboard_helper_classes() options=%s",
clipboard_options)
++ loadable = []
++ for co in clipboard_options:
++ try:
++ parts = co.split(".")
++ mod = ".".join(parts[:-1])
++ __import__(mod, {}, {}, [parts[-1]])
++ loadable.append(co)
++ except ImportError as e:
++ clipboardlog("cannot load %s: %s", co, e)
++ continue
++ clipboardlog("get_clipboard_helper_classes()=%s", loadable)
++ return loadable
+
+ def make_clipboard_helper(self):
+Index: /trunk/src/xpra/client/gtk_base/gtk_tray_menu_base.py
+===================================================================
+--- /trunk/src/xpra/client/gtk_base/gtk_tray_menu_base.py (revision
12401)
++++ /trunk/src/xpra/client/gtk_base/gtk_tray_menu_base.py (revision
12402)
+@@ -556,6 +556,7 @@
+ copts = self.client.get_clipboard_helper_classes()
+ #ugly alert: the helper does not exist yet.. we just check the
helper classnames:
+- for c in copts:
+- if c.find("translated_clipboard")>0:
++ if len(copts)>0:
++ chname = copts[0].lower()
++ if chname.find("translated_clipboard")>0 or
chname.find("osxclipboard"):
+ return self.make_translatedclipboard_optionsmenuitem()
+ except:



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (bab4623eda5d5d406547d3ef7b2c18eeeb3746c4), Thomas Orgis, 04/17/2016

Archive powered by MHonArc 2.6.24.

Top of Page