dooble and dooble-qt4 shares files via dooble-common

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

3 files changed, 85 insertions, 58 deletions

diff --git a/dooble-common/PKGBUILD b/dooble-common/PKGBUILD
new file mode 100644
index 0000000..5b297c7
--- /dev/null
+++ b/dooble-common/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
+
+pkgname=dooble-common
+pkgver=1.47
+pkgrel=1
+pkgdesc='Common files for package variants for Dooble'
+url='http://dooble.sourceforge.net/'
+arch=('any')
+license=('custom:3-clause BSD')
+depends=()
+makedepends=()
+source=("http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz")
+sha256sums=('1840074b5648bd3755f7cefa65388e562c8d7159c119240e5c5efe0f7e1316b8')
+
+
+package()
+{
+    cd "$srcdir/dooble.d/trunk/browser/"
+    
+    # TODO: Translations
+    
+    mkdir -p -- "${pkgdir}/usr/share/dooble"
+    mv Icons Images Plugins Tab -- "${pkgdir}/usr/share/dooble"
+    
+    mkdir -p -- "${pkgdir}/usr/lib/dooble"
+    mv plugin-spec -- "${pkgdir}/usr/lib/dooble"
+    
+    for s in 16x16 48x48 64x64; do
+	mkdir -p -- "${pkgdir}/usr/share/icons/hicolor/${s}"
+	ln -s "../../../dooble/Icons/${s}/dooble.png" -- "${pkgdir}/usr/share/icons/hicolor/${s}/dooble.png"
+    done
+}
+
diff --git a/dooble-qt4/PKGBUILD b/dooble-qt4/PKGBUILD
index f634158..6062ad8 100644
--- a/dooble-qt4/PKGBUILD
+++ b/dooble-qt4/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=dooble-qt4
 pkgver=1.47
-pkgrel=3
+pkgrel=4
 pkgdesc='A safe WebKit Web browser'
 url='http://dooble.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('custom:3-clause BSD')
-depends=('qtwebkit' 'libspoton=0.09.04')
-makedepends=('qtwebkit')
+depends=('qtwebkit' 'libspoton=0.09.04' "dooble-common=${pkgver}")
+makedepends=('qtwebkit' 'sed' 'coreutils')
 source=("http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz")
 sha256sums=('1840074b5648bd3755f7cefa65388e562c8d7159c119240e5c5efe0f7e1316b8')
 options=('!emptydirs')
@@ -75,41 +75,38 @@ package()
     make INSTALL_ROOT="$pkgdir" install
     
     msg "Fixing file structure"
-    mkdir "${pkgdir}/opt"
-    mv "${pkgdir}/usr/local/dooble" "${pkgdir}/opt/${pkgname}"
-    mv "${pkgdir}/usr/local/include" "${pkgdir}/opt/${pkgname}"
-    mv "${pkgdir}/usr/share/"* "${pkgdir}/opt/${pkgname}"
-    rmdir "${pkgdir}/usr/local/"
-    rmdir "${pkgdir}/usr/share/"
-    rmdir "${pkgdir}/usr/"
+    mkdir -- "${pkgdir}/opt"
+    mv -- "${pkgdir}/usr/local/dooble" "${pkgdir}/opt/${pkgname}"
+    mv -- "${pkgdir}/usr/share/"* "${pkgdir}/opt/${pkgname}"
     
     msg "Editing files for the file structure modification"
-    sed -i s_"/usr/local/dooble"_"/opt/${pkgname}"_g   \
-	"${pkgdir}/opt/${pkgname}/dooble.sh"           \
-	"${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+    sed -i s_"/usr/local/dooble"_"/opt/${pkgname}"_g  \
+	-- "${pkgdir}/opt/${pkgname}/dooble.sh"       \
+	   "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
     sed -i /LD_LIBRARY_PATH/d \
-	"${pkgdir}/opt/${pkgname}/dooble.sh"
+	-- "${pkgdir}/opt/${pkgname}/dooble.sh"
     sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g \
-	"${pkgdir}/opt/${pkgname}/Dooble" # The replacements's length must match the pattern's length
+	-- "${pkgdir}/opt/${pkgname}/Dooble" # The replacements's length must match the pattern's length
     sed -i s_'\.sh$'__g \
-	"${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+	-- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
     
     msg "Renaming files"
-    mv "${pkgdir}/opt/${pkgname}/dooble.sh" \
-       "${pkgdir}/opt/${pkgname}/dooble"
+    mv -- "${pkgdir}/opt/${pkgname}/dooble.sh" \
+          "${pkgdir}/opt/${pkgname}/dooble"
     if [ ! "${pkgname}" = "dooble" ]; then
