From 11bda23b2e1040469a2393a0e77e0b5c90c84c7627c69086a61a5a28257b231d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 4 May 2024 02:12:57 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main xmodmap revision 53231245a2002c8292ce6ebd2089461c --- .gitattributes | 23 +++++++++++ Xmodmap.remote.template | 29 ++++++++++++++ Xmodmap.template | 40 ++++++++++++++++++ xmodmap-1.0.11.tar.xz | 3 ++ xmodmap.changes | 89 +++++++++++++++++++++++++++++++++++++++++ xmodmap.spec | 77 +++++++++++++++++++++++++++++++++++ 6 files changed, 261 insertions(+) create mode 100644 .gitattributes create mode 100644 Xmodmap.remote.template create mode 100644 Xmodmap.template create mode 100644 xmodmap-1.0.11.tar.xz create mode 100644 xmodmap.changes create mode 100644 xmodmap.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/Xmodmap.remote.template b/Xmodmap.remote.template new file mode 100644 index 0000000..c65743f --- /dev/null +++ b/Xmodmap.remote.template @@ -0,0 +1,29 @@ +!! +!! Xmodmap.remote: Map key san codes or key symbols of +!! a remote X workstation or terminal. +!! +!! Note: for remote terminals we do not know what scan codes +!! are used for specific keys. Therefore we have to use +!! the symbols as representative. This may cause problems +!! if the symbols for specific keys were swapped before. +!! +!! If you need the exact scan codes for different terminals and +!! their key board copy this file to +!! Xmodmap. where +!! the suffix is the full qualified name identical with the +!! value of the DISPLAY variable without `:0', `:1', ... +!! e.g. Xmodmap.xterminal.uni-yx.de +!! +!! How to determine scan codes an there currently corresponding +!! symbol see manual page of xev(1x) and xmodmap(1x). +!! +!! Werner Fink, +!! +!! Backarrow key is symbol BackSpace +!! Modifiers for backarrow key +!! Shift-BS is Symbol BackSpace +!! Alt-BS is Symbol DeleteWord +!! Remove key is Symbol Delete +!! +keysym BackSpace = BackSpace BackSpace 3270_DeleteWord + diff --git a/Xmodmap.template b/Xmodmap.template new file mode 100644 index 0000000..5d8de50 --- /dev/null +++ b/Xmodmap.template @@ -0,0 +1,40 @@ +!! ~/.Xmodmap +!! +!! Use this as a template for $HOME/.Xmodmap +!! +!! The leading `!' is the comment sign. +!! +!! Please note: the natural way to assign keys are their keycodes. +!! The only problem is, that keycodes do depend on the architecture, +!! therefore keysymbols are used herein. This has the disadvantage +!! that this file can only be called once with the program xmodmap. +!! To get keycodes of the keys use the program xev. +!! The system Xmodmap is /usr/X11R6/lib/X11/Xmodmap, have a look. + +!! First example: Swap control key with caps lock key just like on +!! lk401 from DEC or type 4 from Sun Microsystems +!remove Lock = Caps_Lock +!remove Control = Control_L +!keysym Caps_Lock = Control_L +!keysym Control_L = Caps_Lock +!add Lock = Caps_Lock +!add Control = Control_L + +!! Second example: Make left Alt key to left Meta key +!! Note that afterwards no key is assigned anymore to the symbol Alt_L. +!clear Mod1 +!keysym Alt_L = Meta_L +!add Mod1 = Meta_L + +!! Third example: Change right Control key to Compose key. +!! To do Compose Character, press this key and afterwards two +!! characters (e.g. `a' and `^' to get â). +!remove Control = Control_R +!keysym Control_R = Multi_key +!add Control = Control_R + +!! Fourth example: Make Menu key on WIN95 keyboard doing Compose +!keysym Menu = Multi_key + +!! +!! End of ~/.Xmodmap diff --git a/xmodmap-1.0.11.tar.xz b/xmodmap-1.0.11.tar.xz new file mode 100644 index 0000000..d549f9a --- /dev/null +++ b/xmodmap-1.0.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a2f8168f7b0bc382828847403902cb6bf175e17658b36189eac87edda877e81 +size 139532 diff --git a/xmodmap.changes b/xmodmap.changes new file mode 100644 index 0000000..a15d191 --- /dev/null +++ b/xmodmap.changes @@ -0,0 +1,89 @@ +------------------------------------------------------------------- +Mon Jul 11 12:55:19 UTC 2022 - Stefan Dirsch + +- Update to version 1.0.11 + * gitlab CI: add a basic build test + * Build xz tarballs instead of bzip2 + * handle.c: avoid leaks when realloc() fails + * PrintModifierMapping: stop leaking the map returned by + XGetKeyboardMapping Fix warning about number of mouse buttons + +------------------------------------------------------------------- +Sat Apr 17 16:39:15 UTC 2021 - Dirk Müller + +- modernize spec-file (move license to licensedir) + +------------------------------------------------------------------- +Wed Sep 9 15:57:08 UTC 2020 - Stefan Dirsch + +- reenabled move to /usr/etc/X11 for Tumbleweed (boo#1173053) + +------------------------------------------------------------------- +Tue Sep 8 09:51:56 UTC 2020 - Stefan Dirsch + +- reverted move to /usr/etc/X11 for now (boo#1173053, comment#3) + +------------------------------------------------------------------- +Sat Sep 5 01:22:15 UTC 2020 - Stefan Dirsch + +- moved Xmodmap files to /usr/etc/X11 (boo#1173053) + +------------------------------------------------------------------- +Thu Feb 21 11:14:12 UTC 2019 - sndirsch@suse.com + +- Update to version 1.0.10 + * This release provides a man page update and some small build + fixes & janitorial cleanups. + +------------------------------------------------------------------- +Fri Apr 24 15:09:54 UTC 2015 - sndirsch@suse.com + +- Update to version 1.0.9: + * configure: Drop AM_MAINTAINER_MODE + * autogen.sh: Honor NOCONFIGURE=1 + * Add -version option to print program version + * Print which option was in error along with usage message + * Avoid null pointer use if malloc() fails + * Remove unneeded casts on malloc, realloc, and free calls + +------------------------------------------------------------------- +Thu Sep 12 19:37:37 UTC 2013 - zaitor@opensuse.org + +- Update to version 1.0.8: + + Add missing copyright dates from xmodmap.man to COPYING. + + Allow printing -help & -grammar messages without a valid + DISPLAY. + + Error in manpage example about swapping Control_L/Caps_Lock + keys (deb#641588). + + Include X11/Xwindows.h on WIN32. + + Include config.h before stdio.h & other system headers + (fdo#48696). +- Drop xmodmap-includes.patch, fixed upstream. + +------------------------------------------------------------------- +Mon Apr 23 07:02:02 UTC 2012 - vuntz@opensuse.org + +- Update to version 1.0.7: + + Build fixes. + +------------------------------------------------------------------- +Sat Apr 14 20:30:52 UTC 2012 - dimstar@opensuse.org + +- Update to version 1.0.6: + + Replace chk_malloc + sprintf with asprintf. + + Free copy of input line at end of process_line instead of + leaking it. + + Fix gcc -Wwrite-strings warnings. + + Add missing _X_NORETURN to functions that need it. + + Include strings.h for strcasecmp. + + Improve error handling in copy_to_scratch. + + Build system fixes. +- Add pkgconfig(xproto) BuildRequires: new dependency. +- Add xmodmap-includes.patch: Fix build: as asprintf is only + defined when building as _GNU_SOURCE. + +------------------------------------------------------------------- +Fri Apr 13 08:46:08 UTC 2012 - vuntz@opensuse.org + +- Split xmodmap from xorg-x11. Initial version: 1.0.5. + diff --git a/xmodmap.spec b/xmodmap.spec new file mode 100644 index 0000000..48a63f7 --- /dev/null +++ b/xmodmap.spec @@ -0,0 +1,77 @@ +# +# spec file for package xmodmap +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%if 0%{?suse_version} >= 1550 +%define UsrEtcMove 1 +%endif +Name: xmodmap +Version: 1.0.11 +Release: 0 +Summary: Utility to modify keymaps and pointer button mappings in X +License: MIT +Group: System/X11/Utilities +URL: https://xorg.freedesktop.org/ +Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +Source1: Xmodmap.template +Source2: Xmodmap.remote.template +BuildRequires: pkgconfig +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.17 +# This was part of the xorg-x11 package up to version 7.6 +Conflicts: xorg-x11 <= 7.6 + +%description +The xmodmap program is used to edit and display the keyboard modifier +map and keymap table that are used by client applications to convert +event keycodes into keysyms. It is usually run from the user's +session startup script to configure the keyboard according to personal +tastes. + +%prep +%setup -q + +%build +%configure +%make_build + +%install +%make_install +%if 0%{?UsrEtcMove} +install -m0644 -D %{SOURCE1} %{buildroot}%{_distconfdir}/X11/Xmodmap +install -m0644 -D %{SOURCE2} %{buildroot}%{_distconfdir}/X11/Xmodmap.remote +%else +install -m0644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/Xmodmap +install -m0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/Xmodmap.remote +%endif + +%files +%license COPYING +%doc AUTHORS ChangeLog README.md +%if 0%{?UsrEtcMove} +%dir %{_distconfdir}/X11 +%{_distconfdir}/X11/Xmodmap +%{_distconfdir}/X11/Xmodmap.remote +%else +%config %{_sysconfdir}/X11/Xmodmap +%config %{_sysconfdir}/X11/Xmodmap.remote +%endif +%{_bindir}/xmodmap +%{_mandir}/man1/xmodmap.1%{?ext_man} + +%changelog