wok-next diff libacpi/stuff/patches/libacpi_0.2-4.diff @ rev 21661
updated fonttosfnt (1.0.5 -> 1.1.0)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Sat Jun 27 13:41:53 2020 +0100 (2020-06-27) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/libacpi/stuff/patches/libacpi_0.2-4.diff Sat Jun 27 13:41:53 2020 +0100 1.3 @@ -0,0 +1,458 @@ 1.4 +--- libacpi-0.2.orig/libacpi.h 1.5 ++++ libacpi-0.2/libacpi.h 1.6 +@@ -12,6 +12,8 @@ 1.7 + #define __LIBACPI_H__ 1.8 + 1.9 + #define PROC_ACPI "/proc/acpi/" 1.10 ++#define SYS_POWER "/sys/class/power_supply" 1.11 ++ 1.12 + #define LINE_MAX 256 1.13 + #define MAX_NAME 512 1.14 + #define MAX_BUF 1024 1.15 +@@ -177,6 +179,7 @@ 1.16 + int fan_count; /**< number of found fans */ 1.17 + int temperature; /**< system temperature if we only have on thermal zone */ 1.18 + adapter_t adapt; /**< ac adapter */ 1.19 ++ int sysstyle; 1.20 + } global_t; 1.21 + 1.22 + /** 1.23 +@@ -239,6 +242,7 @@ 1.24 + * Looks up if the ac adapter is plugged in or not 1.25 + * and sets the values in a struct 1.26 + * @param globals pointer to the global acpi structure 1.27 ++ * @param sysstyle whether or not to use the /sys interface 1.28 + */ 1.29 + void read_acpi_acstate(global_t *globals); 1.30 + /** 1.31 +--- libacpi-0.2.orig/libacpi.c 1.32 ++++ libacpi-0.2/libacpi.c 1.33 +@@ -14,8 +14,9 @@ 1.34 + #include "libacpi.h" 1.35 + #include "list.h" 1.36 + 1.37 +-static int read_acpi_battinfo(const int num); 1.38 +-static int read_acpi_battalarm(const int num); 1.39 ++ 1.40 ++static int read_acpi_battinfo(const int num, const int sysstyle); 1.41 ++static int read_acpi_battalarm(const int num, const int sysstyle); 1.42 + static int read_acpi_battstate(const int num); 1.43 + static void read_acpi_thermalzones(global_t *globals); 1.44 + 1.45 +@@ -144,8 +145,15 @@ 1.46 + int i = 0; 1.47 + 1.48 + globals->batt_count = 0; 1.49 ++ globals->sysstyle = 0; 1.50 + if((lst = dir_list(PROC_ACPI "battery")) == NULL || !lst->top) 1.51 +- return NOT_SUPPORTED; 1.52 ++ { 1.53 ++ /* check for new Linux 2.6.24+ layout */ 1.54 ++ if((lst = dir_list(SYS_POWER)) == NULL || !lst->top) 1.55 ++ return NOT_SUPPORTED; 1.56 ++ else 1.57 ++ globals->sysstyle = 1; 1.58 ++ } 1.59 + for(node = lst->top; node; node=node->next){ 1.60 + if((names[globals->batt_count] = strdup(node->name)) == NULL){ 1.61 + delete_list(lst); 1.62 +@@ -174,11 +182,20 @@ 1.63 + for (i=0; i < globals->batt_count && i < MAX_ITEMS; i++){ 1.64 + binfo = &batteries[i]; 1.65 + snprintf(binfo->name, MAX_NAME, "%s", names[i]); 1.66 +- snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]); 1.67 +- snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]); 1.68 +- snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]); 1.69 +- read_acpi_battinfo(i); 1.70 +- read_acpi_battalarm(i); 1.71 ++ if(globals->sysstyle) 1.72 ++ { 1.73 ++ snprintf(binfo->state_file, MAX_NAME, "/%s/present", names[i]); 1.74 ++ snprintf(binfo->info_file, MAX_NAME, SYS_POWER "/%s", names[i]); 1.75 ++ snprintf(binfo->alarm_file, MAX_NAME, SYS_POWER "/%s/alarm", names[i]); 1.76 ++ } 1.77 ++ else 1.78 ++ { 1.79 ++ snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]); 1.80 ++ snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]); 1.81 ++ snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]); 1.82 ++ } 1.83 ++ read_acpi_battinfo(i, globals->sysstyle); 1.84 ++ read_acpi_battalarm(i, globals->sysstyle); 1.85 + free(names[i]); 1.86 + } 1.87 + delete_list(lst); 1.88 +@@ -196,11 +213,22 @@ 1.89 + ac->ac_state = P_ERR; 1.90 + return; 1.91 + } 1.92 +- if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7)) 1.93 +- ac->ac_state = P_AC; 1.94 +- else if(tmp && !strncmp(tmp, "off-line", 8)) 1.95 +- ac->ac_state = P_BATT; 1.96 +- else ac->ac_state = P_ERR; 1.97 ++ if(globals->sysstyle) 1.98 ++ { 1.99 ++ if(!strcmp(buf, "1")) 1.100 ++ ac->ac_state = P_AC; 1.101 ++ else if(!strcmp(buf, "0")) 1.102 ++ ac->ac_state = P_BATT; 1.103 ++ else ac->ac_state = P_ERR; 1.104 ++ } 1.105 ++ else 1.106 ++ { 1.107 ++ if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7)) 1.108 ++ ac->ac_state = P_AC; 1.109 ++ else if(tmp && !strncmp(tmp, "off-line", 8)) 1.110 ++ ac->ac_state = P_BATT; 1.111 ++ else ac->ac_state = P_ERR; 1.112 ++ } 1.113 + free(buf); 1.114 + free(tmp); 1.115 + } 1.116 +@@ -212,14 +240,22 @@ 1.117 + list_t *lst = NULL; 1.118 + adapter_t *ac = &globals->adapt; 1.119 + 1.120 ++ globals->sysstyle = 0; 1.121 + if((lst = dir_list(PROC_ACPI "ac_adapter")) == NULL || !lst->top) 1.122 +- return NOT_SUPPORTED; 1.123 +- 1.124 ++ { 1.125 ++ if((lst = dir_list(SYS_POWER "/AC")) == NULL || !lst->top) 1.126 ++ return NOT_SUPPORTED; 1.127 ++ else 1.128 ++ globals->sysstyle = 1; 1.129 ++ } 1.130 + if((!lst->top->name || ((ac->name = strdup(lst->top->name)) == NULL))){ 1.131 + delete_list(lst); 1.132 + return ALLOC_ERR; 1.133 + } 1.134 +- snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name); 1.135 ++ if(globals->sysstyle) 1.136 ++ snprintf(ac->state_file, MAX_NAME, SYS_POWER "/AC/online"); 1.137 ++ else 1.138 ++ snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name); 1.139 + delete_list(lst); 1.140 + read_acpi_acstate(globals); 1.141 + return SUCCESS; 1.142 +@@ -450,7 +486,7 @@ 1.143 + 1.144 + /* read alarm capacity, return 0 on success, negative values on error */ 1.145 + static int 1.146 +-read_acpi_battalarm(const int num){ 1.147 ++read_acpi_battalarm(const int num, const int sysstyle){ 1.148 + char *buf = NULL; 1.149 + char *tmp = NULL; 1.150 + battery_t *info = &batteries[num]; 1.151 +@@ -458,10 +494,22 @@ 1.152 + if((buf = get_acpi_content(info->alarm_file)) == NULL) 1.153 + return NOT_SUPPORTED; 1.154 + 1.155 +- if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u') 1.156 +- info->alarm = strtol(tmp, NULL, 10); 1.157 ++ if(sysstyle) 1.158 ++ { 1.159 ++ if(!strcmp(buf, "0")) 1.160 ++ info->alarm = 0; 1.161 ++ else if(!strcmp(buf, "1")) 1.162 ++ info->alarm = 1; 1.163 ++ else 1.164 ++ info->alarm = NOT_SUPPORTED; 1.165 ++ } 1.166 + else 1.167 +- info->alarm = NOT_SUPPORTED; 1.168 ++ { 1.169 ++ if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u') 1.170 ++ info->alarm = strtol(tmp, NULL, 10); 1.171 ++ else 1.172 ++ info->alarm = NOT_SUPPORTED; 1.173 ++ } 1.174 + free(buf); 1.175 + free(tmp); 1.176 + return SUCCESS; 1.177 +@@ -469,11 +517,58 @@ 1.178 + 1.179 + /* reads static values for a battery (info file), returns SUCCESS */ 1.180 + static int 1.181 +-read_acpi_battinfo(const int num){ 1.182 ++read_acpi_battinfo(const int num, const int sysstyle){ 1.183 + char *buf = NULL; 1.184 + char *tmp = NULL; 1.185 + battery_t *info = &batteries[num]; 1.186 + int i = 0; 1.187 ++ char sysfile[MAX_NAME]; 1.188 ++ 1.189 ++ if(sysstyle) 1.190 ++ { 1.191 ++ snprintf(sysfile, MAX_NAME, "%s/present", info->info_file); 1.192 ++ if((buf = get_acpi_content(sysfile)) == NULL) 1.193 ++ return NOT_SUPPORTED; 1.194 ++ if(!strcmp(buf, "1")) { 1.195 ++ info->present = 1; 1.196 ++ } else { 1.197 ++ info->present = 0; 1.198 ++ return NOT_PRESENT; 1.199 ++ } 1.200 ++ 1.201 ++ snprintf(sysfile, MAX_NAME, "%s/charge_full_design", info->info_file); 1.202 ++ if((buf = get_acpi_content(sysfile)) == NULL) 1.203 ++ return NOT_SUPPORTED; 1.204 ++ info->design_cap = strtol(buf, NULL, 10); 1.205 ++ 1.206 ++ snprintf(sysfile, MAX_NAME, "%s/charge_full", info->info_file); 1.207 ++ if((buf = get_acpi_content(sysfile)) == NULL) 1.208 ++ return NOT_SUPPORTED; 1.209 ++ info->last_full_cap = strtol(buf, NULL, 10); 1.210 ++ 1.211 ++ snprintf(sysfile, MAX_NAME, "%s/charge_now", info->info_file); 1.212 ++ if((buf = get_acpi_content(sysfile)) == NULL) 1.213 ++ return NOT_SUPPORTED; 1.214 ++ info->remaining_cap = strtol(buf, NULL, 10); 1.215 ++ 1.216 ++ snprintf(sysfile, MAX_NAME, "%s/voltage_min_design", info->info_file); 1.217 ++ if((buf = get_acpi_content(sysfile)) == NULL) 1.218 ++ return NOT_SUPPORTED; 1.219 ++ info->design_voltage = strtol(buf, NULL, 10); 1.220 ++ 1.221 ++ snprintf(sysfile, MAX_NAME, "%s/voltage_now", info->info_file); 1.222 ++ if((buf = get_acpi_content(sysfile)) == NULL) 1.223 ++ return NOT_SUPPORTED; 1.224 ++ info->present_voltage = strtol(buf, NULL, 10); 1.225 ++ 1.226 ++ /* FIXME: is rate == current here? */ 1.227 ++ snprintf(sysfile, MAX_NAME, "%s/current_now", info->info_file); 1.228 ++ if((buf = get_acpi_content(sysfile)) == NULL) 1.229 ++ return NOT_SUPPORTED; 1.230 ++ info->present_rate = strtol(buf, NULL, 10); 1.231 ++ 1.232 ++ return SUCCESS; 1.233 ++ } 1.234 + 1.235 + if((buf = get_acpi_content(info->info_file)) == NULL) 1.236 + return NOT_SUPPORTED; 1.237 +@@ -608,7 +703,7 @@ 1.238 + read_acpi_batt(const int num){ 1.239 + if(num > MAX_ITEMS) return ITEM_EXCEED; 1.240 + read_acpi_battstate(num); 1.241 +- read_acpi_battalarm(num); 1.242 ++ read_acpi_battalarm(num, 0); 1.243 + calc_remain_perc(num); 1.244 + calc_remain_chargetime(num); 1.245 + calc_remain_time(num); 1.246 +--- libacpi-0.2.orig/test-libacpi.c 1.247 ++++ libacpi-0.2/test-libacpi.c 1.248 +@@ -46,6 +46,7 @@ 1.249 + read_acpi_batt(i); 1.250 + 1.251 + if(binfo->present) 1.252 ++ { 1.253 + printf("\n%s:\tpresent: %d\n" 1.254 + "\tdesign capacity: %d\n" 1.255 + "\tlast full capacity: %d\n" 1.256 +@@ -65,6 +66,9 @@ 1.257 + binfo->batt_state, binfo->percentage, 1.258 + binfo->charge_time / 60, binfo->charge_time % 60, 1.259 + binfo->remaining_time / 60, binfo->remaining_time % 60); 1.260 ++ if(binfo->alarm) 1.261 ++ printf("%s: Alarm!\n", binfo->name); 1.262 ++ } 1.263 + } 1.264 + } else printf("Battery information:\tnot supported\n"); 1.265 + 1.266 +--- libacpi-0.2.orig/debian/control 1.267 ++++ libacpi-0.2/debian/control 1.268 +@@ -0,0 +1,30 @@ 1.269 ++Source: libacpi 1.270 ++Priority: optional 1.271 ++Maintainer: Nico Golde <nion@debian.org> 1.272 ++Build-Depends: debhelper (>= 5) 1.273 ++Standards-Version: 3.7.3 1.274 ++Section: libs 1.275 ++Homepage: http://www.ngolde.de/libacpi.html 1.276 ++ 1.277 ++Package: libacpi-dev 1.278 ++Section: libdevel 1.279 ++Architecture: i386 ia64 amd64 1.280 ++Depends: libacpi0 (= ${binary:Version}) 1.281 ++Description: development files for libacpi 1.282 ++ libacpi is a general purpose shared library for programs gathering 1.283 ++ ACPI data on Linux. It implements thermal zones, battery information, 1.284 ++ fan information and AC states. 1.285 ++ . 1.286 ++ This package contains the header files and static libraries needed to 1.287 ++ compile applications or shared objects that use libacpi. 1.288 ++ 1.289 ++Package: libacpi0 1.290 ++Section: libs 1.291 ++Architecture: i386 ia64 amd64 1.292 ++Depends: ${shlibs:Depends}, ${misc:Depends} 1.293 ++Description: general purpose library for ACPI 1.294 ++ libacpi is a general purpose shared library for programs gathering 1.295 ++ ACPI data on Linux. It implements thermal zones, battery information, 1.296 ++ fan information and AC states. 1.297 ++ . 1.298 ++ This package contains the shared library for libacpi. 1.299 +--- libacpi-0.2.orig/debian/libacpi-dev.install 1.300 ++++ libacpi-0.2/debian/libacpi-dev.install 1.301 +@@ -0,0 +1,4 @@ 1.302 ++usr/include/* 1.303 ++usr/lib/lib*.a 1.304 ++usr/lib/lib*.so 1.305 ++usr/share/man/man3/libacpi.3 1.306 +--- libacpi-0.2.orig/debian/compat 1.307 ++++ libacpi-0.2/debian/compat 1.308 +@@ -0,0 +1 @@ 1.309 ++5 1.310 +--- libacpi-0.2.orig/debian/docs 1.311 ++++ libacpi-0.2/debian/docs 1.312 +@@ -0,0 +1 @@ 1.313 ++README 1.314 +--- libacpi-0.2.orig/debian/changelog 1.315 ++++ libacpi-0.2/debian/changelog 1.316 +@@ -0,0 +1,44 @@ 1.317 ++libacpi (0.2-4) unstable; urgency=low 1.318 ++ 1.319 ++ * Fix interface incompatibilities introduced by last patch (Closes: #464276). 1.320 ++ 1.321 ++ -- Nico Golde <nion@debian.org> Wed, 06 Feb 2008 11:31:13 +0100 1.322 ++ 1.323 ++libacpi (0.2-3) unstable; urgency=low 1.324 ++ 1.325 ++ * Temporary patch libacpi to make battery and ac status work with 1.326 ++ kernels >= 2.6.24. There will be a fixed upstream version 1.327 ++ which uses sysfs and procfs as fallback soon. Many thanks 1.328 ++ to Joseph Spillner for the patch! (Closes: #463986, #463982). 1.329 ++ 1.330 ++ -- Nico Golde <nion@debian.org> Mon, 04 Feb 2008 22:35:35 +0100 1.331 ++ 1.332 ++libacpi (0.2-2) unstable; urgency=low 1.333 ++ 1.334 ++ * Bumped Standards Version, no changes needed. 1.335 ++ * Switched from Homepage tag to Homepage control field. 1.336 ++ 1.337 ++ -- Nico Golde <nion@debian.org> Wed, 02 Jan 2008 14:42:01 +0100 1.338 ++ 1.339 ++libacpi (0.2-1) unstable; urgency=low 1.340 ++ 1.341 ++ * New upstream release. 1.342 ++ Fixed double header inclusion (Closes: #433399). 1.343 ++ 1.344 ++ -- Nico Golde <nion@debian.org> Sun, 29 Jul 2007 14:13:59 +0200 1.345 ++ 1.346 ++libacpi (0.1-2) unstable; urgency=low 1.347 ++ 1.348 ++ * Just build this package for amd64,i386 and ia64 since 1.349 ++ the other archs have on ACPI support (Closes: #432432). 1.350 ++ * Switched from Source-Version to binary:Version. 1.351 ++ * Do not suppress make clean output any longer. 1.352 ++ 1.353 ++ -- Nico Golde <nion@debian.org> Tue, 10 Jul 2007 18:18:08 +0200 1.354 ++ 1.355 ++libacpi (0.1-1) unstable; urgency=low 1.356 ++ 1.357 ++ * Initial release (Closes: #429573). 1.358 ++ 1.359 ++ -- Nico Golde <nion@debian.org> Mon, 18 Jun 2007 22:11:10 +0200 1.360 ++ 1.361 +--- libacpi-0.2.orig/debian/libacpi0.install 1.362 ++++ libacpi-0.2/debian/libacpi0.install 1.363 +@@ -0,0 +1 @@ 1.364 ++usr/lib/lib*.so.* 1.365 +--- libacpi-0.2.orig/debian/copyright 1.366 ++++ libacpi-0.2/debian/copyright 1.367 +@@ -0,0 +1,34 @@ 1.368 ++This package was debianized by Nico Golde <nion@debian.org> on 1.369 ++Mon, 18 Jun 2007 22:11:10 +0200. 1.370 ++ 1.371 ++It was downloaded from http://www.ngolde.de/libacpi.html 1.372 ++ 1.373 ++Upstream Author: Nico Golde <nico@ngolde.de> 1.374 ++ 1.375 ++Copyright: 2007 Nico Golde 1.376 ++ 1.377 ++License: 1.378 ++ 1.379 ++ Copyright (C) 2007 Nico Golde <nico@ngolde.de> 1.380 ++ 1.381 ++ Permission is hereby granted, free of charge, to any person obtaining a 1.382 ++ copy of this software and associated documentation files (the 1.383 ++ "Software"), to deal in the Software without restriction, including 1.384 ++ without limitation the rights to use, copy, modify, merge, publish, 1.385 ++ distribute, sublicense, and/or sell copies of the Software, and to 1.386 ++ permit persons to whom the Software is furnished to do so, subject to 1.387 ++ the following conditions: 1.388 ++ 1.389 ++ The above copyright notice and this permission notice shall be included 1.390 ++ in all copies or substantial portions of the Software. 1.391 ++ 1.392 ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 1.393 ++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 1.394 ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 1.395 ++ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 1.396 ++ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 1.397 ++ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 1.398 ++ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 1.399 ++ 1.400 ++The Debian packaging is (C) 2007, Nico Golde <nion@debian.org> and 1.401 ++is licensed under the GPL, see `/usr/share/common-licenses/GPL'. 1.402 +--- libacpi-0.2.orig/debian/rules 1.403 ++++ libacpi-0.2/debian/rules 1.404 +@@ -0,0 +1,57 @@ 1.405 ++#!/usr/bin/make -f 1.406 ++#export DH_VERBOSE=1 1.407 ++ 1.408 ++CFLAGS = -Wall -g 1.409 ++ 1.410 ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) 1.411 ++ CFLAGS += -O0 1.412 ++else 1.413 ++ CFLAGS += -O2 1.414 ++endif 1.415 ++ 1.416 ++build: build-stamp 1.417 ++build-stamp: 1.418 ++ dh_testdir 1.419 ++ $(MAKE) 1.420 ++ 1.421 ++ touch $@ 1.422 ++ 1.423 ++clean: 1.424 ++ dh_testdir 1.425 ++ dh_testroot 1.426 ++ rm -f build-stamp 1.427 ++ 1.428 ++ $(MAKE) clean 1.429 ++ dh_clean 1.430 ++ 1.431 ++install: build 1.432 ++ dh_testdir 1.433 ++ dh_testroot 1.434 ++ dh_clean -k 1.435 ++ dh_installdirs 1.436 ++ 1.437 ++ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr install 1.438 ++ 1.439 ++binary-indep: build install 1.440 ++ 1.441 ++binary-arch: build install 1.442 ++ dh_testdir 1.443 ++ dh_testroot 1.444 ++ dh_installchangelogs CHANGES 1.445 ++ dh_installdocs doc/ 1.446 ++ dh_installexamples test-libacpi.c 1.447 ++ dh_install --sourcedir=debian/tmp --list-missing 1.448 ++ dh_link 1.449 ++ dh_strip 1.450 ++ dh_compress 1.451 ++ dh_fixperms 1.452 ++ dh_makeshlibs 1.453 ++ dh_makeshlibs 1.454 ++ dh_installdeb 1.455 ++ dh_shlibdeps 1.456 ++ dh_gencontrol 1.457 ++ dh_md5sums 1.458 ++ dh_builddeb 1.459 ++ 1.460 ++binary: binary-indep binary-arch 1.461 ++.PHONY: build clean binary-indep binary-arch binary install