pool/deja-dup
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
deja-dup/deja-dup-help2man_stderr.patch

27 lines
3.5 KiB
Diff
Raw Normal View History

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
2016-10-13 16:53:36 +00:00
Index: deja-dup-34.2/man/CMakeLists.txt
===================================================================
--- deja-dup-34.2.orig/man/CMakeLists.txt
+++ deja-dup-34.2/man/CMakeLists.txt
Accepting request 244083 from home:sfalken:branches:GNOME:Apps - Update to version 30.0: + Packaging: Fix build with CMake 2.8.12. - Changes from version 29.5: + Bug Fixes: Re-enable libunity support after it was accidentally dropped in 29.1. + Packaging: Require duplicity 0.6.23. - Changes from version 29.4: + Bug Fixes: Add missing icon in help documentation. + Packaging: - Add ENABLE_UNITY_CCPANEL argument for unity-control-center support. - Fix some compile problems with valac, parallel building, and rpath support. - Changes from version 29.1: + Bug Fixes: Detect encryption on existing backups by paying attention to what Duplicity tells us, rather than trying to figure it out by scanning ourselves. This removes a possible source of error. + Polish: - Rename to Backups (instead of Backup). - Update look and feel of preferences a bit. - Add screenshots to appdata file. + Packaging: - Require GTK+ 3.6 and GLib 2.34. - Convert from autotools to cmake: --with-ccpanel is now -DENABLE_CCPANEL, --with-nautilus is now -DENABLE_NAUTILUS, --with-unity is now -DENABLE_UNITY. Otherwise, normal cmake conventions apply. - Add some autopilot tests, runnable by 'autopilot' and 'autopilot-system' targets (which test against the local OBS-URL: https://build.opensuse.org/request/show/244083 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=56
2014-08-13 18:32:10 +00:00
@@ -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
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
2016-10-13 16:53:36 +00:00
+ 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
Accepting request 244083 from home:sfalken:branches:GNOME:Apps - Update to version 30.0: + Packaging: Fix build with CMake 2.8.12. - Changes from version 29.5: + Bug Fixes: Re-enable libunity support after it was accidentally dropped in 29.1. + Packaging: Require duplicity 0.6.23. - Changes from version 29.4: + Bug Fixes: Add missing icon in help documentation. + Packaging: - Add ENABLE_UNITY_CCPANEL argument for unity-control-center support. - Fix some compile problems with valac, parallel building, and rpath support. - Changes from version 29.1: + Bug Fixes: Detect encryption on existing backups by paying attention to what Duplicity tells us, rather than trying to figure it out by scanning ourselves. This removes a possible source of error. + Polish: - Rename to Backups (instead of Backup). - Update look and feel of preferences a bit. - Add screenshots to appdata file. + Packaging: - Require GTK+ 3.6 and GLib 2.34. - Convert from autotools to cmake: --with-ccpanel is now -DENABLE_CCPANEL, --with-nautilus is now -DENABLE_NAUTILUS, --with-unity is now -DENABLE_UNITY. Otherwise, normal cmake conventions apply. - Add some autopilot tests, runnable by 'autopilot' and 'autopilot-system' targets (which test against the local OBS-URL: https://build.opensuse.org/request/show/244083 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=56
2014-08-13 18:32:10 +00:00
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)
@@ -31,8 +31,8 @@ foreach(LINGUA ${LINGUAS})
add_custom_command(OUTPUT ${LINGUA}/deja-dup.1 ${LINGUA}/deja-dup-preferences.1
COMMAND mkdir -p ${LINGUA} locales/${LINGUA}/LC_MESSAGES
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
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
2016-10-13 16:53:36 +00:00
+ 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
Accepting request 244083 from home:sfalken:branches:GNOME:Apps - Update to version 30.0: + Packaging: Fix build with CMake 2.8.12. - Changes from version 29.5: + Bug Fixes: Re-enable libunity support after it was accidentally dropped in 29.1. + Packaging: Require duplicity 0.6.23. - Changes from version 29.4: + Bug Fixes: Add missing icon in help documentation. + Packaging: - Add ENABLE_UNITY_CCPANEL argument for unity-control-center support. - Fix some compile problems with valac, parallel building, and rpath support. - Changes from version 29.1: + Bug Fixes: Detect encryption on existing backups by paying attention to what Duplicity tells us, rather than trying to figure it out by scanning ourselves. This removes a possible source of error. + Polish: - Rename to Backups (instead of Backup). - Update look and feel of preferences a bit. - Add screenshots to appdata file. + Packaging: - Require GTK+ 3.6 and GLib 2.34. - Convert from autotools to cmake: --with-ccpanel is now -DENABLE_CCPANEL, --with-nautilus is now -DENABLE_NAUTILUS, --with-unity is now -DENABLE_UNITY. Otherwise, normal cmake conventions apply. - Add some autopilot tests, runnable by 'autopilot' and 'autopilot-system' targets (which test against the local OBS-URL: https://build.opensuse.org/request/show/244083 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/deja-dup?expand=0&rev=56
2014-08-13 18:32:10 +00:00
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")
Reference in New Issue Copy Permalink