[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d245d002b60b4a9cbb550abe306a0be655c2e6a6)

Vlad Glagolev scm at sourcemage.org
Sun Nov 14 21:59:16 EST 2010


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ChangeLog                   |    3 +++
 wm-addons/fbxkb/HISTORY     |    4 ++++
 wm-addons/fbxkb/PRE_BUILD   |    4 ++++
 wm-addons/fbxkb/gtk+2.patch |   28 ++++++++++++++++++++++++++++
 wm-addons/xxkb/BUILD        |    2 ++
 wm-addons/xxkb/DEPENDS      |    6 ++++++
 wm-addons/xxkb/DETAILS      |   20 ++++++++++++++++++++
 wm-addons/xxkb/HISTORY      |    2 ++
 wm-addons/xxkb/PRE_BUILD    |    4 ++++
 wm-addons/xxkb/imake.patch  |   11 +++++++++++
 10 files changed, 84 insertions(+)

New commits:
commit d245d002b60b4a9cbb550abe306a0be655c2e6a6
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xxkb: new spell, XKB keyboard layout switcher and indicator

commit 5cc5db153e0097d96d3f772a98f2a1c6514f5a49
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    fbxkb: fixed compilation with recent GTK+2

diff --git a/ChangeLog b/ChangeLog
index 4c64032..44d24ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-11-15 Vlad Glagolev <stealth at sourcemage.org>
+	* wm-addons/xxkb: new spell, XKB keyboard layout switcher and indicator
+
 2010-11-14 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* libs/libnih: new spell, a light-weight standard library for C
 	* video/mplay: new spell, a TUI for mplayer
diff --git a/wm-addons/fbxkb/HISTORY b/wm-addons/fbxkb/HISTORY
index 0a81241..a08245e 100644
--- a/wm-addons/fbxkb/HISTORY
+++ b/wm-addons/fbxkb/HISTORY
@@ -1,3 +1,7 @@
+2010-11-15 Vlad Glagolev <stealth at sourcemage.org>
+	* gtk+2.patch: added, to fix compilation with recent (>=2.22) GTK+2
+	* PRE_BUILD: added, to apply the patch
+
 2007-01-21 Pieter Lenaerts <e-type at sourcemage.org>
 	* DETAILS: updated to 0.6
 
diff --git a/wm-addons/fbxkb/PRE_BUILD b/wm-addons/fbxkb/PRE_BUILD
new file mode 100755
index 0000000..acfacd4
--- /dev/null
+++ b/wm-addons/fbxkb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/gtk+2.patch"
diff --git a/wm-addons/fbxkb/gtk+2.patch b/wm-addons/fbxkb/gtk+2.patch
new file mode 100644
index 0000000..56458fe
--- /dev/null
+++ b/wm-addons/fbxkb/gtk+2.patch
@@ -0,0 +1,28 @@
+--- fbxkb.c.orig	2006-12-18 21:47:52.000000000 +0000
++++ fbxkb.c	2008-11-08 16:25:32.000000000 +0000
+@@ -378,10 +378,11 @@
+             g_assert((no >= 0) && (no < ngroups));
+             if (group2info[no].sym != NULL) {
+                 ERR("xkb group #%d is already defined\n", no);
++            } else {
++                group2info[no].sym = g_strdup(tok);
++                group2info[no].flag = sym2flag(tok);
++                group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);           
+             }
+-            group2info[no].sym = g_strdup(tok);
+-            group2info[no].flag = sym2flag(tok);
+-            group2info[no].name = XGetAtomName(dpy, kbd_desc_ptr->names->groups[no]);           
+         }
+         XFree(sym_name);
+     }
+--- Makefile.common.orig      2004-10-15 22:18:59.000000000 +0000
++++ Makefile.common   2010-11-02 13:35:02.593908176 +0000
+@@ -25,7 +25,7 @@
+ endif
+
+ # -DGTK_DISABLE_DEPRECATED does not work yet
+-CFLAGS += -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++CFLAGS += -g
+
+ %.o: %.c
+        $(CC) $(CFLAGS) $(INCS) -c $<
diff --git a/wm-addons/xxkb/BUILD b/wm-addons/xxkb/BUILD
new file mode 100755
index 0000000..bca2bbb
--- /dev/null
+++ b/wm-addons/xxkb/BUILD
@@ -0,0 +1,2 @@
+xmkmf $OPTS &&
+make
diff --git a/wm-addons/xxkb/DEPENDS b/wm-addons/xxkb/DEPENDS
new file mode 100755
index 0000000..6c4c81d
--- /dev/null
+++ b/wm-addons/xxkb/DEPENDS
@@ -0,0 +1,6 @@
+depends libx11 &&
+depends libxpm &&
+
+optional_depends librsvg2 \
+                 "-DWITH_SVG_SUPPORT" "" \
+                 "to use SVG images (not included) instead of XPM"
diff --git a/wm-addons/xxkb/DETAILS b/wm-addons/xxkb/DETAILS
new file mode 100755
index 0000000..6017f1d
--- /dev/null
+++ b/wm-addons/xxkb/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=xxkb
+         VERSION=1.11
+          SOURCE=$SPELL-$VERSION-src.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:12675bee3be5a37b5e471fa763e2f8600859d5621dcf7ea9f004bad8f2200035582661cfb36938e9606582a86570e6de99c30dcf2d988c96604daf1185592c14
+        WEB_SITE=http://www.sourceforge.net/projects/xxkb/
+         ENTERED=20101115
+      LICENSE[0]=GPL
+        KEYWORDS="wm-addons"
+           SHORT="XKB keyboard layout switcher and indicator"
+cat << EOF
+Xxkb is a simple XKB keyboard mapping switcher. It maintains an active
+keyboard mapping on a per-window basis. An optional small icon is
+displayed in each window to indicate the selected keyboard mapping. You
+can click this icon to switch between mappings in addition to being able
+to use the key combination specified in the XKB configuration.
+
+Xxkb works with virtually any window manager.
+EOF
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
new file mode 100644
index 0000000..901ca23
--- /dev/null
+++ b/wm-addons/xxkb/HISTORY
@@ -0,0 +1,2 @@
+2010-11-15 Vlad Glagolev <stealth at sourcemage.org>
+	* {PRE_}BUILD, DEPENDS, DETAILS, imake.patch: spell created
diff --git a/wm-addons/xxkb/PRE_BUILD b/wm-addons/xxkb/PRE_BUILD
new file mode 100755
index 0000000..a69a2e0
--- /dev/null
+++ b/wm-addons/xxkb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/imake.patch"
diff --git a/wm-addons/xxkb/imake.patch b/wm-addons/xxkb/imake.patch
new file mode 100644
index 0000000..f0bf52d
--- /dev/null
+++ b/wm-addons/xxkb/imake.patch
@@ -0,0 +1,11 @@
+--- Imakefile.orig	Sun Jun 17 02:29:38 2007
++++ Imakefile	Sun Jun 17 02:30:03 2007
+@@ -3,7 +3,7 @@
+ BASEDIR = $(PROJECTROOT)
+ BINDIR = $(BASEDIR)/bin
+ PIXMAPDIR = $(BASEDIR)/share/xxkb
+-LOCAL_LIBRARIES = $(XONLYLIB) -lXpm -lXt
++LOCAL_LIBRARIES = $(XLIB) $(XTOOLLIB) $(XPMLIB)
+ 
+ OBJS = xxkb.o resource.o wlist.o
+ PIXMAPS = pixmaps/by15.xpm pixmaps/by48.xpm \



More information about the SM-Commit mailing list