diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-02-07 08:44:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-02-07 08:44:13 +0000 |
| commit | 379bf0646d3ecb24b36a5b6890d7a8057b9c7ded (patch) | |
| tree | b189461e786d6a656f42d83950e0993d5e5d3df2 | |
| parent | 3797d2f0e98272cd984cd38a62cf8847b91cf4bd (diff) | |
| download | aports-379bf0646d3ecb24b36a5b6890d7a8057b9c7ded.tar.bz2 aports-379bf0646d3ecb24b36a5b6890d7a8057b9c7ded.tar.xz | |
main/gtk-engines: fix depends for subpackages
| -rw-r--r-- | main/gtk-engines/APKBUILD | 4 | ||||
| -rw-r--r-- | main/gtk-engines/gtk-engines-2.20.2-glib.h.patch | 26 |
2 files changed, 2 insertions, 28 deletions
diff --git a/main/gtk-engines/APKBUILD b/main/gtk-engines/APKBUILD index b2f98e3d65..643ecd8665 100644 --- a/main/gtk-engines/APKBUILD +++ b/main/gtk-engines/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=gtk-engines pkgver=2.21.0 -pkgrel=1 +pkgrel=2 pkgdesc="collection of gtk+ engines" url="http://www.gtk.org/" arch="all" @@ -18,7 +18,6 @@ makedepends="gtk+-dev intltool" install= subpackages="$pkgname-lang $pkgname-dev $depends" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz" -# gtk-engines-2.20.2-glib.h.patch" _builddir="${srcdir}/${pkgname}-${pkgver}" prepare() { @@ -49,6 +48,7 @@ package() { _mv_engine() { pkgdesc="GTK $1 engine" replaces="gtk-engines" + depends= cd "$pkgdir" find -name "$2" | while read i; do mkdir -p "$subpkgdir"/${i%/*} 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 deleted file mode 100644 index 35e5007e2c..0000000000 --- a/main/gtk-engines/gtk-engines-2.20.2-glib.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - |