Merge remote-tracking branch 'upstream/master'

2 files changed, 11 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29432d5b3eb3..27e4c19e1d55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ayatana-webmail-no-indicator-messages
 	pkgdesc = Webmail notifications and actions for any desktop without ayatana-indicator-messages dependency
-	pkgver = 22.2.26
-	pkgrel = 5
+	pkgver = 22.6.28
+	pkgrel = 1
 	url = https://tari.in/www/software/ayatana-webmail/
 	install = ayatana-webmail.install
 	arch = any
@@ -21,15 +21,13 @@ pkgbase = ayatana-webmail-no-indicator-messages
 	depends = python-secretstorage
 	depends = python-urllib3
 	optdepends = ayatana-indicator-messages: Support for indicator messages
-	provides = ayatana-webmail=22.2.26
+	provides = ayatana-webmail=22.6.28
 	conflicts = ayatana-webmail
 	conflicts = unity-mail
 	replaces = unity-mail
-	source = ayatana-webmail-22.2.26.tar.gz::https://github.com/AyatanaIndicators/ayatana-webmail/archive/22.2.26.tar.gz
+	source = ayatana-webmail-22.6.28.tar.gz::https://github.com/AyatanaIndicators/ayatana-webmail/archive/22.6.28.tar.gz
 	source = status_icon.patch
-	source = idler_fix.patch
-	md5sums = 98ee497c3d3fa3122524c0f654163bc0
+	md5sums = ae7bceaa5278ec287c27d0e2f18a895c
 	md5sums = eb8721b75b144ab35a8e18bb352799ab
-	md5sums = a52812d8d9a779df06b2adf373a15cd5
 
 pkgname = ayatana-webmail-no-indicator-messages
diff --git a/PKGBUILD b/PKGBUILD
index 88abd342d91e..f6f8c1b98f17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: Ingo Meyer <IJ_M@gmx.de>
 
 pkgname="ayatana-webmail-no-indicator-messages"
-pkgver="22.2.26"
-pkgrel="5"
+pkgver="22.6.28"
+pkgrel="1"
 pkgdesc="Webmail notifications and actions for any desktop without ayatana-indicator-messages dependency"
 arch=("any")
 url="https://tari.in/www/software/ayatana-webmail/"
@@ -14,11 +14,9 @@ makedepends=("python-setuptools" "python-polib")
 optdepends=("ayatana-indicator-messages: Support for indicator messages")
 install="ayatana-webmail.install"
 source=("ayatana-webmail-${pkgver}.tar.gz::https://github.com/AyatanaIndicators/ayatana-webmail/archive/${pkgver}.tar.gz"
-        "status_icon.patch"
-        "idler_fix.patch")
-md5sums=("98ee497c3d3fa3122524c0f654163bc0"
-         "eb8721b75b144ab35a8e18bb352799ab"
-         "a52812d8d9a779df06b2adf373a15cd5")
+        "status_icon.patch")
+md5sums=("ae7bceaa5278ec287c27d0e2f18a895c"
+         "eb8721b75b144ab35a8e18bb352799ab")
 provides=("ayatana-webmail=${pkgver}")
 replaces=("unity-mail")
 conflicts=("ayatana-webmail" "unity-mail")
@@ -26,8 +24,7 @@ conflicts=("ayatana-webmail" "unity-mail")
 prepare()
 {
     cd ayatana-webmail-${pkgver}
-    patch -Np1 -i "${srcdir}/status_icon.patch" && \
-    patch -Np1 -i "${srcdir}/idler_fix.patch"
+    patch -Np1 -i "${srcdir}/status_icon.patch"
 }
 
 build()