[update] graphics/inkscape to 1.3.2
Hi, just updated Inkscape to 1.3.2. Built and tested on arm64. diff /usr/ports commit - b4b9ec55e00e00ae4c6152c8e0174302a05bc72f path + /usr/ports blob - 6bf631289103518c90f35539009557c06c9e1183 file + graphics/inkscape/Makefile --- graphics/inkscape/Makefile +++ graphics/inkscape/Makefile @@ -1,6 +1,6 @@ COMMENT = SVG vector drawing application -VERSION = 1.3 +VERSION = 1.3.2 DISTNAME = inkscape-${VERSION} REVISION = 0 @@ -72,7 +72,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ www/py-requests${MODPY_FLAVOR} \ x11/gtk+4,-guic -WRKDIST = ${WRKDIR}/inkscape-${VERSION}_2023-07-21_0e150ed6c4 +WRKDIST = ${WRKDIR}/inkscape-${VERSION}_2023-11-25_091e20ef0f SUBST_VARS += RUBY MODRUBY_REV blob - 61facc73e6c7e8b604a6fd06d52c3de203c54b36 file + graphics/inkscape/distinfo --- graphics/inkscape/distinfo +++ graphics/inkscape/distinfo @@ -1,2 +1,2 @@ -SHA256 (inkscape-1.3.tar.xz) = v08oawJeAWm4lIzBTVGZqbTCBNdhyJTEtISWVx7HYwc= -SIZE (inkscape-1.3.tar.xz) = 85764028 +SHA256 (inkscape-1.3.2.tar.xz) = 29GETcRD/l4Q0+mohxROX7ciOFL/8ZHPte963qsOCGs= +SIZE (inkscape-1.3.2.tar.xz) = 44720944 blob - 4f5617451d444e237af30d9a1799a209cb451ad6 file + graphics/inkscape/pkg/PLIST --- graphics/inkscape/pkg/PLIST +++ graphics/inkscape/pkg/PLIST @@ -943,6 +943,8 @@ share/inkscape/extensions/other/extension-xaml/inkxaml share/inkscape/extensions/other/extension-xaml/inkxaml/xaml2svg/shapes.xsl share/inkscape/extensions/other/extension-xaml/inkxaml/xaml2svg/transform.xsl share/inkscape/extensions/other/extension-xaml/inkxaml/xamlobjects.py +share/inkscape/extensions/other/extension-xaml/poetry.lock +share/inkscape/extensions/other/extension-xaml/pyproject.toml share/inkscape/extensions/other/extension-xaml/readme.md share/inkscape/extensions/other/extension-xaml/tox.ini share/inkscape/extensions/other/gcodetools/ -- ~Justin
Re: UPDATE: graphics/inkscape with new dependency geo/lib2geom
On 2021/10/27 22:22, Rafael Sadowski wrote: > On Wed Oct 27, 2021 at 11:34:02AM +0100, Stuart Henderson wrote: > > On 2021/10/27 12:03, Rafael Sadowski wrote: > > > > OK to import lib2geom and update inkscape? > > > > include/2geom-1.1.0/ > > > > is the version number in the include dir really needed? > > > > if so, please use a SUBST_VARS variable to avoid the plist churn so > > diffs are a bit more clear, but it would be nicer to rename i think.. > > > > Thanks Stuart for the feedback. It looks like we really need the extra > version, otherwise we will have to patch the pc/cmake files and I don't > want to go that way. Upstream tagged version with 1.1 so I left this. Fair enough then. Bit annoying as pkg_add can't skip unchanged files, but it is what it is. > New tarball attached. ok to import
Re: UPDATE: graphics/inkscape with new dependency geo/lib2geom
On Wed Oct 27, 2021 at 11:34:02AM +0100, Stuart Henderson wrote: > On 2021/10/27 12:03, Rafael Sadowski wrote: > > > OK to import lib2geom and update inkscape? > > include/2geom-1.1.0/ > > is the version number in the include dir really needed? > > if so, please use a SUBST_VARS variable to avoid the plist churn so > diffs are a bit more clear, but it would be nicer to rename i think.. > Thanks Stuart for the feedback. It looks like we really need the extra version, otherwise we will have to patch the pc/cmake files and I don't want to go that way. Upstream tagged version with 1.1 so I left this. New tarball attached. lib2geom.tar.gz Description: Binary data
Re: UPDATE: graphics/inkscape with new dependency geo/lib2geom
On 2021/10/27 12:03, Rafael Sadowski wrote: > > OK to import lib2geom and update inkscape? include/2geom-1.1.0/ is the version number in the include dir really needed? if so, please use a SUBST_VARS variable to avoid the plist churn so diffs are a bit more clear, but it would be nicer to rename i think..
Re: UPDATE: graphics/inkscape with new dependency geo/lib2geom
On Sat Jul 03, 2021 at 07:13:22PM +0200, Rafael Sadowski wrote: > Please find below an inkscape update diff. Inkscape 1.1 comes with a new > dependency on lib2geom. I decided to create a new port instead of using > the supplied one which comes with the inkscape 1.1. This gives us the > possibility to set the shred version ourselves. > > OK to import lib2geom and update inkscape? > > Information for inst:lib2geom-1.1 > > Comment: > easy to use 2D geometry library in C++ > > Required by: > inkscape-1.1 > > Description: > 2Geom is a C++ 2D geometry library geared towards robust processing of > computational geometry data associated with vector graphics. The primary > design > consideration is ease of use and clarity. > > Maintainer: Rafael Sadowski > > WWW: https://gitlab.com/inkscape/lib2geom > Ping > > > Index: Makefile > === > RCS file: /cvs/ports/graphics/inkscape/Makefile,v > retrieving revision 1.89 > diff -u -p -u -p -r1.89 Makefile > --- Makefile 23 Feb 2021 19:39:25 - 1.89 > +++ Makefile 3 Jul 2021 17:02:41 - > @@ -2,7 +2,7 @@ > > COMMENT =SVG vector drawing application > > -DISTNAME = inkscape-1.0.2 > +DISTNAME = inkscape-1.1 > > CATEGORIES = graphics > > @@ -13,15 +13,14 @@ MAINTAINER = Rafael Sadowski # GPLv2 and LGPLv2.1 > PERMIT_PACKAGE = Yes > > -WANTLIB += ${COMPILER_LIBCXX} ICE Magick++-6.Q16 MagickCore-6.Q16 > -WANTLIB += MagickWand-6.Q16 SM X11 Xext aspell atk-1.0 atkmm-1.6 > -WANTLIB += c cairo cairo-gobject cairomm-1.0 double-conversion > -WANTLIB += fontconfig freetype gc gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 > -WANTLIB += gdl-3 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 > -WANTLIB += gobject-2.0 gsl gslcblas gtk-3 gtkmm-3.0 harfbuzz iconv > -WANTLIB += intl jpeg lcms2 m pango-1.0 pangocairo-1.0 pangoft2-1.0 > -WANTLIB += pangomm-1.4 png poppler poppler-glib potrace sigc-2.0 > -WANTLIB += soup-2.4 xml2 xslt z > +WANTLIB += ${COMPILER_LIBCXX} 2geom ICE Magick++-6.Q16 MagickCore-6.Q16 > +WANTLIB += MagickWand-6.Q16 SM X11 Xext atk-1.0 atkmm-1.6 boost_filesystem-mt > +WANTLIB += c cairo cairo-gobject cairomm-1.0 fontconfig freetype > +WANTLIB += gc gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 > +WANTLIB += glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 gsl gslcblas > +WANTLIB += gtk-3 gtkmm-3.0 harfbuzz iconv intl jpeg lcms2 m pango-1.0 > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 png poppler > +WANTLIB += poppler-glib potrace sigc-2.0 soup-2.4 xml2 xslt z > > MASTER_SITES = https://media.inkscape.org/dl/resources/file/ > EXTRACT_SUFX = .tar.xz > @@ -41,22 +40,20 @@ MODRUBY_BUILDDEP =No > MODRUBY_RUNDEP = No > > BUILD_DEPENDS = devel/gettext,-tools \ > - devel/gtest \ > - devel/boost > + devel/gtest > > -LIB_DEPENDS =math/double-conversion \ > +LIB_DEPENDS =devel/boost \ > devel/boehm-gc \ > devel/gsl \ > devel/libsoup \ > devel/pango \ > + geo/lib2geom \ > graphics/ImageMagick \ > graphics/lcms2 \ > graphics/png \ > graphics/potrace \ > print/poppler \ > - textproc/aspell/core \ > textproc/libxslt \ > - x11/gnome/gdl \ > x11/gtk+3 \ > x11/gtk3mm > > @@ -67,7 +64,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ > textproc/py-lxml${MODPY_FLAVOR} \ > x11/gtk+3,-guic > > -WRKDIST =${WRKDIR}/inkscape-1.0.2_2021-01-15_e86c870879 > +WRKDIST =${WRKDIR}/inkscape-1.1_2021-05-24_c4e8f9ed74 > > SUBST_VARS +=RUBY MODRUBY_REV > > Index: distinfo > === > RCS file: /cvs/ports/graphics/inkscape/distinfo,v > retrieving revision 1.18 > diff -u -p -u -p -r1.18 distinfo > --- distinfo 10 Feb 2021 04:54:55 - 1.18 > +++ distinfo 3 Jul 2021 17:02:41 - > @@ -1,2 +1,2 @@ > -SHA256 (inkscape-1.0.2.tar.xz) = 2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo= > -SIZE (inkscape-1.0.2.tar.xz) = 32421620 > +SHA256 (inkscape-1.1.tar.xz) = cebozj/fcC9Z28SidmZeuYLreCKwKbvb7O0t9DAXleY= > +SIZE (inkscape-1.1.tar.xz) = 34203156 > Index: patches/patch-CMakeLists_txt > === > RCS file: /cvs/ports/graphics/inkscape/patches/patch-CMakeLists_txt,v > retrieving revision 1.1 > diff -u -p -u -p -r1.1 patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 26 May 2020 04:53:26 - 1.1 > +++ patches/patch-CMakeLists_txt 3 Jul 2021 17:02:41 - > @@ -11,26 +11,13 @@ CMake Warning (dev) at /usr/local/share/ > Index: CMakeLists.txt > --- CMakeLists.txt.orig > +++ CMakeLists.txt > -@@ -27,12 +27,12 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMa > - > - # avoid having empty buildtype > - set(CMAKE
UPDATE: graphics/inkscape with new dependency geo/lib2geom
Please find below an inkscape update diff. Inkscape 1.1 comes with a new dependency on lib2geom. I decided to create a new port instead of using the supplied one which comes with the inkscape 1.1. This gives us the possibility to set the shred version ourselves. OK to import lib2geom and update inkscape? Information for inst:lib2geom-1.1 Comment: easy to use 2D geometry library in C++ Required by: inkscape-1.1 Description: 2Geom is a C++ 2D geometry library geared towards robust processing of computational geometry data associated with vector graphics. The primary design consideration is ease of use and clarity. Maintainer: Rafael Sadowski WWW: https://gitlab.com/inkscape/lib2geom Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.89 diff -u -p -u -p -r1.89 Makefile --- Makefile23 Feb 2021 19:39:25 - 1.89 +++ Makefile3 Jul 2021 17:02:41 - @@ -2,7 +2,7 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-1.0.2 +DISTNAME = inkscape-1.1 CATEGORIES = graphics @@ -13,15 +13,14 @@ MAINTAINER =Rafael Sadowski https://media.inkscape.org/dl/resources/file/ EXTRACT_SUFX = .tar.xz @@ -41,22 +40,20 @@ MODRUBY_BUILDDEP = No MODRUBY_RUNDEP = No BUILD_DEPENDS =devel/gettext,-tools \ - devel/gtest \ - devel/boost + devel/gtest -LIB_DEPENDS = math/double-conversion \ +LIB_DEPENDS = devel/boost \ devel/boehm-gc \ devel/gsl \ devel/libsoup \ devel/pango \ + geo/lib2geom \ graphics/ImageMagick \ graphics/lcms2 \ graphics/png \ graphics/potrace \ print/poppler \ - textproc/aspell/core \ textproc/libxslt \ - x11/gnome/gdl \ x11/gtk+3 \ x11/gtk3mm @@ -67,7 +64,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ textproc/py-lxml${MODPY_FLAVOR} \ x11/gtk+3,-guic -WRKDIST = ${WRKDIR}/inkscape-1.0.2_2021-01-15_e86c870879 +WRKDIST = ${WRKDIR}/inkscape-1.1_2021-05-24_c4e8f9ed74 SUBST_VARS += RUBY MODRUBY_REV Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.18 diff -u -p -u -p -r1.18 distinfo --- distinfo10 Feb 2021 04:54:55 - 1.18 +++ distinfo3 Jul 2021 17:02:41 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-1.0.2.tar.xz) = 2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo= -SIZE (inkscape-1.0.2.tar.xz) = 32421620 +SHA256 (inkscape-1.1.tar.xz) = cebozj/fcC9Z28SidmZeuYLreCKwKbvb7O0t9DAXleY= +SIZE (inkscape-1.1.tar.xz) = 34203156 Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/graphics/inkscape/patches/patch-CMakeLists_txt,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt26 May 2020 04:53:26 - 1.1 +++ patches/patch-CMakeLists_txt3 Jul 2021 17:02:41 - @@ -11,26 +11,13 @@ CMake Warning (dev) at /usr/local/share/ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -27,12 +27,12 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMa - - # avoid having empty buildtype - set(CMAKE_BUILD_TYPE_INIT "Release") -+project(inkscape) - - include(CMakeScripts/HelperFunctions.cmake) - include(CMakeScripts/ConfigEnv.cmake) - include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable - --project(inkscape) - set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME inkscape) # needs to be before any install() commands - - include(CMakeScripts/ConfigPaths.cmake) -@@ -66,7 +66,7 @@ if(APPLE) +@@ -64,7 +64,8 @@ if(APPLE) SET(CMAKE_MACOSX_RPATH TRUE) SET(CMAKE_INSTALL_RPATH "@loader_path/${INKSCAPE_INSTALL_LIBDIR_RELATIVE_TO_BINDIR}") else() -SET(CMAKE_INSTALL_RPATH "$ORIGIN/${INKSCAPE_INSTALL_LIBDIR_RELATIVE_TO_BINDIR}") -+SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${INKSCAPE_INSTALL_LIBDIR}) ++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" ++"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/inkscape") endif() # this can be removed if/when cmake 3.1 is made the minimum required version Index: patches/patch-CMakeScripts_Pod2man_cmake === RCS file: /cvs/ports/graphics/inkscape/patches/patch-CMakeScripts_Pod2man_cmake,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-CMakeScripts_Pod2man_cmake --- patches/patch-CMakeScripts_Pod2man_cmake26 May 2020 04:53:26 - 1.1 +++ patches/patch-CMakeScripts_Pod2man_cmake3 Jul 2021 17:02:41 - @@ -7,7 +7,7 @@ Fix manpage setup for OpenBSD Index: CMakeScripts/Pod2
Re: UPDATE: graphics/inkscape
Rafael Sadowski writes: > Simple update inkscape to 1.0.2. OK? OK gnezdo@ > > Index: Makefile > === > RCS file: /cvs/ports/graphics/inkscape/Makefile,v > retrieving revision 1.87 > diff -u -p -u -p -r1.87 Makefile > --- Makefile 17 Nov 2020 03:19:37 - 1.87 > +++ Makefile 9 Feb 2021 07:18:07 - > @@ -2,8 +2,7 @@ > > COMMENT =SVG vector drawing application > > -DISTNAME = inkscape-1.0.1 > -REVISION = 0 > +DISTNAME = inkscape-1.0.2 > > CATEGORIES = graphics > > @@ -70,7 +69,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ > textproc/py-lxml${MODPY_FLAVOR} \ > x11/gtk+3,-guic > > -WRKDIST =${WRKDIR}/inkscape-1.0.1_2020-09-07_3bc2e813f5 > +WRKDIST =${WRKDIR}/inkscape-1.0.2_2021-01-15_e86c870879 > > SUBST_VARS +=RUBY MODRUBY_REV > > Index: distinfo > === > RCS file: /cvs/ports/graphics/inkscape/distinfo,v > retrieving revision 1.17 > diff -u -p -u -p -r1.17 distinfo > --- distinfo 8 Sep 2020 15:22:39 - 1.17 > +++ distinfo 9 Feb 2021 07:18:07 - > @@ -1,2 +1,2 @@ > -SHA256 (inkscape-1.0.1.tar.xz) = z5KV7fRqYzyvOqwFYjZKJK73zWKUYBNlrKOK7q0tV8I= > -SIZE (inkscape-1.0.1.tar.xz) = 32051632 > +SHA256 (inkscape-1.0.2.tar.xz) = 2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo= > +SIZE (inkscape-1.0.2.tar.xz) = 32421620 > Index: pkg/PLIST > === > RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v > retrieving revision 1.20 > diff -u -p -u -p -r1.20 PLIST > --- pkg/PLIST 8 Sep 2020 15:22:39 - 1.20 > +++ pkg/PLIST 9 Feb 2021 07:18:07 - > @@ -65,6 +65,13 @@ share/inkscape/examples/tref.svg > share/inkscape/examples/turbulence_filters.svg > share/inkscape/extensions/ > share/inkscape/extensions/.pylintrc > +share/inkscape/extensions/.pytest_cache/ > +share/inkscape/extensions/.pytest_cache/CACHEDIR.TAG > +share/inkscape/extensions/.pytest_cache/README.md > +share/inkscape/extensions/.pytest_cache/v/ > +share/inkscape/extensions/.pytest_cache/v/cache/ > +share/inkscape/extensions/.pytest_cache/v/cache/nodeids > +share/inkscape/extensions/.pytest_cache/v/cache/stepwise > share/inkscape/extensions/LICENSE.txt > share/inkscape/extensions/MANIFEST.in > share/inkscape/extensions/Poly3DObjects/
UPDATE: graphics/inkscape
Simple update inkscape to 1.0.2. OK? Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.87 diff -u -p -u -p -r1.87 Makefile --- Makefile17 Nov 2020 03:19:37 - 1.87 +++ Makefile9 Feb 2021 07:18:07 - @@ -2,8 +2,7 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-1.0.1 -REVISION = 0 +DISTNAME = inkscape-1.0.2 CATEGORIES = graphics @@ -70,7 +69,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ textproc/py-lxml${MODPY_FLAVOR} \ x11/gtk+3,-guic -WRKDIST = ${WRKDIR}/inkscape-1.0.1_2020-09-07_3bc2e813f5 +WRKDIST = ${WRKDIR}/inkscape-1.0.2_2021-01-15_e86c870879 SUBST_VARS += RUBY MODRUBY_REV Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.17 diff -u -p -u -p -r1.17 distinfo --- distinfo8 Sep 2020 15:22:39 - 1.17 +++ distinfo9 Feb 2021 07:18:07 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-1.0.1.tar.xz) = z5KV7fRqYzyvOqwFYjZKJK73zWKUYBNlrKOK7q0tV8I= -SIZE (inkscape-1.0.1.tar.xz) = 32051632 +SHA256 (inkscape-1.0.2.tar.xz) = 2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo= +SIZE (inkscape-1.0.2.tar.xz) = 32421620 Index: pkg/PLIST === RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v retrieving revision 1.20 diff -u -p -u -p -r1.20 PLIST --- pkg/PLIST 8 Sep 2020 15:22:39 - 1.20 +++ pkg/PLIST 9 Feb 2021 07:18:07 - @@ -65,6 +65,13 @@ share/inkscape/examples/tref.svg share/inkscape/examples/turbulence_filters.svg share/inkscape/extensions/ share/inkscape/extensions/.pylintrc +share/inkscape/extensions/.pytest_cache/ +share/inkscape/extensions/.pytest_cache/CACHEDIR.TAG +share/inkscape/extensions/.pytest_cache/README.md +share/inkscape/extensions/.pytest_cache/v/ +share/inkscape/extensions/.pytest_cache/v/cache/ +share/inkscape/extensions/.pytest_cache/v/cache/nodeids +share/inkscape/extensions/.pytest_cache/v/cache/stepwise share/inkscape/extensions/LICENSE.txt share/inkscape/extensions/MANIFEST.in share/inkscape/extensions/Poly3DObjects/
Re: UPDATE: graphics/inkscape
On 2020/05/25 22:48, Rafael Sadowski wrote: > On Fri May 08, 2020 at 07:22:55AM +0200, Rafael Sadowski wrote: > > Update inkscape to 1.0. A lot has happened port wise but look for > > yourself. If you use and/or like inkscape, please test and give > > feedback also okays welcome. > > > > Most tests look good and inkscape stats/runs fine. The py, perl and ruby > > extensions not tested by me (I never tested it). > > > > Rafael > > > > Here is my last proposal, this one sets python2 additionally if someone > wants to use py2-only extensions. Ports is really not setup to cope well with things using both python 2 and python 3. Ports using the python module are expected to use variables like MODPY_BIN/MODPY_LIBDIR/etc and not construct things themselves from MODPY_DEFAULT_VERSION_. So I would not like to add this "just in case" somebody wants to use py2-only extensions, only if there's a strong requirement for something in particular.
Re: UPDATE: graphics/inkscape
On Mon, May 11, 2020 at 09:53:19AM +0200, Landry Breuil wrote: > On Fri, May 08, 2020 at 07:22:55AM +0200, Rafael Sadowski wrote: > > Update inkscape to 1.0. A lot has happened port wise but look for > > yourself. If you use and/or like inkscape, please test and give > > feedback also okays welcome. > > > > Most tests look good and inkscape stats/runs fine. The py, perl and ruby > > extensions not tested by me (I never tested it). > > looks good to me portswise, start fine here too. > > wondering if the subdirs in share/inkscape/icons should mean more > @tag gtk-update-icon-cache lines .. No, that's only for things under share/icons/... -- Antoine
Re: UPDATE: graphics/inkscape
On Fri, May 08, 2020 at 07:22:55AM +0200, Rafael Sadowski wrote: > Update inkscape to 1.0. A lot has happened port wise but look for > yourself. If you use and/or like inkscape, please test and give > feedback also okays welcome. > > Most tests look good and inkscape stats/runs fine. The py, perl and ruby > extensions not tested by me (I never tested it). looks good to me portswise, start fine here too. wondering if the subdirs in share/inkscape/icons should mean more @tag gtk-update-icon-cache lines .. Landry
Re: UPDATE: graphics/inkscape
On 1/18/19 6:12 PM, Rafael Sadowski wrote: Simple update to the latest stable version. All poppler patches merged upstream. Feedback and/or tests welcome. This works very well for me on amd64. The only problem i've found is overlapping text in the tutorials if the liberation-fonts are not installed. Making fonts/liberation-fonts a run dependency would solve this issue. (To reproduce, uninstall liberation-fonts and choose Help->Tutorials->Basic from the menu.) According to port-lib-depends-check, 'WANTLIB += z' is missing. Otherwise it looks good to me. Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.71 diff -u -p -u -p -r1.71 Makefile --- Makefile4 Sep 2018 12:46:14 - 1.71 +++ Makefile18 Jan 2019 16:37:50 - @@ -2,13 +2,11 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.92.3 +DISTNAME = inkscape-0.92.4 + CATEGORIES = graphics -REVISION = 3 -MASTER_SITES = https://media.inkscape.org/dl/resources/file/ HOMEPAGE =https://www.inkscape.org/ -EXTRACT_SUFX = .tar.bz2 MAINTAINER = Rafael Sadowski @@ -19,15 +17,18 @@ WANTLIB += ${COMPILER_LIBCXX} ICE Magick WANTLIB += MagickWand-6.Q16 SM X11 Xcomposite Xcursor Xdamage WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt aspell atk-1.0 WANTLIB += atkmm-1.6 bz2 c cairo cairomm-1.0 djvulibre enchant -WANTLIB += exif expat ffi fftw3 fontconfig freetype gc gdk-x11-2.0 -WANTLIB += gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 -WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gsl gslcblas -WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell harfbuzz -WANTLIB += iconv intl jasper jbig jpeg lcms2 lzma m openjp2 pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1 -WANTLIB += png poppler poppler-glib popt potrace raw_r sigc-2.0 -WANTLIB += tiff webp webpmux xcb xcb-render xcb-shm xml2 xslt -WANTLIB += z +WANTLIB += exif expat ffi fftw3 fontconfig freetype fribidi gc +WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 +WANTLIB += glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 +WANTLIB += gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell +WANTLIB += harfbuzz iconv intl jasper jbig jpeg lcms2 lzma m openjp2 +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre +WANTLIB += pixman-1 png16 poppler poppler-glib popt potrace raw_r +WANTLIB += sigc-2.0 tiff webp webpmux xcb xcb-render xcb-shm xml2 +WANTLIB += xslt + +MASTER_SITES = https://media.inkscape.org/dl/resources/file/ +EXTRACT_SUFX = .tar.bz2 MODULES= textproc/intltool \ lang/python \ Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo15 Mar 2018 15:59:19 - 1.14 +++ distinfo18 Jan 2019 16:37:50 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.92.3.tar.bz2) = BjKWwFpl16kqD2J0hbZiIUh6z8ZKJPcS61I3xL14FrI= -SIZE (inkscape-0.92.3.tar.bz2) = 31606442 +SHA256 (inkscape-0.92.4.tar.bz2) = V+wtqBd7NmFKUT4oIu/XOvch5pD33ca9Cl+7FSW0UV4= +SIZE (inkscape-0.92.4.tar.bz2) = 31929728 Index: patches/patch-src_extension_internal_pdfinput_pdf-input_cpp === RCS file: patches/patch-src_extension_internal_pdfinput_pdf-input_cpp diff -N patches/patch-src_extension_internal_pdfinput_pdf-input_cpp --- patches/patch-src_extension_internal_pdfinput_pdf-input_cpp 4 Jan 2019 21:09:06 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_extension_internal_pdfinput_pdf-input_cpp,v 1.3 2019/01/04 21:09:06 kili Exp $ - -Fix with new poppler. From archlinux. - -Index: src/extension/internal/pdfinput/pdf-input.cpp src/extension/internal/pdfinput/pdf-input.cpp.orig -+++ src/extension/internal/pdfinput/pdf-input.cpp -@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, - dlg->getImportSettings(prefs); - - // Apply crop settings --PDFRectangle *clipToBox = NULL; -+_POPPLER_CONST PDFRectangle *clipToBox = NULL; - double crop_setting; - sp_repr_get_double(prefs, "cropTo", &crop_setting); - Index: patches/patch-src_extension_internal_pdfinput_pdf-input_h === RCS file: patches/patch-src_extension_internal_pdfinput_pdf-input_h diff -N patches/patch-src_extension_internal_pdfinput_pdf-input_h --- patches/patch-src_extension_internal_pdfinput_pdf-input_h 4 Jan 2019 21:09:06 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_extension_internal_pdfinput_pdf-input_h,v 1.1 2019/01/04 21:09:06 kili Exp $ - -Fix with new poppler. From archlinux. - -Index: src/extension/internal/pdfinput/pdf-input.h
UPDATE: graphics/inkscape
Simple update to the latest stable version. All poppler patches merged upstream. Feedback and/or tests welcome. Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.71 diff -u -p -u -p -r1.71 Makefile --- Makefile4 Sep 2018 12:46:14 - 1.71 +++ Makefile18 Jan 2019 16:37:50 - @@ -2,13 +2,11 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.92.3 +DISTNAME = inkscape-0.92.4 + CATEGORIES = graphics -REVISION = 3 -MASTER_SITES = https://media.inkscape.org/dl/resources/file/ HOMEPAGE = https://www.inkscape.org/ -EXTRACT_SUFX = .tar.bz2 MAINTAINER = Rafael Sadowski @@ -19,15 +17,18 @@ WANTLIB += ${COMPILER_LIBCXX} ICE Magick WANTLIB += MagickWand-6.Q16 SM X11 Xcomposite Xcursor Xdamage WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt aspell atk-1.0 WANTLIB += atkmm-1.6 bz2 c cairo cairomm-1.0 djvulibre enchant -WANTLIB += exif expat ffi fftw3 fontconfig freetype gc gdk-x11-2.0 -WANTLIB += gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 -WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gsl gslcblas -WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell harfbuzz -WANTLIB += iconv intl jasper jbig jpeg lcms2 lzma m openjp2 pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1 -WANTLIB += png poppler poppler-glib popt potrace raw_r sigc-2.0 -WANTLIB += tiff webp webpmux xcb xcb-render xcb-shm xml2 xslt -WANTLIB += z +WANTLIB += exif expat ffi fftw3 fontconfig freetype fribidi gc +WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 +WANTLIB += glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 +WANTLIB += gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell +WANTLIB += harfbuzz iconv intl jasper jbig jpeg lcms2 lzma m openjp2 +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre +WANTLIB += pixman-1 png16 poppler poppler-glib popt potrace raw_r +WANTLIB += sigc-2.0 tiff webp webpmux xcb xcb-render xcb-shm xml2 +WANTLIB += xslt + +MASTER_SITES = https://media.inkscape.org/dl/resources/file/ +EXTRACT_SUFX = .tar.bz2 MODULES= textproc/intltool \ lang/python \ Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo15 Mar 2018 15:59:19 - 1.14 +++ distinfo18 Jan 2019 16:37:50 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.92.3.tar.bz2) = BjKWwFpl16kqD2J0hbZiIUh6z8ZKJPcS61I3xL14FrI= -SIZE (inkscape-0.92.3.tar.bz2) = 31606442 +SHA256 (inkscape-0.92.4.tar.bz2) = V+wtqBd7NmFKUT4oIu/XOvch5pD33ca9Cl+7FSW0UV4= +SIZE (inkscape-0.92.4.tar.bz2) = 31929728 Index: patches/patch-src_extension_internal_pdfinput_pdf-input_cpp === RCS file: patches/patch-src_extension_internal_pdfinput_pdf-input_cpp diff -N patches/patch-src_extension_internal_pdfinput_pdf-input_cpp --- patches/patch-src_extension_internal_pdfinput_pdf-input_cpp 4 Jan 2019 21:09:06 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_extension_internal_pdfinput_pdf-input_cpp,v 1.3 2019/01/04 21:09:06 kili Exp $ - -Fix with new poppler. From archlinux. - -Index: src/extension/internal/pdfinput/pdf-input.cpp src/extension/internal/pdfinput/pdf-input.cpp.orig -+++ src/extension/internal/pdfinput/pdf-input.cpp -@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, - dlg->getImportSettings(prefs); - - // Apply crop settings --PDFRectangle *clipToBox = NULL; -+_POPPLER_CONST PDFRectangle *clipToBox = NULL; - double crop_setting; - sp_repr_get_double(prefs, "cropTo", &crop_setting); - Index: patches/patch-src_extension_internal_pdfinput_pdf-input_h === RCS file: patches/patch-src_extension_internal_pdfinput_pdf-input_h diff -N patches/patch-src_extension_internal_pdfinput_pdf-input_h --- patches/patch-src_extension_internal_pdfinput_pdf-input_h 4 Jan 2019 21:09:06 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_extension_internal_pdfinput_pdf-input_h,v 1.1 2019/01/04 21:09:06 kili Exp $ - -Fix with new poppler. From archlinux. - -Index: src/extension/internal/pdfinput/pdf-input.h src/extension/internal/pdfinput/pdf-input.h.orig -+++ src/extension/internal/pdfinput/pdf-input.h -@@ -15,6 +15,7 @@ - #endif - - #ifdef HAVE_POPPLER -+#include "poppler-transition-api.h" - - #include - Index: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp === RCS file: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp diff -N patches/patch-src_extension_int
UPDATE: graphics/inkscape
Update inkscape to 0.92.3. Tested on amd64. Notable port changes: - Add new lib depend: libwebp - Change MAINTAINER - Drop all poppler patches - Enable tests ok? commenst? Rafael Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.67 diff -u -p -u -p -r1.67 Makefile --- Makefile25 Dec 2017 22:59:24 - 1.67 +++ Makefile15 Mar 2018 15:18:49 - @@ -2,15 +2,14 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.92.2 +DISTNAME = inkscape-0.92.3 CATEGORIES = graphics -REVISION = 0 MASTER_SITES = https://media.inkscape.org/dl/resources/file/ HOMEPAGE = https://www.inkscape.org/ EXTRACT_SUFX = .tar.bz2 -MAINTAINER = Rafael Sadowski +MAINTAINER = Rafael Sadowski # GPLv2 and LGPLv2.1 PERMIT_PACKAGE_CDROM = Yes @@ -25,9 +24,9 @@ WANTLIB += glibmm-2.4 gmodule-2.0 gobjec WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell harfbuzz WANTLIB += iconv intl jasper jbig jpeg lcms2 lzma m openjp2 pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1 -WANTLIB += png poppler poppler-glib popt potrace -WANTLIB += raw_r sigc-2.0 tiff webp xcb xcb-render xcb-shm xml2 -WANTLIB += xslt z +WANTLIB += png poppler poppler-glib popt potrace raw_r sigc-2.0 +WANTLIB += tiff webp webpmux xcb xcb-render xcb-shm xml2 xslt +WANTLIB += z MODULES= textproc/intltool \ lang/python \ @@ -59,6 +58,7 @@ LIB_DEPENDS = devel/boehm-gc \ graphics/libexif \ graphics/png \ graphics/potrace \ + graphics/libwebp \ print/poppler \ textproc/aspell/core \ textproc/gtkspell \ @@ -85,9 +85,6 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE} -I${LOCALBASE}/include -I${X11BASE}/include \ -DPOPPLER_NEW_OBJECT_API" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" - -# XXX todo -NO_TEST = Yes # As discussed on the ports mailing list, remove internationalised manual # pages, as our mandoc implementation does not yet deal with them properly. Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- distinfo19 Aug 2017 08:44:39 - 1.13 +++ distinfo15 Mar 2018 15:18:49 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.92.2.tar.bz2) = pijQ4EwlTphAlH5thml0+SxorjFjGji5TZtl5c2Ez9M= -SIZE (inkscape-0.92.2.tar.bz2) = 31224100 +SHA256 (inkscape-0.92.3.tar.bz2) = BjKWwFpl16kqD2J0hbZiIUh6z8ZKJPcS61I3xL14FrI= +SIZE (inkscape-0.92.3.tar.bz2) = 31606442 Index: patches/patch-CMakeScripts_DefineDependsandFlags_cmake === RCS file: patches/patch-CMakeScripts_DefineDependsandFlags_cmake diff -N patches/patch-CMakeScripts_DefineDependsandFlags_cmake --- patches/patch-CMakeScripts_DefineDependsandFlags_cmake 25 Dec 2017 22:59:24 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,19 +0,0 @@ -$OpenBSD: patch-CMakeScripts_DefineDependsandFlags_cmake,v 1.1 2017/12/25 22:59:24 kili Exp $ - -Fix build with poppler->=0.58. -From upstream commit 9418824967eb4c53371ef8588243fed4cab496e0. - -Index: CMakeScripts/DefineDependsandFlags.cmake CMakeScripts/DefineDependsandFlags.cmake.orig -+++ CMakeScripts/DefineDependsandFlags.cmake -@@ -124,6 +124,10 @@ if(ENABLE_POPPLER) - POPPLER_VERSION VERSION_EQUAL "0.29.0") - set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) - endif() -+ if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR -+ POPPLER_VERSION VERSION_EQUAL "0.58.0") -+set(POPPLER_NEW_OBJECT_API ON) -+ endif() - else() - set(ENABLE_POPPLER_CAIRO OFF) - endif() Index: patches/patch-config_h_cmake === RCS file: patches/patch-config_h_cmake diff -N patches/patch-config_h_cmake --- patches/patch-config_h_cmake25 Dec 2017 22:59:24 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,18 +0,0 @@ -$OpenBSD: patch-config_h_cmake,v 1.1 2017/12/25 22:59:24 kili Exp $ - -Fix build with poppler->=0.58. -From upstream commit 9418824967eb4c53371ef8588243fed4cab496e0. - -Index: config.h.cmake config.h.cmake.orig -+++ config.h.cmake -@@ -149,6 +149,9 @@ - /* Use color space API from Poppler >= 0.29.0 */ - #cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1 - -+/* Use object API from Poppler >= 0.58.0 */ -+#cmakedefine POPPLER_NEW_OBJECT_API 1 -+ - /* Define to 1 if you have the `pow' function. */ - #cmakedefine HAVE_POW 1 - Index: patches/patch-src_extension_internal_pdfinput_pdf-input_cpp === RCS file: patches/patch-src_extension_internal_pdfinpu
Re: UPDATE: graphics/inkscape
Hi, Thanks for this. On Thu, Mar 23, 2017 at 08:14:17PM +0100, Rafael Sadowski wrote: > Updated diff after fixes in CVS. > +DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${DISTNAME}.tar_XlpI7qT.bz2} I wonder why they named their distfile like this. Kinda odd. Otherwise looks good. Had a quick mess around, no crashes. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPDATE: graphics/inkscape
On Wed Mar 01, 2017 at 08:20:14PM +0100, Rafael Sadowski wrote: > Hi All! > > simple bug fix update. Diff see below. Tested on amd64. > > Best regards, > > Rafael Sadowski > Updated diff after fixes in CVS. Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.57 diff -u -p -u -p -r1.57 Makefile --- Makefile10 Mar 2017 20:09:50 - 1.57 +++ Makefile23 Mar 2017 19:12:13 - @@ -2,13 +2,13 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.92.0 +DISTNAME = inkscape-0.92.1 CATEGORIES = graphics -REVISION = 0 -MASTER_SITES = https://inkscape.org/gallery/item/10552/ +MASTER_SITES = https://media.inkscape.org/dl/resources/file/ HOMEPAGE = https://www.inkscape.org/ EXTRACT_SUFX = .tar.bz2 +DISTFILES =${DISTNAME}${EXTRACT_SUFX}{${DISTNAME}.tar_XlpI7qT.bz2} MAINTAINER = Rafael Sadowski Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo24 Feb 2017 08:05:34 - 1.11 +++ distinfo23 Mar 2017 19:12:13 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.92.0.tar.bz2) = uLTBWaAESNRlOEUz5acNPzPl+ca3THbqXWNt3W3XulY= -SIZE (inkscape-0.92.0.tar.bz2) = 30827883 +SHA256 (inkscape-0.92.1.tar.bz2) = JXQFv4At4SXxfRI2OAk6N9sC6+M00kPPmw2JA/fIkAU= +SIZE (inkscape-0.92.1.tar.bz2) = 31222684 Index: pkg/PLIST === RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v retrieving revision 1.12 diff -u -p -u -p -r1.12 PLIST --- pkg/PLIST 24 Feb 2017 08:05:34 - 1.12 +++ pkg/PLIST 23 Mar 2017 19:12:13 - @@ -705,6 +705,16 @@ share/inkscape/tutorials/edge3d.svg share/inkscape/tutorials/gpl-2.svg share/inkscape/tutorials/making_markers.svg share/inkscape/tutorials/oldguitar.jpg +share/inkscape/tutorials/pixelart-dialog.de.png +share/inkscape/tutorials/pixelart-dialog.el.png +share/inkscape/tutorials/pixelart-dialog.en.png +share/inkscape/tutorials/pixelart-dialog.fr.png +share/inkscape/tutorials/pixelart-dialog.nl.png +share/inkscape/tutorials/pixelart-dialog.png +share/inkscape/tutorials/pixelart-dialog.pt.png +share/inkscape/tutorials/pixelart-dialog.ru.png +share/inkscape/tutorials/pixelart-dialog.sk.png +share/inkscape/tutorials/pixelart-dialog.zh_TW.png share/inkscape/tutorials/potrace.be.png share/inkscape/tutorials/potrace.ca.png share/inkscape/tutorials/potrace.de.png @@ -892,6 +902,8 @@ share/inkscape/tutorials/tutorial-tracin share/inkscape/tutorials/tutorial-tracing-pixelart.fr.svg share/inkscape/tutorials/tutorial-tracing-pixelart.nl.svg share/inkscape/tutorials/tutorial-tracing-pixelart.pt.svg +share/inkscape/tutorials/tutorial-tracing-pixelart.ru.svg +share/inkscape/tutorials/tutorial-tracing-pixelart.sk.svg share/inkscape/tutorials/tutorial-tracing-pixelart.svg share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg share/inkscape/tutorials/tutorial-tracing.be.svg
UPDATE: graphics/inkscape
Hi All! simple bug fix update. Diff see below. Tested on amd64. Best regards, Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.56 diff -u -p -u -p -r1.56 Makefile --- Makefile27 Feb 2017 19:42:43 - 1.56 +++ Makefile1 Mar 2017 19:18:15 - @@ -2,12 +2,14 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.92.0 +DISTNAME = inkscape-0.92.1 CATEGORIES = graphics -MASTER_SITES = https://inkscape.org/gallery/item/10552/ +MASTER_SITES = https://inkscape.org/gallery/item/10682/ HOMEPAGE = https://www.inkscape.org/ + EXTRACT_SUFX = .tar.bz2 +DISTFILES =${DISTNAME}${EXTRACT_SUFX}{${DISTNAME}.tar_XlpI7qT.bz2} MAINTAINER = Rafael Sadowski Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo24 Feb 2017 08:05:34 - 1.11 +++ distinfo1 Mar 2017 19:18:15 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.92.0.tar.bz2) = uLTBWaAESNRlOEUz5acNPzPl+ca3THbqXWNt3W3XulY= -SIZE (inkscape-0.92.0.tar.bz2) = 30827883 +SHA256 (inkscape-0.92.1.tar.bz2) = JXQFv4At4SXxfRI2OAk6N9sC6+M00kPPmw2JA/fIkAU= +SIZE (inkscape-0.92.1.tar.bz2) = 31222684 Index: pkg/PLIST === RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v retrieving revision 1.12 diff -u -p -u -p -r1.12 PLIST --- pkg/PLIST 24 Feb 2017 08:05:34 - 1.12 +++ pkg/PLIST 1 Mar 2017 19:18:15 - @@ -705,6 +705,16 @@ share/inkscape/tutorials/edge3d.svg share/inkscape/tutorials/gpl-2.svg share/inkscape/tutorials/making_markers.svg share/inkscape/tutorials/oldguitar.jpg +share/inkscape/tutorials/pixelart-dialog.de.png +share/inkscape/tutorials/pixelart-dialog.el.png +share/inkscape/tutorials/pixelart-dialog.en.png +share/inkscape/tutorials/pixelart-dialog.fr.png +share/inkscape/tutorials/pixelart-dialog.nl.png +share/inkscape/tutorials/pixelart-dialog.png +share/inkscape/tutorials/pixelart-dialog.pt.png +share/inkscape/tutorials/pixelart-dialog.ru.png +share/inkscape/tutorials/pixelart-dialog.sk.png +share/inkscape/tutorials/pixelart-dialog.zh_TW.png share/inkscape/tutorials/potrace.be.png share/inkscape/tutorials/potrace.ca.png share/inkscape/tutorials/potrace.de.png @@ -892,6 +902,8 @@ share/inkscape/tutorials/tutorial-tracin share/inkscape/tutorials/tutorial-tracing-pixelart.fr.svg share/inkscape/tutorials/tutorial-tracing-pixelart.nl.svg share/inkscape/tutorials/tutorial-tracing-pixelart.pt.svg +share/inkscape/tutorials/tutorial-tracing-pixelart.ru.svg +share/inkscape/tutorials/tutorial-tracing-pixelart.sk.svg share/inkscape/tutorials/tutorial-tracing-pixelart.svg share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg share/inkscape/tutorials/tutorial-tracing.be.svg
Re: UPDATE: graphics/inkscape
*ping* below a huge update On Thu Jan 26, 2017 at 07:42:37PM +0100, Rafael Sadowski wrote: > Hi ports@, > > update to the last stable version. All patches committed upstream. > > Did some tests with old SVGs, works fine here on amd64. > > Comments? Feedback? > > Cheers, > > Rafael Sadowski > > Index: Makefile > === > RCS file: /cvs/ports/graphics/inkscape/Makefile,v > retrieving revision 1.53 > diff -u -p -u -p -r1.53 Makefile > --- Makefile 17 Dec 2016 19:06:28 - 1.53 > +++ Makefile 26 Jan 2017 18:35:07 - > @@ -1,16 +1,13 @@ > # $OpenBSD: Makefile,v 1.53 2016/12/17 19:06:28 zhuk Exp $ > > -# XXX check if still needed at next update > -CXXFLAGS += -std=c++11 > - > COMMENT =SVG vector drawing application > > -DISTNAME = inkscape-0.91 > +DISTNAME = inkscape-0.92.0 > CATEGORIES = graphics > -REVISION = 10 > > -MASTER_SITES = https://inkscape.org/en/gallery/item/3854/ > -HOMEPAGE = http://www.inkscape.org/ > +MASTER_SITES = https://inkscape.org/gallery/item/10552/ > +HOMEPAGE = https://www.inkscape.org/ > +EXTRACT_SUFX = .tar.bz2 > > MAINTAINER = Rafael Sadowski > > @@ -25,19 +22,18 @@ WANTLIB += fontconfig freetype gc gdk-x1 > WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 > WANTLIB += graphite2 gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 > WANTLIB += gtkspell harfbuzz iconv intl jbig jpeg lcms2 lzma m > -WANTLIB += openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 > -WANTLIB += pangomm-1.4 pcre pixman-1 png poppler poppler-glib > -WANTLIB += popt pthread pthread-stubs sigc-2.0 stdc++ tiff webp > -WANTLIB += xcb xcb-render xcb-shm xml2 xslt z > +WANTLIB += openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 > +WANTLIB += pcre pixman-1 png poppler poppler-glib popt pthread > +WANTLIB += pthread-stubs sigc-2.0 stdc++ tiff webp xcb xcb-render > +WANTLIB += xcb-shm xml2 xslt z > > MODULES= textproc/intltool \ > lang/python \ > - lang/ruby > + lang/ruby \ > + gcc4 > > -# c++11 > -MODULES += gcc4 > -MODGCC4_ARCHS = * > -MODGCC4_LANGS = c++ > +MODGCC4_ARCHS= * > +MODGCC4_LANGS= c++ > > # We are just substituting paths at build time > MODPY_BUILDDEP = No > @@ -53,6 +49,7 @@ BUILD_DEPENDS = devel/boost > LIB_DEPENDS =devel/boehm-gc \ > devel/gsl \ > devel/popt \ > + devel/pango \ > graphics/ImageMagick \ > graphics/lcms2 \ > graphics/libexif \ > @@ -68,24 +65,33 @@ RUN_DEPENDS = devel/desktop-file-utils \ > x11/gtk+3,-guic > > USE_GMAKE = Yes > + > CONFIGURE_STYLE = gnu > -AUTOCONF_VERSION = 2.69 > + > +AUTOCONF_VERSION = 2.69 > +AUTOMAKE_VERSION = 1.11 > > CONFIGURE_ARGS = -without-gnome-vfs > CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/ImageMagick \ > - -I${LOCALBASE}/include -I${X11BASE}/include" \ > + -I${LOCALBASE}/include -I${X11BASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" > > +# XXX todo > NO_TEST =Yes > > # As discussed on the ports mailing list, remove internationalised manual > # pages, as our mandoc implementation does not yet deal with them properly. > RM_MANS =man/el man/fr man/ja man/man1/inkscape.*.1 \ > - man/sk man/zh_TW > + man/sk man/zh_TW man/de > > SUBST_VARS +=RUBY MODRUBY_REV > pre-configure: > - ${SUBST_CMD} ${WRKSRC}/src/extension/implementation/script.cpp > + find ${WRKDIST} -name i18n.py \ > + -exec sed -i 's,python,${MODPY_BIN},' {} +; > + ${SUBST_CMD} ${WRKSRC}/src/extension/implementation/script.cpp \ > + ${WRKSRC}/src/main.cpp > + cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ > + AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh > > post-install: > .for i in ${RM_MANS} > Index: distinfo > === > RCS file: /cvs/ports/graphics/inkscape/distinfo,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 distinfo > --- distinfo 24 Mar 2015 18:45:11 - 1.10 > +++ distinfo 26 Jan 2017 18:35:07 - > @@ -1,2 +1,2 @@ > -SHA256 (inkscape-0.91.tar.gz) = LKPPvI21PkpPIGUL9Qx85pKojcv0HrwMks0k5GUA2yA= > -SIZE (inkscape-0.91.tar.gz) = 34074831 > +SHA256 (inkscape-0.92.0.tar.bz2) = > uLTBWaAESNRlOEUz5acNPzPl+ca3THbqXWNt3W3XulY= > +SIZE (inkscape-0.92.0.tar.bz2) = 30827883 > Index: patches/patch-src_2geom_hvlinesegment_h > === > RCS file: patches/patch-src_2geom_hvlinesegment_h > diff -N patches/patch-src_2geom_hvlinesegment_h > --- patches/patch-src_2geom_hvlinesegment_h 24 Mar 2015 18:45:12 - > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,16 +0,0 @@ > -$OpenBSD: patc
UPDATE: graphics/inkscape
Hi ports@, update to the last stable version. All patches committed upstream. Did some tests with old SVGs, works fine here on amd64. Comments? Feedback? Cheers, Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.53 diff -u -p -u -p -r1.53 Makefile --- Makefile17 Dec 2016 19:06:28 - 1.53 +++ Makefile26 Jan 2017 18:35:07 - @@ -1,16 +1,13 @@ # $OpenBSD: Makefile,v 1.53 2016/12/17 19:06:28 zhuk Exp $ -# XXX check if still needed at next update -CXXFLAGS +=-std=c++11 - COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.91 +DISTNAME = inkscape-0.92.0 CATEGORIES = graphics -REVISION = 10 -MASTER_SITES = https://inkscape.org/en/gallery/item/3854/ -HOMEPAGE = http://www.inkscape.org/ +MASTER_SITES = https://inkscape.org/gallery/item/10552/ +HOMEPAGE = https://www.inkscape.org/ +EXTRACT_SUFX = .tar.bz2 MAINTAINER = Rafael Sadowski @@ -25,19 +22,18 @@ WANTLIB += fontconfig freetype gc gdk-x1 WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 WANTLIB += graphite2 gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 WANTLIB += gtkspell harfbuzz iconv intl jbig jpeg lcms2 lzma m -WANTLIB += openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pangomm-1.4 pcre pixman-1 png poppler poppler-glib -WANTLIB += popt pthread pthread-stubs sigc-2.0 stdc++ tiff webp -WANTLIB += xcb xcb-render xcb-shm xml2 xslt z +WANTLIB += openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 +WANTLIB += pcre pixman-1 png poppler poppler-glib popt pthread +WANTLIB += pthread-stubs sigc-2.0 stdc++ tiff webp xcb xcb-render +WANTLIB += xcb-shm xml2 xslt z MODULES= textproc/intltool \ lang/python \ - lang/ruby + lang/ruby \ + gcc4 -# c++11 -MODULES += gcc4 -MODGCC4_ARCHS =* -MODGCC4_LANGS =c++ +MODGCC4_ARCHS= * +MODGCC4_LANGS= c++ # We are just substituting paths at build time MODPY_BUILDDEP = No @@ -53,6 +49,7 @@ BUILD_DEPENDS = devel/boost LIB_DEPENDS = devel/boehm-gc \ devel/gsl \ devel/popt \ + devel/pango \ graphics/ImageMagick \ graphics/lcms2 \ graphics/libexif \ @@ -68,24 +65,33 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic USE_GMAKE =Yes + CONFIGURE_STYLE = gnu -AUTOCONF_VERSION = 2.69 + +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.11 CONFIGURE_ARGS = -without-gnome-vfs CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include/ImageMagick \ - -I${LOCALBASE}/include -I${X11BASE}/include" \ + -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +# XXX todo NO_TEST = Yes # As discussed on the ports mailing list, remove internationalised manual # pages, as our mandoc implementation does not yet deal with them properly. RM_MANS = man/el man/fr man/ja man/man1/inkscape.*.1 \ - man/sk man/zh_TW + man/sk man/zh_TW man/de SUBST_VARS += RUBY MODRUBY_REV pre-configure: - ${SUBST_CMD} ${WRKSRC}/src/extension/implementation/script.cpp + find ${WRKDIST} -name i18n.py \ + -exec sed -i 's,python,${MODPY_BIN},' {} +; + ${SUBST_CMD} ${WRKSRC}/src/extension/implementation/script.cpp \ + ${WRKSRC}/src/main.cpp + cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh post-install: .for i in ${RM_MANS} Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo24 Mar 2015 18:45:11 - 1.10 +++ distinfo26 Jan 2017 18:35:07 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.91.tar.gz) = LKPPvI21PkpPIGUL9Qx85pKojcv0HrwMks0k5GUA2yA= -SIZE (inkscape-0.91.tar.gz) = 34074831 +SHA256 (inkscape-0.92.0.tar.bz2) = uLTBWaAESNRlOEUz5acNPzPl+ca3THbqXWNt3W3XulY= +SIZE (inkscape-0.92.0.tar.bz2) = 30827883 Index: patches/patch-src_2geom_hvlinesegment_h === RCS file: patches/patch-src_2geom_hvlinesegment_h diff -N patches/patch-src_2geom_hvlinesegment_h --- patches/patch-src_2geom_hvlinesegment_h 24 Mar 2015 18:45:12 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_2geom_hvlinesegment_h,v 1.1 2015/03/24 18:45:12 landry Exp $ src/2geom/hvlinesegment.h.orig Tue Mar 17 22:36:38 2015 -+++ src/2geom/hvlinesegment.h Tue Mar 17 22:36:46 2015 -@@ -1,10 +1,10 @@ --/** -+/** - * \file - * \brief Horizontal and vertical line segment - *//* - * Authors
Re: update graphics/inkscape
On Sat, May 14, 2011 at 05:03:19PM +0200, Matthias Kilian wrote: > Update to inkscape-0.48.1. Disregard. Brad sent a (cleaner) diff earlier, which I'll put in this evening. Ciao, Kili
update graphics/inkscape
Update to inkscape-0.48.1. Contains a fix for the poppler-0.16 API change (poppler-0.16 isn't committed yet, but inkscape should build and work with either version of poppler). This also seems to fix the ruler problem mentioned on ports@ (but not the memory display nor the poor performance of the GUI). ok? Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile17 Nov 2010 08:05:14 - 1.19 +++ Makefile14 May 2011 14:48:47 - @@ -2,8 +2,7 @@ COMMENT= SVG vector drawing application -DISTNAME= inkscape-0.48.0 -REVISION= 0 +DISTNAME= inkscape-0.48.1 CATEGORIES=graphics MAINTAINER=Benoit Chesneau @@ -18,16 +17,16 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM=Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender aspell atk-1.0 c cairo \ - cairomm-1.0 expat fontconfig freetype glib-2.0 glibmm-2.4 \ +WANTLIB= GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender Xxf86vm aspell atk-1.0 c cairo \ + cairomm-1.0 drm expat fontconfig freetype glib-2.0 glibmm-2.4 \ gmodule-2.0 gobject-2.0 gsl gslcblas gthread-2.0 m \ pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 pthread \ sigc-2.0 stdc++ xml2 z gio-2.0 giomm-2.4 \ pthread-stubs xcb gc>=3 popt MagickCore Magick++ \ lcms png xslt poppler poppler-glib atkmm-1.6 gdkmm-2.4 \ gtkmm-2.4 pangomm-1.4 gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \ - gtkspell xcb-render xcb-render-util + gtkspell xcb-render xcb-shm MODULES= devel/gettext \ textproc/intltool Index: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo5 Oct 2010 08:57:47 - 1.2 +++ distinfo14 May 2011 14:48:47 - @@ -1,5 +1,5 @@ -MD5 (inkscape-0.48.0.tar.gz) = u5RUO4ExV9gygWV6iUZdRg== -RMD160 (inkscape-0.48.0.tar.gz) = DZfBcTb+aaIki7TPTS9ils4Yw38= -SHA1 (inkscape-0.48.0.tar.gz) = IgremBBpqR06+rnL/3X2XHURnaI= -SHA256 (inkscape-0.48.0.tar.gz) = CBL2ymOqfEuyNskyoCvU4MtSCUBLtCz/X2WtD4SEQXY= -SIZE (inkscape-0.48.0.tar.gz) = 25870275 +MD5 (inkscape-0.48.1.tar.gz) = PBeeuZjUnRwxKCLhV3O/bQ== +RMD160 (inkscape-0.48.1.tar.gz) = oaIe24diSXKwvJhaeqIdOvcKySM= +SHA1 (inkscape-0.48.1.tar.gz) = pDRnEZklrucNHWPXRvmEartN6pE= +SHA256 (inkscape-0.48.1.tar.gz) = Cn90TjJupaNeZEzo5JuG+gQ7z30ihwhnmhX/CxTzqIg= +SIZE (inkscape-0.48.1.tar.gz) = 26249296 Index: patches/patch-configure === RCS file: patches/patch-configure diff -N patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-configure 14 May 2011 14:48:47 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.orig Sun Jan 9 22:01:51 2011 configure Sat May 14 15:36:48 2011 +@@ -10785,7 +10785,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>confdefs.h + + fi + +-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2 -ldl" ++INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2" + if test "x$openmp_ok" = "xyes"; then + INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp" + fi Index: pkg/PLIST === RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 5 Oct 2010 08:57:47 - 1.4 +++ pkg/PLIST 14 May 2011 14:48:47 - @@ -628,6 +628,7 @@ share/inkscape/tutorials/potrace-es.png share/inkscape/tutorials/potrace-eu.png share/inkscape/tutorials/potrace-fr.png share/inkscape/tutorials/potrace-hu.png +share/inkscape/tutorials/potrace-id.png share/inkscape/tutorials/potrace-ja.png share/inkscape/tutorials/potrace-nl.png share/inkscape/tutorials/potrace-pl.png @@ -697,7 +698,9 @@ share/inkscape/tutorials/tutorial-callig share/inkscape/tutorials/tutorial-calligraphy.fa.svg share/inkscape/tutorials/tutorial-calligraphy.fr.svg share/inkscape/tutorials/tutorial-calligraphy.hu.svg +share/inkscape/tutorials/tutorial-calligraphy.id.svg share/inkscape/tutorials/tutorial-calligraphy.ja.svg +share/inkscape/tutorials/tutorial-calligraphy.nl.svg share/inkscape/tutorials/tutorial-calligraphy.pl.svg share/inkscape/tutorials/tutorial-calligraphy.pt_BR.svg share/inkscape/tutorials/tutorial-calligraphy.ru.svg @@ -714,7 +717,9 @@ share/inkscape/tutorials/tutorial-elemen share/inkscape/tutorials/tutorial-elements.fa.svg share/inkscape/tutorials/tutorial-elements.fr.svg share/inkscape/tutorials/tutorial-elements.hu.svg +share/inkscape/tutorials/tutorial-elements.id.svg share/inkscape/tutorials/tutorial-