New version

2 files changed, 23 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5995e005b9f5..562812471d8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,9 +7,7 @@ pkgbase = octopi-dev
 	arch = x86_64
 	license = GPL2
 	makedepends = qt5-declarative
-	makedepends = alpm_octopi_utils
 	makedepends = clang
-	makedepends = qtermwidget
 	makedepends = qt5-tools
 	depends = qt5-base
 	depends = qt5-declarative
diff --git a/PKGBUILD b/PKGBUILD
index 7134beea7dea..f73d0827d45a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,11 @@ pkgname=('octopi-dev')
 pkgver=0.9.0
 pkgrel=2
 pkgdesc="A powerful Pacman frontend using Qt5 libs"
-pkggit=octopi
-_gitcommit=31060ae2b2f7c496c95b2262b8219c39b65e45be
-_gitsha256='2eac6062b3589700b0d0e37c601f5bff4ad49dc59847be5950777d7e5a09685c'
 arch=('i686' 'x86_64')
 url="http://octopiproject.wordpress.com"
 license=('GPL2')
 depends=('qt5-base' 'qt5-declarative' 'pacman' 'alpm_octopi_utils>=1.0.1-1' 'qtermwidget')
-makedepends=('qt5-declarative' 'alpm_octopi_utils' 'clang' 'qtermwidget' 'qt5-tools')
+makedepends=('qt5-declarative' 'clang' 'qt5-tools')
 optdepends=('octopi-notifier-qt5: Notifier for Octopi using Qt5 libs'
             'octopi-notifier-frameworks: Notifier for Octopi with Knotifications support'
             'gist: for SysInfo report'
@@ -24,62 +21,61 @@ optdepends=('octopi-notifier-qt5: Notifier for Octopi using Qt5 libs'
 provides=('octopi' 'octopi-repoeditor' 'octopi-cachecleaner')
 conflicts=('octopi-git' 'octopi-kde-git' 'octopi-notifier-noknotify')
 
+_pkggit=octopi
+_gitcommit=31060ae2b2f7c496c95b2262b8219c39b65e45be
+
 source=("octopi-${pkgver}-${pkgrel}.tar.gz::https://github.com/aarnt/octopi/archive/${_gitcommit}.tar.gz")
-sha256sums=(${_gitsha256})
+sha256sums=('2eac6062b3589700b0d0e37c601f5bff4ad49dc59847be5950777d7e5a09685c')
 
 prepare() {
-  cd "${srcdir}/${pkggit}-${_gitcommit}"
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
   
-  # set version if beta
+  # set version for beta
   sed -i -e "s|0.10.0 (dev)|${pkgver}-${pkgrel} (git-${_gitcommit:0:6})|g" src/strconstants.cpp
 }
 
 build() {
-  cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
-  cpucount=$((${cpucount:-1}))
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
 
-  cd "${srcdir}/${pkggit}-${_gitcommit}"
-
-  msg "Starting build..."
+  echo "Starting build..."
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.pro -spec linux-clang
-  make -j $cpucount
+  make
 
   cd helper
-  msg "Building octopi-helper..."
+  echo "Building octopi-helper..."
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-helper.pro -spec linux-clang
-  make -j $cpucount
+  make
 
   cd ../repoeditor
-  msg "Building octopi-repoeditor..."
+  echo "Building octopi-repoeditor..."
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-repoeditor.pro -spec linux-clang
-  make -j $cpucount
+  make
 
   cd ../cachecleaner
-  msg "Building octopi-cachecleaner..."
+  echo "Building octopi-cachecleaner..."
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-cachecleaner.pro -spec linux-clang
-  make -j $cpucount
+  make
 
   cd ../sudo
-  msg "Building octopi-sudo..."
+  echo "Building octopi-sudo..."
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-sudo.pro -spec linux-clang
-  make -j $cpucount
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkggit}-${_gitcommit}"
-
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
+  
   make INSTALL_ROOT="${pkgdir}" install
-
+  
   cd helper
   make INSTALL_ROOT="${pkgdir}" install
   
   cd ../repoeditor
   make INSTALL_ROOT="${pkgdir}" install
-
+  
   cd ../cachecleaner
   make INSTALL_ROOT="${pkgdir}" install
-
+  
   cd ../sudo
   make INSTALL_ROOT="${pkgdir}" install
 }
-