Update to v0.3.r46.g81dc247-1

3 files changed, 12 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2cf66e0cb535..f2f963beee8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = mconnect-git
 	pkgdesc = KDE Connect protocol implementation in Vala/C for non-KDE desktops
-	pkgver = 409.210b435
-	pkgrel = 2
-	url = https://github.com/bboozzoo/mconnect
+	pkgver = v0.3.r46.g81dc247
+	pkgrel = 1
+	url = https://github.com/grimpy/mconnect
 	install = mconnect-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = at-spi2-atk
+	makedepends = gdb
 	makedepends = git
 	makedepends = vala
 	makedepends = json-glib
@@ -22,9 +23,7 @@ pkgbase = mconnect-git
 	provides = mconnect
 	conflicts = mconnect
 	options = !emptydirs
-	source = mconnect::git+https://github.com/bboozzoo/mconnect.git#branch=master
-	source = mconnect_utils.patch
+	source = mconnect::git+https://github.com/grimpy/mconnect.git#branch=master
 	sha256sums = SKIP
-	sha256sums = 11a8e281a405e3d49c0b504dae03fcd33d1dbb5d278609d0163ecfec88b1ae1d
 
 pkgname = mconnect-git
diff --git a/PKGBUILD b/PKGBUILD
index 09218cce579b..33fdb4351c21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,32 +5,29 @@
 #
 _pkgname="mconnect"
 pkgname="${_pkgname}-git"
-pkgver=409.210b435
-pkgrel=2
+pkgver=v0.3.r46.g81dc247
+pkgrel=1
 pkgdesc="KDE Connect protocol implementation in Vala/C for non-KDE desktops"
 arch=('i686' 'x86_64')
 depends=('gtk3' 'libgee' 'gnutls' 'json-glib' 'libnotify')
-makedepends=('at-spi2-atk' 'git' 'vala' 'json-glib' 'glib2' 'gobject-introspection' 'meson')
-url="https://github.com/bboozzoo/mconnect"
+makedepends=('at-spi2-atk' 'gdb' 'git' 'vala' 'json-glib' 'glib2' 'gobject-introspection' 'meson')
+url="https://github.com/grimpy/mconnect"
 license=('GPL2')
 install="${pkgname}.install"
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
 options=('!emptydirs')
-source=("mconnect::git+${url}.git#branch=master"
-        'mconnect_utils.patch')
-sha256sums=('SKIP'
-            '11a8e281a405e3d49c0b504dae03fcd33d1dbb5d278609d0163ecfec88b1ae1d')
+source=("mconnect::git+${url}.git#branch=master")
+sha256sums=('SKIP')
 
 pkgver() {
     cd "${_pkgname}"
-    echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+    echo $(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
 }
 
 prepare() {
     cd "${_pkgname}"
     mkdir build
-    patch -Np1 --input="${srcdir}/mconnect_utils.patch"
 }
 
 build() {
diff --git a/mconnect_utils.patch b/mconnect_utils.patch
deleted file mode 100644
index 91d60c71b433..000000000000
--- a/mconnect_utils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/mconnect/utils.vala b/src/mconnect/utils.vala
-index 1d7f5cb..83e35bf 100644
---- a/src/mconnect/utils.vala
-+++ b/src/mconnect/utils.vala
-@@ -160,7 +160,7 @@ namespace Utils {
- 
-             // regex taken from SO
-             // uncrustify breaks the regex, so *INDENT-OFF*
--			Regex r = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+,.~#?&\/=]*)/;
-+			GLib.Regex r = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+,.~#?&\/=]*)/;
-             // *INDENT-ON*
- 
-             MatchInfo mi;
-@@ -180,7 +180,7 @@ namespace Utils {
-                 debug ("no match");
-             }
-             return matches;
--        } catch (RegexError e) {
-+        } catch (GLib.RegexError e) {
-             warning ("failed to compile regex: %s", e.message);
-             return {};
-         }