summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-14 09:32:02 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-14 09:32:02 +0000
commit11ca8a4dd9e0882bdfeeebc81518245ab27f6cb9 (patch)
tree2c43a875b018092bf08b60afe713e495dfae67c5 /meta
parentd0de533a99e83c194a98d0c523d2787e5e26de5d (diff)
downloadopenembedded-core-11ca8a4dd9e0882bdfeeebc81518245ab27f6cb9.tar.gz
openembedded-core-11ca8a4dd9e0882bdfeeebc81518245ab27f6cb9.tar.bz2
openembedded-core-11ca8a4dd9e0882bdfeeebc81518245ab27f6cb9.tar.xz
openembedded-core-11ca8a4dd9e0882bdfeeebc81518245ab27f6cb9.zip
libgpg-error: upgraded to 1.6
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3991 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libgpg-error/libgpg-error-1.6/pkgconfig.patch (renamed from meta/packages/libgpg-error/libgpg-error-1.0/pkgconfig.patch)52
-rw-r--r--meta/packages/libgpg-error/libgpg-error_1.6.bb (renamed from meta/packages/libgpg-error/libgpg-error_1.0.bb)3
2 files changed, 26 insertions, 29 deletions
diff --git a/meta/packages/libgpg-error/libgpg-error-1.0/pkgconfig.patch b/meta/packages/libgpg-error/libgpg-error-1.6/pkgconfig.patch
index 04620feed..f367f1ccc 100644
--- a/meta/packages/libgpg-error/libgpg-error-1.0/pkgconfig.patch
+++ b/meta/packages/libgpg-error/libgpg-error-1.6/pkgconfig.patch
@@ -3,46 +3,44 @@
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
-Index: libgpg-error-1.0/configure.ac
+Index: libgpg-error-1.3/configure.ac
===================================================================
---- libgpg-error-1.0.orig/configure.ac 2004-07-30 07:48:04.000000000 -0500
-+++ libgpg-error-1.0/configure.ac 2005-02-23 18:52:01.000000000 -0600
-@@ -83,6 +83,7 @@
+--- libgpg-error-1.3.orig/configure.ac
++++ libgpg-error-1.3/configure.ac
+@@ -117,6 +117,7 @@ GPG_ERROR_CONFIG_CFLAGS=""
AC_SUBST(GPG_ERROR_CONFIG_LIBS)
AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
+AC_CONFIG_FILES([src/gpg-error.pc])
- # Checks for library functions.
- AC_CONFIG_FILES([Makefile])
-Index: libgpg-error-1.0/src/Makefile.am
-===================================================================
---- libgpg-error-1.0.orig/src/Makefile.am 2004-06-28 07:37:38.000000000 -0500
-+++ libgpg-error-1.0/src/Makefile.am 2005-02-23 18:53:57.000000000 -0600
-@@ -24,7 +24,8 @@
- mkerrnos.awk errnos.in \
- mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
- mkheader.awk gpg-error.h.in \
-- err-sources.h err-codes.h gpg-error-config.in gpg-error.m4
-+ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
-+ gpg-error.pc.in
- BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
- err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h
-@@ -39,6 +40,9 @@
+ # Special defines for certain platforms
+Index: libgpg-error-1.3/src/Makefile.am
+===================================================================
+--- libgpg-error-1.3.orig/src/Makefile.am
++++ libgpg-error-1.3/src/Makefile.am
+@@ -28,6 +28,8 @@ include_HEADERS = gpg-error.h
+ bin_SCRIPTS = gpg-error-config
m4datadir = $(datadir)/aclocal
m4data_DATA = gpg-error.m4
-
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gpg-error.pc
-+
- include_HEADERS = gpg-error.h
- lib_LTLIBRARIES = libgpg-error.la
-Index: libgpg-error-1.0/src/gpg-error.pc.in
+
+ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
+@@ -35,7 +37,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.
+ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
+ mkheader.awk gpg-error.h.in \
+ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
+- gpg-error.def versioninfo.rc.in
++ gpg-error.def versioninfo.rc.in gpg-error.pc.in
+
+ BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
+ err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h
+Index: libgpg-error-1.3/src/gpg-error.pc.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libgpg-error-1.0/src/gpg-error.pc.in 2005-02-23 18:52:01.000000000 -0600
+--- /dev/null
++++ libgpg-error-1.3/src/gpg-error.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
diff --git a/meta/packages/libgpg-error/libgpg-error_1.0.bb b/meta/packages/libgpg-error/libgpg-error_1.6.bb
index e520a23ae..7aaf33e9f 100644
--- a/meta/packages/libgpg-error/libgpg-error_1.0.bb
+++ b/meta/packages/libgpg-error/libgpg-error_1.6.bb
@@ -1,10 +1,9 @@
-PR = "r1"
DESCRIPTION = "GPG-Error library"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL LGPL FDL"
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch;patch=1"
# move libgpg-error-config into -dev package