Revert 0163949..fc1a317

This rolls back to commit 016394940f.
2014-01-26 10:37:56 +11:00 · 2014-01-26 10:37:56 +11:00 · 0621bb78c2
parent fc1a317b65
commit 0621bb78c2
9 changed files with 69 additions and 99 deletions
--- a/contrib/macdeploy/fancy.plist
+++ b/contrib/macdeploy/fancy.plist
@ -22,7 +22,7 @@
 			<integer>370</integer>
 			<integer>156</integer>
 		</array>
-		<key>Dogecoin-Qt.app</key>
+		<key>Litecoin-Qt.app</key>
 		<array>
 			<integer>128</integer>
 			<integer>156</integer>
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@ -763,7 +763,7 @@ if config.dmg is not None:
                items_positions.append(itemscript.substitute(params))

        params = {
-            "disk" : "Dogecoin-Qt",
+            "disk" : "Litecoin-Qt",
            "window_bounds" : "300,300,800,620",
            "icon_size" : "96",
            "background_commands" : "",
--- a/dogecoin-qt.pro
+++ b/dogecoin-qt.pro
@ -27,8 +27,11 @@ UI_DIR = build

 # use: qmake "RELEASE=1"
 contains(RELEASE, 1) {
-    # Mac: compile for maximum compatibility (10.6, 64-bit)
-    macx:QMAKE_MACOSX_DEPLOYMENT_TARGET=10.6
+    # Mac: compile for maximum compatibility (10.5, 32-bit)
+    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+    macx:QMAKE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+    macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+
    !win32:!macx {
        # Linux: static link and extra security (see: https://wiki.debian.org/Hardening)
        LIBS += -Wl,-Bstatic -Wl,-z,relro -Wl,-z,now
@ -66,6 +69,7 @@ contains(USE_QRCODE, 1) {
 contains(USE_UPNP, -) {
    message(Building without UPNP support)
 } else {
+    message(Building with UPNP support)
    count(USE_UPNP, 0) {
        USE_UPNP=1
    }
@ -99,34 +103,11 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
    QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
 }

-macx: {
-    DEPSDIR=/usr/local/
-    HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
-    OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
-    LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices \
-        $$DEPSDIR/lib/libdb_cxx.a \
-        $$DEPSDIR/lib/libboost_system-mt.a \
-        $$DEPSDIR/lib/libboost_filesystem-mt.a \
-        $$DEPSDIR/lib/libboost_program_options-mt.a \
-        $$DEPSDIR/lib/libboost_thread-mt.a \
-        $$DEPSDIR/lib/libboost_chrono-mt.a
-    DEFINES += MAC_OSX
-    ICON = src/qt/res/icons/Dogecoin.icns
-    QMAKE_INFO_PLIST=src/mac/Info.plist
-    # osx 10.9 has changed the stdlib default to libc++. To prevent some link error, you may need to use libstdc++
-    QMAKE_CXXFLAGS += -stdlib=libstdc++
-
-    #one of these is unnecessary, perhaps all
-    QMAKE_CFLAGS_THREAD += -pthread
-    QMAKE_LFLAGS_THREAD += -pthread
-    QMAKE_CXXFLAGS_THREAD += -pthread
-}
-
 INCLUDEPATH += src/leveldb/include src/leveldb/helpers
 LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
 !win32 {
    # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
-    genleveldb.commands = cd $$PWD/src/leveldb && chmod +x build_detect_platform && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
 } else {
    # make an educated guess about what the ranlib command is called
    isEmpty(QMAKE_RANLIB) {
@ -385,12 +366,11 @@ OTHER_FILES += README.md \
    src/test/*.cpp \
    src/test/*.h \
    src/qt/test/*.cpp \
-    src/qt/test/*.h \
-    src/mac/Info.plist
+    src/qt/test/*.h

 # platform specific defaults, if not overridden on command line
 isEmpty(BOOST_LIB_SUFFIX) {
-    macx:BOOST_LIB_SUFFIX = -mt.a
+    macx:BOOST_LIB_SUFFIX = -mt
    win32:BOOST_LIB_SUFFIX = -mgw44-mt-s-1_50
 }

@ -398,12 +378,24 @@ isEmpty(BOOST_THREAD_LIB_SUFFIX) {
    BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
 }

+isEmpty(BDB_LIB_PATH) {
+    macx:BDB_LIB_PATH = /opt/local/lib/db48
+}
+
+isEmpty(BDB_LIB_SUFFIX) {
+    macx:BDB_LIB_SUFFIX = -4.8
+}
+
+isEmpty(BDB_INCLUDE_PATH) {
+    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
+}
+
 isEmpty(BOOST_LIB_PATH) {
-    macx:BOOST_LIB_PATH = /usr/local/lib
+    macx:BOOST_LIB_PATH = /opt/local/lib
 }

 isEmpty(BOOST_INCLUDE_PATH) {
-    macx:BOOST_INCLUDE_PATH = /usr/local/include
+    macx:BOOST_INCLUDE_PATH = /opt/local/include
 }

 win32:DEFINES += WIN32 WIN32_LEAN_AND_MEAN
@ -427,18 +419,25 @@ win32:!contains(MINGW_THREAD_BUGFIX, 0) {
    DEFINES += _FILE_OFFSET_BITS=64
 }

+macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
+macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
+macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices
+macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
+macx:ICON = src/qt/res/icons/litecoin.icns
+macx:QMAKE_CFLAGS_THREAD += -pthread
+macx:QMAKE_LFLAGS_THREAD += -pthread
+macx:QMAKE_CXXFLAGS_THREAD += -pthread
+macx:QMAKE_INFO_PLIST = share/qt/Info.plist

 # Set libraries and includes at end, to use platform-defined defaults if not overridden
 INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
 LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
 LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
 # -lgdi32 has to happen after -lcrypto (see  #681)
-
-win32: {
-    LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
-    LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
-    LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
-}
+win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
+LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
+win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX

 contains(RELEASE, 1) {
    !win32:!macx {
--- a/share/qt/Info.plist
+++ b/share/qt/Info.plist
@ -1,13 +1,13 @@
 <?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">
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
 <dict>
 	<key>CFBundleIconFile</key>
 	<string>litecoin.icns</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$VERSION, Copyright © 2009-$YEAR The Dogecoin developers</string>
+	<string>$VERSION, Copyright © 2009-$YEAR The Bitcoin developers</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$VERSION</string>
 	<key>CFBundleVersion</key>
@ -15,22 +15,22 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>Dogecoin-Qt</string>
+	<string>Litecoin-Qt</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.dogecoin.wallet-qt</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>org.litecoin.LitecoinPayment</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>litecoin</string>
-			</array>
-		</dict>
-	</array>
+	<string>org.litecoin.Litecoin-Qt</string>
+        <key>CFBundleURLTypes</key>
+        <array>
+          <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLName</key>
+            <string>org.litecoin.LitecoinPayment</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+              <string>litecoin</string>
+            </array>
+          </dict>
+        </array>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 </dict>
--- a/src/compat.h
+++ b/src/compat.h
@ -28,10 +28,6 @@
 #endif

 typedef u_int SOCKET;
-#ifdef MAC_OSX
-#define MSG_NOSIGNAL        SO_NOSIGPIPE
-#endif
-
 #ifdef WIN32
 #define MSG_NOSIGNAL        0
 #define MSG_DONTWAIT        0
--- a/src/leveldb/build_detect_platform
+++ b/src/leveldb/build_detect_platform
--- a/src/mac/Info.plist
+++ b/src/mac/Info.plist
@ -1,26 +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>CFBundleShortVersionString</key>
-        <string>1.5.0.1</string>
-	<key>CFBundleVersion</key>
-        <string>1.5 Alpha 1</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>CFBundleIconFile</key>
-	<string>Dogecoin.icns</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>© Dogecoin</string>
-	<key>CFBundleSignature</key>
-	<string>DOGE</string>
-	<key>CFBundleExecutable</key>
-	<string>Dogecoin-Qt</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.dogecoin.wallet-qt</string>
-	<key>CFBundleName</key>
-	<string>Dogecoin-Qt</string>
-</dict>
-</plist>
--- a/src/makefile.osx
+++ b/src/makefile.osx
@ -4,20 +4,21 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

-# Mac OS X makefile for Dogecoin
+# Mac OS X makefile for bitcoin
 # Originally by Laszlo Hanyecz (solar@heliacal.net)

-STATIC=yes
-CXX=c++
-DEPSDIR=/usr/local
+CXX=llvm-g++
+DEPSDIR=/opt/local

 INCLUDEPATHS= \
 -I"$(CURDIR)" \
 -I"$(CURDIR)"/obj \
- -I"$(DEPSDIR)/include" 
+ -I"$(DEPSDIR)/include" \
+ -I"$(DEPSDIR)/include/db48"

 LIBPATHS= \
- -L"$(DEPSDIR)/lib" 
+ -L"$(DEPSDIR)/lib" \
+ -L"$(DEPSDIR)/lib/db48"

 USE_UPNP:=1
 USE_IPV6:=1
@ -31,20 +32,20 @@ ifdef STATIC
 TESTLIBS += \
 $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
 LIBS += \
- $(DEPSDIR)/lib/libdb_cxx.a \
+ $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
 $(DEPSDIR)/lib/libboost_system-mt.a \
 $(DEPSDIR)/lib/libboost_filesystem-mt.a \
 $(DEPSDIR)/lib/libboost_program_options-mt.a \
 $(DEPSDIR)/lib/libboost_thread-mt.a \
 $(DEPSDIR)/lib/libboost_chrono-mt.a \
- -lssl \
- -lcrypto \
+ $(DEPSDIR)/lib/libssl.a \
+ $(DEPSDIR)/lib/libcrypto.a \
 -lz
 else
 TESTLIBS += \
 -lboost_unit_test_framework-mt
 LIBS += \
- -ldb_cxx \
+ -ldb_cxx-4.8 \
 -lboost_system-mt \
 -lboost_filesystem-mt \
 -lboost_program_options-mt \
@ -62,7 +63,7 @@ ifdef RELEASE
 # Compile for maximum compatibility and smallest size.
 # This requires that dependencies are compiled
 # the same way.
-CFLAGS = -mmacosx-version-min=10.6 -O3
+CFLAGS = -mmacosx-version-min=10.5 -arch i386 -O3
 else
 DEBUGFLAGS = -g
 endif
@ -143,7 +144,7 @@ LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
 DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
 DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
 leveldb/libleveldb.a:
-	@echo "Building LevelDB ..." && cd leveldb && chmod +x build_detect_platform && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
+	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..

 # auto-generated dependencies:
 -include obj/*.P
--- a/src/qt/res/icons/dogecoin.icns
+++ b/src/qt/res/icons/dogecoin.icns