-        mv "${pkgdir}/opt/${pkgname}/applications/dooble.desktop" \
-           "${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
-	mv "${pkgdir}/opt/${pkgname}/icons/hicolor/48x48/dooble.png" \
-	   "${pkgdir}/opt/${pkgname}/icons/hicolor/48x48/${pkgname}.png"
+        mv -- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop" \
+              "${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
     fi
     
-    msg "Editing files for the renaming of files"
-    sed -i s_"/usr/share/"_"/opt/${pkgname}/"_g \
-	"${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
-    if [ ! "${pkgname}" = "dooble" ]; then
-	sed -i s_"dooble.png"_"${pkgname}.png"_g \
-	    "${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
-    fi
+    msg "Remove files an replace with those provided by dooble-common"
+    for d in Icons Images Plugins Tab; do
+	rm -rf -- "${pkgdir}/opt/${pkgname}/${d}"
+	ln -sf "../../usr/share/dooble/${d}" -- "${pkgdir}/opt/${pkgname}/${d}"
+    done
+    rm -r -- "${pkgdir}/opt/${pkgname}/icons"
+    rm -r -- "${pkgdir}/usr/local/include"
+    rmdir -- "${pkgdir}/usr/local/"
+    rmdir -- "${pkgdir}/usr/share/"
+    rmdir -- "${pkgdir}/usr/"
 }
 
diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD
index 61b898f..ea35801 100644
--- a/dooble/PKGBUILD
+++ b/dooble/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=dooble
 pkgver=1.47
-pkgrel=3
+pkgrel=4
 pkgdesc='A safe WebKit Web browser'
 url='http://dooble.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('custom:3-clause BSD')
-depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'libspoton=0.09.04-1')
-makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools')
+depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'libspoton=0.09.04-1' "dooble-common=${pkgver}")
+makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools' 'sed' 'coreutils')
 source=("http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz")
 sha256sums=('1840074b5648bd3755f7cefa65388e562c8d7159c119240e5c5efe0f7e1316b8')
 options=('!emptydirs')
@@ -71,41 +71,38 @@ package()
     make INSTALL_ROOT="$pkgdir" install
     
     msg "Fixing file structure"
-    mkdir "${pkgdir}/opt"
-    mv "${pkgdir}/usr/local/dooble" "${pkgdir}/opt/${pkgname}"
-    mv "${pkgdir}/usr/local/include" "${pkgdir}/opt/${pkgname}"
-    mv "${pkgdir}/usr/share/"* "${pkgdir}/opt/${pkgname}"
-    rmdir "${pkgdir}/usr/local/"
-    rmdir "${pkgdir}/usr/share/"
-    rmdir "${pkgdir}/usr/"
+    mkdir -- "${pkgdir}/opt"
+    mv -- "${pkgdir}/usr/local/dooble" "${pkgdir}/opt/${pkgname}"
+    mv -- "${pkgdir}/usr/share/"* "${pkgdir}/opt/${pkgname}"
     
     msg "Editing files for the file structure modification"
-    sed -i s_"/usr/local/dooble"_"/opt/${pkgname}"_g   \
-	"${pkgdir}/opt/${pkgname}/dooble.sh"           \
-	"${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+    sed -i s_"/usr/local/dooble"_"/opt/${pkgname}"_g  \
+	-- "${pkgdir}/opt/${pkgname}/dooble.sh"       \
+	   "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
     sed -i /LD_LIBRARY_PATH/d \
-        "${pkgdir}/opt/${pkgname}/dooble.sh"
+        -- "${pkgdir}/opt/${pkgname}/dooble.sh"
     sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g \
-	"${pkgdir}/opt/${pkgname}/Dooble" # The replacements's length must match the pattern's length
+	-- "${pkgdir}/opt/${pkgname}/Dooble" # The replacements's length must match the pattern's length
     sed -i s_'\.sh$'__g \
-	"${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+	-- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
     
     msg "Renaming files"
-    mv "${pkgdir}/opt/${pkgname}/dooble.sh" \
-       "${pkgdir}/opt/${pkgname}/dooble"
+    mv -- "${pkgdir}/opt/${pkgname}/dooble.sh" \
+          "${pkgdir}/opt/${pkgname}/dooble"
     if [ ! "${pkgname}" = "dooble" ]; then
-        mv "${pkgdir}/opt/${pkgname}/applications/dooble.desktop" \
-           "${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
-	mv "${pkgdir}/opt/${pkgname}/icons/hicolor/48x48/dooble.png" \
-	   "${pkgdir}/opt/${pkgname}/icons/hicolor/48x48/${pkgname}.png"
+        mv -- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop" \
+            " ${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
     fi
     
-    msg "Editing files for the renaming of files"
-    sed -i s_"/usr/share/"_"/opt/${pkgname}/"_g \
-	"${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
-    if [ ! "${pkgname}" = "dooble" ]; then
-	sed -i s_"dooble.png"_"${pkgname}.png"_g \
-	    "${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop"
-    fi
+    msg "Remove files an replace with those provided by dooble-common"
+    for d in Icons Images Plugins Tab; do
+	rm -rf -- "${pkgdir}/opt/${pkgname}/${d}"
+	ln -sf "../../usr/share/dooble/${d}" -- "${pkgdir}/opt/${pkgname}/${d}"
+    done
+    rm -r -- "${pkgdir}/opt/${pkgname}/icons"
+    rm -r -- "${pkgdir}/usr/local/include"
+    rmdir -- "${pkgdir}/usr/local/"
+    rmdir -- "${pkgdir}/usr/share/"
+    rmdir -- "${pkgdir}/usr/"
 }