cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to system-config-printer 1.0.15. Tested at c2k9.

Browse Source
This commit is contained in:
ajacoutot 2009-06-08 19:24:43 +00:00
parent 9e18d75e6e
commit 2553d5a88d
6 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
print/system-config-printer/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2009/03/28 18:12:50 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2009/06/08 19:24:43 ajacoutot Exp $
COMMENT= printer (CUPS) administration tool
DISTNAME= system-config-printer-1.0.13
PKGNAME= ${DISTNAME}p2
DISTNAME= system-config-printer-1.0.15
CATEGORIES= print sysutils
HOMEPAGE= http://cyberelk.net/tim/software/system-config-printer/
@ -42,7 +41,8 @@ SUBST_FILES= applet.py cupshelpers/cupshelpers.py pysmb.py \
my-default-printer.desktop.in \
print-applet.desktop.in \
system-config-printer.desktop.in \
troubleshoot/SchedulerNotRunning.py
troubleshoot/SchedulerNotRunning.py \
Makefile.in
FAKE_FLAGS= dbusdir=${PREFIX}/share/examples/system-config-printer/dbus-1/system.d/ \
autostartdir=${PREFIX}/share/examples/system-config-printer/xdg/autostart/

10
print/system-config-printer/distinfo
View File

@ -1,5 +1,5 @@
MD5 (system-config-printer-1.0.13.tar.bz2) = piS9DUKojVxWLmxZN/j5AA==
RMD160 (system-config-printer-1.0.13.tar.bz2) = yuxAkz3VfvgvpsotsSbWTIvHhjM=
SHA1 (system-config-printer-1.0.13.tar.bz2) = sSYCEYYKpsXbM4ce27OxdbvZMeM=
SHA256 (system-config-printer-1.0.13.tar.bz2) = ELP2lqK/gg6mX+0KAIxf+rk5YPTIhLMHGL+zBkAwlr4=
SIZE (system-config-printer-1.0.13.tar.bz2) = 834669
MD5 (system-config-printer-1.0.15.tar.bz2) = cC1edQY92VpGmzY18uOmyQ==
RMD160 (system-config-printer-1.0.15.tar.bz2) = d7ix93UShEMGBpu7z8PNydlE5hw=
SHA1 (system-config-printer-1.0.15.tar.bz2) = sH6e5tU3WyD2D4/mESwxoZ2Xa4E=
SHA256 (system-config-printer-1.0.15.tar.bz2) = HRx0z/YJEVpQOqv4XKd2dskMrXn6wTDVEl26swtRrOw=
SIZE (system-config-printer-1.0.15.tar.bz2) = 835432

15
print/system-config-printer/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.6 2009/02/10 17:19:42 ajacoutot Exp $
--- Makefile.in.orig Fri Jan 16 11:37:10 2009
+++ Makefile.in Tue Feb 10 17:40:25 2009
$OpenBSD: patch-Makefile_in,v 1.7 2009/06/08 19:24:43 ajacoutot Exp $
--- Makefile.in.orig Wed Feb 18 17:10:32 2009
+++ Makefile.in Thu Jun 4 03:22:18 2009
@@ -308,7 +308,7 @@ man_MANS = \
dbus_DATA = \
newprinternotification.conf
@ -54,3 +54,12 @@ $OpenBSD: patch-Makefile_in,v 1.6 2009/02/10 17:19:42 ajacoutot Exp $
print-applet.desktop
uninstall-desktopDATA:
@@ -1120,7 +1116,7 @@ help:
@echo " run-applet Run system-config-printer-applet with local glade file"
test-ppd-module.sh:
- echo "#!/usr/bin/env python" > "$@"
+ echo "#!${MODPY_BIN}" > "$@"
echo "import sys; sys.path.append ('$(top_srcdir)')" >> "$@"
echo "from cupshelpers.ppds import _self_test" >> "$@"
echo "_self_test(sys.argv)" >> "$@"

