network/qwit: Updated for version 0.10

6 files changed, 26 insertions, 28 deletions

diff --git a/network/qwit/README b/network/qwit/README
index 0ebd39b834a88..840d96d69319f 100644
--- a/network/qwit/README
+++ b/network/qwit/README
@@ -1,3 +1 @@
 Qwit - free cross-platform Qt4-based Twitter client.
-
-Requires Qt4.
\ No newline at end of file
diff --git a/network/qwit/doinst.sh b/network/qwit/doinst.sh
index 5fb28930db0b9..4e8ba7071dea7 100644
--- a/network/qwit/doinst.sh
+++ b/network/qwit/doinst.sh
@@ -1,3 +1,4 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
diff --git a/network/qwit/qwit.SlackBuild b/network/qwit/qwit.SlackBuild
index dadc4c3c6702f..95b559936b224 100644
--- a/network/qwit/qwit.SlackBuild
+++ b/network/qwit/qwit.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=qwit
-VERSION=${VERSION:-0.8}
+VERSION=${VERSION:-0.10}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,8 +38,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-qmake-qt4 $PRGNAM.pro
-make
+echo "StartupNotify=false" >> $PRGNAM.desktop
+
+qmake -unix PREFIX=/usr -o Makefile $PRGNAM.pro
+make \
+  CFLAGS="-pipe $SLKCFLAGS -g -Wall -W -D_REENTRANT \$(DEFINES)" \
+  CXXFLAGS="-pipe $SLKCFLAGS -g -Wall -W -D_REENTRANT \$(DEFINES)"
 make install INSTALL_ROOT=$PKG
 
 ( cd $PKG
@@ -49,12 +53,14 @@ make install INSTALL_ROOT=$PKG
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
+mkdir -p $PKG/usr/share/pixmaps
 install -m 0644 images/$PRGNAM.png $PKG/usr/share/pixmaps/
+rm -rf $PKG/usr/share/icons
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING INSTALL README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -62,4 +68,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/qwit/qwit.desktop b/network/qwit/qwit.desktop
deleted file mode 100644
index a210afe6b274d..0000000000000
--- a/network/qwit/qwit.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qwit
-Comment=Qt4 based Twitter Client
-Icon=qwit
-Exec=qwit
-TryExec=qwit
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/network/qwit/qwit.info b/network/qwit/qwit.info
index 674dfd1ad79ee..02d52bb98ba93 100644
--- a/network/qwit/qwit.info
+++ b/network/qwit/qwit.info
@@ -1,8 +1,10 @@
 PRGNAM="qwit"
-VERSION="0.8"
+VERSION="0.10"
 HOMEPAGE="http://code.google.com/p/qwit/"
-DOWNLOAD="http://qwit.googlecode.com/files/qwit-0.8-src.tar.bz2"
-MD5SUM="464414a666404c88d5dddd91127b2ee8"
+DOWNLOAD="http://qwit.googlecode.com/files/qwit-0.10-src.tar.bz2"
+MD5SUM="b94e0819f3aa8747acc1cf57e7b372ab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="pprkut"
\ No newline at end of file
+APPROVED="rworkman"
diff --git a/network/qwit/slack-desc b/network/qwit/slack-desc
index ab92833a84915..7b9b6d4063d12 100644
--- a/network/qwit/slack-desc
+++ b/network/qwit/slack-desc
@@ -11,9 +11,9 @@ qwit:
 qwit: Qwit - free cross-platform Qt4-based Twitter client.
 qwit: 
 qwit: Homepage: http://code.google.com/p/qwit/
-qwit: 
-qwit: 
-qwit: 
-qwit: 
-qwit: 
-qwit: 
+qwit:
+qwit:
+qwit:
+qwit:
+qwit:
+qwit: