| 1 |
s4t4n 11/05/26 14:52:47 |
| 2 |
|
| 3 |
Added: wmlaptop-Makefile.patch |
| 4 |
wmlaptop-ACPI-detection.patch |
| 5 |
Removed: wmlaptop-1.3-Makefile.patch |
| 6 |
Log: |
| 7 |
Version bump. Added patch to check for /proc/acpi instead of /proc/acpi/info. Partially fixes bug #348124. |
| 8 |
|
| 9 |
(Portage version: 2.1.9.42/cvs/Linux i686) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 x11-plugins/wmlaptop/files/wmlaptop-Makefile.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmlaptop/files/wmlaptop-Makefile.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmlaptop/files/wmlaptop-Makefile.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: wmlaptop-Makefile.patch |
| 18 |
=================================================================== |
| 19 |
--- /Makefile 2010-09-09 13:44:07.000000000 +0200 |
| 20 |
+++ /Makefile.new 2010-09-09 13:47:40.000000000 +0200 |
| 21 |
@@ -1,14 +1,17 @@ |
| 22 |
- |
| 23 |
+LIBDIR = -L/usr/X11R6/lib |
| 24 |
+LIBS = -lXpm -lXext -lX11 |
| 25 |
+OBJS = main.o init.o event.o draw.o battery.o cpu.o autoscript.o pixmap.o |
| 26 |
+EXE = wmlaptop |
| 27 |
|
| 28 |
|
| 29 |
.c.o: |
| 30 |
- $(CC) -c $< -o $*.o $(CFLAGS) |
| 31 |
+ $(CC) $(CFLAGS) -c $< -o $*.o |
| 32 |
|
| 33 |
all: $(EXE) |
| 34 |
|
| 35 |
$(EXE): $(OBJS) |
| 36 |
./buildCounter |
| 37 |
- $(CC) -o $(EXE) $^ $(LIBDIR) $(LIBS) |
| 38 |
+ $(CC) $(LDFLAGS) -o $(EXE) $^ $(LIBDIR) $(LIBS) |
| 39 |
|
| 40 |
|
| 41 |
clean: |
| 42 |
@@ -20,7 +23,7 @@ |
| 43 |
reall: clean all |
| 44 |
|
| 45 |
install: |
| 46 |
- /usr/bin/install -c -o 0 -g 0 -s -m 755 $(EXE) $(INSTALLDIR)/$(EXE) |
| 47 |
+ /usr/bin/install -c -o 0 -g 0 -m 755 $(EXE) $(INSTALLDIR)/$(EXE) |
| 48 |
chmod +s $(INSTALLDIR)/$(EXE) |
| 49 |
|
| 50 |
uninstall: |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.1 x11-plugins/wmlaptop/files/wmlaptop-ACPI-detection.patch |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmlaptop/files/wmlaptop-ACPI-detection.patch?rev=1.1&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmlaptop/files/wmlaptop-ACPI-detection.patch?rev=1.1&content-type=text/plain |
| 58 |
|
| 59 |
Index: wmlaptop-ACPI-detection.patch |
| 60 |
=================================================================== |
| 61 |
diff -ru wmlaptop-1.4.orig/src/battery.c wmlaptop-1.4/src/battery.c |
| 62 |
--- wmlaptop-1.4.orig/src/battery.c 2010-11-26 14:26:27.594108155 -0600 |
| 63 |
+++ wmlaptop-1.4/src/battery.c 2010-11-26 14:26:51.324108155 -0600 |
| 64 |
@@ -74,7 +74,7 @@ |
| 65 |
|
| 66 |
bool ACPI_canSupport( ) |
| 67 |
{ |
| 68 |
- if( access( ACPI_ACCESS_TEST, R_OK ) == SUCCESS ) |
| 69 |
+ if( access( ACPI_ACCESS_TEST, R_OK | X_OK ) == SUCCESS ) |
| 70 |
return true; |
| 71 |
return false; |
| 72 |
} |
| 73 |
diff -ru wmlaptop-1.4.orig/src/battery.h wmlaptop-1.4/src/battery.h |
| 74 |
--- wmlaptop-1.4.orig/src/battery.h 2010-11-26 14:26:27.594108155 -0600 |
| 75 |
+++ wmlaptop-1.4/src/battery.h 2010-11-26 14:26:56.100774821 -0600 |
| 76 |
@@ -24,7 +24,7 @@ |
| 77 |
/******************* |
| 78 |
* ACPI FEATURES * |
| 79 |
*********************************************************************************/ |
| 80 |
-#define ACPI_ACCESS_TEST "/proc/acpi/info" |
| 81 |
+#define ACPI_ACCESS_TEST "/proc/acpi" |
| 82 |
#define ACPI_BATTERY_DIR "/proc/acpi/battery" |
| 83 |
//TODO #define ACPI_BATTERY_DIR "/home/mtc/hisBattery/battery" |
Archives