update pcr/ring

1 files changed, 29 insertions, 15 deletions

diff --git a/pcr/ring/PKGBUILD b/pcr/ring/PKGBUILD
index 2ee23d4c8..137cf0f6e 100644
--- a/pcr/ring/PKGBUILD
+++ b/pcr/ring/PKGBUILD
@@ -3,7 +3,17 @@
 pkgbase=ring
 pkgname=(ring-daemon ring-lrc ring-client-gnome)
 pkgdesc="The GNU Ring / ring.cx (formerly SFLphone) VoIP system"
-_pkgver=20170126.1.cd1aa0d
+_pkgver=20170202.1.23df36f
+_SOURCE_DATE_EPOCH=1486011607
+
+# To figure out what the above value of _SOURCE_DATE_EPOCH should be,
+# run
+#
+#    git log -n1 --format=%ct ${_pkgver##*.}
+#
+# from inside of the repository created by
+#
+#    git clone https://gerrit-ring.savoirfairelinux.com/ring-project
 
 pkgver=beta2.$_pkgver
 pkgrel=1
@@ -11,27 +21,27 @@ arch=("i686" "x86_64")
 url="https://ring.cx/"
 license=('GPL3')
 source=("http://dl.ring.cx/ring-release/tarballs/${pkgbase}_${_pkgver}.tar.gz")
-sha256sums=('d732159eabdbb580cfb73ce325c353c1139cf0cd6001bdb45b54da4b8b1fb8dc')
+sha256sums=('1ff3b581cb099ae1bda83a68e99d23d87b50a497a70e760901364e7102d803eb')
 
 # Get this list by looking at `daemon/contrib/src/*/rules.mak`; look
 # for packages that add themselves to both PKGS and FOUND_PKGS.
 _daemon_contrib=(
-        #asio           # TODO: IDK: no PKGS_FOUND logic, specific git commit
-        #boost          # TODO: IDK: no PKGS_FOUND logic
+        #asio           # CONTRIB: TODO: IDK: no PKGS_FOUND logic, specific git commit
+        #boost          # CONTRIB: TODO: IDK: no PKGS_FOUND logic
         crypto++
         ffmpeg
         #gnutls         # DUP: ffmpeg->gnutls
-        #gsm            # TODO: IDK: no PKGS_FOUND logic
+        #gsm            # CONTRIB: TODO: IDK: no PKGS_FOUND logic
         jsoncpp
         msgpack-c
         libnatpmp       # NOTE: force system version; see below
         #nettle         # DUP: ffmpeg->gnutls->nettle
         #libogg         # DUP: ffmpeg->{libvorbis,speex}->libogg
-        #opendht        # TODO: not yet packaged (>=git.3fb7c2a)
+        opendht
         #opus           # DUP: ffmpeg->opus
         #pcre           # DUP: {base,base-devel}->grep->pcre
         #pjproject      # CONTRIB: Added patches for gnutls
-        #restbed        # TODO: not yet packaged (>=4.0, >=git.3418750)
+        #restbed        # CONTRIB: Want at least commit 3418750 (not yet in a release)
         #libsamplerate  # DUP: ffmpeg->jack->libsamplerate
         #libsndfile     # DUP: ffmpeg->libsamplerate->libsndfile
         #speex          # DUP: ffmpeg->speex
@@ -41,10 +51,16 @@ _daemon_contrib=(
         yaml-cpp
         #zlib           # DUP: ffmpeg->zlib
 )
-# We force the system version of libnatpmp because the detection logic
-# uses pkg-config, but the libnatpmp package doesn't include
-# pkg-config files; so the build system thinks we don't have it.  We
-# accomplish this by passing `--disable-natpmp` to `../bootstrap`.
+# We may pass several `--disable-X` flags to `../bootstrap` below; to
+# force the system version of dependencies.
+#
+# Disable contrib 'natpmp' to force the system version of libnatpmp
+# because the detection logic uses pkg-config, but the libnatpmp
+# package doesn't include pkg-config files; so the build system thinks
+# we don't have it.
+#
+# TODO: Once we use system restbed, disable contrib 'asio' because it
+# is only needed as a build-dependency for restbed.
 
 _makedepends_daemon=()
 _depends_daemon=("${_daemon_contrib[@]}" dbus-c++)
@@ -81,7 +97,7 @@ build() {
   cd "$srcdir/ring-project/daemon"
   ./autogen.sh
   ./configure --prefix=/usr
-  make
+  make RING_DIRTY_REPO= RING_REVISION=$_pkgver
 
   cd "$srcdir/ring-project/lrc"
   mkdir build
@@ -95,7 +111,7 @@ build() {
   cd "$srcdir/ring-project/client-gnome"
   mkdir build
   cd build
-  cmake .. \
+  SOURCE_DATE_EPOCH=$_SOURCE_DATE_EPOCH cmake .. \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
         -DLibRingClient_PROJECT_DIR="$srcdir/ring-project/lrc"
@@ -129,5 +145,3 @@ package_ring-client-gnome() {
   cd "$srcdir/ring-project/client-gnome/build"
   make DESTDIR="$pkgdir" install
 }
-
-# vim:set ts=2 sw=2 et: