# ChangeLog for app-admin/system-config-printer-common
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.40 2011/08/07 14:55:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.41 2011/08/09 23:55:19 reavertm Exp $
+
+*system-config-printer-common-1.3.5 (09 Aug 2011)
+
+ 09 Aug 2011; Maciej Mrozowski <reavertm@gentoo.org>
+ -system-config-printer-common-1.1.13.ebuild,
+ -files/system-config-printer-common-1.1.13-split.patch,
+ -system-config-printer-common-1.2.2.ebuild,
+ -files/system-config-printer-common-1.2.2-split.patch,
+ +system-config-printer-common-1.3.5.ebuild,
+ +files/system-config-printer-common-1.3.5-split.patch,
+ +files/0002-Make-PackageKit-optional-in-cupshelpers-bug-726996-U.patch,
+ +files/0004-Removed-PackageKit-client-code-in-missingPackagesAnd.patch:
+ Version bump, remove old
07 Aug 2011; Raúl Porcel <armin76@gentoo.org>
system-config-printer-common-1.3.3.ebuild:
--- /dev/null
+From ddf4a4dcec27393e3c0c9efb032032cdb6b69d10 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Mon, 1 Aug 2011 10:42:57 +0100
+Subject: [PATCH 2/4] Make PackageKit optional in cupshelpers (bug #726996, Ubuntu #819000).
+
+---
+ cupshelpers/cupshelpers.py | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 251e0ee..3b95e2f 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -21,8 +21,12 @@
+
+ import cups, pprint, os, tempfile, re, string
+ import locale
+-import packagekit.client, packagekit.enums
+ from . import _debugprint
++try:
++ import packagekit.client, packagekit.enums
++ HAVE_PACKAGEKIT=True
++except ImportError:
++ HAVE_PACKAGEKIT=False
+
+ class Printer:
+ _flags_blacklist = ["options", "local"]
+@@ -830,7 +834,7 @@ def missingPackagesAndExecutables(ppd):
+ """
+ executables = missingExecutables(ppd)
+ packages = []
+- if executables:
++ if executables and HAVE_PACKAGEKIT:
+ unresolved_executables = []
+ client = packagekit.client.PackageKitClient ()
+ for executable in executables:
+--
+1.7.3.4
+
--- /dev/null
+From b1420ee264d6c462454919492f53a506d7bce0e1 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 2 Aug 2011 15:43:11 +0100
+Subject: [PATCH 4/4] Removed PackageKit client code in missingPackagesAndExecutables (bug #726938).
+
+The PackageKit Python client module is hard-coded to set a default
+GLib main loop on import, which means it cannot be imported by a
+module that might be used by an application using a different main
+loop implementation, such as KDE's printer-applet.
+---
+ cupshelpers/cupshelpers.py | 24 +-----------------------
+ 1 files changed, 1 insertions(+), 23 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 3b95e2f..bf6eda2 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -22,11 +22,6 @@
+ import cups, pprint, os, tempfile, re, string
+ import locale
+ from . import _debugprint
+-try:
+- import packagekit.client, packagekit.enums
+- HAVE_PACKAGEKIT=True
+-except ImportError:
+- HAVE_PACKAGEKIT=False
+
+ class Printer:
+ _flags_blacklist = ["options", "local"]
+@@ -833,24 +828,7 @@ def missingPackagesAndExecutables(ppd):
+ missing executables
+ """
+ executables = missingExecutables(ppd)
+- packages = []
+- if executables and HAVE_PACKAGEKIT:
+- unresolved_executables = []
+- client = packagekit.client.PackageKitClient ()
+- for executable in executables:
+- if not executable.startswith ("/"):
+- executable = "/usr/bin/" + executable
+-
+- result = client.search_file ([executable],
+- packagekit.enums.FILTER_NOT_INSTALLED)
+- if result:
+- packages.extend (set (map (lambda x: x.name, result)))
+- else:
+- unresolved_executables.append (executable)
+-
+- executables = unresolved_executables
+-
+- return (packages, executables)
++ return ([], executables)
+
+ def _main():
+ c = cups.Connection()
+--
+1.7.3.4
+
+++ /dev/null
-diff -ru ../system-config-printer-1.1.12/configure.in ./configure.in
---- ../system-config-printer-1.1.12/configure.in 2009-08-25 18:01:27.000000000 +0200
-+++ ./configure.in 2009-08-28 18:32:45.000000000 +0200
-@@ -1,6 +1,6 @@
- AC_INIT(system-config-printer, 1.1.12)
- AC_CONFIG_SRCDIR(system-config-printer.py)
--AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
-+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
- IT_PROG_INTLTOOL
- AM_GNU_GETTEXT([external])
- AM_PATH_PYTHON
-diff -ru ../system-config-printer-1.1.12/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.12/Makefile.am 2009-08-25 18:01:27.000000000 +0200
-+++ ./Makefile.am 2009-08-28 18:57:38.000000000 +0200
-@@ -70,84 +70,22 @@
- rm -f .stamp-distutils-in-builddir
-
- nobase_pkgdata_SCRIPTS= \
-- my-default-printer.py \
-- pysmb.py \
-- system-config-printer.py \
-- troubleshoot/__init__.py \
-- applet.py
-+ pysmb.py
-
- nobase_pkgdata_DATA= \
-- AdvancedServerSettings.py \
-- authconn.py \
- config.py \
-- cupspk.py \
- debug.py \
-- errordialogs.py \
-- HIG.py \
-- glade.py \
-- GroupsPane.py \
-- GroupsPaneModel.py \
-- gtkinklevel.py \
-- gtkspinner.py \
- installpackage.py \
-- jobviewer.py \
- monitor.py \
-- options.py \
-- optionwidgets.py \
- PhysicalDevice.py \
- ppdippstr.py \
- probe_printer.py \
-- gtk_label_autowrap.py \
- SearchCriterion.py \
- smburi.py \
- statereason.py \
-- timedops.py \
-- ToolbarSearchEntry.py \
-- userdefault.py \
- XmlHelper.py \
-- glade/AboutDialog.glade \
-- glade/ConnectDialog.glade \
-- glade/ConnectingDialog.glade \
-- glade/InstallDialog.glade \
-- glade/JobsWindow.glade \
-- glade/NewPrinterName.glade \
-- glade/NewPrinterWindow.glade \
-- glade/PrinterPropertiesDialog.glade \
-- glade/PrintersWindow.glade \
-- glade/ServerSettingsDialog.glade \
-- glade/SMBBrowseDialog.glade \
-- glade/statusicon_popupmenu.glade \
-- glade/WaitWindow.glade \
-- icons/i-network-printer.png \
-- troubleshoot/base.py \
-- troubleshoot/CheckLocalServerPublishing.py \
-- troubleshoot/CheckNetworkServerSanity.py \
-- troubleshoot/CheckPPDSanity.py \
-- troubleshoot/CheckPrinterSanity.py \
-- troubleshoot/CheckUSBPermissions.py \
-- troubleshoot/ChooseNetworkPrinter.py \
-- troubleshoot/ChoosePrinter.py \
-- troubleshoot/DeviceListed.py \
-- troubleshoot/ErrorLogCheckpoint.py \
-- troubleshoot/ErrorLogFetch.py \
-- troubleshoot/ErrorLogParse.py \
-- troubleshoot/Locale.py \
-- troubleshoot/LocalOrRemote.py \
-- troubleshoot/NetworkCUPSPrinterShared.py \
-- troubleshoot/PrinterStateReasons.py \
-- troubleshoot/PrintTestPage.py \
-- troubleshoot/QueueNotEnabled.py \
-- troubleshoot/QueueRejectingJobs.py \
-- troubleshoot/RemoteAddress.py \
-- troubleshoot/SchedulerNotRunning.py \
-- troubleshoot/ServerFirewalled.py \
-- troubleshoot/Shrug.py \
-- troubleshoot/Welcome.py
--
--bin_SCRIPTS=\
-- system-config-printer \
-- system-config-printer-applet \
-- my-default-printer
-+ smburi.py \
-+ statereason.py
-
- if UDEV_RULES
- udevrulesdir=$(sysconfdir)/udev/rules.d
-@@ -162,61 +100,16 @@
- udev/udev-add-printer
- endif
-
--man_MANS= \
-- man/system-config-printer.1 \
-- man/system-config-printer-applet.1
--
- dbus_DATA =\
- newprinternotification.conf
- dbusdir = $(sysconfdir)/dbus-1/system.d/
-
--desktop_DATA =\
-- system-config-printer.desktop \
-- print-applet.desktop \
-- manage-print-jobs.desktop \
-- my-default-printer.desktop
- desktopdir = $(datadir)/applications/
- autostartdir = $(sysconfdir)/xdg/autostart/
-
- DESKTOP_VENDOR=@DESKTOPVENDOR@
- DESKTOP_PREFIX=@DESKTOPPREFIX@
-
--install-desktopDATA: $(desktop_DATA)
-- mkdir -p $(DESTDIR)$(desktopdir)
-- mkdir -p $(DESTDIR)$(desktopdir)
-- desktop-file-install $(DESKTOP_VENDOR) \
-- --dir $(DESTDIR)$(desktopdir) \
-- --add-category System \
-- --add-category Settings \
-- --add-category HardwareSettings \
-- --add-category Printing \
-- --add-category GTK \
-- system-config-printer.desktop
-- desktop-file-install $(DESKTOP_VENDOR) \
-- --dir $(DESTDIR)$(desktopdir) \
-- --add-category System \
-- --add-category Monitor \
-- --add-category GTK \
-- manage-print-jobs.desktop
-- desktop-file-install $(DESKTOP_VENDOR) \
-- --dir $(DESTDIR)$(desktopdir) \
-- --add-category Settings \
-- --add-category HardwareSettings \
-- --add-category GTK \
-- my-default-printer.desktop
-- desktop-file-install $(DESKTOP_VENDOR) \
-- --dir $(DESTDIR)$(autostartdir) \
-- --add-category System \
-- --add-category Monitor \
-- --add-category GTK \
-- print-applet.desktop
--
--uninstall-desktopDATA:
-- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
-- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.desktop
-- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)my-default-printer.desktop
-- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
--
- EXTRA_DIST=\
- $(nobase_pkgdata_SCRIPTS) \
- $(nobase_pkgdata_DATA) \
-diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
---- ../system-config-printer-1.2.2/Makefile.am 2010-05-07 16:19:03.000000000 +0200
-+++ ./Makefile.am 2010-05-17 20:36:37.657216914 +0200
-@@ -70,91 +70,20 @@
+diff -ruN system-config-printer-1.3.5/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.5/Makefile.am 2011-07-28 18:04:13.000000000 +0200
++++ my/Makefile.am 2011-08-10 00:56:28.296077828 +0200
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -O2 -Wall
++CFLAGS=-Wall
+
+ SUBDIRS=po
+
+@@ -83,99 +83,21 @@
rm -f .stamp-distutils-in-builddir
nobase_pkgdata_SCRIPTS= \
- check-device-ids.py \
- pysmb.py \
+- scp-dbus-service.py \
- system-config-printer.py \
- troubleshoot/__init__.py \
- applet.py
+ pysmb.py
nobase_pkgdata_DATA= \
-- AdvancedServerSettings.py \
- asyncconn.py \
- asyncipp.py \
- asyncpk1.py \
config.py \
- cupspk.py \
debug.py \
-- dnssdresolve.py \
+ dnssdresolve.py \
- errordialogs.py \
- HIG.py \
-- firewall.py \
+ firewall.py \
- gui.py \
-- GroupsPane.py \
-- GroupsPaneModel.py \
- gtkinklevel.py \
- gtkspinner.py \
-- installdriver.py \
installpackage.py \
- jobviewer.py \
monitor.py \
+- newprinter.py \
- options.py \
- optionwidgets.py \
PhysicalDevice.py \
+- ppdcache.py \
ppdippstr.py \
- ppdsloader.py \
+- printerproperties.py \
probe_printer.py \
- gtk_label_autowrap.py \
SearchCriterion.py \
+- serversettings.py \
smburi.py \
- statereason.py \
+- statereason.py \
- timedops.py \
- ToolbarSearchEntry.py \
- userdefault.py \
-- XmlHelper.py \
-- ui/AboutDialog.glade \
-- ui/ConnectDialog.glade \
-- ui/ConnectingDialog.glade \
-- ui/InstallDialog.glade \
-- ui/JobsWindow.glade \
-- ui/NewPrinterName.glade \
-- ui/NewPrinterWindow.glade \
-- ui/PrinterPropertiesDialog.glade \
-- ui/PrintersWindow.glade \
-- ui/ServerSettingsDialog.glade \
-- ui/SMBBrowseDialog.glade \
-- ui/statusicon_popupmenu.glade \
-- ui/WaitWindow.glade \
+- ui/AboutDialog.ui \
+- ui/ConnectDialog.ui \
+- ui/ConnectingDialog.ui \
+- ui/InstallDialog.ui \
+- ui/JobsWindow.ui \
+- ui/NewPrinterName.ui \
+- ui/NewPrinterWindow.ui \
+- ui/PrinterPropertiesDialog.ui \
+- ui/PrintersWindow.ui \
+- ui/ServerSettingsDialog.ui \
+- ui/SMBBrowseDialog.ui \
+- ui/statusicon_popupmenu.ui \
+- ui/WaitWindow.ui \
- icons/i-network-printer.png \
- troubleshoot/base.py \
- troubleshoot/CheckLocalServerPublishing.py \
- troubleshoot/SchedulerNotRunning.py \
- troubleshoot/ServerFirewalled.py \
- troubleshoot/Shrug.py \
-- troubleshoot/Welcome.py
+- troubleshoot/VerifyPackages.py \
+- troubleshoot/Welcome.py \
+- xml/preferreddrivers.rng \
+- xml/validate.py
+-
+-cupshelpersdir=$(sysconfdir)/cupshelpers
+-cupshelpers_DATA=\
+- xml/preferreddrivers.xml
-
--bin_SCRIPTS=\
+-bin_SCRIPTS= \
- system-config-printer \
-- system-config-printer-applet
-+ XmlHelper.py
+- system-config-printer-applet \
+- dbus/scp-dbus-service
++ statereason.py
if UDEV_RULES
- udevrulesdir=/lib/udev/rules.d
-@@ -169,56 +98,17 @@
- udev/udev-add-printer
+ udevrulesdir=$(sysconfdir)/udev/rules.d
+@@ -201,56 +123,17 @@
+
endif
-man_MANS= \
- man/system-config-printer-applet.1
-
dbus_DATA = \
- newprinternotification.conf \
- printerdriversinstaller.conf
+ dbus/com.redhat.NewPrinterNotification.conf \
+ dbus/com.redhat.PrinterDriversInstaller.conf
dbusdir = $(sysconfdir)/dbus-1/system.d/
+-dbusinterfaces_DATA = \
+- dbus/org.fedoraproject.Config.Printing.xml
+-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
+-
+-dbusservices_DATA = \
+- dbus/org.fedoraproject.Config.Printing.service
+-dbusservicesdir = $(datadir)/dbus-1/services/
+-
-desktop_DATA =\
- system-config-printer.desktop \
-- print-applet.desktop \
-- manage-print-jobs.desktop
+- print-applet.desktop
desktopdir = $(datadir)/applications/
autostartdir = $(sysconfdir)/xdg/autostart/
- --add-category GTK \
- system-config-printer.desktop
- desktop-file-install $(DESKTOP_VENDOR) \
-- --dir $(DESTDIR)$(desktopdir) \
-- --add-category System \
-- --add-category Monitor \
-- --add-category GTK \
-- manage-print-jobs.desktop
-- desktop-file-install $(DESKTOP_VENDOR) \
- --dir $(DESTDIR)$(autostartdir) \
- --add-category System \
- --add-category Monitor \
-
-uninstall-desktopDATA:
- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
-- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.desktop
- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
-
-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.1.13.ebuild,v 1.10 2010/11/06 18:45:52 halcy0n Exp $
-
-EAPI="2"
-inherit python autotools
-
-MY_P="${PN%-common}-${PV}"
-
-DESCRIPTION="Common modules of Red Hat's printer administration tool"
-HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.1/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sh sparc ~x86"
-SLOT="0"
-IUSE="doc"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# system-config-printer split since 1.1.3
-RDEPEND="
- !app-admin/system-config-printer:0
- dev-libs/libxml2[python]
- dev-python/dbus-python
- dev-python/pycups
- dev-python/pygobject
- net-print/cups[dbus]
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/epydoc )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-split.patch"
-
- eautoreconf
-}
-
-src_configure() {
- econf --disable-nls
-}
-
-src_compile() {
- emake || die "emake failed"
- if use doc; then
- emake html || die "emake html failed"
- fi
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
- if use doc; then
- dohtml -r html/ || die "installing html docs failed"
- fi
-
- emake DESTDIR="${D}" install || die "emake install failed"
-}
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.2.2.ebuild,v 1.7 2011/06/01 16:05:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.5.ebuild,v 1.1 2011/08/09 23:55:19 reavertm Exp $
EAPI="3"
DESCRIPTION="Common modules of Red Hat's printer administration tool"
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.2/${MY_P}.tar.xz"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="doc policykit"
# system-config-printer split since 1.1.3
COMMON_DEPEND="
+ dev-libs/glib:2
dev-libs/libusb
dev-libs/libxml2[python]
dev-python/dbus-python
- dev-python/pycups
- dev-python/pygobject
- net-print/cups[dbus]
+ >=dev-python/pycups-1.9.53
+ >=dev-python/pygobject-2.21.5
+ >=net-print/cups-1.4.6[dbus]
sys-fs/udev
"
DEPEND="${COMMON_DEPEND}
}
src_prepare() {
- epatch "${FILESDIR}/${P}-split.patch"
+ epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
+ # Picked up from master just after tagging, remove for next release
+ epatch "${FILESDIR}/0002-Make-PackageKit-optional-in-cupshelpers-bug-726996-U.patch"
+ epatch "${FILESDIR}/0004-Removed-PackageKit-client-code-in-missingPackagesAnd.patch"
eautoreconf
}
dohtml -r html/ || die "installing html docs failed"
fi
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${ED}" install \
+ udevrulesdir=/lib/udev/rules.d \
+ udevhelperdir=/lib/udev \
+ || die "emake install failed"
- python_convert_shebangs -q -r $(python_get_version) "${D}"
+ python_convert_shebangs -q -r $(python_get_version) "${ED}"
}
pkg_postinst() {
# ChangeLog for app-admin/system-config-printer-gnome
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.27 2011/07/24 09:49:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.28 2011/08/09 23:56:08 reavertm Exp $
+
+*system-config-printer-gnome-1.3.5 (09 Aug 2011)
+
+ 09 Aug 2011; Maciej Mrozowski <reavertm@gentoo.org>
+ +files/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch,
+ +files/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch,
+ -system-config-printer-gnome-1.2.2.ebuild,
+ -files/system-config-printer-gnome-1.2.2-cupspk-fileget-tmp.patch,
+ -files/system-config-printer-gnome-1.2.2-split.patch,
+ +system-config-printer-gnome-1.3.5.ebuild,
+ +files/system-config-printer-gnome-1.3.5-split.patch:
+ Version bump, remove old
24 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
system-config-printer-gnome-1.3.3.ebuild:
--- /dev/null
+From 895b66459b34b7f36dba1313212ec224c6662e3c Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Fri, 29 Jul 2011 15:51:54 +0100
+Subject: [PATCH 1/4] Avoid "global name 'dbus' is not defined" traceback in serversettings.py (bgu #726682).
+
+---
+ serversettings.py | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/serversettings.py b/serversettings.py
+index 05db1ba..62d345f 100644
+--- a/serversettings.py
++++ b/serversettings.py
+@@ -23,6 +23,7 @@
+ import config
+ from gettext import gettext as _
+ import cups
++import dbus
+ import gobject
+ import gtk
+ import os
+--
+1.7.3.4
+
--- /dev/null
+From 4ede66364b6987cb3013fa447fcdec09b3a638cb Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Mon, 1 Aug 2011 14:04:49 +0100
+Subject: [PATCH 3/4] Properties dialog: make OK button sensitive even when no changes to save (Ubuntu #444280).
+
+Only becomes insensitive when there are conflicts.
+---
+ printerproperties.py | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/printerproperties.py b/printerproperties.py
+index ca40f31..9c055f9 100755
+--- a/printerproperties.py
++++ b/printerproperties.py
+@@ -619,7 +619,10 @@ class PrinterPropertiesDialog(GtkGUI):
+
+ if (response == gtk.RESPONSE_OK or
+ response == gtk.RESPONSE_APPLY):
+- failed = self.save_printer (self.printer)
++ if (response == gtk.RESPONSE_OK and len (self.changed) == 0):
++ failed = False
++ else:
++ failed = self.save_printer (self.printer)
+
+ if response == gtk.RESPONSE_APPLY and not failed:
+ try:
+@@ -957,8 +960,7 @@ class PrinterPropertiesDialog(GtkGUI):
+
+ self.btnPrinterPropertiesApply.set_sensitive (len (self.changed) > 0 and
+ not self.conflicts)
+- self.btnPrinterPropertiesOK.set_sensitive (len (self.changed) > 0 and
+- not self.conflicts)
++ self.btnPrinterPropertiesOK.set_sensitive (not self.conflicts)
+
+ def save_printer(self, printer, saveall=False, parent=None):
+ if parent == None:
+--
+1.7.3.4
+
+++ /dev/null
-diff -up system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp system-config-printer-1.2.2/asyncpk1.py
---- system-config-printer-1.2.2/asyncpk1.py.cupspk-fileget-tmp 2010-05-07 15:19:03.000000000 +0100
-+++ system-config-printer-1.2.2/asyncpk1.py 2010-05-13 13:00:57.759093485 +0100
-@@ -153,7 +153,10 @@ class _WriteToTmpFile:
- def __init__ (self, kwds, reply_handler, error_handler):
- self._reply_handler = reply_handler
- self._error_handler = error_handler
-- (tmpfd, tmpfname) = tempfile.mkstemp ()
-+
-+ # Create the temporary file in /tmp to ensure that
-+ # cups-pk-helper-mechanism is able to write to it.
-+ (tmpfd, tmpfname) = tempfile.mkstemp (dir="/tmp")
- os.close (tmpfd)
- self._filename = tmpfname
- debugprint ("Created tempfile %s" % tmpfname)
-diff -up system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp system-config-printer-1.2.2/cupspk.py
---- system-config-printer-1.2.2/cupspk.py.cupspk-fileget-tmp 2010-04-15 00:11:33.000000000 +0100
-+++ system-config-printer-1.2.2/cupspk.py 2010-05-13 13:00:57.760093336 +0100
-@@ -385,7 +385,9 @@ class Connection:
- filename = None
-
- if (not use_pycups) and (fd != None or file_object != None):
-- (tmpfd, tmpfname) = tempfile.mkstemp()
-+ # Create the temporary file in /tmp to ensure that
-+ # cups-pk-helper-mechanism is able to write to it.
-+ (tmpfd, tmpfname) = tempfile.mkstemp(dir="/tmp")
- os.close (tmpfd)
-
- pk_args = (resource, tmpfname)
-diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
---- ../system-config-printer-1.2.2/Makefile.am 2010-05-07 16:19:03.000000000 +0200
-+++ ./Makefile.am 2010-05-17 20:39:12.278375860 +0200
-@@ -2,76 +2,8 @@
+diff -ruN system-config-printer-1.3.5/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.5/Makefile.am 2011-07-28 18:04:13.000000000 +0200
++++ my/Makefile.am 2011-08-10 01:11:27.890147909 +0200
+@@ -1,90 +1,9 @@
+-CFLAGS=-g -O2 -Wall
++CFLAGS=-Wall
SUBDIRS=po
-EXPORT_MODULES= \
- cupshelpers/__init__.py \
- cupshelpers/cupshelpers.py \
+- cupshelpers/installdriver.py \
- cupshelpers/ppds.py \
-- cupshelpers/openprinting.py
+- cupshelpers/openprinting.py \
+- cupshelpers/xmldriverprefs.py
+-
+-EXPORT_MODULES_GEN= \
+- cupshelpers/config.py
-
-### Automake hooks for Distutils.
-# The distutils module doesn't understand srcdir != builddir,
-.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES)
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
- cp $(top_srcdir)/setup.py .; \
-- mkdir cupshelpers; \
+- $(mkdir_p) cupshelpers; \
- for file in $(EXPORT_MODULES); do \
- cp $(top_srcdir)/$$file $$file; \
- done; \
- -e "s|\@PACKAGE\@|$(PACKAGE)|" \
- $< > $@
-
+-cupshelpers/config.py: cupshelpers/config.py.in Makefile
+- $(mkdir_p) cupshelpers
+- sed \
+- -e "s|\@prefix\@|$(prefix)|" \
+- -e "s|\@sysconfdir\@|$(sysconfdir)|" \
+- $< > $@
+-
-# Use distutils to build the module.
--all-local: .stamp-distutils-in-builddir config.py
+-all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py
- $(PYTHON) setup.py build
-
-# Use distutils to install the module.
-# doesn't provide a way to do this itself.
-uninstall-local:
- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
-- for file in $(EXPORT_MODULES); do \
-- rm -f $(DESTDIR)/$(pythondir)/$$file*; \
+- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \
+- rm -f $(DESTDIR)/$(pythondir)/$$file*; \
- done
-
-# Tell distutils to clean up.
- -$(PYTHON) setup.py clean --all
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
- rm -f setup.py; \
-- for file in $(EXPORT_MODULES); do \
+- for file in $(EXPORT_MODULES) \
+- $(EXPORT_MODULES_GEN); do \
- rm -f $$file*; \
- done; \
- fi
nobase_pkgdata_SCRIPTS= \
check-device-ids.py \
- pysmb.py \
+ scp-dbus-service.py \
system-config-printer.py \
troubleshoot/__init__.py \
- applet.py
-@@ -82,9 +14,7 @@
+@@ -95,33 +14,21 @@
asyncipp.py \
asyncpk1.py \
authconn.py \
- config.py \
cupspk.py \
- debug.py \
- dnssdresolve.py \
+- dnssdresolve.py \
errordialogs.py \
HIG.py \
-@@ -95,23 +25,14 @@
+- firewall.py \
+ gui.py \
gtkinklevel.py \
gtkspinner.py \
- installdriver.py \
- installpackage.py \
jobviewer.py \
- monitor.py \
+ newprinter.py \
options.py \
optionwidgets.py \
- PhysicalDevice.py \
+ ppdcache.py \
- ppdippstr.py \
ppdsloader.py \
+ printerproperties.py \
- probe_printer.py \
gtk_label_autowrap.py \
- SearchCriterion.py \
+ serversettings.py \
- smburi.py \
- statereason.py \
timedops.py \
ToolbarSearchEntry.py \
userdefault.py \
-- XmlHelper.py \
- ui/AboutDialog.glade \
- ui/ConnectDialog.glade \
- ui/ConnectingDialog.glade \
-@@ -173,11 +94,6 @@
+@@ -177,39 +84,10 @@
+ system-config-printer-applet \
+ dbus/scp-dbus-service
+
+-if UDEV_RULES
+-udevrulesdir=$(sysconfdir)/udev/rules.d
+-udevrules_DATA=udev/70-printers.rules
+-udev_udev_configure_printer_SOURCES=\
+- udev/udev-configure-printer.c
+-udev_udev_configure_printer_LDADD=-lcups -ludev -lusb $(GLIB_LIBS)
+-udev_udev_configure_printer_CFLAGS=$(AM_CFLAGS) $(GLIB_CFLAGS)
+-udevhelperdir=$(sysconfdir)/udev
+-udevhelper_PROGRAMS=\
+- udev/udev-configure-printer
+-udevhelper_SCRIPTS=\
+- udev/udev-add-printer
+-
+-if HAVE_SYSTEMD
+-%.service: %.service.in
+- $(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@
+-systemdsystemunit_DATA = \
+- udev/udev-configure-printer.service
+-CLEANFILES = \
+- $(systemdsystemunit_DATA)
+-endif
+-
+-endif
+-
+ man_MANS= \
man/system-config-printer.1 \
man/system-config-printer-applet.1
-dbus_DATA = \
-- newprinternotification.conf \
-- printerdriversinstaller.conf
+- dbus/com.redhat.NewPrinterNotification.conf \
+- dbus/com.redhat.PrinterDriversInstaller.conf
-dbusdir = $(sysconfdir)/dbus-1/system.d/
-
- desktop_DATA =\
- system-config-printer.desktop \
- print-applet.desktop \
+ dbusinterfaces_DATA = \
+ dbus/org.fedoraproject.Config.Printing.xml
+ dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.2.2.ebuild,v 1.9 2011/02/16 19:00:09 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.5.ebuild,v 1.1 2011/08/09 23:56:08 reavertm Exp $
EAPI="3"
DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.2/${MY_P}.tar.xz"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="gnome-keyring"
sys-devel/gettext
"
-APP_LINGUAS="ar as bg bn_IN bn bs ca cs cy da de el en_GB es et fa fi fr gu he
-hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl pt_BR
-pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
+APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
+he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
+pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
for X in ${APP_LINGUAS}; do
IUSE="${IUSE} linguas_${X}"
done
}
src_prepare() {
- epatch "${FILESDIR}/${P}-split.patch"
-
- # Upstream bug #587744
- epatch "${FILESDIR}/${P}-cupspk-fileget-tmp.patch"
+ epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
+ # Picked up from master just after tagging, remove for next release
+ epatch "${FILESDIR}/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch"
+ epatch "${FILESDIR}/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch"
eautoreconf
}
myconf="${myconf} --enable-nls"
fi
- econf ${myconf}
+ econf \
+ --with-desktop-vendor=Gentoo \
+ --without-udev-rules \
+ ${myconf}
}
src_install() {
dodoc AUTHORS ChangeLog README || die "dodoc failed"
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${ED}" install || die "emake install failed"
- python_convert_shebangs -q -r $(python_get_version) "${D}"
+ python_convert_shebangs -q -r $(python_get_version) "${ED}"
}
pkg_postrm() {
projects / gentoo.git / commitdiff