From owner-svn-ports-all@FreeBSD.ORG Thu Sep 12 19:44:39 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A0AAB8F3; Thu, 12 Sep 2013 19:44:39 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7EABD21BA; Thu, 12 Sep 2013 19:44:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8CJidw8065399; Thu, 12 Sep 2013 19:44:39 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8CJicUA065394; Thu, 12 Sep 2013 19:44:38 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201309121944.r8CJicUA065394@svn.freebsd.org> From: Koop Mast Date: Thu, 12 Sep 2013 19:44:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327104 - in head/print/system-config-printer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 19:44:39 -0000 Author: kwm Date: Thu Sep 12 19:44:38 2013 New Revision: 327104 URL: http://svnweb.freebsd.org/changeset/ports/327104 Log: Update to 1.4.2. This fixes run-time with glib 2.36. PR: ports/180075 [1] Reported by: Stephen Fisher [1], swills@ Deleted: head/print/system-config-printer/files/patch-my-default-printer head/print/system-config-printer/files/patch-newprinternotification.conf head/print/system-config-printer/files/patch-system-config-printer head/print/system-config-printer/files/patch-system-config-printer-applet head/print/system-config-printer/files/patch-system-config-printer.py Modified: head/print/system-config-printer/Makefile head/print/system-config-printer/distinfo head/print/system-config-printer/files/patch-applet.py head/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py head/print/system-config-printer/pkg-plist Modified: head/print/system-config-printer/Makefile ============================================================================== --- head/print/system-config-printer/Makefile Thu Sep 12 19:42:03 2013 (r327103) +++ head/print/system-config-printer/Makefile Thu Sep 12 19:44:38 2013 (r327104) @@ -1,51 +1,51 @@ -# New ports collection makefile for: system-config-printer -# Date created: 2008-03-20 -# Whom: Michael Johnson -# +# Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/print/system-config-printer/Makefile,v 1.6 2009/12/29 16:03:58 ahze Exp $ -# PORTNAME= system-config-printer -PORTVERSION= 1.1.16 -PORTREVISION= 6 +PORTVERSION= 1.4.2 CATEGORIES= print gnome MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= CUPS configuration Gtk+2.0 GUI -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \ - ${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify \ - xmlproc_parse:${PORTSDIR}/textproc/py-xml \ - ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ - xmlto:${PORTSDIR}/textproc/xmlto \ - desktop-file-install:${PORTSDIR}/devel/desktop-file-utils \ +BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \ ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \ - ${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify \ - xmlproc_parse:${PORTSDIR}/textproc/py-xml \ - ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ + ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \ ${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper -USE_BZIP2= yes -USE_PYTHON= 2.6+ +USE_XZ= yes +USE_PYTHON= yes GNU_CONFIGURE= yes -USE_GMAKE= yes -USES= gettext +USES= desktop-file-utils gettext gmake pathfix pkgconfig shebangfix CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= pygtk2 -MAN1= system-config-printer-applet.1 system-config-printer.1 +USE_GNOME= intlhack pygobject3 + +CONFIGURE_ARGS= --without-udev-rules \ + --without-systemdsystemunitdir + +MAN1= system-config-printer-applet.1 \ + system-config-printer.1 PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//} +SHEBANG_FILES= *.py troubleshoot/*.py xml/validate.py + INSTALLS_EGGINFO= yes PYDISTUTILS_PKGNAME= cupshelpers PYDISTUTILS_PKGVERSION= 1.0 post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ - 's|%%LOCALBASE%%|${LOCALBASE}|g; s|%%PREFIX%%|${PREFIX}|g' + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ + s|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/applet.py ${WRKSRC}/check-device-ids.py \ + ${WRKSRC}/cupshelpers/cupshelpers.py \ + ${WRKSRC}/cupshelpers/xmldriverprefs.py \ + ${WRKSRC}/dbus/org.fedoraproject.Config.Printing.service \ + ${WRKSRC}/newprinter.py ${WRKSRC}/probe_printer.py @${REINPLACE_CMD} -e 's|setup.py install|setup.py install -c -O1|g' \ ${WRKSRC}/Makefile.in Modified: head/print/system-config-printer/distinfo ============================================================================== --- head/print/system-config-printer/distinfo Thu Sep 12 19:42:03 2013 (r327103) +++ head/print/system-config-printer/distinfo Thu Sep 12 19:44:38 2013 (r327104) @@ -1,2 +1,2 @@ -SHA256 (system-config-printer-1.1.16.tar.bz2) = 176b63ee6af2208313469192eb34eb12b41fe8b890a18c8a5ab693010a8e785d -SIZE (system-config-printer-1.1.16.tar.bz2) = 1036604 +SHA256 (system-config-printer-1.4.2.tar.xz) = f0e464435532f73cf8c328ceb1220f02ab2acfc1dcdec729cf5a0acf4193dbea +SIZE (system-config-printer-1.4.2.tar.xz) = 888848 Modified: head/print/system-config-printer/files/patch-applet.py ============================================================================== --- head/print/system-config-printer/files/patch-applet.py Thu Sep 12 19:42:03 2013 (r327103) +++ head/print/system-config-printer/files/patch-applet.py Thu Sep 12 19:44:38 2013 (r327104) @@ -1,20 +1,11 @@ ---- applet.py.orig 2009-12-22 09:44:19.000000000 -0500 -+++ applet.py 2009-12-29 00:06:27.000000000 -0500 +--- applet.py.orig 2013-07-22 15:58:32.000000000 +0200 ++++ applet.py 2013-08-29 11:06:43.000000000 +0200 @@ -43,7 +43,7 @@ - os.environ['LC_ALL'] = 'C' - locale.setlocale (locale.LC_ALL, "") + + from gi.repository import Notify -APPDIR="/usr/share/system-config-printer" +APPDIR="%%PREFIX%%/share/system-config-printer" - DOMAIN="system-config-printer" ICON="printer" - SEARCHING_ICON="document-print-preview" -@@ -234,7 +234,7 @@ - pid = os.fork () - if pid == 0: - # Child. -- cmd = "/usr/bin/system-config-printer" -+ cmd = "%%PREFIX%%/bin/system-config-printer" - argv.insert (0, cmd) - os.execvp (cmd, argv) - sys.exit (1) + + # We need to call Notify.init before we can check the server for caps Modified: head/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py ============================================================================== --- head/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py Thu Sep 12 19:42:03 2013 (r327103) +++ head/print/system-config-printer/files/patch-cupshelpers_cupshelpers.py Thu Sep 12 19:44:38 2013 (r327104) @@ -1,6 +1,6 @@ ---- cupshelpers/cupshelpers.py.orig 2009-12-22 09:44:19.000000000 -0500 -+++ cupshelpers/cupshelpers.py 2009-12-29 00:08:26.000000000 -0500 -@@ -663,7 +663,7 @@ +--- cupshelpers/cupshelpers.py.orig 2013-07-22 15:58:32.000000000 +0200 ++++ cupshelpers/cupshelpers.py 2013-08-29 11:18:44.000000000 +0200 +@@ -739,7 +739,7 @@ # First, a local function. How to check that something exists # in a path: @@ -9,12 +9,3 @@ if name == "-": # A filter of "-" means that no filter is required, # i.e. the device accepts the given format as-is. -@@ -765,7 +765,7 @@ - continue - - exepath = pathcheck (exe, -- "/usr/lib/cups/filter:" -+ "%%LOCALBASE%%/libexec/cups/filter:" - "/usr/lib64/cups/filter") - - if exe and not exepath: Modified: head/print/system-config-printer/pkg-plist ============================================================================== --- head/print/system-config-printer/pkg-plist Thu Sep 12 19:42:03 2013 (r327103) +++ head/print/system-config-printer/pkg-plist Thu Sep 12 19:44:38 2013 (r327104) @@ -1,28 +1,41 @@ -bin/my-default-printer +bin/install-printerdriver +bin/scp-dbus-service bin/system-config-printer bin/system-config-printer-applet -etc/dbus-1/system.d/newprinternotification.conf +etc/cupshelpers/preferreddrivers.xml +etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf +etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf etc/xdg/autostart/print-applet.desktop %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.py %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyc %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyo +%%PYTHON_SITELIBDIR%%/cupshelpers/config.py +%%PYTHON_SITELIBDIR%%/cupshelpers/config.pyc +%%PYTHON_SITELIBDIR%%/cupshelpers/config.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.py %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.pyc %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.pyo +%%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.py +%%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.pyc +%%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.py %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyc %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.py %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyc %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyo -share/applications/manage-print-jobs.desktop -share/applications/my-default-printer.desktop +%%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.py +%%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.pyc +%%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.pyo share/applications/system-config-printer.desktop +share/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml +share/dbus-1/services/org.fedoraproject.Config.Printing.service share/locale/ar/LC_MESSAGES/system-config-printer.mo share/locale/as/LC_MESSAGES/system-config-printer.mo share/locale/bg/LC_MESSAGES/system-config-printer.mo share/locale/bn/LC_MESSAGES/system-config-printer.mo share/locale/bn_IN/LC_MESSAGES/system-config-printer.mo +share/locale/br/LC_MESSAGES/system-config-printer.mo share/locale/bs/LC_MESSAGES/system-config-printer.mo share/locale/ca/LC_MESSAGES/system-config-printer.mo share/locale/cs/LC_MESSAGES/system-config-printer.mo @@ -58,6 +71,7 @@ share/locale/mr/LC_MESSAGES/system-confi share/locale/ms/LC_MESSAGES/system-config-printer.mo share/locale/my/LC_MESSAGES/system-config-printer.mo share/locale/nb/LC_MESSAGES/system-config-printer.mo +share/locale/nds/LC_MESSAGES/system-config-printer.mo share/locale/nl/LC_MESSAGES/system-config-printer.mo share/locale/nn/LC_MESSAGES/system-config-printer.mo share/locale/or/LC_MESSAGES/system-config-printer.mo @@ -81,88 +95,92 @@ share/locale/uk/LC_MESSAGES/system-confi share/locale/vi/LC_MESSAGES/system-config-printer.mo share/locale/zh_CN/LC_MESSAGES/system-config-printer.mo share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo -%%DATADIR%%/AdvancedServerSettings.py -%%DATADIR%%/GroupsPane.py -%%DATADIR%%/GroupsPaneModel.py -%%DATADIR%%/HIG.py -%%DATADIR%%/PhysicalDevice.py -%%DATADIR%%/SearchCriterion.py -%%DATADIR%%/ToolbarSearchEntry.py -%%DATADIR%%/XmlHelper.py -%%DATADIR%%/applet.py -%%DATADIR%%/asyncconn.py -%%DATADIR%%/asyncipp.py -%%DATADIR%%/asyncpk0.py -%%DATADIR%%/asyncpk1.py -%%DATADIR%%/authconn.py -%%DATADIR%%/config.py -%%DATADIR%%/cupspk.py -%%DATADIR%%/debug.py -%%DATADIR%%/errordialogs.py -%%DATADIR%%/firewall.py -%%DATADIR%%/glade.py -%%DATADIR%%/glade/AboutDialog.glade -%%DATADIR%%/glade/ConnectDialog.glade -%%DATADIR%%/glade/ConnectingDialog.glade -%%DATADIR%%/glade/InstallDialog.glade -%%DATADIR%%/glade/JobsWindow.glade -%%DATADIR%%/glade/NewPrinterName.glade -%%DATADIR%%/glade/NewPrinterWindow.glade -%%DATADIR%%/glade/PrinterPropertiesDialog.glade -%%DATADIR%%/glade/PrintersWindow.glade -%%DATADIR%%/glade/SMBBrowseDialog.glade -%%DATADIR%%/glade/ServerSettingsDialog.glade -%%DATADIR%%/glade/WaitWindow.glade -%%DATADIR%%/glade/statusicon_popupmenu.glade -%%DATADIR%%/gtk_label_autowrap.py -%%DATADIR%%/gtkinklevel.py -%%DATADIR%%/gtkspinner.py -%%DATADIR%%/icons/i-network-printer.png -%%DATADIR%%/installpackage.py -%%DATADIR%%/jobviewer.py -%%DATADIR%%/monitor.py -%%DATADIR%%/my-default-printer.py -%%DATADIR%%/options.py -%%DATADIR%%/optionwidgets.py -%%DATADIR%%/ppdippstr.py -%%DATADIR%%/probe_printer.py -%%DATADIR%%/pysmb.py -%%DATADIR%%/smburi.py -%%DATADIR%%/statereason.py -%%DATADIR%%/system-config-printer.py -%%DATADIR%%/timedops.py -%%DATADIR%%/troubleshoot/CheckLocalServerPublishing.py -%%DATADIR%%/troubleshoot/CheckNetworkServerSanity.py -%%DATADIR%%/troubleshoot/CheckPPDSanity.py -%%DATADIR%%/troubleshoot/CheckPrinterSanity.py -%%DATADIR%%/troubleshoot/CheckUSBPermissions.py -%%DATADIR%%/troubleshoot/ChooseNetworkPrinter.py -%%DATADIR%%/troubleshoot/ChoosePrinter.py -%%DATADIR%%/troubleshoot/DeviceListed.py -%%DATADIR%%/troubleshoot/ErrorLogCheckpoint.py -%%DATADIR%%/troubleshoot/ErrorLogFetch.py -%%DATADIR%%/troubleshoot/ErrorLogParse.py -%%DATADIR%%/troubleshoot/LocalOrRemote.py -%%DATADIR%%/troubleshoot/Locale.py -%%DATADIR%%/troubleshoot/NetworkCUPSPrinterShared.py -%%DATADIR%%/troubleshoot/PrintTestPage.py -%%DATADIR%%/troubleshoot/PrinterStateReasons.py -%%DATADIR%%/troubleshoot/QueueNotEnabled.py -%%DATADIR%%/troubleshoot/QueueRejectingJobs.py -%%DATADIR%%/troubleshoot/RemoteAddress.py -%%DATADIR%%/troubleshoot/SchedulerNotRunning.py -%%DATADIR%%/troubleshoot/ServerFirewalled.py -%%DATADIR%%/troubleshoot/Shrug.py -%%DATADIR%%/troubleshoot/Welcome.py -%%DATADIR%%/troubleshoot/__init__.py -%%DATADIR%%/troubleshoot/base.py -%%DATADIR%%/userdefault.py -@dirrm %%DATADIR%%/troubleshoot -@dirrm %%DATADIR%%/icons -@dirrm %%DATADIR%%/glade -@dirrm %%DATADIR%% -@dirrmtry share/applications -@dirrm %%PYTHON_SITELIBDIR%%/cupshelpers +share/system-config-printer/HIG.py +share/system-config-printer/PhysicalDevice.py +share/system-config-printer/SearchCriterion.py +share/system-config-printer/ToolbarSearchEntry.py +share/system-config-printer/applet.py +share/system-config-printer/asyncconn.py +share/system-config-printer/asyncipp.py +share/system-config-printer/asyncpk1.py +share/system-config-printer/authconn.py +share/system-config-printer/check-device-ids.py +share/system-config-printer/config.py +share/system-config-printer/cupspk.py +share/system-config-printer/debug.py +share/system-config-printer/dnssdresolve.py +share/system-config-printer/errordialogs.py +share/system-config-printer/firewallsettings.py +share/system-config-printer/gtkinklevel.py +share/system-config-printer/gui.py +share/system-config-printer/icons/i-network-printer.png +share/system-config-printer/install-printerdriver.py +share/system-config-printer/installpackage.py +share/system-config-printer/jobviewer.py +share/system-config-printer/monitor.py +share/system-config-printer/newprinter.py +share/system-config-printer/options.py +share/system-config-printer/optionwidgets.py +share/system-config-printer/ppdcache.py +share/system-config-printer/ppdippstr.py +share/system-config-printer/ppdsloader.py +share/system-config-printer/printerproperties.py +share/system-config-printer/probe_printer.py +share/system-config-printer/pysmb.py +share/system-config-printer/scp-dbus-service.py +share/system-config-printer/serversettings.py +share/system-config-printer/smburi.py +share/system-config-printer/statereason.py +share/system-config-printer/system-config-printer.py +share/system-config-printer/timedops.py +share/system-config-printer/troubleshoot/CheckLocalServerPublishing.py +share/system-config-printer/troubleshoot/CheckNetworkServerSanity.py +share/system-config-printer/troubleshoot/CheckPPDSanity.py +share/system-config-printer/troubleshoot/CheckPrinterSanity.py +share/system-config-printer/troubleshoot/CheckSELinux.py +share/system-config-printer/troubleshoot/CheckUSBPermissions.py +share/system-config-printer/troubleshoot/ChooseNetworkPrinter.py +share/system-config-printer/troubleshoot/ChoosePrinter.py +share/system-config-printer/troubleshoot/DeviceListed.py +share/system-config-printer/troubleshoot/ErrorLogCheckpoint.py +share/system-config-printer/troubleshoot/ErrorLogFetch.py +share/system-config-printer/troubleshoot/ErrorLogParse.py +share/system-config-printer/troubleshoot/LocalOrRemote.py +share/system-config-printer/troubleshoot/Locale.py +share/system-config-printer/troubleshoot/NetworkCUPSPrinterShared.py +share/system-config-printer/troubleshoot/PrintTestPage.py +share/system-config-printer/troubleshoot/PrinterStateReasons.py +share/system-config-printer/troubleshoot/QueueNotEnabled.py +share/system-config-printer/troubleshoot/QueueRejectingJobs.py +share/system-config-printer/troubleshoot/RemoteAddress.py +share/system-config-printer/troubleshoot/SchedulerNotRunning.py +share/system-config-printer/troubleshoot/ServerFirewalled.py +share/system-config-printer/troubleshoot/Shrug.py +share/system-config-printer/troubleshoot/VerifyPackages.py +share/system-config-printer/troubleshoot/Welcome.py +share/system-config-printer/troubleshoot/__init__.py +share/system-config-printer/troubleshoot/base.py +share/system-config-printer/ui/AboutDialog.ui +share/system-config-printer/ui/ConnectDialog.ui +share/system-config-printer/ui/ConnectingDialog.ui +share/system-config-printer/ui/InstallDialog.ui +share/system-config-printer/ui/JobsWindow.ui +share/system-config-printer/ui/NewPrinterName.ui +share/system-config-printer/ui/NewPrinterWindow.ui +share/system-config-printer/ui/PrinterPropertiesDialog.ui +share/system-config-printer/ui/PrintersWindow.ui +share/system-config-printer/ui/SMBBrowseDialog.ui +share/system-config-printer/ui/ServerSettingsDialog.ui +share/system-config-printer/ui/WaitWindow.ui +share/system-config-printer/ui/statusicon_popupmenu.ui +share/system-config-printer/userdefault.py +share/system-config-printer/xml/preferreddrivers.rng +share/system-config-printer/xml/validate.py +@dirrm share/system-config-printer/xml +@dirrm share/system-config-printer/ui +@dirrm share/system-config-printer/troubleshoot +@dirrm share/system-config-printer/icons +@dirrm share/system-config-printer @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -183,3 +201,5 @@ share/locale/zh_TW/LC_MESSAGES/system-co @dirrmtry share/locale/bn_IN @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrm %%PYTHON_SITELIBDIR%%/cupshelpers +@dirrm etc/cupshelpers