summaryrefslogtreecommitdiffstats
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
parentd0de533a99e83c194a98d0c523d2787e5e26de5d (diff)
downloadpoky-11ca8a4dd9e0882bdfeeebc81518245ab27f6cb9.tar.gz
libgpg-error: upgraded to 1.6
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3991 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-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 04620feedb..f367f1ccc2 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 @@
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.0/configure.ac 6Index: libgpg-error-1.3/configure.ac
7=================================================================== 7===================================================================
8--- libgpg-error-1.0.orig/configure.ac 2004-07-30 07:48:04.000000000 -0500 8--- libgpg-error-1.3.orig/configure.ac
9+++ libgpg-error-1.0/configure.ac 2005-02-23 18:52:01.000000000 -0600 9+++ libgpg-error-1.3/configure.ac
10@@ -83,6 +83,7 @@ 10@@ -117,6 +117,7 @@ GPG_ERROR_CONFIG_CFLAGS=""
11 AC_SUBST(GPG_ERROR_CONFIG_LIBS) 11 AC_SUBST(GPG_ERROR_CONFIG_LIBS)
12 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) 12 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
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 # Checks for library functions.
17 AC_CONFIG_FILES([Makefile])
18Index: libgpg-error-1.0/src/Makefile.am
19===================================================================
20--- libgpg-error-1.0.orig/src/Makefile.am 2004-06-28 07:37:38.000000000 -0500
21+++ libgpg-error-1.0/src/Makefile.am 2005-02-23 18:53:57.000000000 -0600
22@@ -24,7 +24,8 @@
23 mkerrnos.awk errnos.in \
24 mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
25 mkheader.awk gpg-error.h.in \
26- err-sources.h err-codes.h gpg-error-config.in gpg-error.m4
27+ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
28+ gpg-error.pc.in
29 16
30 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ 17 # Special defines for certain platforms
31 err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h 18Index: libgpg-error-1.3/src/Makefile.am
32@@ -39,6 +40,9 @@ 19===================================================================
20--- libgpg-error-1.3.orig/src/Makefile.am
21+++ libgpg-error-1.3/src/Makefile.am
22@@ -28,6 +28,8 @@ include_HEADERS = gpg-error.h
23 bin_SCRIPTS = gpg-error-config
33 m4datadir = $(datadir)/aclocal 24 m4datadir = $(datadir)/aclocal
34 m4data_DATA = gpg-error.m4 25 m4data_DATA = gpg-error.m4
35
36+pkgconfigdir = $(libdir)/pkgconfig 26+pkgconfigdir = $(libdir)/pkgconfig
37+pkgconfig_DATA = gpg-error.pc 27+pkgconfig_DATA = gpg-error.pc
38+
39 include_HEADERS = gpg-error.h
40 28
41 lib_LTLIBRARIES = libgpg-error.la 29
42Index: libgpg-error-1.0/src/gpg-error.pc.in 30 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
31@@ -35,7 +37,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.
32 mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
33 mkheader.awk gpg-error.h.in \
34 err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
35- gpg-error.def versioninfo.rc.in
36+ gpg-error.def versioninfo.rc.in gpg-error.pc.in
37
38 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
40Index: libgpg-error-1.3/src/gpg-error.pc.in
43=================================================================== 41===================================================================
44--- /dev/null 1970-01-01 00:00:00.000000000 +0000 42--- /dev/null
45+++ libgpg-error-1.0/src/gpg-error.pc.in 2005-02-23 18:52:01.000000000 -0600 43+++ libgpg-error-1.3/src/gpg-error.pc.in
46@@ -0,0 +1,10 @@ 44@@ -0,0 +1,10 @@
47+prefix=@prefix@ 45+prefix=@prefix@
48+exec_prefix=@exec_prefix@ 46+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 e520a23ae0..7aaf33e9f9 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 @@
1PR = "r1"
2DESCRIPTION = "GPG-Error library" 1DESCRIPTION = "GPG-Error library"
3SECTION = "libs" 2SECTION = "libs"
4PRIORITY = "optional" 3PRIORITY = "optional"
5LICENSE = "GPL LGPL FDL" 4LICENSE = "GPL LGPL FDL"
6 5
7SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ 6SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
8 file://pkgconfig.patch;patch=1" 7 file://pkgconfig.patch;patch=1"
9 8
10# move libgpg-error-config into -dev package 9# move libgpg-error-config into -dev package
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-09 09:46:40 +0000