Skip to content

Commit e393fe4

Browse files
sherlockcoinalex v
authored andcommitted
[OSX] macdeployqtplus bug fixes [OSX] (#514)
* [OSX] macdeployqtplus bug fixes [OSX] Background image of the OSX install window is mis-sized #379 * Update background.svg Dynamic Labling * Revert "Update background.svg" This reverts commit ffa9d4d. * Update background.svg * Dynamic labeling * {OSX} Gitian Building Fixes Gitian build fails Fix. * [OSX] Python Usage Fix Python usage Fix * [OSX] GItian Build Fixes #2 Gitian Build Fixes #2 * [OSX] DMG Mounting Crash Fix DMG Mounting Crash Fix.
1 parent 4fb8043 commit e393fe4

File tree

8 files changed

+110
-96
lines changed

8 files changed

+110
-96
lines changed

Makefile.am

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ $(OSX_APP)/Contents/PkgInfo:
7373

7474
$(OSX_APP)/Contents/Resources/empty.lproj:
7575
$(MKDIR_P) $(@D)
76-
@touch $@
76+
@touch $@
7777

7878
$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
7979
$(MKDIR_P) $(@D)
@@ -99,9 +99,16 @@ osx_volname:
9999
echo $(OSX_VOLNAME) >$@
100100

101101
if BUILD_DARWIN
102-
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
102+
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(OSX_BACKGROUND_IMAGE)
103103
$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME) -add-resources contrib/Frameworks/libboost_filesystem-mt.dylib contrib/Frameworks/libboost_system-mt.dylib
104104

105+
$(OSX_BACKGROUND_IMAGE).png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
106+
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 36 -p 36 -o $@
107+
$(OSX_BACKGROUND_IMAGE)@2x.png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
108+
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 72 -p 72 -o $@
109+
$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE).png $(OSX_BACKGROUND_IMAGE)@2x.png
110+
tiffutil -cathidpicheck $^ -out $@
111+
105112
deploydir: $(OSX_DMG)
106113
else
107114
APP_DIST_DIR=$(top_builddir)/dist

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ case $host in
346346
fi
347347
fi
348348

349+
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
349350
AC_CHECK_PROG([BREW],brew, brew)
350351
if test x$BREW = xbrew; then
351352
dnl These Homebrew packages may be keg-only, meaning that they won't be found

contrib/macdeploy/background.svg

Lines changed: 34 additions & 28 deletions
Loading

contrib/macdeploy/background.tiff

-1.83 MB
Binary file not shown.
12.7 KB
Loading
31.1 KB
Loading

contrib/macdeploy/custom_dsstore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
ds = DSStore.open(output_file, 'w+')
1515
ds['.']['bwsp'] = {
1616
'ShowStatusBar': False,
17-
'WindowBounds': b'{{300, 280}, {500, 343}}',
17+
'WindowBounds': '{{300, 280}, {500, 343}}',
1818
'ContainerShowSidebar': False,
1919
'SidebarWidth': 0,
2020
'ShowTabView': False,

0 commit comments

Comments
 (0)