Disable plugins/calligrasheets/extensions/sheetssolver support
Looks like calligra depends on GSL 1.7 but devel/gsl is still 1.5. Too many reported bulk errors in sheets/plugins/solver/sheetssolver_autogen. Unhappy bulk build crew, unhappy rsadowski.
This commit is contained in:
rsadowski
parent
1e2afb2c5e
commit
57489fa07e
|
|
@ -3,7 +3,7 @@ HOMEPAGE = https://www.calligra.org
|
|||
VERSION = 3.2.1
|
||||
DISTNAME = calligra-${VERSION}
|
||||
CATEGORIES = editors
|
||||
REVISION = 7
|
||||
REVISION = 8
|
||||
|
||||
SHARED_LIBS = RtfReader 51.0 # 0.0
|
||||
SHARED_LIBS += basicflakes 50.0 # 0.0
|
||||
|
|
@ -48,22 +48,20 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
|
|||
PERMIT_PACKAGE = Yes
|
||||
DPB_PROPERTIES = parallel
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} ICE Imath-3_1
|
||||
WANTLIB += KChart KF5Activities KF5Archive
|
||||
WANTLIB += KF5Auth KF5AuthCore KF5Bookmarks KF5Codecs KF5Completion
|
||||
WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
|
||||
WANTLIB += KF5Crash KF5DBusAddons KF5GuiAddons KF5I18n KF5IconThemes
|
||||
WANTLIB += KF5ItemViews KF5JS KF5JobWidgets KF5KCMUtils KF5KDELibs4Support
|
||||
WANTLIB += KF5KHtml KF5KIOCore KF5KIOFileWidgets KF5KIOGui KF5KIOWidgets
|
||||
WANTLIB += KF5Notifications KF5NotifyConfig KF5Parts KF5Service
|
||||
WANTLIB += KF5Solid KF5SonnetCore KF5SonnetUi KF5TextWidgets KF5UnitConversion
|
||||
WANTLIB += KF5Wallet KF5WidgetsAddons KF5WindowSystem KF5XmlGui
|
||||
WANTLIB += Okular5Core Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network
|
||||
WANTLIB += Qt5OpenGL Qt5PrintSupport Qt5Qml Qt5QmlModels Qt5Quick
|
||||
WANTLIB += Qt5QuickWidgets Qt5Sql Qt5Svg Qt5Widgets Qt5X11Extras
|
||||
WANTLIB += Qt5Xml SM X11 Xext c fontconfig freetype gsl gslcblas
|
||||
WANTLIB += iconv lcms2 m phonon4qt5 phonon4qt5experimental poppler
|
||||
WANTLIB += poppler-qt5 qca-qt5 z
|
||||
WANTLIB += KF5Archive KF5Auth KF5AuthCore KF5Bookmarks KF5Codecs
|
||||
WANTLIB += KF5Completion KF5ConfigCore KF5ConfigGui KF5ConfigWidgets
|
||||
WANTLIB += KF5CoreAddons KF5Crash KF5DBusAddons KF5GuiAddons KF5I18n
|
||||
WANTLIB += KF5IconThemes KF5ItemViews KF5JS KF5JobWidgets KF5KCMUtils
|
||||
WANTLIB += KF5KDELibs4Support KF5KHtml KF5KIOCore KF5KIOFileWidgets
|
||||
WANTLIB += KF5KIOGui KF5KIOWidgets KF5Notifications KF5NotifyConfig
|
||||
WANTLIB += KF5Parts KF5Service KF5Solid KF5SonnetCore KF5SonnetUi
|
||||
WANTLIB += KF5TextWidgets KF5UnitConversion KF5Wallet KF5WidgetsAddons
|
||||
WANTLIB += KF5WindowSystem KF5XmlGui Okular5Core Qt5Concurrent
|
||||
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport
|
||||
WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets Qt5Sql
|
||||
WANTLIB += Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xml SM X11 Xext c
|
||||
WANTLIB += fontconfig freetype iconv lcms2 m phonon4qt5 phonon4qt5experimental
|
||||
WANTLIB += poppler poppler-qt5 qca-qt5 z
|
||||
|
||||
MODULES = devel/kf5
|
||||
|
||||
|
|
@ -88,7 +86,6 @@ RUN_DEPENDS = devel/desktop-file-utils \
|
|||
x11/gtk+3,-guic
|
||||
|
||||
LIB_DEPENDS = converters/libiconv \
|
||||
devel/gsl \
|
||||
devel/kf5/kactivities \
|
||||
devel/kf5/karchive \
|
||||
devel/kf5/kcmutils \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- Switch to C++17
|
||||
- Update Cmake and deps, Fix Freetype and FontConfig Linkage,
|
||||
from upstream
|
||||
|
||||
- disable GSL support for now. devel/gsl needs an update
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
|
|
@ -25,7 +25,7 @@ Index: CMakeLists.txt
|
|||
|
||||
############
|
||||
#############
|
||||
@@ -391,8 +392,14 @@ endif ()
|
||||
@@ -391,21 +392,27 @@ endif ()
|
||||
## Check for OpenEXR
|
||||
##
|
||||
|
||||
|
|
@ -42,6 +42,28 @@ Index: CMakeLists.txt
|
|||
|
||||
##
|
||||
## Test for GNU Scientific Library
|
||||
##
|
||||
-macro_optional_find_package(GSL 1.7)
|
||||
-set_package_properties(GSL_FOUND PROPERTIES
|
||||
- DESCRIPTION "GNU Scientific Library"
|
||||
- URL "https://www.gnu.org/software/gsl"
|
||||
- PURPOSE "Required by Sheets' solver plugin"
|
||||
- TYPE OPTIONAL
|
||||
- )
|
||||
-macro_bool_to_01(GSL_FOUND HAVE_GSL)
|
||||
-configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h )
|
||||
+#macro_optional_find_package(GSL 1.7)
|
||||
+#set_package_properties(GSL_FOUND PROPERTIES
|
||||
+# DESCRIPTION "GNU Scientific Library"
|
||||
+# URL "https://www.gnu.org/software/gsl"
|
||||
+# PURPOSE "Required by Sheets' solver plugin"
|
||||
+# TYPE OPTIONAL
|
||||
+# )
|
||||
+#macro_bool_to_01(GSL_FOUND HAVE_GSL)
|
||||
+#configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gsl.h )
|
||||
|
||||
##
|
||||
## Test for Phonon4Qt5
|
||||
@@ -641,8 +648,8 @@ if(NOT WIN32 AND NOT APPLE)
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -184,8 +184,6 @@ lib/qt5/plugins/calligra/tools/
|
|||
@so lib/qt5/plugins/calligradocinfopropspage.so
|
||||
@so lib/qt5/plugins/calligraimagethumbnail.so
|
||||
lib/qt5/plugins/calligrasheets/
|
||||
lib/qt5/plugins/calligrasheets/extensions/
|
||||
@so lib/qt5/plugins/calligrasheets/extensions/sheetssolver.so
|
||||
lib/qt5/plugins/calligrasheets/functions/
|
||||
@so lib/qt5/plugins/calligrasheets/functions/kspreadbitopsmodule.so
|
||||
@so lib/qt5/plugins/calligrasheets/functions/kspreadconversionmodule.so
|
||||
|
|
@ -222,6 +220,8 @@ lib/qt5/plugins/karbon/extensions/
|
|||
@so lib/qt5/plugins/karbon/extensions/karbon_refinepath.so
|
||||
@so lib/qt5/plugins/karbon/extensions/karbon_roundcorners.so
|
||||
@so lib/qt5/plugins/karbon/extensions/karbon_whirlpinch.so
|
||||
lib/qt5/plugins/okular/
|
||||
lib/qt5/plugins/okular/generators/
|
||||
@so lib/qt5/plugins/okular/generators/okularGenerator_doc_calligra.so
|
||||
@so lib/qt5/plugins/okular/generators/okularGenerator_docx_calligra.so
|
||||
@so lib/qt5/plugins/okular/generators/okularGenerator_odp_calligra.so
|
||||
|
|
@ -4822,8 +4822,6 @@ share/calligrasheets/templates/HomeFamily/BMI.desktop
|
|||
share/calligrasheets/templates/HomeFamily/CreditCardTracker.desktop
|
||||
share/calligrasheets/templates/HomeFamily/MenuPlan.desktop
|
||||
share/calligrasheets/templates/HomeFamily/VacationChecklist.desktop
|
||||
share/calligrasheets/viewplugins/
|
||||
share/calligrasheets/viewplugins/solver.rc
|
||||
share/calligrastage/
|
||||
share/calligrastage/animations/
|
||||
share/calligrastage/animations/animations.xml
|
||||
|
|
@ -5115,6 +5113,7 @@ share/color/icc/calligra/sRGB-elle-V4-g10.icc
|
|||
share/color/icc/calligra/sRGB-elle-V4-labl.icc
|
||||
share/color/icc/calligra/sRGB-elle-V4-srgbtrc.icc
|
||||
share/color/icc/calligra/scRGB.icm
|
||||
share/config.kcfg/
|
||||
share/config.kcfg/calligrasheets.kcfg
|
||||
share/doc/HTML/ca/calligra/
|
||||
share/doc/HTML/ca/calligra/index.cache.bz2
|
||||
|
|
@ -5872,6 +5871,7 @@ share/kservices5/words_docx_thumbnail.desktop
|
|||
share/kservices5/words_msword_thumbnail.desktop
|
||||
share/kservices5/words_odt_thumbnail.desktop
|
||||
share/kservices5/words_rtf_thumbnail.desktop
|
||||
share/kxmlgui5/
|
||||
share/kxmlgui5/calligrasheets/
|
||||
share/kxmlgui5/calligrasheets/calligrasheets.rc
|
||||
share/kxmlgui5/calligrasheets/calligrasheets_readonly.rc
|
||||
|
|
@ -7972,6 +7972,7 @@ share/locale/zh_TW/LC_MESSAGES/krossmodulesheets.mo
|
|||
share/locale/zh_TW/LC_MESSAGES/krossmodulewords.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/okularGenerator_odp.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/okularGenerator_odt.mo
|
||||
share/metainfo/
|
||||
share/metainfo/org.kde.calligragemini.appdata.xml
|
||||
share/metainfo/org.kde.calligrasheets.appdata.xml
|
||||
share/metainfo/org.kde.calligrastage.appdata.xml
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user