bump lightdm-pantheon-greeter

4 files changed, 69 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a88367e78aef..191e6673d98d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,34 @@
 # Generated by mksrcinfo v8
-# Sun Sep 24 10:44:11 UTC 2017
+# Fri Feb  1 15:50:12 UTC 2019
 pkgbase = lightdm-pantheon-greeter
 	pkgdesc = Pantheon greeter for LightDM
-	pkgver = 3.2.0
+	pkgver = 3.3.1
 	pkgrel = 1
 	url = https://github.com/elementary/greeter
-	arch = i686
+	install = lightdm-pantheon-greeter.install
 	arch = x86_64
+	groups = pantheon-unstable
 	license = GPL
-	makedepends = cmake
+	makedepends = meson
+	makedepends = git
+	makedepends = libglvnd
+	makedepends = libxfixes
 	makedepends = vala
-	makedepends = wingpanel
 	depends = cairo
-	depends = clutter
 	depends = clutter-gtk
 	depends = gdk-pixbuf2
 	depends = glib2
-	depends = glibc
 	depends = gtk3
+	depends = libmutter2
 	depends = libgee
 	depends = libgl
+	depends = libgranite.so
 	depends = libx11
 	depends = lightdm
-	depends = libgranite.so
-	depends = libwingpanel-2.0.so
-	source = lightdm-pantheon-greeter-3.2.0.tar.gz::https://github.com/elementary/greeter/archive/3.2.0.tar.gz
-	source = lightdm-pantheon-greeter-paths.patch
-	sha256sums = 3d97370e94067ecc6040e825e7e8122f58c50ff04e168c3cc73fa2dbffdcb130
-	sha256sums = 64911a77369693a85563459ff372c4f7daba09825e7f66f2b98b60ab2b7ecd76
+	provides = lightdm-pantheon-greeter
+	conflicts = lightdm-pantheon-greeter
+	source = lightdm-pantheon-greeter::git+https://github.com/elementary/greeter.git#tag=3.3.1
+	sha256sums = SKIP
 
 pkgname = lightdm-pantheon-greeter
 
diff --git a/PKGBUILD b/PKGBUILD
index 0daa2432421b..ee467b1358f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,55 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: sh4nks <sh4nks7@gmail.com
 
 pkgname=lightdm-pantheon-greeter
-pkgver=3.2.0
+pkgver=3.3.1
 pkgrel=1
 pkgdesc='Pantheon greeter for LightDM'
