Permalink
Browse files

Use imagemagick instead of pdfjam due to issues with permissions unde…

…r CentOS
  • Loading branch information...
simoncadman committed Oct 13, 2013
1 parent b4b1712 commit eca19cc9d6b4b8393641311ed613832fe2c2dee5
View
@@ -20,7 +20,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print CUPS Backend Version " + CCPVersion
sys.exit(0)
View
@@ -20,7 +20,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print Delete Account Script Version " + CCPVersion
sys.exit(0)
View
@@ -19,7 +19,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print Dynamic PPD Generator Version " + CCPVersion
sys.exit(0)
View
@@ -21,7 +21,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print Printer Lister Version " + CCPVersion
sys.exit(0)
View
@@ -6,7 +6,7 @@ pkgdesc="Print via Google Cloud print using CUPS"
arch=('any')
url="http://ccp.niftiestsoftware.com"
license=('GPL3')
-depends=('cups' 'pycups' 'python2' 'ghostscript' 'python2-httplib2' 'texlive-core')
+depends=('cups' 'pycups' 'python2' 'ghostscript' 'python2-httplib2' 'imagemagick')
makedepends=('git')
changelog=ChangeLog
install=INSTALL
View
@@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/simoncadman/CUPS-Cloud-Print
Package: cupscloudprint
Architecture: all
-Depends: cups, python-cups, python-httplib2, pdfjam, texlive-latex-extra
+Depends: cups, python-cups, python-httplib2, imagemagick
Description: Print via Google Cloud print using CUPS
Print via Google Cloud print using CUPS, useful when you need to print via a printer which does not have Linux support, but does support Google Cloud Print.
@@ -9,7 +9,7 @@ COMMENT= Google Cloud Print driver for CUPS
RUN_DEPENDS= cups:${PORTSDIR}/print/cups\
ps2pdf:${PORTSDIR}/print/ghostscript9-nox11\
- pdfjam:${PORTSDIR}/print/pdfjam\
+ ImageMagick:${PORTSDIR}/graphics/ImageMagick\
${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups\
${PYTHON_SITELIBDIR}/httplib2:${PORTSDIR}/www/py-httplib2
@@ -18,7 +18,7 @@ net-print/cups
app-text/ghostscript-gpl
dev-python/pycups
dev-python/httplib2
-app-text/pdfjam"
+media-gfx/imagemagick"
S=${WORKDIR}/${P}
src_install() {
@@ -8,7 +8,7 @@ URL: http://ccp.niftiestsoftware.com
Source0: http://ccp.niftiestsoftware.com/cupscloudprint-20131009.tar.bz2
BuildRequires: cups-devel,cups,make,python-httplib2
-Requires: cups,ghostscript,system-config-printer-libs,python-httplib2,/usr/bin/pdf90,/usr/bin/pdf270,/usr/bin/pdflatex,/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ifluatex.sty,/usr/share/texmf-dist/web2c/fmtutil.cnf,/usr/share/texlive/texmf/texconfig/tcfmgr,/usr/share/texlive/texmf-dist/tex/latex/pdftex-def/pdftex.def
+Requires: cups,ghostscript,system-config-printer-libs,python-httplib2,imagemagick
%description
Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print.
View
@@ -383,7 +383,7 @@ def submitJob(self, printerid, jobtype, jobfile, jobname, printername, options="
print("ERROR: PDF doesnt exist")
return False
if rotate > 0:
- p = subprocess.Popen(['pdf' + str(rotate), jobfile, '--outfile', jobfile], stdout=subprocess.PIPE)
+ p = subprocess.Popen(['convert', '-density', '300x300', jobfile, '-rotate', str(rotate), jobfile], stdout=subprocess.PIPE)
output = p.communicate()[0]
result = p.returncode
if result != 0:
View
@@ -19,7 +19,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print Issue Reporting Script Version " + CCPVersion
sys.exit(0)
View
@@ -21,7 +21,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print Setup Script Version " + CCPVersion
sys.exit(0)
View
@@ -21,7 +21,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print Submit Job Version " + CCPVersion
sys.exit(0)
View
@@ -22,7 +22,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131012 214736"
+ CCPVersion = "20131013 143307"
print "CUPS Cloud Print Upgrade Script Version " + CCPVersion
sys.exit(0)

0 comments on commit eca19cc

Please sign in to comment.