From 6145fdf47e7c4e222c6d5b5abad2cd320ddc2648 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <jonas.schnelli@include7.ch>
Date: Tue, 2 Jun 2015 13:24:22 +0200
Subject: [PATCH] OSX: use "Bitcoin Core" as Bundle Display Name

Github-Pull: #6214
Rebased-From: 0a32a9347e12a8d1d4a46bf9a1d5b3ae13bbe501
---
 Makefile.am                                   |  11 ++++++++---
 .../macdeploy/Base.lproj/InfoPlist.strings    |   1 +
 contrib/macdeploy/DS_Store                    | Bin 10244 -> 10244 bytes
 contrib/macdeploy/macdeployqtplus             |   4 ++--
 share/qt/Info.plist.in                        |   6 ++++++
 5 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 contrib/macdeploy/Base.lproj/InfoPlist.strings

diff --git a/Makefile.am b/Makefile.am
index 3a215a014..2f478e4b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ OSX_DMG=Bitcoin-Core.dmg
 OSX_BACKGROUND_IMAGE=background.tiff
 OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
 OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
+OSX_BASE_LPROJ_DIR=$(top_srcdir)/contrib/macdeploy/Base.lproj/InfoPlist.strings
 OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
 OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
@@ -30,7 +31,7 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
   $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
   $(top_srcdir)/doc/README_windows.txt
 
-OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
+OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \
   $(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
   $(top_srcdir)/contrib/macdeploy/DS_Store \
   $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
@@ -72,7 +73,7 @@ $(OSX_APP)/Contents/PkgInfo:
 
 $(OSX_APP)/Contents/Resources/empty.lproj:
 	$(MKDIR_P) $(@D)
-	@touch $@
+	@touch $@ 
 
 $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
 	$(MKDIR_P) $(@D)
@@ -86,9 +87,13 @@ $(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
 	$(MKDIR_P) $(@D)
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
 
+$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: $(OSX_BASE_LPROJ_DIR)
+	$(MKDIR_P) $(@D)
+	$(INSTALL_DATA) $< $@
+
 OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
   $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
-  $(OSX_APP)/Contents/MacOS/Bitcoin-Qt
+  $(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
 
 if BUILD_DARWIN
 $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
diff --git a/contrib/macdeploy/Base.lproj/InfoPlist.strings b/contrib/macdeploy/Base.lproj/InfoPlist.strings
new file mode 100644
index 000000000..b259ea141
--- /dev/null
+++ b/contrib/macdeploy/Base.lproj/InfoPlist.strings
@@ -0,0 +1 @@
+{	CFBundleDisplayName = "Bitcoin Core"; CFBundleName = "Bitcoin Core"; }
diff --git a/contrib/macdeploy/DS_Store b/contrib/macdeploy/DS_Store
index ca19b207c06c31ab722f3a9eb4f9d5f3a4a8f6de..db9d16f1d700f18b64edafa0f8d981a680567b4d 100644
GIT binary patch
delta 1068
zcmdr~O-NKx6h3#nI%-zV8+Du<Z9=0=Cf?7?dvlq>W}YKKgd>@>aMO%qSurD}{g9vw
z#TH4%aiK&6MQ)7HCNPj9Od@Eb;If6#rd7<Mg|zD2X<S6RmVI!!-}~No&pY3FcOo&7
znCW89<;3cK=FC-9+sxr>z;2fZy-G7qyYAy<*Wrrh_B<4TQ%c*O+1neZ+n|($Iee?w
zY#y20^3L`xk>Y}KfK9QqL!1GZo?N&45Oa<!PH)mdyi*e?A!}}><_N<c#W>TG$!5|O
z&8IGqSE3wRp&fc530Gkp9>4;;f_Ly4w&6SMuuA4;K7NJY;G=w!Pw^Q(&!6&V{5fCX
zi+G^UP<GsYfSQs*E$|ahU{{^du}=MN(E3u`C0`>Ga{!p8nbOljB=vqHX_;XWw8EO1
z>QCwYf?$ZGYMN?D#gBF86)U3t0U<EpiLyS-dLnzjQB?_tAK(P8cy2j(8LIU@wuNWw
z+Ze^Kf8v@eSY%QFPL0lEtM{Hg6qM5{h;nYx)uyj<pe?i*1F$sR4tK`vfF2U@fDy9o
zfY5`nKs+9e3Db-koiUO7;jLyR@fRcLY-p|At?~)*Si{;;RW-DMbXqs5Kr$Q-i?o&2
zEn!k-Q?oQJ9MVi(3<wz#2Ypp#R_J0X7{a^0$+6coBncU7s5shE;@d^Nns~m*UBp|8
z9)-9}DDl^CDe9`9UQ$2__8wq;w+`_)zjYjIEcI^fertnjN;6?R4={?48;#yRlANSC
z{Quq|9cOU-=DF*cYuU^t`GonVNbNp|!5|Dn3bM3kAOPJkj2#C*JRE<SbNYXBv}+&z
I|5y3sFJNHTfdBvi

delta 1205
zcmdT@Pe>GT6#jne+WN2DUCs5+8lx5^+uH2T?92`(?jIEeBQ=B2%y!4wlx!E=%tL_@
z21y-?ALyZj$2u0fhrq%mg)RjO5nY1l)X{^7=u&Ui6)dk^`rt9&ym{aI-tW!K!ob47
z<MXWS<-lqsE6Y^aqs-!L<bw_ucR5e+hmJ>l($V5<>D)#h!^u?AC~XN{;!8(0-tF|1
z&#iy#^`MxZF7eyWC|l-hPPK0CS(Y*mlmJ`Wiyy=ptY%H7vZ{&MhDQ3gNXXUd_980H
z%vPUdXQ{Xqo#?|TCU67y@C471MGhbE4cpAds+gNKv1aCBGV5TStd|Y45jM)k*cD!1
zBU!$O_;`)fm8D^F6z>aHlfN}5umFi*AgIb}KsQ8DHbkE)X?`OvDgj-J8-_FyltodO
z{09G2bJ3}^i+?~<d50^^`uV)8{qSe%YQiD_r};bAoMoq&hictygOAmESdK5&t~i$R
zB{0_jYZ0)_wYmpU;f%S8e9~M>c-7KoZtFM&V?b1t!=j>uz0qhe?3E&N#2b`*g5F4X
z(64rf#V#!(XRP&hR@6T-#9a-oe4yd=shCfXsXoJ}DCQ9~H7=?Cn5HYbq{xaK^!ZgS
zq4^Ur^JIL{U2!Pj55#1hKXu=q50R@0^DI|sOcTWdut^&;VHbd}1@0hTU8r#q-zns)
zh?_?=AqYUIz(wNp^7CLhAiLLx_^aJKUui6^+t~Bkq&~alxJzH%G=I}5&G%EvMp=vS
z?<S;n<!D13G3dCCYnVX_vq)m1Z#t#Nr&DpNuv1*dJkaqg54r_PN!Eo67^k>Nq8S(m
zBw&esiZW6pkcNR<6iHI0|F&UAsPlf864DG)?-<g}m?T;Hpb75mned)t?R9oUFh$LE
e8fuDc1Vneo<4ecZGdAI;m9JHQ`Op8fbH4$>)%qU*

diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 3ac44d024..2253c40af 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -757,7 +757,7 @@ if config.dmg is not None:
     
     if fancy is None:
         try:
-            runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname=app_bundle_name, ov=True)
+            runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname="Bitcoin-Core", ov=True)
         except subprocess.CalledProcessError as e:
             sys.exit(e.returncode)
     else:
@@ -772,7 +772,7 @@ if config.dmg is not None:
         if verbose >= 3:
             print "Creating temp image for modification..."
         try:
-            runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname=app_bundle_name, ov=True)
+            runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname="Bitcoin-Core", ov=True)
         except subprocess.CalledProcessError as e:
             sys.exit(e.returncode)
         
diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index dd6edde8d..d5a7144be 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -30,6 +30,12 @@
 
   <key>CFBundleExecutable</key>
   <string>Bitcoin-Qt</string>
+  
+  <key>CFBundleName</key>
+  <string>Bitcoin-Qt</string>
+
+  <key>LSHasLocalizedDisplayName</key>
+  <true/>
 
   <key>CFBundleIdentifier</key>
   <string>org.bitcoinfoundation.Bitcoin-Qt</string>