Version compatible with plasma5-wallpapers-dynamic>=2.3

3 files changed, 14 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67d9ce2b981a..255c868e504e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = dynamic-wallpaper-mojave
-	pkgver = 6.1
+	pkgver = 6.2.r2.gdd63c5b
 	pkgrel = 1
 	url = https://github.com/japamax/gnome-kde-dynamic-wallpaper-mojave
 	arch = any
@@ -16,7 +16,7 @@ pkgname = dynamic-wallpaper-mojave-gnome-timed-git
 pkgname = dynamic-wallpaper-mojave-kde-git
 	pkgdesc = Azimuth Elevation based KDE macOS Mojave wallpaper
 	install = dynamic-wallpaper-mojave-kde-git.install
-	depends = plasma5-wallpapers-dynamic
+	depends = plasma5-wallpapers-dynamic>=2.3
 	depends = dynamic-wallpaper-mojave-images-git
 
 pkgname = dynamic-wallpaper-mojave-images-git
diff --git a/PKGBUILD b/PKGBUILD
index 1a1f564759e7..bd384a7a57f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase='dynamic-wallpaper-mojave'
 pkgname=("${pkgbase}-gnome-timed-git" "${pkgbase}-kde-git" "${pkgbase}-images-git" )
 _gitname='gnome-kde-dynamic-wallpaper-mojave'
-pkgver=6.1
+pkgver=6.2.r2.gdd63c5b
 pkgrel=1
 arch=('any')
 url="https://github.com/japamax/${_gitname}"
@@ -18,8 +18,8 @@ pkgver() {
  package_dynamic-wallpaper-mojave-images-git() {
 	pkgdesc="macOS Mojave dynamic wallpaper based 16 images"
 	cd "${srcdir}/${_gitname}"
-	install -dm755 "${pkgdir}/usr/share/dynamicwallpapers/mojave/images"
-	install -m644 ${srcdir}/${_gitname}/mojave/* "${pkgdir}/usr/share/dynamicwallpapers/mojave/images"
+	install -dm755 "${pkgdir}/usr/share/dynamicwallpapers/mojave-solar/contents/images"
+	install -m644 ${srcdir}/${_gitname}/mojave/* "${pkgdir}/usr/share/dynamicwallpapers/mojave-solar/contents/images"
 }
 
  package_dynamic-wallpaper-mojave-gnome-timed-git() {
@@ -28,16 +28,19 @@ pkgver() {
 	install=dynamic-wallpaper-mojave-gnome-timed-git.install
 	cd "${srcdir}/${_gitname}"
 	install -dm755 "${pkgdir}/usr/share/backgrounds/macOS"
-	ln -s "/usr/share/dynamicwallpapers/mojave/images" "${pkgdir}/usr/share/backgrounds/macOS/mojave"
+	ln -s "/usr/share/dynamicwallpapers/mojave-solar/contents/images" "${pkgdir}/usr/share/backgrounds/macOS/mojave"
 	install -Dm644 mojave-timed.xml "${pkgdir}/usr/share/backgrounds/macOS/mojave-timed.xml"
 	install -Dm644 mojave.xml "${pkgdir}/usr/share/gnome-background-properties/mojave.xml"
  }
  
  package_dynamic-wallpaper-mojave-kde-git() {
-	depends=(plasma5-wallpapers-dynamic dynamic-wallpaper-mojave-images-git)
+	depends=('plasma5-wallpapers-dynamic>=2.3' dynamic-wallpaper-mojave-images-git)
 	pkgdesc="Azimuth Elevation based KDE macOS Mojave wallpaper"
 	install=dynamic-wallpaper-mojave-kde-git.install
 	cd "${srcdir}/${_gitname}"
-	install -Dm644 mojave.json "${pkgdir}/usr/share/dynamicwallpapers/mojave/metadata.json"
+	install -dm755 "${pkgdir}/usr/share/dynamicwallpapers/mojave-timed/contents"
+	ln -s "/usr/share/dynamicwallpapers/mojave-solar/contents/images" "${pkgdir}/usr/share/dynamicwallpapers/mojave-timed/contents/images"
+	install -Dm644 mojave-solar.json "${pkgdir}/usr/share/dynamicwallpapers/mojave-solar/metadata.json"
+	install -Dm644 mojave-timed.json "${pkgdir}/usr/share/dynamicwallpapers/mojave-timed/metadata.json"
  }
 
diff --git a/dynamic-wallpaper-mojave-kde-git.install b/dynamic-wallpaper-mojave-kde-git.install
index e3ff4dd50103..b2cf26b9b2a0 100644
--- a/dynamic-wallpaper-mojave-kde-git.install
+++ b/dynamic-wallpaper-mojave-kde-git.install
@@ -4,6 +4,9 @@ cat << EOT
 ==================================================================================
 
 Select "Dynamic" wallpaper type, put your real coordinates and your timer.
+For the timed version,
+you must sync your system clock time (presented both in local time and UTC) as well as the RTC (hardware clock).
+Consult https://wiki.archlinux.org/index.php/System_time & https://wiki.archlinux.org/index.php/OpenNTPD
 
 ==================================================================================