summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-25 16:44:35 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-25 19:52:59 +0000
commitbbeb39ec5aa812feed57f62886065bb7638aaec3 (patch)
treef48964abf02b2177ff4c97d962675943eaba9d32
parenta6061443c7c646eac21eae9c2eaa2064a78faa64 (diff)
downloadaports-bbeb39ec5aa812feed57f62886065bb7638aaec3.tar.bz2
aports-bbeb39ec5aa812feed57f62886065bb7638aaec3.tar.xz
main/gtk-engines: rebuild against glib-2.32
-rw-r--r--main/gtk-engines/APKBUILD10
-rw-r--r--main/gtk-engines/gtk-engines-2.20.2-glib.h.patch26
2 files changed, 32 insertions, 4 deletions
diff --git a/main/gtk-engines/APKBUILD b/main/gtk-engines/APKBUILD
index e4b236291..8b4225ba3 100644
--- a/main/gtk-engines/APKBUILD
+++ b/main/gtk-engines/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=gtk-engines
pkgver=2.20.2
-pkgrel=2
+pkgrel=4
pkgdesc="collection of gtk+ engines"
url="http://www.gtk.org/"
arch="all"
@@ -10,8 +10,9 @@ license="GPL"
depends=
makedepends="gtk+-dev intltool"
install=
-subpackages=
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-lang"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ gtk-engines-2.20.2-glib.h.patch"
_builddir="${srcdir}/${pkgname}-${pkgver}"
prepare() {
@@ -39,4 +40,5 @@ package() {
find "$pkgdir" -name '*.la' -delete
}
-md5sums="5deb287bc6075dc21812130604c7dc4f gtk-engines-2.20.2.tar.bz2"
+md5sums="5deb287bc6075dc21812130604c7dc4f gtk-engines-2.20.2.tar.bz2
+c951d1a0a9edc89bb824d8e48fb0001b gtk-engines-2.20.2-glib.h.patch"
diff --git a/main/gtk-engines/gtk-engines-2.20.2-glib.h.patch b/main/gtk-engines/gtk-engines-2.20.2-glib.h.patch
new file mode 100644
index 000000000..35e5007e2
--- /dev/null
+++ b/main/gtk-engines/gtk-engines-2.20.2-glib.h.patch
@@ -0,0 +1,26 @@
+From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sun, 27 Nov 2011 15:24:57 +0100
+Subject: [PATCH] Fix build with glib 2.31: Only glib.h can be #include'd.
+ Fixes bug #664914
+
+---
+ engines/clearlooks/src/animation.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c
+index 1f7a41f..56a9286 100644
+--- a/engines/clearlooks/src/animation.c
++++ b/engines/clearlooks/src/animation.c
+@@ -28,7 +28,7 @@
+ #include "animation.h"
+
+ #ifdef HAVE_WORKING_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+
+ struct _AnimationInfo {
+ GTimer *timer;
+--
+1.7.8.5
+