Updated to 2.0.94

3 files changed, 8 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e265a240925..61f5b29f92a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ayatana-indicator-power
 	pkgdesc = Ayatana Indicator showing power state
-	pkgver = 2.0.93
-	pkgrel = 4
+	pkgver = 2.0.94
+	pkgrel = 1
 	url = https://github.com/AyatanaIndicators
 	arch = i686
 	arch = x86_64
@@ -23,11 +23,9 @@ pkgbase = ayatana-indicator-power
 	optdepends = mate-control-center
 	optdepends = mate-power-manager
 	options = !emptydirs
-	source = https://github.com/AyatanaIndicators/ayatana-indicator-power/archive/2.0.93.tar.gz
-	source = 0001_enum-in-gschemas-unique.patch
+	source = https://github.com/AyatanaIndicators/ayatana-indicator-power/archive/2.0.94.tar.gz
 	source = 0002_add-testing-option.patch
-	md5sums = 8584e8489ef75c47ef1b820b53d85954
-	md5sums = aa58e7664e559967ba1b7e6c8ba1b4b1
+	md5sums = 6b14508f80d39a535dde366358b748b7
 	md5sums = 2fab358cf58bfde470e0b1f00931151b
 
 pkgname = ayatana-indicator-power
diff --git a/0001_enum-in-gschemas-unique.patch b/0001_enum-in-gschemas-unique.patch
deleted file mode 100644
index 57b583ec9657..000000000000
--- a/0001_enum-in-gschemas-unique.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 41bf160d2e1efc5185d2f26431394f3feffa0ce4
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date:   Mon Mar 19 09:24:52 2018 +0100
-
-    data/org.ayatana.indicator.power.gschema.xml.in: Prepend project namespace to enum id.
-    
-    Fixes AyatanaIndicators/ayatana-indicator-power#1.
-
-diff --git a/data/org.ayatana.indicator.power.gschema.xml.in b/data/org.ayatana.indicator.power.gschema.xml.in
-index 872b78e..2119aa9 100644
---- a/data/org.ayatana.indicator.power.gschema.xml.in
-+++ b/data/org.ayatana.indicator.power.gschema.xml.in
-@@ -1,5 +1,5 @@
- <schemalist>
--  <enum id="icon-policy-enum">
-+  <enum id="ayatana-indicator-power-icon-policy-enum">
-     <value nick="present" value="0" />
-     <value nick="charge" value="1" />
-     <value nick="never" value="2" />
-@@ -15,7 +15,7 @@
-       <_summary>Show percentage in Menu Bar</_summary>
-       <_description>Whether or not to show the percentage in the menu bar.</_description>
-     </key>
--    <key enum="icon-policy-enum" name="icon-policy">
-+    <key enum="ayatana-indicator-power-icon-policy-enum" name="icon-policy">
-       <default>"present"</default>
-       <_summary>When to show the battery status in the menu bar.</_summary>
-       <_description>Options for when to show battery status. Valid options are "present", "charge", and "never".</_description>
diff --git a/PKGBUILD b/PKGBUILD
index a5e8ecc12714..0d8b419d583d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Valentin Huélamo <vhuelamo at gmail dot com>
 
 pkgname="ayatana-indicator-power"
-pkgver="2.0.93"
-pkgrel="4"
+pkgver="2.0.94"
+pkgrel="1"
 pkgdesc="Ayatana Indicator showing power state"
 arch=("i686" "x86_64")
 url="https://github.com/AyatanaIndicators"
@@ -11,15 +11,13 @@ license=("GPL2" "GPL3")
 depends=("libayatana-indicator-gtk3" "upower" "systemd" "libnotify" "dconf")
 makedepends=("cmake" "cmake-extras" "libnotify" "glib2" "python")
 optdepends=("mate-ayatana-indicator-applet" "zenity" "powerd" "mate-control-center" "mate-power-manager")
-https://github.com/AyatanaIndicators/${pkgname}/archive/${pkgver}.tar.gz
-source=("https://github.com/AyatanaIndicators/${pkgname}/archive/${pkgver}.tar.gz" "0001_enum-in-gschemas-unique.patch" "0002_add-testing-option.patch")
-md5sums=("8584e8489ef75c47ef1b820b53d85954" "aa58e7664e559967ba1b7e6c8ba1b4b1" "2fab358cf58bfde470e0b1f00931151b")
+source=("https://github.com/AyatanaIndicators/${pkgname}/archive/${pkgver}.tar.gz" "0002_add-testing-option.patch")
+md5sums=("6b14508f80d39a535dde366358b748b7" "2fab358cf58bfde470e0b1f00931151b")
 options=("!emptydirs")
 
 prepare()
 {
     cd ${pkgname}-${pkgver}
-    patch -Np1 -i ../0001_enum-in-gschemas-unique.patch
     patch -Np1 -i ../0002_add-testing-option.patch
 }