aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVufa2021-11-25 19:27:26 +0800
committerVufa2021-11-25 19:27:26 +0800
commite163a1b26a32a720cfeb90b4ec130a831f06b2a0 (patch)
tree3372b9a0152f686349c92bd15858fd3cfbbdf505
parent1e5529f5e35d86d1299dda874d4849585315a292 (diff)
downloadaur-e163a1b26a32a720cfeb90b4ec130a831f06b2a0.tar.gz
fixed the conflict with lib32-libldap.
Signed-off-by: Vufa <countstarlight@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rwxr-xr-xrun.sh2
3 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 34f519bc51ab..32589a5d1dd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,7 +29,7 @@ pkgbase = deepin-wine-wechat
md5sums = a9b96f879714fca41f03c84714c965ec
md5sums = cf87ad9db0bf279ddf9e5c1dce64a716
md5sums = 531a3997ea28e8fc0f47e9e136dae332
- md5sums = 8f8a42f794a54a6b78fb6d829d1a4894
+ md5sums = ad5ef3a00ce862117d7291d35c62c1b3
md5sums = f3257f8fc9e73ea88b3a46372634f82f
pkgname = deepin-wine-wechat
diff --git a/PKGBUILD b/PKGBUILD
index fa22a757c609..d6682d29a9b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,7 +26,7 @@ md5sums=('b48cd3c089b7c2bb7b68aba018b306b1'
'a9b96f879714fca41f03c84714c965ec'
'cf87ad9db0bf279ddf9e5c1dce64a716'
'531a3997ea28e8fc0f47e9e136dae332'
- '8f8a42f794a54a6b78fb6d829d1a4894'
+ 'ad5ef3a00ce862117d7291d35c62c1b3'
'f3257f8fc9e73ea88b3a46372634f82f')
build() {
@@ -70,6 +70,6 @@ package() {
md5sum "${srcdir}/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${debpkgname}/files/files.md5sum"
install -m755 "${srcdir}/run.sh" "${pkgdir}/opt/apps/${debpkgname}/files/"
msg "Copying deepin lib32 files ..."
- install -d "${pkgdir}/usr/lib32"
- cp ${srcdir}/dpkgdir/usr/lib/i386-linux-gnu/{liblber-2.4.so.2,libldap-2.4.so.2,libldap_r-2.4.so.2,libsasl2.so.2} "${pkgdir}/usr/lib32"
+ install -d "${pkgdir}/opt/apps/${debpkgname}/files/lib32"
+ cp ${srcdir}/dpkgdir/usr/lib/i386-linux-gnu/{liblber-2.4.so.2,libldap-2.4.so.2,libldap_r-2.4.so.2,libsasl2.so.2} "${pkgdir}/opt/apps/${debpkgname}/files/lib32"
}
diff --git a/run.sh b/run.sh
index 4f5af9956fe6..968698eb1392 100755
--- a/run.sh
+++ b/run.sh
@@ -28,6 +28,8 @@ ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+export LD_LIBRARY_PATH=/opt/apps/$DEB_PACKAGE_NAME/files/lib32
+
export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
OpenWinecfg()