Fix:

1. move compilation out of prepare()
2. initialize git submodule in prepare()
2. requires openssl-1.0 to build
4. concatenate sed calls in pkgver()
5. extract git fragment in source array

2 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1d3793c6167..29c5cd2e79f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = libqtelegram-ae
 	makedepends = git
 	depends = qt5-base
 	depends = qt5-multimedia
+	depends = openssl-1.0
 	source = libqtelegram-ae::git+https://github.com/Aseman-Land/libqtelegram-aseman-edition.git#commit=c8a34b0
 	source = libqtelegram-code-generator::git+https://github.com/Aseman-Land/libqtelegram-code-generator.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3518cae015e4..4b55f5c49ccf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Original uploader in CCR: FranzMari
 # Original uploader in AUR: Ḷḷumex03
 
+_fragment="#commit=c8a34b0"
 pkgname=libqtelegram-ae
-_pkgname=libqtelegram-aseman-edition
 epoch=3
 pkgver=10.0.0+72+gc8a34b0
 pkgrel=1
@@ -14,34 +14,38 @@ pkgdesc="Telegram library written in Qt based on telegram-cli code"
 arch=('x86_64')
 license=('GPL3')
 url="https://launchpad.net/libqtelegram"
-depends=('qt5-base' 'qt5-multimedia')
+depends=('qt5-base' 'qt5-multimedia' 'openssl-1.0')
 makedepends=('cmake' 'git')
-source=("$pkgname"::"git+https://github.com/Aseman-Land/libqtelegram-aseman-edition.git#commit=c8a34b0"
-        libqtelegram-code-generator::git+https://github.com/Aseman-Land/libqtelegram-code-generator.git)
+source=("$pkgname::git+https://github.com/Aseman-Land/libqtelegram-aseman-edition.git$_fragment"
+        "libqtelegram-code-generator::git+https://github.com/Aseman-Land/libqtelegram-code-generator.git")
 sha256sums=('SKIP'
             'SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe --long | sed 's/\([^-]*-g\)/\1/;s/-/+/g' | sed 's/.stable//g' | sed 's/v//g'
+  git describe --long | sed 's/\([^-]*-g\)/\1/;s/-/+/g;s/.stable//g;s/v//g'
 }
 
 prepare() {
   cd $pkgname
+  git config submodule.libqtelegram-code-generator.url "${srcdir}"/libqtelegram-code-generator
+  git submodule update --init --recursive --remote
+}
+
+build() {
+  cd $pkgname
+  set -x
   mkdir -p build{,.init}
-  mv ../libqtelegram-code-generator .
   cd build.init
   qmake-qt5 -r ../libqtelegram-code-generator
   make
-  ./libqtelegram-generator 68 ../scheme/scheme-68.tl ..
+  ./libqtelegram-generator 68 "$srcdir"/$pkgname/scheme/scheme-68.tl ..
   cd ../telegram
-  chmod 644 */*.cpp
-  chmod 644 */*.h
-}
-
-build() {
-  cd $pkgname/build
-  qmake-qt5 -r PREFIX=/usr INSTALL_LIBS_PREFIX=/usr/lib INSTALL_HEADERS_PREFIX=/usr/include QMAKE_CFLAGS_ISYSTEM= CONFIG+=typeobjects ..
+  chmod 644 -- */*.cpp
+  chmod 644 -- */*.h
+  cd ../build
+  export CXXFLAGS+=" -Wno-narrowing"
+  qmake-qt5 -r OPENSSL_INCLUDE_PATH=/usr/include/openssl-1.0 PREFIX=/usr INSTALL_LIBS_PREFIX=/usr/lib INSTALL_HEADERS_PREFIX=/usr/include QMAKE_CFLAGS_ISYSTEM= CONFIG+=typeobjects ..
   make
 }