diff options
Diffstat (limited to 'misc/kdeutils4/files')
-rw-r--r-- | misc/kdeutils4/files/patch-ark-CMakeLists.txt | 26 | ||||
-rw-r--r-- | misc/kdeutils4/files/patch-ark-plugins-CMakeLists.txt | 32 |
2 files changed, 0 insertions, 58 deletions
diff --git a/misc/kdeutils4/files/patch-ark-CMakeLists.txt b/misc/kdeutils4/files/patch-ark-CMakeLists.txt deleted file mode 100644 index fae223ae2a40..000000000000 --- a/misc/kdeutils4/files/patch-ark-CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -KDE SVN revision r1230915. - -Author: rkcosta (Raphael Kubo da Costa) -Date: Sun May 8 17:30:06 2011 +0000 - - Put the libarchive detection calls before configure_file(). - - The generated config.h was using some variables defined only after - plugins/CMakeLists.txt called macro_optional_find_package(LibArchive), - however the top-level CMakeLists.txt relied on these variables already - being set, which was never the case. - - BUG: 271553 - FIXED-IN: 4.6.4 - ---- ark/CMakeLists.txt -+++ ark/CMakeLists.txt -@@ -1,5 +1,8 @@ - project(ark) - -+macro_optional_find_package(LibArchive) -+macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.") -+ - configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) - - add_subdirectory(part) diff --git a/misc/kdeutils4/files/patch-ark-plugins-CMakeLists.txt b/misc/kdeutils4/files/patch-ark-plugins-CMakeLists.txt deleted file mode 100644 index f157bf403124..000000000000 --- a/misc/kdeutils4/files/patch-ark-plugins-CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -KDE SVN revision r1230915. - -Author: rkcosta (Raphael Kubo da Costa) -Date: Sun May 8 17:30:06 2011 +0000 - - Put the libarchive detection calls before configure_file(). - - The generated config.h was using some variables defined only after - plugins/CMakeLists.txt called macro_optional_find_package(LibArchive), - however the top-level CMakeLists.txt relied on these variables already - being set, which was never the case. - - BUG: 271553 - FIXED-IN: 4.6.4 - ---- ark/plugins/CMakeLists.txt -+++ ark/plugins/CMakeLists.txt -@@ -1,5 +1,3 @@ --macro_optional_find_package(LibArchive) -- - if (LIBARCHIVE_FOUND) - if( HAVE_LIBARCHIVE_READ_DISK_API ) - if( NOT HAVE_LIBARCHIVE_LZMA_SUPPORT OR NOT HAVE_LIBARCHIVE_XZ_SUPPORT ) -@@ -15,8 +13,6 @@ if (LIBARCHIVE_FOUND) - endif( HAVE_LIBARCHIVE_READ_DISK_API ) - endif (LIBARCHIVE_FOUND) - --macro_log_feature(LIBARCHIVE_FOUND "LibArchive" "A library for dealing with a wide variety of archive file formats" "http://code.google.com/p/libarchive/" FALSE "" "Required for among others tar, tar.gz, tar.bz2 formats in Ark.") -- - add_subdirectory( clirarplugin ) - add_subdirectory( cli7zplugin ) - add_subdirectory( clizipplugin ) |