Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-release-src > by-pkgid > 2c101d732df8a963b38a7c700d61af5a > files > 10

hplip-3.11.3a-5.mga1.src.rpm

Only in hplip-3.9.8: :wq
diff -ur hplip-3.9.8.orig/scan/sane/marvell.c hplip-3.9.8/scan/sane/marvell.c
--- hplip-3.9.8.orig/scan/sane/marvell.c	2009-08-04 23:36:06.000000000 +0200
+++ hplip-3.9.8/scan/sane/marvell.c	2009-10-17 15:56:23.000000000 +0200
@@ -63,8 +63,11 @@
    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
    if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
    {
-      BUG("unable to load restricted library: %s\n", dlerror());
-      goto bugout;
+      if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+      {
+         BUG("unable to load restricted library: %s\n", dlerror());
+         goto bugout;
+      }
    } 
 
    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
diff -ur hplip-3.9.8.orig/scan/sane/soap.c hplip-3.9.8/scan/sane/soap.c
--- hplip-3.9.8.orig/scan/sane/soap.c	2009-08-04 23:36:06.000000000 +0200
+++ hplip-3.9.8/scan/sane/soap.c	2009-10-17 15:51:08.000000000 +0200
@@ -71,8 +71,11 @@
    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
    if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
    {
-      BUG("unable to load restricted library: %s\n", dlerror());
-      goto bugout;
+      if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+      {
+         BUG("unable to load restricted library: %s\n", dlerror());
+         goto bugout;
+      }
    } 
 
    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */