gpgme/trunk/python310.patch

   1 diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure
   2 --- gpgme-1.16.0.orig/configure 2021-06-24 20:10:50.000000000 +0300
   3 +++ gpgme-1.16.0/configure      2021-12-01 00:12:24.383952330 +0200
   4 @@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT
   5  if ${am_cv_python_version+:} false; then :
   6    $as_echo_n "(cached) " >&6
   7  else
   8 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
   9 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
  10  fi
  11  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
  12  $as_echo "$am_cv_python_version" >&6; }
  13 @@ -19666,7 +19666,7 @@ else:
  14  # <https://github.com/pypa/virtualenv/issues/118>
  15  try:
  16      from platform import python_implementation
  17 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
  18 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
  19          can_use_sysconfig = 0
  20  except ImportError:
  21      pass"
  22 @@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure
  23         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
  24  $as_echo_n "checking for the distutils Python package... " >&6; }
  25         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
  26 -       if test -z "$ac_distutils_result"; then
  27 +       if test $? -eq 0; then
  28                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  29  $as_echo "yes" >&6; }
  30         else
  31 @@ -19933,7 +19933,7 @@ EOD`
  32                                 ac_python_version=$PYTHON_VERSION
  33                         else
  34                                 ac_python_version=`$PYTHON -c "import sys; \
  35 -                                       print (sys.version[:3])"`
  36 +                                       print (sys.version[:4])"`
  37                         fi
  38                 fi
  39
  40 @@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT
  41  if ${am_cv_python_version+:} false; then :
  42    $as_echo_n "(cached) " >&6
  43  else
  44 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
  45 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
  46  fi
  47  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
  48  $as_echo "$am_cv_python_version" >&6; }
  49 @@ -20296,7 +20296,7 @@ else:
  50  # <https://github.com/pypa/virtualenv/issues/118>
  51  try:
  52      from platform import python_implementation
  53 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
  54 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
  55          can_use_sysconfig = 0
  56  except ImportError:
  57      pass"
  58 @@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure
  59         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
  60  $as_echo_n "checking for the distutils Python package... " >&6; }
  61         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
  62 -       if test -z "$ac_distutils_result"; then
  63 +       if test $? -eq 0; then
  64                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  65  $as_echo "yes" >&6; }
  66         else
  67 @@ -20563,7 +20563,7 @@ EOD`
  68                                 ac_python_version=$PYTHON_VERSION
  69                         else
  70                                 ac_python_version=`$PYTHON -c "import sys; \
  71 -                                       print (sys.version[:3])"`
  72 +                                       print (sys.version[:4])"`
  73                         fi
  74                 fi
  75
  76 @@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT
  77  if ${am_cv_python_version+:} false; then :
  78    $as_echo_n "(cached) " >&6
  79  else
  80 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
  81 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
  82  fi
  83  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
  84  $as_echo "$am_cv_python_version" >&6; }
  85 @@ -20926,7 +20926,7 @@ else:
  86  # <https://github.com/pypa/virtualenv/issues/118>
  87  try:
  88      from platform import python_implementation
  89 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
  90 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
  91          can_use_sysconfig = 0
  92  except ImportError:
  93      pass"
  94 @@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure
  95         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
  96  $as_echo_n "checking for the distutils Python package... " >&6; }
  97         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
  98 -       if test -z "$ac_distutils_result"; then
  99 +       if test $? -eq 0; then
 100                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 101  $as_echo "yes" >&6; }
 102         else
 103 @@ -21193,7 +21193,7 @@ EOD`
 104                                 ac_python_version=$PYTHON_VERSION
 105                         else
 106                                 ac_python_version=`$PYTHON -c "import sys; \
 107 -                                       print (sys.version[:3])"`
 108 +                                       print (sys.version[:4])"`
 109                         fi
 110                 fi
 111
 112 @@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT
 113  if ${am_cv_python_version+:} false; then :
 114    $as_echo_n "(cached) " >&6
 115  else
 116 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
 117 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
 118  fi
 119  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
 120  $as_echo "$am_cv_python_version" >&6; }
 121 @@ -21556,7 +21556,7 @@ else:
 122  # <https://github.com/pypa/virtualenv/issues/118>
 123  try:
 124      from platform import python_implementation
 125 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
 126 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
 127          can_use_sysconfig = 0
 128  except ImportError:
 129      pass"
 130 @@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure
 131         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
 132  $as_echo_n "checking for the distutils Python package... " >&6; }
 133         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 134 -       if test -z "$ac_distutils_result"; then
 135 +       if test $? -eq 0; then
 136                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 137  $as_echo "yes" >&6; }
 138         else
 139 @@ -21823,7 +21823,7 @@ EOD`
 140                                 ac_python_version=$PYTHON_VERSION
 141                         else
 142                                 ac_python_version=`$PYTHON -c "import sys; \
 143 -                                       print (sys.version[:3])"`
 144 +                                       print (sys.version[:4])"`
 145                         fi
 146                 fi
 147
 148 @@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT
 149  if ${am_cv_python_version+:} false; then :
 150    $as_echo_n "(cached) " >&6
 151  else
 152 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
 153 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
 154  fi
 155  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
 156  $as_echo "$am_cv_python_version" >&6; }
 157 @@ -22186,7 +22186,7 @@ else:
 158  # <https://github.com/pypa/virtualenv/issues/118>
 159  try:
 160      from platform import python_implementation
 161 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
 162 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
 163          can_use_sysconfig = 0
 164  except ImportError:
 165      pass"
 166 @@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure
 167         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
 168  $as_echo_n "checking for the distutils Python package... " >&6; }
 169         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 170 -       if test -z "$ac_distutils_result"; then
 171 +       if test $? -eq 0; then
 172                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 173  $as_echo "yes" >&6; }
 174         else
 175 @@ -22453,7 +22453,7 @@ EOD`
 176                                 ac_python_version=$PYTHON_VERSION
 177                         else
 178                                 ac_python_version=`$PYTHON -c "import sys; \
 179 -                                       print (sys.version[:3])"`
 180 +                                       print (sys.version[:4])"`
 181                         fi
 182                 fi
 183
 184 @@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT
 185  if ${am_cv_python_version+:} false; then :
 186    $as_echo_n "(cached) " >&6
 187  else
 188 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
 189 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
 190  fi
 191  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
 192  $as_echo "$am_cv_python_version" >&6; }
 193 @@ -22816,7 +22816,7 @@ else:
 194  # <https://github.com/pypa/virtualenv/issues/118>
 195  try:
 196      from platform import python_implementation
 197 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
 198 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
 199          can_use_sysconfig = 0
 200  except ImportError:
 201      pass"
 202 @@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure
 203         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
 204  $as_echo_n "checking for the distutils Python package... " >&6; }
 205         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 206 -       if test -z "$ac_distutils_result"; then
 207 +       if test $? -eq 0; then
 208                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 209  $as_echo "yes" >&6; }
 210         else
 211 @@ -23083,7 +23083,7 @@ EOD`
 212                                 ac_python_version=$PYTHON_VERSION
 213                         else
 214                                 ac_python_version=`$PYTHON -c "import sys; \
 215 -                                       print (sys.version[:3])"`
 216 +                                       print (sys.version[:4])"`
 217                         fi
 218                 fi
 219
 220 @@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING:
 221
 222          if test -n "$PYTHON"; then
 223        # If the user set $PYTHON, use it and don't search something else.
 224 -      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5
 225 -$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; }
 226 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
 227 +$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
 228        prog="import sys
 229  # split strings by '.' and convert to numeric.  Append some zeros
 230  # because we need at least 4 digits for the hex conversion.
 231  # map returns an iterator in Python 3.0 and a list in 2.x
 232 -minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
 233 +minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
 234  minverhex = 0
 235  # xrange is not present in Python 3.0 and range returns an iterator
 236  for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
 237 @@ -23318,19 +23318,19 @@ fi
 238      else
 239        # Otherwise, try each interpreter until we find one that satisfies
 240        # VERSION.
 241 -      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5
 242 -$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; }
 243 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
 244 +$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
 245  if ${am_cv_pathless_PYTHON+:} false; then :
 246    $as_echo_n "(cached) " >&6
 247  else
 248
 249 -       for am_cv_pathless_PYTHON           in python3.9 none; do
 250 +       for am_cv_pathless_PYTHON           in python3.10 none; do
 251           test "$am_cv_pathless_PYTHON" = none && break
 252           prog="import sys
 253  # split strings by '.' and convert to numeric.  Append some zeros
 254  # because we need at least 4 digits for the hex conversion.
 255  # map returns an iterator in Python 3.0 and a list in 2.x
 256 -minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
 257 +minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
 258  minverhex = 0
 259  # xrange is not present in Python 3.0 and range returns an iterator
 260  for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
 261 @@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT
 262  if ${am_cv_python_version+:} false; then :
 263    $as_echo_n "(cached) " >&6
 264  else
 265 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
 266 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
 267  fi
 268  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
 269  $as_echo "$am_cv_python_version" >&6; }
 270 @@ -23446,7 +23446,7 @@ else:
 271  # <https://github.com/pypa/virtualenv/issues/118>
 272  try:
 273      from platform import python_implementation
 274 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
 275 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
 276          can_use_sysconfig = 0
 277  except ImportError:
 278      pass"
 279 @@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure
 280         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
 281  $as_echo_n "checking for the distutils Python package... " >&6; }
 282         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 283 -       if test -z "$ac_distutils_result"; then
 284 +       if test $? -eq 0; then
 285                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 286  $as_echo "yes" >&6; }
 287         else
 288 @@ -23713,7 +23713,7 @@ EOD`
 289                                 ac_python_version=$PYTHON_VERSION
 290                         else
 291                                 ac_python_version=`$PYTHON -c "import sys; \
 292 -                                       print (sys.version[:3])"`
 293 +                                       print (sys.version[:4])"`
 294                         fi
 295                 fi
 296
 297 @@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT
 298  if ${am_cv_python_version+:} false; then :
 299    $as_echo_n "(cached) " >&6
 300  else
 301 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
 302 +  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
 303  fi
 304  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
 305  $as_echo "$am_cv_python_version" >&6; }
 306 @@ -24076,7 +24076,7 @@ else:
 307  # <https://github.com/pypa/virtualenv/issues/118>
 308  try:
 309      from platform import python_implementation
 310 -    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
 311 +    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
 312          can_use_sysconfig = 0
 313  except ImportError:
 314      pass"
 315 @@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure
 316         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
 317  $as_echo_n "checking for the distutils Python package... " >&6; }
 318         ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 319 -       if test -z "$ac_distutils_result"; then
 320 +       if test $? -eq 0; then
 321                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 322  $as_echo "yes" >&6; }
 323         else
 324 @@ -24343,7 +24343,7 @@ EOD`
 325                                 ac_python_version=$PYTHON_VERSION
 326                         else
 327                                 ac_python_version=`$PYTHON -c "import sys; \
 328 -                                       print (sys.version[:3])"`
 329 +                                       print (sys.version[:4])"`
 330                         fi
 331                 fi
 332