Compare commits

...

6 Commits
master ... f22

Author SHA1 Message Date
Kalev Lember fe751de1e0 Update to 2.24.30 2016-03-07 10:07:59 +01:00
Kalev Lember 05307edb85 Update to 2.24.29 2015-12-11 11:49:25 +01:00
Matthias Clasen 2d342304c4 2.24.28 2015-05-13 09:59:57 -04:00
Matthias Clasen cc606823cd 2.24.27 2015-03-03 14:09:43 -05:00
Matthias Clasen 681b4f2a51 Switch BRs to pkgconfig 2015-02-20 09:50:38 -05:00
Matthias Clasen 4446f3d496 2.24.26 2015-02-19 19:59:08 -05:00
4 changed files with 43 additions and 55 deletions

5
.gitignore vendored
View File

@ -28,3 +28,8 @@ gtk+-2.21.5.tar.bz2
/gtk+-2.24.23.tar.xz
/gtk+-2.24.24.tar.xz
/gtk+-2.24.25.tar.xz
/gtk+-2.24.26.tar.bz2
/gtk+-2.24.27.tar.bz2
/gtk+-2.24.28.tar.bz2
/gtk+-2.24.29.tar.xz
/gtk+-2.24.30.tar.xz

View File

@ -1,27 +0,0 @@
From 5bafcca63f8d065461c311f1ab768e7d0d290813 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 22 Oct 2014 22:10:56 -0400
Subject: [PATCH] Ignore gdk-pixbuf deprecations
We're not going to start updating the 2.24 branch to newer
gdk-pixbuf APIs, so ignore deprecations.
---
configure.ac | 2 --
1 file changed, 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 85f0454..9e5c4f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -621,8 +621,6 @@ if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; th
CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
fi
-CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
-
dnl
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
--
2.2.0

View File

@ -8,7 +8,6 @@
%define atk_version %{atk_base_version}-2
%define cairo_base_version 1.6.0
%define cairo_version %{cairo_base_version}-1
%define libpng_version 2:1.2.2-16
%define xrandr_version 1.2.99.4-2
%define gobject_introspection_version 0.9.3
%define gir_repository_version 0.6.5-5
@ -17,8 +16,8 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
Version: 2.24.25
Release: 2%{?dist}
Version: 2.24.30
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@ -35,32 +34,29 @@ Patch2: icon-padding.patch
Patch8: tooltip-positioning.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=611313
Patch15: window-dragging.patch
Patch16: 0001-Ignore-gdk-pixbuf-deprecations.patch
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: cairo-devel
BuildRequires: gdk-pixbuf2-devel
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
BuildRequires: jasper-devel
BuildRequires: libXi-devel
BuildRequires: libpng-devel >= %{libpng_version}
BuildRequires: pkgconfig(atk) >= %{atk_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version}
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(pango) >= %{pango_version}
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xdamage)
BuildRequires: gettext
BuildRequires: cups-devel
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libXrandr-devel >= %{xrandr_version}
BuildRequires: libXrender-devel
BuildRequires: libXcursor-devel
BuildRequires: libXfixes-devel
BuildRequires: libXinerama-devel
BuildRequires: libXcomposite-devel
BuildRequires: libXdamage-devel
BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
# Bootstrap requirements
BuildRequires: gtk-doc
BuildRequires: automake autoconf libtool pkgconfig
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: pkgconfig
# Conflicts with packages containing theme engines
# built against the 2.4.0 ABI
@ -121,7 +117,6 @@ Requires: cairo-devel >= %{cairo_version}
Requires: libX11-devel, libXcursor-devel, libXinerama-devel
Requires: libXext-devel, libXi-devel, libXrandr-devel
Requires: libXfixes-devel, libXcomposite-devel
Requires: libpng-devel
Requires: pkgconfig
Provides: gail-devel = %{version}-%{release}
@ -149,7 +144,6 @@ This package contains developer documentation for the GTK+ widget toolkit.
%patch2 -p1 -b .icon-padding
%patch8 -p1 -b .tooltip-positioning
%patch15 -p1 -b .window-dragging
%patch16 -p1 -b .gdk-pixbuf-deprecations
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@ -277,7 +271,8 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
gtk-query-immodules-2.0-%{__isa_bits} --update-cache
%files -f gtk20.lang
%doc AUTHORS COPYING NEWS README
%license COPYING
%doc AUTHORS NEWS README
%{_bindir}/gtk-query-immodules-2.0*
%{_bindir}/update-gtk-immodules
%{_libdir}/libgtk-x11-2.0.so.*
@ -339,6 +334,21 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
%doc tmpdocs/examples
%changelog
* Mon Mar 07 2016 Kalev Lember <klember@redhat.com> - 2.24.30-1
- Update to 2.24.30
* Fri Dec 11 2015 Kalev Lember <klember@redhat.com> - 2.24.29-1
- Update to 2.24.29
* Wed May 13 2015 Matthias Clasen <mclasen@redhat.com> - 2.24.28-1
- Update to 2.24.28
* Tue Mar 3 2015 Matthias Clasen <mclasen@redhat.com> - 2.24.27-1
- Update to 2.24.27
* Thu Feb 19 2015 Matthias Clasen <mclasen@redhat.com> - 2.24.26-1
- Update to 2.24.26
* Wed Dec 17 2014 Kalev Lember <kalevlember@gmail.com> - 2.24.25-2
- Use gtk-update-icon-cache that's built as gtk3 subpackage
- Fix the build with latest gdk-pixbuf2

View File

@ -1 +1 @@
612350704dd3aacb95355a4981930c6f gtk+-2.24.25.tar.xz
04568ba5c58b75e3c7543e45628ad789 gtk+-2.24.30.tar.xz