aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar ctrlaltca2023-08-31 09:47:43 +0200
committerGravatar GitHub2023-08-31 09:47:43 +0200
commit4f5d7b44aefd19740b3b3bb63d7ef60b8a912a08 (patch)
tree2bda8b09c3222ddbd1fe6a0a25fbf7c4796ab6c9
parentSpellchecker: on right click menu, check the spelling for the word under the ... (diff)
downloadKVIrc-4f5d7b44aefd19740b3b3bb63d7ef60b8a912a08.tar.gz
KVIrc-4f5d7b44aefd19740b3b3bb63d7ef60b8a912a08.tar.bz2
KVIrc-4f5d7b44aefd19740b3b3bb63d7ef60b8a912a08.zip
Macos: manually create dmg to fix icon position (#2556)
* Macos: manually create dmg to fix icon position * Fix dmg name
-rw-r--r--.github/workflows/build_macos.yml17
-rwxr-xr-xdist/macos/installer_background.pngbin0 -> 5183 bytes
-rw-r--r--dist/osx/background.jpgbin27298 -> 0 bytes
-rw-r--r--dist/osx/osx_dmg.json10
4 files changed, 11 insertions, 16 deletions
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index 993d4c8a2..ec3416ddd 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -30,7 +30,7 @@ jobs:
- name: Install other prerequisites
run: |
brew update
- brew install enchant openssl --force-bottle
+ brew install enchant openssl create-dmg --force-bottle
- name: Configure CMake
run: |
@@ -60,11 +60,16 @@ jobs:
echo "dmg_name=KVIrc-$kvi_version-dev-$git_desc" >> "$GITHUB_ENV"
- name: Create DMG
- uses: QQxiaoming/create-dmg-action@v0.0.2
- with:
- name: '${{ env.dmg_name }}'
- srcdir: 'build/KVIrc.app'
-
+ shell: bash
+ run: |
+ cd '${{github.workspace}}'
+ create-dmg --volname "${{ env.dmg_name }}" \
+ --background "dist/macos/installer_background.png" \
+ --window-pos 200 120 \
+ --window-size 800 450 \
+ --icon KVIrc.app 200 190 \
+ --icon-size 100 \
+ --app-drop-link 600 185 "${{ env.dmg_name }}.dmg" "build/KVIrc.app"
- name: Publish artifact
uses: actions/upload-artifact@v3
diff --git a/dist/macos/installer_background.png b/dist/macos/installer_background.png
new file mode 100755
index 000000000..9c72a1583
--- /dev/null
+++ b/dist/macos/installer_background.png
Binary files differ
diff --git a/dist/osx/background.jpg b/dist/osx/background.jpg
deleted file mode 100644
index 1cc1b5af1..000000000
--- a/dist/osx/background.jpg
+++ /dev/null
Binary files differ
diff --git a/dist/osx/osx_dmg.json b/dist/osx/osx_dmg.json
deleted file mode 100644
index 0b8187e64..000000000
--- a/dist/osx/osx_dmg.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "title": "KVIrc",
- "icon": "../../data/icons/64x64/kvirc.png",
- "background": "background.jpg",
- "icon-size": 64,
- "contents": [
- { "x": 448, "y": 344, "type": "link", "path": "/Applications" },
- { "x": 192, "y": 344, "type": "file", "path": "../../build/KVIrc.app/" }
- ]
-} \ No newline at end of file