summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Burgos2018-09-21 18:06:01 -0600
committerSam Burgos2018-09-21 18:06:01 -0600
commite3a8f11fd7c41fddd370aa904e8da24e6cc2c9e8 (patch)
tree45b8267f59d61de392c7b4b649508a01e0f3f20a
parentf69157721eb35b50e37a7f98a3635013f6bedf69 (diff)
downloadaur-e3a8f11fd7c41fddd370aa904e8da24e6cc2c9e8.tar.gz
added patch from upstream to compile with newer versions of vala
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--compile_new_vala.patch29
3 files changed, 37 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1789e4243cae..a323e01fd11e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lightdm-slick-greeter
pkgdesc = A slick-looking LightDM greeter
pkgver = 1.2.2
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/linuxmint/slick-greeter
install = slick-greeter.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 2081c18274be..c1fa361ca50b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=lightdm-slick-greeter
_pkgname=slick-greeter
pkgver=1.2.2
-pkgrel=2
+pkgrel=3
pkgdesc="A slick-looking LightDM greeter"
arch=('i686' 'x86_64')
url="https://github.com/linuxmint/${_pkgname}"
@@ -25,6 +25,12 @@ install=slick-greeter.install
source=("${_pkgname}-${pkgver}.tar.gz::$url/archive/${pkgver}.tar.gz")
sha256sums=('ea5e53e1beddda097fc6e0733bc5dc5c143341504b34f7165357e87ed7b7b52b')
+prepare() {
+ cd ${_pkgname}-${pkgver}
+ #Allow compiling with newer versions of Vala
+ patch -Np0 -i ../compile_new_vala.patch
+}
+
build() {
cd ${_pkgname}-${pkgver}
aclocal --install
diff --git a/compile_new_vala.patch b/compile_new_vala.patch
new file mode 100644
index 000000000000..1000db4daf0e
--- /dev/null
+++ b/compile_new_vala.patch
@@ -0,0 +1,29 @@
+--- src/background.vala
++++ src/background.vala
+@@ -443,8 +443,14 @@
+
+ private string _current_background;
+ public string? current_background {
+- get { return _current_background; }
+-
++ get {
++ if (_current_background == null)
++ {
++ _current_background = fallback_color;
++ }
++
++ return _current_background;
++ }
+ set {
+ if (value == null || value == "")
+ {
+@@ -456,8 +462,6 @@
+
+ reload ();
+ }
+-
+- default = fallback_color;
+ }
+
+ public bool draw_grid { get; set; default = true; }
+