From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- x11-misc/x2x/Manifest | 5 +- x11-misc/x2x/files/x2x_1.30-10-keymap.patch | 115 ++++++++++++++++++++++++++++ x11-misc/x2x/metadata.xml | 9 ++- x11-misc/x2x/x2x-1.30.ebuild | 48 ++++++++++++ 4 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 x11-misc/x2x/files/x2x_1.30-10-keymap.patch create mode 100644 x11-misc/x2x/x2x-1.30.ebuild (limited to 'x11-misc/x2x') diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest index 453aee474363..6f9d5658da0e 100644 --- a/x11-misc/x2x/Manifest +++ b/x11-misc/x2x/Manifest @@ -1,6 +1,9 @@ +AUX x2x_1.30-10-keymap.patch 3825 BLAKE2B 1dade51328dad2587e1ef9d13d86bb9ef53b3c88092402286a3371af2d6b18791844fc7aae45c260b1575ee24f50f0dcfc85b5554a10a9615b0810edc9413d97 SHA512 8ea3c6f7b219e5e8649d27108c89a1b253f73a3bede3c107eaa09ae1ca38634eeb391803f1dbfe05a5ec82e1ad31162c194f1f142203d342e980edc6e13ff143 DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131 +DIST x2x-1.30.tar.gz 52760 BLAKE2B fae2eeb9aa68241c3ba9e79021aa9313a5852048f23b6be8ad5de7dd090d2cd09c006f4c1b1403ccfa8057f314657c2248463a7c53187e41291742cfaa04139a SHA512 cb14b40e1511e3fe6c927443f5f411a827ebf6c313bfb46af0165eebdd534c8aa3abcc8064b89420b7f44c23c518ed4f02bab4c23bbcfaece8910a3f824c9c11 DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01 DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71 EBUILD x2x-1.27-r3.ebuild 1472 BLAKE2B d31f4329ed5974fcda95f5f8c40b9989d0533bae79a4f6aa3c5e3bd1b100b158819095b433603527054d79e89082761fee5c29d121f7eebd4e20f8c85d8c2d08 SHA512 6d6a8605cf947b97701f2581a93973e6a8356c9dcdc0d2f9d0bcf77930c7800673044f4192f2ebb7e9b35e9ae2fa1bb6f25591cfbe022563d78af68586bb6aa6 -MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 +EBUILD x2x-1.30.ebuild 1009 BLAKE2B 461f6782305834fd1e37339f5de17635481b00143bf8e4422b670a6dab9afb65adba5b6c942141ad4f63d8aada2fa319ee5380715d443bc94d7299508b123ed7 SHA512 12b445d4ee03a7fd10c81b4ea5899b55c62ea251abc974e8eb33e8cdd88580f34bf570d4a04dec720fc7ec93b84284b7b8e2ca95bfc120aa6dc23618d616793e +MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87 diff --git a/x11-misc/x2x/files/x2x_1.30-10-keymap.patch b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch new file mode 100644 index 000000000000..b9bb1f9b9623 --- /dev/null +++ b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch @@ -0,0 +1,115 @@ +--- a./x2x.c ++++ b./x2x.c +@@ -321,6 +321,12 @@ typedef struct _sticky { + KeySym keysym; + } STICKY, *PSTICKY; + ++typedef struct _keymap { ++ struct _keymap * pNext; ++ KeySym from; ++ KeySym to; ++} KEYMAP, *PKEYMAP; ++ + typedef int (*HANDLER)(); /* event handler function */ + + /* These prototypes need the typedefs */ +@@ -377,6 +383,7 @@ static Bool doDpmsMouse = False; + static int logicalOffset= 0; + static int nButtons = 0; + static KeySym buttonmap[N_BUTTONS + 1][MAX_BUTTONMAPEVENTS + 1]; ++static PKEYMAP keymaps = NULL; + static Bool noScale = False; + static int compRegLeft = 0; + static int compRegRight = 0; +@@ -571,7 +578,8 @@ char **argv; + PSHADOW pShadow; + extern char *lawyerese; + PSTICKY pNewSticky; +- KeySym keysym; ++ PKEYMAP pNewKeymap; ++ KeySym keysym,keysym2; + int button; + int eventno; + char *keyname, *argptr; +@@ -703,6 +711,22 @@ char **argv; + } else { + printf("x2x: warning: can't translate %s\n", argv[arg]); + } ++ } else if (!strcasecmp(argv[arg], "-keymap")) { ++ if ((++arg+1) >= argc) Usage(); ++ if (((keysym = XStringToKeysym(argv[arg])) != NoSymbol) && ++ ((keysym2 = XStringToKeysym(argv[arg+1])) != NoSymbol)) { ++ pNewKeymap = (PKEYMAP)malloc(sizeof(KEYMAP)); ++ pNewKeymap->pNext = keymaps; ++ pNewKeymap->from = keysym; ++ pNewKeymap->to = keysym2; ++ keymaps = pNewKeymap; ++#ifdef DEBUG ++ printf("will translate key %s to %s\n", argv[arg],argv[arg+1]); ++#endif ++ } else { ++ printf("x2x: warning: can't translate %s or %s\n", argv[arg],argv[arg+1]); ++ } ++ arg++; + } else if (!strcasecmp(argv[arg], "-buttonmap")) { + if (++arg >= argc) Usage(); + button = atoi(argv[arg]); +@@ -842,6 +842,7 @@ static void Usage() + printf(" -completeregionup \n"); + printf(" -completeregionlow \n"); + printf(" -struts\n"); ++ printf(" -keymap \n"); + #ifdef WIN_2_X + printf(" -offset [-]\n"); + printf("WIN_2_X build allows Windows or X as -from display\n"); +@@ -2200,6 +2224,7 @@ XKeyEvent *pEv; + PSHADOW pShadow; + Bool bPress; + PSTICKY pSticky; ++ PKEYMAP pKeymap; + Bool DoFakeShift = False; + KeyCode toShiftCode; + +@@ -2211,6 +2236,15 @@ XKeyEvent *pEv; + XKeysymToString(keysym), (bPress ? "pressed" : "released"), pEv->state); + #endif + ++ for (pKeymap = keymaps; pKeymap; pKeymap = pKeymap->pNext) ++ if (keysym == pKeymap->from) { ++ keysym = pKeymap->to; ++#ifdef DEBUG ++ printf("Key mapped from %x to %x\n", pKeymap->from, pKeymap->to); ++#endif ++ } ++ ++ + /* If CapsLock is on, we need to do some funny business to make sure the */ + /* "to" display does the right thing */ + if(doCapsLkHack && (pEv->state & 0x2)) + +--- a./x2x.1 ++++ b./x2x.1 +@@ -309,6 +309,12 @@ Describes uppermost coordinate of complete rectangle region in from-display. + .B \-completeregionlow + .IP + Describes lowermost coordinate of complete rectangle region in from-display. ++.TP ++.B \-keymap \fIfrom-keysym\fP \fIto-keysym\fP ++.IP ++Translates the \fIfrom-keysym\fP keysym of the first X to \fIto-keysym\fP of the second X. ++See X11/keysymdef.h for available keysyms. ++Alternatively you can use setxkbmap, as described in the BUGS section. + .SH EXAMPLES + Calling the system whose keyboard is to be used "primary" and the + other system "secondary", you need to specify either \-from +@@ -329,6 +333,10 @@ secondary $ ssh \-X primary x2x \-from :0 \-west + run directly indirectly on primary: + .IP + primary $ ssh \-A secondary env DISPLAY=:0.0 ssh \-X primary x2x \-from :0 \-east ++.TP ++set a custom keymap binding: ++.IP ++x2x -keymap ISO_Level3_Shift Mode_switch + + .RE + If your primary display is configured with several monitors having different diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml index 115e9d64a669..5d2f87cc3174 100644 --- a/x11-misc/x2x/metadata.xml +++ b/x11-misc/x2x/metadata.xml @@ -1,5 +1,12 @@ - + + rndxelement@protonmail.com + Philipp Rösner + + + proxy-maint@gentoo.org + Proxy Maintainers + diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30.ebuild new file mode 100644 index 000000000000..09d330e821dd --- /dev/null +++ b/x11-misc/x2x/x2x-1.30.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="A utility to connect the mouse and keyboard to another X" +HOMEPAGE="https://github.com/dottedmag/x2x" +SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXext" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/rman + x11-base/xorg-proto + >=x11-misc/imake-1.0.8-r1" + +S="${WORKDIR}"/${PN}-debian-1.30-10 + +PATCHES=( + # Patch to fix bug #126939 + # AltGr does not work in x2x with different keymaps: + "${FILESDIR}"/${PN}_1.30-10-keymap.patch +) +DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old ) + +src_prepare() { + default + eautoreconf +} + +src_compile() { + emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" +} + +src_install() { + default + dodoc -r docs/ +} -- cgit v1.2.3