Skip to content

Commit afa2e8b

Browse files
proletesseractproletesseract
authored
Merge pull request #441 from aguycalled/fix-makefile-qt
Fix Gitian build
2 parents 5ba6b6a + a185018 commit afa2e8b

5 files changed

Lines changed: 33 additions & 13 deletions

‎src/Makefile.qt.include‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,12 @@ qt_navcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(NAVCOIN_INCLUDES) $(CURL_INCLUDES) $(N
470470
$(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
471471
qt_navcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
472472

473-
qt_navcoin_qt_SOURCES=qt/navcoin.cpp
473+
qt_navcoin_qt_SOURCES = qt/navcoin.cpp
474474
if TARGET_DARWIN
475-
qt_navcoin_qt_SOURCES+=$(NAVCOIN_MM)
475+
qt_navcoin_qt_SOURCES += $(NAVCOIN_MM)
476476
endif
477477
if TARGET_WINDOWS
478-
qt_navcoin_qt_SOURCES += $(NAVCOIN_RC)
478+
qt_navcoin_qt_SOURCES+=$(NAVCOIN_RC)
479479
endif
480480
qt_navcoin_qt_LDADD = qt/libnavcoinqt.a $(LIBNAVCOIN_SERVER)
481481
if ENABLE_WALLET

‎src/qt/communityfunddisplay.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ void CommunityFundDisplay::refresh()
9393
std::string expiry_title = "Rejected on: ";
9494
std::time_t t = static_cast<time_t>(proptime);
9595
std::stringstream ss;
96-
ss << std::put_time(std::gmtime(&t), "%c %Z");
96+
char buf[24];
97+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
98+
ss << buf;
9799
ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
98100
ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
99101
}
@@ -106,7 +108,9 @@ void CommunityFundDisplay::refresh()
106108
std::string expiry_title = "Expired on: ";
107109
std::time_t t = static_cast<time_t>(proptime);
108110
std::stringstream ss;
109-
ss << std::put_time(std::gmtime(&t), "%c %Z");
111+
char buf[24];
112+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
113+
ss << buf;
110114
ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
111115
ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
112116
}

‎src/qt/communityfunddisplaydetailed.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ void CommunityFundDisplayDetailed::setProposalLabels() const
109109
std::string expiry_title = "Rejected on: ";
110110
std::time_t t = static_cast<time_t>(proptime);
111111
std::stringstream ss;
112-
ss << std::put_time(std::gmtime(&t), "%c %Z");
112+
char buf[24];
113+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
114+
ss << buf;
113115
ui->labelExpiresInTitle->setText(QString::fromStdString(expiry_title));
114116
ui->labelExpiresIn->setText(QString::fromStdString(ss.str().erase(10, 9)));
115117
}
@@ -118,7 +120,9 @@ void CommunityFundDisplayDetailed::setProposalLabels() const
118120
std::string expiry_title = "Expired on: ";
119121
std::time_t t = static_cast<time_t>(proptime);
120122
std::stringstream ss;
121-
ss << std::put_time(std::gmtime(&t), "%c %Z");
123+
char buf[24];
124+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
125+
ss << buf;
122126
ui->labelExpiresInTitle->setText(QString::fromStdString(expiry_title));
123127
ui->labelExpiresIn->setText(QString::fromStdString(ss.str().erase(10, 9)));
124128
}

‎src/qt/communityfunddisplaypaymentrequest.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ void CommunityFundDisplayPaymentRequest::refresh()
8181
std::string duration_title = "Accepted on: ";
8282
std::time_t t = static_cast<time_t>(proptime);
8383
std::stringstream ss;
84-
ss << std::put_time(std::gmtime(&t), "%c %Z");
84+
char buf[24];
85+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
86+
ss << buf;
8587
ui->labelTitleDuration->setText(QString::fromStdString(duration_title));
8688
ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
8789
}
@@ -101,7 +103,9 @@ void CommunityFundDisplayPaymentRequest::refresh()
101103
std::string expiry_title = "Rejected on: ";
102104
std::time_t t = static_cast<time_t>(proptime);
103105
std::stringstream ss;
104-
ss << std::put_time(std::gmtime(&t), "%c %Z");
106+
char buf[24];
107+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
108+
ss << buf;
105109
ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
106110
ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
107111
}
@@ -114,7 +118,9 @@ void CommunityFundDisplayPaymentRequest::refresh()
114118
std::string expiry_title = "Expired on: ";
115119
std::time_t t = static_cast<time_t>(proptime);
116120
std::stringstream ss;
117-
ss << std::put_time(std::gmtime(&t), "%c %Z");
121+
char buf[24];
122+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
123+
ss << buf;
118124
ui->labelTitleDuration->setText(QString::fromStdString(expiry_title));
119125
ui->labelDuration->setText(QString::fromStdString(ss.str().erase(10, 9)));
120126
}

‎src/qt/communityfunddisplaypaymentrequestdetailed.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ void CommunityFundDisplayPaymentRequestDetailed::setPrequestLabels() const
125125
std::string duration_title = "Accepted on: ";
126126
std::time_t t = static_cast<time_t>(proptime);
127127
std::stringstream ss;
128-
ss << std::put_time(std::gmtime(&t), "%c %Z");
128+
char buf[24];
129+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
130+
ss << buf;
129131
ui->labelPrequestExpiryTitle->setText(QString::fromStdString(duration_title));
130132
ui->labelPrequestExpiry->setText(QString::fromStdString(ss.str().erase(10, 9)));
131133
}
@@ -135,7 +137,9 @@ void CommunityFundDisplayPaymentRequestDetailed::setPrequestLabels() const
135137
std::string expiry_title = "Rejected on: ";
136138
std::time_t t = static_cast<time_t>(proptime);
137139
std::stringstream ss;
138-
ss << std::put_time(std::gmtime(&t), "%c %Z");
140+
char buf[24];
141+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
142+
ss << buf;
139143
ui->labelPrequestExpiryTitle->setText(QString::fromStdString(expiry_title));
140144
ui->labelPrequestExpiry->setText(QString::fromStdString(ss.str().erase(10, 9)));
141145
}
@@ -146,7 +150,9 @@ void CommunityFundDisplayPaymentRequestDetailed::setPrequestLabels() const
146150
std::string expiry_title = "Expired on: ";
147151
std::time_t t = static_cast<time_t>(proptime);
148152
std::stringstream ss;
149-
ss << std::put_time(std::gmtime(&t), "%c %Z");
153+
char buf[24];
154+
if (strftime(buf, sizeof(buf), "%c %Z", std::gmtime(&t)))
155+
ss << buf;
150156
ui->labelPrequestExpiryTitle->setText(QString::fromStdString(expiry_title));
151157
ui->labelPrequestExpiry->setText(QString::fromStdString(ss.str().erase(10, 9)));
152158
}

0 commit comments

Comments
 (0)