From owner-svn-ports-all@freebsd.org Thu Dec 13 17:10:55 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 192FA132BEF1; Thu, 13 Dec 2018 17:10:55 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B02DF682F2; Thu, 13 Dec 2018 17:10:54 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1A8622B67; Thu, 13 Dec 2018 17:10:54 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBDHAsQv008348; Thu, 13 Dec 2018 17:10:54 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBDHAqIj008338; Thu, 13 Dec 2018 17:10:52 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201812131710.wBDHAqIj008338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Thu, 13 Dec 2018 17:10:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487374 - head/graphics/diffpdf/files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: head/graphics/diffpdf/files X-SVN-Commit-Revision: 487374 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B02DF682F2 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-1.21 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.82)[-0.821,0]; NEURAL_HAM_SHORT(-0.39)[-0.389,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2018 17:10:55 -0000 Author: dinoex Date: Thu Dec 13 17:10:52 2018 New Revision: 487374 URL: https://svnweb.freebsd.org/changeset/ports/487374 Log: - use qt5 Obtained from: debian Added: head/graphics/diffpdf/files/ head/graphics/diffpdf/files/patch-aboutform.cpp (contents, props changed) head/graphics/diffpdf/files/patch-diffpdf.pro (contents, props changed) head/graphics/diffpdf/files/patch-generic.hpp (contents, props changed) head/graphics/diffpdf/files/patch-helpform.cpp (contents, props changed) head/graphics/diffpdf/files/patch-label.cpp (contents, props changed) head/graphics/diffpdf/files/patch-lineedit.cpp (contents, props changed) head/graphics/diffpdf/files/patch-main.cpp (contents, props changed) head/graphics/diffpdf/files/patch-mainwindow.hpp (contents, props changed) head/graphics/diffpdf/files/patch-optionsform.cpp (contents, props changed) Added: head/graphics/diffpdf/files/patch-aboutform.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-aboutform.cpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,19 @@ +--- aboutform.cpp.orig 2013-10-15 07:01:22 UTC ++++ aboutform.cpp +@@ -11,7 +11,6 @@ + */ + + #include "aboutform.hpp" +-#include + #include + #include + #include +@@ -52,7 +51,7 @@ AboutForm::AboutForm(QWidget *parent) : + "" + "I also provide training and consultancy in C++, Go, Python 2, " + "Python 3, C++/Qt, and PyQt4.").arg(qApp->applicationName()) +- .arg(Version).arg(qVersion()).arg(POPPLER_VERSION)); ++ .arg(Version).arg(qVersion()).arg("Qt 5")); + QTextBrowser *contributorsBrowser = new QTextBrowser; + contributorsBrowser->setReadOnly(true); + contributorsBrowser->setHtml(tr("" Added: head/graphics/diffpdf/files/patch-diffpdf.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-diffpdf.pro Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,46 @@ +--- diffpdf.pro.orig 2013-10-15 07:01:22 UTC ++++ diffpdf.pro +@@ -31,35 +31,36 @@ TRANSLATIONS += diffpdf_fr.ts + TRANSLATIONS += diffpdf_de.ts + TRANSLATIONS += diffpdf_es.ts + CODECFORTR = UTF-8 +-LIBS += -lpoppler-qt4 ++LIBS += -lpoppler-qt5 ++QT += widgets printsupport + win32 { + CONFIG += release + } + exists($(HOME)/opt/poppler024/) { + message(Using locally built Poppler library) + INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/cpp +- INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt4 ++ INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt5 + LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler024/lib -L$(HOME)/opt/poppler024/lib + } else { + exists(/poppler_lib) { + message(Using locally built Poppler library on Windows) + INCLUDEPATH += /c/poppler_lib/include/poppler/cpp +- INCLUDEPATH += /c/poppler_lib/include/poppler/qt4 ++ INCLUDEPATH += /c/poppler_lib/include/poppler/qt5 + LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin + } else { +- exists(/usr/include/poppler/qt4) { ++ exists(/usr/include/poppler/qt5) { + INCLUDEPATH += /usr/include/poppler/cpp +- INCLUDEPATH += /usr/include/poppler/qt4 ++ INCLUDEPATH += /usr/include/poppler/qt5 + } else { + INCLUDEPATH += /usr/local/include/poppler/cpp +- INCLUDEPATH += /usr/local/include/poppler/qt4 ++ INCLUDEPATH += /usr/local/include/poppler/qt5 + } + } + } + #exists($(HOME)/opt/podofo09/) { + # message(Using locally built PoDoFo library) + # INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/cpp +-# INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt4 ++# INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt5 + # LIBS += -Wl,-rpath -Wl,$(HOME)/opt/podofo09/lib64 -Wl,-L$(HOME)/opt/podofo09/lib64 + #} else { + # exists(/usr/include/podofo) { Added: head/graphics/diffpdf/files/patch-generic.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-generic.hpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,11 @@ +--- generic.hpp.orig 2013-10-15 07:01:22 UTC ++++ generic.hpp +@@ -12,7 +12,7 @@ + for more details. + */ + +-#include ++#include + #include + #include + #include Added: head/graphics/diffpdf/files/patch-helpform.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-helpform.cpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,10 @@ +--- helpform.cpp.orig 2013-10-15 07:01:22 UTC ++++ helpform.cpp +@@ -11,7 +11,6 @@ + */ + + #include "helpform.hpp" +-#include + #include + #include + #include Added: head/graphics/diffpdf/files/patch-label.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-label.cpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,10 @@ +--- label.cpp.orig 2013-10-15 07:01:22 UTC ++++ label.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + Label::Label(QWidget *parent) : QLabel(parent) + { Added: head/graphics/diffpdf/files/patch-lineedit.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-lineedit.cpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,10 @@ +--- lineedit.cpp.orig 2013-10-15 07:01:22 UTC ++++ lineedit.cpp +@@ -14,6 +14,7 @@ + #include "lineedit.hpp" + #include + #include ++#include + + + LineEdit::LineEdit(QWidget *parent) : QLineEdit(parent) Added: head/graphics/diffpdf/files/patch-main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-main.cpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,10 @@ +--- main.cpp.orig 2013-10-15 07:01:22 UTC ++++ main.cpp +@@ -31,7 +31,6 @@ int main(int argc, char *argv[]) + app.setOrganizationDomain("qtrac.eu"); + app.setApplicationName("DiffPDF"); + app.setWindowIcon(QIcon(":/icon.png")); +- QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); + + QTextStream out(stdout); + QStringList args = app.arguments().mid(1); Added: head/graphics/diffpdf/files/patch-mainwindow.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-mainwindow.hpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,11 @@ +--- mainwindow.hpp.orig 2013-10-15 07:01:22 UTC ++++ mainwindow.hpp +@@ -19,7 +19,7 @@ + #else + #include + #endif +-#include ++#include + #include + #include + #include Added: head/graphics/diffpdf/files/patch-optionsform.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diffpdf/files/patch-optionsform.cpp Thu Dec 13 17:10:52 2018 (r487374) @@ -0,0 +1,26 @@ +--- optionsform.cpp.orig 2013-10-15 07:01:22 UTC ++++ optionsform.cpp +@@ -76,9 +76,9 @@ void OptionsForm::createWidgets() + << qMakePair(tr("Diagonal \\"), Qt::FDiagPattern) + << qMakePair(tr("Diagonal Cross"), Qt::DiagCrossPattern)) + brushStyleComboBox->addItem(brushSwatch(pair.second, color), +- pair.first, pair.second); ++ pair.first, QVariant::fromValue(pair.second)); + brushStyleComboBox->setCurrentIndex(brushStyleComboBox->findData( +- brush.style())); ++ QVariant::fromValue(brush.style()))); + + penStyleComboBox = new QComboBox; + typedef QPair PenPair; +@@ -90,9 +90,9 @@ void OptionsForm::createWidgets() + << qMakePair(tr("Dash-Dotted"), Qt::DashDotLine) + << qMakePair(tr("Dash-Dot-Dotted"), Qt::DashDotDotLine)) + penStyleComboBox->addItem(penStyleSwatch(pair.second, color), +- pair.first, pair.second); ++ pair.first, QVariant::fromValue(pair.second)); + penStyleComboBox->setCurrentIndex(penStyleComboBox->findData( +- pen.style())); ++ QVariant::fromValue(pen.style()))); + + alphaSpinBox = new QSpinBox; + alphaSpinBox->setRange(1, 100);