diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-02-14 10:58:07 -0600 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-02-14 10:58:07 -0600 |
| commit | 7046c624e05adb1583c6dbd264c0b1c07d05cba9 (patch) | |
| tree | aaaa7166b6cee933188ee9348037fad3afac5bb2 | |
| parent | a3179edefd016e9dd5b785921752f6e6c0d9c92a (diff) | |
| download | aports-7046c624e05adb1583c6dbd264c0b1c07d05cba9.tar.bz2 aports-7046c624e05adb1583c6dbd264c0b1c07d05cba9.tar.xz | |
main/gtk+2.0: try removing ftbfs patch
| -rw-r--r-- | main/gtk+2.0/APKBUILD | 13 | ||||
| -rw-r--r-- | main/gtk+2.0/gtk-2.24.0-ftbfs.patch | 10 |
2 files changed, 3 insertions, 20 deletions
diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD index 96e19018f5..ec7158afed 100644 --- a/main/gtk+2.0/APKBUILD +++ b/main/gtk+2.0/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk+2.0 pkgver=2.24.0 -pkgrel=0 +pkgrel=1 pkgdesc="The GTK+ Toolkit (v2)" url="http://www.gtk.org/" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" @@ -39,17 +39,11 @@ makedepends="pkgconfig pango-dev tiff-dev zlib-dev" -source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2 - gtk-2.24.0-ftbfs.patch" +source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2" depends_dev="atk-dev pango-dev cairo-dev glib-dev intltool gdk-pixbuf-dev" _builddir="$srcdir"/gtk+-$pkgver -prepare() { - cd "$_builddir" - patch -p1 < "$srcdir"/gtk-2.24.0-ftbfs.patch -} - build() { cd "$_builddir" ./configure --prefix=/usr \ @@ -66,5 +60,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="3f67a9d8d939222df84facf2d0ecb275 gtk+-2.24.0.tar.bz2 -daf0a9e71372581d02475d5bfdeaf091 gtk-2.24.0-ftbfs.patch" +md5sums="3f67a9d8d939222df84facf2d0ecb275 gtk+-2.24.0.tar.bz2" diff --git a/main/gtk+2.0/gtk-2.24.0-ftbfs.patch b/main/gtk+2.0/gtk-2.24.0-ftbfs.patch deleted file mode 100644 index 8d25b79713..0000000000 --- a/main/gtk+2.0/gtk-2.24.0-ftbfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.24.0.orig/gdk/gdkwindow.h -+++ gtk+-2.24.0/gdk/gdkwindow.h -@@ -728,7 +728,6 @@ - - #define GDK_ROOT_PARENT() (gdk_get_default_root_window ()) - #define gdk_window_get_size gdk_drawable_get_size --#define gdk_window_get_type gdk_window_get_window_type - #define gdk_window_get_colormap gdk_drawable_get_colormap - #define gdk_window_set_colormap gdk_drawable_set_colormap - #define gdk_window_ref g_object_ref |