Fixed the terrible imitation by SolarAquarion

2 files changed, 26 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b76b9e601e6..596a744c4524 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,24 @@
 # Generated by mksrcinfo v8
-# Wed Dec 13 19:08:27 UTC 2017
+# Tue Jan  2 14:01:38 UTC 2018
 pkgbase = wingpanel-indicator-nightlight-git
-	pkgdesc = nightlife indicator
-	pkgver = r4.1f73747
+	pkgdesc = Winganel Nightlight Indicator
+	pkgver = r40.2668b67
 	pkgrel = 1
-	url = https://github.com/elementary/wingpanel-indicator-a11y
-	arch = i686
+	url = https://github.com/elementary/wingpanel-indicator-nightlight
 	arch = x86_64
 	groups = pantheon-unstable
-	license = GPL3
-	makedepends = cmake
+	license = GPL2
 	makedepends = git
-	makedepends = granite-git
+	makedepends = intltool
+	makedepends = meson
 	makedepends = vala
 	makedepends = wingpanel-git
 	depends = glib2
 	depends = glibc
 	depends = gtk3
-	depends = libgranite.so
 	depends = libwingpanel-2.0.so
-	provides = wingpanel-indicator-a11y
-	conflicts = wingpanel-indicator-a11y
-	replaces = wingpanel-indicator-a11y-bzr
+	provides = wingpanel-indicator-nightlight
+	conflicts = wingpanel-indicator-nightlight
 	source = git+https://github.com/elementary/wingpanel-indicator-nightlight.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 06ff2f84c11a..6c8ccc069f5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,28 @@
-# Maintainer: Maxime Gauduin <shlomochoina@gmail.com>
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=wingpanel-indicator-nightlight-git
-pkgver=r4.1f73747
+pkgver=r40.2668b67
 pkgrel=1
-pkgdesc='nightlife indicator'
-_gitname=wingpanel-indicator-nightlight
-arch=('i686' 'x86_64')
-url='https://github.com/elementary/wingpanel-indicator-a11y'
-license=('GPL3')
+pkgdesc='Winganel Nightlight Indicator'
+arch=('x86_64')
+url='https://github.com/elementary/wingpanel-indicator-nightlight'
+license=('GPL2')
 groups=('pantheon-unstable')
 depends=('glib2' 'glibc' 'gtk3'
-         'libgranite.so' 'libwingpanel-2.0.so')
-makedepends=('cmake' 'git' 'granite-git' 'vala' 'wingpanel-git')
-provides=('wingpanel-indicator-a11y')
-conflicts=('wingpanel-indicator-a11y')
-replaces=('wingpanel-indicator-a11y-bzr')
-source=("git+https://github.com/elementary/${_gitname}.git")
+         'libwingpanel-2.0.so')
+makedepends=('git' 'intltool' 'meson' 'vala' 'wingpanel-git')
+provides=('wingpanel-indicator-nightlight')
+conflicts=('wingpanel-indicator-nightlight')
+source=('git+https://github.com/elementary/wingpanel-indicator-nightlight.git')
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_gitname}"
+  cd wingpanel-indicator-nightlight
 
   echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd "${srcdir}/${_gitname}"
-
   if [[ -d build ]]; then
     rm -rf build
   fi
@@ -34,19 +30,16 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/${_gitname}/build
+  cd build
 
-  cmake .. \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_INSTALL_LIBDIR='/usr/lib'
-  make
+  arch-meson ../wingpanel-indicator-nightlight
+  ninja
 }
 
 package() {
-  cd ${srcdir}/${_gitname}/build
+  cd build
 
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
 
 # vim: ts=2 sw=2 et: