Hello community,
here is the log from the commit of package system-config-printer for
openSUSE:Factory checked in at 2018-04-25 09:44:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old)
and /work/SRC/openSUSE:Factory/.system-config-printer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "system-config-printer"
Wed Apr 25 09:44:26 2018 rev:89 rq:599915 version:1.5.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes
2018-03-08 10:46:06.305949322 +0100
+++
/work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes
2018-04-25 09:44:29.947927185 +0200
@@ -1,0 +2,7 @@
+Mon Apr 23 08:28:28 UTC 2018 - [email protected]
+
+- Add system-config-printer-no-simple-gui.patch: Remove _simple_gui
+ class from openprinting.py: this class pulls in a GTK stack, but
+ then is actually never used (boo#1090189).
+
+-------------------------------------------------------------------
New:
----
system-config-printer-no-simple-gui.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ system-config-printer.spec ++++++
--- /var/tmp/diff_new_pack.fETsc4/_old 2018-04-25 09:44:30.687900058 +0200
+++ /var/tmp/diff_new_pack.fETsc4/_new 2018-04-25 09:44:30.691899911 +0200
@@ -41,6 +41,8 @@
Patch22: system-config-printer-no-params-to-py3.patch
# PATCH-FIX-UPSTREAM fix_connect_dialog_focus.diff
gh#twaugh/system-config-printer#38 [email protected] -- Allow to set the focus
on a connect dialog combobox so the user can edit its contents
Patch24: fix_connect_dialog_focus.diff
+# PATCH-FEATURE-OPENSUSE system-config-printer-no-simple-gui.patch boo#1090189
[email protected] -- Remove unused _simple_gui class in openprinting.py.
Pulls in GTK
+Patch100: system-config-printer-no-simple-gui.patch
# For directory ownership
BuildRequires: %{_icontheme}-icon-theme
BuildRequires: cups-devel
@@ -163,6 +165,7 @@
%patch21 -p1
%patch22 -p1
%patch24 -p1
+%patch100 -p1
%build
%configure \
++++++ system-config-printer-no-simple-gui.patch ++++++
Index: system-config-printer-1.5.7/cupshelpers/openprinting.py
===================================================================
--- system-config-printer-1.5.7.orig/cupshelpers/openprinting.py
+++ system-config-printer-1.5.7/cupshelpers/openprinting.py
@@ -396,72 +396,3 @@ class OpenPrinting:
_debugprint ("listDrivers: Querying OpenPrinting: %s" % repr(params))
return self.webQuery(params, parse_result, (callback, user_data))
-def _simple_gui ():
- from gi.repository import Gdk
- from gi.repository import Gtk
- import pprint
- Gdk.threads_init ()
- class QueryApp:
- def __init__(self):
- self.openprinting = OpenPrinting()
- self.main = Gtk.Dialog (title="OpenPrinting query application",
- transient_for=None, modal=True)
- self.main.add_buttons (Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE,
- "Search", 10,
- "List", 20)
- self.main.set_border_width (6)
- self.main.vbox.set_spacing (2)
- vbox = Gtk.VBox.new (False, 6)
- self.main.vbox.pack_start (vbox, True, True, 0)
- vbox.set_border_width (6)
- self.entry = Gtk.Entry ()
- vbox.pack_start (self.entry, False, False, 6)
- sw = Gtk.ScrolledWindow ()
- self.tv = Gtk.TextView ()
- sw.add (self.tv)
- vbox.pack_start (sw, True, True, 6)
- self.main.connect ("response", self.response)
- self.main.show_all ()
-
- def response (self, dialog, response):
- if (response == Gtk.ResponseType.CLOSE or
- response == Gtk.ResponseType.DELETE_EVENT):
- Gtk.main_quit ()
-
- if response == 10:
- # Run a query.
- self.openprinting.searchPrinters (self.entry.get_text (),
-
self.search_printers_callback)
-
- if response == 20:
- self.openprinting.listDrivers (self.entry.get_text (),
- self.list_drivers_callback)
-
- def search_printers_callback (self, status, user_data, printers):
- if status != 0:
- raise printers[1]
-
- text = ""
- for printer in printers.values ():
- text += printer + "\n"
- Gdk.threads_enter ()
- self.tv.get_buffer ().set_text (text)
- Gdk.threads_leave ()
-
- def list_drivers_callback (self, status, user_data, drivers):
- if status != 0:
- raise drivers[1]
-
- text = pprint.pformat (drivers)
- Gdk.threads_enter ()
- self.tv.get_buffer ().set_text (text)
- Gdk.threads_leave ()
-
- def query_callback (self, status, user_data, result):
- Gdk.threads_enter ()
- self.tv.get_buffer ().set_text (str (result))
- open ("result.xml", "w").write (str (result))
- Gdk.threads_leave ()
-
- q = QueryApp()
- Gtk.main ()
