1 |
scarabeus 12/08/28 12:25:19 |
2 |
|
3 |
Added: csync-automagicness.patch |
4 |
Log: |
5 |
Add csync package required for miral owncloud service. |
6 |
|
7 |
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-misc/csync/files/csync-automagicness.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/csync/files/csync-automagicness.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/csync/files/csync-automagicness.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: csync-automagicness.patch |
16 |
=================================================================== |
17 |
diff -urN csync-0.50.8.old/cmake/Modules/MacroOptionalFindPackage.cmake csync-0.50.8/cmake/Modules/MacroOptionalFindPackage.cmake |
18 |
--- csync-0.50.8.old/cmake/Modules/MacroOptionalFindPackage.cmake 1970-01-01 01:00:00.000000000 +0100 |
19 |
+++ csync-0.50.8/cmake/Modules/MacroOptionalFindPackage.cmake 2012-08-28 13:35:55.312298632 +0200 |
20 |
@@ -0,0 +1,48 @@ |
21 |
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() |
22 |
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] ) |
23 |
+# This macro is a combination of OPTION() and FIND_PACKAGE(), it |
24 |
+# works like FIND_PACKAGE(), but additionally it automatically creates |
25 |
+# an option name WITH_<name>, which can be disabled via the cmake GUI. |
26 |
+# or via -DWITH_<name>=OFF |
27 |
+# The standard <name>_FOUND variables can be used in the same way |
28 |
+# as when using the normal FIND_PACKAGE() |
29 |
+ |
30 |
+# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@×××.org> |
31 |
+# |
32 |
+# Redistribution and use is allowed according to the terms of the BSD license. |
33 |
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. |
34 |
+ |
35 |
+# This is just a helper macro to set a bunch of variables empty. |
36 |
+# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both: |
37 |
+macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var) |
38 |
+ if(DEFINED ${_name}_${_var}) |
39 |
+ set(${_name}_${_var} "") |
40 |
+ endif(DEFINED ${_name}_${_var}) |
41 |
+ |
42 |
+ string(TOUPPER ${_name} _nameUpper) |
43 |
+ if(DEFINED ${_nameUpper}_${_var}) |
44 |
+ set(${_nameUpper}_${_var} "") |
45 |
+ endif(DEFINED ${_nameUpper}_${_var}) |
46 |
+endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var) |
47 |
+ |
48 |
+ |
49 |
+macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) |
50 |
+ option(WITH_${_name} "Search for ${_name} package" ON) |
51 |
+ if (WITH_${_name}) |
52 |
+ find_package(${_name} ${ARGN}) |
53 |
+ else (WITH_${_name}) |
54 |
+ string(TOUPPER ${_name} _nameUpper) |
55 |
+ set(${_name}_FOUND FALSE) |
56 |
+ set(${_nameUpper}_FOUND FALSE) |
57 |
+ |
58 |
+ _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS) |
59 |
+ _mofp_set_empty_if_defined(${_name} INCLUDE_DIR) |
60 |
+ _mofp_set_empty_if_defined(${_name} INCLUDES) |
61 |
+ _mofp_set_empty_if_defined(${_name} LIBRARY) |
62 |
+ _mofp_set_empty_if_defined(${_name} LIBRARIES) |
63 |
+ _mofp_set_empty_if_defined(${_name} LIBS) |
64 |
+ _mofp_set_empty_if_defined(${_name} FLAGS) |
65 |
+ _mofp_set_empty_if_defined(${_name} DEFINITIONS) |
66 |
+ endif (WITH_${_name}) |
67 |
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE) |
68 |
+ |
69 |
diff -urN csync-0.50.8.old/CMakeLists.txt csync-0.50.8/CMakeLists.txt |
70 |
--- csync-0.50.8.old/CMakeLists.txt 2012-08-28 13:35:05.005298638 +0200 |
71 |
+++ csync-0.50.8/CMakeLists.txt 2012-08-28 13:42:05.150298588 +0200 |
72 |
@@ -38,9 +38,10 @@ |
73 |
# add macros |
74 |
include(MacroAddPlugin) |
75 |
include(MacroCopyFile) |
76 |
+include(MacroOptionalFindPackage) |
77 |
|
78 |
-find_package(Log4C) |
79 |
-if(NOT LOG4C_FOUND) |
80 |
+macro_optional_find_package(Log4C) |
81 |
+if(NOT WITH_Log4C) |
82 |
set(WITH_LOG4C FALSE) |
83 |
endif() |
84 |
|
85 |
@@ -64,11 +65,11 @@ |
86 |
add_subdirectory(config) |
87 |
add_subdirectory(doc) |
88 |
|
89 |
-find_package(Check) |
90 |
-if (CHECK_FOUND) |
91 |
- include(MacroAddCheckTest) |
92 |
-endif (CHECK_FOUND) |
93 |
if (UNIT_TESTING) |
94 |
+ find_package(Check) |
95 |
+ if (CHECK_FOUND) |
96 |
+ include(MacroAddCheckTest) |
97 |
+ endif (CHECK_FOUND) |
98 |
add_subdirectory(tests) |
99 |
-endif(UNIT_TESTING) |
100 |
+endif (UNIT_TESTING) |
101 |
|
102 |
diff -urN csync-0.50.8.old/DefineOptions.cmake csync-0.50.8/DefineOptions.cmake |
103 |
--- csync-0.50.8.old/DefineOptions.cmake 2012-08-28 13:35:05.004298638 +0200 |
104 |
+++ csync-0.50.8/DefineOptions.cmake 2012-08-28 13:41:44.838298591 +0200 |
105 |
@@ -1,4 +1,3 @@ |
106 |
-option(WITH_LOG4C "Build csync without log4c" ON) |
107 |
option(UNIT_TESTING "Build with unit tests" OFF) |
108 |
option(MEM_NULL_TESTS "Enable NULL memory testing" OFF) |
109 |
option(LOG_TO_CALLBACK "Enable extended logging through a callback" OFF) |
110 |
diff -urN csync-0.50.8.old/doc/CMakeLists.txt csync-0.50.8/doc/CMakeLists.txt |
111 |
--- csync-0.50.8.old/doc/CMakeLists.txt 2012-08-28 13:35:05.004298638 +0200 |
112 |
+++ csync-0.50.8/doc/CMakeLists.txt 2012-08-28 13:38:05.055298617 +0200 |
113 |
@@ -2,7 +2,10 @@ |
114 |
# Build the documentation |
115 |
# |
116 |
|
117 |
-include(UseDoxygen OPTIONAL) |
118 |
+option(WITH_APIDOC "Use doxygen to generate documentation" ON) |
119 |
+if (WITH_APIDOC) |
120 |
+ include(UseDoxygen OPTIONAL) |
121 |
+endif (WITH_APIDOC) |
122 |
|
123 |
file(GLOB _manpages *.[0-9].txt) |
124 |
add_custom_target(man |
125 |
diff -urN csync-0.50.8.old/modules/CMakeLists.txt csync-0.50.8/modules/CMakeLists.txt |
126 |
--- csync-0.50.8.old/modules/CMakeLists.txt 2012-08-28 13:35:05.003298638 +0200 |
127 |
+++ csync-0.50.8/modules/CMakeLists.txt 2012-08-28 13:40:25.254298600 +0200 |
128 |
@@ -1,8 +1,8 @@ |
129 |
project(modules C) |
130 |
|
131 |
-find_package(Libsmbclient) |
132 |
-find_package(LibSSH 0.4.0) |
133 |
-find_package(Neon) |
134 |
+macro_optional_find_package(Libsmbclient) |
135 |
+macro_optional_find_package(LibSSH 0.4.0) |
136 |
+macro_optional_find_package(Neon) |
137 |
|
138 |
set(PLUGIN_VERSION_INSTALL_DIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}") |