xap/ring-gnome-client: Upgraded to ring-gnome-client-20191111.3.a3432a2.

xap/ring-gnome-client/doinst.sh

@@ -3,6 +3,6 @@ if [ -x /usr/bin/update-desktop-database ]; then
     /usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x /usr/bin/glib-compile-schemas ];
+if [ -x /usr/bin/glib-compile-schemas ]; then
     /usr/bin/glib-compile-schemas ./usr/share/glib-2.0/schemas >/dev/null 2>&1
 fi

xap/ring-gnome-client/jami_20191111.3.a3432a2.tar.gz.sha256

@@ -0,0 +1 @@
+50aa6d150db61abf5bef174a891c9631f5e3534c200e3e0261b0ad1095514908  jami_20191111.3.a3432a2.tar.gz

xap/ring-gnome-client/ring-gnome-client-no-postinstall-link.patch

@@ -0,0 +1,15 @@
+diff -Naur client-gnome.orig/CMakeLists.txt client-gnome/CMakeLists.txt
+--- client-gnome.orig/CMakeLists.txt	2019-12-15 14:22:04.562166125 +0000
++++ client-gnome/CMakeLists.txt	2019-12-15 14:22:43.288736610 +0000
+@@ -477,11 +477,6 @@
+       WORLD_EXECUTE
+ )
+ 
+-INSTALL(CODE "
+-    EXECUTE_PROCESS(COMMAND rm ${CMAKE_INSTALL_PREFIX}/bin/ring.cx -f)
+-    EXECUTE_PROCESS(COMMAND ln -s ${CMAKE_INSTALL_PREFIX}/bin/jami ${CMAKE_INSTALL_PREFIX}/bin/ring.cx)
+-    ")
+-
+ # add a target to generate API documentation with Doxygen
+ FIND_PACKAGE(Doxygen)
+ IF(DOXYGEN_FOUND)

xap/ring-gnome-client/ring-gnome-client.SlackBuild

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build script for Slackware
-# Copyright (C) 2018 Damien Goutte-Gattat
+# Copyright (C) 2018,2019 Damien Goutte-Gattat
 #
 # Redistribution and use of this script, with or without modifications,
 # is permitted provided that the following conditions are met:
@@ -22,14 +22,13 @@
 #
 # Contact: Damien Goutte-Gattat <dgouttegattat@incenp.org>
 #
-# Latest ring sourcecode is available at: <https://www.ring.cx/>.
+# Latest ring sourcecode is available at: <https://jami.net/>.
 #
-# Depends: l/evolution-data-server, l/libringclient, l/clutter-gtk
-# Depends: l/webkit2, l/qrencode
+# Depends: l/clutter-gtk, l/libringclient, l/qrencode, l/webkit2
 
 # Source package infos
-NAMESRC=${NAMESRC:-ring}
-VERSION=${VERSION:-20180718.1.af8399f}
+NAMESRC=${NAMESRC:-jami}
+VERSION=${VERSION:-20191111.3.a3432a2}
 ARCHIVE=${ARCHIVE:-${NAMESRC}_$VERSION.tar.gz}
 WGET=${WGET:-https://dl.ring.cx/ring-release/tarballs/$ARCHIVE}
 
@@ -59,14 +58,12 @@ if [ ! -d $TMP ]; then
 fi
 
 # Compilation flags
-LIBDIRSUFFIX=""
 case "$ARCH" in
 i?86)
     CPUOPT="-O2 -march=$ARCH -mtune=i686"
     ;;
 x86_64)
     CPUOPT="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
     ;;
 *)
     CPUOPT="-O2"
@@ -86,6 +83,9 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME/client-gnome
+# Patch out post-install symlink creation, which must have been added
+# by a developper who never heard about staged install.
+patch -p 1 < $CWD/ring-gnome-client-no-postinstall-link.patch
 mkdir build && cd build
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
@@ -96,6 +96,8 @@ cmake \
   ..
 make -j $JOBS
 make install/strip DESTDIR=$PKG
+# Add the symlink ourself
+ln -s /usr/bin/jami $PKG/usr/bin/ring.cx
 
 # Install the documentation
 mkdir -p $PKG/usr/doc/$NAMEPKG-$VERSION
@@ -109,7 +111,6 @@ install    -m 755 $CWD/doinst.sh  $PKG/install/doinst.sh
 # Add dependency infos
 cat <<EOF > $PKG/install/slack-required
 clutter-gtk
-evolution-data-server
 libringclient
 qrencode
 webkit2

xap/ring-gnome-client/ring_20180718.1.af8399f.tar.gz.sha256

@@ -1 +0,0 @@
-c8c83a70662ad786c5aac82745eebf72b114358cf4c505b3c392f377312cae71  ring_20180718.1.af8399f.tar.gz