Update 6.0.0.16 & Switch upstream

2 files changed, 103 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f28c7725b8e..7d2fabafe1ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,26 @@
 pkgbase = deepin-wine6-stable
-	pkgdesc = Deepin Wine6 stable
-	pkgver = 6.0.0.9
+	pkgdesc = Deepin wine6 stable
+	pkgver = 6.0.0.16
 	pkgrel = 1
 	url = http://www.deepin.org
-	arch = i686
 	arch = x86_64
 	license = Proprietary
 	makedepends = tar
-	makedepends = p7zip
+	noextract = deepin-wine6-stable_6.0.0.16-1_amd64.deb
+	noextract = deepin-wine6-stable-amd64_6.0.0.16-1_amd64.deb
+	noextract = deepin-wine6-stable-i386_6.0.0.16-1_i386.deb
+	source = https://community-store-packages.deepin.com/appstore/pool/appstore/d/deepin-wine6-stable/deepin-wine6-stable_6.0.0.16-1_amd64.deb
+	source = https://community-store-packages.deepin.com/appstore/pool/appstore/d/deepin-wine6-stable/deepin-wine6-stable-amd64_6.0.0.16-1_amd64.deb
+	source = https://community-store-packages.deepin.com/appstore/pool/appstore/d/deepin-wine6-stable/deepin-wine6-stable-i386_6.0.0.16-1_i386.deb
+	sha256sums = d8a688972224b07b462ec5e4a1166602f8bced7348badba4b5f85028b03d6f0f
+	sha256sums = 5a0ee309f6c2d6e08cd0b67748d2e38b8add4d558fb6a762cabeac0262d7b083
+	sha256sums = 0bef2d1ed5dd722e09d7b549483958ce37e70b114145782d22a9ba754da88139
+
+pkgname = deepin-wine6-stable
+	depends = deepin-wine6-stable-i386=6.0.0.16
+	depends = deepin-wine6-stable-amd64=6.0.0.16
+
+pkgname = deepin-wine6-stable-i386
 	depends = lib32-alsa-plugins
 	depends = lib32-glib2
 	depends = lib32-glibc
@@ -38,7 +51,35 @@ pkgbase = deepin-wine6-stable
 	depends = lib32-libxrandr
 	depends = lib32-libxi
 	depends = lib32-glu
-	source = http://community-store.deepin.com/appstore/apricot/pool/appstore/c/com.jiakaobaodian.deepin/com.jiakaobaodian.deepin_8.2.5deepin1_i386.deb
-	sha256sums = 3f4463343287336dfe1c20a6ad2bb664098b85b86a58da31dfb5aa2f64d6c189
 
-pkgname = deepin-wine6-stable
+pkgname = deepin-wine6-stable-amd64
+	depends = alsa-plugins
+	depends = glib2
+	depends = glibc
+	depends = libgphoto2
+	depends = gst-plugins-base-libs
+	depends = lcms2
+	depends = libldap
+	depends = mpg123
+	depends = openal
+	depends = libpcap
+	depends = libcanberra-pulse
+	depends = libudev0-shim
+	depends = libusb
+	depends = vkd3d
+	depends = libx11
+	depends = libxext
+	depends = libxml2
+	depends = ocl-icd
+	depends = deepin-udis86
+	depends = zlib
+	depends = ncurses
+	depends = fontconfig
+	depends = freetype2
+	depends = gettext
+	depends = libxcursor
+	depends = mesa
+	depends = libjpeg6
+	depends = libxrandr
+	depends = libxi
+	depends = glu
diff --git a/PKGBUILD b/PKGBUILD
index 46190e186fb5..316d211efd1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,40 @@
 # Contributer: abcfy2 <abcfy2@163.com>
-pkgname='deepin-wine6-stable'
-pkgver=6.0.0.9
+
+pkgname=('deepin-wine6-stable' 'deepin-wine6-stable-i386' 'deepin-wine6-stable-amd64')
+pkgver=6.0.0.16
 pkgrel=1
-pkgdesc="Deepin Wine6 stable"
-arch=('i686' 'x86_64')
+pkgdesc="Deepin wine6 stable"
+arch=('x86_64')
 url="http://www.deepin.org"
 license=('Proprietary')
