Репозитории ALT
S: | 2.07-alt1 |
5.1: | p17-alt2 |
4.1: | p17-alt1 |
4.0: | p17-ipl10mdk |
3.0: | p17-ipl10mdk |
Группа :: Издательство
Пакет: psutils
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: psutils-1.23-paperconf.patch
Скачать
Скачать
diff -ur psutils-1.23.orig/configure.ac psutils-1.23/configure.ac
--- psutils-1.23.orig/configure.ac 2014-01-16 10:20:54.000000000 +0000
+++ psutils-1.23/configure.ac 2018-10-08 07:22:19.331849246 +0000
@@ -76,7 +76,7 @@
dnl hence not use a full path
AC_ARG_VAR([PAPER], [Absolute path to paper executable])
if test -z "$PAPER"; then
- PAPER=paper
+ PAPER=paperconf
fi
dnl Generate output files
Only in psutils-1.23: configure.ac~
diff -ur psutils-1.23.orig/psutil.c psutils-1.23/psutil.c
--- psutils-1.23.orig/psutil.c 2014-01-16 10:20:54.000000000 +0000
+++ psutils-1.23/psutil.c 2018-10-08 07:22:55.885542208 +0000
@@ -88,13 +88,21 @@
int res = 0;
if (paper_name == NULL) /* Use default paper name */
paper_name = pgetline(PAPER);
- if (paper_name && (cmd = xasprintf(PAPER " --unit=pt --size %s", paper_name)) && (l = pgetline(cmd)))
+ if (paper_name && (cmd = xasprintf(PAPER " -s %s", paper_name)) && (l = pgetline(cmd)))
+ {
+ for (int i = 0; i < strlen(l); i++)
+ {
+ if (l[i] == ',')
+ {
+ l[i] = '.';
+ }
+ }
res = sscanf(l, "%lg %lg", width, height);
+ }
free(l);
free(cmd);
return res == 2;
}
-
/* Make a file seekable, using temporary files if necessary */
FILE *seekable(FILE *fp)
{