Merge pull request #100 from macarooni-man/dev

v2.2.3

.github/workflows/compiler.yml

@@ -83,7 +83,7 @@ jobs:
 
   macos:
     name: macOS Build
-    runs-on: macos-12
+    runs-on: macos-13
     needs: [setup-env, test-env]
     steps:
 
@@ -173,6 +173,13 @@ jobs:
           cp -f ../source/gui-assets/fonts/Consolas* /usr/share/fonts
           fc-cache -f
           # python locale-gen.py
+
+          # Patch plyer (pull #822)
+          FILECHOOSER="./venv/lib/python3.9/site-packages/plyer/platforms/linux/filechooser.py"
+          sed -i 's/--confirm-overwrite//g' "$FILECHOOSER"
+          sed -i '/self\.title/d' "$FILECHOOSER"
+          sed -i '/self\.icon/d' "$FILECHOOSER"
+
           echo Compiling auto-mcs
           export KIVY_AUDIO=ffpyplayer
           cd $current
@@ -247,6 +254,13 @@ jobs:
               cp -f ../source/gui-assets/fonts/Consolas* /usr/share/fonts
               fc-cache -f
               # python locale-gen.py
+
+              # Patch plyer (pull #822)
+              FILECHOOSER="./venv/lib/python3.9/site-packages/plyer/platforms/linux/filechooser.py"
+              sed -i 's/--confirm-overwrite//g' "$FILECHOOSER"
+              sed -i '/self\.title/d' "$FILECHOOSER"
+              sed -i '/self\.icon/d' "$FILECHOOSER"
+
               echo Compiling auto-mcs
               export KIVY_AUDIO=ffpyplayer
               cd $current

.gitignore

@@ -1,6 +1,6 @@
 build-tools/.DS_Store
 build-tools/dist
