inkscape: add libdir to lib and not lib64

This commit is contained in:
Danny Rawlins 2021-06-19 23:14:58 +10:00
parent cd10165fbc
commit c188c5febf
3 changed files with 15 additions and 15 deletions

@ -100,19 +100,18 @@ drwxr-xr-x root/root usr/include/2geom-1.1.0/2geom/symbolic/
-rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/transforms.h
-rw-r--r-- root/root usr/include/2geom-1.1.0/2geom/utils.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/cmake/
drwxr-xr-x root/root usr/lib/cmake/2Geom/
-rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomConfig.cmake
-rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomConfigVersion.cmake
-rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/2Geom/2GeomTargets.cmake
drwxr-xr-x root/root usr/lib/inkscape/
-rwxr-xr-x root/root usr/lib/inkscape/libinkscape_base.so
lrwxrwxrwx root/root usr/lib/lib2geom.so -> lib2geom.so.1.1.0
-rwxr-xr-x root/root usr/lib/lib2geom.so.1.1.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/2geom.pc
drwxr-xr-x root/root usr/lib64/
drwxr-xr-x root/root usr/lib64/cmake/
drwxr-xr-x root/root usr/lib64/cmake/2Geom/
-rw-r--r-- root/root usr/lib64/cmake/2Geom/2GeomConfig.cmake
-rw-r--r-- root/root usr/lib64/cmake/2Geom/2GeomConfigVersion.cmake
-rw-r--r-- root/root usr/lib64/cmake/2Geom/2GeomTargets-release.cmake
-rw-r--r-- root/root usr/lib64/cmake/2Geom/2GeomTargets.cmake
drwxr-xr-x root/root usr/lib64/inkscape/
-rwxr-xr-x root/root usr/lib64/inkscape/libinkscape_base.so
lrwxrwxrwx root/root usr/lib64/lib2geom.so -> lib2geom.so.1.1.0
-rwxr-xr-x root/root usr/lib64/lib2geom.so.1.1.0
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/org.inkscape.Inkscape.desktop

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF31Ql1ovz8YMtzzslgb9F4J62kcXa4GboyL74g4xo9+cxB6t21v1tu2LRHjsQsJIvmecj52s4ka9qLQ4CDGohTA8=
SHA256 (Pkgfile) = 2260fe92600cd216d989804c3c2d8f7c5e596afb2fd6ceb64a92686de122c4e5
SHA256 (.footprint) = aac767626b117d415ad0bdedbece6c76c865068cb9e248c97442d14d68db07aa
RWSagIOpLGJF3354hpcDMSyRcNl899644ZiynO9wkJTa7FzbaGV/FKpiUF7L5ll746Zu/Tyzal/rlzd384RvQ2x9QfVcpPAfrQA=
SHA256 (Pkgfile) = d13c52f460388e24f346ef4fc42092bc0e678de6ed48d5468cbcec95e2653923
SHA256 (.footprint) = 8a957107d077ffd8cdedcb76c718f9f2796605e628afb302f1ab99a91743bcae
SHA256 (inkscape-1.1.tar.xz) = 71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6
SHA256 (poppler-21.06.1.tar.xz) = 86b09e5a02de40081a3916ef8711c5128eaf4b1fc59d5f87d0ec66f04f595db4

@ -7,7 +7,7 @@ name=inkscape
version=1.1
_pversion=21.06.1
_psoversion=111
release=5
release=6
source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz
https://poppler.freedesktop.org/poppler-$_pversion.tar.xz)
@ -47,6 +47,7 @@ build() {
cmake -S $name-${version}_* -B build -G Ninja \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_LIBDIR=lib \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \