Attachment 2241 Details for Bug 13118 – Примерный патч - может где и лишний (там сиволические ссылки в коде, а я с ними не понял как правильно делать патч), плюс переменные LIBDIR и LIBEXECD

[patch] Примерный патч - может где и лишний (там сиволические ссылки в коде, а я с ними не понял как правильно делать патч), плюс переменные LIBDIR и LIBEXECD

hardinfo-0.4.2.2-new.diff (text/plain), 8.80 KB, created by ruslandh on 2007-10-27 13:47:28 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: ruslandh

Created: 2007-10-27 13:47:28 MSD

Size: 8.80 KB

patch

obsolete

>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/common/zlib.h hardinfo-0.4.2.2-new/arch/common/zlib.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/common/zlib.h	2007-07-20 18:44:59 +0400
>+++ hardinfo-0.4.2.2-new/arch/common/zlib.h	2007-10-27 13:19:54 +0400
>@@ -27,7 +27,7 @@
>     if (!(compress && compressBound)) {
> 	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
> 	if (!libz) {
>-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
>+            libz = g_module_open("/usr/lib64/libz.so", G_MODULE_BIND_LAZY);
>             if (!libz) {
>                 g_warning("Cannot load ZLib: %s", g_module_error());
>                 return;
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/alpha/os.h hardinfo-0.4.2.2-new/arch/linux/alpha/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/alpha/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/alpha/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/armv4l/os.h hardinfo-0.4.2.2-new/arch/linux/armv4l/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/armv4l/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/armv4l/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/common/os.h hardinfo-0.4.2.2-new/arch/linux/common/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/common/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/common/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/ia64/os.h hardinfo-0.4.2.2-new/arch/linux/ia64/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/ia64/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/ia64/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/m68k/os.h hardinfo-0.4.2.2-new/arch/linux/m68k/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/m68k/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/m68k/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/mips/os.h hardinfo-0.4.2.2-new/arch/linux/mips/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/mips/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/mips/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/parisc/os.h hardinfo-0.4.2.2-new/arch/linux/parisc/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/parisc/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/parisc/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/ppc/os.h hardinfo-0.4.2.2-new/arch/linux/ppc/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/ppc/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/ppc/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/s390/os.h hardinfo-0.4.2.2-new/arch/linux/s390/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/s390/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/s390/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/sparc/os.h hardinfo-0.4.2.2-new/arch/linux/sparc/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/sparc/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/sparc/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/x86/os.h hardinfo-0.4.2.2-new/arch/linux/x86/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/x86/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/x86/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/arch/linux/x86_64/os.h hardinfo-0.4.2.2-new/arch/linux/x86_64/os.h Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/arch/linux/x86_64/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new/arch/linux/x86_64/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/autopackage/default.apspec hardinfo-0.4.2.2-new/autopackage/default.apspec Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/autopackage/default.apspec	2007-07-20 18:47:19 +0400
>+++ hardinfo-0.4.2.2-new/autopackage/default.apspec	2007-10-27 13:22:05 +0400
>@@ -42,9 +42,9 @@
> # See http://www.autopackage.org/api/ for details
> installExe bin/*
> installData share/*
>-copyFile lib/hardinfo/modules/benchmark.so $PREFIX/lib/hardinfo/modules/benchmark.so
>-copyFile lib/hardinfo/modules/computer.so $PREFIX/lib/hardinfo/modules/computer.so
>-copyFile lib/hardinfo/modules/devices.so $PREFIX/lib/hardinfo/modules/devices.so
>+copyFile lib64/hardinfo/modules/benchmark.so $PREFIX/lib64/hardinfo/modules/benchmark.so
>+copyFile lib64/hardinfo/modules/computer.so $PREFIX/lib64/hardinfo/modules/computer.so
>+copyFile lib64/hardinfo/modules/devices.so $PREFIX/lib64/hardinfo/modules/devices.so
> installMenuItem "System" share/applications/hardinfo.desktop
> 
> [Uninstall]
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>2007-10-27 13:36 diff -uNlr hardinfo-0.4.2.2/binreloc.c hardinfo-0.4.2.2-new/binreloc.c Ñòðàíèöà 1
>
>
>--- hardinfo-0.4.2.2/binreloc.c	2007-07-20 18:45:08 +0400
>+++ hardinfo-0.4.2.2-new/binreloc.c	2007-10-27 13:29:30 +0400
>@@ -22,6 +22,10 @@
> #include <string.h>
> #include "binreloc.h"
> 
>+#define LIBDIR @libdir@
>+#define LIBEXECDIR @libexecdir@
>+
>+
> G_BEGIN_DECLS
> /** @internal
>  * Find the canonical filename of the executable. Returns the filename
>@@ -592,7 +596,7 @@
> 	    return NULL;
>     }
> 
>-    dir = g_build_filename(prefix, "lib", NULL);
>+    dir = g_build_filename(prefix, LIBDIR, NULL);
>     g_free(prefix);
>     return dir;
> }
>@@ -624,7 +628,7 @@
> 	    return NULL;
>     }
> 
>-    dir = g_build_filename(prefix, "libexec", NULL);
>+    dir = g_build_filename(prefix, LIBEXECDIR, NULL);
>     g_free(prefix);
>     return dir;
> }
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>

Actions: View | Diff

Attachments on bug 13118: 2241 | 2242