From eba46a5d1ecdb5c364c88702e1134a0744494ca1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 6 Aug 2012 16:38:35 +1000 Subject: [PATCH] Drop obsolete patches --- ...-CloseGrabs-actions-behind-an-option.patch | 76 ------ ...generate-man-page-from-the-rules-XML.patch | 230 ------------------ ...an-keyboards-are-cyrillic-by-default.patch | 44 ---- 3 files changed, 350 deletions(-) delete mode 100644 0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch delete mode 100644 0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch delete mode 100644 0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch diff --git a/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch b/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch deleted file mode 100644 index 8d788ac..0000000 --- a/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Thu, 19 Jan 2012 16:36:16 +1100 -Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option - -Similar to how we put the Terminate mapping behind an option rather than -enabling it by default, put the ClearGrab/CloseGrab action handlers -behind an option too, so we don't ship 'break my screensaver'. Oops. - -Signed-off-by: Daniel Stone ---- - compat/xfree86 | 15 +++++++++------ - rules/base.o_c.part | 1 + - rules/base.xml.in | 6 ++++++ - 3 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/compat/xfree86 b/compat/xfree86 -index cf4a8b2..52e661d 100644 ---- a/compat/xfree86 -+++ b/compat/xfree86 -@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic" { - action = SwitchScreen(Screen=12, !SameServer); - }; - -- interpret XF86_Ungrab { -- action = Private(type=0x86, data="Ungrab"); -- }; -- interpret XF86_ClearGrab { -- action = Private(type=0x86, data="ClsGrb"); -- }; - interpret XF86LogGrabInfo { - action = Private(type=0x86, data="PrGrbs"); - }; -@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic" { - action = Private(type=0x86, data="-VMode"); - }; - }; -+ -+partial xkb_compatibility "grab_break" { -+ interpret XF86_Ungrab { -+ action = Private(type=0x86, data="Ungrab"); -+ }; -+ interpret XF86_ClearGrab { -+ action = Private(type=0x86, data="ClsGrb"); -+ }; -+}; -diff --git a/rules/base.o_c.part b/rules/base.o_c.part -index 352f8b3..b80ab6d 100644 ---- a/rules/base.o_c.part -+++ b/rules/base.o_c.part -@@ -3,4 +3,5 @@ - grp_led:scroll = +ledscroll(group_lock) - japan:kana_lock = +japan(kana_lock) - caps:shiftlock = +ledcaps(shift_lock) -+ grab:break_actions = +xfree86(grab_break) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index 22b720f..6c17faa 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -6278,6 +6278,12 @@ - <_description>Toggle PointerKeys with Shift + NumLock. - - -+ - - - --- -1.7.8.3 - diff --git a/0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch b/0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch deleted file mode 100644 index 72184ba..0000000 --- a/0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch +++ /dev/null @@ -1,230 +0,0 @@ -From c17f8b08740aed26687fd65c84e654a6cdc163a2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 13 Jun 2011 23:39:30 +0100 -Subject: [PATCH] Use XSL to generate man page from the rules XML - -Generate a man-page from the evdev.xml through the xslt/man.xsl stylesheet. - -Adds a requirement on the xorg util-macros and xsltproc. - -Signed-off-by: Peter Hutterer -Reviewed-by: Dan Nicholson -Reviewed-by: Gaetan Nadon ---- - Makefile.am | 2 +- - configure.in | 10 ++++ - man/Makefile.am | 17 +++++++ - man/man.xsl | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 165 insertions(+), 1 deletions(-) - create mode 100644 man/Makefile.am - create mode 100644 man/man.xsl - -diff --git a/Makefile.am b/Makefile.am -index e98117e..943539f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs -+SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs man - - pkgconfigdir = $(datadir)/pkgconfig - pkgconfig_DATA = xkeyboard-config.pc -diff --git a/configure.in b/configure.in -index 527e807..e98919a 100644 ---- a/configure.in -+++ b/configure.in -@@ -3,6 +3,15 @@ AC_CONFIG_SRCDIR(rules/base.xml.in) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - -+# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.12 or later before -+ running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.12) -+XORG_MANPAGE_SECTIONS -+XORG_WITH_XSLTPROC -+AC_PROG_SED -+ - AC_SUBST(VERSION) - - AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found]) -@@ -104,6 +113,7 @@ types/Makefile - xkeyboard-config.pc - xkeyboard-config.spec - docs/Makefile -+man/Makefile - ]) - - echo '***********************************************************' -diff --git a/man/Makefile.am b/man/Makefile.am -new file mode 100644 -index 0000000..2e9deaa ---- /dev/null -+++ b/man/Makefile.am -@@ -0,0 +1,17 @@ -+EXTRA_DIST = man.xsl -+ -+if HAVE_XSLTPROC -+miscmandir = $(MISC_MAN_DIR) -+miscman_PRE = xkeyboard-config.man -+miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@) -+CLEANFILES = $(miscman_DATA) $(miscman_PRE) -+SUFFIXES = .$(MISC_MAN_SUFFIX) .man -+MAN_SUBSTS += -e 's|__xkb_base__|$(xkb_base)|g' -+ -+xkeyboard-config.man: $(top_builddir)/rules/evdev.xml $(srcdir)/man.xsl -+ $(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_builddir)/rules/evdev.xml > $@ -+ -+.man.$(MISC_MAN_SUFFIX): -+ $(SED) $(MAN_SUBSTS) < $< > $@ -+ -+endif -diff --git a/man/man.xsl b/man/man.xsl -new file mode 100644 -index 0000000..a5bd14d ---- /dev/null -+++ b/man/man.xsl -@@ -0,0 +1,137 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ( -+ -+ ) -+ -+ -+ -+ -+ -+ _ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -1.7.5.4 - diff --git a/0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch b/0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch deleted file mode 100644 index 1b7778a..0000000 --- a/0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7e789cffc6999a30b5d7ded03496b1d3dad1dc86 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 15 Dec 2011 15:53:55 +1000 -Subject: [PATCH] rules: Serbian keyboards are cyrillic by default - -Signed-off-by: Peter Hutterer ---- - rules/base.xml.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index 4ee879b..a90e994 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -4075,7 +4075,7 @@ - - rs - <_shortDescription>sr -- <_description>Serbian -+ <_description>Serbian (Cyrillic) - - srp - -@@ -4084,7 +4084,7 @@ - - - yz -- <_description>Serbian (Z and ZHE swapped) -+ <_description>Serbian (Cyrillic, Z and ZHE swapped) - - - -@@ -4114,7 +4114,7 @@ - - - alternatequotes -- <_description>Serbian (with guillemets) -+ <_description>Serbian (Cyrillic with guillemets) - - - --- -1.7.7.1 -