New commits:
commit 8e17a86ca7fe8b3b3ce9dfa14b39ec9af1916e91
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
gcal: version 4 (build fix for current glibc, since 2.13 or so)
commit 30c4cc0e8ef34079e4c4f0b6b0200fa75b62acf6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
kbd: avoid installation of UTF-8 test file that may confuse castfs
commit 4f821c588aac00d7ed49c4d296537995768abdc8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
pyopengl: version 3.1.0
commit e83e346e3af9cf6f0cd477aac1933180f044171b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
SOURCE_HASH=sha512:522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f
-# PATCHLEVEL=1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/$SOURCE
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index 4d1e725..f239381 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,9 @@
+2016-04-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: remove a file that confuses sorcery and
+ caused endless attempts to fix a broken spell
+ * DETAILS: PATCHLEVEL++ for the case that this indeed fixes
+ broken installs
+
2015-07-30 Treeve Jelbert <treeve AT sourcemage.org
* DETAILS: version 2.0.3
diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
index d3aa27d..47c3358 100755
--- a/utils/kbd/PRE_BUILD
+++ b/utils/kbd/PRE_BUILD
@@ -2,4 +2,8 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
patch < "$SPELL_DIRECTORY"/kbd-2.0.0-tests.patch &&
+# Avoid funny non-ascii file names that possibly confuse
+# castfs. Note that this may not help if that file already
+# exists in your system from an earlier install.
+rm -vf "docs/doc/utf/♪♬" &&
autoreconf -fi
diff --git a/x11/xpra/DETAILS b/x11/xpra/DETAILS
index 40ceb16..f71d07e 100755
--- a/x11/xpra/DETAILS
+++ b/x11/xpra/DETAILS
@@ -6,7 +6,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.xpra.org
ENTERED=20051125
- PATCHLEVEL=1
+ PATCHLEVEL=2
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 caf90bf..c555da4 100644
--- a/x11/xpra/HISTORY
+++ b/x11/xpra/HISTORY
@@ -1,6 +1,12 @@
+2016-04-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, xpra-r12408-clipmenu.patch: switch to the correct
+ patch for this branch
+ * DETAILS: ++PATCHLEVEL
+
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
+ * DETAILS: ++PATCHLEVEL
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
index 642360f..0a874b8 100755
--- a/x11/xpra/PRE_BUILD
+++ b/x11/xpra/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -Np3 < "$SCRIPT_DIRECTORY/xpra-r12402-clipmenu.patch"
+patch -Np4 < "$SCRIPT_DIRECTORY/xpra-r12408-clipmenu.patch"
diff --git a/x11/xpra/xpra-r12402-clipmenu.patch
b/x11/xpra/xpra-r12402-clipmenu.patch
deleted file mode 100644
index b2961c3..0000000
--- a/x11/xpra/xpra-r12402-clipmenu.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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:
diff --git a/x11/xpra/xpra-r12408-clipmenu.patch
b/x11/xpra/xpra-r12408-clipmenu.patch
new file mode 100644
index 0000000..0c43fd9
--- /dev/null
+++ b/x11/xpra/xpra-r12408-clipmenu.patch
@@ -0,0 +1,14 @@
+Index: /tags/v0.16.x/src/xpra/client/gtk_base/gtk_tray_menu_base.py
+===================================================================
+--- /tags/v0.16.x/src/xpra/client/gtk_base/gtk_tray_menu_base.py
(revision 12407)
++++ /tags/v0.16.x/src/xpra/client/gtk_base/gtk_tray_menu_base.py
(revision 12408)
+@@ -547,6 +547,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:
+ return self.make_translatedclipboard_optionsmenuitem()
+ except:
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (8e17a86ca7fe8b3b3ce9dfa14b39ec9af1916e91),
Thomas Orgis, 04/26/2016