Sync from SUSE:SLFO:Main gpgme revision 9c33e34f9066fd526199c7a2479466fa
This commit is contained in:
parent
6eb4cd78d4
commit
1b91d72a02
BIN
gpgme-1.23.0.tar.bz2
(Stored with Git LFS)
BIN
gpgme-1.23.0.tar.bz2
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
gpgme-1.23.2.tar.bz2
(Stored with Git LFS)
Normal file
BIN
gpgme-1.23.2.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
gpgme-1.23.2.tar.bz2.sig
Normal file
BIN
gpgme-1.23.2.tar.bz2.sig
Normal file
Binary file not shown.
795
gpgme-D545-obsolete-distutils.patch
Normal file
795
gpgme-D545-obsolete-distutils.patch
Normal file
@ -0,0 +1,795 @@
|
|||||||
|
From e3ae88267f03b435ec7d9e80ae1e2891e1f118e6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ingo Klöcker <dev@ingo-kloecker.de>
|
||||||
|
Date: Tue, 16 Jan 2024 09:53:39 +0100
|
||||||
|
Subject: build: Update Python autoconf macro
|
||||||
|
|
||||||
|
* configure.ac: Call AX_PYTHON_DEVEL with new "optional" argument.
|
||||||
|
* m4/ax_python_devel.m4: Replace with current version from the autoconf
|
||||||
|
archive.
|
||||||
|
--
|
||||||
|
|
||||||
|
The new "optional" argument allows us to leave out one of our custom
|
||||||
|
changes.
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 9d551813..0e0b9d97 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -607,7 +607,7 @@ if test "$found_py" = "1"; then
|
||||||
|
unset am_cv_python_pythondir
|
||||||
|
unset am_cv_python_pyexecdir
|
||||||
|
AM_PATH_PYTHON(mym4pythonver, [
|
||||||
|
- AX_PYTHON_DEVEL
|
||||||
|
+ AX_PYTHON_DEVEL([], [true])
|
||||||
|
if test "$PYTHON_VERSION"; then
|
||||||
|
PYTHONS="$(echo $PYTHONS $PYTHON)"
|
||||||
|
PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)"
|
||||||
|
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
|
||||||
|
index 55f0cfff..1f480db6 100644
|
||||||
|
--- a/m4/ax_python_devel.m4
|
||||||
|
+++ b/m4/ax_python_devel.m4
|
||||||
|
@@ -1,10 +1,10 @@
|
||||||
|
# ===========================================================================
|
||||||
|
-# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
|
||||||
|
+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
-# AX_PYTHON_DEVEL([version])
|
||||||
|
+# AX_PYTHON_DEVEL([version[,optional]])
|
||||||
|
#
|
||||||
|
# DESCRIPTION
|
||||||
|
#
|
||||||
|
@@ -12,8 +12,8 @@
|
||||||
|
# in your configure.ac.
|
||||||
|
#
|
||||||
|
# This macro checks for Python and tries to get the include path to
|
||||||
|
-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
|
||||||
|
-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and
|
||||||
|
+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output
|
||||||
|
+# variables. It also exports $(PYTHON_EXTRA_LIBS) and
|
||||||
|
# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
|
||||||
|
#
|
||||||
|
# You can search for some particular version of Python by passing a
|
||||||
|
@@ -23,6 +23,11 @@
|
||||||
|
# version number. Don't use "PYTHON_VERSION" for this: that environment
|
||||||
|
# variable is declared as precious and thus reserved for the end-user.
|
||||||
|
#
|
||||||
|
+# By default this will fail if it does not detect a development version of
|
||||||
|
+# python. If you want it to continue, set optional to true, like
|
||||||
|
+# AX_PYTHON_DEVEL([], [true]). The ax_python_devel_found variable will be
|
||||||
|
+# "no" if it fails.
|
||||||
|
+#
|
||||||
|
# This macro should work for all versions of Python >= 2.1.0. As an end
|
||||||
|
# user, you can disable the check for the python version by setting the
|
||||||
|
# PYTHON_NOVERSIONCHECK environment variable to something else than the
|
||||||
|
@@ -67,10 +72,18 @@
|
||||||
|
# modified version of the Autoconf Macro, you may extend this special
|
||||||
|
# exception to the GPL to apply to your modified version as well.
|
||||||
|
|
||||||
|
-#serial 17
|
||||||
|
+#serial 36
|
||||||
|
|
||||||
|
AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
|
||||||
|
AC_DEFUN([AX_PYTHON_DEVEL],[
|
||||||
|
+ # Get whether it's optional
|
||||||
|
+ if test -z "$2"; then
|
||||||
|
+ ax_python_devel_optional=false
|
||||||
|
+ else
|
||||||
|
+ ax_python_devel_optional=$2
|
||||||
|
+ fi
|
||||||
|
+ ax_python_devel_found=yes
|
||||||
|
+
|
||||||
|
#
|
||||||
|
# Allow the use of a (user set) custom python version
|
||||||
|
#
|
||||||
|
@@ -81,81 +94,147 @@ AC_DEFUN([AX_PYTHON_DEVEL],[
|
||||||
|
|
||||||
|
AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
|
||||||
|
if test -z "$PYTHON"; then
|
||||||
|
- AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
|
||||||
|
+ AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path])
|
||||||
|
+ if ! $ax_python_devel_optional; then
|
||||||
|
+ AC_MSG_ERROR([Giving up, python development not available])
|
||||||
|
+ fi
|
||||||
|
+ ax_python_devel_found=no
|
||||||
|
PYTHON_VERSION=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # Check for a version of Python >= 2.1.0
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
|
||||||
|
- ac_supports_python_ver=`$PYTHON -c "import sys; \
|
||||||
|
+ if test $ax_python_devel_found = yes; then
|
||||||
|
+ #
|
||||||
|
+ # Check for a version of Python >= 2.1.0
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
|
||||||
|
+ ac_supports_python_ver=`$PYTHON -c "import sys; \
|
||||||
|
ver = sys.version.split ()[[0]]; \
|
||||||
|
print (ver >= '2.1.0')"`
|
||||||
|
- if test "$ac_supports_python_ver" != "True"; then
|
||||||
|
+ if test "$ac_supports_python_ver" != "True"; then
|
||||||
|
if test -z "$PYTHON_NOVERSIONCHECK"; then
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
- AC_MSG_FAILURE([
|
||||||
|
+ AC_MSG_WARN([
|
||||||
|
This version of the AC@&t@_PYTHON_DEVEL macro
|
||||||
|
doesn't work properly with versions of Python before
|
||||||
|
2.1.0. You may need to re-run configure, setting the
|
||||||
|
-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
|
||||||
|
+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
|
||||||
|
PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
|
||||||
|
Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
|
||||||
|
to something else than an empty string.
|
||||||
|
])
|
||||||
|
+ if ! $ax_python_devel_optional; then
|
||||||
|
+ AC_MSG_FAILURE([Giving up])
|
||||||
|
+ fi
|
||||||
|
+ ax_python_devel_found=no
|
||||||
|
+ PYTHON_VERSION=""
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([skip at user request])
|
||||||
|
fi
|
||||||
|
- else
|
||||||
|
+ else
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # if the macro parameter ``version'' is set, honour it
|
||||||
|
- #
|
||||||
|
- if test -n "$1"; then
|
||||||
|
+ if test $ax_python_devel_found = yes; then
|
||||||
|
+ #
|
||||||
|
+ # If the macro parameter ``version'' is set, honour it.
|
||||||
|
+ # A Python shim class, VPy, is used to implement correct version comparisons via
|
||||||
|
+ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for
|
||||||
|
+ # Python 2.7.10 (the ".1" being evaluated as less than ".3").
|
||||||
|
+ #
|
||||||
|
+ if test -n "$1"; then
|
||||||
|
AC_MSG_CHECKING([for a version of Python $1])
|
||||||
|
- ac_supports_python_ver=`$PYTHON -c "import sys; \
|
||||||
|
- ver = sys.version.split ()[[0]]; \
|
||||||
|
+ cat << EOF > ax_python_devel_vpy.py
|
||||||
|
+class VPy:
|
||||||
|
+ def vtup(self, s):
|
||||||
|
+ return tuple(map(int, s.strip().replace("rc", ".").split(".")))
|
||||||
|
+ def __init__(self):
|
||||||
|
+ import sys
|
||||||
|
+ self.vpy = tuple(sys.version_info)[[:3]]
|
||||||
|
+ def __eq__(self, s):
|
||||||
|
+ return self.vpy == self.vtup(s)
|
||||||
|
+ def __ne__(self, s):
|
||||||
|
+ return self.vpy != self.vtup(s)
|
||||||
|
+ def __lt__(self, s):
|
||||||
|
+ return self.vpy < self.vtup(s)
|
||||||
|
+ def __gt__(self, s):
|
||||||
|
+ return self.vpy > self.vtup(s)
|
||||||
|
+ def __le__(self, s):
|
||||||
|
+ return self.vpy <= self.vtup(s)
|
||||||
|
+ def __ge__(self, s):
|
||||||
|
+ return self.vpy >= self.vtup(s)
|
||||||
|
+EOF
|
||||||
|
+ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \
|
||||||
|
+ ver = ax_python_devel_vpy.VPy(); \
|
||||||
|
print (ver $1)"`
|
||||||
|
+ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py*
|
||||||
|
if test "$ac_supports_python_ver" = "True"; then
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
+ AC_MSG_RESULT([yes])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
- AC_MSG_ERROR([this package requires Python $1.
|
||||||
|
+ AC_MSG_WARN([this package requires Python $1.
|
||||||
|
If you have it installed, but it isn't the default Python
|
||||||
|
interpreter in your system path, please pass the PYTHON_VERSION
|
||||||
|
variable to configure. See ``configure --help'' for reference.
|
||||||
|
])
|
||||||
|
+ if ! $ax_python_devel_optional; then
|
||||||
|
+ AC_MSG_ERROR([Giving up])
|
||||||
|
+ fi
|
||||||
|
+ ax_python_devel_found=no
|
||||||
|
PYTHON_VERSION=""
|
||||||
|
fi
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # Check if you have distutils, else fail
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING([for the distutils Python package])
|
||||||
|
- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||||
|
- if test -z "$ac_distutils_result"; then
|
||||||
|
+ if test $ax_python_devel_found = yes; then
|
||||||
|
+ #
|
||||||
|
+ # Check if you have distutils, else fail
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING([for the sysconfig Python package])
|
||||||
|
+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
|
||||||
|
+ if test $? -eq 0; then
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
- else
|
||||||
|
+ IMPORT_SYSCONFIG="import sysconfig"
|
||||||
|
+ else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
- AC_MSG_ERROR([cannot import Python module "distutils".
|
||||||
|
+
|
||||||
|
+ AC_MSG_CHECKING([for the distutils Python package])
|
||||||
|
+ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
|
||||||
|
+ if test $? -eq 0; then
|
||||||
|
+ AC_MSG_RESULT([yes])
|
||||||
|
+ IMPORT_SYSCONFIG="from distutils import sysconfig"
|
||||||
|
+ else
|
||||||
|
+ AC_MSG_WARN([cannot import Python module "distutils".
|
||||||
|
Please check your Python installation. The error was:
|
||||||
|
-$ac_distutils_result])
|
||||||
|
- PYTHON_VERSION=""
|
||||||
|
+$ac_sysconfig_result])
|
||||||
|
+ if ! $ax_python_devel_optional; then
|
||||||
|
+ AC_MSG_ERROR([Giving up])
|
||||||
|
+ fi
|
||||||
|
+ ax_python_devel_found=no
|
||||||
|
+ PYTHON_VERSION=""
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # Check for Python include path
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING([for Python include path])
|
||||||
|
- if test -z "$PYTHON_CPPFLAGS"; then
|
||||||
|
- python_path=`$PYTHON -c "import distutils.sysconfig; \
|
||||||
|
- print (distutils.sysconfig.get_python_inc ());"`
|
||||||
|
- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
|
||||||
|
- print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
|
||||||
|
+ if test $ax_python_devel_found = yes; then
|
||||||
|
+ #
|
||||||
|
+ # Check for Python include path
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING([for Python include path])
|
||||||
|
+ if test -z "$PYTHON_CPPFLAGS"; then
|
||||||
|
+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
|
||||||
|
+ # sysconfig module has different functions
|
||||||
|
+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ print (sysconfig.get_path ('include'));"`
|
||||||
|
+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ print (sysconfig.get_path ('platinclude'));"`
|
||||||
|
+ else
|
||||||
|
+ # old distutils way
|
||||||
|
+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ print (sysconfig.get_python_inc ());"`
|
||||||
|
+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ print (sysconfig.get_python_inc (plat_specific=1));"`
|
||||||
|
+ fi
|
||||||
|
if test -n "${python_path}"; then
|
||||||
|
if test "${plat_python_path}" != "${python_path}"; then
|
||||||
|
python_path="-I$python_path -I$plat_python_path"
|
||||||
|
@@ -164,22 +243,22 @@ $ac_distutils_result])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
PYTHON_CPPFLAGS=$python_path
|
||||||
|
- fi
|
||||||
|
- AC_MSG_RESULT([$PYTHON_CPPFLAGS])
|
||||||
|
- AC_SUBST([PYTHON_CPPFLAGS])
|
||||||
|
+ fi
|
||||||
|
+ AC_MSG_RESULT([$PYTHON_CPPFLAGS])
|
||||||
|
+ AC_SUBST([PYTHON_CPPFLAGS])
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # Check for Python library path
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING([for Python library path])
|
||||||
|
- if test -z "$PYTHON_LDFLAGS"; then
|
||||||
|
+ #
|
||||||
|
+ # Check for Python library path
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING([for Python library path])
|
||||||
|
+ if test -z "$PYTHON_LIBS"; then
|
||||||
|
# (makes two attempts to ensure we've got a version number
|
||||||
|
# from the interpreter)
|
||||||
|
ac_python_version=`cat<<EOD | $PYTHON -
|
||||||
|
|
||||||
|
# join all versioning strings, on some systems
|
||||||
|
# major/minor numbers could be in different list elements
|
||||||
|
-from distutils.sysconfig import *
|
||||||
|
+from sysconfig import *
|
||||||
|
e = get_config_var('VERSION')
|
||||||
|
if e is not None:
|
||||||
|
print(e)
|
||||||
|
@@ -190,23 +269,20 @@ EOD`
|
||||||
|
ac_python_version=$PYTHON_VERSION
|
||||||
|
else
|
||||||
|
ac_python_version=`$PYTHON -c "import sys; \
|
||||||
|
- print (sys.version[[:3]])"`
|
||||||
|
+ print ("%d.%d" % sys.version_info[[:2]])"`
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Make the versioning information available to the compiler
|
||||||
|
-
|
||||||
|
- # JW: We don't need it and it interferes with the hack
|
||||||
|
- # to detect multiple Pyhton versions
|
||||||
|
- #AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
|
||||||
|
- # [If available, contains the Python version number currently in use.])
|
||||||
|
+ AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
|
||||||
|
+ [If available, contains the Python version number currently in use.])
|
||||||
|
|
||||||
|
# First, the library directory:
|
||||||
|
ac_python_libdir=`cat<<EOD | $PYTHON -
|
||||||
|
|
||||||
|
# There should be only one
|
||||||
|
-import distutils.sysconfig
|
||||||
|
-e = distutils.sysconfig.get_config_var('LIBDIR')
|
||||||
|
+$IMPORT_SYSCONFIG
|
||||||
|
+e = sysconfig.get_config_var('LIBDIR')
|
||||||
|
if e is not None:
|
||||||
|
print (e)
|
||||||
|
EOD`
|
||||||
|
@@ -214,8 +290,8 @@ EOD`
|
||||||
|
# Now, for the library:
|
||||||
|
ac_python_library=`cat<<EOD | $PYTHON -
|
||||||
|
|
||||||
|
-import distutils.sysconfig
|
||||||
|
-c = distutils.sysconfig.get_config_vars()
|
||||||
|
+$IMPORT_SYSCONFIG
|
||||||
|
+c = sysconfig.get_config_vars()
|
||||||
|
if 'LDVERSION' in c:
|
||||||
|
print ('python'+c[['LDVERSION']])
|
||||||
|
else:
|
||||||
|
@@ -230,94 +306,160 @@ EOD`
|
||||||
|
then
|
||||||
|
# use the official shared library
|
||||||
|
ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
|
||||||
|
- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
|
||||||
|
+ PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library"
|
||||||
|
else
|
||||||
|
# old way: use libpython from python_configdir
|
||||||
|
ac_python_libdir=`$PYTHON -c \
|
||||||
|
- "from distutils.sysconfig import get_python_lib as f; \
|
||||||
|
+ "from sysconfig import get_python_lib as f; \
|
||||||
|
import os; \
|
||||||
|
print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
|
||||||
|
- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
|
||||||
|
+ PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- if test -z "PYTHON_LDFLAGS"; then
|
||||||
|
- AC_MSG_ERROR([
|
||||||
|
+ if test -z "PYTHON_LIBS"; then
|
||||||
|
+ AC_MSG_WARN([
|
||||||
|
Cannot determine location of your Python DSO. Please check it was installed with
|
||||||
|
- dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
|
||||||
|
+ dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
|
||||||
|
])
|
||||||
|
+ if ! $ax_python_devel_optional; then
|
||||||
|
+ AC_MSG_ERROR([Giving up])
|
||||||
|
+ fi
|
||||||
|
+ ax_python_devel_found=no
|
||||||
|
+ PYTHON_VERSION=""
|
||||||
|
fi
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
- AC_MSG_RESULT([$PYTHON_LDFLAGS])
|
||||||
|
- AC_SUBST([PYTHON_LDFLAGS])
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # Check for site packages
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING([for Python site-packages path])
|
||||||
|
- if test -z "$PYTHON_SITE_PKG"; then
|
||||||
|
- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
|
||||||
|
- print (distutils.sysconfig.get_python_lib(0,0));"`
|
||||||
|
- fi
|
||||||
|
- AC_MSG_RESULT([$PYTHON_SITE_PKG])
|
||||||
|
- AC_SUBST([PYTHON_SITE_PKG])
|
||||||
|
+ if test $ax_python_devel_found = yes; then
|
||||||
|
+ AC_MSG_RESULT([$PYTHON_LIBS])
|
||||||
|
+ AC_SUBST([PYTHON_LIBS])
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # libraries which must be linked in when embedding
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING(python extra libraries)
|
||||||
|
- if test -z "$PYTHON_EXTRA_LIBS"; then
|
||||||
|
- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
|
||||||
|
- conf = distutils.sysconfig.get_config_var; \
|
||||||
|
+ #
|
||||||
|
+ # Check for site packages
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING([for Python site-packages path])
|
||||||
|
+ if test -z "$PYTHON_SITE_PKG"; then
|
||||||
|
+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
|
||||||
|
+ PYTHON_SITE_PKG=`$PYTHON -c "
|
||||||
|
+$IMPORT_SYSCONFIG;
|
||||||
|
+if hasattr(sysconfig, 'get_default_scheme'):
|
||||||
|
+ scheme = sysconfig.get_default_scheme()
|
||||||
|
+else:
|
||||||
|
+ scheme = sysconfig._get_default_scheme()
|
||||||
|
+if scheme == 'posix_local':
|
||||||
|
+ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
|
||||||
|
+ scheme = 'posix_prefix'
|
||||||
|
+prefix = '$prefix'
|
||||||
|
+if prefix == 'NONE':
|
||||||
|
+ prefix = '$ac_default_prefix'
|
||||||
|
+sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})
|
||||||
|
+print(sitedir)"`
|
||||||
|
+ else
|
||||||
|
+ # distutils.sysconfig way
|
||||||
|
+ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ print (sysconfig.get_python_lib(0,0));"`
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+ AC_MSG_RESULT([$PYTHON_SITE_PKG])
|
||||||
|
+ AC_SUBST([PYTHON_SITE_PKG])
|
||||||
|
+
|
||||||
|
+ #
|
||||||
|
+ # Check for platform-specific site packages
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING([for Python platform specific site-packages path])
|
||||||
|
+ if test -z "$PYTHON_PLATFORM_SITE_PKG"; then
|
||||||
|
+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
|
||||||
|
+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "
|
||||||
|
+$IMPORT_SYSCONFIG;
|
||||||
|
+if hasattr(sysconfig, 'get_default_scheme'):
|
||||||
|
+ scheme = sysconfig.get_default_scheme()
|
||||||
|
+else:
|
||||||
|
+ scheme = sysconfig._get_default_scheme()
|
||||||
|
+if scheme == 'posix_local':
|
||||||
|
+ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
|
||||||
|
+ scheme = 'posix_prefix'
|
||||||
|
+prefix = '$prefix'
|
||||||
|
+if prefix == 'NONE':
|
||||||
|
+ prefix = '$ac_default_prefix'
|
||||||
|
+sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase': prefix})
|
||||||
|
+print(sitedir)"`
|
||||||
|
+ else
|
||||||
|
+ # distutils.sysconfig way
|
||||||
|
+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ print (sysconfig.get_python_lib(1,0));"`
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+ AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG])
|
||||||
|
+ AC_SUBST([PYTHON_PLATFORM_SITE_PKG])
|
||||||
|
+
|
||||||
|
+ #
|
||||||
|
+ # libraries which must be linked in when embedding
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING(python extra libraries)
|
||||||
|
+ if test -z "$PYTHON_EXTRA_LIBS"; then
|
||||||
|
+ PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ conf = sysconfig.get_config_var; \
|
||||||
|
print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
|
||||||
|
- fi
|
||||||
|
- AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
|
||||||
|
- AC_SUBST(PYTHON_EXTRA_LIBS)
|
||||||
|
+ fi
|
||||||
|
+ AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
|
||||||
|
+ AC_SUBST(PYTHON_EXTRA_LIBS)
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # linking flags needed when embedding
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING(python extra linking flags)
|
||||||
|
- if test -z "$PYTHON_EXTRA_LDFLAGS"; then
|
||||||
|
- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
|
||||||
|
- conf = distutils.sysconfig.get_config_var; \
|
||||||
|
+ #
|
||||||
|
+ # linking flags needed when embedding
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING(python extra linking flags)
|
||||||
|
+ if test -z "$PYTHON_EXTRA_LDFLAGS"; then
|
||||||
|
+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
||||||
|
+ conf = sysconfig.get_config_var; \
|
||||||
|
print (conf('LINKFORSHARED'))"`
|
||||||
|
- fi
|
||||||
|
- AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
|
||||||
|
- AC_SUBST(PYTHON_EXTRA_LDFLAGS)
|
||||||
|
+ # Hack for macos, it sticks this in here.
|
||||||
|
+ PYTHON_EXTRA_LDFLAGS=`echo $PYTHON_EXTRA_LDFLAGS | sed 's/CoreFoundation.*$/CoreFoundation/'`
|
||||||
|
+ fi
|
||||||
|
+ AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
|
||||||
|
+ AC_SUBST(PYTHON_EXTRA_LDFLAGS)
|
||||||
|
|
||||||
|
- #
|
||||||
|
- # final check to see if everything compiles alright
|
||||||
|
- #
|
||||||
|
- AC_MSG_CHECKING([consistency of all components of python development environment])
|
||||||
|
- # save current global flags
|
||||||
|
- ac_save_LIBS="$LIBS"
|
||||||
|
- ac_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
|
||||||
|
- CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
|
||||||
|
- AC_LANG_PUSH([C])
|
||||||
|
- AC_LINK_IFELSE([
|
||||||
|
+ #
|
||||||
|
+ # final check to see if everything compiles alright
|
||||||
|
+ #
|
||||||
|
+ AC_MSG_CHECKING([consistency of all components of python development environment])
|
||||||
|
+ # save current global flags
|
||||||
|
+ ac_save_LIBS="$LIBS"
|
||||||
|
+ ac_save_LDFLAGS="$LDFLAGS"
|
||||||
|
+ ac_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
+ LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS"
|
||||||
|
+ LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
|
||||||
|
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
|
||||||
|
+ AC_LANG_PUSH([C])
|
||||||
|
+ AC_LINK_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([[#include <Python.h>]],
|
||||||
|
[[Py_Initialize();]])
|
||||||
|
],[pythonexists=yes],[pythonexists=no])
|
||||||
|
- AC_LANG_POP([C])
|
||||||
|
- # turn back to default flags
|
||||||
|
- CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
|
- LIBS="$ac_save_LIBS"
|
||||||
|
+ AC_LANG_POP([C])
|
||||||
|
+ # turn back to default flags
|
||||||
|
+ CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
|
+ LIBS="$ac_save_LIBS"
|
||||||
|
+ LDFLAGS="$ac_save_LDFLAGS"
|
||||||
|
|
||||||
|
- AC_MSG_RESULT([$pythonexists])
|
||||||
|
+ AC_MSG_RESULT([$pythonexists])
|
||||||
|
|
||||||
|
- if test ! "x$pythonexists" = "xyes"; then
|
||||||
|
- AC_MSG_WARN([
|
||||||
|
+ if test ! "x$pythonexists" = "xyes"; then
|
||||||
|
+ AC_MSG_WARN([
|
||||||
|
Could not link test program to Python. Maybe the main Python library has been
|
||||||
|
installed in some non-standard library path. If so, pass it to configure,
|
||||||
|
- via the LDFLAGS environment variable.
|
||||||
|
- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
|
||||||
|
+ via the LIBS environment variable.
|
||||||
|
+ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib"
|
||||||
|
============================================================================
|
||||||
|
+ ERROR!
|
||||||
|
You probably have to install the development version of the Python package
|
||||||
|
for your distribution. The exact name of this package varies among them.
|
||||||
|
============================================================================
|
||||||
|
- ])
|
||||||
|
- PYTHON_VERSION=""
|
||||||
|
+ ])
|
||||||
|
+ if ! $ax_python_devel_optional; then
|
||||||
|
+ AC_MSG_ERROR([Giving up])
|
||||||
|
+ fi
|
||||||
|
+ ax_python_devel_found=no
|
||||||
|
+ PYTHON_VERSION=""
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
#
|
||||||
|
From cc1f2b5acb8484edf0a722dcccac435687576a44 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ingo Klöcker <dev@ingo-kloecker.de>
|
||||||
|
Date: Tue, 16 Jan 2024 09:58:33 +0100
|
||||||
|
Subject: build: Re-add still needed custom changes to Python autoconf macro
|
||||||
|
|
||||||
|
* m4/ax_python_devel.m4: Do not emit 'HAVE_PYTHON'.
|
||||||
|
--
|
||||||
|
|
||||||
|
This reapplies the changes made with 5189c08 that are still needed for
|
||||||
|
detecting multiple Python versions.
|
||||||
|
|
||||||
|
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
|
||||||
|
index 1f480db6..8116028a 100644
|
||||||
|
--- a/m4/ax_python_devel.m4
|
||||||
|
+++ b/m4/ax_python_devel.m4
|
||||||
|
@@ -274,8 +274,11 @@ EOD`
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Make the versioning information available to the compiler
|
||||||
|
- AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
|
||||||
|
- [If available, contains the Python version number currently in use.])
|
||||||
|
+
|
||||||
|
+ # JW: We don't need it and it interferes with the hack
|
||||||
|
+ # to detect multiple Python versions
|
||||||
|
+ #AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
|
||||||
|
+ # [If available, contains the Python version number currently in use.])
|
||||||
|
|
||||||
|
# First, the library directory:
|
||||||
|
ac_python_libdir=`cat<<EOD | $PYTHON -
|
||||||
|
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
|
||||||
|
index 68b98e8e..d601b075 100644
|
||||||
|
--- a/lang/python/Makefile.am
|
||||||
|
+++ b/lang/python/Makefile.am
|
||||||
|
@@ -34,40 +34,40 @@ SUBDIRS = . ${tests} examples doc src
|
||||||
|
.PHONY: prepare
|
||||||
|
prepare: copystamp
|
||||||
|
|
||||||
|
-# For VPATH builds we need to copy some files because Python's
|
||||||
|
-# distutils are not VPATH-aware.
|
||||||
|
+# For VPATH builds we need to copy some files because Python
|
||||||
|
+# is not VPATH-aware.
|
||||||
|
copystamp:
|
||||||
|
ln -sf "$(top_srcdir)/src/data.h" .
|
||||||
|
ln -sf "$(top_builddir)/conf/config.h" .
|
||||||
|
ln -sf "$(srcdir)/src" gpg
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
-all-local: copystamp
|
||||||
|
+all-local: wheels
|
||||||
|
+
|
||||||
|
+wheels: copystamp
|
||||||
|
set -e ; for PYTHON in $(PYTHONS); do \
|
||||||
|
CPP="$(CPP)" \
|
||||||
|
CFLAGS="$(CFLAGS)" \
|
||||||
|
srcdir="$(srcdir)" \
|
||||||
|
top_builddir="$(top_builddir)" \
|
||||||
|
- $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \
|
||||||
|
+ $$PYTHON -m pip wheel --no-deps --no-build-isolation --progress-bar off --disable-pip-version-check --wheel-dir ./wheels . ; \
|
||||||
|
done
|
||||||
|
|
||||||
|
-python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp
|
||||||
|
- $(MKDIR_P) python$(PYTHON_VERSION)-gpg-dist
|
||||||
|
+dist/gpg-$(VERSION).tar.gz.asc: copystamp
|
||||||
|
CPP="$(CPP)" \
|
||||||
|
CFLAGS="$(CFLAGS)" \
|
||||||
|
srcdir="$(srcdir)" \
|
||||||
|
top_builddir="$(top_builddir)" \
|
||||||
|
- $(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \
|
||||||
|
- --manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST
|
||||||
|
+ $(PYTHON) -m build --sdist --no-isolation .
|
||||||
|
gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g'
|
||||||
|
- $(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz
|
||||||
|
+ $(gpgbin) --detach-sign --armor dist/gpg-$(VERSION).tar.gz
|
||||||
|
|
||||||
|
.PHONY: sdist
|
||||||
|
-sdist: python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc
|
||||||
|
+sdist: dist/gpg-$(VERSION).tar.gz.asc
|
||||||
|
|
||||||
|
.PHONY: upload
|
||||||
|
-upload: python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz \
|
||||||
|
- python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz.asc
|
||||||
|
+upload: dist/gpg-$(VERSION).tar.gz \
|
||||||
|
+ dist/gpg-$(VERSION).tar.gz.asc
|
||||||
|
twine upload $^
|
||||||
|
|
||||||
|
CLEANFILES = copystamp \
|
||||||
|
@@ -75,34 +75,27 @@ CLEANFILES = copystamp \
|
||||||
|
data.h \
|
||||||
|
gpg
|
||||||
|
|
||||||
|
-# Remove the rest.
|
||||||
|
-#
|
||||||
|
-# 'make distclean' clears the write bit, breaking rm -rf. Fix the
|
||||||
|
-# permissions.
|
||||||
|
clean-local:
|
||||||
|
- rm -rf -- build
|
||||||
|
- for PYTHON in $(PYTHONS); do \
|
||||||
|
- find "$$(basename "$${PYTHON}")-gpg" -type d ! -perm -200 -exec chmod u+w {} ';' ; \
|
||||||
|
- rm -rf -- "$$(basename "$${PYTHON}")-gpg" ; \
|
||||||
|
- done
|
||||||
|
+ rm -rf -- build wheels dist gpg.egg-info
|
||||||
|
|
||||||
|
-install-exec-local:
|
||||||
|
+# Python 2 pip won't install the wheel if the egg-info is present
|
||||||
|
+install-exec-local: wheels
|
||||||
|
+ rm -rf -- gpg.egg-info ; \
|
||||||
|
set -e ; for PYTHON in $(PYTHONS); do \
|
||||||
|
CPP="$(CPP)" \
|
||||||
|
CFLAGS="$(CFLAGS)" \
|
||||||
|
srcdir="$(srcdir)" \
|
||||||
|
top_builddir="$(top_builddir)" \
|
||||||
|
- $$PYTHON setup.py \
|
||||||
|
- build \
|
||||||
|
- --build-base="$$(basename "$${PYTHON}")-gpg" \
|
||||||
|
- install \
|
||||||
|
- --prefix "$(DESTDIR)$(prefix)" \
|
||||||
|
- --verbose ; \
|
||||||
|
+ $$PYTHON -m pip install \
|
||||||
|
+ --no-index --find-links ./wheels \
|
||||||
|
+ --prefix "$(DESTDIR)$(prefix)" \
|
||||||
|
+ --verbose \
|
||||||
|
+ gpg ; \
|
||||||
|
done
|
||||||
|
|
||||||
|
uninstall-local:
|
||||||
|
set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \
|
||||||
|
PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \
|
||||||
|
rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \
|
||||||
|
- "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \
|
||||||
|
+ "$(DESTDIR)$${PLATLIB}"/gpg-$$GV.dist-info ; \
|
||||||
|
done
|
||||||
|
diff --git a/lang/python/doc/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org
|
||||||
|
index b4367872..c40e2249 100644
|
||||||
|
--- a/lang/python/doc/src/gpgme-python-howto.org
|
||||||
|
+++ b/lang/python/doc/src/gpgme-python-howto.org
|
||||||
|
@@ -2945,7 +2945,7 @@ Save that into a file called =keycount.pyx= and then create a
|
||||||
|
=setup.py= file which contains this:
|
||||||
|
|
||||||
|
#+BEGIN_SRC python -i
|
||||||
|
-from distutils.core import setup
|
||||||
|
+from setuptools import setup
|
||||||
|
from Cython.Build import cythonize
|
||||||
|
|
||||||
|
setup(
|
||||||
|
diff --git a/lang/python/examples/howto/advanced/cython/setup.py b/lang/python/examples/howto/advanced/cython/setup.py
|
||||||
|
index f8dce034..849639e2 100644
|
||||||
|
--- a/lang/python/examples/howto/advanced/cython/setup.py
|
||||||
|
+++ b/lang/python/examples/howto/advanced/cython/setup.py
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-from distutils.core import setup
|
||||||
|
+from setuptools import setup
|
||||||
|
from Cython.Build import cythonize
|
||||||
|
|
||||||
|
setup(
|
||||||
|
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
|
||||||
|
index 6f36861d..7b64ba7b 100755
|
||||||
|
--- a/lang/python/setup.py.in
|
||||||
|
+++ b/lang/python/setup.py.in
|
||||||
|
@@ -18,8 +18,12 @@
|
||||||
|
# License along with this library; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
-from distutils.core import setup, Extension
|
||||||
|
-from distutils.command.build import build
|
||||||
|
+try:
|
||||||
|
+ from setuptools import setup, Extension
|
||||||
|
+ from setuptools.command.build import build
|
||||||
|
+except ImportError:
|
||||||
|
+ from distutils.core import setup, Extension
|
||||||
|
+ from distutils.command.build import build
|
||||||
|
|
||||||
|
import glob
|
||||||
|
import os
|
||||||
|
@@ -225,9 +229,8 @@ class BuildExtFirstHack(build):
|
||||||
|
build.run(self)
|
||||||
|
|
||||||
|
|
||||||
|
-py3 = [] if sys.version_info.major < 3 else ['-py3']
|
||||||
|
swig_sources = []
|
||||||
|
-swig_opts = ['-threads'] + py3 + extra_swig_opts
|
||||||
|
+swig_opts = ['-threads'] + extra_swig_opts
|
||||||
|
swige = Extension(
|
||||||
|
'gpg._gpgme',
|
||||||
|
sources=swig_sources,
|
||||||
|
@@ -282,10 +285,12 @@ GPGME and these bindings is available here:
|
||||||
|
'Programming Language :: Python :: 2',
|
||||||
|
'Programming Language :: Python :: 2.7',
|
||||||
|
'Programming Language :: Python :: 3',
|
||||||
|
- 'Programming Language :: Python :: 3.4',
|
||||||
|
- 'Programming Language :: Python :: 3.5',
|
||||||
|
'Programming Language :: Python :: 3.6',
|
||||||
|
- 'Programming Language :: Python :: 3.7',
|
||||||
|
+ 'Programming Language :: Python :: 3.8',
|
||||||
|
+ 'Programming Language :: Python :: 3.9',
|
||||||
|
+ 'Programming Language :: Python :: 3.10',
|
||||||
|
+ 'Programming Language :: Python :: 3.11',
|
||||||
|
+ 'Programming Language :: Python :: 3.12',
|
||||||
|
'Operating System :: POSIX',
|
||||||
|
'Operating System :: Microsoft :: Windows',
|
||||||
|
'Topic :: Communications :: Email',
|
||||||
|
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
|
||||||
|
index 8116028a..e3bedcbb 100644
|
||||||
|
--- a/m4/ax_python_devel.m4
|
||||||
|
+++ b/m4/ax_python_devel.m4
|
||||||
|
@@ -468,4 +468,4 @@ print(sitedir)"`
|
||||||
|
#
|
||||||
|
# all done!
|
||||||
|
#
|
||||||
|
-])
|
||||||
|
+])
|
||||||
|
\ No newline at end of file
|
||||||
|
diff --git a/m4/python.m4 b/m4/python.m4
|
||||||
|
index 4b9483c0..e741511d 100644
|
||||||
|
--- a/m4/python.m4
|
||||||
|
+++ b/m4/python.m4
|
||||||
|
@@ -36,12 +36,12 @@
|
||||||
|
# numbers and dots only.
|
||||||
|
AC_DEFUN([AM_PATH_PYTHON],
|
||||||
|
[
|
||||||
|
- dnl Find a Python interpreter. Python versions prior to 2.7 are not
|
||||||
|
- dnl supported. Python 3.0 through to Python 3.3 are also not supported.
|
||||||
|
+ dnl Find a Python interpreter. Python versions prior to 3.8 are
|
||||||
|
+ dnl end-of-life and not supported, with the exception of 2.7 and 3.6
|
||||||
|
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
|
||||||
|
[python2 python2.7 dnl
|
||||||
|
python dnl
|
||||||
|
- python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
|
||||||
|
+ python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.6
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_ARG_VAR([PYTHON], [the Python interpreter])
|
||||||
@ -1,294 +0,0 @@
|
|||||||
From 4b1395de56816eb982f5811ae8736b6aeb2fc46e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ben Greiner <code@bnavigator.de>
|
|
||||||
Date: Sat, 18 Dec 2021 14:10:54 +0100
|
|
||||||
Subject: [PATCH gpgme 1/2] build: Support Python 3.10 version detection
|
|
||||||
without distutils
|
|
||||||
|
|
||||||
* m4/ax_python_devel.m4: update to serial 23, remove distutils usage
|
|
||||||
|
|
||||||
--
|
|
||||||
This version removes the usage of Python distutils where possible.
|
|
||||||
Python 3.10 deprecated distutils and prints warnings that it will
|
|
||||||
be removed in Python 3.12
|
|
||||||
|
|
||||||
Keep GPGME overrides for finding multiple versions
|
|
||||||
---
|
|
||||||
m4/ax_python_devel.m4 | 123 ++++++++++++++++++++++++++++--------------
|
|
||||||
1 file changed, 84 insertions(+), 39 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
|
|
||||||
index 55f0cfff..f4d20b33 100644
|
|
||||||
--- a/m4/ax_python_devel.m4
|
|
||||||
+++ b/m4/ax_python_devel.m4
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# ===========================================================================
|
|
||||||
-# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
|
|
||||||
+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
|
|
||||||
# ===========================================================================
|
|
||||||
#
|
|
||||||
# SYNOPSIS
|
|
||||||
@@ -12,8 +12,8 @@
|
|
||||||
# in your configure.ac.
|
|
||||||
#
|
|
||||||
# This macro checks for Python and tries to get the include path to
|
|
||||||
-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
|
|
||||||
-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and
|
|
||||||
+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output
|
|
||||||
+# variables. It also exports $(PYTHON_EXTRA_LIBS) and
|
|
||||||
# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
|
|
||||||
#
|
|
||||||
# You can search for some particular version of Python by passing a
|
|
||||||
@@ -67,7 +67,7 @@
|
|
||||||
# modified version of the Autoconf Macro, you may extend this special
|
|
||||||
# exception to the GPL to apply to your modified version as well.
|
|
||||||
|
|
||||||
-#serial 17
|
|
||||||
+#serial 23
|
|
||||||
|
|
||||||
AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
|
|
||||||
AC_DEFUN([AX_PYTHON_DEVEL],[
|
|
||||||
@@ -99,7 +99,7 @@ AC_DEFUN([AX_PYTHON_DEVEL],[
|
|
||||||
This version of the AC@&t@_PYTHON_DEVEL macro
|
|
||||||
doesn't work properly with versions of Python before
|
|
||||||
2.1.0. You may need to re-run configure, setting the
|
|
||||||
-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
|
|
||||||
+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
|
|
||||||
PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
|
|
||||||
Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
|
|
||||||
to something else than an empty string.
|
|
||||||
@@ -135,16 +135,25 @@ variable to configure. See ``configure --help'' for reference.
|
|
||||||
#
|
|
||||||
# Check if you have distutils, else fail
|
|
||||||
#
|
|
||||||
- AC_MSG_CHECKING([for the distutils Python package])
|
|
||||||
- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
|
||||||
- if test -z "$ac_distutils_result"; then
|
|
||||||
+ AC_MSG_CHECKING([for the sysconfig Python package])
|
|
||||||
+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
|
|
||||||
+ if test $? -eq 0; then
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
+ IMPORT_SYSCONFIG="import sysconfig"
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
- AC_MSG_ERROR([cannot import Python module "distutils".
|
|
||||||
+
|
|
||||||
+ AC_MSG_CHECKING([for the distutils Python package])
|
|
||||||
+ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
|
|
||||||
+ if test $? -eq 0; then
|
|
||||||
+ AC_MSG_RESULT([yes])
|
|
||||||
+ IMPORT_SYSCONFIG="from distutils import sysconfig"
|
|
||||||
+ else
|
|
||||||
+ AC_MSG_ERROR([cannot import Python module "distutils".
|
|
||||||
Please check your Python installation. The error was:
|
|
||||||
-$ac_distutils_result])
|
|
||||||
- PYTHON_VERSION=""
|
|
||||||
+$ac_sysconfig_result])
|
|
||||||
+ PYTHON_VERSION=""
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
@@ -152,10 +161,19 @@ $ac_distutils_result])
|
|
||||||
#
|
|
||||||
AC_MSG_CHECKING([for Python include path])
|
|
||||||
if test -z "$PYTHON_CPPFLAGS"; then
|
|
||||||
- python_path=`$PYTHON -c "import distutils.sysconfig; \
|
|
||||||
- print (distutils.sysconfig.get_python_inc ());"`
|
|
||||||
- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
|
|
||||||
- print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
|
|
||||||
+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
|
|
||||||
+ # sysconfig module has different functions
|
|
||||||
+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_path ('include'));"`
|
|
||||||
+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_path ('platinclude'));"`
|
|
||||||
+ else
|
|
||||||
+ # old distutils way
|
|
||||||
+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_python_inc ());"`
|
|
||||||
+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_python_inc (plat_specific=1));"`
|
|
||||||
+ fi
|
|
||||||
if test -n "${python_path}"; then
|
|
||||||
if test "${plat_python_path}" != "${python_path}"; then
|
|
||||||
python_path="-I$python_path -I$plat_python_path"
|
|
||||||
@@ -172,14 +190,14 @@ $ac_distutils_result])
|
|
||||||
# Check for Python library path
|
|
||||||
#
|
|
||||||
AC_MSG_CHECKING([for Python library path])
|
|
||||||
- if test -z "$PYTHON_LDFLAGS"; then
|
|
||||||
+ if test -z "$PYTHON_LIBS"; then
|
|
||||||
# (makes two attempts to ensure we've got a version number
|
|
||||||
# from the interpreter)
|
|
||||||
ac_python_version=`cat<<EOD | $PYTHON -
|
|
||||||
|
|
||||||
# join all versioning strings, on some systems
|
|
||||||
# major/minor numbers could be in different list elements
|
|
||||||
-from distutils.sysconfig import *
|
|
||||||
+from sysconfig import *
|
|
||||||
e = get_config_var('VERSION')
|
|
||||||
if e is not None:
|
|
||||||
print(e)
|
|
||||||
@@ -197,7 +215,7 @@ EOD`
|
|
||||||
# Make the versioning information available to the compiler
|
|
||||||
|
|
||||||
# JW: We don't need it and it interferes with the hack
|
|
||||||
- # to detect multiple Pyhton versions
|
|
||||||
+ # to detect multiple Python versions
|
|
||||||
#AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
|
|
||||||
# [If available, contains the Python version number currently in use.])
|
|
||||||
|
|
||||||
@@ -205,8 +223,8 @@ EOD`
|
|
||||||
ac_python_libdir=`cat<<EOD | $PYTHON -
|
|
||||||
|
|
||||||
# There should be only one
|
|
||||||
-import distutils.sysconfig
|
|
||||||
-e = distutils.sysconfig.get_config_var('LIBDIR')
|
|
||||||
+$IMPORT_SYSCONFIG
|
|
||||||
+e = sysconfig.get_config_var('LIBDIR')
|
|
||||||
if e is not None:
|
|
||||||
print (e)
|
|
||||||
EOD`
|
|
||||||
@@ -214,8 +232,8 @@ EOD`
|
|
||||||
# Now, for the library:
|
|
||||||
ac_python_library=`cat<<EOD | $PYTHON -
|
|
||||||
|
|
||||||
-import distutils.sysconfig
|
|
||||||
-c = distutils.sysconfig.get_config_vars()
|
|
||||||
+$IMPORT_SYSCONFIG
|
|
||||||
+c = sysconfig.get_config_vars()
|
|
||||||
if 'LDVERSION' in c:
|
|
||||||
print ('python'+c[['LDVERSION']])
|
|
||||||
else:
|
|
||||||
@@ -230,44 +248,67 @@ EOD`
|
|
||||||
then
|
|
||||||
# use the official shared library
|
|
||||||
ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
|
|
||||||
- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
|
|
||||||
+ PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library"
|
|
||||||
else
|
|
||||||
# old way: use libpython from python_configdir
|
|
||||||
ac_python_libdir=`$PYTHON -c \
|
|
||||||
- "from distutils.sysconfig import get_python_lib as f; \
|
|
||||||
+ "from sysconfig import get_python_lib as f; \
|
|
||||||
import os; \
|
|
||||||
print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
|
|
||||||
- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
|
|
||||||
+ PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if test -z "PYTHON_LDFLAGS"; then
|
|
||||||
+ if test -z "PYTHON_LIBS"; then
|
|
||||||
AC_MSG_ERROR([
|
|
||||||
Cannot determine location of your Python DSO. Please check it was installed with
|
|
||||||
- dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
|
|
||||||
+ dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
- AC_MSG_RESULT([$PYTHON_LDFLAGS])
|
|
||||||
- AC_SUBST([PYTHON_LDFLAGS])
|
|
||||||
+ AC_MSG_RESULT([$PYTHON_LIBS])
|
|
||||||
+ AC_SUBST([PYTHON_LIBS])
|
|
||||||
|
|
||||||
#
|
|
||||||
# Check for site packages
|
|
||||||
#
|
|
||||||
AC_MSG_CHECKING([for Python site-packages path])
|
|
||||||
if test -z "$PYTHON_SITE_PKG"; then
|
|
||||||
- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
|
|
||||||
- print (distutils.sysconfig.get_python_lib(0,0));"`
|
|
||||||
+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
|
|
||||||
+ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_path('purelib'));"`
|
|
||||||
+ else
|
|
||||||
+ # distutils.sysconfig way
|
|
||||||
+ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_python_lib(0,0));"`
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$PYTHON_SITE_PKG])
|
|
||||||
AC_SUBST([PYTHON_SITE_PKG])
|
|
||||||
|
|
||||||
+ #
|
|
||||||
+ # Check for platform-specific site packages
|
|
||||||
+ #
|
|
||||||
+ AC_MSG_CHECKING([for Python platform specific site-packages path])
|
|
||||||
+ if test -z "$PYTHON_SITE_PKG"; then
|
|
||||||
+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
|
|
||||||
+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_path('platlib'));"`
|
|
||||||
+ else
|
|
||||||
+ # distutils.sysconfig way
|
|
||||||
+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ print (sysconfig.get_python_lib(1,0));"`
|
|
||||||
+ fi
|
|
||||||
+ fi
|
|
||||||
+ AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG])
|
|
||||||
+ AC_SUBST([PYTHON_PLATFORM_SITE_PKG])
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# libraries which must be linked in when embedding
|
|
||||||
#
|
|
||||||
AC_MSG_CHECKING(python extra libraries)
|
|
||||||
if test -z "$PYTHON_EXTRA_LIBS"; then
|
|
||||||
- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
|
|
||||||
- conf = distutils.sysconfig.get_config_var; \
|
|
||||||
+ PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ conf = sysconfig.get_config_var; \
|
|
||||||
print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
|
|
||||||
@@ -278,8 +319,8 @@ EOD`
|
|
||||||
#
|
|
||||||
AC_MSG_CHECKING(python extra linking flags)
|
|
||||||
if test -z "$PYTHON_EXTRA_LDFLAGS"; then
|
|
||||||
- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
|
|
||||||
- conf = distutils.sysconfig.get_config_var; \
|
|
||||||
+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
|
|
||||||
+ conf = sysconfig.get_config_var; \
|
|
||||||
print (conf('LINKFORSHARED'))"`
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
|
|
||||||
@@ -291,8 +332,10 @@ EOD`
|
|
||||||
AC_MSG_CHECKING([consistency of all components of python development environment])
|
|
||||||
# save current global flags
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
+ ac_save_LDFLAGS="$LDFLAGS"
|
|
||||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
|
||||||
- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
|
|
||||||
+ LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS"
|
|
||||||
+ LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
|
|
||||||
AC_LANG_PUSH([C])
|
|
||||||
AC_LINK_IFELSE([
|
|
||||||
@@ -303,15 +346,17 @@ EOD`
|
|
||||||
# turn back to default flags
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
+ LDFLAGS="$ac_save_LDFLAGS"
|
|
||||||
|
|
||||||
AC_MSG_RESULT([$pythonexists])
|
|
||||||
|
|
||||||
if test ! "x$pythonexists" = "xyes"; then
|
|
||||||
+ # gpgme: only warn here, no error, as we are looking for multiple versions
|
|
||||||
AC_MSG_WARN([
|
|
||||||
Could not link test program to Python. Maybe the main Python library has been
|
|
||||||
installed in some non-standard library path. If so, pass it to configure,
|
|
||||||
- via the LDFLAGS environment variable.
|
|
||||||
- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
|
|
||||||
+ via the LIBS environment variable.
|
|
||||||
+ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib"
|
|
||||||
============================================================================
|
|
||||||
You probably have to install the development version of the Python package
|
|
||||||
for your distribution. The exact name of this package varies among them.
|
|
||||||
@@ -323,4 +368,4 @@ EOD`
|
|
||||||
#
|
|
||||||
# all done!
|
|
||||||
#
|
|
||||||
-])
|
|
||||||
+])
|
|
||||||
\ No newline at end of file
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
@ -1,3 +1,47 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Feb 17 11:20:39 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
- Update gpgme-D545-obsolete-distutils.patch with upstream's
|
||||||
|
changes (but use pip instead of python-build for wheel building)
|
||||||
|
- Change from in-place build to out-of-place build in order to
|
||||||
|
reflect upstream's build setup (See D545)
|
||||||
|
- Don't replace distutils in 15.X
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jan 6 12:43:19 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
- Python 3.12 has dropped distutils
|
||||||
|
* Build require python-setuptools instead
|
||||||
|
* Drop old gpgme-D545-python310.patch
|
||||||
|
* Replace with gpgme-D545-obsolete-distutils.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 5 19:03:33 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Make libgpgmepp-devel provide its CMake target file
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 29 21:13:20 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
|
||||||
|
|
||||||
|
- Update to 1.23.2:
|
||||||
|
* Preserve more specific existing failure code. [T6575]
|
||||||
|
* qt: Start dirmngr with gpgconf to avoid multiple instances. [T6833]
|
||||||
|
* qt: On Windows, use UTF-8 when logging the error text. [T5960]
|
||||||
|
* qt: Remove left-over partial files more persistently. [T6584]
|
||||||
|
* qt: Use a temporary file name when creating signed or encrypted
|
||||||
|
archives. [T6721]
|
||||||
|
* qt: Build Qt 6 bindings with -fPIC if requested or Qt 6 was built
|
||||||
|
with this flag. [T6781]
|
||||||
|
* Notes:
|
||||||
|
- qt: DefaultKeyGenerationJob DEPRECATED.
|
||||||
|
* Release-info: https://dev.gnupg.org/T6782
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 30 21:58:54 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||||
|
|
||||||
|
- update to 1.23.1:
|
||||||
|
* fixes for other platforms
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 25 10:56:48 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
|
Wed Oct 25 10:56:48 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
|
||||||
|
|
||||||
|
|||||||
43
gpgme.spec
43
gpgme.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file
|
# spec file for package gpgme
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -32,8 +32,16 @@
|
|||||||
%bcond_with python3
|
%bcond_with python3
|
||||||
%bcond_without qt6
|
%bcond_without qt6
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{suse_version} >= 1550 || "%{?pythons}" == "python311"
|
||||||
|
%bcond_without replace_distutils
|
||||||
|
%else
|
||||||
|
# Keep deprecated distutils for Python 3.6 on 15.x
|
||||||
|
%bcond_with replace_distutils
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: gpgme%{psuffix}
|
Name: gpgme%{psuffix}
|
||||||
Version: 1.23.0
|
Version: 1.23.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Programmatic library interface to GnuPG
|
Summary: Programmatic library interface to GnuPG
|
||||||
License: GPL-3.0-or-later AND LGPL-2.1-or-later
|
License: GPL-3.0-or-later AND LGPL-2.1-or-later
|
||||||
@ -46,8 +54,8 @@ Source2: baselibs.conf
|
|||||||
Source3: https://gnupg.org/signature_key.asc#/gpgme.keyring
|
Source3: https://gnupg.org/signature_key.asc#/gpgme.keyring
|
||||||
# used to have a fixed timestamp
|
# used to have a fixed timestamp
|
||||||
Source99: gpgme.changes
|
Source99: gpgme.changes
|
||||||
# PATCH-FIX-UPSTREAM support python 3.10 -- https://dev.gnupg.org/D545
|
# PATCH-FIX-UPSTREAM obsolete distutlils -- https://dev.gnupg.org/D545
|
||||||
Patch1: gpgme-D545-python310.patch
|
Patch1: gpgme-D545-obsolete-distutils.patch
|
||||||
# PATCH-FIX-OPENSUSE gpgme-suse-nobetasuffix.patch code@bnavigator.de -- remove "-unknown" betasuffix boo#1205197
|
# PATCH-FIX-OPENSUSE gpgme-suse-nobetasuffix.patch code@bnavigator.de -- remove "-unknown" betasuffix boo#1205197
|
||||||
Patch2: gpgme-suse-nobetasuffix.patch
|
Patch2: gpgme-suse-nobetasuffix.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -61,6 +69,11 @@ BuildRequires: swig
|
|||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
BuildRequires: %{python_module devel}
|
BuildRequires: %{python_module devel}
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
|
%if %{with replace_distutils}
|
||||||
|
BuildRequires: %{python_module pip}
|
||||||
|
BuildRequires: %{python_module setuptools >= 62.4}
|
||||||
|
BuildRequires: %{python_module wheel}
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if %{with qt}
|
%if %{with qt}
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
@ -142,6 +155,8 @@ Requires: glibc-devel
|
|||||||
Requires: libgpg-error-devel
|
Requires: libgpg-error-devel
|
||||||
Requires: libgpgme-devel = %{version}
|
Requires: libgpgme-devel = %{version}
|
||||||
Requires: libgpgmepp6 = %{version}
|
Requires: libgpgmepp6 = %{version}
|
||||||
|
# This avoids requiring CMake at build time for the default flavor
|
||||||
|
Provides: cmake(Gpgmepp) = %{version}
|
||||||
%requires_ge libassuan-devel
|
%requires_ge libassuan-devel
|
||||||
|
|
||||||
%description -n libgpgmepp-devel
|
%description -n libgpgmepp-devel
|
||||||
@ -240,7 +255,15 @@ management.
|
|||||||
This package contains the bindings to use the library in Qt 6 C++ applications.
|
This package contains the bindings to use the library in Qt 6 C++ applications.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n gpgme-%{version}
|
%autosetup -N -n gpgme-%{version}
|
||||||
|
%if %{with replace_distutils}
|
||||||
|
%patch -p1 -P1 -P2
|
||||||
|
%endif
|
||||||
|
%if 0%{suse_version} > 1500
|
||||||
|
# Note: rpm in 15.x does not know about the autopatch -m flag.
|
||||||
|
# Need to apply every additional patch explicitly, if any.
|
||||||
|
%autopatch -p1 -m3
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
@ -263,6 +286,9 @@ export CXX=g++-12 CC=gcc-12 CPP=cpp-12
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%define _configure ../configure
|
||||||
|
mkdir build
|
||||||
|
pushd build
|
||||||
%configure \
|
%configure \
|
||||||
--disable-silent-rules \
|
--disable-silent-rules \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
@ -270,8 +296,10 @@ export CXX=g++-12 CC=gcc-12 CPP=cpp-12
|
|||||||
--enable-languages="${languages}" \
|
--enable-languages="${languages}" \
|
||||||
--enable-build-timestamp="${build_timestamp}"
|
--enable-build-timestamp="${build_timestamp}"
|
||||||
%make_build
|
%make_build
|
||||||
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
pushd build
|
||||||
%make_install
|
%make_install
|
||||||
find %{buildroot} -type f -name "*.la" -delete -print
|
find %{buildroot} -type f -name "*.la" -delete -print
|
||||||
chmod -x %{buildroot}%{_libdir}/cmake/Gpgmepp/*.cmake
|
chmod -x %{buildroot}%{_libdir}/cmake/Gpgmepp/*.cmake
|
||||||
@ -285,6 +313,7 @@ rm -r %{buildroot}%{_libdir}/cmake/Gpgmepp
|
|||||||
rm -r %{buildroot}%{_libdir}/libgpgme*
|
rm -r %{buildroot}%{_libdir}/libgpgme*
|
||||||
rm -r %{buildroot}%{_libdir}/pkgconfig/gpgme*
|
rm -r %{buildroot}%{_libdir}/pkgconfig/gpgme*
|
||||||
%endif
|
%endif
|
||||||
|
popd
|
||||||
|
|
||||||
%check
|
%check
|
||||||
GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $(find -name mygpgme.log -type f)
|
GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $(find -name mygpgme.log -type f)
|
||||||
@ -342,7 +371,7 @@ GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $
|
|||||||
%files %{python_files gpg}
|
%files %{python_files gpg}
|
||||||
%license COPYING COPYING.LESSER LICENSES
|
%license COPYING COPYING.LESSER LICENSES
|
||||||
%{python_sitearch}/gpg
|
%{python_sitearch}/gpg
|
||||||
%{python_sitearch}/gpg-%{version}-py%{python_version}.egg-info
|
%{python_sitearch}/gpg-%{version}*-info
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with qt}
|
%if %{with qt}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user