Forgot to delete the patches

This commit is contained in:
rsadowski 2022-08-14 14:02:07 +00:00
parent c4b63256c9
commit 3a479c0f05
3 changed files with 0 additions and 47 deletions

View File

@ -1,19 +0,0 @@
Index: Qt4Qt5/Qsci/qsciscintillabase.h
--- Qt4Qt5/Qsci/qsciscintillabase.h.orig
+++ Qt4Qt5/Qsci/qsciscintillabase.h
@@ -26,6 +26,7 @@
#include <QAbstractScrollArea>
#include <QByteArray>
#include <QPoint>
+#include <QUrl>
#include <QTimer>
#include <Qsci/qsciglobal.h>
@@ -37,7 +38,6 @@ class QImage;
class QMimeData;
class QPainter;
class QPixmap;
-class QUrl;
QT_END_NAMESPACE
class QsciScintillaQt;

View File

@ -1,12 +0,0 @@
Index: Qt4Qt5/qscintilla.pro
--- Qt4Qt5/qscintilla.pro.orig
+++ Qt4Qt5/qscintilla.pro
@@ -72,7 +72,7 @@ unix:!macx {
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
-target.path = $$[QT_INSTALL_LIBS]
+target.path = ${LOCALBASE}/lib
INSTALLS += target
header.path = $$[QT_INSTALL_HEADERS]

View File

@ -1,16 +0,0 @@
32-bits consumers fix for
"undefined reference to Scintilla::RunStyles<long, char>::RunStyles()"
Index: src/RunStyles.cpp
--- src/RunStyles.cpp.orig
+++ src/RunStyles.cpp
@@ -308,7 +308,8 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
template class Scintilla::RunStyles<int, int>;
template class Scintilla::RunStyles<int, char>;
-#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
+#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU || \
+ ( defined(__OpenBSD__) && !defined(__LP64__) )
template class Scintilla::RunStyles<ptrdiff_t, int>;
template class Scintilla::RunStyles<ptrdiff_t, char>;
#endif