From b61b49eeb110bc5ee53516fb24c9695e46e50829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Mon, 25 Jul 2022 20:07:18 +0200 Subject: [PATCH 1/6] up size --- osx/create-osx-dmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx/create-osx-dmg.sh b/osx/create-osx-dmg.sh index f2944bd..97f7f0d 100755 --- a/osx/create-osx-dmg.sh +++ b/osx/create-osx-dmg.sh @@ -70,7 +70,7 @@ fi # create the initial dmg echo "-- Create volume" du -sm "$work_dir/${STAGING_DIR}" | awk '{print $1}' > "$work_dir/_size" -expr "$(cat "$work_dir/_size")" + 99 > "$work_dir/_size" +expr "$(cat "$work_dir/_size")" + 150 > "$work_dir/_size" hdiutil create -srcfolder "$work_dir/${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \ -format UDRW -size "$(cat "$work_dir/_size")M" \ From c1a475884c676ae40e9dadec3cd7517b0d9b9d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Tue, 26 Jul 2022 01:02:55 +0200 Subject: [PATCH 2/6] add app deps and clean _applibs --- osx/cleanup-app.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osx/cleanup-app.sh b/osx/cleanup-app.sh index 5f77a29..81f74e1 100755 --- a/osx/cleanup-app.sh +++ b/osx/cleanup-app.sh @@ -46,3 +46,6 @@ rm -rf "$PYTHON_PATH/"lib/{lib*,pkgconfig} rm -rf "$PYTHON_PATH/"include rm -rf "$PYTHON_PATH"/lib/pkgconfig rm -rf "$PYTHON_PATH"/lib/{itcl*,tcl*,tdbc*,tk*,tK*,libtk*,libtcl*} + +cp -rf ../../../app/_applibs/* "$VENV_PATH"/lib/python3.*/site-packages +rm -rf "$APP_PATH"/Contents/Resources/yourapp/_applibs From 03e0cd496338c37bb78f29e44728ba132148cdfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Tue, 26 Jul 2022 01:03:58 +0200 Subject: [PATCH 3/6] better size --- osx/create-osx-dmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx/create-osx-dmg.sh b/osx/create-osx-dmg.sh index 97f7f0d..a01d258 100755 --- a/osx/create-osx-dmg.sh +++ b/osx/create-osx-dmg.sh @@ -70,7 +70,7 @@ fi # create the initial dmg echo "-- Create volume" du -sm "$work_dir/${STAGING_DIR}" | awk '{print $1}' > "$work_dir/_size" -expr "$(cat "$work_dir/_size")" + 150 > "$work_dir/_size" +expr "$(cat "$work_dir/_size")" \* 2 > "$work_dir/_size" hdiutil create -srcfolder "$work_dir/${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \ -format UDRW -size "$(cat "$work_dir/_size")M" \ From 71e76cdc359be3697292c59177d8919c211c3e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Tue, 26 Jul 2022 06:52:45 +0200 Subject: [PATCH 4/6] better typo --- osx/cleanup-app.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osx/cleanup-app.sh b/osx/cleanup-app.sh index 81f74e1..b260d2a 100755 --- a/osx/cleanup-app.sh +++ b/osx/cleanup-app.sh @@ -47,5 +47,5 @@ rm -rf "$PYTHON_PATH/"include rm -rf "$PYTHON_PATH"/lib/pkgconfig rm -rf "$PYTHON_PATH"/lib/{itcl*,tcl*,tdbc*,tk*,tK*,libtk*,libtcl*} -cp -rf ../../../app/_applibs/* "$VENV_PATH"/lib/python3.*/site-packages +cp -rf "$APP_PATH"/Contents/Resources/yourapp/_applibs/* "$VENV_PATH"/lib/python3.*/site-packages rm -rf "$APP_PATH"/Contents/Resources/yourapp/_applibs From a5810e1426071a67cc4d8befed218a683f3924e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Thu, 28 Jul 2022 15:58:34 +0200 Subject: [PATCH 5/6] uses last tag sdl* --- osx/create-osx-bundle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/create-osx-bundle.sh b/osx/create-osx-bundle.sh index 51550cf..52a21f7 100755 --- a/osx/create-osx-bundle.sh +++ b/osx/create-osx-bundle.sh @@ -26,8 +26,8 @@ EXTRAS="base" PYVER="3.9.9" OPENSSL_VERSION="1.1.1l" SDL_VERSION="release-2.0.20" -SDL_IMAGE_VERSION="168ceb577c245c91801c1bcaf970ef31c9b4d7ba" -SDL_MIXER_VERSION="64120a41f62310a8be9bb97116e15a95a892e39d" +SDL_IMAGE_VERSION="release-2.6.0" +SDL_MIXER_VERSION="release-2.6.1" SDL_TTF_VERSION="release-2.0.18" APP_NAME="Kivy" APP_VERSION="master" From 23020554544735baef1462d652d3e78d1d07e528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?--=3DFurtiF=E2=84=A2=3D--?= Date: Tue, 30 Aug 2022 19:29:43 +0200 Subject: [PATCH 6/6] Revert "uses last tag sdl*" This reverts commit a5810e1426071a67cc4d8befed218a683f3924e2. --- osx/create-osx-bundle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/create-osx-bundle.sh b/osx/create-osx-bundle.sh index 52a21f7..51550cf 100755 --- a/osx/create-osx-bundle.sh +++ b/osx/create-osx-bundle.sh @@ -26,8 +26,8 @@ EXTRAS="base" PYVER="3.9.9" OPENSSL_VERSION="1.1.1l" SDL_VERSION="release-2.0.20" -SDL_IMAGE_VERSION="release-2.6.0" -SDL_MIXER_VERSION="release-2.6.1" +SDL_IMAGE_VERSION="168ceb577c245c91801c1bcaf970ef31c9b4d7ba" +SDL_MIXER_VERSION="64120a41f62310a8be9bb97116e15a95a892e39d" SDL_TTF_VERSION="release-2.0.18" APP_NAME="Kivy" APP_VERSION="master"