Merge pull request #441 from aguycalled/fix-makefile-qt

Fix Gitian build
navcoin · Apr 15, 2019 · afa2e8b · afa2e8b
2 parents 5ba6b6a + a185018
commit afa2e8b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -470,12 +470,12 @@ qt_navcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(NAVCOIN_INCLUDES) $(CURL_INCLUDES) $(N
 	$(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
 qt_navcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
-qt_navcoin_qt_SOURCES=qt/navcoin.cpp
+qt_navcoin_qt_SOURCES = qt/navcoin.cpp
 if TARGET_DARWIN
-        qt_navcoin_qt_SOURCES+=$(NAVCOIN_MM)
+  qt_navcoin_qt_SOURCES += $(NAVCOIN_MM)
 endif
 if TARGET_WINDOWS
-	qt_navcoin_qt_SOURCES += $(NAVCOIN_RC)
+  qt_navcoin_qt_SOURCES+=$(NAVCOIN_RC)
 endif
 qt_navcoin_qt_LDADD = qt/libnavcoinqt.a $(LIBNAVCOIN_SERVER)
 if ENABLE_WALLET

diff --git a/src/qt/communityfunddisplay.cpp b/src/qt/communityfunddisplay.cpp
@@ -93,7 +93,9 @@ void CommunityFundDisplay::refresh()
         std::string expiry_title = "Rejected on: ";
         std::time_t t = static_cast<time_t>(proptime);
         std::stringstream ss;
-        ss << std::put_time(std::gmtime(&t), "%c %Z");
+        char buf[24];
+        if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+	    ss << buf;
         ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
         ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
     }
@@ -106,7 +108,9 @@ void CommunityFundDisplay::refresh()
             std::string expiry_title = "Expired on: ";
             std::time_t t = static_cast<time_t>(proptime);
             std::stringstream ss;
-            ss << std::put_time(std::gmtime(&t), "%c %Z");
+            char buf[24];
+            if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+		ss << buf;
             ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
             ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
         }

diff --git a/src/qt/communityfunddisplaydetailed.cpp b/src/qt/communityfunddisplaydetailed.cpp
@@ -109,7 +109,9 @@ void CommunityFundDisplayDetailed::setProposalLabels() const
         std::string expiry_title = "Rejected on: ";
         std::time_t t = static_cast<time_t>(proptime);
         std::stringstream ss;
-        ss << std::put_time(std::gmtime(&t), "%c %Z");
+        char buf[24];
+        if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+            ss << buf;
         ui->labelExpiresInTitle->setText(QString::fromStdString(expiry_title));
         ui->labelExpiresIn->setText(QString::fromStdString(ss.str().erase(10, 9)));
     }
@@ -118,7 +120,9 @@ void CommunityFundDisplayDetailed::setProposalLabels() const
             std::string expiry_title = "Expired on: ";
             std::time_t t = static_cast<time_t>(proptime);
             std::stringstream ss;
-            ss << std::put_time(std::gmtime(&t), "%c %Z");
+            char buf[24];
+            if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+                ss << buf;
             ui->labelExpiresInTitle->setText(QString::fromStdString(expiry_title));
             ui->labelExpiresIn->setText(QString::fromStdString(ss.str().erase(10, 9)));
         }

diff --git a/src/qt/communityfunddisplaypaymentrequest.cpp b/src/qt/communityfunddisplaypaymentrequest.cpp
@@ -81,7 +81,9 @@ void CommunityFundDisplayPaymentRequest::refresh()
         std::string duration_title = "Accepted on: ";
         std::time_t t = static_cast<time_t>(proptime);
         std::stringstream ss;
-        ss << std::put_time(std::gmtime(&t), "%c %Z");
+        char buf[24];
+        if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+            ss << buf;
         ui->labelTitleDuration->setText(QString::fromStdString(duration_title));
         ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
     }
@@ -101,7 +103,9 @@ void CommunityFundDisplayPaymentRequest::refresh()
         std::string expiry_title = "Rejected on: ";
         std::time_t t = static_cast<time_t>(proptime);
         std::stringstream ss;
-        ss << std::put_time(std::gmtime(&t), "%c %Z");
+        char buf[24];
+        if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+            ss << buf;
         ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
         ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
     }
@@ -114,7 +118,9 @@ void CommunityFundDisplayPaymentRequest::refresh()
             std::string expiry_title = "Expired on: ";
             std::time_t t = static_cast<time_t>(proptime);
             std::stringstream ss;
-            ss << std::put_time(std::gmtime(&t), "%c %Z");
+            char buf[24];
+            if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+                ss << buf;
             ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
             ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
         }

diff --git a/src/qt/communityfunddisplaypaymentrequestdetailed.cpp b/src/qt/communityfunddisplaypaymentrequestdetailed.cpp
@@ -125,7 +125,9 @@ void CommunityFundDisplayPaymentRequestDetailed::setPrequestLabels() const
         std::string duration_title = "Accepted on: ";
         std::time_t t = static_cast<time_t>(proptime);
         std::stringstream ss;
-        ss << std::put_time(std::gmtime(&t), "%c %Z");
+        char buf[24];
+        if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+            ss << buf;
         ui->labelPrequestExpiryTitle->setText(QString::fromStdString(duration_title));
         ui->labelPrequestExpiry->setText(QString::fromStdString(ss.str().erase(10, 9)));
     }
@@ -135,7 +137,9 @@ void CommunityFundDisplayPaymentRequestDetailed::setPrequestLabels() const
         std::string expiry_title = "Rejected on: ";
         std::time_t t = static_cast<time_t>(proptime);
         std::stringstream ss;
-        ss << std::put_time(std::gmtime(&t), "%c %Z");
+        char buf[24];
+        if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+            ss << buf;
         ui->labelPrequestExpiryTitle->setText(QString::fromStdString(expiry_title));
         ui->labelPrequestExpiry->setText(QString::fromStdString(ss.str().erase(10, 9)));
     }
@@ -146,7 +150,9 @@ void CommunityFundDisplayPaymentRequestDetailed::setPrequestLabels() const
             std::string expiry_title = "Expired on: ";
             std::time_t t = static_cast<time_t>(proptime);
             std::stringstream ss;
-            ss << std::put_time(std::gmtime(&t), "%c %Z");
+            char buf[24];
+            if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
+                ss << buf;
             ui->labelPrequestExpiryTitle->setText(QString::fromStdString(expiry_title));
             ui->labelPrequestExpiry->setText(QString::fromStdString(ss.str().erase(10, 9)));
         }