diff options
| -rw-r--r-- | main/gobject-introspection/001-ccache.patch | 24 | ||||
| -rw-r--r-- | main/gobject-introspection/002-ccache.patch | 21 | ||||
| -rw-r--r-- | main/gobject-introspection/APKBUILD | 12 |
3 files changed, 4 insertions, 53 deletions
diff --git a/main/gobject-introspection/001-ccache.patch b/main/gobject-introspection/001-ccache.patch deleted file mode 100644 index 1f9145df50..0000000000 --- a/main/gobject-introspection/001-ccache.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 404af5e1d854522df2b02db9f8805ce19f9e8b76 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Fri, 22 Oct 2010 15:28:40 +0000 -Subject: Handle CC="ccache gcc" for linker command too - -The compiler path explicitly split()s the variable, we should do -so in the linker path too. ---- -diff --git a/giscanner/dumper.py b/giscanner/dumper.py -index 773dec9..7462aa3 100644 ---- a/giscanner/dumper.py -+++ b/giscanner/dumper.py -@@ -200,7 +200,8 @@ class DumpCompiler(object): - args.append('--tag=CC') - args.append('--silent') - -- args.extend([self._linker_cmd, '-o', output]) -+ args = self._linker_cmd.split() -+ args.extend(['-o', output]) - if libtool: - args.append('-export-dynamic') - --- -cgit v0.8.3.1 diff --git a/main/gobject-introspection/002-ccache.patch b/main/gobject-introspection/002-ccache.patch deleted file mode 100644 index 9e9b69a9db..0000000000 --- a/main/gobject-introspection/002-ccache.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a09298e2638282e8529c554704a2493006af379f Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Fri, 22 Oct 2010 16:54:29 +0000 -Subject: Fix previous commit - ---- -diff --git a/giscanner/dumper.py b/giscanner/dumper.py -index 7462aa3..e44f4f4 100644 ---- a/giscanner/dumper.py -+++ b/giscanner/dumper.py -@@ -200,7 +200,7 @@ class DumpCompiler(object): - args.append('--tag=CC') - args.append('--silent') - -- args = self._linker_cmd.split() -+ args.extend(self._linker_cmd.split()) - args.extend(['-o', output]) - if libtool: - args.append('-export-dynamic') --- -cgit v0.8.3.1 diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD index 327b496086..c4742ec376 100644 --- a/main/gobject-introspection/APKBUILD +++ b/main/gobject-introspection/APKBUILD @@ -1,16 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gobject-introspection -pkgver=0.9.12 -pkgrel=1 +pkgver=0.10.1 +pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch="all" license="LGPL GPL" makedepends="flex bison glib-dev libffi-dev python-dev libtool" depends="python glib-dev libffi-dev cairo-dev" -source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 - 001-ccache.patch - 002-ccache.patch" +source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" # since this is a dev package by definition we dont bother separate -dev subpackages="$pkgname-doc libgirepository" @@ -48,6 +46,4 @@ libgirepository() { mv "$pkgdir"/usr/lib/libgirepository*.so* "$subpkgdir"/usr/lib/ } -md5sums="260ba5e77b5c0de0e7d8faf63ecbfee7 gobject-introspection-0.9.12.tar.bz2 -4ad235a1372f247f6df83a548ad4a331 001-ccache.patch -13c587cda7bbb12402ed43dbd7161310 002-ccache.patch" +md5sums="46faf231243ef5918bb30a38dbc62f10 gobject-introspection-0.10.1.tar.bz2" |