From 924adc9b823b352f8ef167880bde697d486437d1 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Thu, 21 Aug 2014 21:06:49 +0200 Subject: [PATCH 1/3] changed to private git repo --- contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml | 2 +- contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml | 4 ++-- contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml b/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml index e713b18272..c055f43675 100644 --- a/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml +++ b/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml @@ -23,7 +23,7 @@ packages: - "libqt4-test" reference_datetime: "2014-01-10 00:00:00" remotes: -- "url": "https://github.com/darkcoinproject/darkcoin.git" +- "url": "https://github.com/schinzelh/darkcoin-rc.git" "dir": "darkcoin" files: - "bitcoin-deps-linux32-gitian-r6.zip" diff --git a/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml b/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml index fda2b75b65..c1f1f265fa 100644 --- a/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml +++ b/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml @@ -14,7 +14,7 @@ packages: reference_datetime: "2014-01-10 00:00:00" remotes: -- "url": "https://github.com/darkcoinproject/darkcoin.git" +- "url": "https://github.com/schinzelh/darkcoin-rc.git" "dir": "darkcoin" files: - "osx-native-depends-r3.tar.gz" @@ -80,4 +80,4 @@ script: | /usr/bin/install -c contrib/macdeploy/DS_Store dist/.DS_Store cd dist; ln -s /Applications Applications; cd .. genisoimage -no-cache-inodes -l -probe -V "DarkCoin-Qt" -no-pad -r -apple -o DarkCoin-Qt.dmg dist - dmg dmg DarkCoin-Qt.dmg /home/ubuntu/out/DarkCoin-Qt.dmg \ No newline at end of file + dmg dmg DarkCoin-Qt.dmg /home/ubuntu/out/DarkCoin-Qt.dmg diff --git a/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml b/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml index e1e2111db2..6598e8aceb 100644 --- a/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml +++ b/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml @@ -13,7 +13,7 @@ packages: - "faketime" reference_datetime: "2014-01-10 00:00:00" remotes: -- "url": "https://github.com/darkcoinproject/darkcoin.git" +- "url": "https://github.com/schinzelh/darkcoin-rc.git" "dir": "darkcoin" files: - "qt-win32-4.8.5-gitian-r5.zip" @@ -112,4 +112,4 @@ script: | rm -rf $TEMPDIR mkdir -p $TEMPDIR cd $TEMPDIR - tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME \ No newline at end of file + tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME From df1dd730399fbafa8526eb3bc88033a218d1e9f3 Mon Sep 17 00:00:00 2001 From: Evan Duffield Date: Thu, 21 Aug 2014 13:25:07 -0700 Subject: [PATCH 2/3] merged rc5 back into rc4 --- src/clientversion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clientversion.h b/src/clientversion.h index 19d1c0d041..6a7b280934 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,7 +9,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 10 #define CLIENT_VERSION_REVISION 12 -#define CLIENT_VERSION_BUILD 31 +#define CLIENT_VERSION_BUILD 32 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true From 231bfa3f324ad184b4e9ce2f7bf81fc5e4167625 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Fri, 22 Aug 2014 00:11:37 +0200 Subject: [PATCH 3/3] fixed build --- bitcoin-qt.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index a0e16b505d..95577ccf5a 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,3 +1,6 @@ +# Hack around https://bugreports.qt-project.org/browse/QTBUG-22829 +QMAKE_MOC = $$QMAKE_MOC -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED + TEMPLATE = app TARGET = darkcoin-qt macx:TARGET = "DarkCoin-Qt"