From 1fafffa7a7ea45c8c31f8f59c3c31f6a2eb1b81a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 27 Oct 2020 20:08:15 +0100 Subject: [PATCH] python3: bump versions don't remove __pycache__ directories --- ...-3.7.7.patchset => python3-3.7.9.patchset} | 44 +++++++++---------- ...-3.8.3.patchset => python3-3.8.6.patchset} | 34 +++++++------- ....7.patchset => python3_x86-3.7.9.patchset} | 0 ....3.patchset => python3_x86-3.8.6.patchset} | 0 ...hon3-3.7.7.recipe => python3-3.7.9.recipe} | 7 +-- ...n38-3.8.3.recipe => python38-3.8.6.recipe} | 5 +-- dev-lang/python/python39-3.9.0.recipe | 5 +-- 7 files changed, 43 insertions(+), 52 deletions(-) rename dev-lang/python/patches/{python3-3.7.7.patchset => python3-3.7.9.patchset} (97%) rename dev-lang/python/patches/{python3-3.8.3.patchset => python3-3.8.6.patchset} (97%) rename dev-lang/python/patches/{python3_x86-3.7.7.patchset => python3_x86-3.7.9.patchset} (100%) rename dev-lang/python/patches/{python3_x86-3.8.3.patchset => python3_x86-3.8.6.patchset} (100%) rename dev-lang/python/{python3-3.7.7.recipe => python3-3.7.9.recipe} (96%) rename dev-lang/python/{python38-3.8.3.recipe => python38-3.8.6.recipe} (96%) diff --git a/dev-lang/python/patches/python3-3.7.7.patchset b/dev-lang/python/patches/python3-3.7.9.patchset similarity index 97% rename from dev-lang/python/patches/python3-3.7.7.patchset rename to dev-lang/python/patches/python3-3.7.9.patchset index 10873e0a3..906a63df2 100644 --- a/dev-lang/python/patches/python3-3.7.7.patchset +++ b/dev-lang/python/patches/python3-3.7.9.patchset @@ -1,4 +1,4 @@ -From b0d3ce92f39e3b6e3fa40dfb5f44e43922e9b8e7 Mon Sep 17 00:00:00 2001 +From 5c4b11a81a6defd12a01f2123e4fcb783d28c2fe Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 10 Apr 2014 16:03:33 +0000 Subject: initial Haiku patch @@ -419,7 +419,7 @@ index 4363c0c..40994b0 100755 def main(): global filedict diff --git a/configure.ac b/configure.ac -index f9dabd8..f55f9f2 100644 +index f1cc8e9..b0cca04 100644 --- a/configure.ac +++ b/configure.ac @@ -1151,6 +1151,16 @@ if test $enable_shared = "yes"; then @@ -447,7 +447,7 @@ index f9dabd8..f55f9f2 100644 CYGWIN*) LN="ln -s";; *) LN=ln;; esac -@@ -2611,7 +2622,7 @@ then +@@ -2614,7 +2625,7 @@ then BLDSHARED="$LDSHARED" fi ;; @@ -456,7 +456,7 @@ index f9dabd8..f55f9f2 100644 LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; FreeBSD*) -@@ -2678,7 +2689,7 @@ then +@@ -2681,7 +2692,7 @@ then else CCSHARED="+z"; fi;; Linux-android*) ;; @@ -465,7 +465,7 @@ index f9dabd8..f55f9f2 100644 FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" -@@ -2704,7 +2715,7 @@ then +@@ -2707,7 +2718,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; @@ -474,7 +474,7 @@ index f9dabd8..f55f9f2 100644 # -u libsys_s pulls in all symbols in libsys Darwin/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation" -@@ -2949,6 +2960,12 @@ LDFLAGS="-fsanitize=undefined $LDFLAGS" +@@ -2952,6 +2963,12 @@ LDFLAGS="-fsanitize=undefined $LDFLAGS" AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4 AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets @@ -487,7 +487,7 @@ index f9dabd8..f55f9f2 100644 AC_MSG_CHECKING(for --with-libs) AC_ARG_WITH(libs, AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs]), -@@ -4311,6 +4328,7 @@ AC_CHECK_FUNC(__fpu_control, +@@ -4314,6 +4331,7 @@ AC_CHECK_FUNC(__fpu_control, AC_SUBST(LIBM) case $ac_sys_system in Darwin) ;; @@ -496,7 +496,7 @@ index f9dabd8..f55f9f2 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index 88cff61..7e0dc0a 100644 +index bf90600..397acca 100644 --- a/setup.py +++ b/setup.py @@ -664,6 +664,11 @@ class PyBuildExt(build_ext): @@ -572,10 +572,10 @@ index 88cff61..7e0dc0a 100644 libs = [] -- -2.24.0 +2.28.0 -From 9d47e87845b2b4fab7a7da9e7445d7fd903a0c1c Mon Sep 17 00:00:00 2001 +From 3b0375cba65c406f43a1669837c737920b233d73 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 16 Apr 2017 10:05:42 +0200 Subject: fix for negative errnos @@ -610,10 +610,10 @@ index 3cf0683..adf3608 100644 *--cur = Py_hexdigits[saved_errno % 16]; saved_errno /= 16; -- -2.24.0 +2.28.0 -From 69921230f366d1b79c3a996c7d0ef081dce46af8 Mon Sep 17 00:00:00 2001 +From a261fb454a9c843fea23936d23eca4e4e95ff694 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 24 May 2017 11:09:43 +0000 Subject: Implement CTypes's find_library for Haiku @@ -694,20 +694,20 @@ index 97973bc..b2e4095 100644 print(cdll.LoadLibrary("libm.so")) print(cdll.LoadLibrary("libcrypt.so")) -- -2.24.0 +2.28.0 -From bfd2ce4901db4c6188a531d30bf7b8b053bd1dec Mon Sep 17 00:00:00 2001 +From ff662b9d4cb680ec9f960565d6d6ccb446433b5b Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Mon, 23 Sep 2019 09:14:58 +0200 Subject: webbrowser: Support for default browsers on Haiku diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py -index e052e51..d44cff1 100755 +index b04ec7b..c59cdee 100755 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py -@@ -522,6 +522,11 @@ def register_standard_browsers(): +@@ -538,6 +538,11 @@ def register_standard_browsers(): "netscape", "opera", iexplore): if shutil.which(browser): register(browser, None, BackgroundBrowser(browser)) @@ -718,12 +718,12 @@ index e052e51..d44cff1 100755 + register("webpositive", None, BackgroundBrowser("WebPositive")) else: # Prefer X browsers if present - if os.environ.get("DISPLAY"): + if os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"): -- -2.24.0 +2.28.0 -From 4b9241c955561cbfc8bd8d9b5afdeaeadc4c90d2 Mon Sep 17 00:00:00 2001 +From 79a8f791905b604c31b52a8e005dacec09529228 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 30 Nov 2019 23:26:57 +0100 Subject: don't reinit locks on fork. @@ -743,10 +743,10 @@ index b596f80..431f750 100644 pass # no-op when os.register_at_fork does not exist. else: -- -2.24.0 +2.28.0 -From cc6f1ed962c8dd695683f6cab7a90a10e5d41976 Mon Sep 17 00:00:00 2001 +From 8c7414695d2ff888f56b3027425476acdf0ec68f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 15 May 2020 15:20:57 +0200 Subject: handle errors returned by internal_connect() @@ -776,5 +776,5 @@ index 3173b3b..88b66ed 100644 return PyLong_FromLong((long) res); -- -2.24.0 +2.28.0 diff --git a/dev-lang/python/patches/python3-3.8.3.patchset b/dev-lang/python/patches/python3-3.8.6.patchset similarity index 97% rename from dev-lang/python/patches/python3-3.8.3.patchset rename to dev-lang/python/patches/python3-3.8.6.patchset index 11928023e..db47c03dc 100644 --- a/dev-lang/python/patches/python3-3.8.3.patchset +++ b/dev-lang/python/patches/python3-3.8.6.patchset @@ -1,4 +1,4 @@ -From 8c20f44969e26aae573e7ea3cd01d6481496096b Mon Sep 17 00:00:00 2001 +From 763544d5dc0aae75b06d990a01e1a3a3d680d58f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 10 Apr 2014 16:03:33 +0000 Subject: initial Haiku patch @@ -149,7 +149,7 @@ index 0000000..4372ee2 +set -v +eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $HEADERS/posix/netinet/in.h diff --git a/Lib/site.py b/Lib/site.py -index a065ab0..d7ecc28 100644 +index 9fa21cc..14c0811 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -259,6 +259,14 @@ def _getuserbase(): @@ -419,7 +419,7 @@ index ea37c04..d6dc9e9 100755 def main(): global filedict diff --git a/configure.ac b/configure.ac -index d8de9d4..4c709e1 100644 +index 18a0446..fdb0de6 100644 --- a/configure.ac +++ b/configure.ac @@ -1135,6 +1135,16 @@ if test $enable_shared = "yes"; then @@ -496,7 +496,7 @@ index d8de9d4..4c709e1 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index b168ed4..5f94a60 100644 +index 6340669..358da16 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ CYGWIN = (HOST_PLATFORM == 'cygwin') @@ -581,10 +581,10 @@ index b168ed4..5f94a60 100644 return -- -2.24.0 +2.28.0 -From 8642c35ff9d15c673485681da23a0838ff0158ac Mon Sep 17 00:00:00 2001 +From 703ef01c9f29aeec34184a6bf6d24cb78019a957 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 16 Apr 2017 10:05:42 +0200 Subject: fix for negative errnos @@ -619,10 +619,10 @@ index e693e53..30ac104 100644 *--cur = Py_hexdigits[saved_errno % 16]; saved_errno /= 16; -- -2.24.0 +2.28.0 -From 763eb6f482bb5161775f997766fc156939071a02 Mon Sep 17 00:00:00 2001 +From 12d2f2cf80c6c4361d122c24d4a99505d81234b8 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 24 May 2017 11:09:43 +0000 Subject: Implement CTypes's find_library for Haiku @@ -703,17 +703,17 @@ index 97973bc..b2e4095 100644 print(cdll.LoadLibrary("libm.so")) print(cdll.LoadLibrary("libcrypt.so")) -- -2.24.0 +2.28.0 -From 9c6c161c3019b69e72121a5e5593212742d250b2 Mon Sep 17 00:00:00 2001 +From 09b8b9ffc5191a5d14d94fd3c4e9151b3e4419b0 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Mon, 23 Sep 2019 09:14:58 +0200 Subject: webbrowser: Support for default browsers on Haiku diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py -index 9c73bcf..1a816e1 100755 +index cea9130..135c6b8 100755 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -543,6 +543,11 @@ def register_standard_browsers(): @@ -727,12 +727,12 @@ index 9c73bcf..1a816e1 100755 + register("webpositive", None, BackgroundBrowser("WebPositive")) else: # Prefer X browsers if present - if os.environ.get("DISPLAY"): + if os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"): -- -2.24.0 +2.28.0 -From a1c29f7cdde22602c40a1bb48b2c664204fb04b3 Mon Sep 17 00:00:00 2001 +From 570484a1190831793cccf56a8bc20b2d4f8d26c4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 4 Oct 2019 22:02:35 +0200 Subject: since 3.8, don't reinit locks on fork. @@ -752,10 +752,10 @@ index 0cfaec8..0cc63e2 100644 pass # no-op when os.register_at_fork does not exist. else: -- -2.24.0 +2.28.0 -From 177f35afacbb56ded7e841d133bac190b4bedd2e Mon Sep 17 00:00:00 2001 +From 0fe492b679b34f2f9fb1ce66ed28f90df9aafb6d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 15 May 2020 15:20:57 +0200 Subject: handle errors returned by internal_connect() @@ -785,5 +785,5 @@ index 7f1727a..df98f52 100644 return PyLong_FromLong((long) res); -- -2.24.0 +2.28.0 diff --git a/dev-lang/python/patches/python3_x86-3.7.7.patchset b/dev-lang/python/patches/python3_x86-3.7.9.patchset similarity index 100% rename from dev-lang/python/patches/python3_x86-3.7.7.patchset rename to dev-lang/python/patches/python3_x86-3.7.9.patchset diff --git a/dev-lang/python/patches/python3_x86-3.8.3.patchset b/dev-lang/python/patches/python3_x86-3.8.6.patchset similarity index 100% rename from dev-lang/python/patches/python3_x86-3.8.3.patchset rename to dev-lang/python/patches/python3_x86-3.8.6.patchset diff --git a/dev-lang/python/python3-3.7.7.recipe b/dev-lang/python/python3-3.7.9.recipe similarity index 96% rename from dev-lang/python/python3-3.7.7.recipe rename to dev-lang/python/python3-3.7.9.recipe index 4d92f40b2..9986b2a90 100644 --- a/dev-lang/python/python3-3.7.7.recipe +++ b/dev-lang/python/python3-3.7.9.recipe @@ -11,9 +11,9 @@ OSI-approved open source license. HOMEPAGE="https://www.python.org" LICENSE="Python" COPYRIGHT="1990-2018 Python Software Foundation" -REVISION="2" +REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136" +CHECKSUM_SHA256="91923007b05005b5f9bd46f3b9172248aea5abc1543e8a636d59e629c3331b01" SOURCE_DIR="Python-$portVersion" PATCHES="python3-$portVersion.patchset" if [ "$secondaryArchSuffix" = _x86 ] ; then @@ -143,9 +143,6 @@ INSTALL() cd $prefix/lib/python3.7 rm -rf ctypes/test distutils/tests idlelib/idle_test lib2to3/tests \ sqlite3/test test tkinter/test unittest/test - - # TODO: drop __pycache__ folders as well? - find . -name __pycache__ | xargs rm -rf } TEST() diff --git a/dev-lang/python/python38-3.8.3.recipe b/dev-lang/python/python38-3.8.6.recipe similarity index 96% rename from dev-lang/python/python38-3.8.3.recipe rename to dev-lang/python/python38-3.8.6.recipe index bed60de89..54f05ba2d 100644 --- a/dev-lang/python/python38-3.8.3.recipe +++ b/dev-lang/python/python38-3.8.6.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2020 Python Software Foundation" REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864" +CHECKSUM_SHA256="a9e0b79d27aa056eb9cce8d63a427b5f9bab1465dee3f942dcfdb25a82f4ab8a" SOURCE_DIR="Python-$portVersion" PATCHES="python3-$portVersion.patchset" if [ "$secondaryArchSuffix" = _x86 ] ; then @@ -136,9 +136,6 @@ INSTALL() rm -rf ctypes/test distutils/tests idlelib/idle_test lib2to3/tests \ sqlite3/test test tkinter/test unittest/test - # TODO: drop __pycache__ folders as well? - find . -name __pycache__ | xargs rm -rf - rm -f $prefix/bin/{2to3,idle3,pydoc3,python3,python3-config} } diff --git a/dev-lang/python/python39-3.9.0.recipe b/dev-lang/python/python39-3.9.0.recipe index c6547b5de..72fb2f262 100644 --- a/dev-lang/python/python39-3.9.0.recipe +++ b/dev-lang/python/python39-3.9.0.recipe @@ -11,7 +11,7 @@ OSI-approved open source license. HOMEPAGE="https://www.python.org" LICENSE="Python" COPYRIGHT="1990-2020 Python Software Foundation" -REVISION="1" +REVISION="2" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854" SOURCE_DIR="Python-$portVersion" @@ -136,9 +136,6 @@ INSTALL() rm -rf ctypes/test distutils/tests idlelib/idle_test lib2to3/tests \ sqlite3/test test tkinter/test unittest/test - # TODO: drop __pycache__ folders as well? - find . -name __pycache__ | xargs rm -rf - rm -f $prefix/bin/{2to3,idle3,pydoc3,python3,python3-config} }