commit:     74f499a18b521c684273875f15c4e0c3ffdb5df3
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 14:57:29 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 15:15:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f499a1

app-office/wps-office: Fix crash due to glibc version conflict

Also drop file requiring systemd (#813138) as gentoo-zh overlay is doing

Try a differrent SRC_URI (same as gentoo-zh overlay) as current one fails
for some DNS resolvers

Closes: https://bugs.gentoo.org/813138
Bug: https://bugs.gentoo.org/850727
Closes: https://bugs.gentoo.org/878451
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 app-office/wps-office/Manifest                     |   1 +
 .../wps-office/wps-office-11.1.0.11664-r2.ebuild   | 102 +++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 911871a73923..f2fe06a2b8fe 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,2 +1,3 @@
 DIST wps-office_11.1.0.10976.XA_amd64.deb 276985802 BLAKE2B 
f886577e0446d012de8f28866410a6aefad6ba0ba4c0388402bda40de81859f86f4d342055363ee96123af0be4a78c1867fce7b4118fc8447807e01ecec3cac5
 SHA512 
744a054b78c0b5742b5af86a1d058af982b5d673205d690bd393c29a35558f2fb45081c109a406dd87078a50a09b8f6242cb469e8b93824a6b9d93af84c6f128
 DIST wps-office_11.1.0.11664.XA_amd64.deb 319591396 BLAKE2B 
35e94cca54b964731edd4d7bc33d9dbd97f6f9f4502896edcb0cbc0ff21e49953c825c46dbc5b6230443c45d4914a5bf75027c1b98f56307c98ec9ad3d65f955
 SHA512 
0ea03b27246b796b80187bb252dce0446ae497fd1a9a18da3fd3c0e13531d56fca22157cf1d0e7542b77d3bce8cbdaa407ccebfbf1d7d1d9732e51369608ac36
+DIST wps-office_11.1.0.11664_amd64.deb 413652340 BLAKE2B 
5bca47eef4c0c6a418ff5d79cef46ddd8841400333e72d3ac6fb5337d81fc7265503226da7d78b9a1df0cccf8d021852c69d2f65ed88ed74fc531638ef557f08
 SHA512 
6dbe7df259d989389df9d3c5730966693538ab1ef95c18a66cd50609894c83b028190f7381e1c998b0470d389c8c6969d8528ef88bc6428fdb0123586880de08

diff --git a/app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild 
b/app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild
new file mode 100644
index 000000000000..51854735aea4
--- /dev/null
+++ b/app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit unpacker xdg
+
+MY_PV="$(ver_cut 4)"
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="https://www.wps.com/office/linux/";
+
+KEYWORDS="~amd64"
+
+#SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb";
+SRC_URI="https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${MY_PV}/${PN}_${PV}_amd64.deb";
+
+SLOT="0"
+RESTRICT="bindist strip mirror" # mirror as explained at bug #547372
+QA_PREBUILT="*"
+LICENSE="WPS-EULA"
+IUSE="systemd"
+
+# Deps got from this (listed in order):
+# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
+# ldd /opt/kingsoft/wps-office/office6/wps
+# ldd /opt/kingsoft/wps-office/office6/wpp
+RDEPEND="
+       app-arch/bzip2:0
+       app-arch/xz-utils
+       app-arch/lz4
+       dev-libs/atk
+       dev-libs/expat
+       dev-libs/glib:2
+       dev-libs/libbsd
+       || ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 )
+       dev-libs/libgcrypt:0
+       dev-libs/libgpg-error
+       dev-libs/libpcre:3
+       dev-libs/nspr
+       dev-libs/nss
+       media-libs/fontconfig:1.0
+       media-libs/freetype:2
+       || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
+       media-libs/libogg
+       media-libs/libsndfile
+       media-libs/libvorbis
+       media-libs/libpng:0
+       media-sound/pulseaudio
+       net-libs/libasyncns
+       net-print/cups
+       sys-apps/attr
+       sys-apps/util-linux
+       sys-apps/dbus
+       sys-apps/tcp-wrappers
+       sys-libs/libcap
+       sys-libs/zlib:0
+       x11-libs/cairo
+       x11-libs/gdk-pixbuf:2
+       x11-libs/gtk+:2
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXScrnSaver
+       x11-libs/libXau
+       x11-libs/libXcomposite
+       x11-libs/libXcursor
+       x11-libs/libXdmcp
+       x11-libs/libXext
+       x11-libs/libXrender
+       x11-libs/libXtst
+       x11-libs/libXv
+       x11-libs/libxcb
+       dev-libs/libxslt
+       x11-libs/pango
+       virtual/glu
+       systemd? ( sys-apps/systemd )
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+       exeinto /usr/bin
+       exeopts -m0755
+       doexe "${S}"/usr/bin/*
+
+       insinto /usr/share
+       # Skip mime subdir to not get selected over rest of office suites
+       doins -r 
"${S}"/usr/share/{applications,desktop-directories,icons,templates}
+
+       insinto /opt/kingsoft/wps-office
+       doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
+
+       # https://bugs.gentoo.org/878451
+       rm "${S}"/opt/kingsoft/wps-office/office6/libstdc++.so* || die
+
+       # https://bugs.gentoo.org/813138
+       use systemd || { rm 
"${S}"/opt/kingsoft/wps-office/office6/libdbus-1.so* || die ; }
+
+       fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
+}

Reply via email to