porting to wlroots, not really building as of current?

3 files changed, 69 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93f9985db62e..76283cfd73bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Jan 15 22:59:16 UTC 2017
 pkgbase = way-cooler-git
 	pkgdesc = Customizeable Wayland compositor written in Rust
-	pkgver = v0.4.2.r35.ga4dd326
+	pkgver = v0.8.0.r246.gccf86d7
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Immington-Industries/way-cooler
@@ -12,15 +10,25 @@ pkgbase = way-cooler-git
 	makedepends = cargo
 	makedepends = rust
 	makedepends = git
-	depends = wlc
+	makedepends = wayland-protocols
+	makedepends = clang
+	makedepends = libxcursor
+	depends = wlroots-git
+	depends = rust
 	optdepends = weston: default terminal emulator
 	optdepends = dmenu: default launcher
 	optdepends = way-cooler-bg: draws a background for Way Cooler
 	provides = way-cooler
 	conflicts = way-cooler
-	backup = etc/way-cooler/init.lua
+	backup = etc/way-cooler/rc.lua
 	source = way-cooler-git::git+https://github.com/Immington-Industries/way-cooler.git
+	source = git+https://github.com/swaywm/wlroots-rs
+	source = git+https://github.com/swaywm/wlroots
+	source = 0001-wlroots-needs-to-be-dynamic.patch
 	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = 0aa8ef19bbe4d66d5dd6d796498ab8e2
 
 pkgname = way-cooler-git
 
diff --git a/0001-wlroots-needs-to-be-dynamic.patch b/0001-wlroots-needs-to-be-dynamic.patch
new file mode 100644
index 000000000000..19e491cab69c
--- /dev/null
+++ b/0001-wlroots-needs-to-be-dynamic.patch
@@ -0,0 +1,26 @@
+From cc25acbeb948fddf640abcd2ba40698ec0d17152 Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Thu, 24 May 2018 10:02:30 -0400
+Subject: [PATCH] wlroots needs to be dynamic
+
+---
+ Cargo.toml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 930b0b8..8e55767 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -35,8 +35,7 @@ tempfile = "2"
+ gl_generator = "0.5.0"
+ 
+ [features]
+-default = ["static", "libcap", "systemd", "elogind"]
+-static = ["wlroots-sys/static"]
++default = ["libcap", "systemd", "elogind"]
+ libcap = ["wlroots-sys/libcap"]
+ systemd = ["wlroots-sys/systemd"]
+ elogind = ["wlroots-sys/elogind"]
+-- 
+2.17.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 54fa1d16ac48..bb8d0a04f6dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,28 @@
 # Maintainer: Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
 pkgname=way-cooler-git
-pkgver=v0.4.2.r35.ga4dd326
+pkgver=v0.8.0.r246.gccf86d7
 pkgrel=1
 epoch=1
 pkgdesc="Customizeable Wayland compositor written in Rust"
 arch=('i686' 'x86_64')
 url="https://github.com/Immington-Industries/way-cooler"
 license=('MIT')
-depends=('wlc')
-makedepends=('cargo' 'rust' 'git')
+depends=('wlroots-git' 'rust')
+makedepends=('cargo' 'rust' 'git' 'wayland-protocols' 'clang' 'libxcursor')
 optdepends=('weston: default terminal emulator'
             'dmenu: default launcher'
             'way-cooler-bg: draws a background for Way Cooler')
 provides=('way-cooler')
 conflicts=('way-cooler')
-backup=('etc/way-cooler/init.lua')
-source=("${pkgname}::git+https://github.com/Immington-Industries/way-cooler.git")
-md5sums=('SKIP')
+backup=('etc/way-cooler/rc.lua')
+source=("${pkgname}::git+https://github.com/Immington-Industries/way-cooler.git"
+        "git+https://github.com/swaywm/wlroots-rs"
+        "git+https://github.com/swaywm/wlroots"
+        "0001-wlroots-needs-to-be-dynamic.patch")
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         '0aa8ef19bbe4d66d5dd6d796498ab8e2')
 
 pkgver() {
   cd "$pkgname"
@@ -24,27 +30,34 @@ pkgver() {
 }
 
 prepare() {
-  cd "$srcdir/$pkgname"
-  rm Cargo.lock
+  cd $pkgname
+  git submodule init wlroots-rs
+  git config submodule.wlroots-rs.url ../wlroots-rs
+  git submodule update --remote --init wlroots-rs
+  cd ../wlroots-rs
+  git submodule init wlroots-sys/wlroots
+  git config submodule.wlroots.url ../wlroots
+  git submodule update --init --recursive --remote wlroots-sys/wlroots/
+  cd ../wlroots
+  git reset --hard 79683ee497cff4e363612933af2f068cfea9b19c 
 }
-
 build() {
+  cd "$srcdir/$pkgname/wlroots-rs"
+  patch -i ../../0001-wlroots-needs-to-be-dynamic.patch
+  #RUST_BACKTRACE=1 cargo build --all-features --release
   cd "$srcdir/$pkgname"
-  cargo build --release
+  RUST_BACKTRACE=1 cargo build --all-features --release
 }
 
 package() {
   cd "$srcdir/$pkgname"
 
-  #cargo install way-cooler --root "$pkgdir"
-  #mkdir "$pkgdir/usr"
-  #mv "$pkgdir/bin" "$pkgdir/usr"
-
-  mkdir -p "$pkgdir/usr/bin"
-  mv "target/release/way-cooler" "$pkgdir/usr/bin"
+  cargo install way-cooler --root "$pkgdir"
+  mkdir "$pkgdir/usr"
+  mv "$pkgdir/bin" "$pkgdir/usr"
 
   mkdir -p "$pkgdir/etc/way-cooler"
-  cp "$srcdir/$pkgname/config/init.lua" "$pkgdir/etc/way-cooler"
+  cp "$srcdir/$pkgname/config/rc.lua" "$pkgdir/etc/way-cooler"
 
   mkdir -p "$pkgdir/usr/share/wayland-sessions"
   cp "$srcdir/$pkgname/way-cooler.desktop" "$pkgdir/usr/share/wayland-sessions"