-arch=('i686' 'x86_64')
-url='https://github.com/elementary/greeter'
-license=('GPL')
-depends=('cairo' 'clutter' 'clutter-gtk' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3'
-         'libgee' 'libgl' 'libx11' 'lightdm'
-         'libgranite.so' 'libwingpanel-2.0.so')
-makedepends=('cmake' 'vala' 'wingpanel')
-source=("lightdm-pantheon-greeter-${pkgver}.tar.gz::https://github.com/elementary/greeter/archive/${pkgver}.tar.gz"
-        'lightdm-pantheon-greeter-paths.patch')
-sha256sums=('3d97370e94067ecc6040e825e7e8122f58c50ff04e168c3cc73fa2dbffdcb130'
-            '64911a77369693a85563459ff372c4f7daba09825e7f66f2b98b60ab2b7ecd76')
-
-prepare() {
-  pushd greeter-${pkgver}
-  patch -Np1 -i ../lightdm-pantheon-greeter-paths.patch
-  popd
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
+arch=(x86_64)
+url=https://github.com/elementary/greeter
+license=(GPL)
+groups=(pantheon-unstable)
+depends=(
+  cairo
+  clutter-gtk
+  gdk-pixbuf2
+  glib2
+  gtk3
+  libmutter2
+  libgee
+  libgl
+  libgranite.so
+  libx11
+  lightdm
+)
+makedepends=(
+  meson
+  git
+  libglvnd
+  libxfixes
+  vala
+)
+provides=(lightdm-pantheon-greeter)
+conflicts=(lightdm-pantheon-greeter)
+install=lightdm-pantheon-greeter.install
+source=(lightdm-pantheon-greeter::git+https://github.com/elementary/greeter.git#tag=${pkgver})
+sha256sums=(SKIP)
+
+pkgver() {
+  cd lightdm-pantheon-greeter
+
+  git describe --tags | sed 's/-/.r/; s/-g/./'
 }
 
 build() {
-  cd build
-
-  cmake ../greeter-${pkgver} \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DGSETTINGS_COMPILE='FALSE'
-  make
+  arch-meson lightdm-pantheon-greeter build \
+    -D b_pie=false \
+    -D ubuntu-patched-gsd=false
+  ninja -C build
 }
 
 package() {
-  cd build
-
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" meson install -C build
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/lightdm-pantheon-greeter-paths.patch b/lightdm-pantheon-greeter-paths.patch
deleted file mode 100644
index 1e60d9f15aa1..000000000000
--- a/lightdm-pantheon-greeter-paths.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 889bc96e75eb5f2f3d5da9fb110ce092b8e1a395 Mon Sep 17 00:00:00 2001
-From: Solomon Choina <shlomochoina@gmail.com>
-Date: Wed, 28 Jun 2017 10:32:15 -0400
-Subject: [PATCH] updating the patch
-
----
- CMakeLists.txt                                               | 12 ++++++------
- .../{pantheon-greeter.conf => lightdm-pantheon-greeter.conf} |  0
- ...heon-greeter.desktop => lightdm-pantheon-greeter.desktop} |  4 ++--
- src/PantheonGreeter.vala                                     |  2 +-
- src/Widgets/Wallpaper.vala                                   |  2 +-
- 5 files changed, 10 insertions(+), 10 deletions(-)
- rename data/{pantheon-greeter.conf => lightdm-pantheon-greeter.conf} (100%)
- rename data/{pantheon-greeter.desktop => lightdm-pantheon-greeter.desktop} (64%)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bd290ff..83f270b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
- set (CONF_DIR "/etc/lightdm")
- set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
--set (PKGDATADIR "${DATADIR}/pantheon-greeter")
-+set (PKGDATADIR "${DATADIR}/lightdm-pantheon-greeter")
- set (CMAKE_INSTALL_PREFIX /usr)
- set (VERSION "3.1.1")
- 
-@@ -93,10 +93,10 @@ include (GSettings)
- include (GResource)
- glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml)
- 
--add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
--target_link_libraries(pantheon-greeter m)
-+add_executable (lightdm-pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS})
-+target_link_libraries(lightdm-pantheon-greeter m)
- 
--install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
--install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
--install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.conf DESTINATION ${CONF_DIR})
-+install (TARGETS lightdm-pantheon-greeter RUNTIME DESTINATION bin)
-+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.desktop DESTINATION share/xgreeters)
-+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/lightdm-pantheon-greeter.conf DESTINATION ${CONF_DIR})
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})
-diff --git a/data/pantheon-greeter.conf b/data/lightdm-pantheon-greeter.conf
-similarity index 100%
-rename from data/pantheon-greeter.conf
-rename to data/lightdm-pantheon-greeter.conf
-diff --git a/data/pantheon-greeter.desktop b/data/lightdm-pantheon-greeter.desktop
-similarity index 64%
-rename from data/pantheon-greeter.desktop
-rename to data/lightdm-pantheon-greeter.desktop
-index 225cd40..3e40fc7 100644
---- a/data/pantheon-greeter.desktop
-+++ b/data/lightdm-pantheon-greeter.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Name=Pantheon Greeter
- Comment=Pantheon Greeter
--Exec=pantheon-greeter
-+Exec=lightdm-pantheon-greeter
- Type=Application
- X-Ubuntu-Gettext-Domain=pantheon-greeter
--Name[en_US]=pantheon-greeter
-+Name[en_US]=lightdm-pantheon-greeter
-diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
-index d984635..194a259 100644
---- a/src/PantheonGreeter.vala
-+++ b/src/PantheonGreeter.vala
-@@ -104,7 +104,7 @@ public class PantheonGreeter : Gtk.Window {
-         
-         settings = new KeyFile ();
-         try {
--            settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "pantheon-greeter.conf"), KeyFileFlags.KEEP_COMMENTS);
-+            settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "lightdm-pantheon-greeter.conf"), KeyFileFlags.KEEP_COMMENTS);
-         } catch (Error e) {
-             warning (e.message);
-         }
-diff --git a/src/Widgets/Wallpaper.vala b/src/Widgets/Wallpaper.vala
-index 9b6cde1..dcecd1f 100644
---- a/src/Widgets/Wallpaper.vala
-+++ b/src/Widgets/Wallpaper.vala
-@@ -49,7 +49,7 @@ public class Wallpaper : Gtk.Stack {
-         var settings = new KeyFile ();
-         string default_wallpaper = "/usr/share/backgrounds/elementaryos-default";
-         try {
--            settings.load_from_file (Constants.CONF_DIR + "/pantheon-greeter.conf", KeyFileFlags.KEEP_COMMENTS);
-+            settings.load_from_file (Constants.CONF_DIR + "/lightdm-pantheon-greeter.conf", KeyFileFlags.KEEP_COMMENTS);
-             default_wallpaper = settings.get_string ("greeter", "default-wallpaper");
-         } catch (Error e) {
-             warning (e.message);
diff --git a/lightdm-pantheon-greeter.install b/lightdm-pantheon-greeter.install
new file mode 100644
index 000000000000..b1c0d9f94f1c
--- /dev/null
+++ b/lightdm-pantheon-greeter.install
@@ -0,0 +1,14 @@
+post_install() {
+  DCONF_PROFILE='lightdm' dconf update
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+  rm -f /etc/dconf/db/lightdm
+}
+
+# vim: ts=2 sw=2 et: