diff options
| -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.bb | 13 | ||||
| -rw-r--r-- | meta/packages/libgpg-error/libgpg-error_1.8.bb | 24 |
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 @@ # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # -Index: libgpg-error-1.3/configure.ac +Index: libgpg-error-1.8/configure.ac =================================================================== ---- 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) +--- 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.3/src/Makefile.am +Index: libgpg-error-1.8/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 +--- 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 \ -@@ -35,7 +37,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. + mkerrnos.awk errnos.in README \ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ - mkheader.awk gpg-error.h.in \ + 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 versioninfo.rc.in -+ gpg-error.def versioninfo.rc.in gpg-error.pc.in +- 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.3/src/gpg-error.pc.in + 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 -+++ libgpg-error-1.3/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@ 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 @@ -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -LICENSE = "GPLv2+ & LGPLv2.1+" -DEPENDS = "gettext" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ - file://pkgconfig.patch;" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit 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 @@ +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" +LICENSE = "GPLv2+ & LGPLv2.1+" +DEPENDS = "gettext" +PR = "r0" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ + file://pkgconfig.patch;" + +# move libgpg-error-config into -dev package +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*" + +inherit autotools binconfig pkgconfig |