From 8497fea0105af19a9b8e2c307b56d7115fa9e4c2 Mon Sep 17 00:00:00 2001 From: Mikhail Kolesnik Date: Sun, 30 Jan 2011 02:21:37 +0200 Subject: [PATCH] windowmaker: remove together with some old dockapps --- windowmaker-extra/.footprint | 83 -- windowmaker-extra/.md5sum | 1 - windowmaker-extra/Pkgfile | 20 - windowmaker/.footprint | 265 ---- windowmaker/.md5sum | 2 - windowmaker/Pkgfile | 29 - windowmaker/windowmaker-0.92.0-gcc4.patch | 141 -- wmakerconf/.footprint | 36 - wmakerconf/.md5sum | 1 - wmakerconf/Pkgfile | 20 - wmclock/.footprint | 6 - wmclock/.md5sum | 4 - wmclock/Pkgfile | 21 - wmclock/wmclock-fix_year_display.diff | 34 - wmclock/wmclock-manpage.diff | 22 - wmclock/wmclock-nopolling.diff | 77 -- wmdiscotux/.footprint | 5 - wmdiscotux/.md5sum | 2 - wmdiscotux/Pkgfile | 17 - wmdiscotux/wmdiscotux-1.3.patch | 43 - wmint/.footprint | 3 - wmint/.md5sum | 2 - wmint/Pkgfile | 20 - wmint/wmint-sleep.diff | 53 - wmlaptop/.footprint | 3 - wmlaptop/.md5sum | 3 - wmlaptop/Pkgfile | 19 - wmlaptop/README | 17 - wmlaptop/wmlaptop-makefile.diff | 40 - wmlaptop/wmlaptop-ondemand.diff | 1517 --------------------- wmthrottle/.footprint | 6 - wmthrottle/.md5sum | 1 - wmthrottle/Pkgfile | 20 - wmthrottle/README | 13 - wmwifi/.footprint | 3 - wmwifi/.md5sum | 1 - wmwifi/Pkgfile | 17 - 37 files changed, 2567 deletions(-) delete mode 100644 windowmaker-extra/.footprint delete mode 100644 windowmaker-extra/.md5sum delete mode 100644 windowmaker-extra/Pkgfile delete mode 100644 windowmaker/.footprint delete mode 100644 windowmaker/.md5sum delete mode 100644 windowmaker/Pkgfile delete mode 100644 windowmaker/windowmaker-0.92.0-gcc4.patch delete mode 100644 wmakerconf/.footprint delete mode 100644 wmakerconf/.md5sum delete mode 100644 wmakerconf/Pkgfile delete mode 100644 wmclock/.footprint delete mode 100644 wmclock/.md5sum delete mode 100644 wmclock/Pkgfile delete mode 100644 wmclock/wmclock-fix_year_display.diff delete mode 100644 wmclock/wmclock-manpage.diff delete mode 100644 wmclock/wmclock-nopolling.diff delete mode 100644 wmdiscotux/.footprint delete mode 100644 wmdiscotux/.md5sum delete mode 100644 wmdiscotux/Pkgfile delete mode 100644 wmdiscotux/wmdiscotux-1.3.patch delete mode 100644 wmint/.footprint delete mode 100644 wmint/.md5sum delete mode 100644 wmint/Pkgfile delete mode 100644 wmint/wmint-sleep.diff delete mode 100644 wmlaptop/.footprint delete mode 100644 wmlaptop/.md5sum delete mode 100644 wmlaptop/Pkgfile delete mode 100644 wmlaptop/README delete mode 100644 wmlaptop/wmlaptop-makefile.diff delete mode 100644 wmlaptop/wmlaptop-ondemand.diff delete mode 100644 wmthrottle/.footprint delete mode 100644 wmthrottle/.md5sum delete mode 100644 wmthrottle/Pkgfile delete mode 100644 wmthrottle/README delete mode 100644 wmwifi/.footprint delete mode 100644 wmwifi/.md5sum delete mode 100644 wmwifi/Pkgfile diff --git a/windowmaker-extra/.footprint b/windowmaker-extra/.footprint deleted file mode 100644 index bd96c4b03..000000000 --- a/windowmaker-extra/.footprint +++ /dev/null @@ -1,83 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/WindowMaker/ -drwxr-xr-x root/root usr/share/WindowMaker/Icons/ --rw-r--r-- root/root usr/share/WindowMaker/Icons/Ant.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Antennae.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Bee48x48.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Beer.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Bird.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Book.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Bookshelf.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Brain.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/BulletHole.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/CashRegister.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Clipboard.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Cola.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/ColorGNU.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Correspondence.dir.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/CrystalSkull.dir.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Daemon.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Detergent.dir.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/DoomII.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Draw.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/EscherCube.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/EscherTriangle.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Fish5.dir.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Football.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/FootballUS.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Gear.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Ghost.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/HP-16C-48.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/HandOpen.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/HandPointing.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/HandPointingLeft.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/HandPunch.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/HandReach.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/HeroSandwich.dir.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/LadyBug48x48.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Microphone.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Netscape.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/NewsAgent.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/PDF.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Padlock.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Paint.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Pencils.24.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Penguin.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Radio.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Reference.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Rumi.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Snail.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/T2-Film.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/TagIcon.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/TapeIcon1.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/TrueDie48.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/WheelbarrowFull.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/WordEditor.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/Wrench-12bit.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/bomb2.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/inspect.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/monitor.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/paint.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/tile.black.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/tile.snow.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/tile.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/tile2.xpm -drwxr-xr-x root/root usr/share/WindowMaker/Themes/ -drwxr-xr-x root/root usr/share/WindowMaker/Themes/Checker.themed/ --rw-r--r-- root/root usr/share/WindowMaker/Themes/Checker.themed/checker.xpm --rw-r--r-- root/root usr/share/WindowMaker/Themes/Checker.themed/style -drwxr-xr-x root/root usr/share/WindowMaker/Themes/LeetWM.themed/ --rw-r--r-- root/root usr/share/WindowMaker/Themes/LeetWM.themed/LeetWM.jpg --rw-r--r-- root/root usr/share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb1.jpg --rw-r--r-- root/root usr/share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb2.jpg --rw-r--r-- root/root usr/share/WindowMaker/Themes/LeetWM.themed/LeetWMTile1.jpg --rw-r--r-- root/root usr/share/WindowMaker/Themes/LeetWM.themed/LeetWMtb1.jpg --rw-r--r-- root/root usr/share/WindowMaker/Themes/LeetWM.themed/LeetWMtb2.jpg --rw-r--r-- root/root usr/share/WindowMaker/Themes/LeetWM.themed/style -drwxr-xr-x root/root usr/share/WindowMaker/Themes/Night.themed/ --rw-r--r-- root/root usr/share/WindowMaker/Themes/Night.themed/SeaNight.jpeg --rw-r--r-- root/root usr/share/WindowMaker/Themes/Night.themed/style -drwxr-xr-x root/root usr/share/WindowMaker/Themes/STEP2000.themed/ --rw-r--r-- root/root usr/share/WindowMaker/Themes/STEP2000.themed/BlueImage2.jpeg --rw-r--r-- root/root usr/share/WindowMaker/Themes/STEP2000.themed/style diff --git a/windowmaker-extra/.md5sum b/windowmaker-extra/.md5sum deleted file mode 100644 index 6b170e22c..000000000 --- a/windowmaker-extra/.md5sum +++ /dev/null @@ -1 +0,0 @@ -07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz diff --git a/windowmaker-extra/Pkgfile b/windowmaker-extra/Pkgfile deleted file mode 100644 index 7affc1bcb..000000000 --- a/windowmaker-extra/Pkgfile +++ /dev/null @@ -1,20 +0,0 @@ -# Description: Few extra themes and icons for Window Maker -# URL: http://www.windowmaker.info -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Packager: Vincenzo Colosimo, vico at bicisport dot de -# Depends on: windowmaker - -name=windowmaker-extra -version=0.1 -release=2 -source=(http://www.windowmaker.info/pub/source/release/WindowMaker-extra-$version.tar.gz) - -build() { - cd WindowMaker-extra-$version - - ./configure --prefix=/usr \ - --disable-nls - make - make DESTDIR=$PKG install - rm -f $PKG/usr/share/WindowMaker/Icons/xv.xpm -} diff --git a/windowmaker/.footprint b/windowmaker/.footprint deleted file mode 100644 index cbbec9432..000000000 --- a/windowmaker/.footprint +++ /dev/null @@ -1,265 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/GNUstep/ -drwxr-xr-x root/root usr/GNUstep/Applications/ -lrwxrwxrwx root/root usr/GNUstep/Applications/WPrefs.app -> ../../share/WPrefs -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/WPrefs --rwxr-xr-x root/root usr/bin/convertfonts --rwxr-xr-x root/root usr/bin/get-wings-flags --rwxr-xr-x root/root usr/bin/get-wraster-flags --rwxr-xr-x root/root usr/bin/get-wutil-flags --rwxr-xr-x root/root usr/bin/geticonset --rwxr-xr-x root/root usr/bin/getstyle --rwxr-xr-x root/root usr/bin/seticons --rwxr-xr-x root/root usr/bin/setstyle --rwxr-xr-x root/root usr/bin/wdread --rwxr-xr-x root/root usr/bin/wdwrite --rwxr-xr-x root/root usr/bin/wkdemenu.pl --rwxr-xr-x root/root usr/bin/wmagnify --rwxr-xr-x root/root usr/bin/wmaker --rwxr-xr-x root/root usr/bin/wmaker.inst --rwxr-xr-x root/root usr/bin/wmsetbg --rwxr-xr-x root/root usr/bin/wmsetup --rwxr-xr-x root/root usr/bin/wxcopy --rwxr-xr-x root/root usr/bin/wxpaste -drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/WindowMaker/ --rw-r--r-- root/root usr/etc/WindowMaker/WMGLOBAL --rw-r--r-- root/root usr/etc/WindowMaker/WMRootMenu --rw-r--r-- root/root usr/etc/WindowMaker/WMState --rw-r--r-- root/root usr/etc/WindowMaker/WMWindowAttributes --rw-r--r-- root/root usr/etc/WindowMaker/WindowMaker -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/WINGs/ --rw-r--r-- root/root usr/include/WINGs/WINGs.h --rw-r--r-- root/root usr/include/WINGs/WINGsP.h --rw-r--r-- root/root usr/include/WINGs/WUtil.h --rw-r--r-- root/root usr/include/WINGs/proplist-compat.h --rw-r--r-- root/root usr/include/WINGs/wtabledelegates.h --rw-r--r-- root/root usr/include/WINGs/wtableview.h --rw-r--r-- root/root usr/include/WMaker.h --rw-r--r-- root/root usr/include/wraster.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libExtraWINGs.a --rw-r--r-- root/root usr/lib/libWINGs.a --rw-r--r-- root/root usr/lib/libWMaker.a --rw-r--r-- root/root usr/lib/libWUtil.a --rw-r--r-- root/root usr/lib/libwraster.a --rwxr-xr-x root/root usr/lib/libwraster.la -lrwxrwxrwx root/root usr/lib/libwraster.so -> libwraster.so.3.1.0 -lrwxrwxrwx root/root usr/lib/libwraster.so.3 -> libwraster.so.3.1.0 --rwxr-xr-x root/root usr/lib/libwraster.so.3.1.0 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/WINGs.pc --rw-r--r-- root/root usr/lib/pkgconfig/wmlib.pc --rw-r--r-- root/root usr/lib/pkgconfig/wrlib.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/geticonset.1x.gz --rw-r--r-- root/root usr/man/man1/getstyle.1x.gz --rw-r--r-- root/root usr/man/man1/seticons.1x.gz --rw-r--r-- root/root usr/man/man1/setstyle.1x.gz --rw-r--r-- root/root usr/man/man1/wdwrite.1x.gz --rw-r--r-- root/root usr/man/man1/wmaker.1x.gz --rw-r--r-- root/root usr/man/man1/wmsetbg.1x.gz --rw-r--r-- root/root usr/man/man1/wxcopy.1x.gz --rw-r--r-- root/root usr/man/man1/wxpaste.1x.gz -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/WINGs/ --rw-r--r-- root/root usr/share/WINGs/Images.tiff --rw-r--r-- root/root usr/share/WINGs/Images.xpm --rw-r--r-- root/root usr/share/WINGs/defaultIcon.tiff --rw-r--r-- root/root usr/share/WINGs/defaultIcon.xpm -drwxr-xr-x root/root usr/share/WPrefs/ --rw-r--r-- root/root usr/share/WPrefs/WPrefs.tiff --rw-r--r-- root/root usr/share/WPrefs/WPrefs.xpm -drwxr-xr-x root/root usr/share/WPrefs/tiff/ --rw-r--r-- root/root usr/share/WPrefs/tiff/advancetonewworkspace.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/animations.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/appearance.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/clip.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/configs.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/cycleworkspaces.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/dock.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/dontlinkworkspaces.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/ergonomic.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/expert.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/fonts.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/iconprefs.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/keyboard.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/keyboardprefs.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/keyshortcuts.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/menualign1.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/menualign2.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/menuprefs.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/menus.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/moreanim.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/mousesettings.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/mousespeed.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/msty1.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/msty2.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/msty3.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/newstyle.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/nonopaque.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/oldstyle.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/opaque.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/paths.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/smooth.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/sound.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed0.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed0s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed1.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed1s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed2.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed2s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed3.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed3s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed4.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/speed4s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/tdel.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/tedit.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/textr.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/theme.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer0.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer0s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer1.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer1s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer2.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer2s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer3.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer3s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer4.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer4s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer5.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/timer5s.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/tnew.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/whandling.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/windowfocus.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/workspace.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/workspacename.tiff --rw-r--r-- root/root usr/share/WPrefs/tiff/xis.tiff -drwxr-xr-x root/root usr/share/WPrefs/xpm/ -drwxr-xr-x root/root usr/share/WindowMaker/ -drwxr-xr-x root/root usr/share/WindowMaker/Backgrounds/ --rw-r--r-- root/root usr/share/WindowMaker/Backgrounds/BlueImage.jpeg -drwxr-xr-x root/root usr/share/WindowMaker/IconSets/ --rw-r--r-- root/root usr/share/WindowMaker/IconSets/Default.iconset -drwxr-xr-x root/root usr/share/WindowMaker/Icons/ --rw-r--r-- root/root usr/share/WindowMaker/Icons/BitchX.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/BitchX.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/DefaultAppIcon.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/Ftp.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUstep.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUstep.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUstep3D.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUstep3D.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUstepGlow.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUstepGlow.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUterm.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/GNUterm.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/GreenWilber.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/ICQ.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Jabber.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Mozilla.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Netscape.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Pen.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Pencil.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Real.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Shell.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Speaker.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/Terminal.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/Terminal.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/TerminalGNUstep.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/TerminalGNUstep.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/TerminalLinux.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/TerminalLinux.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/XChat.png --rw-r--r-- root/root usr/share/WindowMaker/Icons/clip.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/clip.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/defaultAppIcon.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/defaultAppIcon.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/defaultterm.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/defaultterm.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/draw.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/draw.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/linuxterm.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/linuxterm.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/mixer.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/mixer.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/notepad.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/notepad.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/pdf.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/pdf.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/ps.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/ps.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/real.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/real.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/sgiterm.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/sgiterm.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/sound.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/sound.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/staroffice2.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/staroffice2.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/timer.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/timer.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/wilber.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/wilber.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/write.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/write.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/xdvi.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/xdvi.xpm --rw-r--r-- root/root usr/share/WindowMaker/Icons/xv.tiff --rw-r--r-- root/root usr/share/WindowMaker/Icons/xv.xpm -drwxr-xr-x root/root usr/share/WindowMaker/Pixmaps/ --rw-r--r-- root/root usr/share/WindowMaker/Pixmaps/swback.png --rw-r--r-- root/root usr/share/WindowMaker/Pixmaps/swback2.png --rw-r--r-- root/root usr/share/WindowMaker/Pixmaps/swtile.png --rw-r--r-- root/root usr/share/WindowMaker/Pixmaps/tile.tiff --rw-r--r-- root/root usr/share/WindowMaker/Pixmaps/tile.xpm -drwxr-xr-x root/root usr/share/WindowMaker/Styles/ --rw-r--r-- root/root usr/share/WindowMaker/Styles/Autumn.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Black.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/BlackTexture.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Blue.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/BlueDawn.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/BlueishGreen.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Brown.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Brownish.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Chumbo.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Copper.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/DarkBlue.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/DarkRed.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Emerald.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Fire.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Food.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Golden.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Green.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/GreyBlue.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Gtk.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/IRednBlue.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Interlace.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/LightBlue.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/NewBlue.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/NightSky.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Pastel.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Pink.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Pumpkin.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Purple.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Purplish.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Red.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/RednBlue.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Spring.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Summer.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/Traditional.style --rw-r--r-- root/root usr/share/WindowMaker/Styles/VioletBlue.style -drwxr-xr-x root/root usr/share/WindowMaker/Themes/ --rw-r--r-- root/root usr/share/WindowMaker/Themes/Default.style --rw-r--r-- root/root usr/share/WindowMaker/Themes/OpenStep.style --rw-r--r-- root/root usr/share/WindowMaker/Themes/Pastel.style --rw-r--r-- root/root usr/share/WindowMaker/Themes/SteelBlueSilk.style --rw-r--r-- root/root usr/share/WindowMaker/autostart.sh --rw-r--r-- root/root usr/share/WindowMaker/exitscript.sh --rw-r--r-- root/root usr/share/WindowMaker/menu --rw-r--r-- root/root usr/share/WindowMaker/plmenu --rw-r--r-- root/root usr/share/WindowMaker/wmmacros --rw-r--r-- root/root usr/share/WindowMaker/xtree.dat diff --git a/windowmaker/.md5sum b/windowmaker/.md5sum deleted file mode 100644 index 666d9a51d..000000000 --- a/windowmaker/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -aaac5421b686ed2d3e6ab65229c98097 WindowMaker-0.92.0.tar.bz2 -68d8e1b36c5cf4122c754a68d044b9cb windowmaker-0.92.0-gcc4.patch diff --git a/windowmaker/Pkgfile b/windowmaker/Pkgfile deleted file mode 100644 index 796d49151..000000000 --- a/windowmaker/Pkgfile +++ /dev/null @@ -1,29 +0,0 @@ -# Description: An X11 window manager with a NEXTSTEP look and feel -# URL: http://www.windowmaker.info/ -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Packager: Per Liden -# Depends on: xorg-libxft libtiff libungif - -name=windowmaker -version=0.92.0 -release=4 -source=(http://windowmaker.info/pub/source/release/WindowMaker-$version.tar.bz2 \ - $name-$version-gcc4.patch) - -build() { - cd WindowMaker-$version - patch -p0 -i $SRC/$name-$version-gcc4.patch - aclocal - autoheader - autoconf - libtoolize --force --automake - automake -a --gnu --include-deps - ./configure --prefix=/usr --mandir=/usr/man - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/WindowMaker/{README*,menu.*,plmenu.*} \ - $PKG/usr/lib/locale $PKG/usr/man/sk $PKG/usr/bin/wm-oldmenu2new - # Bugfix for WPrefs - mkdir -p $PKG/usr/GNUstep/Applications - ln -sf ../../share/WPrefs $PKG/usr/GNUstep/Applications/WPrefs.app -} diff --git a/windowmaker/windowmaker-0.92.0-gcc4.patch b/windowmaker/windowmaker-0.92.0-gcc4.patch deleted file mode 100644 index 6001a08ee..000000000 --- a/windowmaker/windowmaker-0.92.0-gcc4.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -197,7 +197,7 @@ - - AC_CACHE_CHECK(whether gcc supports x86 inline asm, - ac_cv_c_inline_asm, -- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n":: -+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal":: - "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x), - "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}], - ac_cv_c_inline_asm=yes, ---- wrlib/x86_specific.c -+++ wrlib/x86_specific.c -@@ -98,15 +98,23 @@ - int height, - int line_offset) - { -- long long rrggbbaa; -- long long pixel; -+ union { -+ long long rrggbbaa; -+ struct {short int rr, gg, bb, aa;} words; -+ } rrggbbaa; -+ -+ union { -+ long long pixel; -+ struct {short int rr, gg, bb, aa;} words; -+ } pixel; -+ - short *tmp_err; - short *tmp_nerr; - int x; - - asm volatile - ( -- "pushal \n\t" -+ "pushl %%ebx \n\t" - - // pack dr, dg and db into mm6 - "movl %7, %%eax \n\t" -@@ -290,7 +298,7 @@ - - ".Enda: \n\t" // THE END - "emms \n\t" -- "popal \n\t" -+ "popl %%ebx \n\t" - : - : - "m" (image), // %0 -@@ -309,17 +317,18 @@ - "m" (width), // %13 - "m" (height), // %14 - "m" (line_offset), // %15 -- "m" (rrggbbaa), // %16 (access to rr) -- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) -- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) -- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) -- "m" (pixel), // %20 (access to pixel.r) -- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) -- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) -- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) -+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr) -+ "m" (rrggbbaa.words.gg), // %17 (access to gg) -+ "m" (rrggbbaa.words.bb), // %18 (access to bb) -+ "m" (rrggbbaa.words.aa), // %19 (access to aa) -+ "m" (pixel.pixel), // %20 (access to pixel.r) -+ "m" (pixel.words.gg), // %21 (access to pixel.g) -+ "m" (pixel.words.bb), // %22 (access to pixel.b) -+ "m" (pixel.words.aa), // %23 (access to pixel.a) - "m" (tmp_err), // %24 - "m" (tmp_nerr), // %25 - "m" (x) // %26 -+ : "eax", "ecx", "edx", "esi", "edi" - ); - } - -@@ -342,8 +351,15 @@ - int height, - int line_offset) - { -- long long rrggbbaa; -- long long pixel; -+ union { -+ long long rrggbbaa; -+ struct {short int rr, gg, bb, aa;} words; -+ } rrggbbaa; -+ -+ union { -+ long long pixel; -+ struct {short int rr, gg, bb, aa;} words; -+ } pixel; - - short *tmp_err; - short *tmp_nerr; -@@ -354,7 +370,7 @@ - - asm volatile - ( -- "pushal \n\t" -+ "pushl %%ebx \n\t" - - "movl %13, %%eax \n\t" // eax = width - "movl %%eax, %%ebx \n\t" -@@ -424,7 +440,7 @@ - - ".Endc: \n\t" // THE END - "emms \n\t" -- "popal \n\t" -+ "popl %%ebx \n\t" - : - : - "m" (image), // %0 -@@ -443,19 +459,20 @@ - "m" (width), // %13 - "m" (height), // %14 - "m" (line_offset), // %15 -- "m" (rrggbbaa), // %16 (access to rr) -- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) -- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) -- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) -- "m" (pixel), // %20 (access to pixel.r) -- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) -- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) -- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) -+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr) -+ "m" (rrggbbaa.words.gg), // %17 (access to gg) -+ "m" (rrggbbaa.words.bb), // %18 (access to bb) -+ "m" (rrggbbaa.words.aa), // %19 (access to aa) -+ "m" (pixel.pixel), // %20 (access to pixel.r) -+ "m" (pixel.words.gg), // %21 (access to pixel.g) -+ "m" (pixel.words.bb), // %22 (access to pixel.b) -+ "m" (pixel.words.aa), // %23 (access to pixel.a) - "m" (tmp_err), // %24 - "m" (tmp_nerr), // %25 - "m" (x), // %26 - "m" (w1), // %27 - "m" (w2) // %28 -+ : "eax", "ecx", "edx", "esi", "edi" - ); - } - diff --git a/wmakerconf/.footprint b/wmakerconf/.footprint deleted file mode 100644 index 48a67bf5c..000000000 --- a/wmakerconf/.footprint +++ /dev/null @@ -1,36 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/mkpreview --rwxr-xr-x root/root usr/bin/wmakerconf -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/mkpreview.1.gz --rw-r--r-- root/root usr/man/man1/wmakerconf.1.gz -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/wmakerconf.desktop -drwxr-xr-x root/root usr/share/wmakerconf/ --rw-r--r-- root/root usr/share/wmakerconf/WMWmakerconf --rw-r--r-- root/root usr/share/wmakerconf/appearance.xpm --rw-r--r-- root/root usr/share/wmakerconf/black.xpm --rw-r--r-- root/root usr/share/wmakerconf/desktop.xpm --rw-r--r-- root/root usr/share/wmakerconf/effects.xpm --rwxr-xr-x root/root usr/share/wmakerconf/getfile.pl --rw-r--r-- root/root usr/share/wmakerconf/libwww.pl --rw-r--r-- root/root usr/share/wmakerconf/lynx.pl --rw-r--r-- root/root usr/share/wmakerconf/menu.xpm --rw-r--r-- root/root usr/share/wmakerconf/menustyle.xpm --rw-r--r-- root/root usr/share/wmakerconf/misc.xpm --rw-r--r-- root/root usr/share/wmakerconf/mouse.xpm --rw-r--r-- root/root usr/share/wmakerconf/paths.xpm --rw-r--r-- root/root usr/share/wmakerconf/shortcuts.xpm --rw-r--r-- root/root usr/share/wmakerconf/themes.xpm --rw-r--r-- root/root usr/share/wmakerconf/tiles.xpm --rw-r--r-- root/root usr/share/wmakerconf/titlebar.xpm --rwxr-xr-x root/root usr/share/wmakerconf/upgrade.pl --rw-r--r-- root/root usr/share/wmakerconf/wget.pl --rw-r--r-- root/root usr/share/wmakerconf/windows.xpm --rwxr-xr-x root/root usr/share/wmakerconf/wm-oldmenu2new.sh --rw-r--r-- root/root usr/share/wmakerconf/wmaker-version --rw-r--r-- root/root usr/share/wmakerconf/wmakerconf.xpm --rw-r--r-- root/root usr/share/wmakerconf/workspace.xpm diff --git a/wmakerconf/.md5sum b/wmakerconf/.md5sum deleted file mode 100644 index 462bee2eb..000000000 --- a/wmakerconf/.md5sum +++ /dev/null @@ -1 +0,0 @@ -252114b5ee5fc5bec99477497ee045cc wmakerconf_2.12.tar.gz diff --git a/wmakerconf/Pkgfile b/wmakerconf/Pkgfile deleted file mode 100644 index 5adef478f..000000000 --- a/wmakerconf/Pkgfile +++ /dev/null @@ -1,20 +0,0 @@ -# Description: Window Maker configuration tool -# URL: http://wmakerconf.sourceforge.net/ -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Packager: Olle Gustafsson, ogg at linux dot se -# Depends on: windowmaker - -name=wmakerconf -version=2.12 -release=2 -source=(http://download.sourceforge.net/$name/${name}_$version.tar.gz) - -build() { - cd $name-$version - ./configure --prefix=/usr \ - --disable-nls - make - make DESTDIR=$PKG install - rm $PKG/usr/share/wmakerconf/{ABOUT-NLS,AUTHORS,COPYING,ChangeLog} - rm $PKG/usr/share/wmakerconf/{NEWS,NLS-TEAM1,NLS-TEAM2,MANUAL,README} -} diff --git a/wmclock/.footprint b/wmclock/.footprint deleted file mode 100644 index 38e56df7c..000000000 --- a/wmclock/.footprint +++ /dev/null @@ -1,6 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/wmclock -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --r--r--r-- root/root usr/man/man1/wmclock.1x.gz diff --git a/wmclock/.md5sum b/wmclock/.md5sum deleted file mode 100644 index 7e0177c3d..000000000 --- a/wmclock/.md5sum +++ /dev/null @@ -1,4 +0,0 @@ -97f6e82f55f216ba724859d4652586b4 wmclock-1.0.12.2.tar.gz -0b6171a856c041fec0b2fc61d4bf2cc0 wmclock-fix_year_display.diff -682670891873386fec16c1d2219c374d wmclock-manpage.diff -ef26a885e3b2c75388560211e9d9b5c1 wmclock-nopolling.diff diff --git a/wmclock/Pkgfile b/wmclock/Pkgfile deleted file mode 100644 index 684178424..000000000 --- a/wmclock/Pkgfile +++ /dev/null @@ -1,21 +0,0 @@ -# Description: A Window Maker applet which displays date and time -# URL: http://www.jmknoble.net/WindowMaker/wmclock/ -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Packager: Simone Rota, sip at crux dot nu -# Depends on: xorg-gccmakedep, xorg-imake, xorg-libxpm - -name=wmclock -version=1.0.12.2 -release=3 -source=(http://www.dockapps.org/download.php/id/328/$name-$version.tar.gz \ - $name-nopolling.diff $name-fix_year_display.diff $name-manpage.diff) - -build() { - cd $name-$version - patch -p0 -i $SRC/$name-nopolling.diff - patch -p0 -i $SRC/$name-fix_year_display.diff - patch -p0 -i $SRC/$name-manpage.diff - ./configure --lang english - make - make DESTDIR=$PKG install install.man -} diff --git a/wmclock/wmclock-fix_year_display.diff b/wmclock/wmclock-fix_year_display.diff deleted file mode 100644 index 77a15766b..000000000 --- a/wmclock/wmclock-fix_year_display.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- wmclock.c-orig 2008-11-16 18:23:07.185633821 +0100 -+++ wmclock.c 2008-11-16 18:23:25.482650412 +0100 -@@ -828,7 +828,14 @@ - #endif /* !ONLY_SHAPED_WINDOW */ - for (i = 0; i < NUM_TIME_POSITIONS; i++) - { -- xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i]; -+ if (enable12HourClock && (!enableYearDisplay)) -+ { -+ xPos[i] += timePos24[i]; -+ } -+ else -+ { -+ xPos[i] += timePos12[i]; -+ } - } - - /* Open the display */ ---- wmclock.c-orig 2000-03-08 08:31:33.000000000 +0100 -+++ wmclock.c 2007-10-03 22:42:36.000000000 +0200 -@@ -470,11 +470,11 @@ - XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC, - digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT, - xPos[DIGIT_1_X_POS], yPos[DIGIT_Y_POS]); -- digitXOffset = LED_NUM_WIDTH * (year % 1000); -+ digitXOffset = LED_NUM_WIDTH * (year % 1000 / 100); - XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC, - digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT, - xPos[DIGIT_2_X_POS], yPos[DIGIT_Y_POS]); -- digitXOffset = LED_NUM_WIDTH * (year % 100); -+ digitXOffset = LED_NUM_WIDTH * (year % 100 / 10); - XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC, - digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT, - xPos[DIGIT_3_X_POS], yPos[DIGIT_Y_POS]); diff --git a/wmclock/wmclock-manpage.diff b/wmclock/wmclock-manpage.diff deleted file mode 100644 index e19ac01d5..000000000 --- a/wmclock/wmclock-manpage.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- wmclock.man.in-orig 2008-11-16 18:22:33.061623927 +0100 -+++ wmclock.man.in 2008-11-16 18:22:33.417626015 +0100 -@@ -25,9 +25,7 @@ - .TH wmclock 1x "@DATE@" "Version @VERSION@" - .\" ---------------------------------------------------------------- - .SH NAME --.PP --.BR wmclock : --a dockable clock for the Window Maker window manager -+wmclock \- A dockable clock for the Window Maker window manager - .\" ---------------------------------------------------------------- - .SH SYNOPSIS - .HP -@@ -196,7 +194,7 @@ - .\" ---------------------------------------------------------------- - .SH COPYRIGHT AND LICENSE - .PP --Copyright © 1999 by Jim Knoble . Significant -+Copyright \(co 1999 by Jim Knoble . Significant - portions of - .B wmclock - are directly derived from diff --git a/wmclock/wmclock-nopolling.diff b/wmclock/wmclock-nopolling.diff deleted file mode 100644 index a5a338f78..000000000 --- a/wmclock/wmclock-nopolling.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- wmclock.c.orig 2008-09-28 17:41:49.000000000 +0200 -+++ wmclock.c 2008-09-28 20:33:59.000000000 +0200 -@@ -20,6 +20,7 @@ - * with the software or the use or other dealings in the software. - */ - -+#include - #include - #include - #include -@@ -141,7 +142,8 @@ - Display *dpy; - Window rootWindow; - int screen; --/* int xFd; */ -+int xFd; -+fd_set xFdSet; - int displayDepth; - XSizeHints sizeHints; - XWMHints wmHints; -@@ -801,6 +803,7 @@ - XTextProperty wmName; - XClassHint classHint; - Pixmap shapeMask; -+ struct timeval nextEvent; - - /* Parse command line options */ - progName = extractProgName(argv[0]); -@@ -849,7 +852,7 @@ - screen = DefaultScreen(dpy); - rootWindow = RootWindow(dpy, screen); - displayDepth = DefaultDepth(dpy, screen); -- /* xFd = XConnectionNumber(dpy); */ -+ xFd = XConnectionNumber(dpy); - - /* Icon Daten nach XImage konvertieren */ - GetXpms(); -@@ -1049,14 +1052,32 @@ - poll((struct poll *) 0, (size_t) 0, 50); /* 5/100 sec */ - } - #else -- if (enableYearDisplay) -- { -- usleep(200000L); /* 1/5 sec */ -- } -+ //We compute the date of next event, in order to avoid polling -+ if (enableBlinking) -+ { -+ gettimeofday(&nextEvent,NULL); -+ nextEvent.tv_sec = 0; -+ nextEvent.tv_usec = 1000000-nextEvent.tv_usec; -+ } - else -- { -- usleep(50000L); /* 5/100 sec */ -- } -+ { -+ if (enableYearDisplay) -+ { -+ nextEvent.tv_sec = 86400-actualTime%86400; -+ nextEvent.tv_usec = 0; -+ } -+ else -+ { -+ nextEvent.tv_sec = 60-actualTime%60; -+ nextEvent.tv_usec = 0; -+ } -+ } -+ printf("xFd %d\n", xFd); -+ FD_ZERO(&xFdSet); -+ FD_SET(xFd,&xFdSet); -+ printf("debut select %d\n", nextEvent.tv_sec); -+ select(FD_SETSIZE,&xFdSet,NULL,NULL,&nextEvent); -+ printf("fin select\n"); - #endif - } - return(0); diff --git a/wmdiscotux/.footprint b/wmdiscotux/.footprint deleted file mode 100644 index 57e154f8c..000000000 --- a/wmdiscotux/.footprint +++ /dev/null @@ -1,5 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/xmms/ -drwxr-xr-x root/root usr/lib/xmms/Visualization/ --rwxr-xr-x root/root usr/lib/xmms/Visualization/libwmdiscotux.so diff --git a/wmdiscotux/.md5sum b/wmdiscotux/.md5sum deleted file mode 100644 index 491030709..000000000 --- a/wmdiscotux/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -0e3b8bd5d8974ab1892040c59ef77ca3 wmdiscotux-1.3.patch -8043c73f29f1305446594a0353ad7839 wmdiscotux-1.3.tar.gz diff --git a/wmdiscotux/Pkgfile b/wmdiscotux/Pkgfile deleted file mode 100644 index bbfcd7fcf..000000000 --- a/wmdiscotux/Pkgfile +++ /dev/null @@ -1,17 +0,0 @@ -# Description: A visualization plugin for XMMS -# URL: http://fragment.stc.cx/?page=wmdiscotux -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Depends on: xmms - -name=wmdiscotux -version=1.3 -release=1 -source=(http://fragment.stc.cx/files/$name-$version.tar.gz \ - $name-$version.patch) - -build() { - cd $name-$version - patch -p1 -i $SRC/$name-$version.patch - make - make DESTDIR=$PKG install -} diff --git a/wmdiscotux/wmdiscotux-1.3.patch b/wmdiscotux/wmdiscotux-1.3.patch deleted file mode 100644 index 209bc5512..000000000 --- a/wmdiscotux/wmdiscotux-1.3.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ru wmdiscotux-1.3-orig/Makefile wmdiscotux-1.3/Makefile ---- wmdiscotux-1.3-orig/Makefile 2000-11-15 20:33:43.000000000 +0200 -+++ wmdiscotux-1.3/Makefile 2006-01-29 13:11:51.000000000 +0200 -@@ -1,6 +1,6 @@ - CC = gcc --INCLUDEDIR = -I/usr/include -I/usr/X11R6/include -I/usr/local/include --CFLAGS = -O2 -Wall $(INCLUDEDIR) -fPIC `glib-config --cflags` -+INCLUDEDIR = -I/usr/include/gtk-1.2 -I/usr/include -I/usr/X11R6/include -+CFLAGS += -Wall $(INCLUDEDIR) -fPIC `glib-config --cflags` - LFLAGS = -shared -fPIC -lpthread -L/usr/lib -ldl -lm -L/usr/X11R6/lib -lXpm -lX11 - - libwmdiscotux.so: wmdiscotux.o wmgeneral.o -@@ -10,5 +10,5 @@ - rm -f *.o core *.so* - - install: libwmdiscotux.so -- cp libwmdiscotux.so `xmms-config --visualization-plugin-dir` -+ /usr/bin/install -D -o 0 -g 0 -s -m 755 libwmdiscotux.so $(PKG)`xmms-config --visualization-plugin-dir`/libwmdiscotux.so - -diff -ru wmdiscotux-1.3-orig/wmdiscotux.c wmdiscotux-1.3/wmdiscotux.c ---- wmdiscotux-1.3-orig/wmdiscotux.c 2000-11-16 16:51:52.000000000 +0200 -+++ wmdiscotux-1.3/wmdiscotux.c 2006-01-29 12:56:57.000000000 +0200 -@@ -359,16 +359,10 @@ - gtk_container_border_width(GTK_CONTAINER(dialog), 5); - - -- label = gtk_label_new (" --wmDiscoTux\n\ --v " VERSION "\n\ -- --by Antti Takala \n\ -- --get the newest version from:\n\ --http://wmdiscotux.stc.cx/\n\ -- --"); -+ label = gtk_label_new ("\nwmDiscoTux\n\\n\ -+v " VERSION "\n\\n\nby Antti Takala \n\\n\n\ -+get the newest version from:\n\\n\ -+http://wmdiscotux.stc.cx/\n\\n\n"); - - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); diff --git a/wmint/.footprint b/wmint/.footprint deleted file mode 100644 index 4c426c073..000000000 --- a/wmint/.footprint +++ /dev/null @@ -1,3 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/wmint diff --git a/wmint/.md5sum b/wmint/.md5sum deleted file mode 100644 index 3f73ffe4a..000000000 --- a/wmint/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -ba8ee8e741b1a1bb89fc8de13d6e74bb wmint-0.9.tar.bz2 -c256e5eab3b91b7b849accde71768923 wmint-sleep.diff diff --git a/wmint/Pkgfile b/wmint/Pkgfile deleted file mode 100644 index 9f721fd40..000000000 --- a/wmint/Pkgfile +++ /dev/null @@ -1,20 +0,0 @@ -# Description: A dockable app that displays flashing lights for IRQ's -# URL: http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/sys.html -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Depends on: xorg-libxpm - -name=wmint -version=0.9 -release=2 -source=(http://ftp.sh.cvut.cz/MIRRORS/rock/ROCK-2.1/w/$name-$version.tar.bz2 \ - wmint-sleep.diff) - -build() { - cd $name-$version/$name - - # adds -s switch to prevent frequent wakeups - patch -p2 -i $SRC/wmint-sleep.diff - - make - /usr/bin/install -D -m 755 wmint $PKG/usr/bin/wmint -} diff --git a/wmint/wmint-sleep.diff b/wmint/wmint-sleep.diff deleted file mode 100644 index 113691185..000000000 --- a/wmint/wmint-sleep.diff +++ /dev/null @@ -1,53 +0,0 @@ -diff -Nru wmint-0.9-orig/wmint/wmint.c wmint-0.9/wmint/wmint.c ---- wmint-0.9-orig/wmint/wmint.c 2008-03-22 22:57:17.771804010 +0200 -+++ wmint-0.9/wmint/wmint.c 2008-03-22 23:24:15.174803493 +0200 -@@ -34,8 +34,10 @@ - #define MY_EMAIL "slix@gcu-squad.org" - #define GCU_HOME "http://www.gcu-squad.org/" - #define WMINT_VERSION "0.9" -+#define SLEEP_USECS 10000 - - char *ProgName; -+unsigned int usecs = SLEEP_USECS; - - typedef struct { - unsigned short bit; -@@ -110,6 +112,19 @@ - exit(1); - }; - break; -+ case 's' : -+ if (++i == argc) -+ { -+ usage(); -+ exit(1); -+ }; -+ usecs = (unsigned int) strtol(argv[i], &endp, 10); -+ if (*endp || usecs<0 || usecs>1000000) -+ { -+ usage(); -+ exit(1); -+ }; -+ break; - case 'v' : - printVersion(); - exit(0); -@@ -269,7 +284,7 @@ - break; - } - } -- usleep(10000L); -+ usleep(usecs); - } - - } -@@ -526,7 +541,8 @@ - fprintf(stderr, "\nwmint - Sébastien Liénard <%s>, GCU (%s)\n\n",MY_EMAIL,GCU_HOME); - fprintf(stderr, "usage:\n"); - fprintf(stderr, "\t-d \n"); -- fprintf(stderr, "\t-i \n"); -+ fprintf(stderr, "\t-i \n"); -+ fprintf(stderr, "\t-s \n", SLEEP_USECS); - fprintf(stderr, "\t-h\tthis help screen\n"); - fprintf(stderr, "\t-v\tprint the version number\n"); - fprintf(stderr, "\n"); diff --git a/wmlaptop/.footprint b/wmlaptop/.footprint deleted file mode 100644 index 2254a74a6..000000000 --- a/wmlaptop/.footprint +++ /dev/null @@ -1,3 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/wmlaptop diff --git a/wmlaptop/.md5sum b/wmlaptop/.md5sum deleted file mode 100644 index 750110f77..000000000 --- a/wmlaptop/.md5sum +++ /dev/null @@ -1,3 +0,0 @@ -b7ac4be84f51b54da53d9d07f5720505 wmlaptop-1.4.tar.bz2 -8cb77d9d61366cc43622bc593f9310d2 wmlaptop-makefile.diff -e7314e4a2354f5113dc5a3d137553659 wmlaptop-ondemand.diff diff --git a/wmlaptop/Pkgfile b/wmlaptop/Pkgfile deleted file mode 100644 index 641968f97..000000000 --- a/wmlaptop/Pkgfile +++ /dev/null @@ -1,19 +0,0 @@ -# Description: A dockapp to control CPU frequency and monitor battery state -# URL: http://wmlaptop.sourceforge.net/ -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Depends on: xorg-libxpm - -name=wmlaptop -version=1.4 -release=3 -source=(http://wmlaptop.sourceforge.net/$name-$version.tar.bz2 \ - $name-makefile.diff \ - $name-ondemand.diff) - -build() { - cd $name-$version - patch -p1 -i $SRC/$name-makefile.diff - patch -p1 -i $SRC/$name-ondemand.diff - make - make install -} diff --git a/wmlaptop/README b/wmlaptop/README deleted file mode 100644 index 0e316b50a..000000000 --- a/wmlaptop/README +++ /dev/null @@ -1,17 +0,0 @@ -README for wmlaptop - -REQUIREMENTS - -PRE-INSTALL - -POST-INSTALL - -RESOURCES - -PRECAUTION -The 'make install' (from Pkgfile) will NOT suid the binary file. To allow -regular user to change the cpu's frequence do it manually or use sudo. - -This is a heavily patched version, but it works better for me. - -Please use with care! diff --git a/wmlaptop/wmlaptop-makefile.diff b/wmlaptop/wmlaptop-makefile.diff deleted file mode 100644 index 323e45308..000000000 --- a/wmlaptop/wmlaptop-makefile.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff -ru wmlaptop-1.4-orig/Makefile wmlaptop-1.4/Makefile ---- wmlaptop-1.4-orig/Makefile 2004-09-11 14:42:51.000000000 +0300 -+++ wmlaptop-1.4/Makefile 2006-01-02 19:58:10.000000000 +0200 -@@ -1,11 +1,11 @@ - # modify this if you want/need - --INSTALLDIR = /usr/local/bin/ -+INSTALLDIR = $(PKG)/usr/bin - CC = gcc - - LIBDIR = -L/usr/X11R6/lib - LIBS = -lXpm -lXext -lX11 --CFLAGS = -Wall -g -+#CFLAGS = -Wall -g - OBJS = main.o init.o event.o draw.o battery.o cpu.o autoscript.o pixmap.o - EXE = wmlaptop - -@@ -13,7 +13,7 @@ - export INSTALLDIR - export LIBDIR - export LIBS --export CFLAGS -+#export CFLAGS - export OBJS - export EXE - export CC -diff -ru wmlaptop-1.4-orig/src/Makefile wmlaptop-1.4/src/Makefile ---- wmlaptop-1.4-orig/src/Makefile 2004-03-08 14:05:00.000000000 +0200 -+++ wmlaptop-1.4/src/Makefile 2006-01-02 20:03:47.000000000 +0200 -@@ -20,8 +20,8 @@ - reall: clean all - - install: -- /usr/bin/install -c -o 0 -g 0 -s -m 755 $(EXE) $(INSTALLDIR)/$(EXE) -- chmod +s $(INSTALLDIR)/$(EXE) -+ /usr/bin/install -D -o 0 -g 0 -s -m 755 $(EXE) $(INSTALLDIR)/$(EXE) -+# chmod +s $(INSTALLDIR)/$(EXE) - - uninstall: - rm -f $(INSTALLDIR)/$(EXE) diff --git a/wmlaptop/wmlaptop-ondemand.diff b/wmlaptop/wmlaptop-ondemand.diff deleted file mode 100644 index a97581701..000000000 --- a/wmlaptop/wmlaptop-ondemand.diff +++ /dev/null @@ -1,1517 +0,0 @@ -diff -Nru wmlaptop-1.4-orig/src/battery.c wmlaptop-1.4/src/battery.c ---- wmlaptop-1.4-orig/src/battery.c 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/battery.c 2008-04-18 21:56:45.002550126 +0300 -@@ -15,6 +15,8 @@ - */ - - #include "battery.h" -+#include -+ - - bool mallocBatteryVector( ) - { -@@ -96,9 +98,10 @@ - } - - powerState.type = SUPPORT_ACPI; -- powerState.updater = ACPI_Update; -+ powerState.updater = print_battery; -+ -+ - -- /* counting number of batteries */ - powerState.nBatt = 0; - powerState.batteryVector = NULL; - -@@ -108,26 +111,23 @@ - return ERROR; - } - -- /* a cicle for creating as many battery_str structures -- * as are the batteries on the laptop; everyone will be -- * filled with static informations */ -+ - while ((batt = readdir (battdir))) - { - - name = batt->d_name; -- /* jump . and .. */ -+ - if (!strncmp (".", name, 1) || !strncmp ("..", name, 2)) - continue; - - countBattery++; - -- /* adding a battery to powerState vector */ -+ - if( mallocBatteryVector( ) == ERROR ) - return ERROR; - - batPtr = powerState.batteryVector[ powerState.nBatt - 1 ]; - -- /* we can find 'status' or even 'state' */ - snprintf( path, 52, "%s/%s/status", ACPI_BATTERY_DIR, name ); - if (access(path, R_OK) == SUCCESS ) - snprintf( batPtr -> stateFile, 52, "%s/%s/status",ACPI_BATTERY_DIR, name ); -@@ -135,20 +135,17 @@ - snprintf( batPtr -> stateFile, 52, "%s/%s/state", ACPI_BATTERY_DIR, name ); - - -- /* calculating maximum capacity of this battery -- * reading file infos */ -+ - batPtr -> useLFC = ACPI_lfcArgs_get( countBattery ); - batPtr -> counter = countBattery; - snprintf( batPtr -> infoFile, 52, "%s/%s/info", ACPI_BATTERY_DIR, name ); - batPtr -> present = ACPI_maxCapacity ( batPtr ); - -- /* THIS IS NOT A BATTERY ! set error field to true: don't use it */ - if( batPtr -> capacity == ~0x00 && batPtr -> present == true ) - { - batPtr -> error = true; - } - -- /* filler selection :P */ - batPtr -> filler = ACPI_Filler; - } - -@@ -166,8 +163,6 @@ - u_int16 saltCounter = 0; - char * errorMessage = "wmlaptop will ignore this battery. If you don't want to see\nthis message, use '-q' option as argument.\n"; - -- /* we control 'last full capacity' tag before, if this -- * don't exists or it's value is 0, then we use 'design capacity' */ - char * lfcTagPointer = NULL; - char * dcTagPointer = NULL; - u_int32 lastFullCapacity = 0; -@@ -189,7 +184,7 @@ - - if( !strcmp( presentString, "present:" ) && !strcmp( yesNoString, "no" ) ) - { -- /* to avoid division by 0 ? */ -+ - p -> capacity = 1; - return false; - } -@@ -207,11 +202,11 @@ - } - - -- /* naah.. */ -+ - if( saltCounter >= 492 && !dcTagPointer && !lfcTagPointer ) - { - PRINTQ( stderr, "The info file (%s) has not \n'design capacity' and not event 'last full capacity' tag\n%s\n", p -> infoFile, errorMessage ); -- /* we treat 1111.1111.1111.1111 as error here */ -+ - p -> capacity = ~0x00; - } - -@@ -340,66 +335,6 @@ - } - - --void ACPI_Update ( ) --{ -- FILE * fp; -- char *where = NULL; -- char buf[512]; -- -- register int i; -- register u_int32 capacitySum = 0; -- register u_int32 actualStateSum = 0; -- -- for( i = 0; i < powerState.nBatt; i++ ) -- { -- powerState.batteryVector[i] -> filler( powerState.batteryVector[i] ); -- if (powerState.batteryVector[i] -> present) { -- capacitySum += powerState.batteryVector[i] -> capacity; -- actualStateSum += powerState.batteryVector[i] -> actualState; -- } -- } -- -- if (capacitySum > 0) -- powerState.percentage = (actualStateSum * 100) / capacitySum; -- else -- powerState.percentage = 0; -- -- /* battery charger information reading -- * thanks to wmpower */ -- -- if (!(fp = fopen ("/proc/acpi/ac_adapter/0/status", "r"))) -- if (!(fp = fopen ("/proc/acpi/ac_adapter/ACAD/state", "r"))) -- if (!(fp = fopen ("/proc/acpi/ac_adapter/AC/state", "r"))) -- if (!(fp = fopen ("/proc/acpi/ac_adapter/ADP1/state", "r"))) -- return; -- -- fread_unlocked (buf, 512, 1, fp); -- fclose(fp); -- -- if (strncmp(buf, "state:", 6) == 0) -- where = buf + 26; -- if (strncmp(buf, "Status:", 7) == 0) -- where = buf + 26; -- -- if (where) -- { -- if (where[0] == 'n') -- powerState.isCharging = true; -- if (where[0] == 'f') -- powerState.isCharging = false; -- } -- -- if( args_ttyMode ) -- return; -- -- -- setNewBatteryState(); -- -- -- return; --} -- -- - /* this vector will contain in each position the number of the - * battery the user wants to be used with 'last full capacity' */ - static u_int8 * lfcArgsVector = NULL; -@@ -571,7 +506,7 @@ - } - else - { -- estimatedTimeClock( ); -+ print_battery( ); - } - draw_all(); - lastChargingState = powerState.isCharging; -@@ -580,101 +515,177 @@ - } - } - -+void read_power() -+{ -+ DIR *dir; -+ struct dirent *dirent; -+ FILE *file; -+ extern double powerrate; -+ char filename[256]; - - --void estimatedTimeClock ( ) --{ -- /* we remember last 5 percent values changes. -- * for every value we record even the exact moment when this -- * value was recorded (reading global variable secondsCounter) */ -- static u_int32 values[5][2]; -- static u_int8 valueIndex = ~0; -+ dir = opendir("/proc/acpi/battery"); -+ if (!dir) -+ return; - -- static bool lastIsCharging = false; -+ while ((dirent = readdir(dir))) { - -- register u_int8 diffPercentage = 0; -- register u_int32 diffTime = 0; -- register int i; -+ char line[1024]; -+ -+ sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); -+ file = fopen(filename, "r"); -+ if (!file) -+ continue; -+ memset(line, 0, 1024); -+ while (fgets(line, 1024, file) != NULL) { -+ char *c; -+ if (strstr(line, "present:") && strstr(line, "no")) -+ break; - -+ c = strchr(line, ':'); -+ if (!c) -+ continue; -+ c++; - -- /* if battery charge is plugged in, values fetched before are -- * reset to zero and return (draw_all() function already called -- * by updater will draw TIME unlit, to indicate that we haven't -- * a time estimation */ -- if( lastIsCharging != powerState.isCharging ) -- { -- lastIsCharging = powerState.isCharging; -- valueIndex = ~0; -- powerState.remainingTime = 0; -- return; -+ if (strstr(line, "present rate") && strstr(c, "mW")) -+ powerrate = strtoull(c, NULL, 10) / 1000.0; - } -+ fclose(file); - -+ } -+ closedir(dir); -+// fprintf(stdout,"powerrate = %3.1f\n", powerrate); - -- for( i = 4; i > 0; i-- ) -- { -- values[i][1] = values[i-1][1]; -- values[i][0] = values[i-1][0]; -+} -+ -+ -+void battery_capacity() -+{ -+ DIR *dir; -+ struct dirent *dirent; -+ FILE *file; -+ extern double capacity; -+ char filename[256]; -+ -+ -+ dir = opendir("/proc/acpi/battery"); -+ if (!dir) -+ return; -+ -+ while ((dirent = readdir(dir))) { -+ -+ char line[1024]; -+ -+ sprintf(filename, "/proc/acpi/battery/%s/info", dirent->d_name); -+ file = fopen(filename, "r"); -+ if (!file) -+ continue; -+ memset(line, 0, 1024); -+ while (fgets(line, 1024, file) != NULL) { -+ char *c; -+ if (strstr(line, "present:") && strstr(line, "no")) -+ break; -+ -+ c = strchr(line, ':'); -+ if (!c) -+ continue; -+ c++; -+ -+ if (strstr(line, "last full capacity") && strstr(c, "mWh")) -+ capacity = strtoull(c, NULL, 10) / 1000.0; -+ } -+ fclose(file); - } -- values[i][0] = powerState.percentage; -- values[i][1] = secondsCounter; -+ closedir(dir); -+// fprintf(stdout,"capacity = %3.1f\n", capacity); - -+} - -- valueIndex += 1; -- if( valueIndex > 4 ) -- valueIndex = 4; -+void print_battery(void) -+{ -+ DIR *dir; -+ struct dirent *dirent; -+ FILE *file; -+ double rate = 0; -+ double cap = 0; - -- /* if it's the first measure, jump the comparation */ -- if( valueIndex > 0 ) -- { -- u_int32 remainingSeconds; -- /* we have into values[0] the most recent value, -- * and in values[ valueIndex ] the less one */ -+ char filename[256]; - -- if( powerState.isCharging ) -- diffPercentage = values[0][0] - values[ valueIndex ][0]; -- else -- diffPercentage = values[ valueIndex ][0] - values[0][0]; - -- diffTime = values[0][1] - values[ valueIndex ][1]; -+ dir = opendir("/proc/acpi/battery"); -+ if (!dir) -+ return; -+ -+ while ((dirent = readdir(dir))) { -+ double voltage = 0.0; -+ double amperes_drawn = 0.0; -+ double watts_drawn = 0.0; -+ double amperes_left = 0.0; -+ double watts_left = 0.0; -+ char line[1024]; -+ powerState.isCharging = false; -+ -+ if (strlen(dirent->d_name) < 3) -+ continue; -+ -+ sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); -+ file = fopen(filename, "r"); -+ if (!file) -+ continue; -+ memset(line, 0, 1024); -+ while (fgets(line, 1024, file) != NULL) { -+ char *c; -+ if (strstr(line, "present:") && strstr(line, "no")) -+ break; - -- /* this is the logic way: if diffTime is the number of seconds for -- * losing(gaining) diffPercentage percent battery charge, how many -- * seconds will it takes to lose(gain) remaining points ? in other words: -- * diffTime : diffPercentage = remainingSeconds : powerState.percentage -- * (or if we are charging = remainingSeconds : (100-powerState.percentage)) -- * it shouldn't be possible to have diffPercentage = 0 -- * because this function is called everytime that percent changes */ -- if( diffPercentage == 0 ) -- { -- /* sometime it happends that 'diffPercentage == 0': i recieved some bug -- * report about this. I don't know why this happends, and i didn't find -- * any way to correct this conceptually, so i have to put this condition -- * here and turn off the estimated remaining time */ -- PRINTQ( stderr, "There is no difference of percentage between the first\n"); -- PRINTQ( stderr, "relevation and the last one: i have to put remainingTime to 0\n"); -- remainingSeconds = 0; -+ if (strstr(line, "charging state:") -+ && !strstr(line, "discharging")){ -+ powerState.isCharging = true; - } -- else -- { -- if( powerState.isCharging ) -- remainingSeconds = ( diffTime * (100-powerState.percentage) ) / diffPercentage; -- else -- remainingSeconds = ( diffTime * powerState.percentage ) / diffPercentage; -+ c = strchr(line, ':'); -+ if (!c) -+ continue; -+ c++; -+ -+ if (strstr(line, "present voltage")) -+ voltage = strtoull(c, NULL, 10) / 1000.0; -+ -+ if (strstr(line, "remaining capacity") && strstr(c, "mW")) -+ watts_left = strtoull(c, NULL, 10) / 1000.0; -+ -+ if (strstr(line, "remaining capacity") && strstr(c, "mAh")) -+ amperes_left = strtoull(c, NULL, 10) / 1000.0; -+ -+ if (strstr(line, "present rate") && strstr(c, "mW")) -+ watts_drawn = strtoull(c, NULL, 10) / 1000.0 ; -+ -+ if (strstr(line, "present rate") && strstr(c, "mA")) -+ amperes_drawn = strtoull(c, NULL, 10) / 1000.0; -+ - } -+ fclose(file); -+ - -- /* value in minutes */ -- powerState.remainingTime = remainingSeconds / 60; -- } -- else -- powerState.remainingTime = 0; -- -+ if (!powerState.isCharging) { -+ rate += watts_drawn + voltage * amperes_drawn; -+ cap += watts_left + voltage * amperes_left; -+ powerState.remainingTime = 60*cap/rate; -+ powerrate = rate; -+// fprintf(stdout,"taxa = %3.1fW horas=%3.1f \n", rate, cap/rate); -+ } -+ if (powerState.isCharging){ -+ rate += watts_drawn + voltage * amperes_drawn; -+// fprintf(stdout,"watts left = %3.1f, watts drawn=%3.1f \n", watts_left, watts_drawn); -+ /* time to charge battery at 100% */ -+ powerState.remainingTime = 60*(capacity - watts_left)/watts_drawn; -+ } -+ -+ powerrate = rate; -+ powerState.percentage = 100*(watts_left/capacity); -+// fprintf(stdout, "capacidade = %3.1f \n", capacity); -+// fprintf(stdout,"porcentagem = %d \n", powerState.percentage); - --#ifdef DEBUG -- printf("TEMPO TRASCORSO: %u:%02u (%u secondi)\n",diffTime/60,diffTime%60,diffTime); -- printf("PERCENTUALI: values[0] = %u, values[%d] = %u\n", values[0][0], valueIndex, values[valueIndex][0] ); -- printf("TEMPIVALORI: values[0] = %u, values[%d] = %u\n", values[0][1], valueIndex, values[valueIndex][1] ); -- printf("DIFFENREZA: %d\n", diffPercentage ); -- printf("TEMPOSTIMATO: %d\n\n\n", powerState.remainingTime ); --#endif -+ } -+ closedir(dir); - } - -diff -Nru wmlaptop-1.4-orig/src/battery.h wmlaptop-1.4/src/battery.h ---- wmlaptop-1.4-orig/src/battery.h 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/battery.h 2008-04-18 21:56:45.002550126 +0300 -@@ -109,11 +109,10 @@ - * state is changed. */ - void setNewBatteryState( ); - -+void read_power(); - --/* function invoked every time that remaining battery percentage changes -- * and calculates estimated remaining time. -- * (if changed from previous updates the dockapp */ --void estimatedTimeClock ( ); -+void battery_capacity(); - -+void print_battery(); - - #endif -diff -Nru wmlaptop-1.4-orig/src/cpu.c wmlaptop-1.4/src/cpu.c ---- wmlaptop-1.4-orig/src/cpu.c 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/cpu.c 2008-04-18 21:56:45.002550126 +0300 -@@ -65,10 +65,9 @@ - return loadline; - } - -- - void manageCpuLoad( ) - { -- static u_int8 lastCpuLoad = 100; -+// static u_int8 lastCpuLoad = 100; - #ifndef LONGRUN - static u_int32 lastFreqChange = 0; - #endif -@@ -76,10 +75,10 @@ - cpuLoad = getCpuLoad(); - - -- if( cpuLoad != lastCpuLoad || cpuLoad == 100 ) -- draw_all(); -+// if( cpuLoad != lastCpuLoad || cpuLoad == 100 ) -+// draw_all(); - -- lastCpuLoad = cpuLoad; -+// lastCpuLoad = cpuLoad; - - - /* Longrun manages frequency automatically, so skip all this */ -@@ -120,7 +119,7 @@ - - /* let's read actual frequency to avoid a two seconds wait - * dto now it */ -- cpuReadFreq(); -+// cpuReadFreq(); - #endif - - return; -@@ -130,10 +129,14 @@ - - void cpuReadFreq( ) - { -+ - #ifndef LONGRUN - FILE * fp; - char red[10]; - -+ if (governor != 1) -+ cpuState.setFreqFile = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"; -+ - if( (fp = fopen( cpuState.setFreqFile, "r" )) == NULL ) - { - fprintf(stderr, "Error reading the info file (%s):\n%s\n", cpuState.setFreqFile, strerror(errno) ); -@@ -170,19 +173,50 @@ - } - - -+void cpuReadTemp( ){ -+ DIR *dir; -+ struct dirent *dirent; -+ FILE *file; -+ int cpuTemp = 0; -+ char filename[256]; - --void cpuCheckFreq() --{ -- static u_int32 lastCpuFreq = 0; -+ dir = opendir("/proc/acpi/thermal_zone"); -+ if (!dir){ -+ return; -+ } -+ while ((dirent = readdir(dir))) { -+ char line[1024]; - -- cpuReadFreq(); -+ if (strlen(dirent->d_name) < 3) -+ continue; - -- if( lastCpuFreq != cpuState.actualFreq ) -- draw_all(); - -- lastCpuFreq = cpuState.actualFreq; --} -+ sprintf(filename, "/proc/acpi/thermal_zone/%s/temperature", dirent->d_name); -+ file = fopen(filename, "r"); -+ if (!file) -+ continue; -+ memset(line, 0, 1024); -+ while (fgets(line, 1024, file) != NULL) { -+ char *c; -+ // if (strstr(line, "present:") && strstr(line, "no")) -+ // break; -+ -+ c = strchr(line, ':'); -+ if (!c) -+ continue; -+ c++; -+ -+ if (strstr(line, "temperature") && strstr(c, "C")) -+ cpuTemp = strtoull(c, NULL, 10); - -+ } -+ fclose(file); -+ -+ cpuState.Temp = cpuTemp; -+// fprintf(stdout,"temperatura = %d\n", cpuState.Temp); -+ } -+ closedir(dir); -+} - - void cpuSetFreq( bool direction, bool speed ) - { -diff -Nru wmlaptop-1.4-orig/src/cpu.h wmlaptop-1.4/src/cpu.h ---- wmlaptop-1.4-orig/src/cpu.h 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/cpu.h 2008-04-18 21:56:45.003550530 +0300 -@@ -37,6 +37,8 @@ - * global variable cpuState */ - void cpuReadFreq( ); - -+/* read cpu temperature and puts into cpuState.Temp */ -+void cpuReadTemp(); - - /* invoked by events cycle e time every 2 seconds, it reads actual - * frequency (calling readCpuFreq) and it redraws the dockapp if it's -diff -Nru wmlaptop-1.4-orig/src/draw.c wmlaptop-1.4/src/draw.c ---- wmlaptop-1.4-orig/src/draw.c 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/draw.c 2008-04-18 21:56:45.003550530 +0300 -@@ -16,6 +16,7 @@ - - #include "draw.h" - -+extern double powerrate; - - void draw_area(int sx, int sy, int w, int h, int dx, int dy) - { -@@ -37,9 +38,13 @@ - - draw_cpuload ( ); - -+ if (governor == 1){ // 1 means userspace - draw_auto_freq ( ); -- - draw_freq_arrows ( ); -+ } else { -+ draw_cputemp(); -+ draw_powerrate(); -+ } - - draw_actual_freq ( ); - -@@ -59,6 +64,18 @@ - /* Mhz */ - draw_area( 46, 119, 15, 9, 38, 51 ); - -+ // colocar graus C e Watts se ondemand -+ /* C */ -+ if (governor == 2){ -+ /* draw C (Celsius) */ -+ draw_area( 0, 117, 4, 7, 52, 36 ); -+ /* draw W (Watts) */ -+ if (powerState.isCharging) -+ draw_area( 70, 130, 9, 7, 25, 37 ); -+ else -+ draw_area( 81, 130, 9, 7, 25, 37 ); -+ } -+ - /* two gray lines */ - draw_area( 66, 118, 55, 1, 4, 24 ); - draw_area( 66, 118, 55, 1, 4, 48 ); -@@ -87,10 +104,6 @@ - - u_int8 numBars; - int i; -- int j; -- int battery = 0; -- int batterySlot; -- int presentBatteries = 0; - - if( powerState.percentage == 100 ) - /* drawing the green <1> at first position*/ -@@ -118,30 +131,15 @@ - /* drawing <%> symbol of the right color */ - draw_area( 40, baseY, 7, 7, 20, 5 ); - -- -- /* let's see, how many batteries are present */ -- for ( batterySlot = 0; batterySlot < powerState.nBatt; batterySlot ++ ) -- if (powerState.batteryVector[batterySlot] -> present) -- presentBatteries ++; -- -- -- for( batterySlot = 0; batterySlot < powerState.nBatt; batterySlot ++ ) { -- -- if (powerState.batteryVector[batterySlot] -> present) { -- battery ++; -- - /* battery drawing */ -- numBars = (22 * powerState.batteryVector[batterySlot] -> percentage) / 100; -+ numBars = (22 * powerState.percentage) / 100; - - for( i = 0; i < numBars; i++ ) -- draw_area( 49 + ( i > 10 ? i - 11 : i ), 95 + ( i > 10 ? 7 : 0), 1, (7 / presentBatteries), 15+(i*2), 15 + (battery - 1) * (7 / presentBatteries + 1 ) ); -+ draw_area( 49 + ( i > 10 ? i - 11 : i ), 95 + ( i > 10 ? 7 : 0), 1, (7 / 1), 15+(i*2), 15 ); - - /* unlit remaining battery */ -- for( j = i; j < 22; j++ ) -- draw_area( 60, 95, 1, (7 / presentBatteries), 15 + (j*2), 15 + (battery - 1) * (7 / presentBatteries + 1 ) ); -- -- } -- } -+// for( j = i; j < 22; j++ ) -+// draw_area( 60, 95, 1, (7 / 1), 15 + (j*2), 15 + (battery - 1) * (7 / 2 ) ); - - return; - } -@@ -232,6 +230,60 @@ - - } - -+void draw_cputemp ( ) -+{ -+ -+ u_int8 decine = cpuState.Temp == 100 ? 0 : (cpuState.Temp / 10); -+ u_int8 unita = cpuState.Temp % 10; -+ -+ -+ /* tens drawing */ -+ if( decine == 0 && cpuState.Temp != 100 ) -+ draw_area( 57, 75, 4, 7, 49, 27 ); -+ else -+ draw_area( decine*4, 71, 4, 7, 40, 36 ); -+ -+ /* units drawing */ -+ draw_area( unita*4, 71, 4, 7, 45, 36 ); -+ -+ -+} -+ -+void draw_powerrate ( ) -+{ -+ -+ u_int8 decine = 0; -+ u_int8 unita = 0; -+ u_int8 decimal = 0; -+ -+ if (powerrate > 10){ -+ decine = (powerrate / 10); -+ unita = powerrate - decine*10; -+ decimal = powerrate*10 - decine*100 - unita*10; -+ } -+ else { -+ decine = 0; -+ unita = powerrate; -+ decimal = powerrate*10 - unita*10; -+ } -+ -+ /* tens drawing */ -+ if( decine == 0 ) -+ draw_area( 57, 75, 4, 7, 5, 37 ); -+ else -+ draw_area( decine*4, 78 - powerState.isCharging*14, 4, 7, 5, 37 ); -+ -+ /* units drawing */ -+ draw_area( unita*4, 78 - powerState.isCharging*14, 4, 7, 10, 37 ); -+ -+ /* decimal point */ -+ draw_area( 0, 83 - powerState.isCharging*14, 2, 1, 15, 43 ); -+ -+ /* decimals drawing */ -+ draw_area( decimal*4, 78 - powerState.isCharging*14, 4, 7, 18, 37 ); -+} -+ -+ - void draw_auto_freq ( ) - { - if ( cpuState.auto_freq_state ){ -diff -Nru wmlaptop-1.4-orig/src/draw.h wmlaptop-1.4/src/draw.h ---- wmlaptop-1.4-orig/src/draw.h 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/draw.h 2008-04-18 21:56:45.004550097 +0300 -@@ -53,10 +53,19 @@ - void draw_auto_freq ( ); - - /* it draws the arrows at left and right of the cpu frequency */ -+ - void draw_freq_arrows ( ); - --/* it draws actua cpu frequency */ -+ -+/* it draws the actual cpu frequency */ - void draw_actual_freq ( ); - -+/* it draws the cpu temperature */ -+void draw_cputemp(); -+ -+/* it draws the rate at which the battery is -+ * discharging/charging */ -+void draw_powerrate(); -+ - - #endif -diff -Nru wmlaptop-1.4-orig/src/event.c wmlaptop-1.4/src/event.c ---- wmlaptop-1.4-orig/src/event.c 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/event.c 2008-04-18 21:56:45.004550097 +0300 -@@ -16,11 +16,10 @@ - - #include "event.h" - -- -- - void event_handler ( ) - { -- u_int32 update_seconds; -+ u_int32 update_seconds, update_seconds2, update_seconds3; -+ u_int32 batteryUpdate, powerUpdate, tempUpdate; - u_int8 lastPercentage; - int j; - -@@ -31,9 +30,11 @@ - secondsCounter = time(NULL); - powerState.updater(); - update_seconds = time(NULL); -+ update_seconds2 = update_seconds; - lastPercentage = powerState.percentage; - -- if( powerState.percentage == 100 && powerState.isCharging && args_paradisiac == PARADISIAC_ON ) -+ -+ if( powerState.percentage == 100 && powerState.isCharging && args_paradisiac == PARADISIAC_ON && governor == 1) - { - if( args_ttyMode && args_beQuiet == false - #ifndef LONGRUN -@@ -78,6 +79,7 @@ - - switch ( j ) - { -+ if (governor == 1){ - /* auto-freq */ - case MREGION_AUTOFREQ: - /* toggle auto-freqency "(c)2003 LdP" scaling mode */ -@@ -112,7 +114,7 @@ - cpuState.auto_freq_state = false; - #endif - break; -- -+ } - } - - /* if a cliccable region was clicked, the dockapp is redrawn */ -@@ -134,17 +136,32 @@ - } - - -- /* update battery percentage and cpuFreq -- * once every batteryUpdate milliseconds; check for autoscripts -- * and cpuParadisiac too */ -- if( update_seconds <= secondsCounter - (args_batteryUpdate/1000) ) -+ /* If cpuload is less than 90% then the system is 'idle', so we -+ * update battery percentage, temperature and power with -+ * defaults values (which are confortably big as to not -+ * overuse the acpi system and generate to many wakeups (detected -+ * by Intel's powertop). -+ * If cpuload is bigger than 90% it makes sense to check these -+ * values more often (especially the temperature), so we set -+ * the update times to default small values. -+ */ -+ -+ if (cpuLoad < 90) { -+ batteryUpdate = args_batteryUpdate; -+ powerUpdate = args_powerUpdate; -+ tempUpdate = args_tempUpdate; -+ } -+ else { -+ batteryUpdate = 10; -+ powerUpdate = 2; -+ tempUpdate = 2; -+ } -+ -+ -+ if( update_seconds <= secondsCounter - batteryUpdate ) - { - update_seconds = secondsCounter; -- /* longrun adjusts so quickly that if you put the check -- after the succeeding line it consistently reads a -- higher MHz (in ACPI) */ -- cpuCheckFreq(); -- powerState.updater(); -+ print_battery(); - - if( args_autoShutdown != AUTOSHUTDOWN_OFF ) - checkAutoShutdown ( ); -@@ -152,13 +169,31 @@ - if( args_autoAlarm != AUTOALARM_OFF ) - checkAutoAlarm ( ); - -- if( args_paradisiac == PARADISIAC_ON ) -- cpuSetParadisiac ( ); -+// if( args_paradisiac == PARADISIAC_ON && governor == 1) -+// cpuSetParadisiac ( ); -+ } -+ -+ if( update_seconds2 <= secondsCounter - tempUpdate ){ -+ update_seconds2 = secondsCounter; -+ cpuReadTemp(); -+// fprintf(stdout,"executei temperatura \n"); -+ } -+ -+ if( update_seconds3 <= secondsCounter - powerUpdate ){ -+ update_seconds3 = secondsCounter; -+ read_power(); -+// fprintf(stdout,"executei power \n"); - } - - /* check and redraw cpu load */ -+ if (governor == 1) - manageCpuLoad(); -- usleep( 1000*args_cpuUpdate /*150000*/ ); -+ if (governor == 2){ -+ cpuLoad = getCpuLoad(); -+ } -+ cpuReadFreq(); -+ draw_all(); -+ usleep( 1000*args_cpuUpdate ); - - } - } -diff -Nru wmlaptop-1.4-orig/src/init.c wmlaptop-1.4/src/init.c ---- wmlaptop-1.4-orig/src/init.c 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/init.c 2008-04-18 21:56:45.005550432 +0300 -@@ -189,80 +189,6 @@ - } - - --/* this chech for the string 'userspace' is in scaling_governor file under /sys/.. dir -- * (only in case we are going to use SYS's way to set cpufreq). If 'userspace' is not set -- * then we try to set it by ourself */ --void scalingGovernorHelper( ) --{ -- char * scaling_governor_path = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"; -- char * scaling_governor_av_path = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"; -- char * error_msg = "Unable to read <%s>:\n%s\nwmlaptop cannot help you in cpu scaling governor\n"; -- FILE * sysfp; -- FILE * sysavfp; -- char littleBuffer[128]; -- -- bool printIt = false; -- int i; -- -- if( ( sysfp = fopen( scaling_governor_path, "r" ) ) == NULL ) { -- PRINTQ( stderr, error_msg, scaling_governor_path, strerror(errno) ); -- return; -- } -- -- fgets( littleBuffer, 127, sysfp ); -- fclose( sysfp ); -- -- if( !strcmp( littleBuffer, "userspace\n" ) ) -- return; -- -- if( ( sysavfp = fopen( scaling_governor_av_path, "r" ) ) == NULL ) { -- PRINTQ( stderr, error_msg, scaling_governor_av_path, strerror(errno) ); -- return; -- } -- -- fgets( littleBuffer, 127, sysavfp ); -- fclose( sysavfp ); -- -- for( i = 0; i < strlen( littleBuffer ) - 9 ; i++ ) -- if( !strncmp( littleBuffer, "userspace", 9 ) ) -- { -- /* ok, module is loaded */ -- printIt = true; -- break; -- } -- -- -- if( printIt == false ) { -- int s; -- PRINTQ( stderr, "It seems that you do not have 'cpufreq_userspace' module loaded in your kernel\n"); -- PRINTQ( stderr, "I try to call \"/sbin/modprobe cpufreq_userspace\"\n"); -- -- /* ugly.. but very fast */ -- s = system( "/sbin/modprobe cpufreq_userspace" ); -- -- if( s == 0 ) -- PRINTQ( stderr, "..good.\n" ); -- else -- { -- PRINTQ( stderr, "you should do it by yourself (maybe you need to recompile kernel ?)\n"); -- return; -- } -- } -- -- /* All ok here */ -- if( ( sysfp = fopen( scaling_governor_path, "w" )) == NULL ) -- PRINTQ( stderr, error_msg, scaling_governor_path, strerror(errno)); -- else -- { -- PRINTQ( stderr, "echoing 'userspace' > '%s'\n", scaling_governor_path ); -- fprintf( sysfp, "userspace" ); -- fclose( sysfp ); -- } -- -- return; --} -- -- - - /* riempe la struttura cpuState tenendo anche conto - * degli argomenti passati da linea di comando */ -@@ -293,7 +219,6 @@ - /* auto_freq_state */ - cpuState.auto_freq_state = ( args_autoFreq == AUTOFREQ_ON ); - -- - /* min freq */ - if( (fp = fopen( paths[0][idx[0]], "r" )) == NULL ) { - fprintf( stderr, "Error reading the info file (%s):\n%s\n", paths[0][idx[0]], strerror(errno) ); -@@ -313,21 +238,12 @@ - - fgets ( red, 10, fp ); - cpuState.maxFreq = atoi ( red ); -- - fclose ( fp ); - - /* set freq file */ - cpuState.setFreqFile = paths[2][idx[2]]; - -- /* if we have to use the SYS's way to set cpufreq, then ensure that in -- * scaling_governor there has been put 'userspace'; otherwise let's try -- * to put it by ourself */ -- if( idx[2] == 0 ) -- scalingGovernorHelper( ); -- -- -- cpuReadFreq( ); -- -+ cpuReadFreq(); - - /* set freq */ - cpuState.setFreq = cpuState.actualFreq; -@@ -336,6 +252,7 @@ - /* step freq */ - cpuState.stepFreq = args_incrementalStep; - -+ - #else - /* init and get first actual frequency */ - /* PENDING: get these files from config */ -@@ -377,8 +294,7 @@ - free_and_exit( ERROR ); - } - #endif -- switch( args_startingFreq ) -- { -+ switch( args_startingFreq ){ - case STARTINGFREQ_MIN: - #ifndef LONGRUN - /* frequence at min */ -@@ -398,14 +314,16 @@ - #endif - } - -+ - #ifndef LONGRUN - #ifdef DEBUG - fprintf ( stderr, "min freq: %d\nmax freq: %d\nactual freq: %d\n", cpuState.minFreq, cpuState.maxFreq, cpuState.actualFreq ); - #endif - #else - fprintf ( stderr, "LongRun CPU starts at %d, with autoadjust = %d\n\n", cpuState.setLevelIdx, cpuState.auto_freq_state ); -- cpuEchoFreq(); /* set initial range */ -+// cpuEchoFreq(); /* set initial range */ - #endif -+ - return; - } - -diff -Nru wmlaptop-1.4-orig/src/main.c wmlaptop-1.4/src/main.c ---- wmlaptop-1.4-orig/src/main.c 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/main.c 2008-04-18 22:08:44.250548770 +0300 -@@ -29,6 +29,8 @@ - - /* command line's args */ - u_int32 args_cpuUpdate = ARGSDEF_LEAVE; -+ u_int32 args_powerUpdate = ARGSDEF_LEAVE; -+ u_int32 args_tempUpdate = ARGSDEF_LEAVE; - u_int32 args_batteryUpdate = ARGSDEF_LEAVE; - char * args_XDisplayName = NULL; - bool args_autoFreq = ARGSDEF_LEAVE; -@@ -52,6 +54,9 @@ - bool args_dontBlink100 = ARGSDEF_DONTBLINK100; - bool args_ttyMode = ARGSDEF_LEAVE; - bool args_skin = ARGSDEF_LEAVE; -+ int governor = 2; // 1=userspace 2=ondemand -+ double powerrate = 1; -+ double capacity; - - /* X's stuff */ - struct mouseRegion mouse_region[MAX_MOUSE_REGION]; -@@ -106,8 +111,13 @@ - } - } - -- init_cpuState ( ); -- powerState.updater(); -+ if (governor == 1){ -+ init_cpuState(); -+ } -+ battery_capacity(); -+ cpuReadTemp(); -+ print_battery(); -+ - - if( args_ttyMode ) { - fprintf( stdout, "\n" ); -@@ -119,6 +129,7 @@ - } - else - { -+ if (governor == 1){ - /* auto-freq mouse region */ - AddMouseRegion( MREGION_AUTOFREQ, 7, 36, 55, 46 ); - /* cpu frequency left arrow */ -@@ -126,6 +137,9 @@ - /* cpu frequency right arrow */ - AddMouseRegion( MREGION_MAXFREQ, 55, 52, 58, 59 ); - } -+ -+ } -+ - event_handler ( ); - - -@@ -204,9 +218,13 @@ - fprintf( stderr, " v - victory jingle\n"); - fprintf( stderr, " h - high-bell sounds\n"); - fprintf( stderr, " --alarm-repeat=N repeat the choosen alarm N times\n"); -+ fprintf( stderr, "[KERNEL-related-options]:\n"); -+ fprintf( stderr, " --governor=ondemand|userspace choose cpu scaling governor\n"); - fprintf( stderr, "[GENERAL-options]:\n"); - fprintf( stderr, " --cpu-update=N how often, in milliseconds, to update CPU display\n"); -- fprintf( stderr, " --battery-update=N how often, in milliseconds, update battery state\n"); -+ fprintf( stderr, " --battery-update=N how often, in seconds, to update battery state\n"); -+ fprintf( stderr, " --power-update=N how often, in seconds, to update power state\n"); -+ fprintf( stderr, " --temperature-update=N how often, in seconds, to update temperature state\n"); - fprintf( stderr, " -p --play play alarm and exit\n"); - fprintf( stderr, " -q --quiet do not print messages and warnings\n"); - fprintf( stderr, " -d --default show the default compiled settings and exit\n"); -@@ -318,6 +336,14 @@ - args_startingFreq = STARTINGFREQ_MAX; - continue; - } -+ if( !strcmp( argv[i], "--governor=ondemand" ) ) { -+ governor=2; -+ continue; -+ } -+ if( !strcmp( argv[i], "--governor=userspace" ) ) { -+ governor=1; -+ continue; -+ } - - if( !strncmp( argv[i], "--max-freq=", 11 ) ) { - EXIT_IF_ALREADY_SET( args_maxFreq, ARGSDEF_LEAVE, "maxFreq" ); -@@ -465,7 +491,7 @@ - ptr = strchr( argv[i], '=' ); - ptr++; - args_cpuUpdate = atoi( ptr ); -- WARNING_IS_SET_TO_ZERO( args_maxFreq, "cpuUpdate" ); -+ WARNING_IS_SET_TO_ZERO( args_cpuUpdate, "cpuUpdate" ); - continue; - } - -@@ -474,7 +500,25 @@ - ptr = strchr( argv[i], '=' ); - ptr++; - args_batteryUpdate = atoi( ptr ); -- WARNING_IS_SET_TO_ZERO( args_maxFreq, "batteryUpdate" ); -+ WARNING_IS_SET_TO_ZERO( args_batteryUpdate, "batteryUpdate" ); -+ continue; -+ } -+ -+ if( !strncmp( argv[i], "--power-update=", 11 ) ) { -+ EXIT_IF_ALREADY_SET( args_powerUpdate, ARGSDEF_LEAVE, "powerUpdate" ); -+ ptr = strchr( argv[i], '=' ); -+ ptr++; -+ args_powerUpdate = atoi( ptr ); -+ WARNING_IS_SET_TO_ZERO( args_powerUpdate, "powerUpdate" ); -+ continue; -+ } -+ -+ if( !strncmp( argv[i], "--temperature-update=", 11 ) ) { -+ EXIT_IF_ALREADY_SET( args_tempUpdate, ARGSDEF_LEAVE, "tempUpdate" ); -+ ptr = strchr( argv[i], '=' ); -+ ptr++; -+ args_tempUpdate = atoi( ptr ); -+ WARNING_IS_SET_TO_ZERO( args_tempUpdate, "tempUpdate" ); - continue; - } - -@@ -511,6 +555,8 @@ - /* setting default values not set by command line */ - SET_DEFAULT( args_cpuUpdate, ARGSDEF_LEAVE, ARGSDEF_CPUUPDATE ); - SET_DEFAULT( args_batteryUpdate, ARGSDEF_LEAVE, ARGSDEF_BATTERYUPDATE ); -+ SET_DEFAULT( args_powerUpdate, ARGSDEF_LEAVE, ARGSDEF_POWERUPDATE ); -+ SET_DEFAULT( args_tempUpdate, ARGSDEF_LEAVE, ARGSDEF_TEMPUPDATE ); - SET_DEFAULT( args_XDisplayName, NULL, ARGSDEF_XDISPLAYNAME ); - SET_DEFAULT( args_autoFreq, ARGSDEF_LEAVE, ARGSDEF_AUTOFREQ ); - SET_DEFAULT( args_incrementalStep, ARGSDEF_LEAVE, ARGSDEF_INCREMENTALSTEP ); -@@ -566,6 +612,8 @@ - fprintf( stdout, " --skin=%d\n", ARGSDEF_SKIN ); - fprintf( stdout, "[CPU-options]:\n"); - fprintf( stdout, " --cpu-update=%d\n", ARGSDEF_CPUUPDATE ); -+ fprintf( stdout, " --temperature-update=%d\n", ARGSDEF_TEMPUPDATE ); -+ fprintf( stdout, " --power-update=%d\n", ARGSDEF_POWERUPDATE ); - fprintf( stdout, " --auto-freq=%s\n", ARGSDEF_AUTOFREQ == AUTOFREQ_ON ? "on" : "off" ); - fprintf( stdout, " --incremental-step=%d\n", ARGSDEF_INCREMENTALSTEP ); - if( ARGSDEF_STARTINGFREQ != ARGSDEF_LEAVE ) -diff -Nru wmlaptop-1.4-orig/src/main.h wmlaptop-1.4/src/main.h ---- wmlaptop-1.4-orig/src/main.h 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/main.h 2008-04-18 21:56:45.010548403 +0300 -@@ -134,7 +134,7 @@ - u_int8 counter; - char stateFile[52]; - char infoFile[52]; -- u_int32 capacity; -+ double capacity; - u_int32 actualState; - u_int16 percentage; - bool useLFC; -@@ -175,9 +175,12 @@ - u_int8 percentage; - u_int16 remainingTime; - bool isCharging; -+// double rate; - void(*updater)(); - }; - -+extern double powerrate; -+extern double capacity; - - /******************* - * CPUS' STUFF * -@@ -192,6 +195,7 @@ - * events cycle. * - *****************************************************************/ - extern u_int8 cpuLoad; -+extern int governor; - - /***************************************************************** - * global variable cpuState is a structure of this type, it * -@@ -224,6 +228,7 @@ - char * setFreqFile; - u_int32 setFreq; - u_int32 stepFreq; -+ int Temp; - #else - u_int16 *longRunLevels; - u_int16 nLongRunLevels; -@@ -337,14 +342,22 @@ - - /* update frequencies, in milliseconds; cpu must < battery */ - #ifndef ARGSDEF_CPUUPDATE --# define ARGSDEF_CPUUPDATE 80 -+# define ARGSDEF_CPUUPDATE 400 - #endif - #ifndef ARGSDEF_BATTERYUPDATE --# define ARGSDEF_BATTERYUPDATE 5000 -+# define ARGSDEF_BATTERYUPDATE 30 // seconds -+#endif -+#ifndef ARGSDEF_POWERUPDATE -+# define ARGSDEF_POWERUPDATE 5 // seconds -+#endif -+#ifndef ARGSDEF_TEMPUPDATE -+# define ARGSDEF_TEMPUPDATE 10 // seconds - #endif - - extern u_int32 args_cpuUpdate; - extern u_int32 args_batteryUpdate; -+extern u_int32 args_powerUpdate; -+extern u_int32 args_tempUpdate; - - /* name of diplay to open */ - #ifndef ARGSDEF_XDISPLAYNAME -@@ -363,7 +376,7 @@ - - /* incremental auto-scaling step */ - #ifndef ARGSDEF_INCREMENTALSTEP --# define ARGSDEF_INCREMENTALSTEP 100000 -+# define ARGSDEF_INCREMENTALSTEP 200000 - #endif - extern u_int32 args_incrementalStep; - -@@ -395,7 +408,7 @@ - #define PARADISIAC_OFF 2 - - #ifndef ARGSDEF_PARADISIAC --# define ARGSDEF_PARADISIAC PARADISIAC_ON -+# define ARGSDEF_PARADISIAC PARADISIAC_OFF - #endif - extern bool args_paradisiac; - -diff -Nru wmlaptop-1.4-orig/src/pixmap.c wmlaptop-1.4/src/pixmap.c ---- wmlaptop-1.4-orig/src/pixmap.c 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/pixmap.c 2008-04-18 21:56:45.012548584 +0300 -@@ -18,9 +18,235 @@ - - char ** wmlaptop_xpm = NULL; - -+/* XPM */ -+static char * wmlaptop_xpm_type0[] = { -+"123 140 81 1", -+" c None", -+". c #FF0000", -+"+ c #000000", -+"@ c #00FF04", -+"# c #968E8E", -+"$ c #FFFF00", -+"% c #FF1700", -+"& c #FF2F00", -+"* c #FF4700", -+"= c #FF5F00", -+"- c #FF7700", -+"; c #FF8E00", -+"> c #FFA600", -+", c #FFBE00", -+"' c #FFD600", -+") c #FFEE00", -+"! c #FFF900", -+"~ c #F4FA00", -+"{ c #DFFA00", -+"] c #C9FB00", -+"^ c #B4FB00", -+"/ c #9FFC00", -+"( c #89FD00", -+"_ c #74FD00", -+": c #5EFE00", -+"< c #49FE00", -+"[ c #3FFF00", -+"} c #050500", -+"| c #EFEC19", -+"1 c #242303", -+"2 c #B1AF13", -+"3 c #262504", -+"4 c #ECE919", -+"5 c #060600", -+"6 c #94920F", -+"7 c #E7E418", -+"8 c #6F6D0B", -+"9 c #ABA912", -+"0 c #67660B", -+"a c #020200", -+"b c #F3F01A", -+"c c #0F0F01", -+"d c #6A690B", -+"e c #A2A011", -+"f c #86850E", -+"g c #191902", -+"h c #101001", -+"i c #8C8B0F", -+"j c #605F0A", -+"k c #AAA812", -+"l c #2A2904", -+"m c #FBF81B", -+"n c #383706", -+"o c #AEAC12", -+"p c #525108", -+"q c #E0DD18", -+"r c #222203", -+"s c #161602", -+"t c #E8E518", -+"u c #5B5A09", -+"v c #F5F21A", -+"w c #63620A", -+"x c #E5E218", -+"y c #0B0B01", -+"z c #F8F51A", -+"A c #C6C415", -+"B c #BCB914", -+"C c #999710", -+"D c #C1BF14", -+"E c #AFAD12", -+"F c #7C7A0D", -+"G c #F7F41A", -+"H c #272604", -+"I c #5F5E0A", -+"J c #181802", -+"K c #0E0E01", -+"L c #313005", -+"M c #C4C215", -+"N c #DCD917", -+"O c #131302", -+"P c #6D6B0B", -+" ...........................................................", -+" ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.........+++....+++......+++.............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++........+++++...+++......+++.............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++..+++......+++.............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++..+++......+++.............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++...+++....+++..............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++...+++....+++..............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++...+++....+++..............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++...+++....+++..............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++...+++.++.+++..............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++...+++.++.+++..............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++....++.++.++...............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++....++.++.++...............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++....++.++.++...............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++.......+++.+++....++.++.++...............", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++++++...+++.+++.....++..++................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++++++....+++++......++..++................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...............+++++++.....+++.......++..++................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++.....+++...+++++++.+++++++.+++++.+++++....+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++....+++++..+++++++.+++++++.+++++.+++++++..+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++++.+++++++.+++++++.+++++++.+++++.+++++++..+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++++++...+++.....+++...+++...+++.++++.+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++.+++...+++.....+++...+++...+++..+++.+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++.+++...+++.....+++...+++...+++.++++.+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++.+++...+++.....+++...+++...+++.+++..+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++++.+++.+++...+++.....+++...++++..+++++++..+++.+++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..++++++..+++++++...+++.....+++...++++..+++++....+++++++...", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++++.+++++++...+++.....+++...++++..+++++.....+++++....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++++++...+++.....+++...+++...++++++....+++++....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++.+++...+++.....+++...+++...++++++.....+++.....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++.+++...+++.....+++...+++...+++++++....+++.....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++.+++.+++.+++...+++.....+++...+++...+++.+++....+++.....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++++.+++.+++...+++.....+++...+++++.+++.++++...+++.....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++...+++.+++...+++.....+++...+++++.+++..+++...+++.....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ..+++++...+++.+++...+++.....+++...+++++.+++..+++...+++.....", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ...........................................................", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"+@@+++@++@@+@@@+@+++@@@++@@+@@@@+@@++@@++@++++@++++###+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++@+@@+@++@+++@@+++@+++@++++++@@++@@++@@+@++@++++#++###+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++@@+@+@++@+++@@+++@+++@++++++@@++@@++@+@++@++++#+++#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++@++@+++@++@@+@+++@@@+@@@++++@+@@++@@@+++@++++#+#++###+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++@++@++@+++++@@+@++++@@++@++@+@++@+++@++@++@+#+++###+++++++++++++++++++++++++$$$+++++++++$$$++++$$$++++++$$$+++++++++++++", -+"@++@++@+@++++++@@@@@+++@@++@++@+@++@+++@+@++@+@#+++++++++++++++++++++++++++++++$$$++++++++$$$$$+++$$$++++++$$$+++++++++++++", -+"+@@+@@@@@@@@@@@+++@+@@@++@@+++@++@@++@@+@++++@+++++@@@+++......++++++++++++++++$$$+++++++$$$+$$$++$$$++++++$$$+++++++++++++", -+"+$$+++$++$$+$$$+$+++$$$++$$+$$$$+$$++$$++$++++$+++@++@@@+++++++++++++++++++++++$$$+++++++$$$+$$$++$$$++++++$$$+++++++++++++", -+"$++$+$$+$++$+++$$+++$+++$++++++$$++$$++$$+$++$+++@+++@+++++++++++++++++++++++++$$$+++++++$$$+$$$+++$$$++++$$$++++++++++++++", -+"$++$$+$+$++$+++$$+++$+++$++++++$$++$$++$+$++$+++@+@++@@@+++++++++++++++++++++++$$$+++++++$$$+$$$+++$$$++++$$$++++++++++++++", -+"$++$++$+++$++$$+$+++$$$+$$$++++$+$$++$$$+++$+++@+++@@@+++++++++++++++++++++++++$$$+++++++$$$+$$$+++$$$++++$$$++++++++++++++", -+"$++$++$++$+++++$$+$++++$$++$++$+$++$+++$++$++$+@+++++++++++++++++++++++++++++++$$$+++++++$$$+$$$+++$$$++++$$$++++++++++++++", -+"$++$++$+$++++++$$$$$+++$$++$++$+$++$+++$+$++$+$++++++++++++++++++++++++++++++++$$$+++++++$$$+$$$+++$$$+$$+$$$++++++++++++++", -+"+$$+$$$$$$$$$$$+++$+$$$++$$+++$++$$++$$+$++++$+++++$$++++++++++++++++++++++++++$$$+++++++$$$+$$$+++$$$+$$+$$$++++++++++++++", -+"+..+++.++..+...+.+++...++..+....+..++..++.++++.+++$$$$+++++++++++++++++++++++++$$$+++++++$$$+$$$++++$$+$$+$$+++++++++++++++", -+".++.+..+.++.+++..+++.+++.++++++..++..++..+.++.+++$$$$$$++++++++++++++++++++++++$$$+++++++$$$+$$$++++$$+$$+$$+++++++++++++++", -+".++..+.+.++.+++..+++.+++.++++++..++..++.+.++.+++$$$$$$$$+++++++++++++++++++++++$$$+++++++$$$+$$$++++$$+$$+$$+++++++++++++++", -+".++.++.+++.++..+.+++...+...++++.+..++...+++.+++++$$$$$$++++++++++++++++++++++++$$$+++++++$$$+$$$++++$$+$$+$$+++++++++++++++", -+".++.++.++.+++++..+.++++..++.++.+.++.+++.++.++.++++$$$$+++++++++++++++++++++++++$$$$$$$+++$$$+$$$+++++$$++$$++++++++++++++++", -+".++.++.+.++++++.....+++..++.++.+.++.+++.+.++.+.++++$$++++++++++++++++++++++++++$$$$$$$++++$$$$$++++++$$++$$++++++++++++++++", -+"+..+...........+++.+...++..+++.++..++..+.++++.+++++++++++++++++++++++++++++++++$$$$$$$+++++$$$+++++++$$++$$++++++++++++++++", -+"+@@@@++++@+++@@@@+@@@@+++++@++@@@@@++@@@@+@@@@@@+@@@@++@@@@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@++@@++@++++@++++@++++@++@+++++@+++++@++++@@++++@@++++@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@+@+@++@++++@+++++@++@+++@+++++@++++++++++@@++++@@++++@#.@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@@++@+++++++@+++++@++@+++@+++++@++++++++++@@++++@@++++@#.@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@+++@++++++@+++@@@++@++++@@@@++@@@@@+++++@++@@@@++@@@@@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@+++@+++++@++++++@++@++++++++@+@++++@++++@+@++++@+++++@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@+++@++++@++++++++@@++@+++++++@@++++@+++@++@++++@+++++@#.@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@+++@+++@+++++++++@@@@@@@+++++@@++++@+++@++@++++@+++++@#.@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"@++++@+++@++@+++++++++@++++@++++++@+@++++@+++@++@++++@+++++@++++++$$$$$+++++$$$+++$$$$$$$+$$$$$$$+$$$$$+$$$$$++++$$$+$$$+++", -+"+@@@@+@@@@@@@@@@@@@@@@+++++@++@@@@+++@@@@++++@+++@@@@++@@@@+++++++$$$$$++++$$$$$++$$$$$$$+$$$$$$$+$$$$$+$$$$$$$++$$$+$$$+++", -+"..................................................%&*=-;>,')++++++$$$$$$$+$$$$$$$+$$$$$$$+$$$$$$$+$$$$$+$$$$$$$++$$$+$$$+++", -+".+++++++++++++++++++++++++++++++++++++++++++++++..%&*=-;>,')++++++$$$+$$$+$$$$$$$+++$$$+++++$$$+++$$$+++$$$+$$$$+$$$+$$$+++", -+".+++.+++.++.+.....++..++++++....+...++....++..++..%&*=-;>,')++++++$$$+$$$+$$$+$$$+++$$$+++++$$$+++$$$+++$$$++$$$+$$$+$$$+++", -+".+++.+++.++.+++.+++.++.+++++.++++.++.+.++++.++.+..%&*=-;>,')++++++$$$+$$$+$$$+$$$+++$$$+++++$$$+++$$$+++$$$+$$$$+$$$+$$$+++", -+".++.+.++.++.+++.+++.++.+++++.++++.++.+.++++.++.+..%&*=-;>,')++++++$$$+$$$+$$$+$$$+++$$$+++++$$$+++$$$+++$$$+$$$++$$$+$$$+++", -+".++.+.++.++.+++.+++.++.+...+...++...++...++.++.+..%&*=-;>,')++++++$$$$$$$+$$$+$$$+++$$$+++++$$$+++$$$$++$$$$$$$++$$$+$$$+++", -+".+.....+.++.+++.+++.++.+++++.++++.++.+.++++..+.+..%&*=-;>,')++++++$$$$$$++$$$$$$$+++$$$+++++$$$+++$$$$++$$$$$++++$$$$$$$+++", -+".+.+++.+.++.+++.+++.++.+++++.++++.++.+.++++.+..+.!~{]^/(_:<[++++++$$$$$$$+$$$$$$$+++$$$+++++$$$+++$$$$++$$$$$+++++$$$$$++++", -+".+.+++.++..++++.++++..++++++.++++.++.+....++...+.!~{]^/(_:<[++++++$$$+$$$+$$$$$$$+++$$$+++++$$$+++$$$+++$$$$$$++++$$$$$++++", -+".+++++++++++++++++++++++++++++++++++++++++++++++.!~{]^/(_:<[++++++$$$+$$$+$$$+$$$+++$$$+++++$$$+++$$$+++$$$$$$+++++$$$+++++", -+".................................................!~{]^/(_:<[++++++$$$+$$$+$$$+$$$+++$$$+++++$$$+++$$$+++$$$$$$$++++$$$+++++", -+"#################################################!~{]^/(_:<[++++++$$$+$$$+$$$+$$$+++$$$+++++$$$+++$$$+++$$$+$$$++++$$$+++++", -+"#+++++++++++++++++++++++++++++++++++++++++++++++#!~{]^/(_:<[++++++$$$$$$$+$$$+$$$+++$$$+++++$$$+++$$$$$+$$$+$$$$+++$$$+++++", -+"#+++#+++#++#+#####++##++++++####+###++####++##++#!~{]^/(_:<[++++++$$$$$+++$$$+$$$+++$$$+++++$$$+++$$$$$+$$$++$$$+++$$$+++++", -+"#+++#+++#++#+++#+++#++#+++++#++++#++#+#++++#++#+#++++##+++++++++++$$$$$+++$$$+$$$+++$$$+++++$$$+++$$$$$+$$$++$$$+++$$$+++++", -+"#++#+#++#++#+++#+++#++#+++++#++++#++#+#++++#++#+#+++####+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"#++#+#++#++#+++#+++#++#+###+###++###++###++#++#+#++######++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"#+#####+#++#+++#+++#++#+++++#++++#++#+#++++##+#+#+########+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"#+#+++#+#++#+++#+++#++#+++++#++++#++#+#++++#+##+#++######++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"#+#+++#++##++++#++++##++++++#++++#++#+####++###+#+++####+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++++++#++++##++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"#################################################++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"+$$$+$$$++$++$++$+++++$$$++++$+++$$$+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"$++++$++$+$++$++$++++$+++$+++$+++$++$++####+++++++++++++++++++++ ####################################################### ", -+"$++++$++$+$++$++$++++$+++$++$+$++$++$+#++++#++@+++@+@++@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"$++++$$$++$++$++$++++$+++$++$+$++$++$+#++++#++@@+@@+@++@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"$++++$++++$++$++$++++$+++$+$$$$$+$++$+#++++#++@@@@@+@++@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"$++++$++++$++$++$++++$+++$+$+++$+$++$+#++++#++@+@+@+@@@@+@@@@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"+$$$+$+++++$$+++$$$$++$$$++$+++$+$$$++#++++#++@+++@+@@@@++++@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"+...+...++.++.++.+++++...++++.+++...++#++++#++@+++@+@++@+++@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+".++++.++.+.++.++.++++.+++.+++.+++.++.+#++++#++@+++@+@++@+++@+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+".++++.++.+.++.++.++++.+++.++.+.++.++.+#++++#++@+++@+@++@++@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+".++++...++.++.++.++++.+++.++.+.++.++.++####+++@+++@+@++@+@@@@++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+".++++.++++.++.++.++++.+++.+.....+.++.++++++++++++++++++++++++++++}+++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+".++++.++++.++.++.++++.+++.+.+++.+.++.++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"+...+.+++++..+++....++...++.+++.+...++++++++++++++++++++++++++++++++++@+++++++@++.+++++++.+++++++++++++++++++++++++++++++++", -+"############################################# ++++++@+++++++@++.+++++++.+++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++# ++++++@+++++++@++.+++++++.+++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++# ++++++@+++++++@++.+++++++.+++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++# ++++++@+++@+++@++.+++.+++.+++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++# ++++++@@+@@@+@@++..+...+..+++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++# +++++++@@+++@@++++..+++..++++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"#+++++++++++++++++++++++++++++++++++++++++++# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -+"############################################# "}; -+ -+ - - /* XPM */ --char * wmlaptop_xpm_type0[] = { -+/*char * wmlaptop_xpm_type0[] = { - "123 140 27 1", - " c None", - ". c #FF0000", -@@ -190,7 +416,7 @@ - "#+++++++++++++++++++++++++++++++++++++++++++# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", - "############################################# "}; - -- -+*/ - - - /* XPM */ -diff -Nru wmlaptop-1.4-orig/src/version.h wmlaptop-1.4/src/version.h ---- wmlaptop-1.4-orig/src/version.h 2008-04-18 21:55:54.497550614 +0300 -+++ wmlaptop-1.4/src/version.h 2008-04-18 21:56:45.012548584 +0300 -@@ -1,7 +1,7 @@ - #ifndef __VERSION_H__ - #define __VERSION_H__ - --#define BUILD_NR 256 -+#define BUILD_NR 495 - #define PROGNAME "WmLaptop" - #define VERSION "1.4" - diff --git a/wmthrottle/.footprint b/wmthrottle/.footprint deleted file mode 100644 index ca769a42f..000000000 --- a/wmthrottle/.footprint +++ /dev/null @@ -1,6 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/wmthrottle -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/wmthrottle.1.gz diff --git a/wmthrottle/.md5sum b/wmthrottle/.md5sum deleted file mode 100644 index 8cf5bb830..000000000 --- a/wmthrottle/.md5sum +++ /dev/null @@ -1 +0,0 @@ -79e080965f48bbfe08fc9a4d9031b1b5 wmthrottle-0.1.1.tar.bz2 diff --git a/wmthrottle/Pkgfile b/wmthrottle/Pkgfile deleted file mode 100644 index 3f1292e09..000000000 --- a/wmthrottle/Pkgfile +++ /dev/null @@ -1,20 +0,0 @@ -# Description: The version of wmthrottle dockapp that supports acpi/performance and Enhanced Speedstep -# URL: http://rffr.de/acpi -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Depends on: xorg - -name=wmthrottle -version=0.1.1 -release=2 -source=(http://rffr.de/$name-$version.tar.bz2) - -build() { - cd $name-$version - aclocal - automake - autoconf - ./configure --prefix=/usr --disable-nls \ - --mandir=/usr/man - make - make DESTDIR=$PKG install -} diff --git a/wmthrottle/README b/wmthrottle/README deleted file mode 100644 index fc0def9b8..000000000 --- a/wmthrottle/README +++ /dev/null @@ -1,13 +0,0 @@ -README for wmthrottle - -REQUIREMENTS - -PRE-INSTALL - -POST-INSTALL - -RESOURCES - -PRECAUTION -The 'make install' (from Pkgfile) will NOT suid the binary file. To allow -regular user to change throttling state do it manually or use sudo. diff --git a/wmwifi/.footprint b/wmwifi/.footprint deleted file mode 100644 index f116da1f3..000000000 --- a/wmwifi/.footprint +++ /dev/null @@ -1,3 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/wmwifi diff --git a/wmwifi/.md5sum b/wmwifi/.md5sum deleted file mode 100644 index bf2b9ca65..000000000 --- a/wmwifi/.md5sum +++ /dev/null @@ -1 +0,0 @@ -b170d4a6c4fc42774b9798cf98af1c27 wmwifi-0.6.tar.gz diff --git a/wmwifi/Pkgfile b/wmwifi/Pkgfile deleted file mode 100644 index 37c8c4896..000000000 --- a/wmwifi/Pkgfile +++ /dev/null @@ -1,17 +0,0 @@ -# Description: A dockapp to monitor wireless signal strength -# URL: http://www.dockapps.org/file.php/id/222 -# Maintainer: Mikhail Kolesnik, mike at openbunker dot org -# Packager: Martin Opel mo at obbl-net dot de -# Depends on: xorg-libxpm - -name=wmwifi -version=0.6 -release=1 -source=(http://www.dockapps.org/download.php/id/669/$name-$version.tar.gz) - -build() { - cd $name-$version - ./configure --prefix=/usr - make - make DESTDIR=$PKG install -}