From 3102bb90c325d9b29ac304d8f3ea0a17df564fc8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Nov 2008 12:50:10 +0000 Subject: [PATCH] Add 20081002-1. Remove patches applied upstream. --- debian/changelog | 8 +++ debian/patches/101_ignore-mising-keys.diff | 67 ---------------------- debian/patches/102_ignore-bad-match.diff | 21 ------- debian/patches/series | 2 - 4 files changed, 8 insertions(+), 90 deletions(-) delete mode 100644 debian/patches/101_ignore-mising-keys.diff delete mode 100644 debian/patches/102_ignore-bad-match.diff diff --git a/debian/changelog b/debian/changelog index f082d42..5274914 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ion3 (20081002-1) unstable; urgency=low + + * New upstream version + - Obsoletes patches 101_ignore-missing-keys.diff and + 102_ignore-bad-match.diff + + -- Ben Hutchings Sat, 01 Nov 2008 17:08:22 +0000 + ion3 (20080825-1) unstable; urgency=low * New upstream version diff --git a/debian/patches/101_ignore-mising-keys.diff b/debian/patches/101_ignore-mising-keys.diff deleted file mode 100644 index 3f59ea5..0000000 --- a/debian/patches/101_ignore-mising-keys.diff +++ /dev/null @@ -1,67 +0,0 @@ -Wed Jul 23 18:30:48 BST 2008 Tuomo Valkonen - * Do not log complaints about keysym to keycode conversion failure. -diff -rN -u old-ion-3plus/ioncore/conf-bindings.c new-ion-3plus/ioncore/conf-bindings.c ---- old-ion-3plus/ioncore/conf-bindings.c 2008-07-24 21:29:07.000000000 +0100 -+++ new-ion-3plus/ioncore/conf-bindings.c 2008-07-24 21:29:07.000000000 +0100 -@@ -20,6 +20,7 @@ - #include - #include "conf-bindings.h" - #include "bindmaps.h" -+#include "ioncore.h" - - - /*{{{ parse_keybut */ -@@ -94,7 +95,8 @@ - break; - } - if(XKeysymToKeycode(ioncore_g.dpy, keysym)==0){ -- warn_obj(str, TR("Could not convert keysym to keycode.")); -+ ioncore_warn_nolog("%s: %s", str, -+ TR("Could not convert keysym to keycode.")); - break; - } - *ksb_ret=keysym; -diff -rN -u old-ion-3plus/ioncore/ioncore.c new-ion-3plus/ioncore/ioncore.c ---- old-ion-3plus/ioncore/ioncore.c 2008-07-24 21:29:07.000000000 +0100 -+++ new-ion-3plus/ioncore/ioncore.c 2008-07-24 21:29:07.000000000 +0100 -@@ -22,6 +22,7 @@ - #ifndef CF_NO_GETTEXT - #include - #endif -+#include - - #include - #include -@@ -99,12 +100,17 @@ - /*{{{ warn_nolog */ - - --void ioncore_warn_nolog(const char *str) -+void ioncore_warn_nolog(const char *str, ...) - { -- fprintf(stderr, "%s: %s\n", libtu_progname(), str); -+ va_list args; -+ -+ va_start(args, str); -+ fprintf(stderr, "%s: ", libtu_progname()); -+ vfprintf(stderr, str, args); -+ fprintf(stderr, "\n"); -+ va_end(args); - } - -- - /*}}}*/ - - -diff -rN -u old-ion-3plus/ioncore/ioncore.h new-ion-3plus/ioncore/ioncore.h ---- old-ion-3plus/ioncore/ioncore.h 2008-07-24 21:29:07.000000000 +0100 -+++ new-ion-3plus/ioncore/ioncore.h 2008-07-24 21:29:07.000000000 +0100 -@@ -28,6 +28,6 @@ - extern WHook *ioncore_snapshot_hook; - extern WHook *ioncore_deinit_hook; - --extern void ioncore_warn_nolog(const char *str); -+extern void ioncore_warn_nolog(const char *str, ...); - - #endif /* ION_IONCORE_IONCORE_H */ - diff --git a/debian/patches/102_ignore-bad-match.diff b/debian/patches/102_ignore-bad-match.diff deleted file mode 100644 index 7c2a55f..0000000 --- a/debian/patches/102_ignore-bad-match.diff +++ /dev/null @@ -1,21 +0,0 @@ -Wed Jul 23 17:54:17 BST 2008 Tuomo Valkonen - * More BadMatch ignore -diff -rN -u old-ion-3plus/ioncore/rootwin.c new-ion-3plus/ioncore/rootwin.c ---- old-ion-3plus/ioncore/rootwin.c 2008-07-24 21:28:52.000000000 +0100 -+++ new-ion-3plus/ioncore/rootwin.c 2008-07-24 21:28:52.000000000 +0100 -@@ -59,9 +59,13 @@ - - /* Just ignore bad window and similar errors; makes the rest of - * the code simpler. -+ * -+ * Apparently XGetWindowProperty can return BadMatch on a race -+ * condition where the server is already reusing the XID for a -+ * non-window drawable, so let's just ignore BadMatch entirely... - */ - if((ev->error_code==BadWindow || -- (ev->error_code==BadMatch && ev->request_code==X_SetInputFocus) || -+ (ev->error_code==BadMatch /*&& ev->request_code==X_SetInputFocus*/) || - (ev->error_code==BadDrawable && ev->request_code==X_GetGeometry)) && - ignore_badwindow) - return 0; - diff --git a/debian/patches/series b/debian/patches/series index 86fb6be..6de1150 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -101_ignore-mising-keys.diff -102_ignore-bad-match.diff 201_build-config.diff 205_ion-lock.diff 206_use-x-terminal-emulator.diff -- 2.39.2