sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a9666e0f7d16a2c1525dad5f47c602d743634e65)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a9666e0f7d16a2c1525dad5f47c602d743634e65)
- Date: Thu, 22 Nov 2012 15:31:08 -0600
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
crypto/loop-aes/DETAILS | 2 +-
crypto/loop-aes/HISTORY | 3 +++
wm-addons/xxkb/DETAILS | 2 +-
wm-addons/xxkb/HISTORY | 6 ++++++
wm-addons/xxkb/PRE_BUILD | 1 +
wm-addons/xxkb/missing_init.patch | 22 ++++++++++++++++++++++
6 files changed, 34 insertions(+), 2 deletions(-)
New commits:
commit b8c1912f6d7029e12f1222fae55485452a958dc8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xxkb: fixed crash in some cases (see
https://bugs.gentoo.org/show_bug.cgi?id=407127)
commit 27138340017e7e67b6c9ea05f103bc6afce4ff30
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
loop-aes: => 3.6f
diff --git a/crypto/loop-aes/DETAILS b/crypto/loop-aes/DETAILS
index 8e007f9..cb06f97 100755
--- a/crypto/loop-aes/DETAILS
+++ b/crypto/loop-aes/DETAILS
@@ -1,5 +1,5 @@
SPELL=loop-aes
- VERSION=3.6e
+ VERSION=3.6f
SOURCE=loop-AES-v$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/loop-AES-v$VERSION"
diff --git a/crypto/loop-aes/HISTORY b/crypto/loop-aes/HISTORY
index 4b87892..2350396 100644
--- a/crypto/loop-aes/HISTORY
+++ b/crypto/loop-aes/HISTORY
@@ -1,3 +1,6 @@
+2012-11-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6f
+
2011-12-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.6e
* PRE_BUILD: removed, patches built-in
diff --git a/wm-addons/xxkb/DETAILS b/wm-addons/xxkb/DETAILS
index 259d9ce..4264b4c 100755
--- a/wm-addons/xxkb/DETAILS
+++ b/wm-addons/xxkb/DETAILS
@@ -1,6 +1,6 @@
SPELL=xxkb
VERSION=1.11
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
index 16c8154..102e836 100644
--- a/wm-addons/xxkb/HISTORY
+++ b/wm-addons/xxkb/HISTORY
@@ -1,3 +1,9 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: apply the patch
+ * missing_init.patch: added, to fix some memory issue that leads to
+ crash
+
2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing imake dependency
diff --git a/wm-addons/xxkb/PRE_BUILD b/wm-addons/xxkb/PRE_BUILD
index a69a2e0..843aa59 100755
--- a/wm-addons/xxkb/PRE_BUILD
+++ b/wm-addons/xxkb/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+patch -p0 < "$SPELL_DIRECTORY/missing_init.patch" &&
patch -p0 < "$SPELL_DIRECTORY/imake.patch"
diff --git a/wm-addons/xxkb/missing_init.patch
b/wm-addons/xxkb/missing_init.patch
new file mode 100644
index 0000000..52ea883
--- /dev/null
+++ b/wm-addons/xxkb/missing_init.patch
@@ -0,0 +1,22 @@
+--- xxkb.c 2012-03-06 17:49:02.888079235 +0200
++++ xxkb_fixed.c 2012-03-06 17:48:58.712462301 +0200
+@@ -667,12 +667,14 @@
+ Window rwin, parent, *children;
+ int num;
+
+- XQueryTree(dpy, temp_win, &rwin,
&parent, &children, &num);
+- AddWindow(temp_win, parent);
++ if (XQueryTree(dpy, temp_win, &rwin,
&parent, &children, &num) != 0)
++ {
++ AddWindow(temp_win, parent);
+
+- if (children != None) {
+- XFree(children);
+- }
++ if (children != None) {
++ XFree(children);
++ }
++ }
+ }
+ break;
+
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a9666e0f7d16a2c1525dad5f47c602d743634e65), Vlad Glagolev, 11/22/2012
Archive powered by MHonArc 2.6.24.