Merge branch 'master' of gitorious.org:chakra-packages/apps

octopi/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgbase=octopi
 pkgname=('octopi' 'octopi-notifier' 'octopi-qt5' 'octopi-notifier-qt5')
-pkgver=0.5
+pkgver=0.5.0.90
 pkgrel=1
 url="https://octopiproject.wordpress.com/"
 arch=('x86_64')
@@ -15,7 +15,7 @@ replaces=('oktopi')
 categories=('system') 
 screenshot=('http://octopiproject.files.wordpress.com/2014/01/octopi_in_kaos.png')
 
-gitsha=0cd9398
+gitsha=9a2bc23
 source=("$pkgname"::"git://github.com/aarnt/${pkgname}.git#commit=${gitsha}")
 md5sums=('SKIP')
 
@@ -27,6 +27,9 @@ prepare(){
     sed -i 's/\/\/#define NO_GTK_STYLE/#define NO_GTK_STYLE/g' src/main.cpp notifier/octopi-notifier/main.cpp
     sed -i 's/Icon=octopi/Icon=octopi-notifier/g' octopi-notifier.desktop
 
+    # enable the kstatus switch
+    sed -e "s/# DEFINES += KSTATUS/ DEFINES += KSTATUS/" -i notifier/octopi-notifier/octopi-notifier.pro
+
     # prepare for package split
     cp -r "${srcdir}/${pkgbase}" "${srcdir}/${pkgbase}-qt5"
 }

sigil/PKGBUILD

@@ -3,23 +3,24 @@
 
 pkgname=sigil
 _pkgname=Sigil
-pkgver=0.7.4
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="A multi-platform WYSIWYG ebook editor. It is designed to edit books in ePub format. "
 arch=('x86_64')
 url="http://code.google.com/p/sigil/"
 license=('GPL3')
-depends=('qt5-base' 'qt5-webkit' 'boost-libs')
-makedepends=('cmake' 'gendesk' 'boost' 'qt5-tools' 'qt5-svg')
+depends=('qt5-webkit' 'boost-libs')
+makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost')
 categories=('office')
 install=sigil.install
 screenshot=('http://1.bp.blogspot.com/-K2Q-tdVbPRI/UI08v7LhzHI/AAAAAAAAABY/vZ5LHjM6nb4/s1600/Screen+Shot+2012-10-28+at+10.07.03+AM.png')
-source=("http://$pkgname.googlecode.com/files/$_pkgname-$pkgver-Code.zip")
-sha1sums=('12f1557511b197374e07f4f6a9ed07ae6d23dd67')
+source=("https://github.com/user-none/Sigil/releases/download/${pkgver}/${_pkgname}-${pkgver}-Code.zip")
+sha1sums=('dfb2812fd5cceed427110ca76146822304437a52')
 
 
 build() {
-  gendesk -n
+  cd "${srcdir}/Sigil-${pkgver}"
+  gendesk -n "$startdir"/PKGBUILD
 
   mkdir -p build 
   cd build
@@ -34,12 +35,12 @@ build() {
 }
 
 package() {
-  cd build
-  make install DESTDIR=$pkgdir
+  cd "${srcdir}/Sigil-${pkgver}/build"
+  make DESTDIR=$pkgdir install
   install -d -m 0755 "${pkgdir}"/usr/share/applications
 
   # Desktop integration.
-  install -Dm0644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+  install -Dm0644 $srcdir/${_pkgname}-${pkgver}/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
   for _pic in 16 32 48 128 256; do
     install -Dm0644 ../src/Sigil/Resource_Files/icon/app_icon_$_pic.png \
       $pkgdir/usr/share/icons/hicolor/$_picx$_pic/apps/$pkgname.png