Switched to a forked source with more up to date fixes, and changed antlr3/ python2-antlr3 dependencies.

2 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8577a440fb29..45e95752dbf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = keyboardlayouteditor-git
 	pkgdesc = PyGTK programme that helps create or edit XKB keyboard layouts.
-	pkgver = 1.1+r84.d20181009.g742101b
-	pkgrel = 3
+	pkgver = 1.1+r100.20190121.56726a3
+	pkgrel = 1
 	epoch = 1
-	url = http://github.com/simos/keyboardlayouteditor
+	url = http://github.com/hupfdule/keyboardlayouteditor
 	arch = any
 	license = GPL3
-	makedepends = antlr3=3.1.2
+	makedepends = antlr3-3.1.2
 	makedepends = git
 	depends = gucharmap
 	depends = pygtk
 	depends = python2
-	depends = python2-antlr3=3.1.2
+	depends = python2-antlr3-3.1.2
 	depends = python2-cairo
 	depends = python2-gobject2
 	depends = python2-lxml
-	provides = keyboardlayouteditor=1.1+r84.d20181009.g742101b
-	source = keyboardlayouteditor::git+git://github.com/simos/keyboardlayouteditor.git
+	provides = keyboardlayouteditor=1.1+r100.20190121.56726a3
+	source = keyboardlayouteditor::git+git://github.com/hupfdule/keyboardlayouteditor.git
 	source = keyboardlayouteditor.sh
 	sha256sums = SKIP
 	sha256sums = 349b12f237a19f76af16082d58bf443892190faa5f741aced92e10f6e79d8761
diff --git a/PKGBUILD b/PKGBUILD
index a57775a86249..79e14916e2d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,13 @@
 
 _pkgname=keyboardlayouteditor
 pkgname="${_pkgname}"-git
-pkgver=1.1+r84.d20181009.g742101b
-pkgrel=3
+pkgver=1.1+r100.20190121.56726a3
+pkgrel=1
 epoch=1
 pkgdesc="PyGTK programme that helps create or edit XKB keyboard layouts."
 arch=('any')
-url="http://github.com/simos/keyboardlayouteditor"
+# url="http://github.com/simos/keyboardlayouteditor" # Original repo.
+url="http://github.com/hupfdule/keyboardlayouteditor" # Fork with some fixes.
 license=('GPL3')
 # To run the application, you need the python UI binding packages. For Ubuntu 14.04, the packages below are already pre-installed.
 # * Cairo
@@ -18,13 +19,15 @@ depends=(
   'gucharmap'
   'pygtk'
   'python2'
-  'python2-antlr3=3.1.2'
+  #'python2-antlr3=3.1.2'
+  'python2-antlr3-3.1.2'
   'python2-cairo'
   'python2-gobject2'
   'python2-lxml'
 )
 makedepends=(
-  'antlr3=3.1.2'
+  #'antlr3=3.1.2'
+  'antlr3-3.1.2'
   'git'
 )
 optdepends=()
@@ -32,7 +35,8 @@ provides=(
   "${_pkgname}=${pkgver}"
 )
 source=(
-  "${_pkgname}::git+git://github.com/simos/${_pkgname}.git"
+  # "${_pkgname}::git+git://github.com/simos/${_pkgname}.git" # Original repo.
+  "${_pkgname}::git+git://github.com/hupfdule/${_pkgname}.git" # Fork with some fixes.
   "keyboardlayouteditor.sh"
 )
 sha256sums=(
@@ -73,7 +77,7 @@ pkgver() {
     return 13
   fi
 
-  echo "${_ver}+r${_rev}.d${_date}.g${_githash}"
+  echo "${_ver}+r${_rev}.${_date}.${_githash}"
 }
 
 prepare() {
@@ -131,7 +135,7 @@ package() {
 
   _cmd install -D -m755 "${srcdir}/keyboardlayouteditor.sh" "${pkgdir}/usr/bin/keyboardlayouteditor"
 
-  for _docfile in 'ChangeLog-git.txt' 'README.md' 'TODO' 'website.url'; do
+  for _docfile in 'ChangeLog-git.txt' 'README.md' 'TODO' 'screenshot.png' 'website.url'; do
     _cmd install -D -m644 "${_docfile}" "${pkgdir}/usr/share/doc/${_pkgname}/${_docfile}"
   done