2016-02-26 1:39 GMT+03:00 Rafael Sadowski <[email protected]>: > Hi @ports, > > simple maintainer update. See below. > > OK? Comment!?
I've just started building this and l10n updates. I'll let you know after build finish and some testing. Thanks! > Index: Makefile > =================================================================== > RCS file: /cvs/ports/editors/calligra/Makefile,v > retrieving revision 1.15 > diff -u -p -u -p -r1.15 Makefile > --- Makefile 17 Jan 2016 14:55:58 -0000 1.15 > +++ Makefile 25 Feb 2016 22:35:16 -0000 > @@ -2,8 +2,7 @@ > > COMMENT = K Desktop Environment, office suite > HOMEPAGE = https://www.calligra-suite.org/ > -DISTNAME = calligra-2.9.10 > -REVISION = 0 > +DISTNAME = calligra-2.9.11 > CATEGORIES = editors > > DIST_SUBDIR = kde > @@ -171,6 +170,8 @@ CONFIGURE_ARGS += -DWITH_Pstoedit:BOOL=O > > # XXX Silently ignore non-existent dependencies > CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0046=OLD > +CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0054=OLD > +CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0064=OLD > # XXX Don't treat ``DEFINITIONS`` as a built-in directory property > CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0059=OLD > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/editors/calligra/distinfo,v > retrieving revision 1.8 > diff -u -p -u -p -r1.8 distinfo > --- distinfo 19 Dec 2015 15:46:01 -0000 1.8 > +++ distinfo 25 Feb 2016 22:35:16 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (kde/calligra-2.9.10.tar.xz) = > qdFvBSPgMUGj0s0uKOSEqKoPD+rSNSrCw4VogGah0e8= > -SIZE (kde/calligra-2.9.10.tar.xz) = 194841508 > +SHA256 (kde/calligra-2.9.11.tar.xz) = > sY0tD4e8knU+yLHreApZZ3CkkUHj5g2BHaUedS5U6gk= > +SIZE (kde/calligra-2.9.11.tar.xz) = 196039892 > 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.2 > diff -u -p -u -p -r1.2 > patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h > --- patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h 12 > Aug 2015 09:56:12 -0000 1.2 > +++ patches/patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h 25 > Feb 2016 22:35:16 -0000 > @@ -1,11 +1,11 @@ > -$OpenBSD: patch-krita_plugins_extensions_gmic_3rdparty_gmic_CImg_h,v 1.2 > 2015/08/12 09:56: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 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 { > +--- krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h.orig Sat Feb 20 > 10:31:11 2016 > ++++ krita/plugins/extensions/gmic/3rdparty/gmic/CImg.h Sat Feb 20 10:42:33 > 2016 > +@@ -42599,21 +42599,21 @@ namespace cimg_library_suffixed { > else { if (!visible_cursor) { disp.show_mouse(); visible_cursor > = true; }} > const int d = (depth()>1)?depth():0; > int > @@ -15,47 +15,55 @@ in applications. > h = disp.height(), H = height() + d, > - _xp = (int)(_X*(float)w/W), xp = _xp + > ((int)(_xp*(float)W/w)!=_X?1:0), > - _yp = (int)(_Y*(float)h/H), yp = _yp + > ((int)(_yp*(float)H/h)!=_Y?1:0), > -- _xn = (int)((_X+1.0f)*w/W-1), xn = _xn + > ((int)((_xn+1.0f)*W/w)!=_X+1?1:0), > -- _yn = (int)((_Y+1.0f)*h/H-1), yn = _yn + > ((int)((_yn+1.0f)*H/h)!=_Y+1?1:0), > -- _zxp = (int)((_Z+width())*(float)w/W), zxp = _zxp + > ((int)(_zxp*(float)W/w)!=_Z+width()?1:0), > -- _zyp = (int)((_Z+height())*(float)h/H), zyp = _zyp + > ((int)(_zyp*(float)H/h)!=_Z+height()?1:0), > -- _zxn = (int)((_Z+width()+1.0f)*w/W-1), zxn = _zxn + > ((int)((_zxn+1.0f)*W/w)!=_Z+width()+1?1:0), > -- _zyn = (int)((_Z+height()+1.0f)*h/H-1), zyn = _zyn + > ((int)((_zyn+1.0f)*H/h)!=_Z+height()+1?1:0), > -- _xM = (int)(width()*(float)w/W-1), xM = _xM + > ((int)((_xM+1.0f)*W/w)!=width()?1:0), > -- _yM = (int)(height()*(float)h/H-1), yM = _yM + > ((int)((_yM+1.0f)*H/h)!=height()?1:0), > +- _xn = (int)((_X + 1.0f)*w/W - 1), xn = _xn + ((int)((_xn + > 1.0f)*W/w)!=_X + 1?1:0), > +- _yn = (int)((_Y + 1.0f)*h/H - 1), yn = _yn + ((int)((_yn + > 1.0f)*H/h)!=_Y + 1?1:0), > +- _zxp = (int)((_Z + width())*(float)w/W), zxp = _zxp + > ((int)(_zxp*(float)W/w)!=_Z + width()?1:0), > +- _zyp = (int)((_Z + height())*(float)h/H), zyp = _zyp + > ((int)(_zyp*(float)H/h)!=_Z + height()?1:0), > +- _zxn = (int)((_Z + width() + 1.0f)*w/W - 1), > +- zxn = _zxn + ((int)((_zxn + 1.0f)*W/w)!=_Z + width() > + 1?1:0), > +- _zyn = (int)((_Z + height() + 1.0f)*h/H - 1), > +- zyn = _zyn + ((int)((_zyn + 1.0f)*H/h)!=_Z + > height() + 1?1:0), > +- _xM = (int)(width()*(float)w/W - 1), xM = _xM + ((int)((_xM + > 1.0f)*W/w)!=width()?1:0), > +- _yM = (int)(height()*(float)h/H - 1), yM = _yM + ((int)((_yM > + 1.0f)*H/h)!=height()?1:0), > + unixp = (int)(uniX*(float)w/W), xp = unixp + > ((int)(unixp*(float)W/w)!=uniX?1:0), > + uniyp = (int)(uniY*(float)h/H), yp = uniyp + > ((int)(uniyp*(float)H/h)!=uniY?1:0), > -+ unixn = (int)((uniX+1.0f)*w/W-1), xn = unixn + > ((int)((unixn+1.0f)*W/w)!=uniX+1?1:0), > -+ uniyn = (int)((uniY+1.0f)*h/H-1), yn = uniyn + > ((int)((uniyn+1.0f)*H/h)!=uniY+1?1:0), > -+ unizxp = (int)((uniZ+width())*(float)w/W), zxp = unizxp + > ((int)(unizxp*(float)W/w)!=uniZ+width()?1:0), > -+ unizyp = (int)((uniZ+height())*(float)h/H), zyp = unizyp + > ((int)(unizyp*(float)H/h)!=uniZ+height()?1:0), > -+ unizxn = (int)((uniZ+width()+1.0f)*w/W-1), zxn = unizxn + > ((int)((unizxn+1.0f)*W/w)!=uniZ+width()+1?1:0), > -+ unizyn = (int)((uniZ+height()+1.0f)*h/H-1), zyn = unizyn + > ((int)((unizyn+1.0f)*H/h)!=uniZ+height()+1?1:0), > -+ unixM = (int)(width()*(float)w/W-1), xM = unixM + > ((int)((unixM+1.0f)*W/w)!=width()?1:0), > -+ uniyM = (int)(height()*(float)h/H-1), yM = uniyM + > ((int)((uniyM+1.0f)*H/h)!=height()?1:0), > ++ unixn = (int)((uniX + 1.0f)*w/W - 1), xn = unixn + > ((int)((unixn + 1.0f)*W/w)!=uniX + 1?1:0), > ++ uniyn = (int)((uniY + 1.0f)*h/H - 1), yn = uniyn + > ((int)((uniyn + 1.0f)*H/h)!=uniY + 1?1:0), > ++ unizxp = (int)((uniZ + width())*(float)w/W), zxp = unizxp + > ((int)(unizxp*(float)W/w)!=uniZ + width()?1:0), > ++ unizyp = (int)((uniZ + height())*(float)h/H), zyp = unizyp + > ((int)(unizyp*(float)H/h)!=uniZ + height()?1:0), > ++ unizxn = (int)((uniZ + width() + 1.0f)*w/W - 1), > ++ zxn = unizxn + ((int)((unizxn + 1.0f)*W/w)!=uniZ + > width() + 1?1:0), > ++ unizyn = (int)((uniZ + height() + 1.0f)*h/H - 1), > ++ zyn = unizyn + ((int)((unizyn + 1.0f)*H/h)!=uniZ + > height() + 1?1:0), > ++ unixM = (int)(width()*(float)w/W - 1), xM = unixM + > ((int)((unixM + 1.0f)*W/w)!=width()?1:0), > ++ uniyM = (int)(height()*(float)h/H - 1), yM = uniyM + > ((int)((uniyM + 1.0f)*H/h)!=height()?1:0), > xc = (xp + xn)/2, > yc = (yp + yn)/2, > zxc = (zxp + zxn)/2, > -@@ -37458,14 +37458,14 @@ namespace cimg_library_suffixed { > +@@ -42651,16 +42651,16 @@ namespace cimg_library_suffixed { > // Draw selection. > if (phase) { > const int > - _xp0 = (int)(X0*(float)w/W), xp0 = _xp0 + > ((int)(_xp0*(float)W/w)!=X0?1:0), > - _yp0 = (int)(Y0*(float)h/H), yp0 = _yp0 + > ((int)(_yp0*(float)H/h)!=Y0?1:0), > -- _xn0 = (int)((X0+1.0f)*w/W-1), xn0 = _xn0 + > ((int)((_xn0+1.0f)*W/w)!=X0+1?1:0), > -- _yn0 = (int)((Y0+1.0f)*h/H-1), yn0 = _yn0 + > ((int)((_yn0+1.0f)*H/h)!=Y0+1?1:0), > -- _zxp0 = (int)((Z0+width())*(float)w/W), zxp0 = _zxp0 + > ((int)(_zxp0*(float)W/w)!=Z0+width()?1:0), > -- _zyp0 = (int)((Z0+height())*(float)h/H), zyp0 = _zyp0 + > ((int)(_zyp0*(float)H/h)!=Z0+height()?1:0), > -- _zxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = _zxn0 + > ((int)((_zxn0+1.0f)*W/w)!=Z0+width()+1?1:0), > -- _zyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = _zyn0 + > ((int)((_zyn0+1.0f)*H/h)!=Z0+height()+1?1:0), > +- _xn0 = (int)((X0 + 1.0f)*w/W - 1), xn0 = _xn0 + > ((int)((_xn0 + 1.0f)*W/w)!=X0 + 1?1:0), > +- _yn0 = (int)((Y0 + 1.0f)*h/H - 1), yn0 = _yn0 + > ((int)((_yn0 + 1.0f)*H/h)!=Y0 + 1?1:0), > +- _zxp0 = (int)((Z0 + width())*(float)w/W), zxp0 = _zxp0 + > ((int)(_zxp0*(float)W/w)!=Z0 + width()?1:0), > +- _zyp0 = (int)((Z0 + height())*(float)h/H), zyp0 = _zyp0 + > ((int)(_zyp0*(float)H/h)!=Z0 + height()?1:0), > +- _zxn0 = (int)((Z0 + width() + 1.0f)*w/W - 1), > +- zxn0 = _zxn0 + ((int)((_zxn0 + 1.0f)*W/w)!=Z0 + width() + > 1?1:0), > +- _zyn0 = (int)((Z0 + height() + 1.0f)*h/H - 1), > +- zyn0 = _zyn0 + ((int)((_zyn0 + 1.0f)*H/h)!=Z0 + height() + > 1?1:0), > + unixp0 = (int)(X0*(float)w/W), xp0 = unixp0 + > ((int)(unixp0*(float)W/w)!=X0?1:0), > + uniyp0 = (int)(Y0*(float)h/H), yp0 = uniyp0 + > ((int)(uniyp0*(float)H/h)!=Y0?1:0), > -+ unixn0 = (int)((X0+1.0f)*w/W-1), xn0 = unixn0 + > ((int)((unixn0+1.0f)*W/w)!=X0+1?1:0), > -+ uniyn0 = (int)((Y0+1.0f)*h/H-1), yn0 = uniyn0 + > ((int)((uniyn0+1.0f)*H/h)!=Y0+1?1:0), > -+ unizxp0 = (int)((Z0+width())*(float)w/W), zxp0 = unizxp0 + > ((int)(unizxp0*(float)W/w)!=Z0+width()?1:0), > -+ unizyp0 = (int)((Z0+height())*(float)h/H), zyp0 = unizyp0 + > ((int)(unizyp0*(float)H/h)!=Z0+height()?1:0), > -+ unizxn0 = (int)((Z0+width()+1.0f)*w/W-1), zxn0 = unizxn0 + > ((int)((unizxn0+1.0f)*W/w)!=Z0+width()+1?1:0), > -+ unizyn0 = (int)((Z0+height()+1.0f)*h/H-1), zyn0 = unizyn0 + > ((int)((unizyn0+1.0f)*H/h)!=Z0+height()+1?1:0), > ++ unixn0 = (int)((X0 + 1.0f)*w/W - 1), xn0 = unixn0 + > ((int)((unixn0 + 1.0f)*W/w)!=X0 + 1?1:0), > ++ uniyn0 = (int)((Y0 + 1.0f)*h/H - 1), yn0 = uniyn0 + > ((int)((uniyn0 + 1.0f)*H/h)!=Y0 + 1?1:0), > ++ unizxp0 = (int)((Z0 + width())*(float)w/W), zxp0 = unizxp0 > + ((int)(unizxp0*(float)W/w)!=Z0 + width()?1:0), > ++ unizyp0 = (int)((Z0 + height())*(float)h/H), zyp0 = unizyp0 > + ((int)(unizyp0*(float)H/h)!=Z0 + height()?1:0), > ++ unizxn0 = (int)((Z0 + width() + 1.0f)*w/W - 1), > ++ zxn0 = unizxn0 + ((int)((unizxn0 + 1.0f)*W/w)!=Z0 + width() > + 1?1:0), > ++ unizyn0 = (int)((Z0 + height() + 1.0f)*h/H - 1), > ++ zyn0 = unizyn0 + ((int)((unizyn0 + 1.0f)*H/h)!=Z0 + > height() + 1?1:0), > xc0 = (xp0 + xn0)/2, > yc0 = (yp0 + yn0)/2, > zxc0 = (zxp0 + zxn0)/2, > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/editors/calligra/pkg/PLIST,v > retrieving revision 1.8 > diff -u -p -u -p -r1.8 PLIST > --- pkg/PLIST 19 Dec 2015 15:46:01 -0000 1.8 > +++ pkg/PLIST 25 Feb 2016 22:35:16 -0000 > @@ -913,6 +913,8 @@ share/applications/kde4/okularApplicatio > share/applications/kde4/okularApplication_docx_calligra.desktop > share/applications/kde4/okularApplication_odp.desktop > share/applications/kde4/okularApplication_odt.desktop > +share/applications/kde4/okularApplication_powerpoint_calligra.desktop > +share/applications/kde4/okularApplication_pptx_calligra.desktop > share/applications/kde4/plan.desktop > share/applications/kde4/planwork.desktop > share/applications/kde4/sheets.desktop > @@ -6012,8 +6014,8 @@ share/apps/krita/defaultpresets/tangentn > share/apps/krita/dtd/ > share/apps/krita/dtd/krita.dtd > share/apps/krita/gmic/ > +share/apps/krita/gmic/gimp_update169.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 > @@ -7605,7 +7607,7 @@ share/icons/hicolor/1024x1024/apps/calli > share/icons/hicolor/1024x1024/apps/calligragemini.png > share/icons/hicolor/1024x1024/apps/calligrakarbon.png > share/icons/hicolor/1024x1024/apps/calligrakexi.png > -share/icons/hicolor/1024x1024/apps/calligrakrita.png > +share/icons/hicolor/1024x1024/apps/calligrakrita2.png > share/icons/hicolor/1024x1024/apps/calligraplan.png > share/icons/hicolor/1024x1024/apps/calligrasheets.png > share/icons/hicolor/1024x1024/apps/calligrastage.png > @@ -7616,7 +7618,7 @@ share/icons/hicolor/128x128/apps/calligr > share/icons/hicolor/128x128/apps/calligragemini.png > share/icons/hicolor/128x128/apps/calligrakarbon.png > share/icons/hicolor/128x128/apps/calligrakexi.png > -share/icons/hicolor/128x128/apps/calligrakrita.png > +share/icons/hicolor/128x128/apps/calligrakrita2.png > share/icons/hicolor/128x128/apps/calligraplan.png > share/icons/hicolor/128x128/apps/calligraplanwork.png > share/icons/hicolor/128x128/apps/calligrasheets.png > @@ -7637,7 +7639,7 @@ share/icons/hicolor/16x16/apps/calligraf > share/icons/hicolor/16x16/apps/calligragemini.png > share/icons/hicolor/16x16/apps/calligrakarbon.png > share/icons/hicolor/16x16/apps/calligrakexi.png > -share/icons/hicolor/16x16/apps/calligrakrita.png > +share/icons/hicolor/16x16/apps/calligrakrita2.png > share/icons/hicolor/16x16/apps/calligraplan.png > share/icons/hicolor/16x16/apps/calligraplanwork.png > share/icons/hicolor/16x16/apps/calligrasheets.png > @@ -7656,7 +7658,7 @@ share/icons/hicolor/22x22/apps/calligraf > share/icons/hicolor/22x22/apps/calligragemini.png > share/icons/hicolor/22x22/apps/calligrakarbon.png > share/icons/hicolor/22x22/apps/calligrakexi.png > -share/icons/hicolor/22x22/apps/calligrakrita.png > +share/icons/hicolor/22x22/apps/calligrakrita2.png > share/icons/hicolor/22x22/apps/calligraplan.png > share/icons/hicolor/22x22/apps/calligraplanwork.png > share/icons/hicolor/22x22/apps/calligrasheets.png > @@ -7672,7 +7674,7 @@ share/icons/hicolor/256x256/apps/calligr > share/icons/hicolor/256x256/apps/calligragemini.png > share/icons/hicolor/256x256/apps/calligrakarbon.png > share/icons/hicolor/256x256/apps/calligrakexi.png > -share/icons/hicolor/256x256/apps/calligrakrita.png > +share/icons/hicolor/256x256/apps/calligrakrita2.png > share/icons/hicolor/256x256/apps/calligraplan.png > share/icons/hicolor/256x256/apps/calligrasheets.png > share/icons/hicolor/256x256/apps/calligrastage.png > @@ -7685,7 +7687,7 @@ share/icons/hicolor/32x32/apps/calligraf > share/icons/hicolor/32x32/apps/calligragemini.png > share/icons/hicolor/32x32/apps/calligrakarbon.png > share/icons/hicolor/32x32/apps/calligrakexi.png > -share/icons/hicolor/32x32/apps/calligrakrita.png > +share/icons/hicolor/32x32/apps/calligrakrita2.png > share/icons/hicolor/32x32/apps/calligraplan.png > share/icons/hicolor/32x32/apps/calligraplanwork.png > share/icons/hicolor/32x32/apps/calligrasheets.png > @@ -7701,7 +7703,7 @@ share/icons/hicolor/48x48/apps/calligraf > share/icons/hicolor/48x48/apps/calligragemini.png > share/icons/hicolor/48x48/apps/calligrakarbon.png > share/icons/hicolor/48x48/apps/calligrakexi.png > -share/icons/hicolor/48x48/apps/calligrakrita.png > +share/icons/hicolor/48x48/apps/calligrakrita2.png > share/icons/hicolor/48x48/apps/calligraplan.png > share/icons/hicolor/48x48/apps/calligraplanwork.png > share/icons/hicolor/48x48/apps/calligrasheets.png > @@ -7717,7 +7719,7 @@ share/icons/hicolor/512x512/apps/calligr > share/icons/hicolor/512x512/apps/calligragemini.png > share/icons/hicolor/512x512/apps/calligrakarbon.png > share/icons/hicolor/512x512/apps/calligrakexi.png > -share/icons/hicolor/512x512/apps/calligrakrita.png > +share/icons/hicolor/512x512/apps/calligrakrita2.png > share/icons/hicolor/512x512/apps/calligraplan.png > share/icons/hicolor/512x512/apps/calligrasheets.png > share/icons/hicolor/512x512/apps/calligrastage.png > @@ -7728,7 +7730,7 @@ share/icons/hicolor/64x64/apps/calligraf > share/icons/hicolor/64x64/apps/calligragemini.png > share/icons/hicolor/64x64/apps/calligrakarbon.png > share/icons/hicolor/64x64/apps/calligrakexi.png > -share/icons/hicolor/64x64/apps/calligrakrita.png > +share/icons/hicolor/64x64/apps/calligrakrita2.png > share/icons/hicolor/64x64/apps/calligraplan.png > share/icons/hicolor/64x64/apps/calligraplanwork.png > share/icons/hicolor/64x64/apps/calligrasheets.png > @@ -7745,7 +7747,7 @@ share/icons/hicolor/scalable/apps/callig > share/icons/hicolor/scalable/apps/calligraflow.svgz > share/icons/hicolor/scalable/apps/calligrakarbon.svgz > share/icons/hicolor/scalable/apps/calligrakexi.svgz > -share/icons/hicolor/scalable/apps/calligrakrita.svgz > +share/icons/hicolor/scalable/apps/calligrakrita2.svgz > share/icons/hicolor/scalable/apps/calligraplan.svgz > share/icons/hicolor/scalable/apps/calligraplanwork.svgz > share/icons/hicolor/scalable/apps/calligrasheets.svgz > @@ -8066,10 +8068,14 @@ share/kde4/services/libokularGenerator_d > share/kde4/services/libokularGenerator_docx_calligra.desktop > share/kde4/services/libokularGenerator_odp.desktop > share/kde4/services/libokularGenerator_odt.desktop > +share/kde4/services/libokularGenerator_powerpoint_calligra.desktop > +share/kde4/services/libokularGenerator_pptx_calligra.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/okularPowerpoint_calligra.desktop > +share/kde4/services/okularPptx_calligra.desktop > share/kde4/services/qimageioplugins/kra.desktop > share/kde4/services/qimageioplugins/ora.desktop > share/kde4/services/sheets_excel_thumbnail.desktop -- WBR, Vadim Zhukov
