[neon/backports-noble/gpgme-noble/Neon/release] debian/patches: refresh patches
Carlos De Maine
null at kde.org
Thu May 9 00:10:08 BST 2024
Git commit 8c4741dd9e3f1fa9e47c1139c8e00974e935fa81 by Carlos De Maine.
Committed on 08/05/2024 at 23:09.
Pushed by carlosdem into branch 'Neon/release'.
refresh patches
M +1 -35 debian/patches/0001-Remove-upstream-git-fanciness.patch
M +0 -24 debian/patches/0003-Ship-python-examples-with-python3-in-shebang-line.patch
M +1 -3 debian/patches/0004-Avoid-the-hardcoded-list-of-Python-versions.patch
M +1 -3 debian/patches/0007-lang-python-tests-Fix-FTBFS-caused-by-missing-PYTHON.patch
M +0 -37 debian/patches/0013-python-Fix-configure-generating-setup.py.patch
M +1 -5 debian/patches/0020-python3-setuptools.diff
M +6 -6 debian/patches/series
https://invent.kde.org/neon/backports-noble/gpgme-noble/-/commit/8c4741dd9e3f1fa9e47c1139c8e00974e935fa81
diff --git a/debian/patches/0001-Remove-upstream-git-fanciness.patch b/debian/patches/0001-Remove-upstream-git-fanciness.patch
index a091d0e5..8c98e710 100644
--- a/debian/patches/0001-Remove-upstream-git-fanciness.patch
+++ b/debian/patches/0001-Remove-upstream-git-fanciness.patch
@@ -18,43 +18,9 @@ Forwarded: not-needed
autogen.sh | 67 ++++----------------------------------------------------------
1 file changed, 4 insertions(+), 63 deletions(-)
-diff --git a/autogen.sh b/autogen.sh
-index 9b36158..5dfca0e 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -249,27 +249,10 @@ if [ "$myhost" = "find-version" ]; then
- fi
-
- beta=no
-- if [ -e .git ]; then
-- ingit=yes
-- tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
-- tmp=$(echo "$tmp" | sed s/^"$package"//)
-- if [ -n "$tmp" ]; then
-- tmp=$(echo "$tmp" | sed s/^"$package"// \
-- | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
-- else
-- tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
-- | awk -F- '$4!=0{print"-beta"$4}')
-- fi
-- [ -n "$tmp" ] && beta=yes
-- rev=$(git rev-parse --short HEAD | tr -d '\n\r')
-- rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
-- else
-- ingit=no
-- beta=yes
-- tmp="-unknown"
-- rev="0000000"
-- rvd="0"
-- fi
-+ ingit=no
-+ tmp=""
-+ rvd="$(wc -l < debian/changelog)"
-+ rev="$(printf %07x $rvd)"
-
- echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
- exit 0
-@@ -452,48 +435,6 @@ EOF
+@@ -449,48 +449,6 @@
die_p
fi
diff --git a/debian/patches/0003-Ship-python-examples-with-python3-in-shebang-line.patch b/debian/patches/0003-Ship-python-examples-with-python3-in-shebang-line.patch
index 31f2d17c..b70d3c3f 100644
--- a/debian/patches/0003-Ship-python-examples-with-python3-in-shebang-line.patch
+++ b/debian/patches/0003-Ship-python-examples-with-python3-in-shebang-line.patch
@@ -31,8 +31,6 @@ Forwarded: not-needed
lang/python/examples/verifydetails.py | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
-diff --git a/lang/python/examples/assuan.py b/lang/python/examples/assuan.py
-index 84f5ff0..317f5b5 100755
--- a/lang/python/examples/assuan.py
+++ b/lang/python/examples/assuan.py
@@ -1,4 +1,4 @@
@@ -41,8 +39,6 @@ index 84f5ff0..317f5b5 100755
#
# Copyright (C) 2016 g10 Code GmbH
#
-diff --git a/lang/python/examples/decryption-filter.py b/lang/python/examples/decryption-filter.py
-index d0fc3a4..99f4240 100755
--- a/lang/python/examples/decryption-filter.py
+++ b/lang/python/examples/decryption-filter.py
@@ -1,4 +1,4 @@
@@ -51,8 +47,6 @@ index d0fc3a4..99f4240 100755
#
# Copyright (C) 2016, 2018 g10 Code GmbH
#
-diff --git a/lang/python/examples/delkey.py b/lang/python/examples/delkey.py
-index f0411f4..823f384 100755
--- a/lang/python/examples/delkey.py
+++ b/lang/python/examples/delkey.py
@@ -1,4 +1,4 @@
@@ -61,8 +55,6 @@ index f0411f4..823f384 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2004,2008 Igor Belyi <belyi at users.sourceforge.net>
-diff --git a/lang/python/examples/exportimport.py b/lang/python/examples/exportimport.py
-index 235d570..9c811e8 100755
--- a/lang/python/examples/exportimport.py
+++ b/lang/python/examples/exportimport.py
@@ -1,4 +1,4 @@
@@ -71,8 +63,6 @@ index 235d570..9c811e8 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2004,2008 Igor Belyi <belyi at users.sourceforge.net>
-diff --git a/lang/python/examples/genkey.py b/lang/python/examples/genkey.py
-index 5df6476..bbc03a3 100755
--- a/lang/python/examples/genkey.py
+++ b/lang/python/examples/genkey.py
@@ -1,4 +1,4 @@
@@ -81,8 +71,6 @@ index 5df6476..bbc03a3 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2004 Igor Belyi <belyi at users.sourceforge.net>
-diff --git a/lang/python/examples/inter-edit.py b/lang/python/examples/inter-edit.py
-index 2fd74c2..e89d55a 100755
--- a/lang/python/examples/inter-edit.py
+++ b/lang/python/examples/inter-edit.py
@@ -1,4 +1,4 @@
@@ -91,8 +79,6 @@ index 2fd74c2..e89d55a 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2005 Igor Belyi <belyi at users.sourceforge.net>
-diff --git a/lang/python/examples/low_level-encrypt_to_all.py b/lang/python/examples/low_level-encrypt_to_all.py
-index edd0197..7e9c6f4 100755
--- a/lang/python/examples/low_level-encrypt_to_all.py
+++ b/lang/python/examples/low_level-encrypt_to_all.py
@@ -1,4 +1,4 @@
@@ -101,8 +87,6 @@ index edd0197..7e9c6f4 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2008 Igor Belyi <belyi at users.sourceforge.net>
-diff --git a/lang/python/examples/sign.py b/lang/python/examples/sign.py
-index 079ccde..4c9e587 100755
--- a/lang/python/examples/sign.py
+++ b/lang/python/examples/sign.py
@@ -1,4 +1,4 @@
@@ -111,8 +95,6 @@ index 079ccde..4c9e587 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2002 John Goerzen <jgoerzen at complete.org>
-diff --git a/lang/python/examples/signverify.py b/lang/python/examples/signverify.py
-index c9c6edd..8cf7932 100755
--- a/lang/python/examples/signverify.py
+++ b/lang/python/examples/signverify.py
@@ -1,4 +1,4 @@
@@ -121,8 +103,6 @@ index c9c6edd..8cf7932 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2004,2008 Igor Belyi <belyi at users.sourceforge.net>
-diff --git a/lang/python/examples/simple.py b/lang/python/examples/simple.py
-index d2e7c07..2defb01 100755
--- a/lang/python/examples/simple.py
+++ b/lang/python/examples/simple.py
@@ -1,4 +1,4 @@
@@ -131,8 +111,6 @@ index d2e7c07..2defb01 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2005 Igor Belyi <belyi at users.sourceforge.net>
-diff --git a/lang/python/examples/testCMSgetkey.py b/lang/python/examples/testCMSgetkey.py
-index 9b5a526..c5b1f21 100755
--- a/lang/python/examples/testCMSgetkey.py
+++ b/lang/python/examples/testCMSgetkey.py
@@ -1,4 +1,4 @@
@@ -141,8 +119,6 @@ index 9b5a526..c5b1f21 100755
#
# Copyright (C) 2016 g10 Code GmbH
# Copyright (C) 2008 Bernhard Reiter <bernhard at intevation.de>
-diff --git a/lang/python/examples/verifydetails.py b/lang/python/examples/verifydetails.py
-index 3733486..1bf2e48 100755
--- a/lang/python/examples/verifydetails.py
+++ b/lang/python/examples/verifydetails.py
@@ -1,4 +1,4 @@
diff --git a/debian/patches/0004-Avoid-the-hardcoded-list-of-Python-versions.patch b/debian/patches/0004-Avoid-the-hardcoded-list-of-Python-versions.patch
index ecd825c0..a45202b8 100644
--- a/debian/patches/0004-Avoid-the-hardcoded-list-of-Python-versions.patch
+++ b/debian/patches/0004-Avoid-the-hardcoded-list-of-Python-versions.patch
@@ -10,11 +10,9 @@ Forwarded: not-needed
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/configure.ac b/configure.ac
-index 581cc56..aed5594 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -475,6 +475,10 @@ if test "$found_py" = "1"; then
+@@ -624,6 +624,10 @@
PYTHONS="$(echo $PYTHONS | tr '[[:space:]]' '\n' | sort | uniq | tr '\n' ' ' | sed -e 's/ $//')"
PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS | tr '[[:space:]]' '\n' | sort | uniq | tr '\n' ' ' | sed -e 's/ $//')"
diff --git a/debian/patches/0007-lang-python-tests-Fix-FTBFS-caused-by-missing-PYTHON.patch b/debian/patches/0007-lang-python-tests-Fix-FTBFS-caused-by-missing-PYTHON.patch
index 46458b9a..0b2d3c4c 100644
--- a/debian/patches/0007-lang-python-tests-Fix-FTBFS-caused-by-missing-PYTHON.patch
+++ b/debian/patches/0007-lang-python-tests-Fix-FTBFS-caused-by-missing-PYTHON.patch
@@ -7,11 +7,9 @@ Updated by Paul Gevers <elbrus at debian.org>
lang/python/tests/Makefile.am | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
-index 62dddaa..6ca07c4 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
-@@ -70,9 +70,11 @@ check: xcheck
+@@ -70,9 +70,11 @@
.PHONY: xcheck
xcheck: all
diff --git a/debian/patches/0013-python-Fix-configure-generating-setup.py.patch b/debian/patches/0013-python-Fix-configure-generating-setup.py.patch
index 3b36055d..96b47a8f 100644
--- a/debian/patches/0013-python-Fix-configure-generating-setup.py.patch
+++ b/debian/patches/0013-python-Fix-configure-generating-setup.py.patch
@@ -20,43 +20,6 @@ diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
index 6741d3c..6f36861 100755
--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
-@@ -68,22 +68,26 @@ if not gpgme_h:
- gpgme_h = os.path.join('@prefix@', 'include', 'gpgme.h')
-
- define_macros = []
--libs = '@GPGME_CONFIG_LIBS@'.split(' ')
-+if '@GPGME_CONFIG_LIBS@':
-+ libs = '@GPGME_CONFIG_LIBS@'.split(' ')
-+else:
-+ libs = []
-
- # Define extra_macros for both the SWIG and C code
- for k, v in extra_macros.items():
- extra_swig_opts.append('-D{0}={1}'.format(k, v))
- define_macros.append((k, str(v)))
-
--for item in '@GPGME_CONFIG_CFLAGS@'.split(' '):
-- if item.startswith('-I'):
-- include_dirs.append(item[2:])
-- elif item.startswith('-D'):
-- defitem = item[2:].split('=', 1)
-- if len(defitem) == 2:
-- define_macros.append((defitem[0], defitem[1]))
-- else:
-- define_macros.append((defitem[0], None))
-+if '@GPGME_CONFIG_CFLAGS@':
-+ for item in '@GPGME_CONFIG_CFLAGS@'.split(' '):
-+ if item.startswith('-I'):
-+ include_dirs.append(item[2:])
-+ elif item.startswith('-D'):
-+ defitem = item[2:].split('=', 1)
-+ if len(defitem) == 2:
-+ define_macros.append((defitem[0], defitem[1]))
-+ else:
-+ define_macros.append((defitem[0], None))
-
- # Adjust include and library locations in case of win32
- uname_s = os.popen('uname -s').read()
@@ -165,8 +169,9 @@ class BuildExtFirstHack(build):
def _generate_errors_i(self):
diff --git a/debian/patches/0020-python3-setuptools.diff b/debian/patches/0020-python3-setuptools.diff
index 8fe85dfa..1901c57f 100644
--- a/debian/patches/0020-python3-setuptools.diff
+++ b/debian/patches/0020-python3-setuptools.diff
@@ -10,9 +10,7 @@ Last-Update: 2023-10-28
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
-@@ -88,11 +88,12 @@ install-exec-local:
- top_builddir="$(top_builddir)" \
- $$PYTHON setup.py \
+@@ -96,7 +96,8 @@
build \
--build-base="$$(basename "$${PYTHON}")-gpg" \
install \
@@ -22,5 +20,3 @@ Last-Update: 2023-10-28
--verbose ; \
done
- uninstall-local:
- set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \
diff --git a/debian/patches/series b/debian/patches/series
index 84824be5..e8f21197 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
0001-Remove-upstream-git-fanciness.patch
-0002-drop-python2-support.patch
+#0002-drop-python2-support.patch
0003-Ship-python-examples-with-python3-in-shebang-line.patch
0004-Avoid-the-hardcoded-list-of-Python-versions.patch
0007-lang-python-tests-Fix-FTBFS-caused-by-missing-PYTHON.patch
-0010-build-python-Don-t-use-gpg-error-config-gpgme-config.patch
-0013-python-Fix-configure-generating-setup.py.patch
-0015-build-Prefer-gpgrt-config-when-available.patch
-0016-gpgme.m4-Include-_AM_PATH_GPGRT_CONFIG-implementatio.patch
-0017-doc-Update-documentation-for-gpgme.pc-and-pkg-config.patch
+#0010-build-python-Don-t-use-gpg-error-config-gpgme-config.patch
+#0013-python-Fix-configure-generating-setup.py.patch
+#0015-build-Prefer-gpgrt-config-when-available.patch
+#0016-gpgme.m4-Include-_AM_PATH_GPGRT_CONFIG-implementatio.patch
+#0017-doc-Update-documentation-for-gpgme.pc-and-pkg-config.patch
0020-python3-setuptools.diff
More information about the Neon-commits
mailing list