From 3d5e53a66b0b006eb692cf42d3a9238b91409605 Mon Sep 17 00:00:00 2001 From: Jiri Konecny Date: Mon, 1 Feb 2016 14:07:43 +0100 Subject: [PATCH 1/3] Increment the AnacondaWidgets version New version is now 3.3 --- widgets/configure.ac | 4 ++-- widgets/glade/AnacondaWidgets.xml | 4 ++-- widgets/src/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/widgets/configure.ac b/widgets/configure.ac index 8ac3269c755..56633b4fb15 100644 --- a/widgets/configure.ac +++ b/widgets/configure.ac @@ -22,7 +22,7 @@ m4_define(python_required_version, 3.4) AC_PREREQ([2.63]) -AC_INIT([AnacondaWidgets], [3.2], [clumens@redhat.com]) +AC_INIT([AnacondaWidgets], [3.3], [clumens@redhat.com]) # Disable building static libraries. # This needs to be set before initializing automake @@ -51,7 +51,7 @@ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [GOBJECT_INTROSPECTION_CHECK([0.6.7])], [found_introspection=no AM_CONDITIONAL(HAVE_INTROSPECTION, false)]) - + # Complain if introspection was not enabled AS_IF([test "x$found_introspection" = xyes], [:], [ANACONDA_SOFT_FAILURE([GObject introspection must be enabled])]) diff --git a/widgets/glade/AnacondaWidgets.xml b/widgets/glade/AnacondaWidgets.xml index 673101d5a9c..6e5f3e50551 100644 --- a/widgets/glade/AnacondaWidgets.xml +++ b/widgets/glade/AnacondaWidgets.xml @@ -1,6 +1,6 @@ diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am index 07cca0a386a..879ee1ceb3b 100644 --- a/widgets/src/Makefile.am +++ b/widgets/src/Makefile.am @@ -61,7 +61,7 @@ lib_LTLIBRARIES = libAnacondaWidgets.la libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(GLADEUI_CFLAGS) $(LIBXKLAVIER_CFLAGS) -Wall -g\ -DWIDGETS_DATADIR=$(WIDGETSDATA) libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(GLADEUI_LIBS) $(LIBXKLAVIER_LIBS) -libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 3:1:1 +libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 4:0:2 libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS) \ glade-adaptor.c From 4babf6e61f211e1c812f0dea5f63c97b202fbbb2 Mon Sep 17 00:00:00 2001 From: Jiri Konecny Date: Tue, 2 Feb 2016 08:38:24 +0100 Subject: [PATCH 2/3] Increment version of g-introspection for widgets New AnacondaWidgets version is 3.3 --- widgets/src/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am index 879ee1ceb3b..43b288bfb32 100644 --- a/widgets/src/Makefile.am +++ b/widgets/src/Makefile.am @@ -71,18 +71,18 @@ lib_include_HEADERS = $(HDRS) MAINTAINERCLEANFILES = gettext.h if HAVE_INTROSPECTION -AnacondaWidgets-3.0.gir: libAnacondaWidgets.la +AnacondaWidgets-3.3.gir: libAnacondaWidgets.la -AnacondaWidgets_3_0_gir_FILES = $(GISOURCES) $(GIHDRS) -AnacondaWidgets_3_0_gir_LIBS = libAnacondaWidgets.la -AnacondaWidgets_3_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Anaconda --symbol-prefix=anaconda -AnacondaWidgets_3_0_gir_INCLUDES = Gtk-3.0 Xkl-1.0 +AnacondaWidgets_3_3_gir_FILES = $(GISOURCES) $(GIHDRS) +AnacondaWidgets_3_3_gir_LIBS = libAnacondaWidgets.la +AnacondaWidgets_3_3_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Anaconda --symbol-prefix=anaconda +AnacondaWidgets_3_3_gir_INCLUDES = Gtk-3.0 Xkl-1.0 -INTROSPECTION_GIRS = AnacondaWidgets-3.0.gir +INTROSPECTION_GIRS = AnacondaWidgets-3.3.gir typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -CLEANFILES = AnacondaWidgets-3.0.gir $(typelib_DATA) +CLEANFILES = AnacondaWidgets-3.3.gir $(typelib_DATA) MAINTAINERCLEANFILES += Makefile.in endif From 6429b4763b89753235a4dbd999a669a7c5caf876 Mon Sep 17 00:00:00 2001 From: Jiri Konecny Date: Tue, 2 Feb 2016 08:48:38 +0100 Subject: [PATCH 3/3] Increase GI version required of AnacondaWidgets Anaconda GI now requires the AnacondaWidgets in version 3.3. It's required for the multiselection feature in the Custom spoke. --- pyanaconda/ui/gui/__init__.py | 2 +- pyanaconda/ui/gui/hubs/__init__.py | 2 +- pyanaconda/ui/gui/spokes/custom.py | 2 +- pyanaconda/ui/gui/spokes/lib/accordion.py | 2 +- pyanaconda/ui/gui/spokes/storage.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index fdd058084c4..06da7ef3944 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -26,7 +26,7 @@ import gi gi.require_version("Gdk", "3.0") gi.require_version("Gtk", "3.0") -gi.require_version("AnacondaWidgets", "3.0") +gi.require_version("AnacondaWidgets", "3.3") gi.require_version("Keybinder", "3.0") gi.require_version("GdkPixbuf", "2.0") gi.require_version("GLib", "2.0") diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index 8cc0903ff11..28123c511f3 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -107,7 +107,7 @@ def __init__(self, data, storage, payload, instclass): def _createBox(self): gi.require_version("Gtk", "3.0") - gi.require_version("AnacondaWidgets", "3.0") + gi.require_version("AnacondaWidgets", "3.3") from gi.repository import Gtk, AnacondaWidgets diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 0f8fb32bbc0..67b4e1dadb4 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -32,7 +32,7 @@ import gi gi.require_version("Gtk", "3.0") gi.require_version("Gdk", "3.0") -gi.require_version("AnacondaWidgets", "3.0") +gi.require_version("AnacondaWidgets", "3.3") from gi.repository import Gdk, Gtk from gi.repository.AnacondaWidgets import MountpointSelector diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py index 248350788e8..705d46578f8 100644 --- a/pyanaconda/ui/gui/spokes/lib/accordion.py +++ b/pyanaconda/ui/gui/spokes/lib/accordion.py @@ -30,7 +30,7 @@ from pyanaconda.storage_utils import AUTOPART_CHOICES, AUTOPART_DEVICE_TYPES import gi -gi.require_version("AnacondaWidgets", "3.0") +gi.require_version("AnacondaWidgets", "3.3") gi.require_version("Gtk", "3.0") from gi.repository.AnacondaWidgets import MountpointSelector diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 5312a71340a..94b0e6e3662 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -42,7 +42,7 @@ import gi gi.require_version("Gdk", "3.0") gi.require_version("GLib", "2.0") -gi.require_version("AnacondaWidgets", "3.0") +gi.require_version("AnacondaWidgets", "3.3") gi.require_version("BlockDev", "1.0") from gi.repository import Gdk, GLib, AnacondaWidgets