From 496d3dbcbd4335f46c2ba492f9895a4ed6dba76c Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Sun, 30 Jul 2023 08:40:36 +0700 Subject: [PATCH 1/2] New package: lib2geom-1.3 --- common/shlibs | 1 + srcpkgs/lib2geom-devel | 1 + srcpkgs/lib2geom/template | 40 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 120000 srcpkgs/lib2geom-devel create mode 100644 srcpkgs/lib2geom/template diff --git a/common/shlibs b/common/shlibs index 9f4553e6ccc2b..ddb0e8ab87091 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4326,3 +4326,4 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1 libvmaf.so.1 vmaf-2.3.1_1 liblc3.so.1 liblc3-1.0.3_1 libmimalloc.so.2 mimalloc-2.1.2_1 +lib2geom.so.1.3.0 lib2geom-1.3_1 diff --git a/srcpkgs/lib2geom-devel b/srcpkgs/lib2geom-devel new file mode 120000 index 0000000000000..41abdb3cf7010 --- /dev/null +++ b/srcpkgs/lib2geom-devel @@ -0,0 +1 @@ +lib2geom \ No newline at end of file diff --git a/srcpkgs/lib2geom/template b/srcpkgs/lib2geom/template new file mode 100644 index 0000000000000..b5ca3f0d614ab --- /dev/null +++ b/srcpkgs/lib2geom/template @@ -0,0 +1,40 @@ +# Template file for 'lib2geom' +pkgname=lib2geom +version=1.3 +revision=1 +build_style=cmake +configure_args="-D2GEOM_BUILD_SHARED=ON" +hostmakedepends="pkg-config python3-Cython ragel samurai" +makedepends="boost-devel double-conversion-devel cairo-devel gtk+3-devel gsl-devel" +checkdepends="gtest-devel" +short_desc="Easy to use 2D geometry library for c++" +maintainer="Hervy Qurrotul Ainur Rozi " +license="LGPL-2.1-or-later, MPL-1.1" +homepage="https://gitlab.com/inkscape/lib2geom" +distfiles="https://gitlab.com/inkscape/lib2geom/-/archive/${version}/lib2geom-${version}.tar.bz2" +checksum=bd07f2a1322fcad16a55a1901207faa55dffdecebc56a00eabd4575f62e043c9 + +if [ -n "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -D2GEOM_TESTING=ON" +else + configure_args+=" -D2GEOM_TESTING=OFF" +fi + +do_check() { + case "$XBPS_TARGET_MACHINE" in + x86_64-musl) _fail='circle-test' ;; + i686) _fail='(ellipse-test|elliptical-arc-test|self-intersections-test)' ;; + esac + ctest --test-dir build --output-on-failure "$makejobs" -E "$_fail" +} + +lib2geom-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}-${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + } +} From f1a1b646ff0ac0a84d44acf288312c4a6d9ee710 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Sun, 30 Jul 2023 08:40:52 +0700 Subject: [PATCH 2/2] inkscape: update to 1.3 --- srcpkgs/inkscape/patches/musl_page_size.patch | 51 +++++++++++++++++++ srcpkgs/inkscape/template | 31 ++++++----- 2 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/inkscape/patches/musl_page_size.patch diff --git a/srcpkgs/inkscape/patches/musl_page_size.patch b/srcpkgs/inkscape/patches/musl_page_size.patch new file mode 100644 index 0000000000000..15fcfb4705d71 --- /dev/null +++ b/srcpkgs/inkscape/patches/musl_page_size.patch @@ -0,0 +1,51 @@ +PAGE_SIZE is a reserved identifier, but we should be abnle to safely rename it +in the enum without breaking anything to still build against musl +-- +diff --git a/src/attributes.cpp b/src/attributes.cpp +index e5abed3..9e0c459 100644 +--- a/src/attributes.cpp ++++ b/src/attributes.cpp +@@ -142,7 +142,7 @@ static SPStyleProp const props[] = { + /* SPPage */ + {SPAttr::PAGE_MARGIN, "margin"}, + {SPAttr::PAGE_BLEED, "bleed"}, +- {SPAttr::PAGE_SIZE, "page-size"}, ++ {SPAttr::PAGE_SIZEx, "page-size"}, + /* SPGrid */ + {SPAttr::ORIGINX, "originx"}, + {SPAttr::ORIGINY, "originy"}, +diff --git a/src/attributes.h b/src/attributes.h +index 2b17b09..4e8470a 100644 +--- a/src/attributes.h ++++ b/src/attributes.h +@@ -141,7 +141,7 @@ enum class SPAttr { + /* SPPage */ + PAGE_MARGIN, + PAGE_BLEED, +- PAGE_SIZE, ++ PAGE_SIZEx, + /* SPGrid */ + ORIGINX, + ORIGINY, +diff --git a/src/object/sp-page.cpp b/src/object/sp-page.cpp +index cc5c41f..4d0a1fc 100644 +--- a/src/object/sp-page.cpp ++++ b/src/object/sp-page.cpp +@@ -42,7 +42,7 @@ void SPPage::build(SPDocument *document, Inkscape::XML::Node *repr) + SPObject::build(document, repr); + + this->readAttr(SPAttr::INKSCAPE_LABEL); +- this->readAttr(SPAttr::PAGE_SIZE); ++ this->readAttr(SPAttr::PAGE_SIZEx); + this->readAttr(SPAttr::X); + this->readAttr(SPAttr::Y); + this->readAttr(SPAttr::WIDTH); +@@ -85,7 +85,7 @@ void SPPage::set(SPAttr key, const gchar *value) + case SPAttr::PAGE_BLEED: + this->bleed.readOrUnset(value); + break; +- case SPAttr::PAGE_SIZE: ++ case SPAttr::PAGE_SIZEx: + this->_size_label = value ? std::string(value) : ""; + break; + default: diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 49633b61fd861..b6b29f0790ed1 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,28 +1,35 @@ # Template file for 'inkscape' pkgname=inkscape -version=1.2.2 +version=1.3 revision=1 build_style=cmake -# builds executables then runs checks -# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 -make_check_target=check -hostmakedepends="automake gettext glib-devel intltool libmagick-devel libtool - perl-XML-Parser pkg-config which" +make_check_target="check" +hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel + libtool perl-XML-Parser pkg-config which python3-Cython ragel" makedepends="aspell-devel cairomm-devel double-conversion-devel gc-devel gdl-devel gsl-devel gspell-devel gtkmm-devel gtkspell3-devel harfbuzz-devel hunspell-devel libatomic_ops-devel libcdr-devel libgomp-devel libsoup-devel libvisio-devel libwpd-devel libwpd-devel libwpg-devel libxslt-devel pango-devel - poppler-devel poppler-glib-devel potrace-devel" + poppler-devel poppler-glib-devel potrace-devel gtest-devel gtksourceview4-devel + lib2geom-devel popt-devel readline-devel" depends="desktop-file-utils hicolor-icon-theme python3-Pillow python3-appdirs python3-cssselect python3-lxml python3-numpy python3-requests python3-scour" -checkdepends="$depends ImageMagick cantarell-fonts gtest-devel" +checkdepends="$depends GraphicsMagick ImageMagick cantarell-fonts gtest-devel" short_desc="Vector-based drawing program" maintainer="Alex Lohr " license="GPL-2.0-only, LGPL-2.1-or-later" -homepage="http://inkscape.org/" +homepage="https://inkscape.org/" distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz" -checksum=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4 +checksum=bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307 python_version=3 +# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 +make_check=no + +if [ -n "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_TESTING=ON" +else + configure_args+=" -DBUILD_TESTING=OFF" +fi post_patch() { if [ "$XBPS_TARGET_LIBC" = musl ]; then @@ -32,6 +39,6 @@ post_patch() { fi # disable glyph tests that fail due to different hinting vsed -e \ - "s/\(test-glyph-y-pos\|test-rtl-vertical\|text-glyphs-combining\|text-glyphs-vertical\)/# \1 - skipped due to hinting issues/" \ - -i testfiles/rendering_tests/CMakeLists.txt + "s/add_subdirectory(rendering_tests)/# \0 - skipped due to hinting issues/" \ + -i testfiles//CMakeLists.txt }