diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-02-06 22:29:07 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 20:06:42 -0800 |
commit | 6075e4978d344faabede03829ebacd82dcfd392b (patch) | |
tree | 6b8ed22a0b7bae466e4615636a74e0d37d3393f4 /meta/recipes-support/gpgme/gpgme | |
parent | 00dd77d449405b91b23c54656324ec80c0b85fe8 (diff) | |
download | poky-6075e4978d344faabede03829ebacd82dcfd392b.tar.gz |
gpgme: 1.6.0 -> 1.8.0
- Drop gpgme.pc, it is duplicated with pkgconfig.patch
- Rebase pkgconfig.patch to 1.8.0
- Split cmake config to ${PN}-dev
- Update LIC_FILES_CHKSUM, because copytright year changed.
- The libgpgme-pthread is obsolete by upstream;
- Add package libgpgcpp;
TODO: Do not remove gpgme-pthread.pc from pkgconfig.patch,
the upstream explains:
git://git.gnupg.org/gpgme.git
commit 09b64554328445e99a8cc78fc34ea49c2ea2e7f9
------------------------------
libgpgme-pthread is removed but gpgme-config still supports
--thread=pthread for compatibility with find scripts.
------------------------------
(From OE-Core rev: 62b91f655977bdf2faaf53443c47785738c1d0f6)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/gpgme.pc | 10 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/pkgconfig.patch | 42 |
2 files changed, 29 insertions, 23 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/gpgme.pc b/meta/recipes-support/gpgme/gpgme/gpgme.pc deleted file mode 100644 index 30a4d56d6e..0000000000 --- a/meta/recipes-support/gpgme/gpgme/gpgme.pc +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | libdir=${prefix}/lib | ||
3 | includedir=${prefix}/include | ||
4 | |||
5 | Name: gpgme | ||
6 | Description: GNU Privacy Guard Made Easy | ||
7 | Version: 1.4.3 | ||
8 | Requires: | ||
9 | Libs: -L${libdir} -lgpgme -lassuan -lgpg-error | ||
10 | Cflags: -I${includedir} | ||
diff --git a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch index e2f1f4ffb5..341cabfc50 100644 --- a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch | |||
@@ -4,37 +4,50 @@ simpler and less error prone when cross compiling. | |||
4 | Upstream-Status: Denied [Upstream not interested in pkg-config support] | 4 | Upstream-Status: Denied [Upstream not interested in pkg-config support] |
5 | RP 2015/4/17 | 5 | RP 2015/4/17 |
6 | 6 | ||
7 | Rebase to 1.8.0 | ||
8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
9 | --- | ||
10 | configure.ac | 1 + | ||
11 | src/Makefile.am | 4 +- | ||
12 | src/gpgme-pthread.pc.in | 15 +++++++ | ||
13 | src/gpgme.m4 | 114 ++++-------------------------------------------- | ||
14 | src/gpgme.pc.in | 15 +++++++ | ||
15 | 5 files changed, 42 insertions(+), 107 deletions(-) | ||
16 | create mode 100644 src/gpgme-pthread.pc.in | ||
17 | create mode 100644 src/gpgme.pc.in | ||
18 | |||
7 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
8 | index 298a22b..c778b61 100644 | 20 | index 0a67b48..e402dd3 100644 |
9 | --- a/configure.ac | 21 | --- a/configure.ac |
10 | +++ b/configure.ac | 22 | +++ b/configure.ac |
11 | @@ -622,6 +622,7 @@ AC_CONFIG_FILES(Makefile src/Makefile | 23 | @@ -875,6 +875,7 @@ AC_CONFIG_FILES(Makefile src/Makefile |
12 | src/versioninfo.rc | 24 | src/versioninfo.rc |
13 | src/gpgme.h) | 25 | src/gpgme.h) |
14 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) | 26 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) |
15 | +AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) | 27 | +AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) |
16 | AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) | 28 | AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) |
17 | AC_OUTPUT | 29 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) |
18 | 30 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) | |
19 | diff --git a/src/Makefile.am b/src/Makefile.am | 31 | diff --git a/src/Makefile.am b/src/Makefile.am |
20 | index 58922f9..40d0dca 100644 | 32 | index ce6f1d4..5f38fee 100644 |
21 | --- a/src/Makefile.am | 33 | --- a/src/Makefile.am |
22 | +++ b/src/Makefile.am | 34 | +++ b/src/Makefile.am |
23 | @@ -20,11 +20,13 @@ | 35 | @@ -19,12 +19,14 @@ |
36 | ## Process this file with automake to produce Makefile.in | ||
24 | 37 | ||
25 | # Note: moc_kdpipeiodevice should actually be a dependecy below. | ||
26 | EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ | 38 | EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ |
27 | - gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp | 39 | - gpgme.h.in versioninfo.rc.in gpgme.def |
28 | + gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in | 40 | + gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in gpgme-pthread.pc.in |
29 | 41 | ||
30 | bin_SCRIPTS = gpgme-config | 42 | bin_SCRIPTS = gpgme-config |
31 | m4datadir = $(datadir)/aclocal | 43 | m4datadir = $(datadir)/aclocal |
32 | m4data_DATA = gpgme.m4 | 44 | m4data_DATA = gpgme.m4 |
45 | nodist_include_HEADERS = gpgme.h | ||
33 | +pkgconfigdir = $(libdir)/pkgconfig | 46 | +pkgconfigdir = $(libdir)/pkgconfig |
34 | +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc | 47 | +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc |
35 | nodist_include_HEADERS = gpgme.h | ||
36 | 48 | ||
37 | bin_PROGRAMS = gpgme-tool | 49 | bin_PROGRAMS = gpgme-tool |
50 | |||
38 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in | 51 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in |
39 | new file mode 100644 | 52 | new file mode 100644 |
40 | index 0000000..980a48e | 53 | index 0000000..980a48e |
@@ -51,9 +64,9 @@ index 0000000..980a48e | |||
51 | +host=@GPGME_CONFIG_HOST@ | 64 | +host=@GPGME_CONFIG_HOST@ |
52 | + | 65 | + |
53 | +Name: gpgme | 66 | +Name: gpgme |
54 | +Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (threaded version) | 67 | +Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (deprecated) |
55 | +Version: @VERSION@ | 68 | +Version: @VERSION@ |
56 | +Libs: -L${libdir} -lgpgme-pthread -lpthread | 69 | +Libs: -L${libdir} -lgpgme -lpthread |
57 | +Cflags: -I${includedir} | 70 | +Cflags: -I${includedir} |
58 | +Requires: libassuan gpg-error | 71 | +Requires: libassuan gpg-error |
59 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 | 72 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 |
@@ -277,3 +290,6 @@ index 0000000..b69539f | |||
277 | +Cflags: -I${includedir} | 290 | +Cflags: -I${includedir} |
278 | +Requires: libassuan gpg-error | 291 | +Requires: libassuan gpg-error |
279 | \ No newline at end of file | 292 | \ No newline at end of file |
293 | -- | ||
294 | 2.8.1 | ||
295 | |||