From c5821a3589a17ec276620639c46b768d97873876 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sat, 11 Mar 2017 10:02:58 -0500 Subject: update retroshare --- pcr/retroshare/PKGBUILD | 192 ++++++++------------------------------ pcr/retroshare/retroshare.desktop | 11 --- pcr/retroshare/retroshare.install | 15 --- 3 files changed, 41 insertions(+), 177 deletions(-) delete mode 100644 pcr/retroshare/retroshare.desktop delete mode 100644 pcr/retroshare/retroshare.install (limited to 'pcr/retroshare') diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD index 3954f1d96..4f8a0b3ad 100644 --- a/pcr/retroshare/PKGBUILD +++ b/pcr/retroshare/PKGBUILD @@ -4,173 +4,63 @@ # Contributor: Tristero # Contributor: funkyou -# Set this to true to build and install retroshare-nogui -_build_nogui=true - -# Set this to true to build and install the plugins +# Set this to 'true' to build and install the plugins _build_feedreader=true _build_voip=true -### Nothing to be changed below this line ### +# set this to 'true' to use clang for compiling (experimental) +_clang= pkgname=retroshare -pkgver=0.6.0.RC2 -pkgrel=3 +pkgver=0.6.1 +pkgrel=1 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail." arch=('i686' 'x86_64' 'armv6h' 'armv7h') url="http://retroshare.sourceforge.net/" license=('GPL' 'LGPL') - -depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss' 'libmicrohttpd' 'sqlcipher') -provides=('retroshare') -conflicts=('retroshare') - -install="${pkgname}.install" - -source=(#http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/retroshare_0.6.0.RC2~8551.tar.gz \ - http://downloads.sourceforge.net/project/retroshare/RetroShare/0.6.0-rc2/retroshare_0.6.0.RC2~8551_src.tgz \ - ${pkgname}.install \ - ${pkgname}.desktop) - -sha512sums=('6cfd714f6e72d43559909a72d448b90068414be26da73928ff7bfaaf5be5f7c47f5e7932f1ff2ab4d8a7c277ea4407ab3bd539a1ad4a2a7810dc79b32b1348b1' - '9f976e0fad553abeeff2d58f12f72c6bfdbb36ee85fc9f8c150c2c232ea4e2d6a5d565e6ce8235f5b131371748e3c11f28270c59a52f8a9c5156f27cbc68e78a' - '703190641cb004116ef84de0e8ef4e7c5563236509cb318b8658edd9d3d6434c13650268d8a29169e1f7989ce81db821f183b900fd7fdf89f7d4a31b5945bc40') +#qt 5 +depends=('qt5-multimedia' 'qt5-x11extras' 'libupnp' 'libgnome-keyring' 'libxss' 'libmicrohttpd' 'sqlcipher') +makedepends=('git' 'qt5-tools') +optdepends=('tor: tor hidden node support' + 'i2p: i2p hidden node support') +source=("https://github.com/RetroShare/RetroShare/archive/v${pkgver}.tar.gz") +sha256sums=('4ffbb6c61538f80d0f667c2a155c5eac38b0722a3e8d4f1dc1487d10087cfe42') # Add missing dependencies if needed -[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex' 'opencv') -[[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt') +[[ "$_build_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv') +[[ "$_build_feedreader" == 'true' ]] && depends=(${depends[@]} 'curl' 'libxslt') +[[ "$_clang" == 'true' ]] && makedepends=(${makedepends[@]} 'clang') -_rssrcdir="retroshare06-0.6.0/src" +# Set options for qmake +_options='' +[[ "$_clang" == 'true' ]] && _options='-spec linux-clang CONFIG+=c++11' build() { - local _srcdir="${srcdir}/$_rssrcdir" - local _qmake='qmake-qt4' - - msg "Compiling OpenPGP-SDK..." - cd "${_srcdir}/openpgpsdk/src" - $_qmake - make - - msg "Compiling libbitdht..." - cd "${_srcdir}/libbitdht/src" - $_qmake - make - - msg "Compiling pegmarkdown..." - cd "${_srcdir}/supportlibs/pegmarkdown" - $_qmake - make - - - msg "Compiling libretroshare..." - cd "${_srcdir}/libretroshare/src" - $_qmake - make - - msg "Compiling libresapi..." - cd "${_srcdir}/libresapi/src" - $_qmake - make - - # i'm not 100% sure if this step is required - # it will download/update some JavaScript files - msg "Updating webui files..." - cd "${_srcdir}/libresapi/src/webui/" + cd "${srcdir}/RetroShare-${pkgver}" + + # remove unwanted plugins + [[ "$_build_voip" != 'true' ]] && sed -i '/VOIP \\/d' plugins/plugins.pro + [[ "$_build_feedreader" != 'true' ]] && sed -i '/FeedReader/d' plugins/plugins.pro + + # call version scripts + cd libretroshare/src + LANG=C ./version_detail.sh + cd ../.. + + cd retroshare-gui/src + LANG=C ./version_detail.sh + cd ../.. + + qmake CONFIG-=debug CONFIG+=release \ + ${_options} \ + QMAKE_CFLAGS_RELEASE="${CFLAGS}"\ + QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"\ + RetroShare.pro make - - msg "Compiling retroshare-gui..." - cd "${_srcdir}/retroshare-gui/src" - $_qmake - make - - if [[ "$_build_voip" == "true" ]] ; then - msg "Compiling VOIP plugin..." - cd "${_srcdir}/plugins/VOIP" - $_qmake - make - fi - - if [[ "$_build_feedreader" == "true" ]] ; then - msg "Compiling FeedReader plugin..." - cd "${_srcdir}/plugins/FeedReader" - $_qmake - make - fi - - if [[ "$_build_linkscloud" == "true" ]] ; then - msg "Compiling LinksCloud plugin..." - cd "${_srcdir}/plugins/LinksCloud" - $_qmake - make - fi - - if [[ $_build_nogui == "true" ]] ; then - msg "Compiling retroshare-nogui..." - cd "${_srcdir}/retroshare-nogui/src" - $_qmake - make - fi } package() { - local _srcdir="${srcdir}/$_rssrcdir" - - # --- Install Files --- - - msg "Installing files to fakeroot-environment..." - - install -D -m 755 \ - "${_srcdir}/retroshare-gui/src/RetroShare" \ - "${pkgdir}/usr/bin/${pkgname}" + cd "${srcdir}/RetroShare-${pkgver}" - if [[ "$_build_nogui" == "true" ]] ; then - install -D -m 755 \ - "${_srcdir}/retroshare-nogui/src/retroshare-nogui" \ - "${pkgdir}/usr/bin/${pkgname}-nogui" - fi - - # Webui files ( the path is currently hardcoded for the gui ) - install -d -m 655 "${pkgdir}/usr/share/RetroShare06/webui/" - for _file in $(ls "${_srcdir}/libresapi/src/webfiles/"); do - install -D -m 644 \ - "${_srcdir}/libresapi/src/webfiles/${_file}" \ - "${pkgdir}/usr/share/RetroShare06/webui/" - done - - - # Plugins - if [[ "$_build_linkscloud" == "true" ]] ; then - install -D -m 755 \ - "${_srcdir}/plugins/LinksCloud/libLinksCloud.so" \ - "${pkgdir}/usr/lib/retroshare/extensions/libLinksCloud.so" - fi - if [[ "$_build_voip" == "true" ]] ; then - install -D -m 755 \ - "${_srcdir}/plugins/VOIP/libVOIP.so" \ - "${pkgdir}/usr/lib/retroshare/extensions/libVOIP.so" - fi - if [[ "$_build_feedreader" == "true" ]] ; then - install -D -m 755 \ - "${_srcdir}/plugins/FeedReader/libFeedReader.so" \ - "${pkgdir}/usr/lib/retroshare/extensions/libFeedReader.so" - fi - - # Icons - install -D -m 644 \ - "${_srcdir}/retroshare-gui/src/gui/images/logo/logo_512.png" \ - "${pkgdir}/usr/share/pixmaps/retroshare.png" - - # Desktop File - install -D -m 644 \ - "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - # bdboot (needed to bootstrap the DHT) - install -D -m 644 \ - "${_srcdir}/libbitdht/src/bitdht/bdboot.txt" \ - "${pkgdir}/usr/share/RetroShare/bdboot.txt" - - # Skins - cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/" - #find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \; -} \ No newline at end of file + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/pcr/retroshare/retroshare.desktop b/pcr/retroshare/retroshare.desktop deleted file mode 100644 index 0c3f56180..000000000 --- a/pcr/retroshare/retroshare.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=RetroShare -GenericName=Sharing Network -Comment=Secure Communication with Your Friends -Icon=/usr/share/pixmaps/retroshare.png -Exec=/usr/bin/retroshare -Terminal=false -StartupNotify=true -Categories=Network;InstantMessaging;FileTransfer;Chat;Email; diff --git a/pcr/retroshare/retroshare.install b/pcr/retroshare/retroshare.install deleted file mode 100644 index e48df1361..000000000 --- a/pcr/retroshare/retroshare.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - # Update Desktop DB - if [[ -x /usr/bin/update-desktop-database ]]; then - echo "Update desktop database..." - update-desktop-database -q ; - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} -- cgit v1.2.2