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
> -
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:
