On Fri Jun 07, 2019 at 02:53:39PM +0100, Stuart Henderson wrote: > On 2019/06/07 07:14, Rafael Sadowski wrote: > > On Tue Jun 04, 2019 at 07:26:19PM +0100, Stuart Henderson wrote: > > > On 2019/06/01 10:28, Rafael Sadowski wrote: > > > > Update krita to 4.2.0. > > > > > > > > Krita 4.2 Release Notes: > > > > https://krita.org/en/krita-4-2-release-notes/ > > > > > > > > To build it you have to deinstall krita 4.18 otherwise tests will fetch > > > > the old one. > > > > > > > > Feedback is very welcome. All shared libs checked with > > > > check_sym. Lightly tested on amd64. > > > > > > I hit this when testing build, sorry I didn't think to log it and it's > > > well beyond my tmux scrollback. CMakeCache.txt gzipped and attached. > > > > Thanks for testing. It smells like our "normal" Cmake/Ninja build > > (re-)order > > issue. > > > > I started from a clean setup with a fresh tree and no packages installed. > > Built > > fine. > > > > Is is a show stopper? > > In a word, yes.
Stupid question, I was assuming wrong facts. > > If things fail in bulk they need looking into, so this is a lot of > manual extra checking needed by people who are already putting a fair > bit of time into running builds. Counting just the official bulk builds > for amd64 and i386 plus exopi, that's probably about 10 builds a week, > and I know there are other people who do larger or smaller bulks > slightly less frequently. > > (In the case of ports which are depended on by other ports, a failure > there blocking a bunch of other ports significantly slows down the > build: check, fix broken port, restart, wait, come back and check again, > fix another broken port, ....) > > If the breakage is too much, people doing non-essential builds are likely > to just stop caring because they're too much work .. > Of course, you're absolutely right. Back to krita, I did a mistake in my last diff. CONFIGURE_ARGS should set to ON and not to OFF. That triggered the broken part(s). I also added all optional non-existing dependencies to be on the safe side. RS Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/krita/Makefile,v retrieving revision 1.25 diff -u -p -u -p -r1.25 Makefile --- Makefile 20 May 2019 22:15:13 -0000 1.25 +++ Makefile 10 Jun 2019 12:48:29 -0000 @@ -2,37 +2,35 @@ COMMENT = advanced drawing and image manipulation -VERSION = 4.1.8 +VERSION = 4.2.1 DISTNAME = krita-${VERSION} -REVISION = 1 -SHARED_LIBS += kritabasicflakes 1.0 # 16.0 +SHARED_LIBS += kritabasicflakes 2.0 # 16.0 SHARED_LIBS += kritacolord 1.0 # 16.0 -SHARED_LIBS += kritaflake 2.0 # 16.0 -SHARED_LIBS += kritaodf 1.0 # 16.0 -SHARED_LIBS += kritapigment 2.0 # 16.0 +SHARED_LIBS += kritaflake 3.0 # 16.0 +SHARED_LIBS += kritaodf 2.0 # 16.0 +SHARED_LIBS += kritapigment 3.0 # 16.0 SHARED_LIBS += kritaplugin 1.0 # 16.0 -SHARED_LIBS += kritastore 1.0 # 16.0 +SHARED_LIBS += kritastore 2.0 # 16.0 SHARED_LIBS += kritatext 1.0 # 16.0 SHARED_LIBS += kritatextlayout 1.0 # 16.0 -SHARED_LIBS += kritaundo2 1.0 # 16.0 -SHARED_LIBS += kritavectorimage 2.0 # 16.0 SHARED_LIBS += kritaversion 1.0 # 16.0 -SHARED_LIBS += kritawidgets 1.0 # 16.0 -SHARED_LIBS += kritawidgetutils 3.0 # 16.0 -SHARED_LIBS += kritacommand 1.0 # 16.0 +SHARED_LIBS += kritawidgets 2.0 # 16.0 +SHARED_LIBS += kritawidgetutils 4.0 # 16.0 +SHARED_LIBS += kritacommand 2.0 # 16.0 SHARED_LIBS += kritaimpex 1.0 # 16.0 -SHARED_LIBS += kritalibkis 1.0 # 16.0 -SHARED_LIBS += kritalibkra 1.0 # 16.0 -SHARED_LIBS += kritaqml 1.0 # 16.0 +SHARED_LIBS += kritalibkis 2.0 # 16.0 +SHARED_LIBS += kritalibkra 2.0 # 16.0 +SHARED_LIBS += kritaqml 2.0 # 16.0 +SHARED_LIBS += kritametadata 0.0 # 18.0 # XXX Version numbers from editors/calligra 2.x port SHARED_LIBS += kritapsd 2.0 # 14.0 SHARED_LIBS += kritacolor 2.0 # 14.0 -SHARED_LIBS += kritaglobal 3.0 # 14.0 -SHARED_LIBS += kritaimage 53.0 # 0.0 -SHARED_LIBS += kritalibbrush 52.0 # 0.0 -SHARED_LIBS += kritalibpaintop 52.0 # 0.0 -SHARED_LIBS += kritaui 56.0 # 0.0 +SHARED_LIBS += kritaglobal 4.0 # 14.0 +SHARED_LIBS += kritaimage 54.0 # 0.0 +SHARED_LIBS += kritalibbrush 52.1 # 0.0 +SHARED_LIBS += kritalibpaintop 53.0 # 0.0 +SHARED_LIBS += kritaui 57.0 # 0.0 CATEGORIES = graphics DPB_PROPERTIES = parallel @@ -52,7 +50,7 @@ WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Mul WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Svg Qt5Widgets Qt5X11Extras WANTLIB += Qt5Xml SM X11 Xext Xi boost_system-mt c exiv2 fftw3 WANTLIB += gif gsl gslcblas jpeg lcms2 m png poppler poppler-qt5 -WANTLIB += raw tiff xcb xcb-util z +WANTLIB += quazip5 raw tiff xcb xcb-util z MASTER_SITES = ${MASTER_SITE_KDE:=stable/krita/${VERSION}/} EXTRACT_SUFX = .tar.gz @@ -68,7 +66,8 @@ RUN_DEPENDS += devel/desktop-file-utils x11/gtk+3,-guic \ x11/qt5/qtquickcontrols -LIB_DEPENDS += devel/boost \ +LIB_DEPENDS += archivers/quazip,qt5 \ + devel/boost \ devel/gsl \ devel/kf5/karchive \ devel/kf5/kcompletion \ @@ -102,8 +101,11 @@ BUILD_DEPENDS += devel/gettext,-tools \ math/eigen3 \ net/curl -CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_SIP:Bool=Yes \ - -DCMAKE_DISABLE_FIND_PACKAGE_PyQt5:Bool=Yes +# stop searching for optional packages +CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_SIP=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_HEIF=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_Vc=ON \ + -DCMAKE_DISABLE_FIND_PACKAGE_PyQt5=ON TEST_IS_INTERACTIVE = X11 Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/krita/distinfo,v retrieving revision 1.15 diff -u -p -u -p -r1.15 distinfo --- distinfo 10 Mar 2019 10:52:57 -0000 1.15 +++ distinfo 10 Jun 2019 12:48:29 -0000 @@ -1,2 +1,2 @@ -SHA256 (krita-4.1.8.tar.gz) = BHbJ4iefCuaQwu0C4aqcPUkZQ2Q/mFk1WgJlcxi9WUA= -SIZE (krita-4.1.8.tar.gz) = 244065767 +SHA256 (krita-4.2.1.tar.gz) = NTZ63egIyUYKnW4I+AJVpk0IRwrL7zkeVtAKzJKcqco= +SIZE (krita-4.2.1.tar.gz) = 245929278 Index: patches/patch-libs_widgetutils_tests_KisDialogStateSaverTest_cpp =================================================================== RCS file: patches/patch-libs_widgetutils_tests_KisDialogStateSaverTest_cpp diff -N patches/patch-libs_widgetutils_tests_KisDialogStateSaverTest_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libs_widgetutils_tests_KisDialogStateSaverTest_cpp 10 Jun 2019 12:48:29 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Index: libs/widgetutils/tests/KisDialogStateSaverTest.cpp +--- libs/widgetutils/tests/KisDialogStateSaverTest.cpp.orig ++++ libs/widgetutils/tests/KisDialogStateSaverTest.cpp +@@ -37,7 +37,7 @@ void KisDialogStateSaverTest::testSave() + page.checkBox->setChecked(true); + KisDialogStateSaver::saveState(&w, "StateSaverTest"); + KConfigGroup group(KSharedConfig::openConfig(), "StateSaverTest"); +- QCOMPARE(group.readEntry("lineEdit", QString()), "test"); ++ QCOMPARE(group.readEntry("lineEdit", QString()), QString::fromUtf8("test")); + QCOMPARE(group.readEntry("spinBox", 0), 5); + QCOMPARE(group.readEntry("doubleSpinBox", 0.0), 3.0); + QCOMPARE(group.readEntry("verticalSlider", 0), 10); +@@ -55,7 +55,7 @@ void KisDialogStateSaverTest::testRestore() + + KisDialogStateSaver::restoreState(&w, "StateSaverTest", overrideMap); + +- QCOMPARE(page.lineEdit->text(), "test"); ++ QCOMPARE(page.lineEdit->text(), QString::fromUtf8("test")); + QCOMPARE(page.spinBox->value(), 10); + QCOMPARE(page.doubleSpinBox->value(), 3.0); + QCOMPARE(page.verticalSlider->value(), 10); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/krita/pkg/PLIST,v retrieving revision 1.13 diff -u -p -u -p -r1.13 PLIST --- pkg/PLIST 3 Mar 2019 09:51:01 -0000 1.13 +++ pkg/PLIST 10 Jun 2019 12:48:29 -0000 @@ -37,7 +37,6 @@ lib/kritaplugins/kritaconvolutionfilters lib/kritaplugins/kritacsvexport.so lib/kritaplugins/kritacsvimport.so lib/kritaplugins/kritacurvepaintop.so -lib/kritaplugins/kritadefaultdockers.so lib/kritaplugins/kritadefaultpaintops.so lib/kritaplugins/kritadefaulttools.so lib/kritaplugins/kritadeformpaintop.so @@ -52,6 +51,7 @@ lib/kritaplugins/kritaexrimport.so lib/kritaplugins/kritaextensioncolorsfilters.so lib/kritaplugins/kritafastcolortransferfilter.so lib/kritaplugins/kritafilterop.so +lib/kritaplugins/kritagamutmask.so lib/kritaplugins/kritagifexport.so lib/kritaplugins/kritagifimport.so lib/kritaplugins/kritagradientmap.so @@ -62,7 +62,6 @@ lib/kritaplugins/kritahalftone.so lib/kritaplugins/kritahatchingpaintop.so lib/kritaplugins/kritaheightmapexport.so lib/kritaplugins/kritaheightmapimport.so -lib/kritaplugins/kritahistogram.so lib/kritaplugins/kritahistogramdocker.so lib/kritaplugins/kritahistorydocker.so lib/kritaplugins/kritaimageenhancement.so @@ -73,10 +72,12 @@ lib/kritaplugins/kritajpegexport.so lib/kritaplugins/kritajpegimport.so lib/kritaplugins/kritakraexport.so lib/kritaplugins/kritakraimport.so +lib/kritaplugins/kritalayerdocker.so lib/kritaplugins/kritalayergroupswitcher.so lib/kritaplugins/kritalayersplit.so lib/kritaplugins/kritalcmsengine.so lib/kritaplugins/kritalevelfilter.so +lib/kritaplugins/kritalogdocker.so lib/kritaplugins/kritalutdocker.so lib/kritaplugins/kritametadataeditor.so lib/kritaplugins/kritamodifyselection.so @@ -116,6 +117,7 @@ lib/kritaplugins/kritaroundmarkerpaintop lib/kritaplugins/kritaselectiontools.so lib/kritaplugins/kritaseparatechannels.so lib/kritaplugins/kritashearimage.so +lib/kritaplugins/kritasimplexnoisegenerator.so lib/kritaplugins/kritasketchpaintop.so lib/kritaplugins/kritasmallcolorselector.so lib/kritaplugins/kritasmalltilesfilter.so @@ -140,7 +142,6 @@ lib/kritaplugins/kritatoolpolyline.so lib/kritaplugins/kritatooltransform.so lib/kritaplugins/kritatouchdocker.so lib/kritaplugins/kritaunsharpfilter.so -lib/kritaplugins/kritavideoexport.so lib/kritaplugins/kritawavefilter.so lib/kritaplugins/kritawaveletdecompose.so lib/kritaplugins/kritaxcfimport.so @@ -156,6 +157,7 @@ lib/kritaplugins/kritaxcfimport.so @lib lib/libkritalibkis.so.${LIBkritalibkis_VERSION} @lib lib/libkritalibkra.so.${LIBkritalibkra_VERSION} @lib lib/libkritalibpaintop.so.${LIBkritalibpaintop_VERSION} +@lib lib/libkritametadata.so.${LIBkritametadata_VERSION} @lib lib/libkritaodf.so.${LIBkritaodf_VERSION} @lib lib/libkritapigment.so.${LIBkritapigment_VERSION} @lib lib/libkritaplugin.so.${LIBkritaplugin_VERSION} @@ -165,7 +167,6 @@ lib/kritaplugins/kritaxcfimport.so @lib lib/libkritatext.so.${LIBkritatext_VERSION} @lib lib/libkritatextlayout.so.${LIBkritatextlayout_VERSION} @lib lib/libkritaui.so.${LIBkritaui_VERSION} -@lib lib/libkritavectorimage.so.${LIBkritavectorimage_VERSION} @lib lib/libkritaversion.so.${LIBkritaversion_VERSION} @lib lib/libkritawidgets.so.${LIBkritawidgets_VERSION} @lib lib/libkritawidgetutils.so.${LIBkritawidgetutils_VERSION} @@ -251,9 +252,11 @@ share/color/icc/krita/Gray-D50-elle-V4-g share/color/icc/krita/Gray-D50-elle-V4-labl.icc share/color/icc/krita/Gray-D50-elle-V4-rec709.icc share/color/icc/krita/Gray-D50-elle-V4-srgbtrc.icc +share/color/icc/krita/ITUR_2100_PQ_FULL.ICC share/color/icc/krita/Lab-D50-Identity-elle-V2.icc share/color/icc/krita/Lab-D50-Identity-elle-V4.icc share/color/icc/krita/README +share/color/icc/krita/Rec2020-elle-V4-g10.icc share/color/icc/krita/XYZ-D50-Identity-elle-V4.icc share/color/icc/krita/cmyk.icm share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc @@ -290,6 +293,7 @@ share/krita/ share/krita/actions/ share/krita/actions/ConnectionTool.action share/krita/actions/InteractionTool.action +share/krita/actions/KarbonCalligraphyTool.action share/krita/actions/KisAssistantTool.action share/krita/actions/KisToolCrop.action share/krita/actions/KisToolPath.action @@ -338,6 +342,15 @@ share/krita/defaultpresets/spraybrush.kp share/krita/defaultpresets/tangentnormal.kpp share/krita/dtd/ share/krita/dtd/krita.dtd +share/krita/gamutmasks/ +share/krita/gamutmasks/Atmosphere_With_Accent.kgm +share/krita/gamutmasks/Atmospheric_Triad.kgm +share/krita/gamutmasks/Complementary.kgm +share/krita/gamutmasks/Dominant_Hue_With_Accent.kgm +share/krita/gamutmasks/GamutMaskTemplate.kra +share/krita/gamutmasks/Shifted_Triad.kgm +share/krita/gamutmasks/Split_Complementary.kgm +share/krita/gamutmasks/empty_mask_preview.png share/krita/gradients/ share/krita/gradients/BG-Krita2.ggr share/krita/gradients/GPS-FG-Glare.ggr @@ -792,8 +805,6 @@ share/krita/symbols/ share/krita/symbols/BalloonSymbols.svg share/krita/symbols/pepper_carrot_speech_bubbles.svg share/krita/symbols/preset_icons.svg -share/krita/tags/ -share/krita/tags/kis_paintoppresets_tags.xml share/krita/templates/ share/krita/templates/animation/ share/krita/templates/animation/.directory @@ -884,7 +895,6 @@ share/kritaplugins/buginfo.xmlgui share/kritaplugins/clonesarray.xmlgui share/kritaplugins/colorrange.xmlgui share/kritaplugins/colorspaceconversion.xmlgui -share/kritaplugins/histogram.xmlgui share/kritaplugins/imageseparate.xmlgui share/kritaplugins/imagesize.xmlgui share/kritaplugins/imagesplit.xmlgui