summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-terms/aterm/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-terms/aterm/files')
-rw-r--r--x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch35
-rw-r--r--x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch24
2 files changed, 59 insertions, 0 deletions
diff --git a/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch
new file mode 100644
index 00000000000..958f40900bc
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-deadkeys.patch
@@ -0,0 +1,35 @@
+--- aterm-1.0.1~/src/command.c 2006-06-26 20:01:20.000000000 +0200
++++ aterm-1.0.1/src/command.c 2007-09-26 15:03:19.000000000 +0200
+@@ -1486,19 +1486,21 @@
+ numlock_state = (ev->xkey.state & ModNumLockMask); /* numlock toggle */
+ PrivMode((!numlock_state), PrivMode_aplKP);
+ }
+-#ifdef USE_XIM
++#if defined(USE_XIM) || !defined(NO_XLOCALE)
+ len = 0;
+- if (Input_Context != NULL) {
+- Status status_return;
++ if (!XFilterEvent(ev, *(&ev->xkey.window))) {
++ if (Input_Context != NULL) {
++ Status status_return;
+
+- kbuf[0] = '\0';
+- len = XmbLookupString(Input_Context, &ev->xkey, kbuf,
+- sizeof(kbuf), &keysym,
+- &status_return);
+- } else {
+- len = XLookupString(&ev->xkey, kbuf,
+- sizeof(kbuf), &keysym,
+- &compose);
++ kbuf[0] = '\0';
++ len = XmbLookupString(Input_Context, &ev->xkey, kbuf,
++ sizeof(kbuf), &keysym,
++ &status_return);
++ } else {
++ len = XLookupString(&ev->xkey, kbuf,
++ sizeof(kbuf), &keysym,
++ &compose);
++ }
+ }
+ #else /* USE_XIM */
+ len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, &compose);
diff --git a/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch
new file mode 100644
index 00000000000..e44c0b360d2
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch
@@ -0,0 +1,24 @@
+--- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200
++++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200
+@@ -2057,10 +2057,6 @@
+ */
+ get_options(argc, argv);
+
+- if( display_name == NULL )
+- if ((display_name = getenv("DISPLAY")) == NULL)
+- display_name = ":0";
+-
+ #ifdef HAVE_AFTERSTEP
+ #ifdef MyArgs_IS_MACRO
+ MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) );
+@@ -2102,7 +2098,9 @@
+ Xdisplay = XOpenDisplay(display_name);
+
+ if (!Xdisplay) {
+- print_error("can't open display %s", display_name);
++ print_error("can't open display %s", display_name?display_name:
++ getenv("DISPLAY")?getenv("DISPLAY"):
++ "as no -d given and DISPLAY not set");
+ exit(EXIT_FAILURE);
+ }
+ /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */