diff options
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index f1997e15a3..ae9a46ed4e 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001 | 1 | From c452ba58dd2f99d6e624421697417cc018f9a67a Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Wed, 16 Aug 2017 02:00:08 -0400 | 3 | Date: Fri, 29 Jun 2018 14:35:41 +0800 |
4 | Subject: [PATCH 1/4] pkgconfig | 4 | Subject: [PATCH 1/7] pkgconfig |
5 | 5 | ||
6 | Update gpgme to use pkgconfig instead of -config files since its | 6 | Update gpgme to use pkgconfig instead of -config files since its |
7 | simpler and less error prone when cross compiling. | 7 | simpler and less error prone when cross compiling. |
@@ -11,7 +11,7 @@ RP 2015/4/17 | |||
11 | 11 | ||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
13 | 13 | ||
14 | Rebase to 1.9.0 | 14 | Rebase to 1.11.1 |
15 | 15 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
17 | --- | 17 | --- |
@@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
25 | create mode 100644 src/gpgme.pc.in | 25 | create mode 100644 src/gpgme.pc.in |
26 | 26 | ||
27 | diff --git a/configure.ac b/configure.ac | 27 | diff --git a/configure.ac b/configure.ac |
28 | index 6ea4bcd..2a0d528 100644 | 28 | index 2a35404..7485cdf 100644 |
29 | --- a/configure.ac | 29 | --- a/configure.ac |
30 | +++ b/configure.ac | 30 | +++ b/configure.ac |
31 | @@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile | 31 | @@ -886,6 +886,7 @@ AC_CONFIG_FILES(Makefile src/Makefile |
32 | src/versioninfo.rc | 32 | src/versioninfo.rc |
33 | src/gpgme.h) | 33 | src/gpgme.h) |
34 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) | 34 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) |
@@ -37,7 +37,7 @@ index 6ea4bcd..2a0d528 100644 | |||
37 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) | 37 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) |
38 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) | 38 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) |
39 | diff --git a/src/Makefile.am b/src/Makefile.am | 39 | diff --git a/src/Makefile.am b/src/Makefile.am |
40 | index ce6f1d4..5f38fee 100644 | 40 | index 0a196e0..cecaf8f 100644 |
41 | --- a/src/Makefile.am | 41 | --- a/src/Makefile.am |
42 | +++ b/src/Makefile.am | 42 | +++ b/src/Makefile.am |
43 | @@ -19,12 +19,14 @@ | 43 | @@ -19,12 +19,14 @@ |
@@ -54,7 +54,7 @@ index ce6f1d4..5f38fee 100644 | |||
54 | +pkgconfigdir = $(libdir)/pkgconfig | 54 | +pkgconfigdir = $(libdir)/pkgconfig |
55 | +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc | 55 | +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc |
56 | 56 | ||
57 | bin_PROGRAMS = gpgme-tool | 57 | bin_PROGRAMS = gpgme-tool gpgme-json |
58 | 58 | ||
59 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in | 59 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in |
60 | new file mode 100644 | 60 | new file mode 100644 |
@@ -299,5 +299,5 @@ index 0000000..b69539f | |||
299 | +Requires: libassuan gpg-error | 299 | +Requires: libassuan gpg-error |
300 | \ No newline at end of file | 300 | \ No newline at end of file |
301 | -- | 301 | -- |
302 | 1.8.3.1 | 302 | 2.7.4 |
303 | 303 | ||