update dooble

Signed-off-by: Mattias Andrée <maandree@operamail.com>

1 files changed, 54 insertions, 9 deletions

diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD
index 0aef5ad..bdcd38d 100644
--- a/dooble/PKGBUILD
+++ b/dooble/PKGBUILD
@@ -1,26 +1,67 @@
 # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
+
 pkgname=dooble
-pkgver=1.45
+pkgver=1.46
 pkgrel=1
 pkgdesc='A safe WebKit Web browser'
 url='http://dooble.sourceforge.net/'
 arch=('i386' 'x86_64')
 license=('GPL2')
-depends=('bzip2' 'fontconfig' 'gstreamer0.10-base' 'libgcrypt' 'libjpeg'
-         'libsm' 'libxrender' 'mesa-libgl' 'openssl' 'qtwebkit' 'udev' 'xz')
-# Transversally included dependencies:  glibc expat freetype2 pcre libffi glib2 libxml2 orc gstreamer0.10 zlib util-linux-ng
-#                                       libice libxcb libx11 libxfixes libxext libxdamage libdrm mesa libpng sqlite gcc-libs
-#                                       libxau libxdmcp libxxf86vm qt4 libgpg-error
+depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl')
+makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools')
 source=("http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz")
-sha256sums=(07dba4fe4098505c9b8b7e70b1b40cf629999c91e72ee9b38d69004f9885e3bf)
+sha256sums=(50ab11855091bc00a7d41e3b17ef49354ef729e1cd21694c958100398ba6e410)
 options=('!emptydirs')
 
+# Dependency (from ldd output) tree:
+# libpng
+# qt5-base
+#   icu
+#     gcc-libs
+#   libjpeg-turbo
+#   sqlite
+#   mesa-libgl
+#     mesa
+#       libdrm
+#       libxdamage
+#       libxxf86vm
+#   libxrender
+# qt5-webkit
+#   libxcomposite
+#     libxfixes
+#       libx11
+#         libxcb
+#           libxdmcp & libxau
+#             glibc
+#       libxext
+#   libxslt
+#     libgcrypt
+#       libgpg-error
+#     libxml2
+#       xz
+#       zlib
+#   qt5-sensors & qt5-location
+#     qt5-declarative
+#   gstreamer0.10-base
+#     gstreamer0.10
+#       glib2
+#         libffi
+#         pcre
+#     orc
+# openssl
+
+
 
 build()
 {
     cd "$srcdir/dooble.d/trunk/browser/"
-    sed -i 's_-Werror__g' dooble.pro
-    qmake-qt4 -o Makefile dooble.pro
+    sed -i 's_-Werror__g' dooble.qt5.pro
+    qmake-qt5 -o Makefile dooble.qt5.pro
+    make distclean
+    qmake-qt5 -o Makefile dooble.qt5.pro
+    sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtWidgets:' Makefile
+    sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtWebKitWidgets:' Makefile
+    sed -i '/#include/s:QtGui/\([^>]*\)QAction:\1:' Include/*.h
     make
 }
 
@@ -41,5 +82,9 @@ package()
     
     msg "Renaming \$pkgdir/opt/dooble/dooble.sh to \$pkgdir/opt/dooble/dooble"
     mv "$pkgdir/opt/dooble/dooble.sh" "$pkgdir/opt/dooble/dooble"
+    
+    msg "Add missing files"
+    mkdir -p "$pkgdir/opt/dooble/Lib"
+    install -m755 "./libSpotOn/libspoton.so" "$pkgdir/opt/dooble/Lib"
 }