diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
| commit | 01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (patch) | |
| tree | 6dfcf9c3c4143226d0ef65ce2d139f80f8fcacc1 /extra/conky | |
| parent | 40e1222c1402c0d2aded73b95802f8197d0691a6 (diff) | |
| parent | 9343f37ee7ba1aa98f65272412d331a280890e12 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/epdfview/PKGBUILD
community/gpa/PKGBUILD
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/lmctl/PKGBUILD
community/mediatomb/PKGBUILD
community/ruby-atk/PKGBUILD
community/ruby-gdkpixbuf2/PKGBUILD
community/ruby-gio2/PKGBUILD
community/ruby-glib2/PKGBUILD
community/ruby-pango/PKGBUILD
core/eglibc/glibc-2.10-bz4781.patch
core/eglibc/glibc-2.10-dont-build-timezone.patch
core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch
core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
core/eglibc/glibc-2.13-futex.patch
core/eglibc/glibc-__i686.patch
extra/silc-toolkit/PKGBUILD
Diffstat (limited to 'extra/conky')
| -rw-r--r-- | extra/conky/current-power.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/extra/conky/current-power.patch b/extra/conky/current-power.patch deleted file mode 100644 index 1e7cf5a23..000000000 --- a/extra/conky/current-power.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/src/linux.c new/src/linux.c ---- old/src/linux.c 2010-10-05 23:29:36.000000000 +0200 -+++ new/src/linux.c 2010-12-06 22:18:59.346667183 +0100 -@@ -1671,6 +1671,8 @@ - the tradition! */ - else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0) - sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate); -+ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0) -+ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate); - else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0) - sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity); - else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0) |