diff --git a/dev-libs/libgpg_error/libgpg_error-1.36.recipe b/dev-libs/libgpg_error/libgpg_error-1.47.recipe similarity index 91% rename from dev-libs/libgpg_error/libgpg_error-1.36.recipe rename to dev-libs/libgpg_error/libgpg_error-1.47.recipe index 3618fd646..d406b6a8b 100644 --- a/dev-libs/libgpg_error/libgpg_error-1.36.recipe +++ b/dev-libs/libgpg_error/libgpg_error-1.47.recipe @@ -5,16 +5,16 @@ DirMngr, Pinentry, SmartCard Daemon and more." HOMEPAGE="https://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error" COPYRIGHT="2003-2018 g10 Code GmbH" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$portVersion.tar.bz2" -CHECKSUM_SHA256="babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +CHECKSUM_SHA256="9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb" SOURCE_DIR="libgpg-error-$portVersion" PATCHES="libgpg_error-$portVersion.patchset" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -libVersion="0.27.0" +libVersion="0.34.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" portVersionCompat="$portVersion compat >= 1" @@ -30,7 +30,6 @@ REQUIRES=" PROVIDES_devel=" libgpg_error${secondaryArchSuffix}_devel = $portVersion - cmd:gpg_error_config$secondaryArchSuffix = $portVersionCompat cmd:gpgrt_config$secondaryArchSuffix = $portVersionCompat devel:libgpg_error$secondaryArchSuffix = $libVersionCompat " @@ -77,7 +76,6 @@ INSTALL() packageEntries devel \ "$developDir" \ - "$binDir"/gpg-error-config \ "$binDir"/gpgrt-config \ "$dataDir" \ ${maybe_manDir:+"$maybe_manDir"/man1/gpgrt-config.1} diff --git a/dev-libs/libgpg_error/patches/libgpg_error-1.36.patchset b/dev-libs/libgpg_error/patches/libgpg_error-1.47.patchset similarity index 75% rename from dev-libs/libgpg_error/patches/libgpg_error-1.36.patchset rename to dev-libs/libgpg_error/patches/libgpg_error-1.47.patchset index f55c6d60b..384b447ac 100644 --- a/dev-libs/libgpg_error/patches/libgpg_error-1.36.patchset +++ b/dev-libs/libgpg_error/patches/libgpg_error-1.47.patchset @@ -1,11 +1,11 @@ -From 9cf8342f53b6c3071da88916189a1e655b63a160 Mon Sep 17 00:00:00 2001 +From e2a52be8c54431fbbb54e3174243dcbcbe8b0e47 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 5 Aug 2014 16:25:46 +0000 Subject: haiku patch diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..93cfef2 100644 +index 188f7a4..d270f38 100644 --- a/src/mkerrcodes2.awk +++ b/src/mkerrcodes2.awk @@ -81,7 +81,7 @@ BEGIN { @@ -18,17 +18,17 @@ index ea58503..93cfef2 100644 print "static const int err_code_from_index[] = {"; header = 0; -- -2.19.1 +2.37.3 -From f72c66f6b2acd2e4208407d0f0e2cce6bc1d0930 Mon Sep 17 00:00:00 2001 +From 2eda997d28adacf63357d6422955997e3d03f02f Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 17 Jan 2018 22:03:45 +0000 Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined. diff --git a/doc/yat2m.c b/doc/yat2m.c -index 3c7b363..8aaf4c5 100644 +index c2806e3..0736eb8 100644 --- a/doc/yat2m.c +++ b/doc/yat2m.c @@ -105,9 +105,14 @@ @@ -47,7 +47,7 @@ index 3c7b363..8aaf4c5 100644 # define MY_GCC_VERSION 0 #endif diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in -index 1b9be09..75f949f 100644 +index bce028e..3648875 100644 --- a/src/gpg-error.h.in +++ b/src/gpg-error.h.in @@ -153,9 +153,14 @@ typedef unsigned int gpg_error_t; @@ -59,38 +59,40 @@ index 1b9be09..75f949f 100644 + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) +# else -+# define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100) ++# define MY_GCC_VERSION (__GNUC__ * 10000 \ ++ + __GNUC_MINOR__ * 100) +# endif #else # define _GPG_ERR_GCC_VERSION 0 #endif -- -2.19.1 +2.37.3 -From ffb1db9f6ef947eab0412c3304d3960485cb4fef Mon Sep 17 00:00:00 2001 +From 69cdc6d57a69c3aea83cc172fbd7aae59af7f9f8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 21 Mar 2019 23:22:43 +0100 Subject: gpg-error.c: remove preprocessing in macro for gcc2. diff --git a/src/gpg-error.c b/src/gpg-error.c -index 2eb5e7b..44ceac4 100644 +index 4e8bd8b..c70c45d 100644 --- a/src/gpg-error.c +++ b/src/gpg-error.c -@@ -494,11 +494,7 @@ main (int argc, char *argv[]) +@@ -557,13 +557,8 @@ main (int argc, char *argv[]) + "Print all error codes"), ARGPARSE_c (CMD_DEFINES, "defines", "Print all error codes as #define lines"), - ARGPARSE_c (CMD_LOCALE, "locale", -#if HAVE_W32_SYSTEM -- "Return the locale used for gettext" +- ARGPARSE_c (CMD_LOCALE, "locale", +- "Return the locale used for gettext"), -#else - "@" + ARGPARSE_c (CMD_LOCALE, "locale", + "@"), -#endif - ), ARGPARSE_s_n (OPT_DESC, "desc", "Print with error description"), + ARGPARSE_end() -- -2.19.1 +2.37.3