svn commit: r487374 - head/graphics/diffpdf/files
Dirk Meyer
dinoex at FreeBSD.org
Thu Dec 13 17:10:55 UTC 2018
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 <poppler-version.h>
+ #include <QApplication>
+ #include <QHBoxLayout>
+ #include <QSettings>
+@@ -52,7 +51,7 @@ AboutForm::AboutForm(QWidget *parent) :
+ "</ul>"
+ "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("<table>"
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 <poppler-qt4.h>
++#include <poppler-qt5.h>
+ #include <QMetaType>
+ #include <QPair>
+ #include <QPixmap>
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 <poppler-version.h>
+ #include <QApplication>
+ #include <QFile>
+ #include <QKeySequence>
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 <QDragEnterEvent>
+ #include <QDragEnterEvent>
+ #include <QMouseEvent>
++#include <QMimeData>
+
+ 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 <QDragEnterEvent>
+ #include <QDragEnterEvent>
++#include <QMimeData>
+
+
+ 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 <tr1/memory>
+ #endif
+-#include <poppler-qt4.h>
++#include <poppler-qt5.h>
+ #include <QBrush>
+ #include <QList>
+ #include <QMainWindow>
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<QString, Qt::PenStyle> 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);
More information about the svn-ports-all
mailing list