Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1200420c6f763910c9d3d2f58127c51cc61eaefd
commit 1200420c6f763910c9d3d2f58127c51cc61eaefd Author: Baste <[email protected]> Date: Mon Apr 18 13:45:13 2016 +0200 deja-dup-34.2-1-x86_64 - Fix build diff --git a/source/gnome-extra/deja-dup/FrugalBuild b/source/gnome-extra/deja-dup/FrugalBuild index aafda12..20525ec 100644 --- a/source/gnome-extra/deja-dup/FrugalBuild +++ b/source/gnome-extra/deja-dup/FrugalBuild @@ -16,8 +16,9 @@ _F_launchpad_branch="34" _F_gnome_iconcache="y" _F_gnome_glib="y" Finclude launchpad gnome-scriptlet cmake -#source=("$source" cmake-fix.patch) -sha1sums=('5f85200011fc5fdf7e3eb3781afc828c0fcfc469') +source=("$source" help2man.patch) +sha1sums=('5f85200011fc5fdf7e3eb3781afc828c0fcfc469' \ + '1409812b50fd55c49e46386880a7ce80ea72560a') build() { CMake_build diff --git a/source/gnome-extra/deja-dup/help2man.patch b/source/gnome-extra/deja-dup/help2man.patch new file mode 100644 index 0000000..9b9d5cd --- /dev/null +++ b/source/gnome-extra/deja-dup/help2man.patch @@ -0,0 +1,25 @@ +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 +@@ -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 + 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 ++ 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 + 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") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
