diff options
author | Alberto Villa <avilla@FreeBSD.org> | 2011-06-14 09:23:49 +0000 |
---|---|---|
committer | Alberto Villa <avilla@FreeBSD.org> | 2011-06-14 09:23:49 +0000 |
commit | 3f88d44ab79dbfa206490f1310fa6d12fa005e72 (patch) | |
tree | 13cc4df89088675d0ba07a254fe5338146fdd460 /archivers/ark | |
parent | 93886773bae157e823f1e6f4e4a1e4ea9783cad3 (diff) | |
download | ports-3f88d44ab79dbfa206490f1310fa6d12fa005e72.tar.gz ports-3f88d44ab79dbfa206490f1310fa6d12fa005e72.zip |
Notes
Diffstat (limited to 'archivers/ark')
-rw-r--r-- | archivers/ark/distinfo | 4 | ||||
-rw-r--r-- | archivers/ark/files/patch-ark-CMakeLists.txt | 26 | ||||
-rw-r--r-- | archivers/ark/files/patch-ark-plugins-CMakeLists.txt | 32 |
3 files changed, 2 insertions, 60 deletions
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo index 824077cfc83b..53a9f72f441d 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdeutils-4.6.3.tar.bz2) = d61e97a5b3464fbfaef624927cfc19da4158dd91f2e020eb245d10da8af33196 -SIZE (KDE/kdeutils-4.6.3.tar.bz2) = 3703326 +SHA256 (KDE/kdeutils-4.6.4.tar.bz2) = f78d3e683f905da3f16c9848193c50f4df6d1c15d8a46a92829a24b8b4a96233 +SIZE (KDE/kdeutils-4.6.4.tar.bz2) = 3699173 diff --git a/archivers/ark/files/patch-ark-CMakeLists.txt b/archivers/ark/files/patch-ark-CMakeLists.txt deleted file mode 100644 index fae223ae2a40..000000000000 --- a/archivers/ark/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/archivers/ark/files/patch-ark-plugins-CMakeLists.txt b/archivers/ark/files/patch-ark-plugins-CMakeLists.txt deleted file mode 100644 index f157bf403124..000000000000 --- a/archivers/ark/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 ) |