diff options
Diffstat (limited to 'app-crypt/gpgme/files')
3 files changed, 0 insertions, 237 deletions
diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch deleted file mode 100644 index d37d29770367..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.7.0-build-python.patch +++ /dev/null @@ -1,115 +0,0 @@ -From e5bccea346379a70fd9cb910c4ead9642227747f Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Sat, 24 Sep 2016 01:26:19 +0300 -Subject: [PATCH] build: lang: python: cleanups - -1. Make setup.py executable when generated. - -2. Add prepare target to enable prepare the source tree without building - anything. This is handy to enable standard distutils build outside of - gpgme build system. - -3. Treat data.h in similar manner as other VPATH issues, just symlink it - to the srcdir to simplify build, remove the CFLAGS requirement of - distutils. - -The above does not alter the behavior of current build but supports the -following sequence: - -$ mkdir build -$ cd build -$ ../configure --enable-languages= -$ make -$ cd lang/python -$ make prepare -$ ./setup.py build -$ ./setup.py install - -Notice the standard use of distutils which is required for package -manager to control the python selection and build process. - -Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - configure.ac | 2 +- - lang/python/Makefile.am | 16 ++++++++++------ - lang/python/gpgme.i | 2 +- - 3 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4a29f2f..efa1f19 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -886,9 +886,9 @@ AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) - AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([lang/qt/doc/Doxyfile])]) - AC_CONFIG_FILES(lang/qt/doc/Makefile) - AC_CONFIG_FILES([lang/python/Makefile -- lang/python/setup.py - lang/python/pyme/version.py - lang/python/tests/Makefile]) -+AC_CONFIG_FILES([lang/python/setup.py], [chmod a+x lang/python/setup.py]) - AC_OUTPUT - - echo " -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 2271ce0..9866f53 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -46,24 +46,28 @@ COPY_FILES_PYME = \ - - # For VPATH builds we need to copy some files because Python's - # distutils are not VPATH-aware. --copystamp: $(COPY_FILES) $(COPY_FILES_PYME) -+copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h - if test "$(srcdir)" != "$(builddir)" ; then \ - cp -R $(COPY_FILES) . ; \ - cp -R $(COPY_FILES_PYME) pyme ; \ - fi - touch $@ - -+data.h: -+ ln -s "$(top_srcdir)/src/data.h" -+ - all-local: copystamp - for PYTHON in $(PYTHONS); do \ -- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \ -- $$PYTHON setup.py build --verbose ; \ -+ $$PYTHON setup.py build --verbose ; \ - done - - dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp -- CFLAGS="$(CFLAGS) -I$(top_srcdir)" \ -- $(PYTHON) setup.py sdist --verbose -+ $(PYTHON) setup.py sdist --verbose - gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz - -+.PHONY: prepare -+prepare: copystamp -+ - .PHONY: sdist - sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc - -@@ -72,7 +76,7 @@ upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc - twine upload $^ - - CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \ -- copystamp -+ data.h copystamp - - # Remove the rest. - # -diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i -index 84addae..ac666f4 100644 ---- a/lang/python/gpgme.i -+++ b/lang/python/gpgme.i -@@ -183,7 +183,7 @@ - representation of struct gpgme_data for an very efficient check if - the buffer has been modified. */ - %{ --#include "src/data.h" /* For struct gpgme_data. */ -+#include "data.h" /* For struct gpgme_data. */ - %} - #endif - --- -2.7.3 - diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch deleted file mode 100644 index 7d56ad32d6fc..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests-disable.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 516022b0cd1a43973a467bb5b7e6813b9444d608 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Fri, 23 Sep 2016 22:46:39 +0300 -Subject: [PATCH] build: tests: remove non working - -Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - lang/qt/tests/Makefile.am | 2 +- - tests/gpg/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am -index a41dc8c..e05c8a3 100644 ---- a/lang/qt/tests/Makefile.am -+++ b/lang/qt/tests/Makefile.am -@@ -25,7 +25,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) - EXTRA_DIST = initial.test - - TESTS = initial.test t-keylist t-keylocate t-ownertrust t-tofuinfo \ -- t-encrypt t-wkspublish -+ t-wkspublish - - moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \ - t-encrypt.moc t-support.hmoc t-wkspublish.moc -diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am -index 9877843..90a1dfd 100644 ---- a/tests/gpg/Makefile.am -+++ b/tests/gpg/Makefile.am -@@ -36,7 +36,7 @@ endif - - c_tests = \ - t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \ -- t-decrypt t-verify t-decrypt-verify t-sig-notation t-export \ -+ t-decrypt t-verify t-decrypt-verify t-export \ - t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait \ - t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed $(tests_unix) - --- -2.7.3 - diff --git a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch b/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch deleted file mode 100644 index 719ddac16258..000000000000 --- a/app-crypt/gpgme/files/gpgme-1.7.0-build-tests.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c2f352363615a4581e01999eb4230f4921cc6f9f Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Fri, 23 Sep 2016 23:05:35 +0300 -Subject: [PATCH] build: avoid build tests if not required - -Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - lang/qt/tests/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - tests/gpg/Makefile.am | 2 +- - tests/gpgsm/Makefile.am | 2 +- - tests/opassuan/Makefile.am | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am -index 36ecfe4..63186e7 100644 ---- a/lang/qt/tests/Makefile.am -+++ b/lang/qt/tests/Makefile.am -@@ -62,7 +62,7 @@ nodist_t_keylist_SOURCES = $(moc_files) - - BUILT_SOURCES = $(moc_files) - --noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \ -+check_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \ - run-keyformailboxjob t-wkspublish - - CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \ -diff --git a/tests/Makefile.am b/tests/Makefile.am -index c71914f..b698e11 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -31,7 +31,7 @@ LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@ - - noinst_HEADERS = run-support.h - --noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \ -+check_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \ - run-verify run-encrypt run-identify run-decrypt run-genkey \ - run-keysign run-tofu - -diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am -index 90a1dfd..671a2f3 100644 ---- a/tests/gpg/Makefile.am -+++ b/tests/gpg/Makefile.am -@@ -64,7 +64,7 @@ LDADD = ../../src/libgpgme.la - t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread - - # We don't run t-genkey in the test suite, because it takes too long --noinst_PROGRAMS = $(c_tests) t-genkey -+check_PROGRAMS = $(c_tests) t-genkey - - clean-local: - -$(top_srcdir)/tests/start-stop-agent --stop -diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am -index 41645b6..1bdb712 100644 ---- a/tests/gpgsm/Makefile.am -+++ b/tests/gpgsm/Makefile.am -@@ -40,7 +40,7 @@ LDADD = ../../src/libgpgme.la - - # We don't run t-genkey in the test suite, because it takes too long - # and needs a working pinentry. --noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt -+check_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt - - key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 - -diff --git a/tests/opassuan/Makefile.am b/tests/opassuan/Makefile.am -index 31d26ed..608b608 100644 ---- a/tests/opassuan/Makefile.am -+++ b/tests/opassuan/Makefile.am -@@ -27,7 +27,7 @@ EXTRA_DIST = - AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ - LDADD = ../../src/libgpgme.la - --noinst_PROGRAMS = $(TESTS) t-command -+check_PROGRAMS = $(TESTS) t-command - - DISTCLEANFILES = - --- -2.7.3 - |