Hi,

> http://build-failures.rhaalovely.net/powerpc/last/databases/sqlitebrowser.log
> http://build-failures.rhaalovely.net/powerpc/last/cad/openscad.log

See my geany mail [0] since the issue is exactly the same.

The below diff fixes the build of openscad and sqlitebrowser on macppc,
the runtime is fine as well. openscad suffers from what i suppose is a
QtSVG vs macppc OpenGL direct rendering issue (widgets are purple), but
unlike Krita that had it as well, the software is totally usable.

Comments/feedback are welcome,

Charlène.


[0] https://marc.info/?l=openbsd-ports&m=159188140009019&w=2


Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile    29 Feb 2020 08:19:59 -0000      1.27
+++ Makefile    11 Jun 2020 18:22:17 -0000
@@ -6,7 +6,7 @@ COMMENT =       Qt port of the Scintilla sourc
 VERSION =      2.11.4
 DISTNAME =     QScintilla-${VERSION}
 PKGNAME =      ${DISTNAME:L}
-REVISION =     0
+REVISION =     1
 
 CATEGORIES =   editors x11
 
Index: patches/patch-Qt4Qt5_qscintilla_pro
===================================================================
RCS
file: /cvs/ports/editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro,v
retrieving revision 1.5 diff -u -p -u -p -r1.5
patch-Qt4Qt5_qscintilla_pro
--- patches/patch-Qt4Qt5_qscintilla_pro 24 Jul 2019 08:49:43
-0000   1.5 +++ patches/patch-Qt4Qt5_qscintilla_pro     11 Jun
2020 18:22:17 -0000 @@ -2,7 +2,7 @@ $OpenBSD:
patch-Qt4Qt5_qscintilla_pro,v 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
  
Index: patches/patch-src_RunStyles_cpp
===================================================================
RCS file: patches/patch-src_RunStyles_cpp
diff -N patches/patch-src_RunStyles_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_RunStyles_cpp     11 Jun 2020 18:22:17 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+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

Reply via email to