[gnumeric] Compilation: update gtk+ requirement to 3.2.0 like goffice.



commit 22c27f2801e0b1e219e2a9c882442c617224fcab
Author: Morten Welinder <terra gnome org>
Date:   Fri Feb 15 18:34:12 2013 -0500

    Compilation: update gtk+ requirement to 3.2.0 like goffice.

 ChangeLog        |    8 ++++++++
 README           |    4 ++--
 configure.ac     |    2 +-
 gnumeric.spec.in |    8 ++++----
 src/gui-util.c   |   10 ----------
 5 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a2b654e..7600a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-15  Morten Welinder  <terra gnome org>
+
+       * configure.ac (libspreadsheet_gtk_reqs): Explicitly require gtk
+       3.2.0 just like goffice.
+
+       * src/gui-util.c (gnm_store_text_tag_attr_in_pango): Adjust to
+       requiring gtk 3.2
+
 2013-02-14  Morten Welinder  <terra gnome org>
 
        * src/gnm-so-path.c (so_path_view_set_bounds): Use G_MAXDOUBLE,
diff --git a/README b/README
index 58e8d10..02f2d8a 100644
--- a/README
+++ b/README
@@ -15,9 +15,9 @@ Requirements
 
 You need:                              Debian package name
        glib            >= 2.28.0       libglib2.0-dev
-       gtk+            >= 3.0.0        libgtk3.0-dev
+       gtk+            >= 3.2.0        libgtk3.0-dev
        libgsf          >= 1.14.24      libgsf-1-dev
-       libgoffice      >= 0.9.90       libgoffice-0-8-dev
+       libgoffice      >= 0.10.1       libgoffice-0-8-dev
        gnome-xml       >= 2.4.12       libxml2-dev
        pango           >= 1.24.0       libpango1.0-dev
        NOTE: gnome-xml is also known as libxml
diff --git a/configure.ac b/configure.ac
index 29408c9..852c3d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ gnumeric_reqs="$libspreadsheet_reqs
        pangocairo              >= 1.24.0
 "
 libspreadsheet_gtk_reqs="
-       gtk+-3.0                >= 3.0.0
+       gtk+-3.0                >= 3.2.0
 "
 
 gnumeric_gtk_reqs="$libspreadsheet_gtk_reqs"
diff --git a/gnumeric.spec.in b/gnumeric.spec.in
index c975295..1521f50 100644
--- a/gnumeric.spec.in
+++ b/gnumeric.spec.in
@@ -13,11 +13,11 @@ License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root
-BuildRequires:    goffice-devel >= 0.9.0
-BuildRequires:    libgsf-devel >= 1.14.15
+BuildRequires:    goffice-devel >= 0.10.1
+BuildRequires:    libgsf-devel >= 1.14.24
 BuildRequires:    libxml-2.0-devel >= 2.4.12
-BuildRequires:    glib-2.0-devel >= 2.12.0
-BuildRequires:    pango-devel >= 1.12.0
+BuildRequires:    glib-2.0-devel >= 2.28.0
+BuildRequires:    pango-devel >= 1.24.0
 BuildRequires:    scrollkeeper
 Requires:         scrollkeeper hicolor-icon-theme
 Requires(pre):    GConf2
diff --git a/src/gui-util.c b/src/gui-util.c
index c1b4e36..418fbb2 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -804,25 +804,15 @@ gnm_store_text_tag_attr_in_pango (PangoAttrList *list, GtkTextTag *tag, GtkTextI
        y = g_utf8_offset_to_pointer (text, gtk_text_iter_get_offset (&end)) - text;
 
        if (gnm_object_get_bool (tag, "foreground-set")) {
-#if GTK_MAJOR_VERSION > 3 || GTK_MINOR_VERSION >= 2
                GdkRGBA *color = NULL;
                g_object_get (G_OBJECT (tag), "foreground-rgba", &color, NULL);
-#else
-               GdkColor *color = NULL;
-               g_object_get (G_OBJECT (tag), "foreground-gdk", &color, NULL);
-#endif
                if (color) {
-#if GTK_MAJOR_VERSION > 3 || GTK_MINOR_VERSION >= 2
                        /* dividing 0 to 1 into 65536 equal length intervals */
                        attr =  pango_attr_foreground_new
                                ((int)(CLAMP (color->red * 65536, 0., 65535.)),
                                 (int)(CLAMP (color->green * 65536, 0., 65535.)),
                                 (int)(CLAMP (color->blue * 65536, 0., 65535.)));
                        gdk_rgba_free (color);
-#else
-                       attr =  pango_attr_foreground_new (color->red, color->green, color->blue);
-                       gdk_color_free (color);
-#endif
                        attr->start_index = x;
                        attr->end_index = y;
                        pango_attr_list_change (list, attr);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]