The diff below removes qwt and qscintilla support in KDE. These are
purely optional dependencies. With this move we lose the kdeobservatory
applet from plasma-addons. You can live with that, right?
Objections?
RS
Index: p5-qt/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/p5-qt/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- p5-qt/Makefile 27 Jul 2017 11:57:50 -0000 1.7
+++ p5-qt/Makefile 20 Feb 2020 05:43:40 -0000
@@ -3,13 +3,12 @@
COMMENT = Qt4 bindings for Perl
DISTNAME = perlqt-${MODKDE4_VERSION}
PKGNAME = p5-qt-${MODKDE4_VERSION}
-REVISION = 1
+REVISION = 2
-WANTLIB = c m perl pthread util
+WANTLIB = c m perl pthread
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml
WANTLIB += ${KDE4LIB}/smokebase ${KDE4LIB}/smokephonon
-WANTLIB += ${KDE4LIB}/smokeqimageblitz ${KDE4LIB}/smokeqsci
WANTLIB += ${KDE4LIB}/smokeqt3support ${KDE4LIB}/smokeqtcore
WANTLIB += ${KDE4LIB}/smokeqtdbus ${KDE4LIB}/smokeqtdeclarative
WANTLIB += ${KDE4LIB}/smokeqtgui ${KDE4LIB}/smokeqthelp
@@ -18,12 +17,16 @@ WANTLIB += ${KDE4LIB}/smokeqtopengl ${KD
WANTLIB += ${KDE4LIB}/smokeqtsql ${KDE4LIB}/smokeqtsvg
WANTLIB += ${KDE4LIB}/smokeqttest ${KDE4LIB}/smokeqtuitools
WANTLIB += ${KDE4LIB}/smokeqtwebkit ${KDE4LIB}/smokeqtxml
-WANTLIB += ${KDE4LIB}/smokeqtxmlpatterns ${KDE4LIB}/smokeqwt
+WANTLIB += ${KDE4LIB}/smokeqtxmlpatterns
MODULES = x11/kde4 perl
MODKDE4_USE =
-LIB_DEPENDS = ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}
+LIB_DEPENDS = ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}p6 \
+ graphics/qimageblitz
+
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Qwt5=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_QScintilla=ON
# Avoid clashing Perl do_open and do_close with GCC's locale_facets.h
post-patch:
Index: p5-qt/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/kde4/p5-qt/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- p5-qt/patches/patch-CMakeLists_txt 30 Oct 2017 13:55:11 -0000 1.2
+++ p5-qt/patches/patch-CMakeLists_txt 20 Feb 2020 05:43:40 -0000
@@ -4,18 +4,11 @@ KDE BUG 321877: https://bugs.kde.org/sho
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -21,7 +21,9 @@ include(MacroOptionalAddBindings)
- include(MacroLogFeature)
- include(MacroProve)
+@@ -33,14 +33,11 @@ macro_log_feature(PHONON_FOUND "Phonon" "Phonon multim
+ macro_optional_find_package(Qwt5)
+ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4"
"http://qwt.sourceforge.net" FALSE "" "Needed to compile Qwt5 bindings")
--macro_optional_find_package(QScintilla)
-+FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h "${QT_INCLUDE_DIR}/Qsci")
-+FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qscintilla2_qt4 PATHS ${QT_LIBRARY_DIR})
-+set(QSCINTILLA_FOUND TRUE)
- macro_log_feature(QSCINTILLA_FOUND "QScintilla2" "QScintilla2 libraries"
"http://www.riverbankcomputing.co.uk/software/qscintilla/intro" FALSE ""
"Needed to compile QScintilla2 bindings")
-
- macro_optional_find_package(QImageBlitz)
-@@ -36,11 +38,7 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5
++macro_optional_find_package(QImageBlitz)
add_definitions(-DDEBUG)
include (FindPerlMore)
Index: p5-qt/patches/patch-qtcore_src_util_cpp
===================================================================
RCS file: /cvs/ports/x11/kde4/p5-qt/patches/patch-qtcore_src_util_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qtcore_src_util_cpp
--- p5-qt/patches/patch-qtcore_src_util_cpp 24 Apr 2018 12:17:39 -0000
1.1
+++ p5-qt/patches/patch-qtcore_src_util_cpp 20 Feb 2020 05:43:40 -0000
@@ -3,7 +3,22 @@ $OpenBSD: patch-qtcore_src_util_cpp,v 1.
Index: qtcore/src/util.cpp
--- qtcore/src/util.cpp.orig
+++ qtcore/src/util.cpp
-@@ -515,7 +515,7 @@ SV* package_classId( const char *package ) {
+@@ -27,6 +27,14 @@ extern "C" {
+ #include "perl.h"
+ #include "XSUB.h"
+ #include "ppport.h"
++
++// Avoid clashing with GCC locale_facets.h
++#undef do_open
++#undef do_close
++
++// Avoid clashing with GCC locale_facets.h
++#undef do_open
++#undef do_close
+ }
+
+ // Now my own headers
+@@ -515,7 +523,7 @@ SV* package_classId( const char *package ) {
}
}
// Found nothing, so
@@ -12,7 +27,7 @@ Index: qtcore/src/util.cpp
}
#ifdef PERLQTDEBUG
-@@ -2251,7 +2251,7 @@ XS(XS_AUTOLOAD) {
+@@ -2251,7 +2259,7 @@ XS(XS_AUTOLOAD) {
methcache.insert(mcid, new Smoke::ModuleIndex(mi));
}
Index: p5-qt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/p5-qt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- p5-qt/pkg/PLIST 30 May 2013 20:01:30 -0000 1.2
+++ p5-qt/pkg/PLIST 20 Feb 2020 05:43:40 -0000
@@ -20,7 +20,6 @@ include/perlqt/smokeperl.h
include/perlqt/util.h
${P5ARCH}/Phonon.pm
${P5ARCH}/QImageBlitz.pm
-${P5ARCH}/Qsci.pm
${P5ARCH}/Qt3Support4.pm
${P5ARCH}/QtCore4/
${P5ARCH}/QtCore4.pm
@@ -44,50 +43,45 @@ ${P5ARCH}/QtUiTools4.pm
${P5ARCH}/QtWebKit4.pm
${P5ARCH}/QtXml4.pm
${P5ARCH}/QtXmlPatterns4.pm
-${P5ARCH}/Qwt.pm
${P5ARCH}/auto/Phonon/
-${P5ARCH}/auto/Phonon/Phonon.so
+@so ${P5ARCH}/auto/Phonon/Phonon.so
${P5ARCH}/auto/QImageBlitz/
-${P5ARCH}/auto/QImageBlitz/QImageBlitz.so
-${P5ARCH}/auto/Qsci/
-${P5ARCH}/auto/Qsci/Qsci.so
+@so ${P5ARCH}/auto/QImageBlitz/QImageBlitz.so
${P5ARCH}/auto/Qt3Support4/
-${P5ARCH}/auto/Qt3Support4/Qt3Support4.so
+@so ${P5ARCH}/auto/Qt3Support4/Qt3Support4.so
${P5ARCH}/auto/QtCore4/
-${P5ARCH}/auto/QtCore4/QtCore4.so
-${P5ARCH}/auto/QtCore4/libQtCore4.so
+@so ${P5ARCH}/auto/QtCore4/QtCore4.so
+@so ${P5ARCH}/auto/QtCore4/libQtCore4.so
${P5ARCH}/auto/QtDBus4/
-${P5ARCH}/auto/QtDBus4/QtDBus4.so
+@so ${P5ARCH}/auto/QtDBus4/QtDBus4.so
${P5ARCH}/auto/QtDeclarative4/
-${P5ARCH}/auto/QtDeclarative4/QtDeclarative4.so
+@so ${P5ARCH}/auto/QtDeclarative4/QtDeclarative4.so
${P5ARCH}/auto/QtGui4/
-${P5ARCH}/auto/QtGui4/QtGui4.so
+@so ${P5ARCH}/auto/QtGui4/QtGui4.so
${P5ARCH}/auto/QtHelp4/
-${P5ARCH}/auto/QtHelp4/QtHelp4.so
+@so ${P5ARCH}/auto/QtHelp4/QtHelp4.so
${P5ARCH}/auto/QtMultimedia4/
-${P5ARCH}/auto/QtMultimedia4/QtMultimedia4.so
+@so ${P5ARCH}/auto/QtMultimedia4/QtMultimedia4.so
${P5ARCH}/auto/QtNetwork4/
-${P5ARCH}/auto/QtNetwork4/QtNetwork4.so
+@so ${P5ARCH}/auto/QtNetwork4/QtNetwork4.so
${P5ARCH}/auto/QtOpenGL4/
-${P5ARCH}/auto/QtOpenGL4/QtOpenGL4.so
+@so ${P5ARCH}/auto/QtOpenGL4/QtOpenGL4.so
${P5ARCH}/auto/QtScript4/
-${P5ARCH}/auto/QtScript4/QtScript4.so
+@so ${P5ARCH}/auto/QtScript4/QtScript4.so
${P5ARCH}/auto/QtSql4/
-${P5ARCH}/auto/QtSql4/QtSql4.so
+@so ${P5ARCH}/auto/QtSql4/QtSql4.so
${P5ARCH}/auto/QtSvg4/
-${P5ARCH}/auto/QtSvg4/QtSvg4.so
+@so ${P5ARCH}/auto/QtSvg4/QtSvg4.so
${P5ARCH}/auto/QtTest4/
-${P5ARCH}/auto/QtTest4/QtTest4.so
+@so ${P5ARCH}/auto/QtTest4/QtTest4.so
${P5ARCH}/auto/QtUiTools4/
-${P5ARCH}/auto/QtUiTools4/QtUiTools4.so
+@so ${P5ARCH}/auto/QtUiTools4/QtUiTools4.so
${P5ARCH}/auto/QtWebKit4/
-${P5ARCH}/auto/QtWebKit4/QtWebKit4.so
+@so ${P5ARCH}/auto/QtWebKit4/QtWebKit4.so
${P5ARCH}/auto/QtXml4/
-${P5ARCH}/auto/QtXml4/QtXml4.so
+@so ${P5ARCH}/auto/QtXml4/QtXml4.so
${P5ARCH}/auto/QtXmlPatterns4/
-${P5ARCH}/auto/QtXmlPatterns4/QtXmlPatterns4.so
-${P5ARCH}/auto/Qwt/
-${P5ARCH}/auto/Qwt/Qwt.so
+@so ${P5ARCH}/auto/QtXmlPatterns4/QtXmlPatterns4.so
share/perlqt/
share/perlqt/cmake/
share/perlqt/cmake/FindPerlMore.cmake
Index: plasma-addons/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/plasma-addons/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- plasma-addons/Makefile 26 Jan 2020 07:39:56 -0000 1.22
+++ plasma-addons/Makefile 20 Feb 2020 05:43:40 -0000
@@ -2,7 +2,7 @@
COMMENT = extra KDE plasmoids
DISTNAME = kdeplasma-addons-${MODKDE4_VERSION}
-REVISION = 11
+REVISION = 12
SHARED_LIBS = lancelot-datamodels 51.1 # 1.7
SHARED_LIBS += lancelot 51.1 # 1.9
@@ -16,7 +16,7 @@ WANTLIB = c m pthread
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += ICE SM X11 Xext Xrender Xtst
WANTLIB += lib/qt4/QtDBus lib/qt4/QtDeclarative lib/qt4/QtGui
-WANTLIB += lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtSql lib/qt4/QtSvg
+WANTLIB += lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtSvg
WANTLIB += lib/qt4/QtWebKit lib/qt4/QtXml
WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde
WANTLIB += ${KDE4LIB}/kabc ${KDE4LIB}/kcalcore
@@ -33,9 +33,9 @@ WANTLIB += ${KDE4LIB}/plasmaclock ${KDE4
WANTLIB += ${KDE4LIB}/taskmanager
WANTLIB += ${KDE4LIB}/threadweaver ${KDE4LIB}/weather_ion
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 ibus-1.0
-WANTLIB += iconv intl scim-1.0
+WANTLIB += intl scim-1.0
WANTLIB += attica cln dbusmenu-qt qalculate qca qimageblitz qjson qoauth
-WANTLIB += qwt soprano xml2
+WANTLIB += soprano xml2
MODULES = multimedia/phonon
@@ -53,9 +53,9 @@ LIB_DEPENDS = devel/qjson \
security/qca \
security/qoauth \
x11/dbusmenu-qt \
- qwt-*-!qt5:x11/qwt \
${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION}
-CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Eigen2=ON
+CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Eigen2=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qwt=ON
.include <bsd.port.mk>
Index:
plasma-addons/patches/patch-applets_kdeobservatory_cmake_modules_FindQwt_cmake
===================================================================
RCS file:
plasma-addons/patches/patch-applets_kdeobservatory_cmake_modules_FindQwt_cmake
diff -N
plasma-addons/patches/patch-applets_kdeobservatory_cmake_modules_FindQwt_cmake
---
plasma-addons/patches/patch-applets_kdeobservatory_cmake_modules_FindQwt_cmake
9 Nov 2017 18:37:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-applets_kdeobservatory_cmake_modules_FindQwt_cmake,v 1.1
2017/11/09 18:37:08 landry Exp $
-
-Detect Qwt6
-
-Index: applets/kdeobservatory/cmake/modules/FindQwt.cmake
---- applets/kdeobservatory/cmake/modules/FindQwt.cmake.orig
-+++ applets/kdeobservatory/cmake/modules/FindQwt.cmake
-@@ -31,7 +31,7 @@ IF( QT4_FOUND )
- # Find Qwt version
- IF( Qwt5_INCLUDE_DIR )
- FILE( READ ${Qwt5_INCLUDE_DIR}/qwt_global.h QWT_GLOBAL_H )
-- STRING( REGEX MATCH "#define *QWT_VERSION *(0x05)"
QWT_IS_VERSION_5 ${QWT_GLOBAL_H})
-+ STRING( REGEX MATCH "#define *QWT_VERSION *(0x06)"
QWT_IS_VERSION_5 ${QWT_GLOBAL_H})
-
- IF( QWT_IS_VERSION_5 )
- STRING(REGEX REPLACE ".*#define[\\t\\ ]+QWT_VERSION_STR[\\t\\
]+\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*" "\\1" Qwt_VERSION "${QWT_GLOBAL_H}")
-@@ -97,4 +97,4 @@ IF( QT4_FOUND )
- MESSAGE(FATAL_ERROR "Could not find Qwt 5.x")
- ENDIF (NOT Qwt5_FOUND AND Qwt5_FIND_REQUIRED)
-
--ENDIF( QT4_FOUND )
-\ No newline at end of file
-+ENDIF( QT4_FOUND )
Index:
plasma-addons/patches/patch-applets_kdeobservatory_src_commithistoryview_cpp
===================================================================
RCS file:
plasma-addons/patches/patch-applets_kdeobservatory_src_commithistoryview_cpp
diff -N
plasma-addons/patches/patch-applets_kdeobservatory_src_commithistoryview_cpp
---
plasma-addons/patches/patch-applets_kdeobservatory_src_commithistoryview_cpp
9 Nov 2017 18:37:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-applets_kdeobservatory_src_commithistoryview_cpp,v 1.1
2017/11/09 18:37:08 landry Exp $
-
-Fix build with qwt6
-
-Index: applets/kdeobservatory/src/commithistoryview.cpp
---- applets/kdeobservatory/src/commithistoryview.cpp.orig
-+++ applets/kdeobservatory/src/commithistoryview.cpp
-@@ -143,8 +143,8 @@ void CommitHistoryView::updateViews(const Plasma::Data
-
- QwtPlotGrid *grid = new QwtPlotGrid;
- grid->enableXMin(true);
-- grid->setMajPen(QPen(Qt::white, 0, Qt::DotLine));
-- grid->setMinPen(QPen(Qt::NoPen));
-+ grid->setMajorPen(QPen(Qt::white, 0, Qt::DotLine));
-+ grid->setMinorPen(QPen(Qt::NoPen));
- grid->attach(plot);
-
- proxy->setWidget(plot);
Index: plasma-addons/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/plasma-addons/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- plasma-addons/pkg/PLIST 26 Jan 2020 07:39:56 -0000 1.8
+++ plasma-addons/pkg/PLIST 20 Feb 2020 05:43:40 -0000
@@ -144,7 +144,6 @@ include/kde4/lancelot/widgets/Widget.h
@so lib/kde4/plasma_applet_fuzzy_clock.so
@so lib/kde4/plasma_applet_icontasks.so
@so lib/kde4/plasma_applet_incomingmsg.so
-@so lib/kde4/plasma_applet_kdeobservatory.so
@so lib/kde4/plasma_applet_kimpanel.so
@so lib/kde4/plasma_applet_knowledgebase.so
@so lib/kde4/plasma_applet_kolourpicker.so
@@ -511,7 +510,6 @@ share/config/virus_wallpaper.knsrc
share/ibus/component/kimpanel.xml
share/icons/hicolor/128x128/apps/bball.png
share/icons/hicolor/128x128/apps/eyes.png
-share/icons/hicolor/128x128/apps/kdeobservatory.png
share/icons/hicolor/128x128/apps/lancelot-start.png
share/icons/hicolor/128x128/apps/lancelot.png
share/icons/hicolor/128x128/apps/lifegame.png
@@ -522,7 +520,6 @@ share/icons/hicolor/128x128/apps/qalcula
share/icons/hicolor/16x16/actions/krunner_youtube.png
share/icons/hicolor/16x16/apps/bball.png
share/icons/hicolor/16x16/apps/eyes.png
-share/icons/hicolor/16x16/apps/kdeobservatory.png
share/icons/hicolor/16x16/apps/lancelot-start.png
share/icons/hicolor/16x16/apps/lancelot.png
share/icons/hicolor/16x16/apps/lifegame.png
@@ -531,7 +528,6 @@ share/icons/hicolor/16x16/apps/plasmaapp
share/icons/hicolor/16x16/apps/previewer.png
share/icons/hicolor/22x22/actions/krunner_youtube.png
share/icons/hicolor/22x22/apps/eyes.png
-share/icons/hicolor/22x22/apps/kdeobservatory.png
share/icons/hicolor/22x22/apps/lancelot-start.png
share/icons/hicolor/22x22/apps/lancelot.png
share/icons/hicolor/22x22/apps/lifegame.png
@@ -542,7 +538,6 @@ share/icons/hicolor/256x256/apps/eyes.pn
share/icons/hicolor/256x256/apps/lifegame.png
share/icons/hicolor/32x32/actions/krunner_youtube.png
share/icons/hicolor/32x32/apps/bball.png
-share/icons/hicolor/32x32/apps/kdeobservatory.png
share/icons/hicolor/32x32/apps/lancelot-start.png
share/icons/hicolor/32x32/apps/lancelot.png
share/icons/hicolor/32x32/apps/lifegame.png
@@ -551,7 +546,6 @@ share/icons/hicolor/32x32/apps/plasmaapp
share/icons/hicolor/32x32/apps/previewer.png
share/icons/hicolor/48x48/actions/krunner_youtube.png
share/icons/hicolor/48x48/apps/bball.png
-share/icons/hicolor/48x48/apps/kdeobservatory.png
share/icons/hicolor/48x48/apps/lancelot-start.png
share/icons/hicolor/48x48/apps/lancelot.png
share/icons/hicolor/48x48/apps/lifegame.png
@@ -562,7 +556,6 @@ share/icons/hicolor/48x48/apps/qalculate
share/icons/hicolor/64x64/actions/krunner_youtube.png
share/icons/hicolor/64x64/apps/bball.png
share/icons/hicolor/64x64/apps/eyes.png
-share/icons/hicolor/64x64/apps/kdeobservatory.png
share/icons/hicolor/64x64/apps/lancelot-start.png
share/icons/hicolor/64x64/apps/lancelot.png
share/icons/hicolor/64x64/apps/lifegame.png
@@ -574,7 +567,6 @@ share/icons/hicolor/scalable/apps/access
share/icons/hicolor/scalable/apps/bball.svgz
share/icons/hicolor/scalable/apps/eyes.svgz
share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
-share/icons/hicolor/scalable/apps/kdeobservatory.svgz
share/icons/hicolor/scalable/apps/lifegame.svgz
share/kde4/services/CharRunner_config.desktop
share/kde4/services/CharacterRunner.desktop
@@ -600,7 +592,6 @@ share/kde4/services/plasma-applet-eyes.d
share/kde4/services/plasma-applet-fifteenPuzzle.desktop
share/kde4/services/plasma-applet-icontasks.desktop
share/kde4/services/plasma-applet-incomingmsg.desktop
-share/kde4/services/plasma-applet-kdeobservatory.desktop
share/kde4/services/plasma-applet-kimpanel.desktop
share/kde4/services/plasma-applet-knowledgebase.desktop
share/kde4/services/plasma-applet-konqprofiles.desktop
Index: qyoto/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/qyoto/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- qyoto/Makefile 29 Mar 2018 19:40:17 -0000 1.17
+++ qyoto/Makefile 20 Feb 2020 05:43:40 -0000
@@ -3,7 +3,7 @@
CATEGORIES = devel
COMMENT = Qt4 bindings for .NET/Mono
DISTNAME = qyoto-${MODKDE4_VERSION}
-REVISION = 5
+REVISION = 6
SHARED_LIBS = qyoto 50.1 # 2.0
SHARED_LIBS += phonon-sharp 50.1
@@ -17,24 +17,25 @@ WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
WANTLIB += lib/qt4/QtScript lib/qt4/QtTest lib/qt4/QtWebKit
WANTLIB += lib/qt4/QtXml
-WANTLIB += ${KDE4LIB}/smokebase ${KDE4LIB}/smokephonon ${KDE4LIB}/smokeqsci
+WANTLIB += ${KDE4LIB}/smokebase ${KDE4LIB}/smokephonon
WANTLIB += ${KDE4LIB}/smokeqtcore ${KDE4LIB}/smokeqtdbus
WANTLIB += ${KDE4LIB}/smokeqtgui ${KDE4LIB}/smokeqtnetwork
WANTLIB += ${KDE4LIB}/smokeqtopengl ${KDE4LIB}/smokeqtsql
WANTLIB += ${KDE4LIB}/smokeqtsvg ${KDE4LIB}/smokeqtxml
WANTLIB += ${KDE4LIB}/smokeqtscript ${KDE4LIB}/smokeqttest
WANTLIB += ${KDE4LIB}/smokeqtuitools ${KDE4LIB}/smokeqtwebkit
-WANTLIB += qscintilla2_qt4
MODULES = multimedia/phonon lang/mono
MODMONO_GMCS_COMPAT = Yes
MODKDE4_USE =
-LIB_DEPENDS = editors/qscintilla \
- ${MODKDE4_DEP_DIR}/smokeqt
+LIB_DEPENDS = ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}p6
+
+CONFIGURE_ARGS =
-DPHONON_INCLUDE_DIR=${LOCALBASE}/${MODKDE4_INCLUDE_DIR} \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qwt5=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_QScintilla=ON
-CONFIGURE_ARGS =
-DPHONON_INCLUDE_DIR:String=${LOCALBASE}/${MODKDE4_INCLUDE_DIR}
NO_TEST = Yes
Index: ruby-qt/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/ruby-qt/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- ruby-qt/Makefile 29 Apr 2019 00:40:35 -0000 1.29
+++ ruby-qt/Makefile 20 Feb 2020 05:43:40 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel x11/kde4
COMMENT = Ruby bindings for Qt4
DISTNAME = qtruby-${MODKDE4_VERSION}
PKGNAME = qt4-${MODKDE4_VERSION}
-REVISION = 8
+REVISION = 9
HOMEPAGE = http://techbase.kde.org/Development/Languages/Ruby
@@ -16,15 +16,14 @@ WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += lib/qt4/QtDBus lib/qt4/QtDeclarative lib/qt4/QtGui
WANTLIB += lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtWebKit
WANTLIB += lib/qt4/QtXml
-WANTLIB += ${KDE4LIB}/smokebase ${KDE4LIB}/smokephonon ${KDE4LIB}/smokeqsci
+WANTLIB += ${KDE4LIB}/smokebase ${KDE4LIB}/smokephonon
WANTLIB += ${KDE4LIB}/smokeqtcore ${KDE4LIB}/smokeqtdbus
WANTLIB += ${KDE4LIB}/smokeqtdeclarative ${KDE4LIB}/smokeqtgui
WANTLIB += ${KDE4LIB}/smokeqtnetwork ${KDE4LIB}/smokeqtopengl
WANTLIB += ${KDE4LIB}/smokeqtscript ${KDE4LIB}/smokeqtsql
WANTLIB += ${KDE4LIB}/smokeqtsvg ${KDE4LIB}/smokeqttest
WANTLIB += ${KDE4LIB}/smokeqtuitools ${KDE4LIB}/smokeqtwebkit
-WANTLIB += ${KDE4LIB}/smokeqtxml ${KDE4LIB}/smokeqwt
-WANTLIB += qscintilla2_qt4
+WANTLIB += ${KDE4LIB}/smokeqtxml
MODULES = multimedia/phonon lang/ruby
MODKDE4_USE =
@@ -35,9 +34,11 @@ MODRUBY_HANDLE_FLAVORS= Yes
MODRUBY_ADJ_FILES = *.rb rbqtapi
SUBST_VARS = MODRUBY_FLAVOR
-CONFIGURE_ARGS = -DRUBY_EXECUTABLE=${RUBY}
+LIB_DEPENDS = ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}p6
-LIB_DEPENDS = ${MODKDE4_DEP_DIR}/smokeqt
+CONFIGURE_ARGS = -DRUBY_EXECUTABLE=${RUBY} \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qwt5=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_QScintilla=ON
NO_TEST = Yes
Index: ruby-qt/patches/patch-CMakeLists_txt
===================================================================
RCS file: ruby-qt/patches/patch-CMakeLists_txt
diff -N ruby-qt/patches/patch-CMakeLists_txt
--- ruby-qt/patches/patch-CMakeLists_txt 30 Oct 2017 13:55:11 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2017/10/30 13:55:11 landry Exp $
-
-detect qscintilla 2.10.1
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -12,7 +12,9 @@ include(MacroOptionalFindPackage)
- include(MacroOptionalAddBindings)
- include(MacroLogFeature)
-
--macro_optional_find_package(QScintilla)
-+FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h "${QT_INCLUDE_DIR}/Qsci")
-+FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qscintilla2_qt4 PATHS ${QT_LIBRARY_DIR})
-+set(QSCINTILLA_FOUND TRUE)
- macro_log_feature(QSCINTILLA_FOUND "QScintilla2" "QScintilla2 libraries"
"http://www.riverbankcomputing.co.uk/software/qscintilla/intro" FALSE ""
"Needed to compile QScintilla2 bindings")
-
- macro_optional_find_package(Qwt5)
Index: ruby-qt/patches/patch-modules_qscintilla_CMakeLists_txt
===================================================================
RCS file: ruby-qt/patches/patch-modules_qscintilla_CMakeLists_txt
diff -N ruby-qt/patches/patch-modules_qscintilla_CMakeLists_txt
--- ruby-qt/patches/patch-modules_qscintilla_CMakeLists_txt 15 Jan 2014
16:21:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-modules_qscintilla_CMakeLists_txt,v 1.1 2014/01/15 16:21:56
zhuk Exp $
-Fix linking.
---- modules/qscintilla/CMakeLists.txt.orig Wed Jan 15 20:04:30 2014
-+++ modules/qscintilla/CMakeLists.txt Wed Jan 15 20:04:39 2014
-@@ -4,9 +4,9 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES})
- set(rubyqsci_LIBRARY_SRC qscintilla.cpp qscintillahandlers.cpp)
- add_library(rubyqscintilla MODULE ${rubyqsci_LIBRARY_SRC})
- target_link_libraries(rubyqscintilla
-- ${QSCINTILLA_LIBRARIES}
-- ${SMOKE_QSCI_LIBRARY}
- qtruby4shared
-+ ${SMOKE_QSCI_LIBRARY}
-+ ${QSCINTILLA_LIBRARIES}
- )
- set_target_properties(rubyqscintilla PROPERTIES PREFIX "" OUTPUT_NAME
qscintilla)
- install(TARGETS rubyqscintilla DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
Index: ruby-qt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/ruby-qt/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- ruby-qt/pkg/PLIST 29 Apr 2019 00:40:35 -0000 1.10
+++ ruby-qt/pkg/PLIST 20 Feb 2020 05:43:40 -0000
@@ -30,19 +30,8 @@ ${MODRUBY_SITEDIR}/Qt/active_table_model
${MODRUBY_SITEDIR}/Qt/qtruby4.rb
${MODRUBY_SITEDIR}/Qt3.rb
${MODRUBY_SITEDIR}/Qt4.rb
-${MODRUBY_SITEARCHDIR}/phonon.so
-${MODRUBY_SITEARCHDIR}/qscintilla.so
-${MODRUBY_SITEARCHDIR}/qtdeclarative.so
-${MODRUBY_SITEARCHDIR}/qtruby4.so
-${MODRUBY_SITEARCHDIR}/qtscript.so
-${MODRUBY_SITEARCHDIR}/qttest.so
-${MODRUBY_SITEARCHDIR}/qtuitools.so
-${MODRUBY_SITEARCHDIR}/qtwebkit.so
-${MODRUBY_SITEARCHDIR}/qwt.so
${MODRUBY_SITEDIR}/phonon/
${MODRUBY_SITEDIR}/phonon/phonon.rb
-${MODRUBY_SITEDIR}/qscintilla/
-${MODRUBY_SITEDIR}/qscintilla/qscintilla.rb
${MODRUBY_SITEDIR}/qtdeclarative/
${MODRUBY_SITEDIR}/qtdeclarative/qtdeclarative.rb
${MODRUBY_SITEDIR}/qtscript/
@@ -53,8 +42,13 @@ ${MODRUBY_SITEDIR}/qtuitools/
${MODRUBY_SITEDIR}/qtuitools/qtuitools.rb
${MODRUBY_SITEDIR}/qtwebkit/
${MODRUBY_SITEDIR}/qtwebkit/qtwebkit.rb
-${MODRUBY_SITEDIR}/qwt/
-${MODRUBY_SITEDIR}/qwt/qwt.rb
+@so ${MODRUBY_SITEARCHDIR}/phonon.so
+@so ${MODRUBY_SITEARCHDIR}/qtdeclarative.so
+@so ${MODRUBY_SITEARCHDIR}/qtruby4.so
+@so ${MODRUBY_SITEARCHDIR}/qtscript.so
+@so ${MODRUBY_SITEARCHDIR}/qttest.so
+@so ${MODRUBY_SITEARCHDIR}/qtuitools.so
+@so ${MODRUBY_SITEARCHDIR}/qtwebkit.so
share/qtruby4/
share/qtruby4/cmake/
share/qtruby4/cmake/QtRuby4Config.cmake
Index: smokekde/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/smokekde/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- smokekde/Makefile 4 Jan 2019 14:56:08 -0000 1.18
+++ smokekde/Makefile 20 Feb 2020 05:43:40 -0000
@@ -3,7 +3,7 @@
CATEGORIES = devel
COMMENT = introspective wrappers around KDE
DISTNAME = smokekde-${MODKDE4_VERSION}
-REVISION = 3
+REVISION = 4
SHARED_LIBS = smokeakonadi 52.0 # 3.0
SHARED_LIBS += smokeattica 51.0 # 3.0
@@ -51,7 +51,7 @@ MODKDE4_USE = pim libs
LIB_DEPENDS = databases/soprano \
${MODKDE4_DEP_DIR}/smokegen>=${MODKDE4_DEP_VERSION} \
- ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}
+ ${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}p6
CXXFLAGS += -std=c++03
Index: smokeqt/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/smokeqt/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- smokeqt/Makefile 28 May 2018 18:47:45 -0000 1.15
+++ smokeqt/Makefile 20 Feb 2020 05:43:40 -0000
@@ -3,7 +3,7 @@
CATEGORIES = devel
COMMENT = introspective wrappers around Qt
DISTNAME = smokeqt-${MODKDE4_VERSION}
-REVISION = 5
+REVISION = 6
WANTLIB = m
WANTLIB += ${COMPILER_LIBCXX}
@@ -12,12 +12,10 @@ WANTLIB += lib/qt4/QtGui lib/qt4/QtHelp
WANTLIB += lib/qt4/QtNetwork lib/qt4/QtOpenGL lib/qt4/QtScript
WANTLIB += lib/qt4/QtSql lib/qt4/QtSvg lib/qt4/QtTest lib/qt4/QtWebKit
WANTLIB += lib/qt4/QtXml lib/qt4/QtXmlPatterns
-WANTLIB += ${KDE4LIB}/smokebase
-WANTLIB += qimageblitz qscintilla2_qt4 qwt
+WANTLIB += ${KDE4LIB}/smokebase qimageblitz
SHARED_LIBS = smokephonon 50.1 # 3.0
SHARED_LIBS += smokeqimageblitz 50.1 # 3.0
-SHARED_LIBS += smokeqsci 50.1 # 3.0
SHARED_LIBS += smokeqt3support 50.1 # 3.0
SHARED_LIBS += smokeqtcore 50.1 # 3.0
SHARED_LIBS += smokeqtdbus 50.1 # 3.0
@@ -35,15 +33,15 @@ SHARED_LIBS += smokeqtuitools 50.1 # 3.
SHARED_LIBS += smokeqtwebkit 50.1 # 3.0
SHARED_LIBS += smokeqtxml 50.1 # 3.0
SHARED_LIBS += smokeqtxmlpatterns 50.1 # 3.0
-SHARED_LIBS += smokeqwt 50.1 # 3.0
MODKDE4_USE =
MODULES = multimedia/phonon
-LIB_DEPENDS = editors/qscintilla \
- graphics/qimageblitz \
- ${MODKDE4_DEP_DIR}/smokegen \
- qwt-*-!qt5:x11/qwt,
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Qwt5=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_QScintilla=ON
+
+LIB_DEPENDS = ${MODKDE4_DEP_DIR}/smokegen \
+ graphics/qimageblitz
NO_TEST = Yes
Index: smokeqt/patches/patch-CMakeLists_txt
===================================================================
RCS file: smokeqt/patches/patch-CMakeLists_txt
diff -N smokeqt/patches/patch-CMakeLists_txt
--- smokeqt/patches/patch-CMakeLists_txt 30 Oct 2017 13:55:11 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2017/10/30 13:55:11 landry Exp $
-
-detect qscintilla 2.10.1.
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -38,7 +38,9 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5
- macro_optional_find_package(Phonon)
- macro_log_feature(PHONON_FOUND "Phonon" "Phonon multimedia framework"
"http://www.kde.org" FALSE "" "Needed to compile Phonon bindings")
-
--macro_optional_find_package(QScintilla)
-+FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h "${QT_INCLUDE_DIR}/Qsci")
-+FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qscintilla2_qt4 PATHS ${QT_LIBRARY_DIR})
-+set(QSCINTILLA_FOUND TRUE)
- macro_log_feature(QSCINTILLA_FOUND "QScintilla2" "QScintilla2 libraries"
"http://www.riverbankcomputing.co.uk/software/qscintilla/intro" FALSE ""
"Needed to compile QScintilla2 bindings")
-
- set(QTDEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtdefines)
Index: smokeqt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/smokeqt/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- smokeqt/pkg/PLIST 6 Jul 2013 09:46:29 -0000 1.3
+++ smokeqt/pkg/PLIST 20 Feb 2020 05:43:40 -0000
@@ -4,7 +4,6 @@
include/smoke/
include/smoke/phonon_smoke.h
include/smoke/qimageblitz_smoke.h
-include/smoke/qsci_smoke.h
include/smoke/qt3support_smoke.h
include/smoke/qtcore_smoke.h
include/smoke/qtdbus_smoke.h
@@ -22,10 +21,8 @@ include/smoke/qtuitools_smoke.h
include/smoke/qtwebkit_smoke.h
include/smoke/qtxml_smoke.h
include/smoke/qtxmlpatterns_smoke.h
-include/smoke/qwt_smoke.h
@lib ${KDE4LIB}/libsmokephonon.so.${LIBsmokephonon_VERSION}
@lib ${KDE4LIB}/libsmokeqimageblitz.so.${LIBsmokeqimageblitz_VERSION}
-@lib ${KDE4LIB}/libsmokeqsci.so.${LIBsmokeqsci_VERSION}
@lib ${KDE4LIB}/libsmokeqt3support.so.${LIBsmokeqt3support_VERSION}
@lib ${KDE4LIB}/libsmokeqtcore.so.${LIBsmokeqtcore_VERSION}
@lib ${KDE4LIB}/libsmokeqtdbus.so.${LIBsmokeqtdbus_VERSION}
@@ -43,10 +40,8 @@ include/smoke/qwt_smoke.h
@lib ${KDE4LIB}/libsmokeqtwebkit.so.${LIBsmokeqtwebkit_VERSION}
@lib ${KDE4LIB}/libsmokeqtxml.so.${LIBsmokeqtxml_VERSION}
@lib ${KDE4LIB}/libsmokeqtxmlpatterns.so.${LIBsmokeqtxmlpatterns_VERSION}
-@lib ${KDE4LIB}/libsmokeqwt.so.${LIBsmokeqwt_VERSION}
@lib lib/libsmokephonon.so.${LIBsmokephonon_VERSION}
@lib lib/libsmokeqimageblitz.so.${LIBsmokeqimageblitz_VERSION}
-@lib lib/libsmokeqsci.so.${LIBsmokeqsci_VERSION}
@lib lib/libsmokeqt3support.so.${LIBsmokeqt3support_VERSION}
@lib lib/libsmokeqtcore.so.${LIBsmokeqtcore_VERSION}
@lib lib/libsmokeqtdbus.so.${LIBsmokeqtdbus_VERSION}
@@ -64,13 +59,10 @@ include/smoke/qwt_smoke.h
@lib lib/libsmokeqtwebkit.so.${LIBsmokeqtwebkit_VERSION}
@lib lib/libsmokeqtxml.so.${LIBsmokeqtxml_VERSION}
@lib lib/libsmokeqtxmlpatterns.so.${LIBsmokeqtxmlpatterns_VERSION}
-@lib lib/libsmokeqwt.so.${LIBsmokeqwt_VERSION}
share/smoke/phonon.argnames.txt
share/smoke/phonon.typedefs.txt
share/smoke/qimageblitz.argnames.txt
share/smoke/qimageblitz.typedefs.txt
-share/smoke/qsci.argnames.txt
-share/smoke/qsci.typedefs.txt
share/smoke/qt3support.argnames.txt
share/smoke/qt3support.typedefs.txt
share/smoke/qtcore.argnames.txt
@@ -105,7 +97,5 @@ share/smoke/qtxml.argnames.txt
share/smoke/qtxml.typedefs.txt
share/smoke/qtxmlpatterns.argnames.txt
share/smoke/qtxmlpatterns.typedefs.txt
-share/smoke/qwt.argnames.txt
-share/smoke/qwt.typedefs.txt
share/smokegen/qt-config.xml
share/smokegen/qtdefines