diff options
author | raininja | 2015-08-22 22:09:45 -0400 |
---|---|---|
committer | raininja | 2015-08-22 22:09:45 -0400 |
commit | b9ec3b0bbdb6415caa3c9febdcbd982dd97dce3e (patch) | |
tree | f760f0c54f1337095dcb40eaedecdca21fab60bc | |
parent | 8143639f3a1e6a4d7b8e14d413f6a297fe1bcfeb (diff) | |
download | aur-b9ec3b0bbdb6415caa3c9febdcbd982dd97dce3e.tar.gz |
moved symlinking into PKGBUILD
-rw-r--r-- | PKGBUILD | 53 | ||||
-rw-r--r-- | slimjet.install | 113 |
2 files changed, 42 insertions, 124 deletions
@@ -1,15 +1,15 @@ -# Maintainer: raininja <raijin@rai.ninja> -# Contributor: eagleeyetom <eagleeyetom@gmail.com> +# Maintainer: eagleeyetom <eagleeyetom@gmail.com> +# Contrubutor: raininja <raijin@rai.ninja> pkgname=slimjet pkgver=4.0.15.0 -pkgrel=2 +pkgrel=7 pkgdesc="Fast, smart and powerful browser based on Blink" arch=('i686' 'x86_64') url="http://www.slimjet.com" license=('custom:slimjet') depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' - 'icu' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils') + 'icu' 'libpng' 'libxss' 'libxtst' 'nss' 'openssl' 'nspr' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' 'ttf-liberation: fix fonts for some PDFs') makedepends=('pacman>=4.2.0') @@ -21,15 +21,42 @@ sha512sums_i686=('b0d7e80ed9340f48bfe71af834602c4aa508386d76fda74d32c824e8e24b8a sha512sums_x86_64=('72d2029c805a8b91c9a7e386291235fb410181eefd14b22176822dc4d7584b7a3f95b743c43669399ce552d0ea73e901c16b045ca7d7c33aa308338d31fc87a9') package() { - msg2 "Extracting the data.tar.lzma..." - bsdtar -xf data.tar.lzma -C "$pkgdir/" - msg2 "Changing permissions. . ." - chmod -R 0755 "$pkgdir/" - - for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do - install -Dm644 "$pkgdir"/opt/slimjet/product_logo_${i/x*}.png \ - "$pkgdir"/usr/share/icons/hicolor/$i/apps/flashpeak-slimjet.png + msg2 "Extracting the data.tar.lzma..." + bsdtar -xf data.tar.lzma -C "$pkgdir/" + + msg2 "Correcting permissions..." + chmod -R 0755 "$pkgdir/" + + _crypto_files="libnspr4.so.0d libplds4.so.0d libplc4.so.0d libssl3.so.1d libnss3.so.1d libsmime3.so.1d libnssutil3.so.1d" + _libdir="/usr/lib" - done + add_crypto_symlinks() { + + for f in $_crypto_files; do + target=$(echo $f | sed 's/.[01]d$//') + if [ -f "/$_libdir/$target" ]; then + ln -snf "/$_libdir/$target" "$pkgdir/opt/slimjet/$f" + else echo "CHECK NSS, OPENSSL, AND NSPR VERSIONS" + exit 1 + fi + done + } + # Arch has libudev.so.1, slimjet wants .0 + _libudev_0=libudev.so.0 + _libudev_1=libudev.so.1 + + add_udev_symlinks() { + ln -snf "/$_libdir/$_libudev_1" "$pkgdir/opt/slimjet/$_libudev_0" + } + + msg2 "Adding udev and crypto symlinks..." + add_udev_symlinks + add_crypto_symlinks + + msg2 "Adding Icons..." + for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do + install -Dm644 "$pkgdir"/opt/slimjet/product_logo_${i/x*}.png \ + "$pkgdir"/usr/share/icons/hicolor/$i/apps/flashpeak-slimjet.png + done } diff --git a/slimjet.install b/slimjet.install index 6dda0219933b..8886b8ceeb55 100644 --- a/slimjet.install +++ b/slimjet.install @@ -1,9 +1,6 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - - ARCH=$(uname -m) - - + # Add icons to the system icons XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null || true`" if [ ! -x "$XDG_ICON_RESOURCE" ]; then @@ -80,63 +77,9 @@ post_install() { # first "<web-browsers>" line we find in gnome-default-applications.xml fgrep -q "FlashPeak Slimjet" "$GNOME_DFL_APPS" || insert_after_first_match "$GNOME_DFL_APPS" "^[ ]*<web-browsers>[ ]*$" "/opt/slimjet/default-app-block" fi - - - get_lib_dir() { - if [ "$ARCH" = "i686" ]; then - LIBDIR=/usr/lib - elif [ "$ARCH" = "x86_64" ]; then - LIBDIR=/usr/lib64 - else - echo Unknown CPU Architecture: "$ARCH" - exit 1 - fi - } - - NSS_FILES="libnspr4.so.0d libplds4.so.0d libplc4.so.0d libssl3.so.1d libnss3.so.1d libsmime3.so.1d libnssutil3.so.1d" - - add_nss_symlinks() { - get_lib_dir - for f in $NSS_FILES - do - target=$(echo $f | sed 's/.[01]d$//') - if [ -f "/$LIBDIR/$target" ]; then - ln -snf "/$LIBDIR/$target" "/opt/slimjet/$f" - elif [ -f "/usr/$LIBDIR/$target" ]; then - ln -snf "/usr/$LIBDIR/$target" "/opt/slimjet/$f" - else - echo $f not found in "/$LIBDIR/$target" or "/usr/$LIBDIR/$target". - exit 1 - fi - done - } - - remove_nss_symlinks() { - for f in $NSS_FILES - do - rm -rf "/opt/slimjet/$f" - done - } - - # Fedora 18 now has libudev.so.1. http://crbug.com/145160 - # Same for Ubuntu 13.04. http://crbug.com/226002 - LIBUDEV_0=libudev.so.0 - LIBUDEV_1=libudev.so.1 - - add_udev_symlinks() { - get_lib_dir - ln -snf "/$LIBDIR/$LIBUDEV_1" "/opt/slimjet/$LIBUDEV_0" - - } - - remove_udev_symlinks() { - rm -rf "/opt/slimjet/$LIBUDEV_0" - } - - remove_udev_symlinks - add_udev_symlinks update-desktop-database -q + echo "You must run Slimjet from a terminal the first time!" } post_upgrade() { @@ -169,57 +112,5 @@ pre_remove() { post_remove() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - - - ARCH=$(uname -m) - - - get_lib_dir() { - if [ "$ARCH" = "i686" ]; then - LIBDIR=/usr/lib - elif [ "$ARCH" = "x86_64" ]; then - LIBDIR=/usr/lib64 - else - echo Unknown CPU Architecture: "$ARCH" - exit 1 - fi - } - - NSS_FILES="libnspr4.so.0d libplds4.so.0d libplc4.so.0d libssl3.so.1d libnss3.so.1d libsmime3.so.1d libnssutil3.so.1d" - - add_nss_symlinks() { - get_lib_dir - for f in $NSS_FILES - do - target=$(echo $f | sed 's/.[01]d$//') - if [ -f "/$LIBDIR/$target" ]; then - ln -snf "/$LIBDIR/$target" "/opt/slimjet/$f" - elif [ -f "/usr/$LIBDIR/$target" ]; then - ln -snf "/usr/$LIBDIR/$target" "/opt/slimjet/$f" - else - echo $f not found in "/$LIBDIR/$target" or "/usr/$LIBDIR/$target". - exit 1 - fi - done - } - - remove_nss_symlinks() { - for f in $NSS_FILES - do - rm -rf "/opt/slimjet/$f" - done - } - - # Fedora 18 now has libudev.so.1. http://crbug.com/145160 - # Same for Ubuntu 13.04. http://crbug.com/226002 - LIBUDEV_0=libudev.so.0 - LIBUDEV_1=libudev.so.1 - - - remove_udev_symlinks() { - rm -rf "/opt/slimjet/$LIBUDEV_0" - } - - remove_udev_symlinks update-desktop-database -q } |