-# The depenency list is copied from abcfy2/deepin-wine5-i386 package
-depends=(
+makedepends=('tar')
+source=(
+    "https://community-store-packages.deepin.com/appstore/pool/appstore/d/deepin-wine6-stable/deepin-wine6-stable_${pkgver}-${pkgrel}_amd64.deb"
+    "https://community-store-packages.deepin.com/appstore/pool/appstore/d/deepin-wine6-stable/deepin-wine6-stable-amd64_${pkgver}-${pkgrel}_amd64.deb"
+    "https://community-store-packages.deepin.com/appstore/pool/appstore/d/deepin-wine6-stable/deepin-wine6-stable-i386_${pkgver}-${pkgrel}_i386.deb"
+)
+noextract=(
+    "deepin-wine6-stable_${pkgver}-${pkgrel}_amd64.deb"
+    "deepin-wine6-stable-amd64_${pkgver}-${pkgrel}_amd64.deb"
+    "deepin-wine6-stable-i386_${pkgver}-${pkgrel}_i386.deb"
+)
+sha256sums=('d8a688972224b07b462ec5e4a1166602f8bced7348badba4b5f85028b03d6f0f'
+            '5a0ee309f6c2d6e08cd0b67748d2e38b8add4d558fb6a762cabeac0262d7b083'
+            '0bef2d1ed5dd722e09d7b549483958ce37e70b114145782d22a9ba754da88139')
+
+package_deepin-wine6-stable() {
+    depends=("deepin-wine6-stable-i386=$pkgver" "deepin-wine6-stable-amd64=$pkgver")
+
+    mkdir -p "deepin-wine6-stable_${pkgver}-${pkgrel}"
+    ar -x "deepin-wine6-stable_${pkgver}-${pkgrel}_amd64.deb" data.tar.xz --output "deepin-wine6-stable_${pkgver}-${pkgrel}"
+    tar -xf "deepin-wine6-stable_${pkgver}-${pkgrel}/data.tar.xz" --directory="${pkgdir}"
+}
+
+package_deepin-wine6-stable-i386() {
+    # deepin-wine6-i386 deb dependencies (Note: i386):
+    # Depends: libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libusb-1.0-0 (>= 2:1.0.16), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses
+    # Recommends: libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1
+    depends=(
         'lib32-alsa-plugins' 'lib32-glib2' 'lib32-glibc' 'libgphoto2'
         'lib32-gst-plugins-base-libs' 'lib32-lcms2' 'lib32-libldap' 'lib32-mpg123'
         'lib32-openal' 'lib32-libpcap' 'lib32-libcanberra-pulse' 'lib32-libudev0-shim'
@@ -16,15 +43,27 @@ depends=(
         'lib32-freetype2' 'lib32-gettext' 'lib32-libxcursor' 'lib32-mesa' 'lib32-libjpeg6'
         'lib32-libxrandr' 'lib32-libxi' 'lib32-glu'
     )
-makedepends=('tar' 'p7zip')
-source=(
-    "http://community-store.deepin.com/appstore/apricot/pool/appstore/c/com.jiakaobaodian.deepin/com.jiakaobaodian.deepin_8.2.5deepin1_i386.deb"
-)
-sha256sums=('3f4463343287336dfe1c20a6ad2bb664098b85b86a58da31dfb5aa2f64d6c189')
 
-package() {
-	cd ${srcdir}
-	tar xpvf data.tar.xz --xattrs-include='*' --numeric-owner
-	install -d ${pkgdir}/usr/lib/deepin-wine6-stable
-    7z x -o${pkgdir}/usr/lib/deepin-wine6-stable opt/apps/com.jiakaobaodian.deepin/files/wine_archive.7z
+    mkdir -p "deepin-wine6-stable-i386_${pkgver}-${pkgrel}"
+    ar -x "deepin-wine6-stable-i386_${pkgver}-${pkgrel}_i386.deb" data.tar.xz --output "deepin-wine6-stable-i386_${pkgver}-${pkgrel}"
+    tar -xf "deepin-wine6-stable-i386_${pkgver}-${pkgrel}/data.tar.xz" --directory="${pkgdir}"
+}
+
+package_deepin-wine6-stable-amd64() {
+    # deepin-wine6-i386 deb dependencies (Note: i386):
+    # Depends: libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libusb-1.0-0 (>= 2:1.0.16), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses
+    # Recommends: libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1
+    depends=(
+        'alsa-plugins' 'glib2' 'glibc' 'libgphoto2'
+        'gst-plugins-base-libs' 'lcms2' 'libldap' 'mpg123'
+        'openal' 'libpcap' 'libcanberra-pulse' 'libudev0-shim'
+        'libusb' 'vkd3d' 'libx11' 'libxext' 'libxml2'
+        'ocl-icd' 'deepin-udis86' 'zlib' 'ncurses' 'fontconfig'
+        'freetype2' 'gettext' 'libxcursor' 'mesa' 'libjpeg6'
+        'libxrandr' 'libxi' 'glu'
+    )
+
+    mkdir -p "deepin-wine6-stable-amd64_${pkgver}-${pkgrel}"
+    ar -x "deepin-wine6-stable-amd64_${pkgver}-${pkgrel}_amd64.deb" data.tar.xz --output "deepin-wine6-stable-amd64_${pkgver}-${pkgrel}"
+    tar -xf "deepin-wine6-stable-amd64_${pkgver}-${pkgrel}/data.tar.xz" --directory="${pkgdir}"
 }