switch (temporarily?) to github mirror, repome patch

3 files changed, 10 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fae843861860..fd0b08b07a09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Jul 23 19:59:06 UTC 2017
 pkgbase = notmuch-git
-	pkgver = 0.25_rc1.2.1.gc28ac94a
-	pkgrel = 1
+	pkgver = 0.25_rc1.2.0.gd95ccfe9
+	pkgrel = 2
 	url = https://notmuchmail.org/
 	arch = i686
 	arch = x86_64
@@ -17,10 +19,8 @@ pkgbase = notmuch-git
 	makedepends = talloc
 	options = !distcc
 	options = !makeflags
-	source = git://notmuchmail.org/git/notmuch
-	source = not_byte_compile_notmuch_el.patch
+	source = git+https://github.com/notmuch/notmuch
 	md5sums = SKIP
-	md5sums = 07fa5cbbf2c7e0d5a19352c652e9c9cf
 
 pkgname = notmuch-git
 	pkgdesc = Not much of an email program
diff --git a/PKGBUILD b/PKGBUILD
index fa2fdcdc91b8..ef6f2d48170e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,16 +8,15 @@
 pkgbase=notmuch-git
 _pkgname=notmuch
 pkgname=('notmuch-git' 'notmuch-vim-git' 'notmuch-mutt-git' 'notmuch-runtime-git')
-pkgver=0.25_rc1.2.1.gc28ac94a
-pkgrel=1
+pkgver=0.25_rc1.2.0.gd95ccfe9
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://notmuchmail.org/"
 license=('GPL3')
 makedepends=('python2' 'python' 'python-sphinx' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
-source=("git://notmuchmail.org/git/notmuch" not_byte_compile_notmuch_el.patch)
-md5sums=('SKIP'
-         '07fa5cbbf2c7e0d5a19352c652e9c9cf')
+source=("git+https://github.com/notmuch/notmuch")
+md5sums=('SKIP')
 
 pkgver() {
   cd ${_pkgname}
@@ -28,13 +27,10 @@ prepare(){
   cp -dpr --no-preserve=ownership "$srcdir/${_pkgname}"/bindings/python{,2}
   find "$srcdir/${_pkgname}/bindings/python" -name '*.py' -exec sed -i -e '1s,python$,python3,' {} +
   find "$srcdir/${_pkgname}/bindings/python2" -name '*.py' -exec sed -i -e '1s,python$,python2,' {} +
-  cd $_pkgname
-  patch -Np1 < $srcdir/not_byte_compile_notmuch_el.patch||true
 }
 
 build() {
   cd $_pkgname
-
   ./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --without-zsh-completion
   make 
   
@@ -73,7 +69,6 @@ package_notmuch-vim-git(){
   make -C ${_pkgname}/vim DESTDIR="$pkgdir" prefix="/usr/share/vim/vimfiles" install
 }
 
-
 package_notmuch-git(){
     pkgdesc="Not much of an email program"
     depends=('notmuch-runtime')
@@ -91,7 +86,7 @@ package_notmuch-git(){
 
     # Install emacs parts
     make DESTDIR="$pkgdir/" install-emacs
-
+    
     # Install manpages
     make DESTDIR="$pkgdir" prefix="/usr" install-man
 
diff --git a/not_byte_compile_notmuch_el.patch b/not_byte_compile_notmuch_el.patch
deleted file mode 100644
index e2a4f8435cf4..000000000000
--- a/not_byte_compile_notmuch_el.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/emacs/Makefile.local b/emacs/Makefile.local
-index 040e64d4..acd5b078 100644
---- a/emacs/Makefile.local
-+++ b/emacs/Makefile.local
-@@ -5,7 +5,6 @@ emacs_sources := \
- 	$(dir)/notmuch-lib.el \
- 	$(dir)/notmuch-compat.el \
- 	$(dir)/notmuch-parser.el \
--	$(dir)/notmuch.el \
- 	$(dir)/notmuch-query.el \
- 	$(dir)/notmuch-show.el \
- 	$(dir)/notmuch-tree.el \