| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Wed, 13 Jan 2016 06:39:34 -0800 | |
| branch | s11u3-sru |
| changeset 5296 | fe5e30c5a9ac |
| parent 3935 | components/hplip/patches/07_facls.detect.patch@177c89f1f2cf |
| permissions | -rw-r--r-- |
|
5296
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
1 |
source: in-house |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
2 |
Set dbus-daemon path to (non-standard) /usr/lib. |
|
3935
177c89f1f2cf
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
5296
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
4 |
--- a/installer/core_install.py 2015-08-26 04:38:39.244369710 -0700 |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
5 |
+++ b/installer/core_install.py 2015-08-26 04:39:29.269396882 -0700 |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
6 |
@@ -345,7 +345,7 @@ |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
7 |
'scanimage': (False, ['scan'], SCANIMAGE_STR, self.check_scanimage, DEPENDENCY_RUN_TIME, '1.0','scanimage --version', EXTERNALDEP), |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
8 |
|
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
9 |
# Required fax packages |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
10 |
- 'dbus': (True, ['fax'], DBUS_STR, self.check_dbus, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','dbus-daemon --version', EXTERNALDEP), |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
11 |
+ 'dbus': (True, ['fax'], DBUS_STR, self.check_dbus, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','/usr/lib/dbus-daemon --version', EXTERNALDEP), |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
12 |
|
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
13 |
# Required and optional qt4 GUI packages |
|
fe5e30c5a9ac
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3935
diff
changeset
|
14 |
'policykit': (False, ['gui_qt4'], POLKIT_STR, self.check_policykit, DEPENDENCY_RUN_TIME,'-','pkexec --version', EXTERNALDEP), # optional for non-sudo behavior of plugins (only optional for Qt4 option) |