summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-01-15 12:46:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-01-15 12:46:29 +0000
commitf36de18183faa28a9b0a909e69a99d1b7537369c (patch)
tree0fedb0da7e1fa3452b9bfa17c87e3df4822fb3dd /main
parent019c76895cc1a860aa50c116d1f040ebb6c058ff (diff)
downloadaports-f36de18183faa28a9b0a909e69a99d1b7537369c.tar.bz2
aports-f36de18183faa28a9b0a909e69a99d1b7537369c.tar.xz
main/gnome-keyring: build fix
fixes #1536
Diffstat (limited to 'main')
-rw-r--r--main/gnome-keyring/APKBUILD8
-rw-r--r--main/gnome-keyring/egg-asn1x.patch27
2 files changed, 32 insertions, 3 deletions
diff --git a/main/gnome-keyring/APKBUILD b/main/gnome-keyring/APKBUILD
index fbb4569ae..2226f57a4 100644
--- a/main/gnome-keyring/APKBUILD
+++ b/main/gnome-keyring/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=gnome-keyring
pkgver=2.32.1
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME keyring"
url="http://www.gnome.org"
arch="all"
@@ -28,7 +28,8 @@ depends_dev="gtk+-dev
makedepends="$depends_dev intltool gobject-introspection-dev"
install=
subpackages="$pkgname-dev"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ egg-asn1x.patch"
[ "$ALPINE_LIBC" = "eglibc" ] && arch=
@@ -59,4 +60,5 @@ package() {
find "$pkgdir" -name '*.la' -delete
}
-md5sums="9a8aa74e03361676f29d6e73155786fc gnome-keyring-2.32.1.tar.bz2"
+md5sums="9a8aa74e03361676f29d6e73155786fc gnome-keyring-2.32.1.tar.bz2
+ab08614f54aa38fabecbf1e18c6b3518 egg-asn1x.patch"
diff --git a/main/gnome-keyring/egg-asn1x.patch b/main/gnome-keyring/egg-asn1x.patch
new file mode 100644
index 000000000..d36b0489a
--- /dev/null
+++ b/main/gnome-keyring/egg-asn1x.patch
@@ -0,0 +1,27 @@
+--- ./egg/egg-asn1x.h.orig 2013-01-15 12:35:55.308701917 +0000
++++ ./egg/egg-asn1x.h 2013-01-15 12:41:45.224900393 +0000
+@@ -25,6 +25,7 @@
+ #define EGG_ASN1X_H_
+
+ #include <glib.h>
++#include <libtasn1.h>
+
+ #ifndef HAVE_EGG_ALLOCATOR
+ typedef void* (*EggAllocator) (void* p, gsize);
+@@ -35,13 +36,13 @@
+
+ struct static_struct_asn;
+
+-GNode* egg_asn1x_create (const struct static_struct_asn *defs,
++GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs,
+ const gchar *type);
+
+-GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs,
++GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs,
+ GQuark type);
+
+-GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs,
++GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs,
+ const gchar *type,
+ gconstpointer data,
+ gsize n_data);