cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qscintilla: fix some consumers build on powerpc

Browse Source 
cad/openscad and databases/sqlitebrowser builds were failing with some
undefined references to "Scintilla::RunStyles<long, ...>"; use ptrdiff_t
variants on that arch. While here, regen a patch.

OK rsadowski@
This commit is contained in:
cwen 2020-06-12 22:40:41 +00:00
parent 64b887b9a1
commit 296714a075
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/qscintilla/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2020/02/29 08:19:59 rsadowski Exp $
# $OpenBSD: Makefile,v 1.28 2020/06/12 22:40:41 cwen Exp $
COMMENT = Qt port of the Scintilla source code editor
@ -6,7 +6,7 @@ COMMENT = Qt port of the Scintilla source code editor
VERSION = 2.11.4
DISTNAME = QScintilla-${VERSION}
PKGNAME = ${DISTNAME:L}
REVISION = 0
REVISION = 1
CATEGORIES = editors x11

4
editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Qt4Qt5_qscintilla_pro,v 1.5 2019/07/24 08:49:43 landry Exp $
$OpenBSD: patch-Qt4Qt5_qscintilla_pro,v 1.6 2020/06/12 22:40:41 cwen Exp $
Index: Qt4Qt5/qscintilla.pro
--- Qt4Qt5/qscintilla.pro.orig
+++ Qt4Qt5/qscintilla.pro
@@ -68,7 +68,7 @@ unix:!macx {
@@ -70,7 +70,7 @@ unix:!macx {
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE

18
editors/qscintilla/patches/patch-src_RunStyles_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_RunStyles_cpp,v 1.1 2020/06/12 22:40:41 cwen Exp $
powerpc 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(__powerpc__) )
template class Scintilla::RunStyles<ptrdiff_t, int>;
template class Scintilla::RunStyles<ptrdiff_t, char>;
#endif