adopted

2 files changed, 18 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad2de953adc2..6993d65c3f1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = cutemarked-git
 	pkgdesc = Qt Markdown Editor
-	pkgver = 0.11.2.r97.gdf584c4
+	pkgver = 0.11.3r849
 	pkgrel = 1
 	url = https://github.com/cloose/CuteMarkEd
-	install = cutemarked-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
@@ -17,9 +16,7 @@ pkgbase = cutemarked-git
 	provides = cutemarked
 	conflicts = cutemarked
 	source = git://github.com/cloose/CuteMarkEd.git
-	source = cutemarked-git.install
 	md5sums = SKIP
-	md5sums = 262fc1597fb332894d1367f510a7f39b
 
 pkgname = cutemarked-git
 
diff --git a/PKGBUILD b/PKGBUILD
index a4ddecf9168f..2f09a2c04869 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,41 @@
-# Maintainer: Aetf <aetf at unlimitedcodeworks dot xyz>
+# Contributor: Aetf <aetf at unlimitedcodeworks dot xyz>
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 _gitname=CuteMarkEd
 pkgname=cutemarked-git
-pkgver=0.11.2.r97.gdf584c4
+pkgver=0.11.3r849
 pkgrel=1
 pkgdesc="Qt Markdown Editor"
 url="https://github.com/cloose/CuteMarkEd"
 arch=('i686' 'x86_64')
-license=( "GPL2" )
-depends=( "qt5-webkit" "hunspell" "discount>=2.1.7" "desktop-file-utils" "hicolor-icon-theme")
-makedepends=( 'git' 'qt5-tools' )
+license=('GPL2')
+depends=('qt5-webkit' 'hunspell' "discount>=2.1.7" 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('git' 'qt5-tools')
 provides=('cutemarked')
 conflicts=('cutemarked')
-source=( "git://github.com/cloose/CuteMarkEd.git"
-         "$pkgname.install")
-md5sums=('SKIP'
-         '262fc1597fb332894d1367f510a7f39b')
-install=$pkgname.install
+source=("git://github.com/cloose/CuteMarkEd.git")
+md5sums=('SKIP')
 
 pkgver() {
-  cd $srcdir/$_gitname
-  git describe --tags --long | sed -r "s/^v//;s/([^-]*-g)/r\\1/;s/-/./g"
+  cd $_gitname
+  _mainver=$(grep ProductVersion ${_gitname}.wxs | head -1 | cut -d= -f2 | tr -d \" | tr -d \? | tr \> r)
+  printf "%s%s" $(echo $_mainver) $(git rev-list --count HEAD)
 }
 
 prepare() {
-  cd $srcdir/$_gitname
-  mkdir -p build
+  cd $_gitname
+  sed -i -e '/#include <QTableWidgetItem>/a #include <QAction>' app/optionsdialog.cpp
 }
 
 build() {
-  cd $srcdir/$_gitname/build
-  
+  cd $_gitname
+  [[ -d build ]] || mkdir build
+  cd build
   qmake ..
   make
 }
 
 package() {
-  cd $srcdir/$_gitname/build
+  cd $_gitname/build
   make INSTALL_ROOT="$pkgdir" install
 }