Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (374f41a63efa23ca72aeef3e1f4ae0e0da777c3f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (374f41a63efa23ca72aeef3e1f4ae0e0da777c3f)
  • Date: Wed, 3 Aug 2011 19:13:24 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

printer/system-config-printer/DETAILS | 4 +-
printer/system-config-printer/HISTORY | 4 ++
printer/system-config-printer/PRE_BUILD | 4 +-
printer/system-config-printer/no-packagekit.patch | 36
++++++++++++++++++++++
4 files changed, 45 insertions(+), 3 deletions(-)

New commits:
commit 374f41a63efa23ca72aeef3e1f4ae0e0da777c3f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

system-config-printer 1.3.5

diff --git a/printer/system-config-printer/DETAILS
b/printer/system-config-printer/DETAILS
index dc101dd..193f379 100755
--- a/printer/system-config-printer/DETAILS
+++ b/printer/system-config-printer/DETAILS
@@ -1,6 +1,6 @@
SPELL=system-config-printer
- VERSION=1.3.3
-
SOURCE_HASH=sha512:ea37a2e359f7940bfd7b37ce3398d449a4d31961a057f800f592328c39f3e4d30d7d8807df78be4ec64a5b8fa497014a1056a6b2c866b9501cd3e7c4a62d4ec0
+ VERSION=1.3.5
+
SOURCE_HASH=sha512:2b58dff4328455bd1f9b3a9d4df4a0c00ee7d3f1fbb1404652bbc7161dd08a5ac965371f90ff8d125447bfd9e652ca8d0434f7919b5773b6179e548eda358d11
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/printer/system-config-printer/HISTORY
b/printer/system-config-printer/HISTORY
index ac0b2f0..eaf0b8b 100644
--- a/printer/system-config-printer/HISTORY
+++ b/printer/system-config-printer/HISTORY
@@ -1,3 +1,7 @@
+2011-08-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.5
+ * PRE_BUILD, no-packagekit.patch: added patch form Arch
+
2011-06-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.3

diff --git a/printer/system-config-printer/PRE_BUILD
b/printer/system-config-printer/PRE_BUILD
index 6f54504..40c6dbc 100755
--- a/printer/system-config-printer/PRE_BUILD
+++ b/printer/system-config-printer/PRE_BUILD
@@ -2,4 +2,6 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $BUILD_DIRECTORY &&
verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/no-packagekit.patch
diff --git a/printer/system-config-printer/no-packagekit.patch
b/printer/system-config-printer/no-packagekit.patch
new file mode 100644
index 0000000..8482ad8
--- /dev/null
+++ b/printer/system-config-printer/no-packagekit.patch
@@ -0,0 +1,36 @@
+--- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01
10:47:11.614519332 +0100
++++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02
15:45:33.807623959 +0100
+@@ -21,7 +21,6 @@
+
+ import cups, pprint, os, tempfile, re, string
+ import locale
+-import packagekit.client, packagekit.enums
+ from . import _debugprint
+
+ class Printer:
+@@ -829,24 +828,7 @@
+ missing executables
+ """
+ executables = missingExecutables(ppd)
+- packages = []
+- if executables:
+- unresolved_executables = []
+- client = packagekit.client.PackageKitClient ()
+- for executable in executables:
+- if not executable.startswith ("/"):
+- executable = "/usr/bin/" + executable
+-
+- result = client.search_file ([executable],
+-
packagekit.enums.FILTER_NOT_INSTALLED)
+- if result:
+- packages.extend (set (map (lambda x: x.name, result)))
+- else:
+- unresolved_executables.append (executable)
+-
+- executables = unresolved_executables
+-
+- return (packages, executables)
++ return ([], executables)
+
+ def _main():
+ c = cups.Connection()



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (374f41a63efa23ca72aeef3e1f4ae0e0da777c3f), Ladislav Hagara, 08/03/2011

Archive powered by MHonArc 2.6.24.

Top of Page