From: Ben Hutchings Date: Thu, 28 May 2009 00:17:28 +0000 (+0100) Subject: Apply upstream interim fixes X-Git-Tag: 20090110-2~7 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9c4f3f25129c757f5e5e7d888ce9d7adbb66fa9a;p=ion3.git Apply upstream interim fixes Add ion-3-20090526.diff. Undo the typo in config.h and copy the ChangeLog entries from the patch to the installed ChangeLog. --- diff --git a/debian/changelog b/debian/changelog index 6c7a76b..ebcc450 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ion3 (20090110-2) unstable; urgency=low + + * Apply upstream interim fixes (ion-3-20090526.diff) + + -- Ben Hutchings Sat, 13 Jun 2009 05:17:15 +0100 + ion3 (20090110-1) unstable; urgency=low * New upstream version diff --git a/debian/patches/101_ion-3-20090526.diff b/debian/patches/101_ion-3-20090526.diff new file mode 100644 index 0000000..160ee4f --- /dev/null +++ b/debian/patches/101_ion-3-20090526.diff @@ -0,0 +1,142 @@ +Mon Mar 2 10:30:41 W. Europe Standard Time 2009 Tuomo Valkonen + * Don't symlink look.lua, but rather dopath from within +Mon Mar 2 10:09:36 W. Europe Standard Time 2009 Tuomo Valkonen + * Fix frame_clear_shape +Sun Feb 8 23:37:32 W. Europe Standard Time 2009 Tuomo Valkonen + * WM_TAKE_FOCUS tune +Fri Jan 9 23:19:32 W. Europe Standard Time 2009 Tuomo Valkonen + tagged ion-3-20090110 +diff -rN -u old-ion-3/config.h new-ion-3/config.h +--- old-ion-3/config.h 2009-05-26 19:09:08.172555900 +0200 ++++ new-ion-3/config.h 2009-05-26 19:09:15.984855900 +0200 +@@ -1,4 +1,4 @@ +-/* ++asdf/* + * config.h + * + * Copyright (c) Tuomo Valkonen 1999-2009. +diff -rN -u old-ion-3/etc/Makefile new-ion-3/etc/Makefile +--- old-ion-3/etc/Makefile 2009-05-26 19:09:15.359871900 +0200 ++++ new-ion-3/etc/Makefile 2009-05-26 19:09:16.344221700 +0200 +@@ -11,6 +11,7 @@ + ETC = cfg_ion.lua cfg_ioncore.lua cfg_kludges.lua cfg_defaults.lua \ + cfg_tiling.lua cfg_query.lua cfg_menu.lua \ + cfg_statusbar.lua cfg_dock.lua cfg_layouts.lua \ ++ look.lua \ + look_brownsteel.lua look_clean.lua look_dusky.lua \ + look_greyviolet.lua look_ios.lua look_cleanviolet.lua \ + look_simpleblue.lua look_cleanios.lua look_newviolet.lua \ +@@ -24,5 +25,3 @@ + ###################################### + + _install: etc_install +- rm -f $(ETCDIR)/look.lua +- ln -s look_newviolet.lua $(ETCDIR)/look.lua +diff -rN -u old-ion-3/etc/look.lua new-ion-3/etc/look.lua +--- old-ion-3/etc/look.lua 1970-01-01 01:00:00.000000000 +0100 ++++ new-ion-3/etc/look.lua 2009-05-26 19:09:16.484843100 +0200 +@@ -0,0 +1 @@ ++dopath('look_newviolet') +diff -rN -u old-ion-3/ioncore/clientwin.c new-ion-3/ioncore/clientwin.c +--- old-ion-3/ioncore/clientwin.c 2009-05-26 19:09:15.562991700 +0200 ++++ new-ion-3/ioncore/clientwin.c 2009-05-26 19:09:17.125451700 +0200 +@@ -1015,10 +1015,11 @@ + { + if(cwin->flags&CLIENTWIN_P_WM_TAKE_FOCUS){ + Time stmp=ioncore_get_timestamp(); ++ region_finalise_focusing((WRegion*)cwin, cwin->win, warp, stmp); + send_clientmsg(cwin->win, ioncore_g.atom_wm_take_focus, stmp); ++ }else{ ++ region_finalise_focusing((WRegion*)cwin, cwin->win, warp, CurrentTime); + } +- +- region_finalise_focusing((WRegion*)cwin, cwin->win, warp); + + XSync(ioncore_g.dpy, 0); + } +diff -rN -u old-ion-3/ioncore/focus.c new-ion-3/ioncore/focus.c +--- old-ion-3/ioncore/focus.c 2009-05-26 19:09:15.531742500 +0200 ++++ new-ion-3/ioncore/focus.c 2009-05-26 19:09:18.219173700 +0200 +@@ -347,7 +347,7 @@ + /*Time ioncore_focus_time=CurrentTime;*/ + + +-void region_finalise_focusing(WRegion* reg, Window win, bool warp) ++void region_finalise_focusing(WRegion* reg, Window win, bool warp, Time time) + { + if(warp) + region_do_warp(reg); +@@ -356,10 +356,7 @@ + return; + + region_set_await_focus(reg); +- /*xwindow_do_set_focus(win);*/ +- XSetInputFocus(ioncore_g.dpy, win, RevertToParent, +- CurrentTime/*ioncore_focus_time*/); +- /*ioncore_focus_time=CurrentTime;*/ ++ XSetInputFocus(ioncore_g.dpy, win, RevertToParent, time); + } + + +diff -rN -u old-ion-3/ioncore/focus.h new-ion-3/ioncore/focus.h +--- old-ion-3/ioncore/focus.h 2009-05-26 19:09:15.484868700 +0200 ++++ new-ion-3/ioncore/focus.h 2009-05-26 19:09:18.250422900 +0200 +@@ -23,7 +23,7 @@ + extern void region_warp(WRegion *reg); /* maybewarp TRUE */ + extern void region_set_focus(WRegion *reg); /* maybewarp FALSE */ + +-extern void region_finalise_focusing(WRegion* reg, Window win, bool warp); ++extern void region_finalise_focusing(WRegion* reg, Window win, bool warp, Time time); + + DYNFUN void region_do_set_focus(WRegion *reg, bool warp); + extern void region_do_warp(WRegion *reg); +diff -rN -u old-ion-3/ioncore/frame-draw.c new-ion-3/ioncore/frame-draw.c +--- old-ion-3/ioncore/frame-draw.c 2009-05-26 19:09:15.422370300 +0200 ++++ new-ion-3/ioncore/frame-draw.c 2009-05-26 19:09:18.266047500 +0200 +@@ -219,7 +219,8 @@ + + void frame_clear_shape(WFrame *frame) + { +- grbrush_set_window_shape(frame->brush, TRUE, 0, NULL); ++ if(frame->brush!=NULL) ++ grbrush_set_window_shape(frame->brush, TRUE, 0, NULL); + } + + +diff -rN -u old-ion-3/ioncore/group.c new-ion-3/ioncore/group.c +--- old-ion-3/ioncore/group.c 2009-05-26 19:09:15.453619500 +0200 ++++ new-ion-3/ioncore/group.c 2009-05-26 19:09:18.969154500 +0200 +@@ -241,7 +241,7 @@ + if(st!=NULL && st->reg!=NULL) + region_do_set_focus(st->reg, warp); + else +- region_finalise_focusing((WRegion*)ws, ws->dummywin, warp); ++ region_finalise_focusing((WRegion*)ws, ws->dummywin, warp, CurrentTime); + } + + +diff -rN -u old-ion-3/ioncore/window.c new-ion-3/ioncore/window.c +--- old-ion-3/ioncore/window.c 2009-05-26 19:09:15.437994900 +0200 ++++ new-ion-3/ioncore/window.c 2009-05-26 19:09:21.562838100 +0200 +@@ -182,7 +182,7 @@ + + void window_do_set_focus(WWindow *wwin, bool warp) + { +- region_finalise_focusing((WRegion*)wwin, wwin->win, warp); ++ region_finalise_focusing((WRegion*)wwin, wwin->win, warp, CurrentTime); + } + + +diff -rN -u old-ion-3/mod_tiling/tiling.c new-ion-3/mod_tiling/tiling.c +--- old-ion-3/mod_tiling/tiling.c 2009-05-26 19:09:15.437994900 +0200 ++++ new-ion-3/mod_tiling/tiling.c 2009-05-26 19:09:24.609635100 +0200 +@@ -158,7 +158,7 @@ + + void tiling_fallback_focus(WTiling *ws, bool warp) + { +- region_finalise_focusing((WRegion*)ws, ws->dummywin, warp); ++ region_finalise_focusing((WRegion*)ws, ws->dummywin, warp, CurrentTime); + } + + + diff --git a/debian/patches/102_undo-typo.diff b/debian/patches/102_undo-typo.diff new file mode 100644 index 0000000..fd92265 --- /dev/null +++ b/debian/patches/102_undo-typo.diff @@ -0,0 +1,8 @@ +--- ion3.orig/config.h ++++ ion3/config.h +@@ -1,4 +1,4 @@ +-asdf/* ++/* + * config.h + * + * Copyright (c) Tuomo Valkonen 1999-2009. diff --git a/debian/patches/103_append-changelog.diff b/debian/patches/103_append-changelog.diff new file mode 100644 index 0000000..4fa614c --- /dev/null +++ b/debian/patches/103_append-changelog.diff @@ -0,0 +1,17 @@ +ChangeLog entries from top of ion-3-20090526.diff + +--- ion3.orig/ChangeLog ++++ ion3/ChangeLog +@@ -1,3 +1,12 @@ ++2009-03-02 09:30 UTC Tuomo Valkonen ++ * Don't symlink look.lua, but rather dopath from within ++ ++2009-03-02 09:09 UTC Tuomo Valkonen ++ * Fix frame_clear_shape ++ ++2009-02-08 22:37 UTC Tuomo Valkonen ++ * WM_TAKE_FOCUS tune ++ + 2009-01-09 22:19 UTC Tuomo Valkonen + tagged ion-3-20090110 + diff --git a/debian/patches/series b/debian/patches/series index 6de1150..f3bc9ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,6 @@ +101_ion-3-20090526.diff +102_undo-typo.diff +103_append-changelog.diff 201_build-config.diff 205_ion-lock.diff 206_use-x-terminal-emulator.diff