From 3e388257a83c319dad26237099af126fa2cfd928046d44b8df61675f08dd927c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Thu, 13 Oct 2016 16:53:36 +0000
Subject: [PATCH] Accepting request 434753 from
 home:dimstar:branches:GNOME:Apps

- Fix deja-dup-help2man_stderr.patch: the introduction of
  --no-discard-stderr actually only hid the underlying issue:
  deja-dup is being started from the 'build' directory and its
  libraries are not yet installed. As a consequence, the ld loader
  can't find them, resulting in broken man pages. Change the patch
  to no longer pass --no-discard-stderr (same as upstream) but
  inject LD_LIBRARY_PATH in order to find the two libs
  (boo#992499).

OBS-URL: https://build.opensuse.org/request/show/434753
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=71
---
 deja-dup-help2man_stderr.patch | 15 ++++++++-------
 deja-dup.changes               | 12 ++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/deja-dup-help2man_stderr.patch b/deja-dup-help2man_stderr.patch
index 3dde37c..1ddd797 100644
--- a/deja-dup-help2man_stderr.patch
+++ b/deja-dup-help2man_stderr.patch
@@ -1,14 +1,15 @@
-diff -rupN deja-dup-30.0.old/man/CMakeLists.txt deja-dup-30.0/man/CMakeLists.txt
---- deja-dup-30.0.old/man/CMakeLists.txt	2013-09-30 19:06:59.000000000 -0700
-+++ deja-dup-30.0/man/CMakeLists.txt	2014-08-09 11:10:28.379577743 -0700
+Index: deja-dup-34.2/man/CMakeLists.txt
+===================================================================
+--- deja-dup-34.2.orig/man/CMakeLists.txt
++++ deja-dup-34.2/man/CMakeLists.txt
 @@ -21,8 +21,8 @@ string(REPLACE ".po" "" LINGUAS "${POFIL
  
  add_custom_command(OUTPUT C/deja-dup.1 C/deja-dup-preferences.1
                     COMMAND mkdir -p C
 -                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1
 -                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1
-+                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1
-+                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1
++                   COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1
++                   COMMAND env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1
                     DEPENDS deja-dup deja-dup-preferences)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/man1")
  list(APPEND MAN_TARGETS C/deja-dup.1 C/deja-dup-preferences.1)
@@ -18,8 +19,8 @@ diff -rupN deja-dup-30.0.old/man/CMakeLists.txt deja-dup-30.0/man/CMakeLists.txt
                       COMMAND ln -sf ${CMAKE_BINARY_DIR}/po/${LINGUA}.gmo locales/${LINGUA}/LC_MESSAGES/deja-dup.mo
 -                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1
 -                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1
-+                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1
-+                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man --no-discard-stderr -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1
++                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1
++                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1
                       DEPENDS translations deja-dup deja-dup-preferences)
  
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/${LINGUA}/man1")
diff --git a/deja-dup.changes b/deja-dup.changes
index d536857..c0a5f83 100644
--- a/deja-dup.changes
+++ b/deja-dup.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct 13 13:49:47 UTC 2016 - dimstar@opensuse.org
+
+- Fix deja-dup-help2man_stderr.patch: the introduction of
+  --no-discard-stderr actually only hid the underlying issue:
+  deja-dup is being started from the 'build' directory and its
+  libraries are not yet installed. As a consequence, the ld loader
+  can't find them, resulting in broken man pages. Change the patch
+  to no longer pass --no-discard-stderr (same as upstream) but
+  inject LD_LIBRARY_PATH in order to find the two libs
+  (boo#992499).
+
 -------------------------------------------------------------------
 Sun Apr 24 10:56:00 UTC 2016 - zaitor@opensuse.org