Click here to go back to the commit logs for wine-wayland.

Commit:

---

Hash: 7c7e052783cc3e2b5fb636fe3f496d98538c8fbd

Message: Changes to be committed: modified: .SRCINFO modified: PKGBUILD

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index ae88ccf..33e4cb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 generated-by = makedeb
 pkgname = wine-wayland
 pkgbase = wine-wayland
-pkgdesc = A compatibility layer for running Windows programs (wayland version from gitlab.collabora.com/alf/wine/ wayland branch)
-pkgrel = 1
+pkgdesc = A compatibility layer for running Windows programs (wayland version of wine https://github.com/Kron4ek/wine-wayland.git)
+pkgrel = 2
 pkgver = 7.20
 url = http://www.winehq.com
 arch = amd64
@@ -24,7 +24,6 @@ depends = libgsm1:amd64
 depends = libgstreamer-gl1.0-0:amd64
 depends = gir1.2-gst-plugins-base-1.0:amd64
 depends = gstreamer1.0-plugins-base:amd64
-depends = libldap-2.4-2:amd64
 depends = libmpg123-0:amd64
 depends = libout123-0:amd64
 depends = libsyn123-0:amd64
@@ -67,7 +66,6 @@ depends = libxt6:amd64
 depends = libxxf86dga1:amd64
 depends = libxxf86vm1:amd64
 depends = libopenal1:amd64
-depends = unixodbc:amd64
 depends = libunwind8:amd64
 depends = libkrb5-3:amd64
 depends = libdrm-common:amd64
@@ -91,7 +89,6 @@ depends = libgsm1:i386
 depends = libgstreamer-gl1.0-0:i386
 depends = gir1.2-gst-plugins-base-1.0:i386
 depends = gstreamer1.0-plugins-base:i386
-depends = libldap-2.4-2:i386
 depends = libmpg123-0:i386
 depends = libout123-0:i386
 depends = libsyn123-0:i386
@@ -134,7 +131,6 @@ depends = libxt6:i386
 depends = libxxf86dga1:i386
 depends = libxxf86vm1:i386
 depends = libopenal1:i386
-depends = unixodbc:i386
 depends = libunwind8:i386
 depends = libkrb5-3:i386
 depends = libdrm-common:i386
@@ -168,7 +164,6 @@ makedepends = libglu1-mesa-dev:amd64
 makedepends = libgphoto2-dev:amd64
 makedepends = libgsm1-dev:amd64
 makedepends = libjpeg-dev:amd64
-makedepends = libldap2-dev:amd64
 makedepends = libmpg123-dev:amd64
 makedepends = libncurses5-dev:amd64
 makedepends = libopenal-dev:amd64
@@ -204,7 +199,6 @@ makedepends = libxt-dev:amd64
 makedepends = libxxf86dga-dev:amd64
 makedepends = libxxf86vm-dev:amd64
 makedepends = libopenal-dev:amd64
-makedepends = unixodbc-dev:amd64
 makedepends = libunwind-dev:amd64
 makedepends = libkrb5-dev:amd64
 makedepends = libdrm-dev:amd64
@@ -223,7 +217,6 @@ makedepends = libglu1-mesa-dev:i386
 makedepends = libgphoto2-dev:i386
 makedepends = libgsm1-dev:i386
 makedepends = libjpeg-dev:i386
-makedepends = libldap2-dev:i386
 makedepends = libmpg123-dev:i386
 makedepends = libncurses5-dev:i386
 makedepends = libopenal-dev:i386
@@ -259,14 +252,13 @@ makedepends = libxt-dev:i386
 makedepends = libxxf86dga-dev:i386
 makedepends = libxxf86vm-dev:i386
 makedepends = libopenal-dev:i386
-makedepends = unixodbc-dev:i386
 makedepends = libunwind-dev:i386
 makedepends = libkrb5-dev:i386
 makedepends = libdrm-dev:i386
 makedepends = libgbm-dev:i386
 makedepends = libstdc++-10-dev:i386
 provides = libwine=7.20
-source = https://gitlab.collabora.com/alf/wine/-/archive/wayland/wine-wayland.tar.bz2
+source = git+https://github.com/Kron4ek/wine-wayland.git
 sha512sums = SKIP
 makedepends = debhelper
 makedepends = wayland-protocols
@@ -295,7 +287,6 @@ makedepends = libglu1-mesa-dev:amd64
 makedepends = libgphoto2-dev:amd64
 makedepends = libgsm1-dev:amd64
 makedepends = libjpeg-dev:amd64
-makedepends = libldap2-dev:amd64
 makedepends = libmpg123-dev:amd64
 makedepends = libncurses5-dev:amd64
 makedepends = libopenal-dev:amd64
@@ -331,7 +322,6 @@ makedepends = libxt-dev:amd64
 makedepends = libxxf86dga-dev:amd64
 makedepends = libxxf86vm-dev:amd64
 makedepends = libopenal-dev:amd64
-makedepends = unixodbc-dev:amd64
 makedepends = libunwind-dev:amd64
 makedepends = libkrb5-dev:amd64
 makedepends = libdrm-dev:amd64
@@ -350,7 +340,6 @@ makedepends = libglu1-mesa-dev:i386
 makedepends = libgphoto2-dev:i386
 makedepends = libgsm1-dev:i386
 makedepends = libjpeg-dev:i386
-makedepends = libldap2-dev:i386
 makedepends = libmpg123-dev:i386
 makedepends = libncurses5-dev:i386
 makedepends = libopenal-dev:i386
@@ -386,7 +375,6 @@ makedepends = libxt-dev:i386
 makedepends = libxxf86dga-dev:i386
 makedepends = libxxf86vm-dev:i386
 makedepends = libopenal-dev:i386
-makedepends = unixodbc-dev:i386
 makedepends = libunwind-dev:i386
 makedepends = libkrb5-dev:i386
 makedepends = libdrm-dev:i386
diff --git a/PKGBUILD b/PKGBUILD
index 3246b67..3a21225 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 pkgname=wine-wayland
 pkgbase=wine-wayland
 pkgver=7.20
-pkgrel=1
+pkgrel=2
 
 br="wayland"
 
-source=("https://gitlab.collabora.com/alf/wine/-/archive/$br/wine-$br.tar.bz2")
+source=("git+https://github.com/Kron4ek/wine-wayland.git")
     #    '30-win32-aliases.conf'
     #    'wine-binfmt.conf')
 sha512sums=(
@@ -16,7 +16,7 @@ sha512sums=(
 #'6200d75042a5993294ee58583fa9d145e46a36bcc2a38ddae92482366aaf67423b160556f748cd85d3ee1c521c497488810bdc0b79e192742f83ae49e7f55938'
 #'0ae5202b0ec9b4b1437f8c19f6e5f9c8ed32ef5d112f87c2bebdad62dcc60cdc0016fb9fbf911773bfab0701bc7481e686a06d2a25c9127895b7bc2dde2f2035')
 
-pkgdesc="A compatibility layer for running Windows programs (wayland version from gitlab.collabora.com/alf/wine/ wayland branch)"
+pkgdesc="A compatibility layer for running Windows programs (wayland version of wine https://github.com/Kron4ek/wine-wayland.git)"
 url="http://www.winehq.com"
 arch=(amd64)
 
@@ -41,7 +41,7 @@ libgsm1:amd64
 libgstreamer-gl1.0-0:amd64
 gir1.2-gst-plugins-base-1.0:amd64
 gstreamer1.0-plugins-base:amd64
-libldap-2.4-2:amd64
+#libldap-2.4-2:amd64
 libmpg123-0:amd64
 libout123-0:amd64
 libsyn123-0:amd64
@@ -84,7 +84,7 @@ libxt6:amd64
 libxxf86dga1:amd64
 libxxf86vm1:amd64
 libopenal1:amd64
-unixodbc:amd64
+#unixodbc:amd64
 libunwind8:amd64
 libkrb5-3:amd64
 libdrm-common:amd64
@@ -109,7 +109,7 @@ libgsm1:i386
 libgstreamer-gl1.0-0:i386
 gir1.2-gst-plugins-base-1.0:i386
 gstreamer1.0-plugins-base:i386
-libldap-2.4-2:i386
+#libldap-2.4-2:i386
 libmpg123-0:i386
 libout123-0:i386
 libsyn123-0:i386
@@ -152,7 +152,7 @@ libxt6:i386
 libxxf86dga1:i386
 libxxf86vm1:i386
 libopenal1:i386
-unixodbc:i386
+#unixodbc:i386
 libunwind8:i386
 libkrb5-3:i386
 libdrm-common:i386
@@ -190,7 +190,7 @@ libglu1-mesa-dev:amd64
 libgphoto2-dev:amd64
 libgsm1-dev:amd64
 libjpeg-dev:amd64 
-libldap2-dev:amd64
+#libldap2-dev:amd64
 libmpg123-dev:amd64
 libncurses5-dev:amd64 
 libopenal-dev:amd64
@@ -226,7 +226,7 @@ libxt-dev:amd64
 libxxf86dga-dev:amd64
 libxxf86vm-dev:amd64
 libopenal-dev:amd64
-unixodbc-dev:amd64
+#unixodbc-dev:amd64
 libunwind-dev:amd64
 libkrb5-dev:amd64
 libdrm-dev:amd64
@@ -246,7 +246,7 @@ libglu1-mesa-dev:i386
 libgphoto2-dev:i386
 libgsm1-dev:i386
 libjpeg-dev:i386 
-libldap2-dev:i386
+#libldap2-dev:i386
 libmpg123-dev:i386
 libncurses5-dev:i386 
 libopenal-dev:i386
@@ -282,7 +282,7 @@ libxt-dev:i386
 libxxf86dga-dev:i386
 libxxf86vm-dev:i386
 libopenal-dev:i386
-unixodbc-dev:i386
+#unixodbc-dev:i386
 libunwind-dev:i386
 libkrb5-dev:i386
 libdrm-dev:i386
@@ -329,30 +329,30 @@ conflicts=('libwine')
 build() {
   mkdir -pv "$srcdir/wine-32-build"
   mkdir -pv "$srcdir/wine-64-build"
-  cd "$srcdir/wine-64-build"
+  
+  cd "$srcdir/wine-32-build"
   ../wine-$br/configure \
       --prefix=/usr \
-      --libdir=/usr/lib \
       --with-x \
-      --without-mingw \
       --with-gstreamer \
-      --enable-win64 \
-      --with-wayland
+      --without-mingw \
+      --with-wayland \
+      --libdir=/usr/lib32
 
   make -j1
-
-  cd "$srcdir/wine-32-build"
+  
+  cd "$srcdir/wine-64-build"
   ../wine-$br/configure \
       --prefix=/usr \
+      --libdir=/usr/lib \
       --with-x \
-      --with-gstreamer \
       --without-mingw \
-      --with-wayland \
+      --with-gstreamer \
       --enable-win64 \
-      --libdir=/usr/lib32 \
-      --with-wine64="../wine-64-build"
+      --with-wayland
 
   make -j1
+
 }
 
 package() {