[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f65d1b699c15502ad17cd6b9247c46a669c54475)

Vlad Glagolev scm at sourcemage.org
Thu Jan 6 20:50:52 EST 2011


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 printer/hplip/DETAILS           |    1 +
 printer/hplip/HISTORY           |    5 +++++
 printer/hplip/PRE_BUILD         |    7 +++++++
 printer/hplip/interactive.patch |   32 ++++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+)

New commits:
commit f65d1b699c15502ad17cd6b9247c46a669c54475
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    hplip: fixed bugs related to console tools and udev deprecations

diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index 1c3040a..a8c0ffe 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,5 +1,6 @@
            SPELL=hplip
          VERSION=3.10.9
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 4845753..952ab2f 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,3 +1,8 @@
+2011-01-07 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* PRE_BUILD: added, to apply the patch and to replace udev deprecations
+	* interactive.patch: added, to fix hp-* scripts working with no gui
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/printer/hplip/PRE_BUILD b/printer/hplip/PRE_BUILD
new file mode 100755
index 0000000..ac93b47
--- /dev/null
+++ b/printer/hplip/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/interactive.patch" &&
+
+sed -i "s:SYSFS:ATTRS:g" data/rules/55-hpmud.rules \
+                         data/rules/56-hpmud_support.rules
diff --git a/printer/hplip/interactive.patch b/printer/hplip/interactive.patch
new file mode 100644
index 0000000..24f2790
--- /dev/null
+++ b/printer/hplip/interactive.patch
@@ -0,0 +1,32 @@
+--- base/module.py.orig
++++ base/module.py
+@@ -263,18 +263,17 @@
+             params = ''.join([params, 'd:p:P:'])
+             long_params.extend(['device=', 'device-uri=', 'printer=', 'printer-name'])
+ 
+-        if self.num_valid_modes > 1:
+-            if GUI_MODE in self.avail_modes and prop.gui_build:
+-                params = ''.join([params, 'u'])
+-                long_params.extend(['gui', 'ui'])
+-
+-            if INTERACTIVE_MODE in self.avail_modes:
+-                params = ''.join([params, 'i'])
+-                long_params.extend(['interactive', 'text'])
+-
+-            if NON_INTERACTIVE_MODE in self.avail_modes:
+-                params = ''.join([params, 'n'])
+-                long_params.extend(['noninteractive', 'non-interactive', 'batch'])
++        if GUI_MODE in self.avail_modes and prop.gui_build:
++            params = ''.join([params, 'u'])
++            long_params.extend(['gui', 'ui'])
++            
++        if INTERACTIVE_MODE in self.avail_modes:
++            params = ''.join([params, 'i'])
++            long_params.extend(['interactive', 'text'])
++    
++        if NON_INTERACTIVE_MODE in self.avail_modes:
++            params = ''.join([params, 'n'])
++            long_params.extend(['noninteractive', 'non-interactive', 'batch'])
+ 
+         if self.supported_ui_toolkits is not None and \
+             self.num_supported_ui_toolkits >= 1 and prop.gui_build and \



More information about the SM-Commit mailing list