update, use proper git (my fork), update to sync with master

2 files changed, 23 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 19ab495013ce..afc55211c8e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Aug  6 02:51:46 UTC 2018
 pkgbase = mcomix-gtk3-git
 	pkgdesc = A comic book reader. Ported to GTK3, works well with retina/hidpi
-	pkgver = r1475.3f8f3dc
-	pkgrel = 2
+	pkgver = r1500.16004f9
+	pkgrel = 1
 	url = https://sourceforge.net/projects/mcomix/
 	install = mcomix-gtk3-git.install
 	arch = any
@@ -21,11 +23,10 @@ pkgbase = mcomix-gtk3-git
 	optdepends = unzip: for zip compressed comics
 	optdepends = mupdf: for PDF comics
 	provides = mcomix
-	conflicts = mcomix mcomix-git
-	source = mcomix-gtk3-git::git+http://git.code.sf.net/p/mcomix/git
-	source = https://gist.githubusercontent.com/ilikenwf/f661cb781da598660a88bbaffd4c6f5d/raw/1b47b11b11f1340cf563d251cee92967bd9de275/gtk3.patch
+	conflicts = mcomix
+	conflicts = mcomix-git
+	source = mcomix-gtk3-git::git+https://git.code.sf.net/u/ilikenwf/mcomix#branch=gtk3
 	sha256sums = SKIP
-	sha256sums = 11caa3211c49df1ebcf13e15c79ba3cbed5efcdeacceaa8dce444a4af4961848
 
 pkgname = mcomix-gtk3-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 227bce1173a5..1c942152c978 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Matt Parnell/ilikenwf <parwok@gmail.com>
 
 pkgname=mcomix-gtk3-git
-pkgver=r1475.3f8f3dc
-pkgrel=2
+pkgver=r1500.16004f9
+pkgrel=1
 pkgdesc="A comic book reader. Ported to GTK3, works well with retina/hidpi"
 arch=('any')
 url="https://sourceforge.net/projects/mcomix/"
@@ -16,31 +16,26 @@ optdepends=('libunrar: for rar compressed comics' \
             'unzip: for zip compressed comics' \
             'mupdf: for PDF comics')
 provides=("mcomix")
-conflicts=("mcomix mcomix-git")
-source=("${pkgname}::git+http://git.code.sf.net/p/mcomix/git"
-		"https://gist.githubusercontent.com/ilikenwf/f661cb781da598660a88bbaffd4c6f5d/raw/1b47b11b11f1340cf563d251cee92967bd9de275/gtk3.patch")
-sha256sums=('SKIP'
-            '11caa3211c49df1ebcf13e15c79ba3cbed5efcdeacceaa8dce444a4af4961848')
+conflicts=("mcomix" "mcomix-git")
+source=("${pkgname}::git+https://git.code.sf.net/u/ilikenwf/mcomix#branch=gtk3")
+sha256sums=('SKIP')
 
 install=${pkgname}.install
 
 pkgver() {
-    cd "${pkgname}"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "${pkgname}"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    
-    patch -Np1 -i ../gtk3.patch
-    
- 
-  python2 setup.py install --prefix=/usr --optimize=1 \
-    --single-version-externally-managed --root=${pkgdir}
-  
-  cp -a "${srcdir}/mcomix-gtk3-git/mcomix/images" "${pkgdir}/usr/lib/python2.7/site-packages/mcomix/images"
+	cd "${srcdir}/${pkgname}"
 
-  install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb
-  install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz
-  install -Dm644 mime/comicthumb.thumbnailer ${pkgdir}/usr/share/thumbnailers/comicthumb.thumbnailer
+	python2 setup.py install --prefix=/usr --optimize=1 \
+	--single-version-externally-managed --root=${pkgdir}
+
+	cp -a "${srcdir}/mcomix-gtk3-git/mcomix/images" "${pkgdir}/usr/lib/python2.7/site-packages/mcomix/images"
+
+	install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb
+	install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz
+	install -Dm644 mime/comicthumb.thumbnailer ${pkgdir}/usr/share/thumbnailers/comicthumb.thumbnailer
 }