summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-07-21 11:40:16 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-21 16:00:57 +0100
commit4c2bb35fe1da1ab67a65060fa4468bdf49df31a7 (patch)
tree9284f6742e0959eaf2d63f4d36171a5a7ab376e2
parent9618d56c290401e50c12410bdc8052c26bc70ed2 (diff)
downloadpoky-4c2bb35fe1da1ab67a65060fa4468bdf49df31a7.tar.gz
libgpg-error: Update to 1.8
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch (renamed from meta/packages/libgpg-error/libgpg-error-1.6/pkgconfig.patch)35
-rw-r--r--meta/packages/libgpg-error/libgpg-error_1.6.bb13
-rw-r--r--meta/packages/libgpg-error/libgpg-error_1.8.bb24
3 files changed, 41 insertions, 31 deletions
diff --git a/meta/packages/libgpg-error/libgpg-error-1.6/pkgconfig.patch b/meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch
index f367f1ccc2..49e47d874e 100644
--- a/meta/packages/libgpg-error/libgpg-error-1.6/pkgconfig.patch
+++ b/meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch
@@ -3,44 +3,43 @@
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher 3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4# 4#
5 5
6Index: libgpg-error-1.3/configure.ac 6Index: libgpg-error-1.8/configure.ac
7=================================================================== 7===================================================================
8--- libgpg-error-1.3.orig/configure.ac 8--- libgpg-error-1.8.orig/configure.ac 2010-05-06 06:01:08.000000000 -0700
9+++ libgpg-error-1.3/configure.ac 9+++ libgpg-error-1.8/configure.ac 2010-07-21 02:20:20.923261305 -0700
10@@ -117,6 +117,7 @@ GPG_ERROR_CONFIG_CFLAGS="" 10@@ -140,6 +140,7 @@
11 AC_SUBST(GPG_ERROR_CONFIG_LIBS)
12 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) 11 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
12 AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER)
13 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) 13 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
14+AC_CONFIG_FILES([src/gpg-error.pc]) 14+AC_CONFIG_FILES([src/gpg-error.pc])
15 15
16 16
17 # Special defines for certain platforms 17 # Special defines for certain platforms
18Index: libgpg-error-1.3/src/Makefile.am 18Index: libgpg-error-1.8/src/Makefile.am
19=================================================================== 19===================================================================
20--- libgpg-error-1.3.orig/src/Makefile.am 20--- libgpg-error-1.8.orig/src/Makefile.am 2010-04-14 02:16:44.000000000 -0700
21+++ libgpg-error-1.3/src/Makefile.am 21+++ libgpg-error-1.8/src/Makefile.am 2010-07-21 02:22:36.655012496 -0700
22@@ -28,6 +28,8 @@ include_HEADERS = gpg-error.h 22@@ -37,13 +37,15 @@
23 bin_SCRIPTS = gpg-error-config 23 bin_SCRIPTS = gpg-error-config
24 m4datadir = $(datadir)/aclocal 24 m4datadir = $(datadir)/aclocal
25 m4data_DATA = gpg-error.m4 25 m4data_DATA = gpg-error.m4
26+pkgconfigdir = $(libdir)/pkgconfig 26+pkgconfigdir = $(libdir)/pkgconfig
27+pkgconfig_DATA = gpg-error.pc 27+pkgconfig_DATA = gpg-error.pc
28 28
29
30 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ 29 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
31@@ -35,7 +37,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. 30 mkerrnos.awk errnos.in README \
32 mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ 31 mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
33 mkheader.awk gpg-error.h.in \ 32 mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
34 err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ 33 err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
35- gpg-error.def versioninfo.rc.in 34- gpg-error.def.in versioninfo.rc.in
36+ gpg-error.def versioninfo.rc.in gpg-error.pc.in 35+ gpg-error.def.in versioninfo.rc.in gpg-error.pc.in
37 36
38 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ 37 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
39 err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h 38 err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \
40Index: libgpg-error-1.3/src/gpg-error.pc.in 39Index: libgpg-error-1.8/src/gpg-error.pc.in
41=================================================================== 40===================================================================
42--- /dev/null 41--- /dev/null 1970-01-01 00:00:00.000000000 +0000
43+++ libgpg-error-1.3/src/gpg-error.pc.in 42+++ libgpg-error-1.8/src/gpg-error.pc.in 2010-07-21 02:20:20.923261305 -0700
44@@ -0,0 +1,10 @@ 43@@ -0,0 +1,10 @@
45+prefix=@prefix@ 44+prefix=@prefix@
46+exec_prefix=@exec_prefix@ 45+exec_prefix=@exec_prefix@
diff --git a/meta/packages/libgpg-error/libgpg-error_1.6.bb b/meta/packages/libgpg-error/libgpg-error_1.6.bb
deleted file mode 100644
index d5c6fe80b5..0000000000
--- a/meta/packages/libgpg-error/libgpg-error_1.6.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1DESCRIPTION = "GPG-Error library"
2SECTION = "libs"
3LICENSE = "GPLv2+ & LGPLv2.1+"
4DEPENDS = "gettext"
5
6SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
7 file://pkgconfig.patch;"
8
9# move libgpg-error-config into -dev package
10FILES_${PN} = "${libdir}/lib*.so.*"
11FILES_${PN}-dev += "${bindir}/*"
12
13inherit autotools binconfig pkgconfig
diff --git a/meta/packages/libgpg-error/libgpg-error_1.8.bb b/meta/packages/libgpg-error/libgpg-error_1.8.bb
new file mode 100644
index 0000000000..120feecafa
--- /dev/null
+++ b/meta/packages/libgpg-error/libgpg-error_1.8.bb
@@ -0,0 +1,24 @@
1DESCRIPTION = "a small library that defines common error values for all GnuPG components"
2HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/"
3BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
4
5LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/gpg-error.h;endline=23;md5=83c16c8f5cea85affa1ff270a6f4fcff \
9 file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c"
10
11
12SECTION = "libs"
13LICENSE = "GPLv2+ & LGPLv2.1+"
14DEPENDS = "gettext"
15PR = "r0"
16
17SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
18 file://pkgconfig.patch;"
19
20# move libgpg-error-config into -dev package
21FILES_${PN} = "${libdir}/lib*.so.*"
22FILES_${PN}-dev += "${bindir}/*"
23
24inherit autotools binconfig pkgconfig