9757046077
* python3: Update to 3.6.1
The patches starting with 16 are new to fix the build.
Some no longer relevant patches were dropped, the rest is just refreshed.
* Bump pkgrel of all packages containing Python 3 bytecode/extensions.
The package list was generated using:
pkgfile.exe -R mingw64 -r "cpython.*\\.(py[cod]|dll)"
* lensfun: Add cmake to makedepends
* numpy: Don't hardcode the Python version
* blender: rebuild for new Python
* boost: Don't hardcode Python versions; rebuild
* pillow: Don't hardcode Python version; rebuild
* python-dateutil: Don't hardcode Python versions
* sip: Don't hardcode Python versions
* pyqt4: Don't hardcode Python versions; rebuild
* pyqt5: Don't hardcode Python versions; rebuild
* opencv: Update Python3 version in patch
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
--- Python-3.6.1/Python/pytime.c.orig 2017-03-21 07:32:38.000000000 +0100
|
|
+++ Python-3.6.1/Python/pytime.c 2017-06-13 13:48:14.662315300 +0200
|
|
@@ -536,7 +536,7 @@
|
|
/* 11,644,473,600,000,000,000: number of nanoseconds between
|
|
the 1st january 1601 and the 1st january 1970 (369 years + 89 leap
|
|
days). */
|
|
- *tp = large.QuadPart * 100 - 11644473600000000000;
|
|
+ *tp = large.QuadPart * 100 - 11644473600000000000ULL;
|
|
if (info) {
|
|
DWORD timeAdjustment, timeIncrement;
|
|
BOOL isTimeAdjustmentDisabled, ok;
|
|
@@ -630,6 +630,35 @@
|
|
return pygettimeofday(t, info, 1);
|
|
}
|
|
|
|
+#if defined(MS_WINDOWS) && _WIN32_WINNT < 0x0600
|
|
+/* GetTickCount64() is not available on XP. */
|
|
+ULONGLONG GetTickCount64 ()
|
|
+{
|
|
+ static ULONGLONG (CALLBACK *Py_GetTickCount64)() = (ULONGLONG (*)(void))-1;
|
|
+ static DWORD last_ticks = 0;
|
|
+ static DWORD n_overflow = 0;
|
|
+ DWORD ticks = 0;
|
|
+ HINSTANCE hKernel32;
|
|
+
|
|
+ if (Py_GetTickCount64 == (void*)-1)
|
|
+ {
|
|
+ hKernel32 = GetModuleHandleW(L"KERNEL32");
|
|
+ Py_GetTickCount64 = *(ULONGLONG (*)(void))(GetProcAddress(hKernel32,
|
|
+ "GetTickCount64"));
|
|
+ }
|
|
+ if (Py_GetTickCount64 != (void*) NULL)
|
|
+ {
|
|
+ return Py_GetTickCount64();
|
|
+ }
|
|
+
|
|
+ ticks = GetTickCount();
|
|
+ if (ticks < last_ticks)
|
|
+ n_overflow++;
|
|
+ last_ticks = ticks;
|
|
+ return ((ULONGLONG)n_overflow << 32LL) + (ULONGLONG)GetTickCount();
|
|
+}
|
|
+#endif
|
|
+
|
|
static int
|
|
pymonotonic(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
|
|
{
|