diff options
| -rw-r--r-- | dooble-qt4/PKGBUILD | 54 | ||||
| -rw-r--r-- | dooble/PKGBUILD | 47 |
2 files changed, 70 insertions, 31 deletions
diff --git a/dooble-qt4/PKGBUILD b/dooble-qt4/PKGBUILD index a7c5297..84efac9 100644 --- a/dooble-qt4/PKGBUILD +++ b/dooble-qt4/PKGBUILD @@ -2,10 +2,10 @@ pkgname=dooble-qt4 pkgver=1.46 -pkgrel=1 +pkgrel=2 pkgdesc='A safe WebKit Web browser' url='http://dooble.sourceforge.net/' -arch=('i386' 'x86_64') +arch=('i686' 'x86_64') license=('GPL2') depends=('qtwebkit') makedepends=('qtwebkit') @@ -75,27 +75,43 @@ package() make INSTALL_ROOT="$pkgdir" install msg "Fixing file structure" - mkdir "$pkgdir/opt" - mv "$pkgdir/usr/local/dooble" "$pkgdir/opt/dooble-qt4" - mv "$pkgdir/usr/local/include" "$pkgdir/usr" - rmdir "$pkgdir/usr/local/" || echo "Cannot remove \$pkgdir/usr/local/" + 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/" msg "Editing files for the file structure modification" - sed -i s_'/usr/local/dooble'_'/opt/dooble-qt4'_g "$pkgdir/opt/dooble-qt4/dooble.sh" "$pkgdir/usr/share/applications/dooble.desktop" - sed -i s_'/usr/local/dooble/Lib\x00'_'/opt/dooble-qt4/Lib\x00\x00\x00'_g "$pkgdir/opt/dooble-qt4/Dooble" + 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/Lib\x00'_'/opt/dooble-qt4/Lib\x00\x00\x00'_g \ + "${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" - msg "Renaming \$pkgdir/opt/dooble-qt4/dooble.sh to \$pkgdir/opt/dooble-qt4/dooble" - mv "$pkgdir/opt/dooble-qt4/dooble.sh" "$pkgdir/opt/dooble-qt4/dooble" + msg "Renaming files" + 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" + 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 "Add missing files" - mkdir -p "$pkgdir/opt/dooble-qt4/Lib" - install -m755 "./libSpotOn/libspoton.so" "$pkgdir/opt/dooble-qt4/Lib" - - msg "Renaming and modifying files for compatibility with the qt5 version (dooble) of this package" - mv "$pkgdir/usr/share/applications"/dooble{,-qt4}.desktop - mv "$pkgdir/usr/share/icons/hicolor/48x48"/dooble{,-qt4}.png - sed -i s_'dooble.png'_'dooble-qt4.png'_g "$pkgdir/usr/share/applications/dooble-qt4.desktop" - sed -i s_'^Name\(*\)$'_'Name\1 (Qt 4)'_g "$pkgdir/usr/share/applications/dooble-qt4.desktop" - mv "$pkgdir/usr/include"/dooble{,-qt4} + mkdir -p "$pkgdir/opt/${pkgname}/Lib" + install -m755 "./libSpotOn/libspoton.so" "$pkgdir/opt/${pkgname}/Lib" } diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD index ca04428..e417cee 100644 --- a/dooble/PKGBUILD +++ b/dooble/PKGBUILD @@ -2,10 +2,10 @@ pkgname=dooble pkgver=1.46 -pkgrel=2 +pkgrel=3 pkgdesc='A safe WebKit Web browser' url='http://dooble.sourceforge.net/' -arch=('i386' 'x86_64') +arch=('i686' 'x86_64') license=('GPL2') depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl') makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools') @@ -71,20 +71,43 @@ package() make INSTALL_ROOT="$pkgdir" install msg "Fixing file structure" - mkdir "$pkgdir/opt" - mv "$pkgdir/usr/local/dooble" "$pkgdir/opt" - mv "$pkgdir/usr/local/include" "$pkgdir/usr" - rmdir "$pkgdir/usr/local/" || echo "Cannot remove \$pkgdir/usr/local/" + 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/" msg "Editing files for the file structure modification" - sed -i s_'/usr/local/dooble'_'/opt/dooble'_g "$pkgdir/opt/dooble/dooble.sh" "$pkgdir/usr/share/applications/dooble.desktop" - sed -i s_'/usr/local/dooble/Lib\x00'_'/opt/dooble/Lib\x00\x00\x00\x00\x00\x00\x00'_g "$pkgdir/opt/dooble/Dooble" + 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/Lib\x00'_'/opt/dooble/Lib\x00\x00\x00\x00\x00\x00\x00'_g \ + "${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" - msg "Renaming \$pkgdir/opt/dooble/dooble.sh to \$pkgdir/opt/dooble/dooble" - mv "$pkgdir/opt/dooble/dooble.sh" "$pkgdir/opt/dooble/dooble" + msg "Renaming files" + 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" + 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 "Add missing files" - mkdir -p "$pkgdir/opt/dooble/Lib" - install -m755 "./libSpotOn/libspoton.so" "$pkgdir/opt/dooble/Lib" + mkdir -p "$pkgdir/opt/${pkgname}/Lib" + install -m755 "./libSpotOn/libspoton.so" "$pkgdir/opt/${pkgname}/Lib" } |