Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Increment AnacondaWidgets version #489

Closed
wants to merge 3 commits into from
Closed

Increment AnacondaWidgets version #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d5e53a
Increment the AnacondaWidgets version
jkonecny12 Feb 1, 2016
4babf6e
Increment version of g-introspection for widgets
jkonecny12 Feb 2, 2016
6429b47
Increase GI version required of AnacondaWidgets
jkonecny12 Feb 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyanaconda/ui/gui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion pyanaconda/ui/gui/hubs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pyanaconda/ui/gui/spokes/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyanaconda/ui/gui/spokes/lib/accordion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyanaconda/ui/gui/spokes/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions widgets/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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])])
Expand Down
4 changes: 2 additions & 2 deletions widgets/glade/AnacondaWidgets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<glade-catalog name="AnacondaWidgets"
version="3.2"
targetable="3.1,3.0,2.0,1.0"
version="3.3"
targetable="3.2,3.1,3.0,2.0,1.0"
library="AnacondaWidgets"
domain="glade-3"
depends="gtk+">
Expand Down
16 changes: 8 additions & 8 deletions widgets/src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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