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

- remove some Fedora specifics

Browse Source 
from opensolaris
- while here, regen PLIST
- bump
This commit is contained in:
ajacoutot 2008-12-21 11:40:40 +00:00
parent 23325e461a
commit 3bf0fc5c19
4 changed files with 65 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2008/10/27 13:29:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2008/12/21 11:40:40 ajacoutot Exp $
COMMENT= printer (CUPS) administration tool
DISTNAME= system-config-printer-1.0.9
PKGNAME= ${DISTNAME}p0
CATEGORIES= print sysutils
HOMEPAGE= http://cyberelk.net/tim/software/system-config-printer/
@ -41,7 +42,8 @@ SUBST_FILES= applet.py cupshelpers/cupshelpers.py pysmb.py \
manage-print-jobs.desktop.in \
my-default-printer.desktop.in \
print-applet.desktop.in \
system-config-printer.desktop.in
system-config-printer.desktop.in \
troubleshoot/SchedulerNotRunning.py
pre-configure:
find ${WRKDIST} -name \*.py | \

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

@ -1,10 +1,21 @@
set_program_name(domain) requires newer py-gtk2, but is kept back
due to implied py-Nummeric update.
$OpenBSD: patch-system-config-printer_py,v 1.5 2008/10/27 13:29:13 ajacoutot Exp $
$OpenBSD: patch-system-config-printer_py,v 1.6 2008/12/21 11:40:40 ajacoutot Exp $
--- system-config-printer.py.orig Tue Oct 21 11:02:45 2008
+++ system-config-printer.py Mon Oct 27 14:30:20 2008
@@ -333,7 +333,7 @@ class GUI(GtkGUI, monitor.Watcher):
+++ system-config-printer.py Sun Dec 21 12:29:27 2008
@@ -98,10 +98,6 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
ellipsis = unichr(0x2026)
-TEXT_start_firewall_tool = _("To do this, select "
- "System->Administration->Firewall "
- "from the main menu.")
-
try:
try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY
except AttributeError:
@@ -333,7 +329,7 @@ class GUI(GtkGUI, monitor.Watcher):
np.NewPrinterWindow.set_transient_for(self.MainWindow)
# Set up "About" dialog
@ -13,7 +24,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.5 2008/10/27 13:29:13 ajacoutot Exp
self.AboutDialog.set_version(config.VERSION)
self.AboutDialog.set_icon_name('printer')
@@ -377,7 +377,7 @@ class GUI(GtkGUI, monitor.Watcher):
@@ -377,7 +373,7 @@ class GUI(GtkGUI, monitor.Watcher):
self.dests_iconview.set_item_width (145)
self.dests_iconview.set_pixbuf_column (1)
self.dests_iconview.set_text_column (2)
@ -22,7 +33,33 @@ $OpenBSD: patch-system-config-printer_py,v 1.5 2008/10/27 13:29:13 ajacoutot Exp
self.dests_iconview.connect ('item-activated',
self.dests_iconview_item_activated)
self.dests_iconview.connect ('selection-changed',
@@ -3707,7 +3707,7 @@ class NewPrinterGUI(GtkGUI):
@@ -2479,25 +2475,6 @@ class GUI(GtkGUI, monitor.Watcher):
self.changed = set()
self.setDataButtonState()
- old_setting = self.server_settings.get (cups.CUPS_SERVER_SHARE_PRINTERS,
- '0')
- new_setting = setting_dict.get (cups.CUPS_SERVER_SHARE_PRINTERS, '0')
- if (old_setting == '0' and new_setting != '0'):
- # We have just enabled print queue sharing.
- # Ideally, this is the time we would check the firewall
- # settings on this machine and request that the IPP TCP port
- # be unblocked. Unfortunately, this is not yet possible
- # (bug #440469). However, we can display a dialog to suggest
- # that now might be a good time to review the firewall settings.
- show_info_dialog (_("Review Firewall"),
- _("You may need to adjust the firewall "
- "to allow network printing to this "
- "computer.") + '\n\n' +
- TEXT_start_firewall_tool,
- parent=self.ServerSettingsDialog)
-
- time.sleep(1) # give the server a chance to process our request
-
# Now reconnect, in case the server needed to reload.
self.reconnect ()
@@ -3707,7 +3684,7 @@ class NewPrinterGUI(GtkGUI):
# Try to get make and model via SNMP
if host:
os.environ["HOST"] = host
@ -31,7 +68,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.5 2008/10/27 13:29:13 ajacoutot Exp
debugprint (host + ": " + cmd)
stdout = None
try:
@@ -5098,7 +5098,7 @@ class NewPrinterGUI(GtkGUI):
@@ -5098,7 +5075,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.

17
print/system-config-printer/patches/patch-troubleshoot_SchedulerNotRunning_py Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-troubleshoot_SchedulerNotRunning_py,v 1.1 2008/12/21 11:40:40 ajacoutot Exp $
--- troubleshoot/SchedulerNotRunning.py.orig Sun Dec 21 12:29:40 2008
+++ troubleshoot/SchedulerNotRunning.py Sun Dec 21 12:33:10 2008
@@ -26,10 +26,9 @@ class SchedulerNotRunning(Question):
Question.__init__ (self, troubleshooter, "Scheduler not running?")
page = self.initial_vbox (_("CUPS Service Stopped"),
_("The CUPS print spooler does not appear "
- "to be running. To correct this, choose "
- "System->Administration->Services from "
- "the main menu and look for the `cups' "
- "service."))
+ "to be running. To correct this, run "
+ "'${LOCALBASE}/sbin/cupsd' "))
+ "as root in a terminal."))
troubleshooter.new_page (page, self)
def display (self):

4
print/system-config-printer/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2008/10/27 13:29:13 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2008/12/21 11:40:40 ajacoutot Exp $
bin/my-default-printer
bin/system-config-printer
bin/system-config-printer-applet
@ -76,8 +76,6 @@ share/locale/si/LC_MESSAGES/system-config-printer.mo
share/locale/sk/LC_MESSAGES/system-config-printer.mo
share/locale/sl/LC_MESSAGES/system-config-printer.mo
share/locale/sr/LC_MESSAGES/system-config-printer.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/system-config-printer.mo
share/locale/sv/LC_MESSAGES/system-config-printer.mo
share/locale/ta/LC_MESSAGES/system-config-printer.mo