-build-tools/venv
+build-tools/venv*
 source/gui-assets/live
 source/__pycache__
 source/*.spec

build-tools/build-linux.sh

@@ -65,7 +65,7 @@ if [ $errorlevel -ne 0 ]; then
 	cd openssl-1.1.1g
 
 	mkdir -p $ssl_path/lib
-	./config --prefix=$ssl_path --openssldir=$ssl_path no-ssl2 LDFLAGS="-L $ssl_path/lib -Wl,-rpath,$sslpath/lib"
+	./config --prefix=$ssl_path --openssldir=$ssl_path shared zlib
 	make
 	make install
 
@@ -93,18 +93,27 @@ if [ $errorlevel -ne 0 ]; then
 
 
 	# Finally, download and compile Python from source
-    echo Installing Python 3.9
+	echo Installing Python 3.9
 
 	cd /tmp/
 	wget https://www.python.org/ftp/python/3.9.18/Python-3.9.18.tgz
 	tar xzf Python-3.9.18.tgz
 	cd Python-3.9.18
 
 	mkdir -p $python_path/lib
-	./configure --prefix=$python_path --enable-optimizations --with-lto --with-computed-gotos --with-system-ffi --with-openssl=$ssl_path --with-tcltk-includes='-I/opt/include' --with-tcltk-libs='-L/opt/lib -ltcl8.6 -ltk8.6' --enable-shared LDFLAGS="-Wl,-rpath $python_path/lib"
-	make -j "$(nproc)"
 
-	# sudo ./python3.9 -m test -j "$(nproc)"
+	# Configure Python with correct OpenSSL paths
+	./configure --prefix=$python_path \
+	            --enable-optimizations \
+	            --with-lto \
+	            --with-computed-gotos \
+	            --with-system-ffi \
+	            --with-openssl=$ssl_path \
+	            --enable-shared \
+	            LDFLAGS="-Wl,-rpath,$python_path/lib -L$ssl_path/lib" \
+	            CPPFLAGS="-I$ssl_path/include"
+
+	make -j "$(nproc)"
 	make altinstall
 	rm /tmp/Python-3.9.18.tgz
 

build-tools/ca-bundle.crt

@@ -4250,3 +4250,134 @@ oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
 mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
 emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
 -----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDojCCA0mgAwIBAgIQfda+OepJzNERPEwfRNZTvzAKBggqhkjOPQQDAjA7MQsw
+CQYDVQQGEwJVUzEeMBwGA1UEChMVR29vZ2xlIFRydXN0IFNlcnZpY2VzMQwwCgYD
+VQQDEwNXRTEwHhcNMjQwOTMwMDE1NzU0WhcNMjQxMjI5MDE1NzUzWjAWMRQwEgYD
+VQQDEwtxdWlsdG1jLm9yZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIGSobkF
+8OAQ7BoBM/Ywbf6ZMlomZ0hXZVc7rgLazdk0EurBJo4/+Rj6fqIpCaxZEbh8L/cZ
+Zi53jpI8IaGmabCjggJSMIICTjAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYI
+KwYBBQUHAwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULK630g9S+HGCSEsH0GuN
+yLJjiSkwHwYDVR0jBBgwFoAUkHeSNWfE/6jMqeZ72YB5e8yT+TgwXgYIKwYBBQUH
+AQEEUjBQMCcGCCsGAQUFBzABhhtodHRwOi8vby5wa2kuZ29vZy9zL3dlMS9mZFkw
+JQYIKwYBBQUHMAKGGWh0dHA6Ly9pLnBraS5nb29nL3dlMS5jcnQwJQYDVR0RBB4w
+HIILcXVpbHRtYy5vcmeCDSoucXVpbHRtYy5vcmcwEwYDVR0gBAwwCjAIBgZngQwB
+AgEwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2MucGtpLmdvb2cvd2UxL1NhV0xZ
+VjJ4dmxJLmNybDCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AHb/iD8KtvuVUcJh
+zPWHujS0pM27KdxoQgqf5mdMWjp0AAABkkDc9LkAAAQDAEcwRQIhAIkXJp5cr5EB
+56LK02m/qHkl28bXzyHuCrQNjmrwQb0zAiA3uYhdfktYf51j7ogJToNVW/6wsg/e
+rH5qLtGYsM3r2AB1AKLjCuRF772tm3447Udnd1PXgluElNcrXhssxLlQpEfnAAAB
+kkDc+IEAAAQDAEYwRAIgKWICAvehnVTN6BD1uM9B4YnUSj6JIuQ45g08FVN4xmYC
+IC7XVXaDDq5Za7lFZdyFWnCcs8vZhg/LPzgdWAEIjSmKMAoGCCqGSM49BAMCA0cA
+MEQCIDRIphF3qnsQdluOZ1NQShWEF4Qsa1TL2jlkMYRDugt9AiBrjafJmH2HLa5x
+dW7FPniKDZEWY854j7kmQkEe9lvQPA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICnzCCAiWgAwIBAgIQf/MZd5csIkp2FV0TttaF4zAKBggqhkjOPQQDAzBHMQsw
+CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU
+MBIGA1UEAxMLR1RTIFJvb3QgUjQwHhcNMjMxMjEzMDkwMDAwWhcNMjkwMjIwMTQw
+MDAwWjA7MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVR29vZ2xlIFRydXN0IFNlcnZp
+Y2VzMQwwCgYDVQQDEwNXRTEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARvzTr+
+Z1dHTCEDhUDCR127WEcPQMFcF4XGGTfn1XzthkubgdnXGhOlCgP4mMTG6J7/EFmP
+LCaY9eYmJbsPAvpWo4H+MIH7MA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQU
+kHeSNWfE/6jMqeZ72YB5e8yT+TgwHwYDVR0jBBgwFoAUgEzW63T/STaj1dj8tT7F
+avCUHYwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzAChhhodHRwOi8vaS5wa2ku
+Z29vZy9yNC5jcnQwKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL2MucGtpLmdvb2cv
+ci9yNC5jcmwwEwYDVR0gBAwwCjAIBgZngQwBAgEwCgYIKoZIzj0EAwMDaAAwZQIx
+AOcCq1HW90OVznX+0RGU1cxAQXomvtgM8zItPZCuFQ8jSBJSjz5keROv9aYsAm5V
+sQIwJonMaAFi54mrfhfoFNZEfuNMSQ6/bIBiNLiyoX46FohQvKeIoJ99cx7sUkFN
+7uJW
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYD
+VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG
+A1UEAxMLR1RTIFJvb3QgUjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAw
+WjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz
+IExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
+AATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzuhXyi
+QHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvR
+HYqjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBSATNbrdP9JNqPV2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D
+9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/Cr8deVl5c1RxYIigL9zC2L7F8AjEA8GE8
+p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh4rsUecrNIdSUtUlD
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDpTCCAyygAwIBAgISA65BtY/drcbbMH/3jvHJDtHlMAoGCCqGSM49BAMDMDIx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
+NjAeFw0yNDA4MjYxNjU4NTFaFw0yNDExMjQxNjU4NTBaMCMxITAfBgNVBAMTGDE3
+NTU2MjQ0NTMucnNjLmNkbjc3Lm9yZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IA
+BH3rfCXitdhef+XfH6uLuafYGL7ln9ajwtqena05wikH4N2aoHpndFicaiZmrHXK
+D6ly5Dhebm0RTqk9EhFWITijggIvMIICKzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0l
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
+FNN8IuGF9DRYAicDHBx1pGLnQ4thMB8GA1UdIwQYMBaAFJMnRpgDqVFojpjWxEJI
+2yO/WJTSMFUGCCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL2U2Lm8u
+bGVuY3Iub3JnMCIGCCsGAQUFBzAChhZodHRwOi8vZTYuaS5sZW5jci5vcmcvMDgG
+A1UdEQQxMC+CGDE3NTU2MjQ0NTMucnNjLmNkbjc3Lm9yZ4ITbWF2ZW4ubmVvZm9y
+Z2VkLm5ldDATBgNVHSAEDDAKMAgGBmeBDAECATCCAQQGCisGAQQB1nkCBAIEgfUE
+gfIA8AB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0sgdm7v6s52IRzAAABkY/V1xkA
+AAQDAEcwRQIgTM06H5RbZi38Y6yt2wYxXaAUi9Yzxtx++EGwCCVcaKQCIQCxVNYM
+ronHtR3ok51OBmXpuD8hNfrnqJgdkgPG+Fg4bwB2AO7N0GTV2xrOxVy3nbTNE6Iy
+h0Z8vOzew1FIWUZxH7WbAAABkY/V1xkAAAQDAEcwRQIgP95rWA1BxrhGODHIQ14Y
+de23gf4/IlYfgEscu5RoVVoCIQDtkvIcHf/ealFI9f7dMKIWBEHeHR7fqkulILca
+AknN/zAKBggqhkjOPQQDAwNnADBkAjA2jH5biGiV4ey6ZwrIap0IRBj0euIEjj+E
+HbQRCkVjXiXOLo9Rj8JFVDCTkxHgnXkCMBwxqOLqnRqD26jbNjuAeOR9FMoaRbKS
+Iz4spA+qES89+jMhrOzLbv6DyuySCB/Umw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
+WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G
+h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV
+6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw
+gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj
+v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
+AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
+BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
+Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc
+MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL
+pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp
+eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH
+pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7
+s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu
+h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv
+YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8
+ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0
+LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+
+EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY
+Ig46v9mFmBvyH04=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----

build-tools/reqs-docker.txt

@@ -16,8 +16,8 @@ psutil>=6.0.0
 pyinstaller>=5.10
 pyinstaller-hooks-contrib>=2024.7
 pyparsing==3.0.9
-requests>=2.32.0
-requests-toolbelt>=0.10.1
+requests==2.32.0
+requests-toolbelt==0.10.1
 six==1.16.0
 soupsieve==2.3.2.post1
 urllib3==1.26.19

build-tools/reqs-linux.txt

@@ -20,8 +20,8 @@ Pygments==2.16.1
 pyinstaller==5.10
 pyinstaller-hooks-contrib>=2024.7
 pyparsing==3.0.9
-requests>=2.32.0
-requests-toolbelt>=0.10.1
+requests==2.32.0
+requests-toolbelt==0.10.1
 simpleaudio==1.0.4
 six==1.16.0
 soupsieve==2.3.2.post1

build-tools/reqs-macos.txt

@@ -20,8 +20,8 @@ Pygments==2.16.1
 pyinstaller==5.10
 pyinstaller-hooks-contrib>=2024.7
 pyparsing==3.0.9
-requests>=2.32.0
-requests-toolbelt>=0.10.1
+requests==2.32.0
+requests-toolbelt==0.10.1
 simpleaudio==1.0.4
 six==1.16.0
 soupsieve==2.3.2.post1

build-tools/reqs-windows.txt

@@ -27,8 +27,8 @@ pyparsing==3.0.9
 pypiwin32==223
 pywin32==304
 pywin32-ctypes==0.2.2
-requests>=2.32.0
-requests-toolbelt>=0.10.0
+requests==2.32.0
+requests-toolbelt==0.10.1
 simpleaudio==1.0.4
 six==1.16.0
 soupsieve==2.3.2.post1