From: Ben Hutchings Date: Thu, 7 Feb 2008 21:14:32 +0000 (+0000) Subject: Updated patches for version 3-20080207. X-Git-Tag: 20080207-1~3 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=60d70001f8c7d01830ab745b2bc94b5f67be2756;p=ion3.git Updated patches for version 3-20080207. --- diff --git a/debian/patches/105_dockapp-class-from-hint-window.diff b/debian/patches/105_dockapp-class-from-hint-window.diff deleted file mode 100644 index eac4f2d..0000000 --- a/debian/patches/105_dockapp-class-from-hint-window.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ion3.orig/ioncore/clientwin.c -+++ ion3/ioncore/clientwin.c -@@ -509,13 +509,13 @@ - xwindow_unmanaged_selectinput(win, 0); - xwindow_unmanaged_selectinput(icon_win, StructureNotifyMask); - -- win=icon_win; -- attr=icon_attr; -- - /* Copy WM_CLASS as _ION_DOCKAPP_HACK */ - - p=xwindow_get_text_property(win, XA_WM_CLASS, &n); - -+ win=icon_win; -+ attr=icon_attr; -+ - if(p!=NULL){ - xwindow_set_text_property(icon_win, ioncore_g.atom_dockapp_hack, - (const char **)p, n); diff --git a/debian/patches/201_build-config.diff b/debian/patches/201_build-config.diff index c58cdf2..b8046d0 100755 --- a/debian/patches/201_build-config.diff +++ b/debian/patches/201_build-config.diff @@ -32,7 +32,7 @@ # For ion-completeman system-wide cache VARDIR=/var/cache/ion3 # Message catalogs -@@ -59,18 +59,18 @@ +@@ -62,18 +62,18 @@ # If you have installed Lua 5.1 from the official tarball without changing # paths, this should do it. @@ -60,7 +60,7 @@ ## -@@ -124,7 +124,7 @@ +@@ -127,7 +127,7 @@ # You may uncomment this if you know that your system C libary provides # asprintf and vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not # defined, an implementation provided in libtu/sprintf_2.2/ is used. @@ -69,7 +69,7 @@ # The following setting is needed with GNU libc for clock_gettime and the # monotonic clock. Other systems may not need it, or may not provide a -@@ -163,14 +163,14 @@ +@@ -169,14 +169,14 @@ #C89_SOURCE=-ansi @@ -87,14 +87,3 @@ # The -DCF_HAS_VA_COPY option should allow for some optimisations, and # in some cases simply defining ---- ion3.orig/utils/ion-statusd/Makefile -+++ ion3/utils/ion-statusd/Makefile -@@ -15,7 +15,7 @@ - DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \ - -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \ - -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \ -- -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\" -+# -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\" - - SOURCES = ion-statusd.c exec.c extlrx.c - diff --git a/debian/patches/209_use-etc-default.diff b/debian/patches/209_use-etc-default.diff index 6092eac..cce1b62 100755 --- a/debian/patches/209_use-etc-default.diff +++ b/debian/patches/209_use-etc-default.diff @@ -1,6 +1,6 @@ --- ion3.orig/etc/cfg_ion.lua +++ ion3/etc/cfg_ion.lua -@@ -9,6 +9,8 @@ +@@ -16,6 +16,8 @@ -- Set default modifiers. Alt should usually be mapped to Mod1 on -- XFree86-based systems. The flying window keys are probably Mod3 -- or Mod4; see the output of 'xmodmap'. diff --git a/debian/patches/series b/debian/patches/series index 9eef447..6de1150 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -105_dockapp-class-from-hint-window.diff 201_build-config.diff 205_ion-lock.diff 206_use-x-terminal-emulator.diff