From faf845e0eeac8695e2e3e09f03fc07ebcb107d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Glo=DFner?= Date: Thu, 12 Jan 2006 18:03:50 +0000 Subject: [PATCH] Upgraded wmii to 2.5. --- wmii/.footprint | 90 +++++++++++---------------------------------- wmii/.md5sum | 4 +- wmii/Pkgfile | 14 +++---- wmii/README | 19 ++++++++++ wmii/wmii-2.5.patch | 15 ++++++++ wmii/wmii-2.patch | 38 ------------------- 6 files changed, 63 insertions(+), 117 deletions(-) create mode 100644 wmii/README create mode 100644 wmii/wmii-2.5.patch delete mode 100644 wmii/wmii-2.patch diff --git a/wmii/.footprint b/wmii/.footprint index ec987280c..0c74fadf4 100644 --- a/wmii/.footprint +++ b/wmii/.footprint @@ -1,76 +1,28 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/wmibar --rwxr-xr-x root/root usr/bin/wmifs -rwxr-xr-x root/root usr/bin/wmii +-rwxr-xr-x root/root usr/bin/wmiibar +-rwxr-xr-x root/root usr/bin/wmiifs +-rwxr-xr-x root/root usr/bin/wmiikeys +-rwxr-xr-x root/root usr/bin/wmiimenu +-rwxr-xr-x root/root usr/bin/wmiiplumb +-rwxr-xr-x root/root usr/bin/wmiir +-rwxr-xr-x root/root usr/bin/wmiiwarp -rwxr-xr-x root/root usr/bin/wmiiwm --rwxr-xr-x root/root usr/bin/wmikeys --rwxr-xr-x root/root usr/bin/wmimenu --rwxr-xr-x root/root usr/bin/wmiplumb --rwxr-xr-x root/root usr/bin/wmir --rwxr-xr-x root/root usr/bin/wmira --rwxr-xr-x root/root usr/bin/wmirefcard --rwxr-xr-x root/root usr/bin/wmiwarp drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/wmii/ -drwxr-xr-x root/root usr/etc/wmii/action/ --rwxr-xr-x root/root usr/etc/wmii/action/actions --rwxr-xr-x root/root usr/etc/wmii/action/attach --rwxr-xr-x root/root usr/etc/wmii/action/border --rwxr-xr-x root/root usr/etc/wmii/action/clientupdate --rwxr-xr-x root/root usr/etc/wmii/action/close --rwxr-xr-x root/root usr/etc/wmii/action/cnext --rwxr-xr-x root/root usr/etc/wmii/action/cprev --rwxr-xr-x root/root usr/etc/wmii/action/detach --rwxr-xr-x root/root usr/etc/wmii/action/fnext --rwxr-xr-x root/root usr/etc/wmii/action/fprev --rwxr-xr-x root/root usr/etc/wmii/action/fresize --rwxr-xr-x root/root usr/etc/wmii/action/ftoggle --rwxr-xr-x root/root usr/etc/wmii/action/icons --rwxr-xr-x root/root usr/etc/wmii/action/kbare --rwxr-xr-x root/root usr/etc/wmii/action/kmove --rwxr-xr-x root/root usr/etc/wmii/action/knorm --rwxr-xr-x root/root usr/etc/wmii/action/kresize --rwxr-xr-x root/root usr/etc/wmii/action/lfloat --rwxr-xr-x root/root usr/etc/wmii/action/lgrid --rwxr-xr-x root/root usr/etc/wmii/action/lmax --rwxr-xr-x root/root usr/etc/wmii/action/lock --rwxr-xr-x root/root usr/etc/wmii/action/ltiled --rwxr-xr-x root/root usr/etc/wmii/action/lvsplit --rwxr-xr-x root/root usr/etc/wmii/action/max --rwxr-xr-x root/root usr/etc/wmii/action/mouse --rwxr-xr-x root/root usr/etc/wmii/action/p --rwxr-xr-x root/root usr/etc/wmii/action/pager --rwxr-xr-x root/root usr/etc/wmii/action/pageupdate --rwxr-xr-x root/root usr/etc/wmii/action/plumbgoogle --rwxr-xr-x root/root usr/etc/wmii/action/plumburl --rwxr-xr-x root/root usr/etc/wmii/action/pnew --rwxr-xr-x root/root usr/etc/wmii/action/pnext --rwxr-xr-x root/root usr/etc/wmii/action/pprev --rwxr-xr-x root/root usr/etc/wmii/action/premove --rwxr-xr-x root/root usr/etc/wmii/action/presize --rwxr-xr-x root/root usr/etc/wmii/action/programs --rwxr-xr-x root/root usr/etc/wmii/action/ptoggle --rwxr-xr-x root/root usr/etc/wmii/action/quit --rwxr-xr-x root/root usr/etc/wmii/action/scr --rwxr-xr-x root/root usr/etc/wmii/action/tab --rwxr-xr-x root/root usr/etc/wmii/action/term --rwxr-xr-x root/root usr/etc/wmii/action/www --rwxr-xr-x root/root usr/etc/wmii/action/zoom --rw-r--r-- root/root usr/etc/wmii/bar --rw-r--r-- root/root usr/etc/wmii/keys --rw-r--r-- root/root usr/etc/wmii/menu --rwxr-xr-x root/root usr/etc/wmii/rc --rw-r--r-- root/root usr/etc/wmii/rc.conf --rwxr-xr-x root/root usr/etc/wmii/status.sh --rw-r--r-- root/root usr/etc/wmii/wm +drwxr-xr-x root/root usr/etc/wmii-2.5/ +-rwxr-xr-x root/root usr/etc/wmii-2.5/extern +-rwxr-xr-x root/root usr/etc/wmii-2.5/kmode +-rwxr-xr-x root/root usr/etc/wmii-2.5/quit +-rwxr-xr-x root/root usr/etc/wmii-2.5/status +-rwxr-xr-x root/root usr/etc/wmii-2.5/welcome +-rwxr-xr-x root/root usr/etc/wmii-2.5/wmiirc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/wmibar.1.gz --rw-r--r-- root/root usr/man/man1/wmifs.1.gz --rw-r--r-- root/root usr/man/man1/wmii.1.gz --rw-r--r-- root/root usr/man/man1/wmikeys.1.gz --rw-r--r-- root/root usr/man/man1/wmimenu.1.gz --rw-r--r-- root/root usr/man/man1/wmir.1.gz -drwxr-xr-x root/root usr/man/man5/ --rw-r--r-- root/root usr/man/man5/wmii.rc.5.gz +-r--r--r-- root/root usr/man/man1/wmii.1.gz +-r--r--r-- root/root usr/man/man1/wmiibar.1.gz +-r--r--r-- root/root usr/man/man1/wmiifs.1.gz +-r--r--r-- root/root usr/man/man1/wmiikeys.1.gz +-r--r--r-- root/root usr/man/man1/wmiimenu.1.gz +-r--r--r-- root/root usr/man/man1/wmiir.1.gz +-r--r--r-- root/root usr/man/man1/wmiiwm.1.gz diff --git a/wmii/.md5sum b/wmii/.md5sum index 0d89a16dd..540ad079a 100644 --- a/wmii/.md5sum +++ b/wmii/.md5sum @@ -1,2 +1,2 @@ -da1357ab780930cefe5daf675be5851a wmii-2.patch -e03379bb991260f11aab7f7c4d761dd3 wmii-2.tar.gz +847e449f4afe14a26e997c29fe4c4d58 wmii-2.5.patch +c8815f468d462ab23494deb1d16ee023 wmii-2.5.tar.gz diff --git a/wmii/Pkgfile b/wmii/Pkgfile index 921c171cc..128a6b442 100644 --- a/wmii/Pkgfile +++ b/wmii/Pkgfile @@ -1,9 +1,10 @@ # Description: The next generation of WMI # URL: http://wmii.de/ # Maintainer: Simon Gloßner, viper at hometux dot de +# Depends on: 9base name=wmii -version=2 +version=2.5 release=2 source=(http://wmii.de/download/$name-$version.tar.gz $name-$version.patch) @@ -13,12 +14,9 @@ build() { # disable annoying mouse warping patch -p1 < ../$name-$version.patch - make \ - PREFIX=/usr \ - MANPREFIX=/usr/man \ - DESTDIR=$PKG install - - chmod 644 $PKG/usr/man/man?/* + sed -i 's|^PREFIX.*|PREFIX=/usr|' config.mk + sed -i 's|^MANPREFIX.*|MANPREFIX=/usr/man|' config.mk + sed -i 's|^9PREFIX.*|9PREFIX=/usr/share/9base|' config.mk - rm -r $PKG/usr/share/ + make DESTDIR=$PKG clean install } diff --git a/wmii/README b/wmii/README new file mode 100644 index 000000000..dfb395d5c --- /dev/null +++ b/wmii/README @@ -0,0 +1,19 @@ + +REQUIREMENTS + + The wmii configuration scripts now rely on the 9base package which + contains ports of various Plan 9 standard tools, in particular the + rc shell. I've created a port of it. + +PRE-INSTALL + +POST-INSTALL + +PRECAUTION + + The developer of wmii changed the configuration format again. You + have to manually convert your old configuration to use it in this + new version. The configuration paths also have been changed. + + ~/.wmii-2.5 + /etc/wmii-2.5 diff --git a/wmii/wmii-2.5.patch b/wmii/wmii-2.5.patch new file mode 100644 index 000000000..110ee248e --- /dev/null +++ b/wmii/wmii-2.5.patch @@ -0,0 +1,15 @@ +*** wmii-2.5/cmd/wm/page.c 2006-01-12 18:44:44.000000000 +0100 +--- wmii-2.5/cmd/wm/page.c 2006-01-12 18:44:58.000000000 +0100 +*************** +*** 273,282 **** + XTranslateCoordinates(dpy, f->win, root, wex, wey, &ex, &ey, &dummy); + if (blitz_ispointinrect(ex, ey, r)) + return; +- /* suppress EnterNotify's while mouse warping */ +- XSync(dpy, False); +- XWarpPointer(dpy, None, f->win, 0, 0, 0, 0, r->width / 2, r->height / 2); +- XSync(dpy, True); + } + + static void +--- 273,278 ---- diff --git a/wmii/wmii-2.patch b/wmii/wmii-2.patch deleted file mode 100644 index 5f9e73043..000000000 --- a/wmii/wmii-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -*** wmii-2/base/page.c 2005-07-31 00:14:00.000000000 +0200 ---- wmii-2/base/page.c 2005-09-10 18:46:16.000000000 +0200 -*************** -*** 287,295 **** - focus_frame(f, 1, 1, 1); - /* suppress all EnterNotifs */ - XSelectInput(dpy, root, ROOT_MASK & ~StructureNotifyMask); -- XWarpPointer(dpy, None, f->win, 0, 0, 0, 0, -- atoi(f->files[F_BORDER_W]->content), -- atoi(f->files[F_BORDER_W]->content)); - XSelectInput(dpy, root, ROOT_MASK); - if(old) - draw_frame(old); ---- 287,292 ---- -*************** -*** 460,468 **** - focus_frame(f, 1, 0, 1); - if(is_managed_frame(f) && p->layout) - p->layout->manage(f); -- XWarpPointer(dpy, None, f->win, 0, 0, 0, 0, -- atoi(f->files[F_BORDER_W]->content), -- atoi(f->files[F_BORDER_W]->content)); - XSelectInput(dpy, root, ROOT_MASK); - if(old) - draw_frame(old); ---- 457,462 ---- -*************** -*** 504,512 **** - fr = get_selected(p); - if(fr) { - XSelectInput(dpy, root, ROOT_MASK & ~StructureNotifyMask); -- XWarpPointer(dpy, None, fr->win, 0, 0, 0, 0, -- atoi(fr->files[F_BORDER_W]->content), -- atoi(fr->files[F_BORDER_W]->content)); - XSelectInput(dpy, root, ROOT_MASK); - draw_frame(fr); - } ---- 498,503 ----