summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2019-04-02 17:48:16 -0400
committerCole Robinson <crobinso@redhat.com>2019-04-07 13:54:00 -0400
commitd7fed3294740971dd13c545df820702b30edf3f9 (patch)
treec2c624ae0d57aebd210885656b5ce3c025b45470
parentf2239bad00af79eb9bc374240deba56bb1df653c (diff)
downloadvirt-manager-d7fed3294740971dd13c545df820702b30edf3f9.tar.gz
Bump gtk dep to 3.22 for new popup routines
Given that we bumped deps to fairly modern distros with the python3 change, I think this is safe. gtk 3.22 is from sep 2016, it's in debian9 and fedora 25+, which seems fine for our needs.
-rw-r--r--INSTALL.md4
-rw-r--r--tests/dist.py6
-rw-r--r--ui/about.ui2
-rw-r--r--ui/addhardware.ui2
-rw-r--r--ui/addstorage.ui2
-rw-r--r--ui/asyncjob.ui2
-rw-r--r--ui/clone.ui2
-rw-r--r--ui/connect.ui2
-rw-r--r--ui/connectauth.ui2
-rw-r--r--ui/create.ui2
-rw-r--r--ui/createnet.ui2
-rw-r--r--ui/createpool.ui2
-rw-r--r--ui/createvol.ui2
-rw-r--r--ui/delete.ui2
-rw-r--r--ui/details.ui2
-rw-r--r--ui/fsdetails.ui2
-rw-r--r--ui/gfxdetails.ui2
-rw-r--r--ui/host.ui2
-rw-r--r--ui/manager.ui2
-rw-r--r--ui/migrate.ui2
-rw-r--r--ui/netlist.ui2
-rw-r--r--ui/oslist.ui2
-rw-r--r--ui/preferences.ui2
-rw-r--r--ui/snapshots.ui2
-rw-r--r--ui/storagebrowse.ui2
-rw-r--r--ui/storagelist.ui2
-rw-r--r--ui/vsockdetails.ui2
-rwxr-xr-xvirt-manager8
28 files changed, 35 insertions, 33 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 983e32ce..74398ed5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -31,9 +31,9 @@ A detailed dependency list can be found in
Minimum version requirements of major components:
- python >= 3.3
- - gtk3 >= 3.14
+ - gtk3 >= 3.22
- libvirt-python >= 0.6.0
- - pygobject3 >= 3.14
+ - pygobject3 >= 3.22
- libosinfo >= 0.2.10
On Debian or Ubuntu based distributions, you need to install the
diff --git a/tests/dist.py b/tests/dist.py
index 9403f256..19026b72 100644
--- a/tests/dist.py
+++ b/tests/dist.py
@@ -110,9 +110,11 @@ class TestDist(unittest.TestCase):
Ensure all glade XML files don't _require_ UI bits later than
our minimum supported version
"""
- # RHEL 7.3 has gtk 3.14, so that's our current minimum target
+ # Minimum dep is 3.22 to fix popups on some wayland window managers.
+ # 3.22 is from Sep 2016, so coupled with python3 deps this seems fine
+ # to enforce
minimum_version_major = 3
- minimum_version_minor = 14
+ minimum_version_minor = 22
minimum_version_str = "%s.%s" % (minimum_version_major,
minimum_version_minor)
diff --git a/ui/about.ui b/ui/about.ui
index a75c9ad4..5dfa5afe 100644
--- a/ui/about.ui
+++ b/ui/about.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAboutDialog" id="vmm-about">
<property name="can_focus">False</property>
<property name="destroy_with_parent">True</property>
diff --git a/ui/addhardware.ui b/ui/addhardware.ui
index 408c233e..299ddaa7 100644
--- a/ui/addhardware.ui
+++ b/ui/addhardware.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">67000</property>
<property name="step_increment">1</property>
diff --git a/ui/addstorage.ui b/ui/addstorage.ui
index 70cb0054..0de34056 100644
--- a/ui/addstorage.ui
+++ b/ui/addstorage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.2 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">1000000</property>
<property name="step_increment">0.10000000000000001</property>
diff --git a/ui/asyncjob.ui b/ui/asyncjob.ui
index d854246f..0a22ff28 100644
--- a/ui/asyncjob.ui
+++ b/ui/asyncjob.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkWindow" id="vmm-progress">
<property name="can_focus">False</property>
<property name="border_width">12</property>
diff --git a/ui/clone.ui b/ui/clone.ui
index ca34f418..1643c590 100644
--- a/ui/clone.ui
+++ b/ui/clone.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/ui/connect.ui b/ui/connect.ui
index 6ee66354..3a97417c 100644
--- a/ui/connect.ui
+++ b/ui/connect.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/ui/connectauth.ui b/ui/connectauth.ui
index d74fac25..6eab4002 100644
--- a/ui/connectauth.ui
+++ b/ui/connectauth.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkDialog" id="connectauth">
<property name="can_focus">False</property>
<property name="border_width">6</property>
diff --git a/ui/create.ui b/ui/create.ui
index 9f21c977..8775f836 100644
--- a/ui/create.ui
+++ b/ui/create.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">128</property>
<property name="step_increment">1</property>
diff --git a/ui/createnet.ui b/ui/createnet.ui
index 843e2574..f422acb0 100644
--- a/ui/createnet.ui
+++ b/ui/createnet.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/ui/createpool.ui b/ui/createpool.ui
index ec4a9c50..857bbeeb 100644
--- a/ui/createpool.ui
+++ b/ui/createpool.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkWindow" id="vmm-create-pool">
<property name="height_request">350</property>
<property name="can_focus">False</property>
diff --git a/ui/createvol.ui b/ui/createvol.ui
index 650e011e..79073b7e 100644
--- a/ui/createvol.ui
+++ b/ui/createvol.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100000</property>
<property name="value">1</property>
diff --git a/ui/delete.ui b/ui/delete.ui
index eba7b566..b2113392 100644
--- a/ui/delete.ui
+++ b/ui/delete.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkWindow" id="vmm-delete">
<property name="width_request">450</property>
<property name="height_request">350</property>
diff --git a/ui/details.ui b/ui/details.ui
index 5fd3f3e4..659996a7 100644
--- a/ui/details.ui
+++ b/ui/details.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
diff --git a/ui/fsdetails.ui b/ui/fsdetails.ui
index 6776b0be..922571c6 100644
--- a/ui/fsdetails.ui
+++ b/ui/fsdetails.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment6">
<property name="upper">18446744073709</property>
<property name="step_increment">100</property>
diff --git a/ui/gfxdetails.ui b/ui/gfxdetails.ui
index e4b38cf0..a0e9214f 100644
--- a/ui/gfxdetails.ui
+++ b/ui/gfxdetails.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.2 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment4">
<property name="lower">5900</property>
<property name="upper">50000</property>
diff --git a/ui/host.ui b/ui/host.ui
index 83341dd2..83de7979 100644
--- a/ui/host.ui
+++ b/ui/host.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkWindow" id="vmm-host">
<property name="can_focus">False</property>
diff --git a/ui/manager.ui b/ui/manager.ui
index 7897c957..540fc373 100644
--- a/ui/manager.ui
+++ b/ui/manager.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
diff --git a/ui/migrate.ui b/ui/migrate.ui
index 4a98d509..ef457024 100644
--- a/ui/migrate.ui
+++ b/ui/migrate.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">70000</property>
<property name="step_increment">1</property>
diff --git a/ui/netlist.ui b/ui/netlist.ui
index 909f167d..f17c3948 100644
--- a/ui/netlist.ui
+++ b/ui/netlist.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkGrid" id="net-source-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/ui/oslist.ui b/ui/oslist.ui
index bf1ad8c6..2b40a22a 100644
--- a/ui/oslist.ui
+++ b/ui/oslist.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkSearchEntry" id="os-name">
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/ui/preferences.ui b/ui/preferences.ui
index af07b4c4..fb9f463b 100644
--- a/ui/preferences.ui
+++ b/ui/preferences.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">60</property>
diff --git a/ui/snapshots.ui b/ui/snapshots.ui
index 50b81de2..b91ff653 100644
--- a/ui/snapshots.ui
+++ b/ui/snapshots.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.2 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/ui/storagebrowse.ui b/ui/storagebrowse.ui
index c254c9dc..2de4315e 100644
--- a/ui/storagebrowse.ui
+++ b/ui/storagebrowse.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkWindow" id="vmm-storage-browse">
<property name="can_focus">False</property>
<property name="border_width">6</property>
diff --git a/ui/storagelist.ui b/ui/storagelist.ui
index 0dd12f1e..b0a15924 100644
--- a/ui/storagelist.ui
+++ b/ui/storagelist.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.2 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/ui/vsockdetails.ui b/ui/vsockdetails.ui
index 2a8ee73a..be37765b 100644
--- a/ui/vsockdetails.ui
+++ b/ui/vsockdetails.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment5">
<property name="lower">3</property>
<property name="upper">4294967295</property>
diff --git a/virt-manager b/virt-manager
index d9415184..46838838 100755
--- a/virt-manager
+++ b/virt-manager
@@ -29,9 +29,9 @@ import warnings # pylint: disable=wrong-import-order
warnings.simplefilter("ignore")
try:
- gi.check_version("3.14.0")
+ gi.check_version("3.22.0")
except (ValueError, AttributeError):
- print("pygobject3 3.14.0 or later is required.")
+ print("pygobject3 3.22.0 or later is required.")
sys.exit(1)
@@ -62,8 +62,8 @@ def _import_gtk(leftovers):
from gi.repository import Gtk
leftovers = sys.argv[1:]
- if Gtk.check_version(3, 14, 0):
- print("gtk3 3.14.0 or later is required.")
+ if Gtk.check_version(3, 22, 0):
+ print("gtk3 3.22.0 or later is required.")
sys.exit(1)
# This will error if Gtk wasn't correctly initialized