diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-05-03 23:04:31 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-05-03 23:04:31 +0200 |
commit | 494cb1505e7d9f4b6c37378afa578cfce96a3196 (patch) | |
tree | fdd5f3f8801b3787bddb78367921f6d9fcc5302f /dooble | |
parent | separation of spot-on and libspoton (diff) | |
download | aur-packages-494cb1505e7d9f4b6c37378afa578cfce96a3196.tar.gz aur-packages-494cb1505e7d9f4b6c37378afa578cfce96a3196.tar.bz2 aur-packages-494cb1505e7d9f4b6c37378afa578cfce96a3196.tar.xz |
dooble packages use libspoton now instead of shipping their own
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r-- | dooble-qt4/PKGBUILD | 12 | ||||
-rw-r--r-- | dooble/PKGBUILD | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/dooble-qt4/PKGBUILD b/dooble-qt4/PKGBUILD index f71b7d1..f634158 100644 --- a/dooble-qt4/PKGBUILD +++ b/dooble-qt4/PKGBUILD @@ -2,12 +2,12 @@ pkgname=dooble-qt4 pkgver=1.47 -pkgrel=2 +pkgrel=3 pkgdesc='A safe WebKit Web browser' url='http://dooble.sourceforge.net/' arch=('i686' 'x86_64') license=('custom:3-clause BSD') -depends=('qtwebkit') +depends=('qtwebkit' 'libspoton=0.09.04') makedepends=('qtwebkit') source=("http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz") sha256sums=('1840074b5648bd3755f7cefa65388e562c8d7159c119240e5c5efe0f7e1316b8') @@ -87,7 +87,9 @@ package() 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 \ + sed -i /LD_LIBRARY_PATH/d \ + "${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 sed -i s_'\.sh$'__g \ "${pkgdir}/opt/${pkgname}/applications/dooble.desktop" @@ -109,9 +111,5 @@ package() sed -i s_"dooble.png"_"${pkgname}.png"_g \ "${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop" fi - - msg "Add missing files" - mkdir -p "$pkgdir/opt/${pkgname}/Lib" - install -m755 "./libSpotOn/libspoton.so" "$pkgdir/opt/${pkgname}/Lib" } diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD index f211bfc..61b898f 100644 --- a/dooble/PKGBUILD +++ b/dooble/PKGBUILD @@ -2,12 +2,12 @@ pkgname=dooble pkgver=1.47 -pkgrel=2 +pkgrel=3 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') +depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'libspoton=0.09.04-1') makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools') source=("http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz") sha256sums=('1840074b5648bd3755f7cefa65388e562c8d7159c119240e5c5efe0f7e1316b8') @@ -83,7 +83,9 @@ package() 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 \ + sed -i /LD_LIBRARY_PATH/d \ + "${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 sed -i s_'\.sh$'__g \ "${pkgdir}/opt/${pkgname}/applications/dooble.desktop" @@ -105,9 +107,5 @@ package() sed -i s_"dooble.png"_"${pkgname}.png"_g \ "${pkgdir}/opt/${pkgname}/applications/${pkgname}.desktop" fi - - msg "Add missing files" - mkdir -p "$pkgdir/opt/${pkgname}/Lib" - install -m755 "./libSpotOn/libspoton.so" "$pkgdir/opt/${pkgname}/Lib" } |