From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 27 Mar 2012 00:07:28 +0000 (-0400)
Subject: Merge branch '0.5.0.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~11
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=9a133240d307abc964409540dba337b133922f7f;hp=-c

Merge branch '0.5.0.x' into 0.5.x
---

9a133240d307abc964409540dba337b133922f7f
diff --combined bitcoin-qt.pro
index d46a6e7,2b6fc57..60f1de8
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@@ -1,6 -1,6 +1,6 @@@
  TEMPLATE = app
  TARGET =
 -VERSION = 0.5.0.6
 +VERSION = 0.5.4
  INCLUDEPATH += src src/json src/qt
  DEFINES += QT_GUI BOOST_THREAD_USE_LIB
  CONFIG += no_include_pwd
@@@ -204,7 -204,7 +204,7 @@@ CODECFORTR = UTF-
  TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
  
  isEmpty(QMAKE_LRELEASE) {
-     win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+     win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
      else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
  }
  isEmpty(TS_DIR):TS_DIR = src/qt/locale
@@@ -251,10 -251,20 +251,20 @@@ isEmpty(BOOST_INCLUDE_PATH) 
      macx:BOOST_INCLUDE_PATH = /opt/local/include
  }
  
- windows:LIBS += -lmingwthrd -lws2_32
- windows:DEFINES += _MT WIN32
+ windows:LIBS += -lws2_32
+ windows:DEFINES += WIN32
  windows:RC_FILE = src/qt/res/bitcoin-qt.rc
- windows:QMAKE_LIBS_QT_ENTRY -= -lmingw32
+ 
+ windows:!contains(MINGW_THREAD_BUGFIX, 0) {
+     # At least qmake's win32-g++-cross profile is missing the -lmingwthrd
+     # thread-safety flag. GCC has -mthreads to enable this, but it doesn't
+     # work with static linking. -lmingwthrd must come BEFORE -lmingw, so
+     # it is prepended to QMAKE_LIBS_QT_ENTRY.
+     # It can be turned off with MINGW_THREAD_BUGFIX=0, just in case it causes
+     # any problems on some untested qmake profile now or in the future.
+     DEFINES += _MT
+     QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY
+ }
  
  macx:HEADERS += src/qt/macdockiconhandler.h
  macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
diff --combined share/setup.nsi
index 38f0a3a,55390f3..e231436
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@@ -5,7 -5,7 +5,7 @@@ SetCompressor /SOLID lzm
  
  # General Symbol Definitions
  !define REGKEY "SOFTWARE\$(^Name)"
 -!define VERSION 0.5.0.6
 +!define VERSION 0.5.4
  !define COMPANY "Bitcoin project"
  !define URL http://www.bitcoin.org/
  
@@@ -45,13 -45,13 +45,13 @@@ Var StartMenuGrou
  !insertmacro MUI_LANGUAGE English
  
  # Installer attributes
 -OutFile bitcoin-0.5.0.6-win32-setup.exe
 +OutFile bitcoin-0.5.4-win32-setup.exe
  InstallDir $PROGRAMFILES\Bitcoin
  CRCCheck on
  XPStyle on
  BrandingText " "
  ShowInstDetails show
 -VIProductVersion 0.5.0.6
 +VIProductVersion 0.5.4.0
  VIAddVersionKey ProductName Bitcoin
  VIAddVersionKey ProductVersion "${VERSION}"
  VIAddVersionKey CompanyName "${COMPANY}"
@@@ -75,6 -75,10 +75,10 @@@ Section -Main SEC000
      File /r /x *.exe /x *.o ../src\*.*
      SetOutPath $INSTDIR
      WriteRegStr HKCU "${REGKEY}\Components" Main 1
+ 
+     # Remove old wxwidgets-based-bitcoin executable and locales:
+     Delete /REBOOTOK $INSTDIR\bitcoin.exe
+     RMDir /r /REBOOTOK $INSTDIR\locale
  SectionEnd
  
  Section -post SEC0001