commit: 690033ba0a7e29a5a23630bb0020a911d164133b Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Jul 3 14:09:34 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Thu Jul 7 07:18:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690033ba
app-backup/deja-dup: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/1826 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> .../files/deja-dup-29.1-cmake-backport-1.patch | 11 ------ .../files/deja-dup-29.1-cmake-backport-2.patch | 32 ----------------- .../deja-dup/files/deja-dup-29.5-cmake.patch | 16 --------- .../files/deja-dup-32.0-duplicity-0.6.25.patch | 41 ---------------------- 4 files changed, 100 deletions(-) diff --git a/app-backup/deja-dup/files/deja-dup-29.1-cmake-backport-1.patch b/app-backup/deja-dup/files/deja-dup-29.1-cmake-backport-1.patch deleted file mode 100644 index 1c122d1..0000000 --- a/app-backup/deja-dup/files/deja-dup-29.1-cmake-backport-1.patch +++ /dev/null @@ -1,11 +0,0 @@ -=== modified file 'deja-dup/nautilus/CMakeLists.txt' ---- deja-dup/nautilus/CMakeLists.txt 2013-10-11 19:57:03 +0000 -+++ deja-dup/nautilus/CMakeLists.txt 2013-11-08 03:32:53 +0000 -@@ -23,5 +23,6 @@ - OUTPUT_NAME deja-dup - INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja" - COMPILE_FLAGS "${GLIB_CFLAGS} ${NAUTILUS_CFLAGS} ${COMMON_CFLAGS}") -+add_dependencies(deja-dup-nautilus deja) # needs DirHandling.c - install(TARGETS deja-dup-nautilus DESTINATION "${NAUTILUS_EXTENSIONDIR}") - endif() - diff --git a/app-backup/deja-dup/files/deja-dup-29.1-cmake-backport-2.patch b/app-backup/deja-dup/files/deja-dup-29.1-cmake-backport-2.patch deleted file mode 100644 index 7411d19..0000000 --- a/app-backup/deja-dup/files/deja-dup-29.1-cmake-backport-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -=== modified file 'cmake/DejaDupMacros.cmake' ---- cmake/DejaDupMacros.cmake 2013-10-11 19:57:03 +0000 -+++ cmake/DejaDupMacros.cmake 2013-11-09 05:59:00 +0000 -@@ -34,19 +34,15 @@ - endmacro() - - macro(deja_enable_option) -- if(NOT ENABLE_${ARGV0}) -- return() # nothing to do -- endif() -- -- deja_check_modules(${ARGV}) -- -- if(NOT ${ARGV0}_FOUND) -- if(ENABLE_${ARGV0} STREQUAL "CHECK") -- set(ENABLE_${ARGV0} OFF) -- else() -- message(FATAL_ERROR "You enabled ${ARGV0}, but required dependencies could not be found") -+ if(ENABLE_${ARGV0}) -+ deja_check_modules(${ARGV}) -+ if(NOT ${ARGV0}_FOUND) -+ if(ENABLE_${ARGV0} STREQUAL "CHECK") -+ set(ENABLE_${ARGV0} OFF) -+ else() -+ message(FATAL_ERROR "You enabled ${ARGV0}, but required dependencies could not be found") -+ endif() - endif() -- return() - endif() - endmacro() - - diff --git a/app-backup/deja-dup/files/deja-dup-29.5-cmake.patch b/app-backup/deja-dup/files/deja-dup-29.5-cmake.patch deleted file mode 100644 index 6b364d4..0000000 --- a/app-backup/deja-dup/files/deja-dup-29.5-cmake.patch +++ /dev/null @@ -1,16 +0,0 @@ - deja-dup/widgets/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deja-dup/widgets/CMakeLists.txt b/deja-dup/widgets/CMakeLists.txt -index 78f0e21..e885ac8 100644 ---- a/deja-dup/widgets/CMakeLists.txt -+++ b/deja-dup/widgets/CMakeLists.txt -@@ -52,7 +52,7 @@ vala_precompile(VALA_C ConfigBool.vala - GENERATE_VAPI widgets - GENERATE_HEADER widgets) - add_library(widgets SHARED ${VALA_C}) --target_link_libraries(widgets deja "${GTK_LDFLAGS} ${NOTIFY_LDFLAGS} ${PEAS_LDFLAGS} ${SECRET_LDFLAGS} ${UNITY_LDFLAGS}") -+target_link_libraries(widgets deja ${GTK_LDFLAGS} ${NOTIFY_LDFLAGS} ${PEAS_LDFLAGS} ${SECRET_LDFLAGS} ${UNITY_LDFLAGS}) - set_target_properties(widgets PROPERTIES - INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja;${CMAKE_SOURCE_DIR}/libdeja" - COMPILE_FLAGS "${GTK_CFLAGS} ${NOTIFY_CFLAGS} ${PEAS_CFLAGS} ${SECRET_CFLAGS} ${UNITY_CFLAGS} ${COMMON_CFLAGS}") diff --git a/app-backup/deja-dup/files/deja-dup-32.0-duplicity-0.6.25.patch b/app-backup/deja-dup/files/deja-dup-32.0-duplicity-0.6.25.patch deleted file mode 100644 index 016e678..0000000 --- a/app-backup/deja-dup/files/deja-dup-32.0-duplicity-0.6.25.patch +++ /dev/null @@ -1,41 +0,0 @@ -=== modified file 'AUTHORS' ---- AUTHORS 2014-04-29 02:38:47 +0000 -+++ AUTHORS 2014-10-23 06:41:44 +0000 -@@ -12,6 +12,10 @@ - Comment: For specific author information, see the bzr logs - License: GPL-3+ - -+Files: libdeja/tools/duplicity/DuplicityPlugin.vala -+Copyright: 2014 Adrien Bak <adrien....@gmail.com> -+Licence: GPL-3+ -+ - Files: po/*.po - Copyright: 2008–2013 Rosetta Contributors and Canonical Ltd - License: GPL-3+ - -=== modified file 'libdeja/tools/duplicity/DuplicityPlugin.vala' ---- libdeja/tools/duplicity/DuplicityPlugin.vala 2014-01-24 16:07:59 +0000 -+++ libdeja/tools/duplicity/DuplicityPlugin.vala 2014-10-23 06:41:44 +0000 -@@ -35,13 +35,17 @@ - { - string output; - Process.spawn_command_line_sync("duplicity --version", out output, null, null); -+ var tokens = output.split(" "); - -- var tokens = output.split(" ", 2); -- if (tokens == null || tokens[0] == null || tokens[1] == null) -+ if (tokens == null || tokens.length < 2 ) - throw new SpawnError.FAILED(_("Could not understand duplicity version.")); - -- // First token is 'duplicity' and is ignorable. Second looks like '0.5.03' -- var version_string = tokens[1].strip(); -+ // in version 0.6.25, the output fro duplicity --version changed and the string -+ // "duplicity major.minor.micro" is not preceded by a deprecation warning -+ // as a consequence, the substring "major.minor.micro" is now -+ // always the penultimate token (the last one always being null) -+ -+ var version_string = tokens[tokens.length - 1].strip(); - int major, minor, micro; - if (!DejaDup.parse_version(version_string, out major, out minor, out micro)) - throw new SpawnError.FAILED(_("Could not understand duplicity version ‘%s’.").printf(version_string)); -
