mirror of
https://gitlab.com/CinnamonSlackBuilds/csb.git
synced 2024-12-28 09:58:11 +01:00
caribou: Remove unneeded patches and bump BUILD.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo
parent
234243b2e4
commit
c5881e6fd7
4 changed files with 1 additions and 177 deletions
|
|
@ -1,46 +0,0 @@
|
||||||
From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Webster <miketwebster@gmail.com>
|
|
||||||
Date: Tue, 12 Jan 2021 18:01:47 +0000
|
|
||||||
Subject: [PATCH] xadapter.vala: Remove XkbKeyTypesMask and fields from
|
|
||||||
XKbChangeMap call.
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This was originally a workaround for xFree86 4.3 - see:
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=673547
|
|
||||||
|
|
||||||
As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this
|
|
||||||
causes a BadLength error when attempting to use shifted characters.
|
|
||||||
|
|
||||||
Ref:
|
|
||||||
https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server
|
|
||||||
---
|
|
||||||
libcaribou/xadapter.vala | 9 ++-------
|
|
||||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala
|
|
||||||
index 22858b7..1da5a78 100644
|
|
||||||
--- a/libcaribou/xadapter.vala
|
|
||||||
+++ b/libcaribou/xadapter.vala
|
|
||||||
@@ -195,15 +195,10 @@ namespace Caribou {
|
|
||||||
|
|
||||||
Xkb.MapChanges changes = Xkb.MapChanges ();
|
|
||||||
|
|
||||||
- // We don't touch key types here but include the
|
|
||||||
- // information in XkbSetMap request to the server, because
|
|
||||||
- // some X servers need the information to check the sanity
|
|
||||||
- // of the keysyms change.
|
|
||||||
- changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask);
|
|
||||||
+ changes.changed = (ushort) Xkb.KeySymsMask;
|
|
||||||
changes.first_key_sym = (char) this.reserved_keycode;
|
|
||||||
changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width;
|
|
||||||
- changes.first_type = 0;
|
|
||||||
- changes.num_types = this.xkbdesc.map.num_types;
|
|
||||||
+
|
|
||||||
Xkb.change_map (this.xdisplay, this.xkbdesc, changes);
|
|
||||||
|
|
||||||
this.xdisplay.flush ();
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
PRGNAM=caribou
|
PRGNAM=caribou
|
||||||
VERSION=${VERSION:-0.4.21}
|
VERSION=${VERSION:-0.4.21}
|
||||||
BUILD=${BUILD:-3}
|
BUILD=${BUILD:-4}
|
||||||
TAG=${TAG:-_csb}
|
TAG=${TAG:-_csb}
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
|
|
||||||
|
|
@ -1,117 +0,0 @@
|
||||||
From c52ce71c49dc8d6109a58d16cc8d491d7bd1d781 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rico Tzschichholz <ricotz@ubuntu.com>
|
|
||||||
Date: Wed, 20 Jan 2021 22:59:49 +0100
|
|
||||||
Subject: [PATCH] Stop patching the generated GIR
|
|
||||||
|
|
||||||
---
|
|
||||||
libcaribou/Makefile.am | 8 ++-----
|
|
||||||
tools/Makefile.am | 1 -
|
|
||||||
tools/fix_gir.py | 53 ------------------------------------------
|
|
||||||
3 files changed, 2 insertions(+), 60 deletions(-)
|
|
||||||
delete mode 100755 tools/fix_gir.py
|
|
||||||
|
|
||||||
diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am
|
|
||||||
index 05f2774..0634374 100644
|
|
||||||
--- a/libcaribou/Makefile.am
|
|
||||||
+++ b/libcaribou/Makefile.am
|
|
||||||
@@ -7,7 +7,7 @@ libcaribou_la_VALAFLAGS = \
|
|
||||||
--pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \
|
|
||||||
--pkg libxklavier --pkg external-libs \
|
|
||||||
--internal-vapi caribou-internals-1.0.vapi \
|
|
||||||
- --library caribou-1.0 --gir _Caribou-1.0.gir \
|
|
||||||
+ --library caribou-1.0 --gir Caribou-1.0.gir \
|
|
||||||
--symbols libcaribou.symbols \
|
|
||||||
$(VALAFLAGS)
|
|
||||||
|
|
||||||
@@ -63,9 +63,6 @@ gir_DATA = Caribou-1.0.gir
|
|
||||||
typelibdir = $(libdir)/girepository-1.0
|
|
||||||
typelib_DATA = Caribou-1.0.typelib
|
|
||||||
|
|
||||||
-Caribou-1.0.gir: _Caribou-1.0.gir
|
|
||||||
- $(AM_V_GEN)$(PYTHON) -B $(top_srcdir)/tools/fix_gir.py $< > $@
|
|
||||||
-
|
|
||||||
Caribou-1.0.typelib: Caribou-1.0.gir
|
|
||||||
@INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^
|
|
||||||
|
|
||||||
@@ -81,8 +78,7 @@ CLEANFILES = \
|
|
||||||
caribou-1.0.vapi \
|
|
||||||
caribou-internals-1.0.vapi \
|
|
||||||
Caribou-1.0.typelib \
|
|
||||||
- Caribou-1.0.gir \
|
|
||||||
- _Caribou-1.0.gir
|
|
||||||
+ Caribou-1.0.gir
|
|
||||||
|
|
||||||
DISTCLEANFILES = \
|
|
||||||
caribou-1.0.pc
|
|
||||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
|
||||||
index 3a9bcdb..89f753d 100644
|
|
||||||
--- a/tools/Makefile.am
|
|
||||||
+++ b/tools/Makefile.am
|
|
||||||
@@ -1,5 +1,4 @@
|
|
||||||
EXTRA_DIST = \
|
|
||||||
- fix_gir.py \
|
|
||||||
make_schema.py \
|
|
||||||
convert_cldr.py \
|
|
||||||
basic.xsl
|
|
||||||
diff --git a/tools/fix_gir.py b/tools/fix_gir.py
|
|
||||||
deleted file mode 100755
|
|
||||||
index 182d108..0000000
|
|
||||||
--- a/tools/fix_gir.py
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1,53 +0,0 @@
|
|
||||||
-#!/usr/bin/python
|
|
||||||
-
|
|
||||||
-from xml.dom import minidom
|
|
||||||
-
|
|
||||||
-def purge_white_space_and_fix_namespace(node, indent=0):
|
|
||||||
- if getattr(node, "tagName", None) == "namespace":
|
|
||||||
- name = node.getAttribute("name")
|
|
||||||
- node.setAttribute("name", name.lstrip('_'))
|
|
||||||
- for child in [c for c in node.childNodes]:
|
|
||||||
- if child.nodeType == node.TEXT_NODE or \
|
|
||||||
- getattr(child, "tagName", None) == "annotation":
|
|
||||||
- node.removeChild(child)
|
|
||||||
- continue
|
|
||||||
- purge_white_space_and_fix_namespace(child, indent+1)
|
|
||||||
-
|
|
||||||
-def find_ancestor(node, name):
|
|
||||||
- if getattr(node, "tagName", None) == name:
|
|
||||||
- return node
|
|
||||||
- parent = getattr(node, "parentNode", None)
|
|
||||||
- if not parent:
|
|
||||||
- return None
|
|
||||||
- return find_ancestor(parent, name)
|
|
||||||
-
|
|
||||||
-def fix_vfuncs(dom):
|
|
||||||
- for f in dom.getElementsByTagName("field"):
|
|
||||||
- callbacks = f.getElementsByTagName("callback")
|
|
||||||
-
|
|
||||||
- record = find_ancestor(f, "record")
|
|
||||||
- if not record:
|
|
||||||
- continue
|
|
||||||
-
|
|
||||||
- name = record.getAttribute("name")
|
|
||||||
- cname = record.getAttribute("c:type")
|
|
||||||
-
|
|
||||||
- assert(name.endswith("Class") or name.endswith("Iface"))
|
|
||||||
- assert(cname.endswith("Class") or name.endswith("Iface"))
|
|
||||||
-
|
|
||||||
- if len(callbacks) == 2:
|
|
||||||
- callbacks[-1].parentNode.removeChild(callbacks[-1])
|
|
||||||
-
|
|
||||||
-if __name__ == "__main__":
|
|
||||||
- import sys
|
|
||||||
-
|
|
||||||
- if len(sys.argv) != 2:
|
|
||||||
- print("supply a gir file")
|
|
||||||
- sys.exit(1)
|
|
||||||
-
|
|
||||||
- dom = minidom.parse(sys.argv[-1])
|
|
||||||
-
|
|
||||||
- purge_white_space_and_fix_namespace(dom)
|
|
||||||
- fix_vfuncs(dom)
|
|
||||||
-
|
|
||||||
- print(dom.toprettyxml(indent=" ", newl="\n"))
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala
|
|
||||||
index 89015bc..e88342e 100644
|
|
||||||
--- a/libcaribou/key-model.vala
|
|
||||||
+++ b/libcaribou/key-model.vala
|
|
||||||
@@ -101,7 +101,7 @@ namespace Caribou {
|
|
||||||
unichar uc;
|
|
||||||
while (text.get_next_char (ref index, out uc)) {
|
|
||||||
uint keyval = Gdk.unicode_to_keyval (uc);
|
|
||||||
- if (keyval != uc | 0x01000000)
|
|
||||||
+ if (keyval != (uc | 0x01000000))
|
|
||||||
_keyvals += keyval;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Loading…
Reference in a new issue