10
print/system-config-printer/patches/patch-cupshelpers_cupshelpers_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.3 2009/01/31 12:37:30 ajacoutot Exp $
--- cupshelpers/cupshelpers.py.orig Fri Jan 16 10:50:57 2009
+++ cupshelpers/cupshelpers.py Sat Jan 31 12:11:42 2009
@@ -707,7 +707,7 @@ def missingPackagesAndExecutables(ppd):
$OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.4 2009/06/08 19:24:43 ajacoutot Exp $
--- cupshelpers/cupshelpers.py.orig Wed Feb 18 16:46:02 2009
+++ cupshelpers/cupshelpers.py Thu Jun 4 03:19:02 2009
@@ -714,7 +714,7 @@ def missingPackagesAndExecutables(ppd):
# First, a local function. How to check that something exists
# in a path:
@ -10,7 +10,7 @@ $OpenBSD: patch-cupshelpers_cupshelpers_py,v 1.3 2009/01/31 12:37:30 ajacoutot E
# Strip out foomatic '%'-style place-holders.
p = name.find ('%')
if p != -1:
@@ -805,8 +805,7 @@ def missingPackagesAndExecutables(ppd):
@@ -812,8 +812,7 @@ def missingPackagesAndExecutables(ppd):
continue
exepath = pathcheck (exe,

10
print/system-config-printer/patches/patch-newprinternotification_conf
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-newprinternotification_conf,v 1.1 2009/02/02 23:10:05 ajacoutot Exp $
$OpenBSD: patch-newprinternotification_conf,v 1.2 2009/06/08 19:24:43 ajacoutot Exp $
Allow anyone to listen to the new printer notification dbus signal.
cf. Debian bug #486613.
--- newprinternotification.conf.orig Tue Feb 3 00:00:38 2009
+++ newprinternotification.conf Tue Feb 3 00:01:27 2009
--- newprinternotification.conf.orig Wed Feb 4 17:14:05 2009
+++ newprinternotification.conf Thu Jun 4 03:19:02 2009
@@ -2,10 +2,6 @@
"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
@ -23,5 +23,5 @@ cf. Debian bug #486613.
- <deny own="com.redhat.NewPrinterNotification"/>
+ <allow own="com.redhat.NewPrinterNotification"/>
<deny send_destination="com.redhat.NewPrinterNotification"/>
<deny send_interface="com.redhat.NewPrinterNotification"/>
<deny send_destination="com.redhat.NewPrinterNotification"
send_interface="com.redhat.NewPrinterNotification"/>

12
print/system-config-printer/patches/patch-system-config-printer_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-system-config-printer_py,v 1.8 2009/02/10 17:19:42 ajacoutot Exp $
--- system-config-printer.py.orig Fri Jan 16 11:35:26 2009
+++ system-config-printer.py Tue Feb 10 17:20:21 2009
$OpenBSD: patch-system-config-printer_py,v 1.9 2009/06/08 19:24:43 ajacoutot Exp $
--- system-config-printer.py.orig Wed Feb 18 16:46:03 2009
+++ system-config-printer.py Thu Jun 4 03:19:02 2009
@@ -101,10 +101,6 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
ellipsis = unichr(0x2026)
@ -12,7 +12,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.8 2009/02/10 17:19:42 ajacoutot Exp
try:
try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY
except AttributeError:
@@ -2511,25 +2507,6 @@ class GUI(GtkGUI, monitor.Watcher):
@@ -2518,25 +2514,6 @@ class GUI(GtkGUI, monitor.Watcher):
self.changed = set()
self.setDataButtonState()
@ -38,7 +38,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.8 2009/02/10 17:19:42 ajacoutot Exp
# Now reconnect, in case the server needed to reload.
self.reconnect ()
@@ -3696,7 +3673,7 @@ class NewPrinterGUI(GtkGUI):
@@ -3704,7 +3681,7 @@ class NewPrinterGUI(GtkGUI):
# Try to get make and model via SNMP
if host:
os.environ["HOST"] = host
@ -47,7 +47,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.8 2009/02/10 17:19:42 ajacoutot Exp
debugprint (host + ": " + cmd)
stdout = None
try:
@@ -5194,7 +5171,7 @@ class NewPrinterGUI(GtkGUI):
@@ -5199,7 +5176,7 @@ class NewPrinterGUI(GtkGUI):
try:
# We want this to be in the current natural language,
# so we intentionally don't set LC_ALL=C here.