commit: ae971a260769135ee6846e157bc04617cb2bcc0a Author: Huang Rui <vowstar <AT> gmail <DOT> com> AuthorDate: Mon Jun 27 03:45:36 2022 +0000 Commit: Rui Huang <vowstar <AT> gmail <DOT> com> CommitDate: Mon Jun 27 03:45:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae971a26
media-gfx/zw3d: add 2022.0.3.1, drop 2022.26.00-r1 Signed-off-by: Huang Rui <vowstar <AT> gmail.com> media-gfx/zw3d/Manifest | 2 +- media-gfx/zw3d/metadata.xml | 2 +- ...2022.26.00-r1.ebuild => zw3d-2022.0.3.1.ebuild} | 36 +++++++++++++++++----- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/media-gfx/zw3d/Manifest b/media-gfx/zw3d/Manifest index c2c28bcf4..996f78c91 100644 --- a/media-gfx/zw3d/Manifest +++ b/media-gfx/zw3d/Manifest @@ -1 +1 @@ -DIST ZW3D-2022-Professional-V1.0_amd64.deb 833573660 BLAKE2B b909085f4e56e76a87ca2f94270bcdf5ce416dad185daf6b966ca894b6bc9b1b67590ef8025b86a5a07902a7f5b20711fc7ba7043195f13cbdf75dcd5e0a09c2 SHA512 c045476c67d6976f826c67aba2ffe1ae2d3c51e5a917c7c16fe37bb74cfad7394877b903f4123509ce1fd0f7b956ae8e8c31445c40d6c7f63bba7be657069f30 +DIST zw3d-2022.0.3.1.deb 830137436 BLAKE2B d2f5976ec8e00ab31f2e34b690b5f8e2c637500ea7a599d2409ebe07db2c36bb1bb0c98b17b3515672dbfe26d9ddf05e36f0f91a5c0a535a7b87ffaaf389fa6b SHA512 fba4aa4b3752895bbc644b77624a1548dbea0449c13f31ded12cb213feec26ba28b205c13b77fa99fce7cf93d082583865d67d12775b94e9e46585b71214f5f0 diff --git a/media-gfx/zw3d/metadata.xml b/media-gfx/zw3d/metadata.xml index 1fac258f9..174021f95 100644 --- a/media-gfx/zw3d/metadata.xml +++ b/media-gfx/zw3d/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> <email>[email protected]</email> diff --git a/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1.ebuild similarity index 66% rename from media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild rename to media-gfx/zw3d/zw3d-2022.0.3.1.ebuild index 9e849cc8a..67438eb20 100644 --- a/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild +++ b/media-gfx/zw3d/zw3d-2022.0.3.1.ebuild @@ -8,7 +8,7 @@ inherit unpacker xdg DESCRIPTION="CAD/CAM software for 3D design and processing" HOMEPAGE="https://www.zwsoft.cn/product/zw3d/linux"; -SRC_URI="https://download.zwcad.com/zw3d/3d_linux/2022/ZW3D-2022-Professional-V1.0_amd64.deb"; +SRC_URI="https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${PV}_amd64.deb -> ${P}.deb" LICENSE="all-rights-reserved" SLOT="0" @@ -19,16 +19,25 @@ RESTRICT="strip mirror bindist" RDEPEND=" app-arch/bzip2 app-arch/xz-utils + app-text/djvu + dev-db/sqlite:3 dev-libs/atk dev-libs/glib:2 dev-libs/libpcre dev-libs/libxml2 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 - dev-qt/qtwayland:5 + media-fonts/noto-cjk media-gfx/imagemagick + media-libs/jbigkit media-libs/libglvnd media-libs/libpng + media-libs/opencollada media-libs/tiff + net-libs/zeromq sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf:2 @@ -46,7 +55,10 @@ RDEPEND=" DEPEND="${RDEPEND}" -BDEPEND="dev-util/patchelf" +BDEPEND=" + dev-util/bbe + dev-util/patchelf +" S=${WORKDIR} @@ -64,10 +76,12 @@ src_install() { # Use \x7fELF header to separate ELF executables and libraries [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue local RPATH_ROOT="/opt/apps/${MY_PGK_NAME}/files" - local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/xlator/:${RPATH_ROOT}/lib/xlator/InterOp/:${RPATH_ROOT}/libqt/:${RPATH_ROOT}/libqt/plugins/designer/:${RPATH_ROOT}/lib3rd/" + local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/xlator/:${RPATH_ROOT}/lib/xlator/InterOp/:${RPATH_ROOT}/libqt/:${RPATH_ROOT}/libqt/plugins/designer/:${RPATH_ROOT}/lib3rd/:/usr/lib64/" patchelf --set-rpath "${RPATH_S}" "${x}" || \ die "patchelf failed on ${x}" - patchelf --replace-needed libMagickCore-6.Q16.so.7 libMagickCore-7.Q16.so "${x}" || \ + # patchelf --replace-needed libMagickCore-6.Q16.so.7 libMagickCore-7.Q16.so "${x}" || \ + # die "patchelf failed on ${x}" + patchelf --replace-needed libjbig.so.0 libjbig.so "${x}" || \ die "patchelf failed on ${x}" done popd || die @@ -88,8 +102,16 @@ sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$* ln -s /opt/apps/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die # Use system libraries - rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die - rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die + # rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die + # rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die + + # Fix coredump while draw 2D sketch due to not find fonts + # media-fonts/noto-cjk is required + # and should use /usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc + local MY_FONT_PATH_OLD="/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc" + local MY_FONT_PATH_NEW="//////usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc" + bbe -e "s|${MY_FONT_PATH_OLD}|${MY_FONT_PATH_NEW}|" "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so" > "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so.tmp" && \ + mv "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so.tmp" "${S}/opt/apps/${MY_PGK_NAME}/files/lib/libdisp.so" || die # Install package and fix permissions insinto /opt/apps
