aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bitcoin-qt.pro32
-rw-r--r--contrib/Bitcoin.app/Contents/Info.plist32
-rw-r--r--contrib/Bitcoin.app/Contents/MacOS/.higit0
-rw-r--r--contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icnsbin286031 -> 0 bytes
-rwxr-xr-xcontrib/create_osx_dmg.sh47
-rw-r--r--contrib/gitian-descriptors/README31
-rw-r--r--contrib/gitian-descriptors/gitian-win32.yml38
-rw-r--r--contrib/gitian-descriptors/gitian.yml35
-rw-r--r--contrib/gitian-descriptors/qt-win32.yml54
-rw-r--r--contrib/gitian-descriptors/wxwidgets-win32.yml40
-rw-r--r--contrib/gitian-descriptors/wxwidgets.yml42
-rw-r--r--contrib/macdeploy/LICENSE674
-rw-r--r--contrib/macdeploy/background.pngbin0 -> 12073 bytes
-rw-r--r--contrib/macdeploy/background.psdbin0 -> 163518 bytes
-rw-r--r--contrib/macdeploy/fancy.plist32
-rwxr-xr-xcontrib/macdeploy/macdeployqtplus341
-rw-r--r--contrib/macdeploy/notes.txt26
-rw-r--r--doc/README95
-rw-r--r--doc/README_windows.txt9
-rw-r--r--doc/build-msw.txt16
-rw-r--r--doc/readme-qt.rst22
-rw-r--r--doc/release-process.txt135
-rw-r--r--share/setup.nsi5
-rw-r--r--src/headers.h8
-rw-r--r--src/init.cpp10
-rw-r--r--src/keystore.h1
-rw-r--r--src/makefile.linux-mingw4
-rw-r--r--src/net.cpp1
-rw-r--r--src/qt/bitcoin.cpp2
-rw-r--r--src/qt/bitcoinstrings.cpp149
-rw-r--r--src/wallet.cpp1
31 files changed, 1347 insertions, 535 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index e9dc6f787c..d1a7e68aa4 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -2,11 +2,13 @@ TEMPLATE = app
TARGET =
VERSION = 0.5.0
INCLUDEPATH += src src/json src/qt
-DEFINES += QT_GUI
+DEFINES += QT_GUI BOOST_THREAD_USE_LIB
CONFIG += no_include_pwd
# for boost 1.37, add -mt to the boost libraries
# use: qmake BOOST_LIB_SUFFIX=-mt
+# for boost thread win32 with _win32 sufix
+# use: BOOST_THREAD_LIB_SUFFIX=_win32-...
# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8
# Dependency library locations can be customized with BOOST_INCLUDE_PATH,
@@ -28,8 +30,10 @@ contains(USE_UPNP, -) {
count(USE_UPNP, 0) {
USE_UPNP=1
}
- DEFINES += USE_UPNP=$$USE_UPNP
- LIBS += -lminiupnpc
+ DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
+ INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
+ LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
+ win32:LIBS += -liphlpapi
}
# use: qmake "USE_DBUS=1"
@@ -45,12 +49,20 @@ contains(USE_SSL, 1) {
DEFINES += USE_SSL
}
-# for extra security against potential buffer overflows
-QMAKE_CXXFLAGS += -fstack-protector
-QMAKE_LFLAGS += -fstack-protector
+contains(BITCOIN_NEED_QT_PLUGINS, 1) {
+ DEFINES += BITCOIN_NEED_QT_PLUGINS
+ QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs
+}
+
+!windows {
+ # for extra security against potential buffer overflows
+ QMAKE_CXXFLAGS += -fstack-protector
+ QMAKE_LFLAGS += -fstack-protector
+ # do not enable this on windows, as it will result in a non-working executable!
+}
# disable quite some warnings because bitcoin core "sins" a lot
-QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch
+QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-strict-aliasing -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch
# Input
DEPENDPATH += src/qt src src json/include
@@ -202,6 +214,10 @@ isEmpty(BOOST_LIB_SUFFIX) {
windows:BOOST_LIB_SUFFIX = -mgw44-mt-1_43
}
+isEmpty(BOOST_THREAD_LIB_SUFFIX) {
+ BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
+}
+
isEmpty(BDB_LIB_PATH) {
macx:BDB_LIB_PATH = /opt/local/lib/db48
}
@@ -237,6 +253,6 @@ macx:TARGET = "Bitcoin-Qt"
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH
LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,)
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
-LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_LIB_SUFFIX
+LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)
diff --git a/contrib/Bitcoin.app/Contents/Info.plist b/contrib/Bitcoin.app/Contents/Info.plist
deleted file mode 100644
index d5a278a570..0000000000
--- a/contrib/Bitcoin.app/Contents/Info.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDisplayName</key>
- <string>Bitcoin</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>bitcoin</string>
- <key>CFBundleIdentifier</key>
- <string>org.bitcoin.bitcoin</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>Bitcoin</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>0.4.1</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>400</string>
- <key>LSMinimumSystemVersion</key>
- <string>10.5</string>
- <key>CFBundleIconFile</key>
- <string>BitcoinAppIcon.icns</string>
- <key>LSMultipleInstancesProhibited</key>
- <true/>
-</dict>
-</plist>
diff --git a/contrib/Bitcoin.app/Contents/MacOS/.higit b/contrib/Bitcoin.app/Contents/MacOS/.higit
deleted file mode 100644
index e69de29bb2..0000000000
--- a/contrib/Bitcoin.app/Contents/MacOS/.higit
+++ /dev/null
diff --git a/contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns b/contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns
deleted file mode 100644
index 033ce1a607..0000000000
--- a/contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns
+++ /dev/null
Binary files differ
diff --git a/contrib/create_osx_dmg.sh b/contrib/create_osx_dmg.sh
deleted file mode 100755
index d26dcc8242..0000000000
--- a/contrib/create_osx_dmg.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-#
-# Creates a Bitcoin.dmg OSX file from the contrib/BitcoinTemplate.dmg file
-#
-# Recipe from: http://digital-sushi.org/entry/how-to-create-a-disk-image-installer-for-apple-mac-os-x/
-#
-# To make a prettier BitcoinTemplate.dmg:
-# + open (mount) BitcoinTemplate.dmg
-# + change the file properties, icon positions, background image, etc
-# + eject, then commit the changed BitcoinTemplate.dmg
-#
-
-CWD=$(pwd)
-
-if [ $# -lt 1 ]; then
- if [ $(basename $CWD) == "contrib" ]
- then
- TOP=$(dirname $CWD)
- else
- echo "Usage: $0 /path/to/bitcoin/tree"
- exit 1
- fi
-else
- TOP=$1
-fi
-
-# Create Bitcoin-Qt.app
-cd "$TOP"
-if [ ! -e Makefile ]; then qmake bitcoin-qt.pro; fi
-make
-macdeployqt Bitcoin-Qt.app
-# Workaround a bug in macdeployqt: https://bugreports.qt.nokia.com/browse/QTBUG-21913
-# (when fixed, this won't be necessary)
-cp /opt/local/lib/db48/libdb_cxx-4.8.dylib Bitcoin-Qt.app/Contents/Frameworks/
-install_name_tool -id @executable_path/../Frameworks/libdb_cxx-4.8.dylib \
- Bitcoin-Qt.app/Contents/Frameworks/libdb_cxx-4.8.dylib
-install_name_tool -change libqt.3.dylib \
- @executable_path/../Frameworks/libqt.3.dylib \
- Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt
-
-# Create a .dmg
-macdeployqt Bitcoin-Qt.app -dmg
-
-# Compile bitcoind
-cd "$TOP/src"
-STATIC=1 make -f makefile.osx
-
diff --git a/contrib/gitian-descriptors/README b/contrib/gitian-descriptors/README
new file mode 100644
index 0000000000..a2d902e210
--- /dev/null
+++ b/contrib/gitian-descriptors/README
@@ -0,0 +1,31 @@
+Gavin's notes on getting gitian builds up and running:
+
+You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.
+
+You probably need to enable hardware virtualization in your machine's BIOS.
+
+You need to be running a recent version of 64-bit-Ubuntu, and you need to install several prerequisites:
+ sudo apt-get install apache2 git apt-cacher-ng python-vm-builder qemu-kvm
+
+Sanity checks:
+ sudo service apt-cacher-ng status # Should return apt-cacher-ng is running
+ ls -l /dev/kvm # Should show a /dev/kvm device
+
+Once you've got the right hardware and software:
+
+ git clone git://github.com/bitcoin/bitcoin.git
+ git clone git://github.com/devrandom/gitian-builder.git
+ mkdir gitian-builder/inputs
+ wget 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz' -O gitian-builder/inputs/miniupnpc-1.6.tar.gz
+
+ cd gitian-builder
+ bin/make-base-vm --arch i386
+ bin/make-base-vm --arch amd64
+ cd ..
+
+ # To build
+ cd bitcoin
+ git pull
+ cd ../gitian-builder
+ git pull
+ ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian.yml
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
index 52b10bc33f..4e224ce135 100644
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@ -16,26 +16,18 @@ remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
files:
-- "wxwidgets-win32-2.9.2-gitian.zip"
+- "qt-win32-4.7.4-gitian.zip"
- "boost-win32-1.47.0-gitian.zip"
-- "openssl-1.0.0d.tar.gz"
+- "openssl-1.0.0e.tar.gz"
- "db-4.8.30.NC.tar.gz"
- "miniupnpc-1.6.tar.gz"
script: |
#
- mkdir wxWidgets-2.9.2
- cd wxWidgets-2.9.2
- mkdir lib
- unzip ../wxwidgets-win32-2.9.2-gitian.zip
- cd bin/$GBUILD_BITS
- for lib in wx_mswu; do
- i586-mingw32msvc-ar rc ../../lib/lib${lib}-2.9-i586-mingw32msvc.a $lib/*.o
- i586-mingw32msvc-ranlib ../../lib/lib${lib}-2.9-i586-mingw32msvc.a
- done
- cp -a wx ../../lib
- cd ../..
- mv include/wx-2.9/wx include
- cd ..
+ mkdir $HOME/qt
+ cd $HOME/qt
+ unzip ../build/qt-win32-4.7.4-gitian.zip
+ cd $HOME/build/
+ export PATH=$PATH:$HOME/qt/bin/
#
mkdir boost_1_47_0
cd boost_1_47_0
@@ -50,8 +42,8 @@ script: |
mv include/boost .
cd ..
#
- tar xzf openssl-1.0.0d.tar.gz
- cd openssl-1.0.0d
+ tar xzf openssl-1.0.0e.tar.gz
+ cd openssl-1.0.0e
./Configure --cross-compile-prefix=i586-mingw32msvc- mingw
make
cd ..
@@ -74,19 +66,23 @@ script: |
mkdir -p $OUTDIR/src
cp -a . $OUTDIR/src
rm -rf $OUTDIR/src/.git
- cp -a $OUTDIR/src/locale $OUTDIR
cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt
cp $OUTDIR/src/COPYING $OUTDIR/license.txt
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ export TZ=UTC
+ $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.0e OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.0e/include INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin
+ make $MAKEOPTS
+ cp release/bitcoin-qt.exe $OUTDIR/
+ #
cd src
sed 's/$(DEBUGFLAGS)/-frandom-seed=bitcoin/' -i makefile.linux-mingw
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC
- make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoin.exe USE_UPNP=1
make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_UPNP=0
- i586-mingw32msvc-strip bitcoin.exe
i586-mingw32msvc-strip bitcoind.exe
makensis ../share/setup.nsi
- cp bitcoin.exe ../share/bitcoin-*-win32-setup.exe $OUTDIR/
+ cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/
mkdir $OUTDIR/daemon
cp bitcoind.exe $OUTDIR/daemon
diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml
index 7e0d174810..4e1da912d9 100644
--- a/contrib/gitian-descriptors/gitian.yml
+++ b/contrib/gitian-descriptors/gitian.yml
@@ -7,9 +7,12 @@ architectures:
- "amd64"
packages:
- "libdb4.8++-dev"
-- "libxxf86vm-dev"
-- "libgtk2.0-dev"
-- "libboost-all-dev"
+- "qt4-qmake"
+- "libqt4-dev"
+- "libboost-system-dev"
+- "libboost-filesystem-dev"
+- "libboost-program-options-dev"
+- "libboost-thread-dev"
- "libssl-dev"
- "git-core"
- "unzip"
@@ -18,8 +21,6 @@ remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
files:
-- "wxWidgets-2.9.2-x64-gitian.zip"
-- "wxWidgets-2.9.2-x32-gitian.zip"
- "miniupnpc-1.6.tar.gz"
script: |
INSTDIR="$HOME/install"
@@ -30,30 +31,18 @@ script: |
INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
cd ..
#
- mkdir -p $INSTDIR/bin $INSTDIR/lib/wx $INSTDIR/include
- mkdir wxWidgets-2.9.2
- cd wxWidgets-2.9.2
- unzip ../wxWidgets-2.9.2-x32-gitian.zip
- unzip -o ../wxWidgets-2.9.2-x64-gitian.zip
- cp -a bin/$GBUILD_BITS/wx/config/gtk2-unicode-static-2.9 $INSTDIR/bin/wx-config
- for lib in wx_gtk2u wxregexu wxtiff; do
- ar rc $INSTDIR/lib/lib${lib}-2.9.a bin/$GBUILD_BITS/$lib/*.o
- ranlib $INSTDIR/lib/lib${lib}-2.9.a
- done
- cp -a include/wx-2.9/* $INSTDIR/include
- cp -a bin/$GBUILD_BITS/wx/include $INSTDIR/lib/wx
- cd ..
- #
cd bitcoin
mkdir -p $OUTDIR/src
cp -a . $OUTDIR/src
rm -rf $OUTDIR/src/.git
- mv $OUTDIR/src/locale $OUTDIR
cp $OUTDIR/src/doc/README $OUTDIR
cp $OUTDIR/src/COPYING $OUTDIR
cd src
sed 's/$(DEBUGFLAGS)//' -i makefile.unix
- PATH=$INSTDIR/bin:$PATH make -f makefile.unix STATIC=1 CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin USE_UPNP=1
- PATH=$INSTDIR/bin:$PATH make -f makefile.unix STATIC=1 CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0
+ make -f makefile.unix STATIC=1 DEFS="-I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0
mkdir -p $OUTDIR/bin/$GBUILD_BITS
- install -s bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS
+ install -s bitcoind $OUTDIR/bin/$GBUILD_BITS
+ cd ..
+ qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib"
+ make $MAKEOPTS
+ install bitcoin-qt $OUTDIR/bin/$GBUILD_BITS
diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml
new file mode 100644
index 0000000000..6eb76b2170
--- /dev/null
+++ b/contrib/gitian-descriptors/qt-win32.yml
@@ -0,0 +1,54 @@
+---
+name: "qt"
+suites:
+- "lucid"
+architectures:
+- "i386"
+packages:
+- "mingw32"
+- "zip"
+- "faketime"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "qt-everywhere-opensource-src-4.7.4.tar.gz"
+script: |
+ INSTDIR="$HOME/qt/"
+ mkdir $INSTDIR
+ SRCDIR="$INSTDIR/src/"
+ mkdir $SRCDIR
+ #
+ tar xzf qt-everywhere-opensource-src-4.7.4.tar.gz
+ cd qt-everywhere-opensource-src-4.7.4
+ sed 's/$TODAY/2011-01-30/' -i configure
+ sed 's/i686-pc-mingw32-/i586-mingw32msvc-/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ sed --posix 's|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/i586-mingw32msvc/include/ -frandom-seed=qtbuild|' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ sed 's/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ sed 's/QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads/QMAKE_LFLAGS_EXCEPTIONS_ON = -lmingwthrd/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ sed --posix 's/QMAKE_MOC\t\t= i586-mingw32msvc-moc/QMAKE_MOC\t\t= moc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ sed --posix 's/QMAKE_RCC\t\t= i586-mingw32msvc-rcc/QMAKE_RCC\t\t= rcc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ sed --posix 's/QMAKE_UIC\t\t= i586-mingw32msvc-uic/QMAKE_UIC\t\t= uic/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ # ar adds timestamps to every object file included in the static library
+ # providing -D as ar argument is supposed to solve it, but doesn't work as qmake strips off the arguments and adds -M to pass a script...
+ # which somehow cannot be combined with other flags.
+ # use faketime only for ar, as it confuses make/qmake into hanging sometimes
+ sed --posix "s|QMAKE_LIB\t\t= i586-mingw32msvc-ar -ru|QMAKE_LIB\t\t= $HOME/ar -Dr|" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+ echo '#!/bin/bash' > $HOME/ar
+ echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ar
+ echo 'i586-mingw32msvc-ar "$@"' >> $HOME/ar
+ chmod +x $HOME/ar
+ #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ export TZ=UTC
+ ./configure -prefix $INSTDIR -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -opengl no -nomake examples -nomake demos -nomake docs
+ find . -name *.prl | xargs -l sed 's|/\.||' -i
+ find . -name *.prl | xargs -l sed 's|/$||' -i
+ make $MAKEOPTS install
+ cp -a bin $SRCDIR/
+ cd $INSTDIR
+ find . -name *.prl | xargs -l sed 's|/$||' -i
+ #sed 's|QMAKE_PRL_LIBS.*|QMAKE_PRL_LIBS = -lQtDeclarative -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtGui -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lmsimg32 -lQtNetwork -lQtCore -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32|' -i imports/Qt/labs/particles/qmlparticlesplugin.prl
+
+ # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ zip -r $OUTDIR/qt-win32-4.7.4-gitian.zip *
diff --git a/contrib/gitian-descriptors/wxwidgets-win32.yml b/contrib/gitian-descriptors/wxwidgets-win32.yml
deleted file mode 100644
index 3d49d7b35e..0000000000
--- a/contrib/gitian-descriptors/wxwidgets-win32.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: "wxwidgets"
-suites:
-- "lucid"
-architectures:
-- "i386"
-packages:
-- "mingw32"
-- "faketime"
-- "zip"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "wxWidgets-2.9.2.tar.bz2"
-script: |
- INSTDIR="$HOME/install"
- TMPDIR="$HOME/tmpdir"
- export LIBRARY_PATH="$INSTDIR/lib"
- #
- tar xjf wxWidgets-2.9.2.tar.bz2
- cd wxWidgets-2.9.2
- CXXFLAGS=-frandom-seed=wx1 ./configure --host=i586-mingw32msvc --build=i686-linux --prefix=$INSTDIR --disable-shared --enable-monolithic --without-libpng --disable-svg
- perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h
- make $MAKEOPTS install
- mkdir $TMPDIR
- cd $TMPDIR
- cp -af $INSTDIR/include .
- mkdir -p $TMPDIR/bin/$GBUILD_BITS
- cd $TMPDIR/bin/$GBUILD_BITS
- cp -af $INSTDIR/lib/wx .
- for lib in wx_mswu; do
- mkdir $lib
- (cd $lib ; ar xf $INSTDIR/lib/lib${lib}-2.9-i586-mingw32msvc.a)
- done
- chmod -R +w $TMPDIR
- cd $TMPDIR
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- zip -r wxwidgets-win32-2.9.2-gitian.zip *
- cp wxwidgets-win32-2.9.2-gitian.zip $OUTDIR
diff --git a/contrib/gitian-descriptors/wxwidgets.yml b/contrib/gitian-descriptors/wxwidgets.yml
deleted file mode 100644
index 0509615101..0000000000
--- a/contrib/gitian-descriptors/wxwidgets.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-name: "wxwidgets"
-suites:
-- "lucid"
-architectures:
-- "i386"
-- "amd64"
-packages:
-- "libxxf86vm-dev"
-- "libgtk2.0-dev"
-- "faketime"
-- "zip"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "wxWidgets-2.9.2.tar.bz2"
-script: |
- INSTDIR="$HOME/install"
- TMPDIR="$HOME/tmpdir"
- export LIBRARY_PATH="$INSTDIR/lib"
- #
- tar xjf wxWidgets-2.9.2.tar.bz2
- cd wxWidgets-2.9.2
- ./configure --prefix=$INSTDIR --enable-monolithic --disable-shared
- perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h
- make $MAKEOPTS install
- mkdir $TMPDIR
- cd $TMPDIR
- cp -af $INSTDIR/include .
- mkdir -p $TMPDIR/bin/$GBUILD_BITS
- cd $TMPDIR/bin/$GBUILD_BITS
- cp -af $INSTDIR/lib/wx .
- for lib in wxtiff wxregexu wx_gtk2u; do
- mkdir $lib
- (cd $lib ; ar xf $INSTDIR/lib/lib${lib}-2.9.a)
- done
- chmod -R +w $TMPDIR
- cd $TMPDIR
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- zip -r wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip *
- cp wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip $OUTDIR
diff --git a/contrib/macdeploy/LICENSE b/contrib/macdeploy/LICENSE
new file mode 100644
index 0000000000..94a9ed024d
--- /dev/null
+++ b/contrib/macdeploy/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/contrib/macdeploy/background.png b/contrib/macdeploy/background.png
new file mode 100644
index 0000000000..fce12e3807
--- /dev/null
+++ b/contrib/macdeploy/background.png
Binary files differ
diff --git a/contrib/macdeploy/background.psd b/contrib/macdeploy/background.psd
new file mode 100644
index 0000000000..5889676f8e
--- /dev/null
+++ b/contrib/macdeploy/background.psd
Binary files differ
diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist
new file mode 100644
index 0000000000..e73b9b697e
--- /dev/null
+++ b/contrib/macdeploy/fancy.plist
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>window_bounds</key>
+ <array>
+ <integer>300</integer>
+ <integer>300</integer>
+ <integer>800</integer>
+ <integer>620</integer>
+ </array>
+ <key>background_picture</key>
+ <string>background.png</string>
+ <key>icon_size</key>
+ <integer>96</integer>
+ <key>applications_symlink</key>
+ <true/>
+ <key>items_position</key>
+ <dict>
+ <key>Applications</key>
+ <array>
+ <integer>370</integer>
+ <integer>156</integer>
+ </array>
+ <key>Bitcoin-Qt.app</key>
+ <array>
+ <integer>128</integer>
+ <integer>156</integer>
+ </array>
+ </dict>
+</dict>
+</plist>
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
new file mode 100755
index 0000000000..a43e7102a8
--- /dev/null
+++ b/contrib/macdeploy/macdeployqtplus
@@ -0,0 +1,341 @@
+#!/usr/bin/env python
+
+#
+# Copyright (C) 2011 Patrick "p2k" Schneider <me@p2k-network.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import subprocess, sys, re, os, shutil, os.path
+from time import sleep
+from argparse import ArgumentParser
+
+qt_conf="""[Paths]
+translations=Resources
+plugins=PlugIns
+"""
+
+ap = ArgumentParser(description="""Front-end to macdeployqt with some additional functions.
+
+Outputs a ready-to-deploy app in a folder "dist" and optionally wraps it in a .dmg file.
+Note, that the "dist" folder will be deleted before deploying on each run.
+
+Optionally, Qt translation files (.qm) and additional resources can be added to the bundle.""")
+
+ap.add_argument("app_bundle", nargs=1, metavar="app-bundle", help="application bundle to be deployed")
+ap.add_argument("-verbose", type=int, nargs=1, default=[1], metavar="<0-3>", help="0 = no output, 1 = error/warning (default), 2 = normal, 3 = debug")
+ap.add_argument("-no-plugins", dest="plugins", action="store_false", default=True, help="skip plugin deployment")
+ap.add_argument("-no-strip", dest="strip", action="store_false", default=True, help="don't run 'strip' on the binaries")
+ap.add_argument("-dmg", nargs="?", const="", metavar="basename", help="create a .dmg disk image; if basename is not specified, a camel-cased version of the app name is used")
+ap.add_argument("-fancy", nargs=1, metavar="plist", default=[], help="make a fancy looking disk image using the given plist file with instructions; requires -dmg to work")
+ap.add_argument("-add-qt-tr", nargs=1, metavar="languages", default=[], help="add Qt translation files to the bundle's ressources; the language list must be separated with commas, not with whitespace")
+ap.add_argument("-add-resources", nargs="+", metavar="path", default=[], help="list of additional files or folders to be copied into the bundle's resources; must be the last argument")
+
+config = ap.parse_args()
+
+verbose = config.verbose[0]
+
+# ------------------------------------------------
+
+app_bundle = config.app_bundle[0]
+
+if not os.path.exists(app_bundle):
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not find app bundle \"%s\"\n" % (app_bundle))
+ sys.exit(1)
+
+app_bundle_name = os.path.splitext(os.path.basename(app_bundle))[0]
+
+# ------------------------------------------------
+
+for p in config.add_resources:
+ if verbose >= 3:
+ print "Checking for \"%s\"..." % p
+ if not os.path.exists(p):
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not find additional resource file \"%s\"\n" % (p))
+ sys.exit(1)
+
+# ------------------------------------------------
+
+if len(config.add_qt_tr) == 0:
+ add_qt_tr = []
+else:
+ qt_tr_dir = os.path.join(os.getenv("QTDIR", ""), "translations")
+ add_qt_tr = ["qt_%s.qm" % lng for lng in config.add_qt_tr[0].split(",")]
+ for lng_file in add_qt_tr:
+ p = os.path.join(qt_tr_dir, lng_file)
+ if verbose >= 3:
+ print "Checking for \"%s\"..." % p
+ if not os.path.exists(p):
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not find Qt translation file \"%s\"\n" % (lng_file))
+ sys.exit(1)
+
+# ------------------------------------------------
+
+if len(config.fancy) == 1:
+ if verbose >= 3:
+ print "Fancy: Importing plistlib..."
+ try:
+ import plistlib
+ except ImportError:
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not import plistlib which is required for fancy disk images.\n")
+ sys.exit(1)
+
+ if verbose >= 3:
+ print "Fancy: Importing appscript..."
+ try:
+ import appscript
+ except ImportError:
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not import appscript which is required for fancy disk images.\n")
+ sys.stderr.write("Please install it e.g. with \"sudo easy_install appscript\".\n")
+ sys.exit(1)
+
+ p = config.fancy[0]
+ if verbose >= 3:
+ print "Fancy: Loading \"%s\"..." % p
+ if not os.path.exists(p):
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not find fancy disk image plist at \"%s\"\n" % (p))
+ sys.exit(1)
+
+ try:
+ fancy = plistlib.readPlist(p)
+ except:
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not parse fancy disk image plist at \"%s\"\n" % (p))
+ sys.exit(1)
+
+ try:
+ assert not fancy.has_key("window_bounds") or (isinstance(fancy["window_bounds"], list) and len(fancy["window_bounds"]) == 4)
+ assert not fancy.has_key("background_picture") or isinstance(fancy["background_picture"], str)
+ assert not fancy.has_key("icon_size") or isinstance(fancy["icon_size"], int)
+ assert not fancy.has_key("applications_symlink") or isinstance(fancy["applications_symlink"], bool)
+ if fancy.has_key("items_position"):
+ assert isinstance(fancy["items_position"], dict)
+ for key, value in fancy["items_position"].iteritems():
+ assert isinstance(value, list) and len(value) == 2 and isinstance(value[0], int) and isinstance(value[1], int)
+ except:
+ if verbose >= 1:
+ sys.stderr.write("Error: Bad format of fancy disk image plist at \"%s\"\n" % (p))
+ sys.exit(1)
+
+ if fancy.has_key("background_picture"):
+ bp = fancy["background_picture"]
+ if verbose >= 3:
+ print "Fancy: Resolving background picture \"%s\"..." % bp
+ if not os.path.exists(bp):
+ bp = os.path.join(os.path.dirname(p), bp)
+ if not os.path.exists(bp):
+ if verbose >= 1:
+ sys.stderr.write("Error: Could not find background picture at \"%s\" or \"%s\"\n" % (fancy["background_picture"], bp))
+ sys.exit(1)
+ else:
+ fancy["background_picture"] = bp
+else:
+ fancy = None
+
+# ------------------------------------------------
+
+if os.path.exists("dist"):
+ if verbose >= 2:
+ print "+ Removing old dist folder +"
+
+ shutil.rmtree("dist")
+
+# ------------------------------------------------
+
+target = os.path.join("dist", app_bundle)
+target_res = os.path.join(target, "Contents", "Resources")
+
+if verbose >= 2:
+ print "+ Copying source bundle +"
+if verbose >= 3:
+ print app_bundle, "->", target
+
+os.mkdir("dist")
+shutil.copytree(app_bundle, target)
+
+# ------------------------------------------------
+
+macdeployqt_args = ["macdeployqt", target, "-verbose=%d" % verbose]
+if not config.plugins:
+ macdeployqt_args.append("-no-plugins")
+if not config.strip:
+ macdeployqt_args.append("-no-strip")
+
+if verbose >= 2:
+ print "+ Running macdeployqt +"
+
+ret = subprocess.call(macdeployqt_args)
+if ret != 0:
+ sys.exit(ret)
+
+# ------------------------------------------------
+
+if verbose >= 2:
+ print "+ Installing qt.conf +"
+
+f = open(os.path.join(target_res, "qt.conf"), "wb")
+f.write(qt_conf)
+f.close()
+
+# ------------------------------------------------
+
+if len(add_qt_tr) > 0 and verbose >= 2:
+ print "+ Adding Qt translations +"
+
+for lng_file in add_qt_tr:
+ if verbose >= 3:
+ print os.path.join(qt_tr_dir, lng_file), "->", os.path.join(target_res, lng_file)
+ shutil.copy2(os.path.join(qt_tr_dir, lng_file), os.path.join(target_res, lng_file))
+
+# ------------------------------------------------
+
+if len(config.add_resources) > 0 and verbose >= 2:
+ print "+ Adding additional resources +"
+
+for p in config.add_resources:
+ t = os.path.join(target_res, os.path.basename(p))
+ if verbose >= 3:
+ print p, "->", t
+ if os.path.isdir(p):
+ shutil.copytree(p, t)
+ else:
+ shutil.copy2(p, t)
+
+# ------------------------------------------------
+
+if config.dmg is not None:
+ def runHDIUtil(verb, image_basename, **kwargs):
+ hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"]
+ if kwargs.has_key("capture_stdout"):
+ del kwargs["capture_stdout"]
+ run = subprocess.check_output
+ else:
+ if verbose < 2:
+ hdiutil_args.append("-quiet")
+ elif verbose >= 3:
+ hdiutil_args.append("-verbose")
+ run = subprocess.check_call
+
+ for key, value in kwargs.iteritems():
+ hdiutil_args.append("-" + key)
+ if not value is True:
+ hdiutil_args.append(str(value))
+
+ return run(hdiutil_args)
+
+ if verbose >= 2:
+ if fancy is None:
+ print "+ Creating .dmg disk image +"
+ else:
+ print "+ Preparing .dmg disk image +"
+
+ if config.dmg != "":
+ dmg_name = config.dmg
+ else:
+ spl = app_bundle_name.split(" ")
+ dmg_name = spl[0] + "".join(p.capitalize() for p in spl[1:])
+
+ if fancy is None:
+ try:
+ runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname=app_bundle_name, ov=True)
+ except subprocess.CalledProcessError as e:
+ sys.exit(e.returncode)
+ else:
+ if verbose >= 3:
+ print "Determining size of \"dist\"..."
+ size = 0
+ for path, dirs, files in os.walk("dist"):
+ for file in files:
+ size += os.path.getsize(os.path.join(path, file))
+ size += int(size * 0.1)
+
+ 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)
+ except subprocess.CalledProcessError as e:
+ sys.exit(e.returncode)
+
+ if verbose >= 3:
+ print "Attaching temp image..."
+ try:
+ output = runHDIUtil("attach", dmg_name + ".temp", readwrite=True, noverify=True, noautoopen=True, capture_stdout=True)
+ except subprocess.CalledProcessError as e:
+ sys.exit(e.returncode)
+
+ m = re.search("/Volumes/(.+$)", output)
+ disk_root = m.group(0)
+ disk_name = m.group(1)
+
+ if verbose >= 2:
+ print "+ Applying fancy settings +"
+
+ if fancy.has_key("background_picture"):
+ bg_path = os.path.join(disk_root, os.path.basename(fancy["background_picture"]))
+ if verbose >= 3:
+ print fancy["background_picture"], "->", bg_path
+ shutil.copy2(fancy["background_picture"], bg_path)
+ else:
+ bg_path = None
+
+ if fancy.get("applications_symlink", False):
+ os.symlink("/Applications", os.path.join(disk_root, "Applications"))
+
+ finder = appscript.app("Finder")
+ disk = finder.disks[disk_name]
+ disk.open()
+ window = disk.container_window
+ window.current_view.set(appscript.k.icon_view)
+ window.toolbar_visible.set(False)
+ window.statusbar_visible.set(False)
+ if fancy.has_key("window_bounds"):
+ window.bounds.set(fancy["window_bounds"])
+ view_options = window.icon_view_options
+ view_options.arrangement.set(appscript.k.not_arranged)
+ if fancy.has_key("icon_size"):
+ view_options.icon_size.set(fancy["icon_size"])
+ if bg_path is not None:
+ view_options.background_picture.set(disk.files[os.path.basename(bg_path)])
+ if fancy.has_key("items_position"):
+ for name, position in fancy["items_position"].iteritems():
+ window.items[name].position.set(position)
+ disk.close()
+ if bg_path is not None:
+ subprocess.call(["SetFile", "-a", "V", bg_path])
+ disk.update(registering_applications=False)
+ sleep(2)
+ disk.eject()
+
+ if verbose >= 2:
+ print "+ Finalizing .dmg disk image +"
+
+ try:
+ runHDIUtil("convert", dmg_name + ".temp", format="UDBZ", o=dmg_name + ".dmg", ov=True)
+ except subprocess.CalledProcessError as e:
+ sys.exit(e.returncode)
+
+ os.unlink(dmg_name + ".temp.dmg")
+
+# ------------------------------------------------
+
+if verbose >= 2:
+ print "+ Done +"
+
+sys.exit(0)
diff --git a/contrib/macdeploy/notes.txt b/contrib/macdeploy/notes.txt
new file mode 100644
index 0000000000..0654ff7169
--- /dev/null
+++ b/contrib/macdeploy/notes.txt
@@ -0,0 +1,26 @@
+
+macdeployqtplus works best on OS X Lion, for Snow Leopard you'd need to install
+Python 2.7 and make it your default Python installation.
+
+You will need the appscript package for the fancy disk image creation to work.
+Install it by invoking "sudo easy_install appscript".
+
+Ths script should be invoked in the target directory like this:
+$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,es,ru -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist
+
+During the process, the disk image window will pop up briefly where the fancy
+settings are applied. This is normal, please do not interfere.
+
+You can also set up Qt Creator for invoking the script. For this, go to the
+"Projects" tab on the left side, switch to "Run Settings" above and add a
+deploy configuration. Next add a deploy step choosing "Custom Process Step".
+Fill in the following.
+
+Enable custom process step: [x]
+Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus
+Working directory: %{buildDir}
+Command arguments: Bitcoin-Qt.app -add-qt-tr de,ru -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist
+
+After that you can start the deployment process through the menu with
+Build -> Deploy Project "bitcoin-qt"
+
diff --git a/doc/README b/doc/README
index 789cc9fb87..01b1d40050 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.4.1 BETA
+Bitcoin 0.5.0 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
@@ -19,99 +19,12 @@ with each other, with the help of a P2P network to check for double-spending.
Setup
-----
Unpack the files into a directory and run:
- bin/32/bitcoin (GUI, 32-bit)
+ bin/32/bitcoin-qt (GUI, 32-bit)
bin/32/bitcoind (headless, 32-bit)
- bin/64/bitcoin (GUI, 64-bit)
+ bin/64/bitcoin-qt (GUI, 64-bit)
bin/64/bitcoind (headless, 64-bit)
-Wallet Encryption
------------------
-Bitcoin supports native wallet encryption so that people who steal your
-wallet file don't automatically get access to all of your Bitcoins.
-In order to enable this feature, chose "Encrypt Wallet" from the
-Options menu. You will be prompted to enter a passphrase, which
-will be used as the key to encrypt your wallet and will be needed
-every time you wish to send Bitcoins. If you lose this passphrase,
-you will lose access to spend all of the bitcoins in your wallet,
-no one, not even the Bitcoin developers can recover your Bitcoins.
-This means you are responsible for your own security, store your
-passphrase in a secure location and do not forget it.
-
-Remember that the encryption built into bitcoin only encrypts the
-actual keys which are required to send your bitcoins, not the full
-wallet. This means that someone who steals your wallet file will
-be able to see all the addresses which belong to you, as well as the
-relevant transactions, you are only protected from someone spending
-your coins.
-
-It is recommended that you backup your wallet file before you
-encrypt your wallet. To do this, close the Bitcoin client and
-copy the wallet.dat file from ~/.bitcoin/ on Linux, /Users/(user
-name)/Application Support/Bitcoin/ on Mac OSX, and %APPDATA%/Bitcoin/
-on Windows (that is /Users/(user name)/AppData/Roaming/Bitcoin on
-Windows Vista and 7 and /Documents and Settings/(user name)/Application
-Data/Bitcoin on Windows XP). Once you have copied that file to a
-safe location, reopen the Bitcoin client and Encrypt your wallet.
-If everything goes fine, delete the backup and enjoy your encrypted
-wallet. Note that once you encrypt your wallet, you will never be
-able to go back to a version of the Bitcoin client older than 0.4.
-
-Keep in mind that you are always responsible for your own security.
-All it takes is a slightly more advanced wallet-stealing trojan which
-installs a keylogger to steal your wallet passphrase as you enter it
-in addition to your wallet file and you have lost all your Bitcoins.
-Wallet encryption cannot keep you safe if you do not practice
-good security, such as running up-to-date antivirus software, only
-entering your wallet passphrase in the Bitcoin client and using the
-same passphrase only as your wallet passphrase.
-
-
-Technical details of wallet encryption
---------------------------------------
-Wallet encryption uses AES-256-CBC to encrypt only the private keys
-that are held in a wallet. The keys are encrypted with a master key
-which is entirely random. This master key is then encrypted with
-AES-256-CBC with a key derived from the passphrase using SHA512 and
-OpenSSL's EVP_BytesToKey and a dynamic number of rounds determined by
-the speed of the machine which does the initial encryption (and is
-updated based on the speed of a computer which does a subsequent
-passphrase change). Although the underlying code supports multiple
-encrypted copies of the same master key (and thus multiple passphrases)
-the client does not yet have a method to add additional passphrases.
-
-At runtime, the client loads the wallet as it normally would, however
-the keystore stores the keys in encrypted form. When the passphrase
-is required (to top up keypool or send coins) it will either be queried
-by a GUI prompt, or must first be entered with the walletpassphrase
-RPC command. This will change the wallet to "unlocked" state where the
-unencrypted master key is stored in memory (in the case of GUI, only for
-long enough to complete the requested operation, in RPC, for as long as
-is specified by the second parameter to walletpassphrase). The wallet is
-then locked (or can be manually locked using the walletlock RPC command)
-and the unencrypted master key is removed from memory.
-
-Implementation details of wallet encryption
--------------------------------------------
-When the wallet is locked, calls to sendtoaddress, sendfrom, sendmany,
-and keypoolrefill will return Error -13: "Error: Please enter the wallet
-passphrase with walletpassphrase first."
-
-When the wallet is unlocked, calls to walletpassphrase will fail.
-
-When a wallet is encrypted, the passphrase is required to top up the
-keypool, thus, if the passphrase is rarely entered, it is possible that
-keypool might run out. In this case, the default key will be used as the
-target for payouts for mining, and calls to getnewaddress and getaccount
-address will return an error. In order to prevent such cases, the keypool
-is automatically refilled when walletpassphrase is called with a correct
-passphrase and when topupkeypool is called (while the wallet is unlocked).
-Note that the keypool continues to be topped up on various occasions when
-a new key from pool is used and the wallet is unlocked (or unencrypted).
-
-
-
See the documentation at the bitcoin wiki:
https://en.bitcoin.it/wiki/Main_Page
-
-... for help and more information.
+for help and more information.
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 7ff8834920..ea2f14c42a 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.4.1 BETA
+Bitcoin 0.5.0 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
@@ -18,7 +18,7 @@ with each other, with the help of a P2P network to check for double-spending.
Setup
-----
-Unpack the files into a directory and run bitcoin.exe.
+Unpack the files into a directory and run bitcoin-qt.exe.
If you have Microsoft Security Essentials, you need to add bitcoin.exe to its
"Excluded processes" list. Microsoft Security Essentials->Settings tab,
@@ -27,8 +27,9 @@ select Excluded processes, press Add, select bitcoin.exe, OK, Save changes.
The software automatically finds other nodes to connect to. You can
enable Universal Plug and Play using a menu entry or set your firewall
to forward port 8333 (TCP) to your computer so you can receive
-incoming connections. Bitcoin work without incoming connections,
+incoming connections. Bitcoin works without incoming connections,
but allowing incoming connections helps the Bitcoin network.
-See the bitcoin wiki at: https://en.bitcoin.it/wiki/Main_Page
+See the bitcoin wiki at:
+ https://en.bitcoin.it/wiki/Main_Page
for more help and information.
diff --git a/doc/build-msw.txt b/doc/build-msw.txt
index f3150e086e..346be75f56 100644
--- a/doc/build-msw.txt
+++ b/doc/build-msw.txt
@@ -15,14 +15,8 @@ WINDOWS BUILD NOTES
Compilers Supported
-------------------
-MinGW GCC http://tdm-gcc.tdragon.net/
- TDM-GCC with gcc 4.5.1 was used to build this release.
-MSYS 1.0.11 was also used (sh needed to compile some dependencies)
-
-
-Candidate releases were built with MSVC 10.0 (2010), but
-compiling with Visual C++ caused rendering artifacts when
-bitcoin was run.
+TODO: What works?
+Note: releases are cross-compiled using mingw running on Linux.
Dependencies
@@ -42,7 +36,7 @@ Boost MIT-like license
miniupnpc New (3-clause) BSD license
Versions used in this release:
-OpenSSL 1.0.0d
+OpenSSL 1.0.0e
Berkeley DB 4.8.30.NC
Boost 1.47.0
miniupnpc 1.6
@@ -54,7 +48,7 @@ MSYS shell:
un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
-cd /c/openssl-1.0.0d-mgw
+cd /c/openssl-1.0.0e-mgw
./config
make
@@ -86,5 +80,5 @@ Bitcoin
-------
DOS prompt:
cd \bitcoin\src
-mingw32-make bitcoind.exe -f makefile.mingw
+mingw32-make -f makefile.mingw
strip bitcoind.exe
diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
index b7f0d2c1f8..090177321e 100644
--- a/doc/readme-qt.rst
+++ b/doc/readme-qt.rst
@@ -1,5 +1,5 @@
-Bitcoin-qt: Qt4 based GUI replacement for Bitcoin
-=================================================
+Bitcoin-qt: Qt4 GUI for Bitcoin
+===============================
Features
========
@@ -150,7 +150,7 @@ Berkely DB version warning
A warning for people using the *static binary* version of Bitcoin on a Linux/UNIX-ish system (tl;dr: **Berkely DB databases are not forward compatible**).
-The static binary version of Bitcoin is linked against libdb4.7 or libdb4.8 (see also `this Debian issue`_).
+The static binary version of Bitcoin is linked against libdb4.8 (see also `this Debian issue`_).
Now the nasty thing is that databases from 5.X are not compatible with 4.X.
@@ -160,3 +160,19 @@ and 4.X cannot open the new format. This means that you cannot go back to the ol
significant hassle!
.. _`this Debian issue`: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621425
+
+Ubuntu 11.10 warning
+====================
+
+Ubuntu 11.10 has a package called 'qt-at-spi' installed by default. At the time of writing, having that package
+installed causes bitcoin-qt to crash intermittently. The issue has been reported as `launchpad bug 857790`_, but
+isn't yet fixed.
+
+Until the bug is fixed, you can remove the qt-at-spi package to work around the problem, though this will presumably
+disable screen reader functionality for Qt apps:
+
+::
+
+ sudo apt-get remove qt-at-spi
+
+.. _`launchpad bug 857790`: https://bugs.launchpad.net/ubuntu/+source/qt-at-spi/+bug/857790
diff --git a/doc/release-process.txt b/doc/release-process.txt
index 4d06627006..f0e1ca28ca 100644
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -5,38 +5,53 @@
* update (commit) version in OSX app bundle
contrib/Bitcoin.app/Contents/Info.plist
- * CFBundleShortVersionString should have value like 0.3.23
- * CFBundleVersion should have value like 323
+ * CFBundleShortVersionString should have value like 0.5.0
+ * CFBundleVersion should have value like 500
* tag version in git
- $ git tag -a v0.3.23
+ git tag -a v0.5.0
* write release notes. git shortlog helps a lot:
- $ git shortlog --no-merges v0.3.22..
+ git shortlog --no-merges v0.4.0..
* create source-only archive
- $ git archive --format=tar --prefix=bitcoin-0.3.23/ HEAD | \
- gzip -9c > ~/tmp/bitcoin-0.3.23-src.tar.gz
+ git archive --format=tar --prefix=bitcoin-0.5.0/ HEAD | \
+ gzip -9c > ~/tmp/bitcoin-0.5.0-src.tar.gz
* perform gitian builds
* From a directory containing the bitcoin source, gitian-builder and gitian.sigs
- $ export VERSION=0.3.23
- $ cd ./gitian-builder
- $ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian.yml
- $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
- $ cd build/out
- $ zip bitcoin-$VERSION-linux-gitian.zip *
- $ mv bitcoin-$VERSION-linux-gitian.zip ../../
- $ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
- $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
- $ cd build/out
- $ zip bitcoin-$VERSION-win32-gitian.zip *
- $ mv bitcoin-$VERSION-win32-gitian.zip ../../
-
+ export VERSION=0.5.0
+ cd ./gitian-builder
+
+ * Fetch and build inputs:
+ mkdir -p inputs; cd inputs/
+ wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
+ wget 'http://www.openssl.org/source/openssl-1.0.0e.tar.gz'
+ wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
+ wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2'
+ wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz'
+ cd ..
+ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
+ cp build/out/boost-win32-1.47.0-gitian.zip inputs/
+ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
+ cp build/out/qt-win32-4.7.4-gitian.zip inputs/
+
+ * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
+ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian.yml
+ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
+ cd build/out
+ zip bitcoin-$VERSION-linux-gitian.zip *
+ mv bitcoin-$VERSION-linux-gitian.zip ../../
+ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
+ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
+ cd build/out
+ zip bitcoin-$VERSION-win32-gitian.zip *
+ mv bitcoin-$VERSION-win32-gitian.zip ../../
+
Build output expected:
1. linux 32-bit and 64-bit binaries + source (bitcoin-$VERSION-linux-gitian.zip)
2. windows 32-bit binary, installer + source (bitcoin-$VERSION-win32-gitian.zip)
@@ -44,26 +59,30 @@
* repackage gitian builds for release as stand-alone zip/tar/installer exe
+ * Linux .tar.gz:
+ mkdir bitcoin-$VERSION-linux
+ cd bitcoin-$VERSION-linux
+ unzip bitcoin-$VERSION-linux-gitian.zip
+ cd ..; tar czvf bitcoin-$VERSION-linux.tar.gz bitcoin-$VERSION-linux
+
* Windows .zip and setup.exe:
- $ mkdir bitcoin-$VERSION-win32
- $ cd bitcoin-$VERSION-win32
- $ unzip bitcoin-$VERSION-win32-gitian.zip
- $ mv bitcoin-$VERSION-win32-setup.exe ..
- $ cd ..; zip bitcoin-$VERSION-win32.zip bitcoin-$VERSION-win32
+ mkdir bitcoin-$VERSION-win32
+ cd bitcoin-$VERSION-win32
+ unzip bitcoin-$VERSION-win32-gitian.zip
+ mv bitcoin-$VERSION-win32-setup.exe ..
+ cd ..; zip bitcoin-$VERSION-win32.zip bitcoin-$VERSION-win32
- * Linux .tar.gz:
- $ mkdir bitcoin-$VERSION-linux
- $ cd bitcoin-$VERSION-linux
- $ unzip bitcoin-$VERSION-linux-gitian.zip
- $ cd ..; tar czvf bitcoin-$VERSION-linux.tar.gz bitcoin-$VERSION-linux
* perform Mac build
- * From the bitcoin source dir
- $ cd contrib
- $ ./create_osx_dmg.sh
- $ mv Bitcoin.dmg bitcoin-$VERSION-macosx.dmg
+ qmake USE_SSL=1 USE_UPNP=1 bitcoin-qt.pro
+ make
+ export QTDIR=/opt/local/share/qt4
+ contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,ru -dmg -fancy contrib/macdeploy/fancy.plist
+
+ Build output expected:
+ Bitcoin-Qt.dmg
-* upload source and builds to SF
+* upload source and builds to SourceForge
* create SHA1SUMS for builds, and PGP-sign it
@@ -80,29 +99,29 @@
* Collect enough gitian signatures to meet minimum_weight (see contrib/gitian-downloader/*-download-config)
* From a directory containing bitcoin source, gitian.sigs and gitian zips
- $ export VERSION=0.3.23
- $ mkdir bitcoin-$VERSION-win32-gitian; cd bitcoin-$VERSION-win32-gitian
- $ unzip ../bitcoin-$VERSION-win32-gitian.zip
- $ mkdir gitian
- $ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
- $ for file in `ls ../gitian.sigs/$VERSION-win32/`; do
- $ cp ../gitian.sigs/$VERSION-win32/$file/bitcoin-build.assert ./gitian/$file-build.assert
- $ cp ../gitian.sigs/$VERSION-win32/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
- $ done
- $ zip bitcoin-$VERSION-win32-gitian.zip *
- $ cp bitcoin-$VERSION-win32-gitian.zip ../
- $ cd ..
- $ mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
- $ unzip ../bitcoin-$VERSION-linux-gitian.zip
- $ mkdir gitian
- $ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
- $ for file in `ls ../gitian.sigs/$VERSION/`; do
- $ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert
- $ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
- $ done
- $ zip bitcoin-$VERSION-linux-gitian.zip *
- $ cp bitcoin-$VERSION-linux-gitian.zip ../
-
- * Upload gitian zips to SF
+ export VERSION=0.5.0
+ mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
+ unzip ../bitcoin-$VERSION-linux-gitian.zip
+ mkdir gitian
+ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
+ for file in `ls ../gitian.sigs/$VERSION/`; do
+ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert
+ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
+ done
+ zip bitcoin-$VERSION-linux-gitian.zip *
+ cp bitcoin-$VERSION-linux-gitian.zip ../
+ cd ..
+ mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
+ unzip ../bitcoin-$VERSION-linux-gitian.zip
+ mkdir gitian
+ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
+ for file in `ls ../gitian.sigs/$VERSION/`; do
+ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert
+ cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
+ done
+ zip bitcoin-$VERSION-linux-gitian.zip *
+ cp bitcoin-$VERSION-linux-gitian.zip ../
+
+ * Upload gitian zips to SourceForge
diff --git a/share/setup.nsi b/share/setup.nsi
index 2f2eeaa784..19f5a5329b 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -66,13 +66,11 @@ ShowUninstDetails show
Section -Main SEC0000
SetOutPath $INSTDIR
SetOverwrite on
- File ../bitcoin-qt.exe
+ File ../release/bitcoin-qt.exe
File /oname=license.txt ../COPYING
File /oname=readme.txt ../doc/README_windows.txt
SetOutPath $INSTDIR\daemon
File ../src/bitcoind.exe
- SetOutPath $INSTDIR\locale
- File /r ../locale/*.*
SetOutPath $INSTDIR\src
File /r /x *.exe /x *.o ../src\*.*
SetOutPath $INSTDIR
@@ -117,7 +115,6 @@ Section /o -un.Main UNSEC0000
Delete /REBOOTOK $INSTDIR\license.txt
Delete /REBOOTOK $INSTDIR\readme.txt
RMDir /r /REBOOTOK $INSTDIR\daemon
- RMDir /r /REBOOTOK $INSTDIR\locale
RMDir /r /REBOOTOK $INSTDIR\src
DeleteRegValue HKCU "${REGKEY}\Components" Main
SectionEnd
diff --git a/src/headers.h b/src/headers.h
index 1e174da0de..fd086faee8 100644
--- a/src/headers.h
+++ b/src/headers.h
@@ -18,7 +18,13 @@
#endif
#define _WIN32_IE 0x0400
#define WIN32_LEAN_AND_MEAN 1
+
+// Include boost/foreach here as it defines __STDC_LIMIT_MACROS on some systems.
+#include <boost/foreach.hpp>
+#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
+#endif
+
#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h> // to get BSD define
#endif
@@ -49,8 +55,6 @@
#include <deque>
#include <map>
-#include <boost/foreach.hpp>
-
#ifdef WIN32
#include <windows.h>
#include <winsock2.h>
diff --git a/src/init.cpp b/src/init.cpp
index 28be7ef7c0..d6e153285e 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -12,6 +12,16 @@
#include <boost/filesystem/fstream.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
+#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED)
+#define _BITCOIN_QT_PLUGINS_INCLUDED
+#define __INSURE__
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qcncodecs)
+Q_IMPORT_PLUGIN(qjpcodecs)
+Q_IMPORT_PLUGIN(qtwcodecs)
+Q_IMPORT_PLUGIN(qkrcodecs)
+#endif
+
using namespace std;
using namespace boost;
diff --git a/src/keystore.h b/src/keystore.h
index bbfac83d1f..1f2c6aea3e 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -114,6 +114,7 @@ public:
return CBasicKeyStore::HaveKey(address);
return mapCryptedKeys.count(address) > 0;
}
+ return false;
}
bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const;
bool GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char>& vchPubKeyOut) const;
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index eb22190e57..29b433f851 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -9,13 +9,13 @@ USE_UPNP:=0
INCLUDEPATHS= \
-I"$(DEPSDIR)/boost_1_47_0" \
-I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
- -I"$(DEPSDIR)/openssl-1.0.0d/include" \
+ -I"$(DEPSDIR)/openssl-1.0.0e/include" \
-I"$(DEPSDIR)"
LIBPATHS= \
-L"$(DEPSDIR)/boost_1_47_0/stage/lib" \
-L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
- -L"$(DEPSDIR)/openssl-1.0.0d"
+ -L"$(DEPSDIR)/openssl-1.0.0e"
LIBS= \
-l boost_system-mt-s \
diff --git a/src/net.cpp b/src/net.cpp
index ead7362616..0c28eaa379 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1210,7 +1210,6 @@ void MapPort(bool /* unused fMapPort */)
static const char *strDNSSeed[] = {
"bitseed.xf2.org",
- "bitseed.bitcoin.org.uk",
"dnsseed.bluematt.me",
};
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 86ac8a0271..6afa9671d0 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
if (!translator.isEmpty())
app.installTranslator(&translator);
- app.setApplicationName(QApplication::translate("main", "Bitcoin Qt"));
+ app.setApplicationName(QApplication::translate("main", "Bitcoin-Qt"));
QSplashScreen splash(QPixmap(":/images/splash"), 0);
splash.show();
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 45aadd49a5..647adb9c53 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -18,6 +18,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect\n")
QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "Don't accept connections from outside\n"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)\n"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Number of seconds to keep misbehaving peers from reconnecting (default: "
+"86400)\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port\n"),
QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send\n"),
@@ -66,151 +70,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Unable to bind to port %d on this computer. Bitcoin is probably already "
"running."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
-"This transaction is over the size limit. You can still send it for a fee of "
-"%s, which goes to the nodes that process your transaction and helps to "
-"support the network. Do you want to pay the fee?"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Enter the current passphrase to the wallet."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Passphrase"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Please supply the current wallet decryption passphrase."),
-QT_TRANSLATE_NOOP("bitcoin-core", "The passphrase entered for the wallet decryption was incorrect."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Status"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Date"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Description"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Debit"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Credit"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Open for %d blocks"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Open until %s"),
-QT_TRANSLATE_NOOP("bitcoin-core", "%d/offline?"),
-QT_TRANSLATE_NOOP("bitcoin-core", "%d/unconfirmed"),
-QT_TRANSLATE_NOOP("bitcoin-core", "%d confirmations"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Generated"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Generated (%s matures in %d more blocks)"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Generated - Warning: This block was not received by any other nodes and will "
-"probably not be accepted!"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Generated (not accepted)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "From: "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Received with: "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Payment to yourself"),
-QT_TRANSLATE_NOOP("bitcoin-core", "To: "),
-QT_TRANSLATE_NOOP("bitcoin-core", " Generating"),
-QT_TRANSLATE_NOOP("bitcoin-core", "(not connected)"),
-QT_TRANSLATE_NOOP("bitcoin-core", " %d connections %d blocks %d transactions"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet already encrypted."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Enter the new passphrase to the wallet.\n"
-"Please use a passphrase of 10 or more random characters, or eight or more "
-"words."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error: The supplied passphrase was too short."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE "
-"ALL OF YOUR BITCOINS!\n"
-"Are you sure you wish to encrypt your wallet?"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Please re-enter your new wallet passphrase."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error: the supplied passphrases didn't match."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet encryption failed."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Wallet Encrypted.\n"
-"Remember that encrypting your wallet cannot fully protect your bitcoins from "
-"being stolen by malware infecting your computer."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet is unencrypted, please encrypt it first."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Enter the new passphrase for the wallet."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Re-enter the new passphrase for the wallet."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet Passphrase Changed."),
-QT_TRANSLATE_NOOP("bitcoin-core", "New Receiving Address"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"You should use a new address for each payment you receive.\n"
-"\n"
-"Label"),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>Status:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", ", has not been successfully broadcast yet"),
-QT_TRANSLATE_NOOP("bitcoin-core", ", broadcast through %d node"),
-QT_TRANSLATE_NOOP("bitcoin-core", ", broadcast through %d nodes"),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>Date:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>Source:</b> Generated<br>"),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>From:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", "unknown"),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>To:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", " (yours, label: "),
-QT_TRANSLATE_NOOP("bitcoin-core", " (yours)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>Credit:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", "(%s matures in %d more blocks)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "(not accepted)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>Debit:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>Transaction fee:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", "<b>Net amount:</b> "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Message:"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Comment:"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"Generated coins must wait 120 blocks before they can be spent. When you "
-"generated this block, it was broadcast to the network to be added to the "
-"block chain. If it fails to get into the chain, it will change to \"not "
-"accepted\" and not be spendable. This may occasionally happen if another "
-"node generates a block within a few seconds of yours."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write autostart/bitcoin.desktop file"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Main"),
-QT_TRANSLATE_NOOP("bitcoin-core", "&Start Bitcoin on window system startup"),
-QT_TRANSLATE_NOOP("bitcoin-core", "&Minimize on close"),
-QT_TRANSLATE_NOOP("bitcoin-core", "version %s"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error in amount "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Send Coins"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Amount exceeds your balance "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Total exceeds your balance when the "),
-QT_TRANSLATE_NOOP("bitcoin-core", " transaction fee is included "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Payment sent "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Sending..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Invalid address "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Sending %s to %s"),
-QT_TRANSLATE_NOOP("bitcoin-core", "CANCELLED"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Cancelled"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Transfer cancelled "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Error: "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Connecting..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Unable to connect"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Requesting public key..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Received public key..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Recipient is not accepting transactions sent by IP address"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Transfer was not accepted"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Invalid response received"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Creating transaction..."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"This transaction requires a transaction fee of at least %s because of its "
-"amount, complexity, or use of recently received funds"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Transaction creation failed"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Transaction aborted"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Lost connection, transaction cancelled"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Sending payment..."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"The transaction was rejected. This might happen if some of the coins in "
-"your wallet were already spent, such as if you used a copy of wallet.dat and "
-"coins were spent in the copy but not marked as spent here."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Waiting for confirmation..."),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"The payment was sent, but the recipient was unable to verify it.\n"
-"The transaction is recorded and will credit to the recipient,\n"
-"but the comment information will be blank."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Payment was sent, but an invalid response was received"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Payment completed"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Name"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Address"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Label"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Address"),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
-"This is one of your own addresses for receiving payments and cannot be "
-"entered in the address book. "),
-QT_TRANSLATE_NOOP("bitcoin-core", "Edit Address"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Edit Address Label"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Add Address"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin - Generating"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin - (not connected)"),
-QT_TRANSLATE_NOOP("bitcoin-core", "&Open Bitcoin"),
-QT_TRANSLATE_NOOP("bitcoin-core", "&Send Bitcoins"),
-QT_TRANSLATE_NOOP("bitcoin-core", "O&ptions..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "E&xit"),
-QT_TRANSLATE_NOOP("bitcoin-core", "Program has crashed and will terminate. "),
-QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Please check that your computer's date and time are correct. If "
"your clock is wrong Bitcoin will not work properly."),
QT_TRANSLATE_NOOP("bitcoin-core", "beta"),
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 30a561dcb4..46c57e2fc6 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -39,6 +39,7 @@ bool CWallet::AddCryptedKey(const vector<unsigned char> &vchPubKey, const vector
else
return CWalletDB(strWalletFile).WriteCryptedKey(vchPubKey, vchCryptedSecret);
}
+ return false;
}
bool CWallet::Unlock(const string& strWalletPassphrase)