From fbca2e9e5c780e94916957d9a7928ba372c8300c Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 13 Apr 2011 13:32:55 +0800 Subject: libgpg-error: Upgrade to 1.10 (from 1.9) (From OE-Core rev: f00f71eccc1c1c7ae0451aa7fb42d507b0e914ca) Signed-off-by: Zhai Edwin Signed-off-by: Richard Purdie --- .../libgpg-error/libgpg-error-1.10/pkgconfig.patch | 55 ++++++++++++++++++++++ .../libgpg-error/libgpg-error-1.9/pkgconfig.patch | 53 --------------------- .../libgpg-error/libgpg-error_1.10.bb | 25 ++++++++++ .../libgpg-error/libgpg-error_1.9.bb | 25 ---------- 4 files changed, 80 insertions(+), 78 deletions(-) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch create mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.10.bb delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.9.bb (limited to 'meta/recipes-support/libgpg-error') diff --git a/meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch new file mode 100644 index 0000000000..27640129e2 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch @@ -0,0 +1,55 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Upstream-Status: Pending + +Index: libgpg-error-1.8/configure.ac +=================================================================== +--- libgpg-error-1.8.orig/configure.ac 2010-05-06 06:01:08.000000000 -0700 ++++ libgpg-error-1.8/configure.ac 2010-07-21 02:20:20.923261305 -0700 +@@ -140,6 +140,7 @@ + AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) + AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER) + AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) ++AC_CONFIG_FILES([src/gpg-error.pc]) + + + # Special defines for certain platforms +Index: libgpg-error-1.8/src/Makefile.am +=================================================================== +--- libgpg-error-1.8.orig/src/Makefile.am 2010-04-14 02:16:44.000000000 -0700 ++++ libgpg-error-1.8/src/Makefile.am 2010-07-21 02:22:36.655012496 -0700 +@@ -37,13 +37,15 @@ + bin_SCRIPTS = gpg-error-config + m4datadir = $(datadir)/aclocal + m4data_DATA = gpg-error.m4 ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = gpg-error.pc + + EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ + mkerrnos.awk errnos.in README \ + mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ + mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ + err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ +- gpg-error.def.in versioninfo.rc.in ++ gpg-error.def.in 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.8/src/gpg-error.pc.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libgpg-error-1.8/src/gpg-error.pc.in 2010-07-21 02:20:20.923261305 -0700 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: gpg-error ++Description: a library that defines common error values for all GnuPG components ++Version: @VERSION@ ++Libs: -L{libdir} -lgpg-error ++Cflags: -I${includedir} diff --git a/meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch deleted file mode 100644 index 49e47d874e..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch +++ /dev/null @@ -1,53 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: libgpg-error-1.8/configure.ac -=================================================================== ---- libgpg-error-1.8.orig/configure.ac 2010-05-06 06:01:08.000000000 -0700 -+++ libgpg-error-1.8/configure.ac 2010-07-21 02:20:20.923261305 -0700 -@@ -140,6 +140,7 @@ - AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) - AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER) - AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) -+AC_CONFIG_FILES([src/gpg-error.pc]) - - - # Special defines for certain platforms -Index: libgpg-error-1.8/src/Makefile.am -=================================================================== ---- libgpg-error-1.8.orig/src/Makefile.am 2010-04-14 02:16:44.000000000 -0700 -+++ libgpg-error-1.8/src/Makefile.am 2010-07-21 02:22:36.655012496 -0700 -@@ -37,13 +37,15 @@ - bin_SCRIPTS = gpg-error-config - m4datadir = $(datadir)/aclocal - m4data_DATA = gpg-error.m4 -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = gpg-error.pc - - EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ - mkerrnos.awk errnos.in README \ - mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ - mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ - err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ -- gpg-error.def.in versioninfo.rc.in -+ gpg-error.def.in 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.8/src/gpg-error.pc.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgpg-error-1.8/src/gpg-error.pc.in 2010-07-21 02:20:20.923261305 -0700 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: gpg-error -+Description: a library that defines common error values for all GnuPG components -+Version: @VERSION@ -+Libs: -L{libdir} -lgpg-error -+Cflags: -I${includedir} diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb new file mode 100644 index 0000000000..6dea0844ef --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "a small library that defines common error values for all GnuPG components" +HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" +BUGTRACKER = "https://bugs.g10code.com/gnupg/index" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/gpg-error.h;endline=23;md5=83c16c8f5cea85affa1ff270a6f4fcff \ + file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c" + + +SECTION = "libs" +PR = "r0" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ + file://pkgconfig.patch" + +SRC_URI[md5sum] = "736a03daa9dc5873047d4eb4a9c22a16" +SRC_URI[sha256sum] = "520629b4568b5c29b1991c8ffc267c8bdee5f223c7333c42a651b56f9b1c5431" + +# move libgpg-error-config into -dev package +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*" + +inherit autotools binconfig pkgconfig gettext diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb deleted file mode 100644 index 560340bfc8..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.9.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "a small library that defines common error values for all GnuPG components" -HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h;endline=23;md5=83c16c8f5cea85affa1ff270a6f4fcff \ - file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c" - - -SECTION = "libs" -PR = "r0" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ - file://pkgconfig.patch;" - -SRC_URI[md5sum] = "521b98aa9395e7eaf0ef2236233a0796" -SRC_URI[sha256sum] = "54d9326bfbd46c705963c507953f65a40576d04b374e131008dc5b732ff1e3c3" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig gettext -- cgit v1.2.3-54-g00ecf