diff --git a/media-gfx/inkscape/inkscape-1.2.1.recipe b/media-gfx/inkscape/inkscape-1.2.1.recipe index feec7e1b7..c3c66589f 100644 --- a/media-gfx/inkscape/inkscape-1.2.1.recipe +++ b/media-gfx/inkscape/inkscape-1.2.1.recipe @@ -9,7 +9,7 @@ which is supported by many other applications including web browsers." HOMEPAGE="https://inkscape.org/" COPYRIGHT="2022 Inkscape Developers" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://inkscape.org/gallery/item/34673/inkscape-$portVersion.tar.xz" CHECKSUM_SHA256="46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b" SOURCE_DIR="inkscape-${portVersion}_2022-07-14_9c6d41e410" @@ -109,26 +109,27 @@ BUILD_PREREQUIRES=" BUILD() { LDFLAGS="-Wl,--as-needed" \ - cmake . $cmakeDirArgs -GNinja \ + cmake . -GNinja \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$appsDir/Inkscape \ + -DCMAKE_INSTALL_BINDIR=$appsDir/Inkscape \ + -DCMAKE_INSTALL_LIBDIR=$appsDir/Inkscape/lib \ -DSHARE_INSTALL=$dataDir \ -DINKSCAPE_DATADIR=$dataDir \ -DPACKAGE_LOCALE_DIR=$dataDir/locale \ -DWITH_X11=OFF - # otherwise it runs out of memory, unfortunately - ninja -j1 + ninja -v } INSTALL() { ninja install - mkdir -p $appsDir - mv $binDir/inkscape $appsDir/Inkscape - mv $binDir/inkview $appsDir/Inkview + mv $appsDir/Inkscape/inkscape $appsDir/Inkscape/Inkscape + mv $appsDir/Inkscape/inkview $appsDir/Inkscape/Inkview - rm -rf $binDir $developDir $libDir/{cmake,pkgconfig} + rm -rf $appsDir/Inkscape/{include,share} $appsDir/Inkscape/lib/{cmake,pkgconfig} local APP_SIGNATURE="application/x-vnd.inkscape-inkscape" local MAJOR="`echo "$portVersion" | cut -d. -f1`" @@ -152,9 +153,9 @@ INSTALL() -e "s|@LONG_INFO@|$LONG_INFO|" \ $portDir/additional-files/inkview.rdef.in > inkview.rdef - addResourcesToBinaries inkscape.rdef $appsDir/Inkscape - addAppDeskbarSymlink $appsDir/Inkscape + addResourcesToBinaries inkscape.rdef $appsDir/Inkscape/Inkscape + addAppDeskbarSymlink $appsDir/Inkscape/Inkscape - addResourcesToBinaries inkview.rdef $appsDir/Inkview - addAppDeskbarSymlink $appsDir/Inkview + addResourcesToBinaries inkview.rdef $appsDir/Inkscape/Inkview + addAppDeskbarSymlink $appsDir/Inkscape/Inkview }