Work on updating for all-new project layout

2 files changed, 32 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1bea67bba54..1fb42295d1cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,20 @@
 pkgbase = way-cooler-git
 	pkgdesc = Customizeable Wayland compositor written in Rust
-	pkgver = 0.8.0.r303.g26ff8bb
+	pkgver = 0.8.0.r661.ge50ffca0
 	pkgrel = 1
 	epoch = 1
-	url = https://github.com/Immington-Industries/way-cooler
+	url = http://way-cooler.org/
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = python
 	makedepends = cargo
 	makedepends = rust
 	makedepends = git
-	makedepends = wayland-protocols
-	makedepends = clang
-	makedepends = libxcursor
-	makedepends = cairo
-	makedepends = gdk-pixbuf2
+	makedepends = meson
+	makedepends = ninja
 	depends = lua
-	depends = gdk-pixbuf2
-	depends = cairo
-	depends = wlc
+	depends = wlroots
+	optdepends = awesome-way-cooler: wayland compatable awesome fork
 	optdepends = weston: default terminal emulator
 	optdepends = dmenu: default launcher
 	optdepends = way-cooler-bg: draws a background for Way Cooler
diff --git a/PKGBUILD b/PKGBUILD
index 8a05bc267d7a..cf114001bd45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
-# Maintainer: Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
+
 pkgname=way-cooler-git
-pkgver=0.8.0.r303.g26ff8bb
+pkgver=0.8.0.r661.ge50ffca0
 pkgrel=1
 epoch=1
 pkgdesc="Customizeable Wayland compositor written in Rust"
 arch=('i686' 'x86_64')
-url="https://github.com/Immington-Industries/way-cooler"
+url="http://way-cooler.org/"
 license=('MIT')
-depends=('lua' 'gdk-pixbuf2' 'cairo' 'wlc')
-makedepends=('python' 'cargo' 'rust' 'git' 'wayland-protocols' 'clang' 'libxcursor'
-             'cairo' 'gdk-pixbuf2')
-optdepends=('weston: default terminal emulator'
+depends=('lua' 'wlroots')
+makedepends=('cargo' 'rust' 'git' 'meson' 'ninja')
+optdepends=('awesome-way-cooler: wayland compatable awesome fork'
+            'weston: default terminal emulator'
             'dmenu: default launcher'
             'way-cooler-bg: draws a background for Way Cooler')
 provides=('way-cooler')
@@ -30,27 +32,30 @@ prepare() {
   cd "$pkgname"
   git submodule update --init --recursive
 }
+
 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"
-  RUST_BACKTRACE=1 cargo build --all-features --release
+  cd "$pkgname"
+  meson build
+  ninja -C build
+  # cd "$srcdir/$pkgname/wlroots-rs"
+  # patch -i ../../0001-wlroots-needs-to-be-dynamic.patch
+  # RUST_BACKTRACE=1 cargo build --all-features --release
+  # RUST_BACKTRACE=1 cargo build --all-features --release
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
-  cargo install way-cooler --root "$pkgdir"
-  mkdir "$pkgdir/usr"
-  mv "$pkgdir/bin" "$pkgdir/usr"
+  # cargo install way-cooler --root "$pkgdir"
+  # mkdir "$pkgdir/usr"
+  # mv "$pkgdir/bin" "$pkgdir/usr"
 
-  mkdir -p "$pkgdir/etc/way-cooler"
-  cp "$srcdir/$pkgname/config/rc.lua" "$pkgdir/etc/way-cooler"
+  # mkdir -p "$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"
-  rm "$pkgdir"/.crates.toml
+  # mkdir -p "$pkgdir/usr/share/wayland-sessions"
+  # cp "$srcdir/$pkgname/way-cooler.desktop" "$pkgdir/usr/share/wayland-sessions"
+  # rm "$pkgdir"/.crates.toml
 }
 
 # vim:set ts=2 sw=2 et: