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

Fix build with Qwt6 - reported by ajacoutot@, was missed all this time

Browse Source 
because of the samba breakage. Enforce dependency on qt4 version of Qwt.
This commit is contained in:
landry 2017-11-09 18:37:08 +00:00
parent 4afac89d61
commit dbfd38e654
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/kde4/plasma-addons/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2017/07/27 11:57:50 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2017/11/09 18:37:08 landry Exp $
COMMENT = extra KDE plasmoids
DISTNAME = kdeplasma-addons-${MODKDE4_VERSION}
REVISION = 4
REVISION = 5
SHARED_LIBS = lancelot-datamodels 51.1 # 1.7
SHARED_LIBS += lancelot 51.1 # 1.9
@ -55,7 +55,7 @@ LIB_DEPENDS = devel/qjson \
security/qca \
security/qoauth \
x11/dbusmenu-qt \
x11/qwt \
qwt-*-!qt5:x11/qwt \
${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/marble>=${MODKDE4_DEP_VERSION}

23
x11/kde4/plasma-addons/patches/patch-applets_kdeobservatory_cmake_modules_FindQwt_cmake Normal file
View File

@ -0,0 +1,23 @@
$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 )

18
x11/kde4/plasma-addons/patches/patch-applets_kdeobservatory_src_commithistoryview_cpp Normal file
View File

@ -0,0 +1,18 @@
$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);