From 7224c1253228e5c29c78cb3f0f26ce34770f2356 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 15 Feb 2014 23:24:26 +0200 Subject: Added ebuilds for kogaion desktop --- .../hplip/files/hplip-3.10.9-cve-2010-4267.patch | 11 ++ net-print/hplip/files/hplip-3.11.1-desktop.patch | 18 ++ net-print/hplip/files/hplip-3.11.1-htmldir.patch | 109 +++++++++++ .../hplip/files/hplip-3.11.10-udev-attrs.patch | 207 +++++++++++++++++++++ net-print/hplip/files/hplip-3.9.10-browser.patch | 38 ++++ net-print/hplip/files/hplip-3.9.12-cupsddk.patch | 23 +++ net-print/hplip/files/hplip-3.9.12-systray.patch | 22 +++ 7 files changed, 428 insertions(+) create mode 100644 net-print/hplip/files/hplip-3.10.9-cve-2010-4267.patch create mode 100644 net-print/hplip/files/hplip-3.11.1-desktop.patch create mode 100644 net-print/hplip/files/hplip-3.11.1-htmldir.patch create mode 100644 net-print/hplip/files/hplip-3.11.10-udev-attrs.patch create mode 100644 net-print/hplip/files/hplip-3.9.10-browser.patch create mode 100644 net-print/hplip/files/hplip-3.9.12-cupsddk.patch create mode 100644 net-print/hplip/files/hplip-3.9.12-systray.patch (limited to 'net-print/hplip/files') diff --git a/net-print/hplip/files/hplip-3.10.9-cve-2010-4267.patch b/net-print/hplip/files/hplip-3.10.9-cve-2010-4267.patch new file mode 100644 index 00000000..3bf6b84f --- /dev/null +++ b/net-print/hplip/files/hplip-3.10.9-cve-2010-4267.patch @@ -0,0 +1,11 @@ +--- hplip-3.10.2.orig/io/hpmud/pml.c 2010-12-06 13:35:12.046894255 -0500 ++++ hplip-3.10.2.orig/io/hpmud/pml.c 2010-12-06 13:34:35.018894207 -0500 +@@ -504,6 +504,8 @@ enum HPMUD_RESULT hpmud_get_pml(HPMUD_DE + p += 2; /* eat type and length */ + } + ++ if (dLen > buf_size) ++ dLen = buf_size; + memcpy(buf, p, dLen); + *bytes_read = dLen; + *type = dt; diff --git a/net-print/hplip/files/hplip-3.11.1-desktop.patch b/net-print/hplip/files/hplip-3.11.1-desktop.patch new file mode 100644 index 00000000..0ed31ec0 --- /dev/null +++ b/net-print/hplip/files/hplip-3.11.1-desktop.patch @@ -0,0 +1,18 @@ +--- Makefile.am.old 2011-01-24 20:40:08.989802335 +0100 ++++ Makefile.am 2011-01-24 20:40:23.913135667 +0100 +@@ -332,6 +332,7 @@ + hppgsz_CFLAGS = $(libapdk_la_CFLAGS) + hppgsz_LDADD = libapdk.la -ljpeg -ldl + ++if GUI_BUILD + # hplip.desktop + hplip_desktopdir = $(icondir) + hplip_desktop_DATA = hplip.desktop +@@ -339,6 +340,7 @@ + # hplip-systray.desktop + hplip_systraydir = $(systraydir) + hplip_systray_DATA = hplip-systray.desktop ++endif + + # hpipjs (CUPS filter) + hplipjsdir = $(cupsfilterdir) diff --git a/net-print/hplip/files/hplip-3.11.1-htmldir.patch b/net-print/hplip/files/hplip-3.11.1-htmldir.patch new file mode 100644 index 00000000..da9a7cba --- /dev/null +++ b/net-print/hplip/files/hplip-3.11.1-htmldir.patch @@ -0,0 +1,109 @@ +diff -Naur hplip-3.11.1-old/configure.in hplip-3.11.1/configure.in +--- hplip-3.11.1-old/configure.in 2011-01-24 20:45:27.429802335 +0100 ++++ hplip-3.11.1/configure.in 2011-01-24 20:48:34.759802335 +0100 +@@ -327,6 +327,9 @@ + AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc]]), + hpdocdir=$withval, hpdocdir="$datadir/doc/hplip-$VERSION") + ++AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc]]), ++ hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION") ++ + AC_MSG_CHECKING([for foomatic ppd install]) + AC_ARG_ENABLE(foomatic_ppd_install, + [ --enable-foomatic-ppd-install enable foomatic static ppd install (default=no), uses hpppddir], +@@ -551,6 +554,7 @@ + AC_DEFINE_DIR([abs_sbindir], [sbindir]) + AC_DEFINE_DIR([abs_hpppddir], [hpppddir]) + AC_DEFINE_DIR([abs_docdir], [hpdocdir]) ++AC_DEFINE_DIR([abs_htmldir], [hphtmldir]) + abs_ppddir=${abs_hpppddir%/*} + AC_DEFINE_DIR([abs_drvdir], [drvdir]) + +@@ -558,6 +562,7 @@ + AC_SUBST(abs_sbindir) + AC_SUBST(abs_hpppddir) + AC_SUBST(abs_docdir) ++AC_SUBST(abs_htmldir) + AC_SUBST(abs_ppddir) + AC_SUBST(abs_drvdir) + AC_SUBST(abs_mimedir) +@@ -568,6 +573,7 @@ + AC_SUBST(cupsfilterdir) + AC_SUBST(hpppddir) + AC_SUBST(hpdocdir) ++AC_SUBST(hphtmldir) + AC_SUBST(drvdir) + AC_SUBST(network_build) + AC_SUBST(pp_build) +diff -Naur hplip-3.11.1-old/hplip.conf.in hplip-3.11.1/hplip.conf.in +--- hplip-3.11.1-old/hplip.conf.in 2011-01-24 20:45:27.429802335 +0100 ++++ hplip-3.11.1/hplip.conf.in 2011-01-24 20:49:25.999802335 +0100 +@@ -9,6 +9,7 @@ + ppd=@abs_hpppddir@ + ppdbase=@abs_ppddir@ + doc=@abs_docdir@ ++html=@abs_htmldir@ + icon=@icondir@ + cupsbackend=@cupsbackenddir@ + cupsfilter=@cupsfilterdir@ +@@ -42,4 +43,4 @@ + lite-build=@lite_build@ + udev-acl-rules=@udev_acl_rules@ + hpcups-only-build=@hpcups_only_build@ +-hpijs-only-build=@hpijs_only_build@ +\ Kein Zeilenumbruch am Dateiende. ++hpijs-only-build=@hpijs_only_build@ +diff -Naur hplip-3.11.1-old/hplip.list.in hplip-3.11.1/hplip.list.in +--- hplip-3.11.1-old/hplip.list.in 2011-01-24 20:45:27.523135669 +0100 ++++ hplip-3.11.1/hplip.list.in 2011-01-24 20:50:25.959802335 +0100 +@@ -49,6 +49,7 @@ + $icondir=@icondir@ + $systraydir=@systraydir@ + $docdir=@hpdocdir@ ++$htmldir=@hphtmldirdir@ + $version=@VERSION@ + $internal_tag=@PACKAGE_BUGREPORT@ + +@@ -257,11 +258,11 @@ + @epm_full@f 644 root root $home/pcard/photocard.py pcard/photocard.py + @epm_full@f 755 root root $home/info.py info.py + # docs +-@epm_full@f 644 root root $docdir doc/* +-@epm_full@d 775 root root $docdir/images - +-@epm_full@f 644 root root $docdir/images doc/images/* +-@epm_full@d 775 root root $docdir/styles - +-@epm_full@f 644 root root $docdir/styles doc/styles/* ++@epm_full@f 644 root root $htmldir doc/* ++@epm_full@d 775 root root $htmldir/images - ++@epm_full@f 644 root root $htmldir/images doc/images/* ++@epm_full@d 775 root root $htmldir/styles - ++@epm_full@f 644 root root $htmldir/styles doc/styles/* + # python commands + @epm_full@l 755 root root $bindir/hp-toolbox ../share/hplip/toolbox.py + @epm_full@l 755 root root $bindir/hp-colorcal ../share/hplip/colorcal.py +diff -Naur hplip-3.11.1-old/Makefile.am hplip-3.11.1/Makefile.am +--- hplip-3.11.1-old/Makefile.am 2011-01-24 20:45:27.429802335 +0100 ++++ hplip-3.11.1/Makefile.am 2011-01-24 20:51:45.893135668 +0100 +@@ -9,6 +9,7 @@ + hplipdir = $(datadir)/hplip + + docdir = $(hpdocdir) ++htmldir = $(hphtmldir) + doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG + EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright + +@@ -23,11 +24,11 @@ + + if DOC_BUILD + wwwsrc = doc +-www0dir = $(docdir) ++www0dir = $(htmldir) + dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html +-www3dir = $(docdir)/styles ++www3dir = $(htmldir)/styles + dist_www3_DATA = $(wwwsrc)/styles/* +-www4dir = $(docdir)/images ++www4dir = $(htmldir)/images + dist_www4_DATA = $(wwwsrc)/images/* + endif + diff --git a/net-print/hplip/files/hplip-3.11.10-udev-attrs.patch b/net-print/hplip/files/hplip-3.11.10-udev-attrs.patch new file mode 100644 index 00000000..e57f8f9a --- /dev/null +++ b/net-print/hplip/files/hplip-3.11.10-udev-attrs.patch @@ -0,0 +1,207 @@ +diff -Naur hplip-3.11.10-old/data/rules/55-hpmud.rules hplip-3.11.10/data/rules/55-hpmud.rules +--- hplip-3.11.10-old/data/rules/55-hpmud.rules 2011-10-15 14:11:06.143791977 +0200 ++++ hplip-3.11.10/data/rules/55-hpmud.rules 2011-10-15 14:11:16.083791723 +0200 +@@ -21,128 +21,128 @@ + LABEL="hplip_pid_test" + + # Check for AiO products (0x03f0xx11). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660" + + # Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02). + # The xx02 pid has been retired so this explicit list should not change. + # photosmart_d2300_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660" + # photosmart_100 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660" + # photosmart_1115 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660" + # photosmart_1215 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660" + # photosmart_1218 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660" + # photosmart_130 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660" + # photosmart_1315 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660" + # photosmart_140_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660" + # photosmart_230 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660" + # photosmart_240_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660" + # photosmart_320_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660" + # photosmart_330_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660" + # photosmart_370_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660" + # photosmart_380_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660" + # photosmart_420_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660" + # photosmart_470_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7150 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660" +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7200_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7345 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7350 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7400_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7550 +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7600_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7700_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7800_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660" + # photosmart_7900_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660" + # photosmart_8000_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660" + # photosmart_8100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_8200_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660" + # photosmart_8400_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_8700_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a310_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a320_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a430_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a440_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a510_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a520_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a530_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a610_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a620_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a630_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a710_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_a820_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660" + # photosmart_d5060_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660" + # photosmart_d5100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660" + # photosmart_d6100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660" + # photosmart_d7100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660" + # photosmart_d7300_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660" + # photosmart_pro_b8300_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660" + # photosmart_b8800_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660" + # photosmart_pro_b9100_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660" + # Photosmart_B8500_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660" + # Photosmart_A640_series +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660" + + # Check for Business Inkjet products (0x03f0xx12). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660" + # Check for Deskjet products (0x03f0xx04). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660" + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660" + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660" + # Check for DesignJet product (0x03f0xx14). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660" + + # Removed the following rule because FHS states that /etc should be reserved for static files only. This + # functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield +diff -Naur hplip-3.11.10-old/data/rules/56-hpmud_support.rules hplip-3.11.10/data/rules/56-hpmud_support.rules +--- hplip-3.11.10-old/data/rules/56-hpmud_support.rules 2011-10-15 14:11:06.143791977 +0200 ++++ hplip-3.11.10/data/rules/56-hpmud_support.rules 2011-10-15 14:11:49.153790877 +0200 +@@ -7,9 +7,9 @@ + LABEL="pid_test" + + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'" + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'" + ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" + + LABEL="hpmud_rules_end" diff --git a/net-print/hplip/files/hplip-3.9.10-browser.patch b/net-print/hplip/files/hplip-3.9.10-browser.patch new file mode 100644 index 00000000..46c4f634 --- /dev/null +++ b/net-print/hplip/files/hplip-3.9.10-browser.patch @@ -0,0 +1,38 @@ +--- base/utils.py.old 2009-11-14 15:23:29.000000000 +0100 ++++ base/utils.py 2009-11-14 15:37:53.000000000 +0100 +@@ -812,13 +812,15 @@ + return True + + +-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order +-BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''} ++BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order ++BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''} + + + def find_browser(): + if platform_avail and platform.system() == 'Darwin': + return "open" ++ if platform_avail and platform.system() == 'Linux' and which("xdg-open"): ++ return "xdg-open" + else: + for b in BROWSERS: + if which(b): +@@ -832,11 +834,14 @@ + cmd = 'open "%s"' % url + log.debug(cmd) + os.system(cmd) ++ if platform_avail and platform.system() == 'Linux' and which("xdg-open"): ++ cmd = 'xdg-open "%s"' % url ++ log.debug(cmd) ++ os.system(cmd) + else: + for b in BROWSERS: +- bb = which(b) +- if bb: +- bb = os.path.join(bb, b) ++ if b: ++ bb = which(b, return_full_path='True') + if use_browser_opts: + cmd = """%s %s "%s" &""" % (bb, BROWSER_OPTS[b], url) + else: diff --git a/net-print/hplip/files/hplip-3.9.12-cupsddk.patch b/net-print/hplip/files/hplip-3.9.12-cupsddk.patch new file mode 100644 index 00000000..b059c9bb --- /dev/null +++ b/net-print/hplip/files/hplip-3.9.12-cupsddk.patch @@ -0,0 +1,23 @@ +diff -Naur hplip-3.9.12-old/installer/core_install.py hplip-3.9.12/installer/core_install.py +--- hplip-3.9.12-old/installer/core_install.py 2009-12-15 22:22:13.000000000 +0100 ++++ hplip-3.9.12/installer/core_install.py 2009-12-20 02:11:47.000000000 +0100 +@@ -29,6 +29,7 @@ + import grp + import pwd + import tarfile ++import commands # TODO: Replace with subprocess (commands is deprecated in Python 3.0) + + try: + import hashlib # new in 2.5 +@@ -1036,9 +1037,8 @@ + def check_cupsddk(self): + log.debug("Checking for cups-ddk...") + # TODO: Compute these paths some way or another... +- #return check_tool("/usr/lib/cups/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs") +- return (check_file('drv', "/usr/lib/cups/driver") or check_file('drv', "/usr/lib64/cups/driver")) and \ +- check_file('media.defs', "/usr/share/cupsddk/include") ++ #return check_tool(commands.getoutput("cups-config --serverbin") + "/driver/drv list") and os.path.exists("/usr/share/cupsddk/include/media.defs") ++ return check_file('drv', commands.getoutput("cups-config --serverbin") + "/driver") and check_file('media.defs', "/usr/share/cupsddk/include") + + + def check_policykit(self): diff --git a/net-print/hplip/files/hplip-3.9.12-systray.patch b/net-print/hplip/files/hplip-3.9.12-systray.patch new file mode 100644 index 00000000..0ae053fa --- /dev/null +++ b/net-print/hplip/files/hplip-3.9.12-systray.patch @@ -0,0 +1,22 @@ + +++ hplip-3.9.10/debian/patches/hplip-systray-longer-timeout-for-system-tray-start.dpatch + +#! /bin/sh /usr/share/dpatch/dpatch-run +## hplip-systray-longer-timeout-for-system-tray-start.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad hplip-3.9.10~/ui4/systemtray.py hplip-3.9.10/ui4/systemtray.py +--- hplip-3.9.10~/ui4/systemtray.py 2009-11-17 21:23:42.000000000 +0100 ++++ hplip-3.9.10/ui4/systemtray.py 2009-11-29 21:34:01.399929476 +0100 +@@ -706,7 +706,7 @@ + app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app + + i = 0 +- while i < 10: ++ while i < 180: + if QSystemTrayIcon.isSystemTrayAvailable(): + break + time.sleep(1.0) -- cgit v1.2.3