On Thu Jul 23, 2015 at 10:16:48PM +0300, Vadim Zhukov wrote: > 2015-07-23 22:03 GMT+03:00 Rafael Sadowski <[email protected]>: > > hey ports@, > > > > here is a simple maintainer update. I've tested and built it on amd64. > > > > OK? > > > > cheers, Rafael > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/editors/calligra/Makefile,v > > retrieving revision 1.10 > > diff -u -p -u -p -r1.10 Makefile > > --- Makefile 3 Jul 2015 15:43:12 -0000 1.10 > > +++ Makefile 23 Jul 2015 18:59:02 -0000 > > @@ -1,8 +1,8 @@ > > -# $OpenBSD: Makefile,v 1.10 2015/07/03 15:43:12 zhuk Exp $ > > +# $OpenBSD: Makefile,v 1.7 2015/03/27 08:11:26 ajacoutot Exp $ > > > > COMMENT = K Desktop Environment, office suite > > HOMEPAGE = https://www.calligra-suite.org/ > > -DISTNAME = calligra-2.9.5 > > +DISTNAME = calligra-2.9.6 > > CATEGORIES = editors > > > > DIST_SUBDIR = kde > > @@ -79,8 +79,8 @@ SHARED_LIBS += kovectorimage > > SHARED_LIBS += koversion 0.0 # 14.0 > > SHARED_LIBS += kritacolor 0.0 # 14.0 > > SHARED_LIBS += wordsprivate 14.0 # 1.0 > > -SHARED_LIBS += libglobal 0.0 # 14.0 > > -SHARED_LIBS += libkispsd 0.0 # 14.0 > > +SHARED_LIBS += kritaglobal 14.0 # 1.0 > > +SHARED_LIBS += kritapsd 14.0 # 1.0 > > Why are versions changed to 14.0? If the port doesn't build other way, > it should be fixed instead. Otherwise, those should be 0.0, 0.1 or > 1.0, depending on changes, if any. >
yes, your are right. Here is a new tested patch. Thanks for the review. Cheers, Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/editors/calligra/Makefile,v retrieving revision 1.10 diff -u -p -u -p -r1.10 Makefile --- Makefile 3 Jul 2015 15:43:12 -0000 1.10 +++ Makefile 24 Jul 2015 18:19:29 -0000 @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.10 2015/07/03 15:43:12 zhuk Exp $ +# $OpenBSD: Makefile,v 1.7 2015/03/27 08:11:26 ajacoutot Exp $ COMMENT = K Desktop Environment, office suite HOMEPAGE = https://www.calligra-suite.org/ -DISTNAME = calligra-2.9.5 +DISTNAME = calligra-2.9.6 CATEGORIES = editors DIST_SUBDIR = kde @@ -79,8 +79,8 @@ SHARED_LIBS += kovectorimage SHARED_LIBS += koversion 0.0 # 14.0 SHARED_LIBS += kritacolor 0.0 # 14.0 SHARED_LIBS += wordsprivate 14.0 # 1.0 -SHARED_LIBS += libglobal 0.0 # 14.0 -SHARED_LIBS += libkispsd 0.0 # 14.0 +SHARED_LIBS += kritaglobal 0.0 # 14.0 +SHARED_LIBS += kritapsd 0.0 # 14.0 WANTLIB = c m pthread z WANTLIB += GL GLEW GLU Half ICE Iex IlmImf IlmThread Imath SM X11 Xext Xi Index: distinfo =================================================================== RCS file: /cvs/ports/editors/calligra/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo 3 Jul 2015 15:43:12 -0000 1.4 +++ distinfo 24 Jul 2015 18:19:29 -0000 @@ -1,2 +1,2 @@ -SHA256 (kde/calligra-2.9.5.tar.xz) = t4e1npeVFLSyAHRqD/5cs0T+3eyTIKkeM+J4DVkPURU= -SIZE (kde/calligra-2.9.5.tar.xz) = 193832608 +SHA256 (kde/calligra-2.9.6.tar.xz) = eFZBNxM+L0UGUIXfZs4qsxR4UXwQFjoGumkKLTqYoYQ= +SIZE (kde/calligra-2.9.6.tar.xz) = 194239580 Index: patches/patch-cmake_modules_FindPoppler_cmake =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-cmake_modules_FindPoppler_cmake,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-cmake_modules_FindPoppler_cmake --- patches/patch-cmake_modules_FindPoppler_cmake 3 Jul 2015 15:43:12 -0000 1.2 +++ patches/patch-cmake_modules_FindPoppler_cmake 24 Jul 2015 18:19:29 -0000 @@ -1,4 +1,4 @@ -$OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.2 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $ --- cmake/modules/FindPoppler.cmake.orig Wed Apr 1 15:27:00 2015 +++ cmake/modules/FindPoppler.cmake Mon Apr 27 00:31:55 2015 @@ -60,6 +60,10 @@ endif() Index: patches/patch-kexi_CMakeLists_txt =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-kexi_CMakeLists_txt --- patches/patch-kexi_CMakeLists_txt 3 Jul 2015 15:43:12 -0000 1.2 +++ patches/patch-kexi_CMakeLists_txt 24 Jul 2015 18:19:29 -0000 @@ -1,4 +1,4 @@ -$OpenBSD: patch-kexi_CMakeLists_txt,v 1.2 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD: patch-kexi_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $ Upstream bug? --- kexi/CMakeLists.txt.orig Wed Apr 1 15:27:01 2015 +++ kexi/CMakeLists.txt Mon Apr 27 00:31:55 2015 Index: patches/patch-kexi_widget_CMakeLists_txt =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-kexi_widget_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-kexi_widget_CMakeLists_txt --- patches/patch-kexi_widget_CMakeLists_txt 3 Jul 2015 15:43:12 -0000 1.2 +++ patches/patch-kexi_widget_CMakeLists_txt 24 Jul 2015 18:19:29 -0000 @@ -1,4 +1,4 @@ -$OpenBSD: patch-kexi_widget_CMakeLists_txt,v 1.2 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD: patch-kexi_widget_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $ Unbreak build. --- kexi/widget/CMakeLists.txt.orig Wed Apr 1 15:27:01 2015 +++ kexi/widget/CMakeLists.txt Mon Apr 27 00:31:55 2015 Index: patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h --- patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h 3 Jul 2015 15:43:12 -0000 1.1 +++ patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h 24 Jul 2015 18:19:29 -0000 @@ -1,11 +1,11 @@ -$OpenBSD: patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h,v 1.1 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD$ Variables starting by underscore ("_") sign are reserved and should not be used in applications. ---- krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig Mon May 4 21:17:23 2015 -+++ krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h Mon May 4 21:22:58 2015 -@@ -37389,19 +37389,19 @@ namespace cimg_library_suffixed { +--- krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig Wed Jul 8 09:20:50 2015 ++++ krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h Thu Jul 16 18:17:41 2015 +@@ -37408,19 +37408,19 @@ namespace cimg_library_suffixed { else { if (!visible_cursor) { disp.show_mouse(); visible_cursor = true; }} const int d = (depth()>1)?depth():0; int @@ -36,7 +36,7 @@ in applications. xc = (xp + xn)/2, yc = (yp + yn)/2, zxc = (zxp + zxn)/2, -@@ -37439,14 +37439,14 @@ namespace cimg_library_suffixed { +@@ -37458,14 +37458,14 @@ namespace cimg_library_suffixed { // Draw selection. if (phase) { const int Index: patches/patch-plan_libs_kernel_tests_CMakeLists_txt =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-plan_libs_kernel_tests_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-plan_libs_kernel_tests_CMakeLists_txt --- patches/patch-plan_libs_kernel_tests_CMakeLists_txt 3 Jul 2015 15:43:12 -0000 1.2 +++ patches/patch-plan_libs_kernel_tests_CMakeLists_txt 24 Jul 2015 18:19:29 -0000 @@ -1,4 +1,4 @@ -$OpenBSD: patch-plan_libs_kernel_tests_CMakeLists_txt,v 1.2 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD: patch-plan_libs_kernel_tests_CMakeLists_txt,v 1.1 2015/01/15 18:13:52 dcoppa Exp $ Rename some targets to avoid generating multiple ninja rules with the same name Index: patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-plan_plugins_schedulers_tj_CMakeLists_txt --- patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 3 Jul 2015 15:43:12 -0000 1.2 +++ patches/patch-plan_plugins_schedulers_tj_CMakeLists_txt 24 Jul 2015 18:19:29 -0000 @@ -1,4 +1,4 @@ -$OpenBSD: patch-plan_plugins_schedulers_tj_CMakeLists_txt,v 1.2 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD: patch-plan_plugins_schedulers_tj_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $ XXX allow to build --- plan/plugins/schedulers/tj/CMakeLists.txt.orig Wed Apr 1 15:27:05 2015 +++ plan/plugins/schedulers/tj/CMakeLists.txt Mon Apr 27 00:31:55 2015 Index: patches/patch-plugins_semanticitems_contact_CMakeLists_txt =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-plugins_semanticitems_contact_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-plugins_semanticitems_contact_CMakeLists_txt --- patches/patch-plugins_semanticitems_contact_CMakeLists_txt 3 Jul 2015 15:43:12 -0000 1.2 +++ patches/patch-plugins_semanticitems_contact_CMakeLists_txt 24 Jul 2015 18:19:29 -0000 @@ -1,10 +1,10 @@ -$OpenBSD: patch-plugins_semanticitems_contact_CMakeLists_txt,v 1.2 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD: patch-plugins_semanticitems_contact_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $ Unbreak build. ---- plugins/semanticitems/contact/CMakeLists.txt.orig Wed Apr 1 15:28:07 2015 -+++ plugins/semanticitems/contact/CMakeLists.txt Mon Apr 27 00:31:56 2015 +--- plugins/semanticitems/contact/CMakeLists.txt.orig Wed Jul 8 09:27:38 2015 ++++ plugins/semanticitems/contact/CMakeLists.txt Thu Jul 16 18:17:52 2015 @@ -25,6 +25,7 @@ endif () - target_link_libraries(calligra_semanticitem_contact ${KDE4_KDECORE_LIBS} ${KORDF_LIBS}) + target_link_libraries(calligra_semanticitem_contact ${KDE4_KFILE_LIBS} ${KDE4_KDECORE_LIBS} ${KORDF_LIBS}) +add_definitions(-DBOOST_NO_EXCEPTIONS) Index: patches/patch-stage_part_CMakeLists_txt =================================================================== RCS file: /cvs/ports/editors/calligra/patches/patch-stage_part_CMakeLists_txt,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-stage_part_CMakeLists_txt --- patches/patch-stage_part_CMakeLists_txt 3 Jul 2015 15:43:12 -0000 1.2 +++ patches/patch-stage_part_CMakeLists_txt 24 Jul 2015 18:19:29 -0000 @@ -1,4 +1,4 @@ -$OpenBSD: patch-stage_part_CMakeLists_txt,v 1.2 2015/07/03 15:43:12 zhuk Exp $ +$OpenBSD: patch-stage_part_CMakeLists_txt,v 1.1.1.1 2014/07/12 10:44:18 zhuk Exp $ Unbreak build. --- stage/part/CMakeLists.txt.orig Wed Apr 1 15:28:07 2015 +++ stage/part/CMakeLists.txt Mon Apr 27 00:31:56 2015 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/editors/calligra/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 3 Jul 2015 15:43:12 -0000 1.4 +++ pkg/PLIST 24 Jul 2015 18:19:30 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2015/07/03 15:43:12 zhuk Exp $ +@comment $OpenBSD$ @conflict koffice-* @bin bin/braindump @bin bin/calligra @@ -861,13 +861,13 @@ lib/libkdeinit4_karbon.so @lib lib/libkplatoui.so.${LIBkplatoui_VERSION} @lib lib/libkritacolor.so.${LIBkritacolor_VERSION} lib/libkritacolord.so +@lib lib/libkritaglobal.so.${LIBkritaglobal_VERSION} @lib lib/libkritaimage.so.${LIBkritaimage_VERSION} @lib lib/libkritalibbrush.so.${LIBkritalibbrush_VERSION} @lib lib/libkritalibpaintop.so.${LIBkritalibpaintop_VERSION} +@lib lib/libkritapsd.so.${LIBkritapsd_VERSION} @lib lib/libkritaui.so.${LIBkritaui_VERSION} @lib lib/libkundo2.so.${LIBkundo2_VERSION} -@lib lib/liblibglobal.so.${LIBlibglobal_VERSION} -@lib lib/liblibkispsd.so.${LIBlibkispsd_VERSION} @lib lib/libpigmentcms.so.${LIBpigmentcms_VERSION} @lib lib/libplanprivate.so.${LIBplanprivate_VERSION} @lib lib/libplanworkapp.so.${LIBplanworkapp_VERSION} @@ -6010,8 +6010,8 @@ share/apps/krita/defaultpresets/spraybru share/apps/krita/dtd/ share/apps/krita/dtd/krita.dtd share/apps/krita/gmic/ -share/apps/krita/gmic/gmic_def.gmic share/apps/krita/gmic/gmic_def.gmic.blacklist +share/apps/krita/gmic/update1610.gmic share/apps/krita/gradients/ share/apps/krita/gradients/BG-Krita2.ggr share/apps/krita/gradients/GPS-FG-Glare.ggr @@ -6639,7 +6639,7 @@ share/apps/krita/workspaces/ share/apps/krita/workspaces/Big_Paint.kws share/apps/krita/workspaces/Big_Paint_2.kws share/apps/krita/workspaces/Big_Vector.kws -share/apps/krita/workspaces/Small_Paint.kws +share/apps/krita/workspaces/Default.kws share/apps/krita/workspaces/Small_Vector.kws share/apps/krita/workspaces/VFX_Paint.kws share/apps/kritaanimation/ @@ -7826,10 +7826,6 @@ share/kde4/services/calligra/kspreadrefe share/kde4/services/calligra/kspreadstatisticalmodule.desktop share/kde4/services/calligra/kspreadtextmodule.desktop share/kde4/services/calligra/kspreadtrigonometrymodule.desktop -share/kde4/services/calligra/libokularGenerator_doc_calligra.desktop -share/kde4/services/calligra/libokularGenerator_docx_calligra.desktop -share/kde4/services/calligra/okularDoc_calligra.desktop -share/kde4/services/calligra/okularDocx_calligra.desktop share/kde4/services/calligra/plan_icalendar_export.desktop share/kde4/services/calligra/plan_kplato_import.desktop share/kde4/services/calligra/planpart.desktop @@ -7848,8 +7844,12 @@ share/kde4/services/karbon_karbon1x_thum share/kde4/services/karbon_wmf_thumbnail.desktop share/kde4/services/karbon_xfig_thumbnail.desktop share/kde4/services/krita_kra_thumbnail.desktop +share/kde4/services/libokularGenerator_doc_calligra.desktop +share/kde4/services/libokularGenerator_docx_calligra.desktop share/kde4/services/libokularGenerator_odp.desktop share/kde4/services/libokularGenerator_odt.desktop +share/kde4/services/okularDoc_calligra.desktop +share/kde4/services/okularDocx_calligra.desktop share/kde4/services/okularOdp.desktop share/kde4/services/okularOdt.desktop share/kde4/services/qimageioplugins/kra.desktop
