From 95a71d22c858715179161121cb81c3c99daa909a Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Mon, 15 Nov 2010 21:07:12 +0200 Subject: [PATCH] dzen2: Modify dzen-extras, update Makefile and recipe. Modularized the battery applet by moving the charge calculation in an external script and adding per-platform functions. Made the process a bit more efficient by adding a small program written in C, dzen-battery, which calculates a battery percentage given two standard files in /sys/class/power_supply and by moving processes outside the main loop when they only need to run once. Modified Makefile for dzen-battery.c Bumped PR on dzen2-svn Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- recipes/dzen2/dzen2_svn.bb | 2 +- recipes/dzen2/files/Makefile | 8 +++++++- recipes/dzen2/files/dzen-extras.tar.gz | Bin 5082 -> 5491 bytes 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/recipes/dzen2/dzen2_svn.bb b/recipes/dzen2/dzen2_svn.bb index 893a5778b2..fa1072483b 100644 --- a/recipes/dzen2/dzen2_svn.bb +++ b/recipes/dzen2/dzen2_svn.bb @@ -5,7 +5,7 @@ RDEPENDS = "ttf-dejavu-sans xrandr" SRCREV = "271" PV = "0.8.5+svnr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://dzen.googlecode.com/svn/;module=trunk;proto=http \ file://dzen-extras.tar.gz \ diff --git a/recipes/dzen2/files/Makefile b/recipes/dzen2/files/Makefile index 4e3525a176..4bafbcbd80 100644 --- a/recipes/dzen2/files/Makefile +++ b/recipes/dzen2/files/Makefile @@ -6,7 +6,7 @@ include config.mk SRC = draw.c main.c util.c action.c OBJ = ${SRC:.c=.o} -all: options dzen2 +all: options dzen2 dzen-battery options: @echo dzen2 build options: @@ -24,6 +24,10 @@ dzen2: ${OBJ} @echo CC -o $@ @${CC} -o $@ ${OBJ} ${LDFLAGS} ${LIBS} +dzen-battery: dzen-battery.c + @${CC} -c ${CFLAGS} dzen-battery.c + @${CC} -o dzen-battery dzen-battery.o ${LDFLAGS} + clean: @echo cleaning @rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz @@ -43,6 +47,8 @@ install: all @chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2 @cp -f dzen-launcher ${DESTDIR}${PREFIX}/bin @chmod 755 ${DESTDIR}${PREFIX}/bin/dzen-launcher + @cp -f dzen-battery ${DESTDIR}${PREFIX}/bin + @chmod 755 ${DESTDIR}${PREFIX}/bin/dzen-battery @echo installing scripts to ${DESTDIR}${PREFIX}/share/dzen @mkdir -p ${DESTDIR}${PREFIX}/share/dzen/scripts @cp -f scripts/* ${DESTDIR}${PREFIX}/share/dzen/scripts diff --git a/recipes/dzen2/files/dzen-extras.tar.gz b/recipes/dzen2/files/dzen-extras.tar.gz index d57171404a181e08cb3086bbf4abbc4bb7942e39..7a10757722505c168582c8d778731dbb85ca9a76 100644 GIT binary patch literal 5491 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 -- 2.39.5