diff --git a/recipes-graphics/inkscape/inkscape.bb b/recipes-graphics/inkscape/inkscape.bb index 65600de..70b2f9d 100644 --- a/recipes-graphics/inkscape/inkscape.bb +++ b/recipes-graphics/inkscape/inkscape.bb @@ -3,37 +3,34 @@ HOMEPAGE = "https://inkscape.org/" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=46f815712c095f667139ef42f2270d57" -PV = "1.2.1" -SRC_URI = " \ - https://inkscape.org/gallery/item/34673/${BP}.tar.xz \ - file://0001-Fix-build-with-poppler-22.09.patch \ -" -SRC_URI[sha256sum] = "46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b" -S = "${WORKDIR}/${BPN}-${PV}_2022-07-14_9c6d41e410" +SRC_URI = "gitsm://gitlab.com/inkscape/inkscape.git;protocol=https;nobranch=1" +SRCREV = "b0a8486541ac36327488da641d58a86bee2f07ad" +S = "${WORKDIR}/git" +PV = "1.2.2" DEPENDS = " \ - glib-2.0-native \ - pango \ - gtkmm3 \ - libsoup-2.4 \ - harfbuzz \ - poppler \ - gsl \ bdwgc \ - lcms \ + cairo \ + glib-2.0-native \ + gsl \ gspell \ + gtkmm3 \ + harfbuzz \ + lcms \ + libsoup-2.4 \ libxslt \ + pango \ + poppler \ \ double-conversion \ - libwpg \ - librevenge \ + lib2geom \ libcdr \ + librevenge \ libvisio \ + libwpg \ potrace \ " inherit cmake pkgconfig gettext gtk-icon-cache bash-completion mime-xdg FILES:${PN} += "${datadir}/metainfo" - -INSANE_SKIP:${PN} = "useless-rpaths" diff --git a/recipes-graphics/inkscape/lib2geom_git.bb b/recipes-graphics/inkscape/lib2geom_git.bb new file mode 100644 index 0000000..b13ed64 --- /dev/null +++ b/recipes-graphics/inkscape/lib2geom_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "2Geom: easy 2D graphics library" +HOMEPAGE = "https://gitlab.com/inkscape/lib2geom" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29" + +inherit cmake pkgconfig + +DEPENDS = "boost double-conversion gtk+3 glib-2.0 cairo gsl" + +SRC_URI = " \ + git://gitlab.com/inkscape/lib2geom.git;protocol=https;nobranch=1 \ +" + +PV = "1.2.2" +SRCREV = "a84a73ebdae50cc729f57d1ffb788aeaef0f746c" +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -D2GEOM_TESTING=FALSE \ + -D2GEOM_STANDALONE=TRUE \ + -D2GEOM_BUILD_SHARED=TRUE \ + -D2GEOM_USE_GPL_CODE=TRUE \ +"