[gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-04-21  3:34 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-04-21  3:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6722631748e341ebc90306fa6e2e977f9ef51ac7
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Apr 21 03:33:41 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Apr 21 03:33:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=67226317

media-gfx/zw3d: new package, add 2022.26.00

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/Manifest               |   1 +
 media-gfx/zw3d/metadata.xml           |  23 +++++++
 media-gfx/zw3d/zw3d-2022.26.00.ebuild | 113 ++++++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/media-gfx/zw3d/Manifest b/media-gfx/zw3d/Manifest
new file mode 100644
index 000000000..c2c28bcf4
--- /dev/null
+++ b/media-gfx/zw3d/Manifest
@@ -0,0 +1 @@
+DIST ZW3D-2022-Professional-V1.0_amd64.deb 833573660 BLAKE2B b909085f4e56e76a87ca2f94270bcdf5ce416dad185daf6b966ca894b6bc9b1b67590ef8025b86a5a07902a7f5b20711fc7ba7043195f13cbdf75dcd5e0a09c2 SHA512 c045476c67d6976f826c67aba2ffe1ae2d3c51e5a917c7c16fe37bb74cfad7394877b903f4123509ce1fd0f7b956ae8e8c31445c40d6c7f63bba7be657069f30

diff --git a/media-gfx/zw3d/metadata.xml b/media-gfx/zw3d/metadata.xml
new file mode 100644
index 000000000..1fac258f9
--- /dev/null
+++ b/media-gfx/zw3d/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
+	<longdescription lang="en">
+	The first domestic 3D computer-aided drawing software based on Linux system
+	independently developed by ZWSOFT, can import and export files in formats
+	such as STL, IGES, STEP, etc., and provide complete sketches, parts,
+	assemblies, engineering drawings, processing plans, etc. functions, as well
+	as a variety of measurement and detection methods and view functions,
+	to meet the needs of Linux system users for autonomous, safe and efficient
+	3D CAD/CAM software.
+	</longdescription>
+	<longdescription lang="zh">
+	由中望软件自主研发的国内首款基于Linux系统的三维计算机辅助绘图软件，
+	可导入导出如STL、IGES、STEP等格式的文件，提供了完整的草图、零件、装配
+	工程图、加工方案等功能，以及多种测量检测方式与视图功能
+	满足Linux系统用户对自主、安全、高效的三维CAD/CAM软件的使用需求。
+	</longdescription>
+</pkgmetadata>

diff --git a/media-gfx/zw3d/zw3d-2022.26.00.ebuild b/media-gfx/zw3d/zw3d-2022.26.00.ebuild
new file mode 100644
index 000000000..05ed0a720
--- /dev/null
+++ b/media-gfx/zw3d/zw3d-2022.26.00.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PGK_NAME="com.zwsoft.zw3dprofessional"
+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"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RESTRICT="strip mirror bindist"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-qt/qtsvg:5
+	dev-qt/qtwayland:5
+	media-gfx/imagemagick
+	media-libs/libglvnd
+	media-libs/libpng
+	media-libs/tiff
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libxkbcommon
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-util/patchelf"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# Move ${MY_PGK_NAME} out from /opt/apps
+	mkdir -p "${S}"/usr/share/icons/hicolor/scalable/apps || die
+	mv "${S}"/opt/apps/${MY_PGK_NAME} "${S}"/opt/${MY_PGK_NAME} || die
+	mv "${S}"/opt/${MY_PGK_NAME}/entries/icons/hicolor/scalable/apps/*.svg "${S}"/usr/share/icons/hicolor/scalable/apps || die
+
+	# Set RPATH for preserve-libs handling
+	pushd "${S}"/opt/${MY_PGK_NAME}/files || die
+	local x
+	for x in $(find) ; do
+		# 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/${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/"
+		patchelf --set-rpath "${RPATH_S}" "${x}" || \
+			die "patchelf failed on ${x}"
+		patchelf --replace-needed libMagickCore-6.Q16.so.7 libMagickCore-7.Q16.so "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+	popd || die
+
+	# Fix desktop files
+	sed -E -i 's/^Exec=.*$/Exec=zw3d %F/g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/^Icon=.*$/Icon=ZW3Dprofessional/g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/Application;//g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
+
+	# Add zw3d command
+	mkdir -p "${S}"/usr/bin/ || die
+
+	cat >> "${S}"/opt/${MY_PGK_NAME}/zw3d <<- EOF || die
+#!/bin/sh
+sh /opt/${MY_PGK_NAME}/files/zw3drun.sh \$*
+	EOF
+
+	ln -s /opt/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die
+
+	sed -i 's|/opt/apps/|/opt/|g' "${S}/opt/${MY_PGK_NAME}/files/zw3drun.sh" || die
+
+	# Use system libraries
+	rm -rf "${S}"/opt/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die
+	rm -rf "${S}"/opt/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die
+
+	# Install package and fix permissions
+	insinto /opt
+	doins -r opt/${MY_PGK_NAME}
+	insinto /usr
+	doins -r usr/*
+
+	fperms 0755 /opt/${MY_PGK_NAME}/zw3d
+
+	pushd "${S}" || die
+	for x in $(find "opt/${MY_PGK_NAME}") ; do
+		# Fix shell script permissions
+		[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}"
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] && fperms 0755 "/${x}"
+	done
+	popd || die
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-05-31  9:33 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-05-31  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     2eaad5448fd8d5ef4ff3b74deaf59ba0def07d92
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Tue May 31 09:32:08 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Tue May 31 09:32:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2eaad544

media-gfx/zw3d: fix install path to solve maintenance issues

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 ...2022.26.00.ebuild => zw3d-2022.26.00-r1.ebuild} | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/media-gfx/zw3d/zw3d-2022.26.00.ebuild b/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
similarity index 75%
rename from media-gfx/zw3d/zw3d-2022.26.00.ebuild
rename to media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
index 05ed0a720..013b83e1f 100644
--- a/media-gfx/zw3d/zw3d-2022.26.00.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
@@ -53,18 +53,17 @@ S=${WORKDIR}
 QA_PREBUILT="*"
 
 src_install() {
-	# Move ${MY_PGK_NAME} out from /opt/apps
+	# Move ${MY_PGK_NAME} out from /opt/apps/apps
 	mkdir -p "${S}"/usr/share/icons/hicolor/scalable/apps || die
-	mv "${S}"/opt/apps/${MY_PGK_NAME} "${S}"/opt/${MY_PGK_NAME} || die
-	mv "${S}"/opt/${MY_PGK_NAME}/entries/icons/hicolor/scalable/apps/*.svg "${S}"/usr/share/icons/hicolor/scalable/apps || die
+	mv "${S}"/opt/apps/${MY_PGK_NAME}/entries/icons/hicolor/scalable/apps/*.svg "${S}"/usr/share/icons/hicolor/scalable/apps || die
 
 	# Set RPATH for preserve-libs handling
-	pushd "${S}"/opt/${MY_PGK_NAME}/files || die
+	pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die
 	local x
 	for x in $(find) ; do
 		# 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/${MY_PGK_NAME}/files"
+		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/"
 		patchelf --set-rpath "${RPATH_S}" "${x}" || \
 			die "patchelf failed on ${x}"
@@ -81,29 +80,27 @@ src_install() {
 	# Add zw3d command
 	mkdir -p "${S}"/usr/bin/ || die
 
-	cat >> "${S}"/opt/${MY_PGK_NAME}/zw3d <<- EOF || die
+	cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zw3d <<- EOF || die
 #!/bin/sh
-sh /opt/${MY_PGK_NAME}/files/zw3drun.sh \$*
+sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$*
 	EOF
 
-	ln -s /opt/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die
-
-	sed -i 's|/opt/apps/|/opt/|g' "${S}/opt/${MY_PGK_NAME}/files/zw3drun.sh" || die
+	ln -s /opt/apps/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die
 
 	# Use system libraries
-	rm -rf "${S}"/opt/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die
-	rm -rf "${S}"/opt/${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
 
 	# Install package and fix permissions
-	insinto /opt
-	doins -r opt/${MY_PGK_NAME}
+	insinto /opt/apps
+	doins -r opt/apps/${MY_PGK_NAME}
 	insinto /usr
 	doins -r usr/*
 
-	fperms 0755 /opt/${MY_PGK_NAME}/zw3d
+	fperms 0755 /opt/apps/${MY_PGK_NAME}/zw3d
 
 	pushd "${S}" || die
-	for x in $(find "opt/${MY_PGK_NAME}") ; do
+	for x in $(find "opt/apps/${MY_PGK_NAME}") ; do
 		# Fix shell script permissions
 		[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}"
 		# Use \x7fELF header to separate ELF executables and libraries


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-05-31  9:48 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-05-31  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d4e70a67f48ec4012e68ab7729da459517989313
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Tue May 31 09:48:01 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Tue May 31 09:48:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d4e70a67

media-gfx/zw3d: fix typo in annotation

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild b/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
index 013b83e1f..9e849cc8a 100644
--- a/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild
@@ -53,7 +53,7 @@ S=${WORKDIR}
 QA_PREBUILT="*"
 
 src_install() {
-	# Move ${MY_PGK_NAME} out from /opt/apps/apps
+	# Install scalable icons
 	mkdir -p "${S}"/usr/share/icons/hicolor/scalable/apps || die
 	mv "${S}"/opt/apps/${MY_PGK_NAME}/entries/icons/hicolor/scalable/apps/*.svg "${S}"/usr/share/icons/hicolor/scalable/apps || die
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-06-27  3:45 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-06-27  3:45 UTC (permalink / raw
  To: gentoo-commits

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>vowstar@gmail.com</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


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-12-16 11:50 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-12-16 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     56d05089923feeee37d55fbb9bcba4f9d74d1a5a
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Fri Dec 16 11:50:00 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Fri Dec 16 11:50:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56d05089

media-gfx/zw3d: fix bug and depend <media-libs/tiff-4.5.0

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/{zw3d-2022.0.3.1.ebuild => zw3d-2022.0.3.1-r1.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-gfx/zw3d/zw3d-2022.0.3.1.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
similarity index 99%
rename from media-gfx/zw3d/zw3d-2022.0.3.1.ebuild
rename to media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
index 67438eb20..1ae08dfd9 100644
--- a/media-gfx/zw3d/zw3d-2022.0.3.1.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
@@ -21,7 +21,6 @@ RDEPEND="
 	app-arch/xz-utils
 	app-text/djvu
 	dev-db/sqlite:3
-	dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/libpcre
 	dev-libs/libxml2
@@ -36,7 +35,7 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/libpng
 	media-libs/opencollada
-	media-libs/tiff
+	<media-libs/tiff-4.5.0
 	net-libs/zeromq
 	sys-libs/zlib
 	x11-libs/cairo


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-12-16 15:20 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-12-16 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     14ef5761832736435903ff8e0ed3cac8a9b70503
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Fri Dec 16 15:19:22 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Fri Dec 16 15:19:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14ef5761

media-gfx/zw3d: depend media-libs/tiff-compat:4

Bug: https://bugs.gentoo.org/886341
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
index 1ae08dfd9..51cc78b14 100644
--- a/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/libpng
 	media-libs/opencollada
-	<media-libs/tiff-4.5.0
+	media-libs/tiff-compat:4
 	net-libs/zeromq
 	sys-libs/zlib
 	x11-libs/cairo


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-12-21  4:29 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-12-21  4:29 UTC (permalink / raw
  To: gentoo-commits

commit:     b387569dc99927a208441e4a0897fe721a523f4e
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Dec 21 04:29:27 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Dec 21 04:29:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b387569d

media-gfx/zw3d: fix depblock when using <media-libs/tiff-4.5.0

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/{zw3d-2022.0.3.1-r1.ebuild => zw3d-2022.0.3.1-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
similarity index 98%
rename from media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
rename to media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
index 51cc78b14..5be5eb239 100644
--- a/media-gfx/zw3d/zw3d-2022.0.3.1-r1.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/libpng
 	media-libs/opencollada
-	media-libs/tiff-compat:4
+	|| ( <media-libs/tiff-4.5.0 media-libs/tiff-compat:4 )
 	net-libs/zeromq
 	sys-libs/zlib
 	x11-libs/cairo


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2022-12-21 11:17 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2022-12-21 11:17 UTC (permalink / raw
  To: gentoo-commits

commit:     32a000f8ea4b88ca2b6afa49cac44e0138dc8c2b
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Dec 21 11:16:49 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Dec 21 11:16:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=32a000f8

media-gfx/zw3d: fix media-libs/tiff depends and use subslot

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
index 5be5eb239..e5729f799 100644
--- a/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/libpng
 	media-libs/opencollada
-	|| ( <media-libs/tiff-4.5.0 media-libs/tiff-compat:4 )
+	|| ( media-libs/tiff:0/0 media-libs/tiff-compat:4 )
 	net-libs/zeromq
 	sys-libs/zlib
 	x11-libs/cairo


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2023-04-03 12:47 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2023-04-03 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f3298a092ba5eaeb8dacaf0518d5f7ee808dc4e5
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Apr  3 12:47:28 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Mon Apr  3 12:47:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f3298a09

media-gfx/zw3d: rev bump due to RDEPEND changed

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 .../zw3d/{zw3d-2022.0.3.1-r2.ebuild => zw3d-2022.0.3.1-r3.ebuild}      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
similarity index 98%
rename from media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
rename to media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
index e5729f799..7aa3a55b2 100644
--- a/media-gfx/zw3d/zw3d-2022.0.3.1-r2.ebuild
+++ b/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
@@ -35,7 +35,8 @@ RDEPEND="
 	media-libs/libglvnd
 	media-libs/libpng
 	media-libs/opencollada
-	|| ( media-libs/tiff:0/0 media-libs/tiff-compat:4 )
+	media-libs/tiff
+	media-libs/tiff-compat:4
 	net-libs/zeromq
 	sys-libs/zlib
 	x11-libs/cairo


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2023-04-03 12:47 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2023-04-03 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     a6b8653d459ad23223a8c38b4fcf9e35880b3a81
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Apr  3 12:46:37 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Mon Apr  3 12:46:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6b8653d

media-gfx/zw3d: add 2023.0.3.1

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/Manifest               |   1 +
 media-gfx/zw3d/zw3d-2023.0.3.1.ebuild | 163 ++++++++++++++++++++++++++++++++++
 2 files changed, 164 insertions(+)

diff --git a/media-gfx/zw3d/Manifest b/media-gfx/zw3d/Manifest
index 996f78c91..0a0ae2334 100644
--- a/media-gfx/zw3d/Manifest
+++ b/media-gfx/zw3d/Manifest
@@ -1 +1,2 @@
 DIST zw3d-2022.0.3.1.deb 830137436 BLAKE2B d2f5976ec8e00ab31f2e34b690b5f8e2c637500ea7a599d2409ebe07db2c36bb1bb0c98b17b3515672dbfe26d9ddf05e36f0f91a5c0a535a7b87ffaaf389fa6b SHA512 fba4aa4b3752895bbc644b77624a1548dbea0449c13f31ded12cb213feec26ba28b205c13b77fa99fce7cf93d082583865d67d12775b94e9e46585b71214f5f0
+DIST zw3d-2023.0.3.1.deb 502969732 BLAKE2B f20034be406e132ffbc17020f10ec53eadc9c816c80b19f63ab42a714b1acb4848f087ce4fde2d05472e61e5c9a8f79794bbd5018f283f987d85869f7afa19e7 SHA512 3719b758706546f255aedd5e407e054fb765c90d8f9b99cac200f0e482203de1384c12684178c257d3771085c22b185a8c4af10295f178d9518cac8b8a4adb27

diff --git a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
new file mode 100644
index 000000000..ff1cdd0c6
--- /dev/null
+++ b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PGK_NAME="com.zwsoft.zw3dprofessional"
+inherit unpacker xdg
+
+DESCRIPTION="CAD/CAM software for 3D design and processing"
+HOMEPAGE="https://www.zwsoft.cn/product/zw3d/linux"
+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"
+KEYWORDS="-* ~amd64"
+
+RESTRICT="strip mirror bindist"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	app-text/djvu
+	dev-db/sqlite:3
+	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
+	media-fonts/noto-cjk
+	media-gfx/imagemagick
+	media-libs/jbigkit
+	media-libs/libglvnd
+	media-libs/libpng
+	media-libs/opencollada
+	media-libs/tiff
+	media-libs/tiff-compat:4
+	net-libs/zeromq
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libxkbcommon
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-util/bbe
+	dev-util/patchelf
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_compile() {
+	default
+	# Fix zw3d coredump when run
+cat >> "${T}"/zw3d.c <<- EOF || die
+#include <stdint.h>
+extern int DiModuleEntryPoint(uint64_t argc, uint64_t argv, uint64_t envp);
+int main(int argc, char* argv[], char* envp[])
+{
+return DiModuleEntryPoint((uint64_t)(uintptr_t)&argc, (uint64_t)(uintptr_t)argv, (uint64_t)(uintptr_t)envp);
+}
+	EOF
+
+TAB=$'\t'
+cat >> "${T}"/Makefile <<- EOF || die
+.PHONY: all
+all:
+${TAB}\$(CC) \$(LDFLAGS) \
+-o "\$(S)/opt/apps/\$(MY_PGK_NAME)/files/zw3d" \
+zw3d.c \
+-L"\$(S)/opt/apps/\$(MY_PGK_NAME)/files/lib" \
+-lDrawingInstance \
+-lstdc++ \
+-lm \
+-lgcc_s \
+-Wl,--unresolved-symbols=ignore-all
+	EOF
+
+	emake S="${S}" MY_PGK_NAME="${MY_PGK_NAME}" -C "${T}" || die
+}
+
+src_install() {
+	# Install scalable icons, desktop files, mimes
+	mkdir -p "${S}"/usr/share || die
+	mv "${S}"/opt/apps/${MY_PGK_NAME}/entries/* "${S}"/usr/share || die
+
+	# Set RPATH for preserve-libs handling
+	pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die
+	local x
+	for x in $(find) ; do
+		# 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/:/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}" || \
+		# 	die "patchelf failed on ${x}"
+		patchelf --replace-needed libjbig.so.0 libjbig.so "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+	popd || die
+
+	# Fix desktop files
+	sed -E -i 's/^Exec=.*$/Exec=zw3d %F/g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/^Icon=.*$/Icon=ZW3Dprofessional/g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/Application;//g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
+
+	# Add zw3d command
+	mkdir -p "${S}"/usr/bin/ || die
+
+	cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zw3d <<- EOF || die
+#!/bin/sh
+sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$*
+	EOF
+
+	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
+
+	# 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
+	doins -r opt/apps/${MY_PGK_NAME}
+	insinto /usr
+	doins -r usr/*
+
+	fperms 0755 /opt/apps/${MY_PGK_NAME}/zw3d
+
+	pushd "${S}" || die
+	for x in $(find "opt/apps/${MY_PGK_NAME}") ; do
+		# Fix shell script permissions
+		[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}"
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] && fperms 0755 "/${x}"
+	done
+	popd || die
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2023-04-20  4:26 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2023-04-20  4:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2a3d6df251e5c4b0495f0812d41dd3a591c5892f
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Apr 20 04:26:25 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Apr 20 04:26:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2a3d6df2

media-gfx/zw3d: fix wayland crash issue

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/zw3d-2023.0.3.1.ebuild | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
index ff1cdd0c6..0c655df97 100644
--- a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
+++ b/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
@@ -131,6 +131,20 @@ sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$*
 
 	ln -s /opt/apps/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die
 
+	# Fix zw3d startup file
+cat >> insert.txt <<- EOF || die
+unset WAYLAND_DISPLAY
+export XDG_SESSION_TYPE=x11
+export QT_QPA_PLATFORM=xcb
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
+export QT_STYLE_OVERRIDE=fusion
+export IBUS_USE_PORTAL=1
+	EOF
+
+	sed -i \
+		-e '/export LD_LIBRARY_PATH/r insert.txt' \
+		"${S}"/opt/apps/${MY_PGK_NAME}/files/zw3drun.sh || 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


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2024-10-30  3:38 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2024-10-30  3:38 UTC (permalink / raw
  To: gentoo-commits

commit:     07a5ec4aa394c874840f6012ce07fc235af7c6ff
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Oct 30 03:32:55 2024 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Oct 30 03:33:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=07a5ec4a

media-gfx/zw3d: add missing rdepend media-libs/freetype

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 .../zw3d/{zw3d-2023.0.3.1.ebuild => zw3d-2023.0.3.1-r1.ebuild}      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild b/media-gfx/zw3d/zw3d-2023.0.3.1-r1.ebuild
similarity index 96%
rename from media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
rename to media-gfx/zw3d/zw3d-2023.0.3.1-r1.ebuild
index 39d41d97f..f960db225 100644
--- a/media-gfx/zw3d/zw3d-2023.0.3.1.ebuild
+++ b/media-gfx/zw3d/zw3d-2023.0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,6 +33,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	media-fonts/noto-cjk
 	media-gfx/imagemagick
+	media-libs/freetype
 	media-libs/jbigkit
 	media-libs/libglvnd
 	media-libs/libpng
@@ -146,8 +147,7 @@ export IBUS_USE_PORTAL=1
 		"${S}"/opt/apps/${MY_PGK_NAME}/files/zw3drun.sh || 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/libfreetype* || die
 
 	# Fix coredump while draw 2D sketch due to not find fonts
 	# media-fonts/noto-cjk is required


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/
@ 2024-10-30  3:38 Rui Huang
  0 siblings, 0 replies; 13+ messages in thread
From: Rui Huang @ 2024-10-30  3:38 UTC (permalink / raw
  To: gentoo-commits

commit:     37c92db419adca8498c51315cd867dc616900dd7
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Oct 30 03:33:55 2024 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Oct 30 03:33:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37c92db4

media-gfx/zw3d: drop 2022.0.3.1-r3

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zw3d/Manifest                  |   1 -
 media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild | 132 -------------------------------
 2 files changed, 133 deletions(-)

diff --git a/media-gfx/zw3d/Manifest b/media-gfx/zw3d/Manifest
index 0a0ae2334..31d06cb1e 100644
--- a/media-gfx/zw3d/Manifest
+++ b/media-gfx/zw3d/Manifest
@@ -1,2 +1 @@
-DIST zw3d-2022.0.3.1.deb 830137436 BLAKE2B d2f5976ec8e00ab31f2e34b690b5f8e2c637500ea7a599d2409ebe07db2c36bb1bb0c98b17b3515672dbfe26d9ddf05e36f0f91a5c0a535a7b87ffaaf389fa6b SHA512 fba4aa4b3752895bbc644b77624a1548dbea0449c13f31ded12cb213feec26ba28b205c13b77fa99fce7cf93d082583865d67d12775b94e9e46585b71214f5f0
 DIST zw3d-2023.0.3.1.deb 502969732 BLAKE2B f20034be406e132ffbc17020f10ec53eadc9c816c80b19f63ab42a714b1acb4848f087ce4fde2d05472e61e5c9a8f79794bbd5018f283f987d85869f7afa19e7 SHA512 3719b758706546f255aedd5e407e054fb765c90d8f9b99cac200f0e482203de1384c12684178c257d3771085c22b185a8c4af10295f178d9518cac8b8a4adb27

diff --git a/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild b/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
deleted file mode 100644
index f32fd72a4..000000000
--- a/media-gfx/zw3d/zw3d-2022.0.3.1-r3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PGK_NAME="com.zwsoft.zw3dprofessional"
-inherit unpacker xdg
-
-DESCRIPTION="CAD/CAM software for 3D design and processing"
-HOMEPAGE="https://www.zwsoft.cn/product/zw3d/linux"
-SRC_URI="https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${PV}_amd64.deb -> ${P}.deb"
-
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RESTRICT="strip mirror bindist"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	app-text/djvu
-	dev-db/sqlite:3
-	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
-	media-fonts/noto-cjk
-	media-gfx/imagemagick
-	media-libs/jbigkit
-	media-libs/libglvnd
-	media-libs/libpng
-	media-libs/opencollada
-	media-libs/tiff
-	media-libs/tiff-compat:4
-	net-libs/zeromq
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libxkbcommon
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-util/bbe
-	dev-util/patchelf
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	# Install scalable icons
-	mkdir -p "${S}"/usr/share/icons/hicolor/scalable/apps || die
-	mv "${S}"/opt/apps/${MY_PGK_NAME}/entries/icons/hicolor/scalable/apps/*.svg "${S}"/usr/share/icons/hicolor/scalable/apps || die
-
-	# Set RPATH for preserve-libs handling
-	pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die
-	local x
-	for x in $(find) ; do
-		# 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/:/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}" || \
-		# 	die "patchelf failed on ${x}"
-		patchelf --replace-needed libjbig.so.0 libjbig.so "${x}" || \
-			die "patchelf failed on ${x}"
-	done
-	popd || die
-
-	# Fix desktop files
-	sed -E -i 's/^Exec=.*$/Exec=zw3d %F/g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
-	sed -E -i 's/^Icon=.*$/Icon=ZW3Dprofessional/g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
-	sed -E -i 's/Application;//g' "${S}/usr/share/applications/${MY_PGK_NAME}.desktop" || die
-
-	# Add zw3d command
-	mkdir -p "${S}"/usr/bin/ || die
-
-	cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zw3d <<- EOF || die
-#!/bin/sh
-sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$*
-	EOF
-
-	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
-
-	# 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
-	doins -r opt/apps/${MY_PGK_NAME}
-	insinto /usr
-	doins -r usr/*
-
-	fperms 0755 /opt/apps/${MY_PGK_NAME}/zw3d
-
-	pushd "${S}" || die
-	for x in $(find "opt/apps/${MY_PGK_NAME}") ; do
-		# Fix shell script permissions
-		[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}"
-		# Use \x7fELF header to separate ELF executables and libraries
-		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] && fperms 0755 "/${x}"
-	done
-	popd || die
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-10-30  3:38 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-30  3:38 [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zw3d/ Rui Huang
  -- strict thread matches above, loose matches on Subject: below --
2024-10-30  3:38 Rui Huang
2023-04-20  4:26 Rui Huang
2023-04-03 12:47 Rui Huang
2023-04-03 12:47 Rui Huang
2022-12-21 11:17 Rui Huang
2022-12-21  4:29 Rui Huang
2022-12-16 15:20 Rui Huang
2022-12-16 11:50 Rui Huang
2022-06-27  3:45 Rui Huang
2022-05-31  9:48 Rui Huang
2022-05-31  9:33 Rui Huang
2022-04-21  3:34 Rui Huang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox