1 |
hasufell 13/06/30 18:39:52 |
2 |
|
3 |
Added: simon-0.4.1-linguas.patch simon-0.4.1-sphinx.patch |
4 |
simon-0.4.1-libdir.patch |
5 |
Log: |
6 |
version bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 app-accessibility/simon/files/simon-0.4.1-linguas.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.1-linguas.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.1-linguas.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: simon-0.4.1-linguas.patch |
17 |
=================================================================== |
18 |
--- a/CMakeLists.txt |
19 |
+++ b/CMakeLists.txt |
20 |
@@ -14,6 +14,9 @@ |
21 |
|
22 |
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) |
23 |
|
24 |
+# NLS |
25 |
+option(ENABLE_NLS "Enable native language support" 1) |
26 |
+ |
27 |
find_package(KDE4 "4.4" REQUIRED) |
28 |
find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED) |
29 |
find_package(Qwt6 REQUIRED) |
30 |
@@ -143,4 +146,6 @@ |
31 |
macro_display_feature_log() |
32 |
|
33 |
include(MacroOptionalAddSubdirectory) |
34 |
-macro_optional_add_subdirectory( po ) |
35 |
+if(ENABLE_NLS) |
36 |
+ macro_optional_add_subdirectory( po ) |
37 |
+endif(ENABLE_NLS) |
38 |
--- a/doc/CMakeLists.txt |
39 |
+++ b/doc/CMakeLists.txt |
40 |
@@ -1,11 +1,15 @@ |
41 |
+if(ENABLE_NLS) |
42 |
+ # gettext behavior |
43 |
+ execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}" |
44 |
+ OUTPUT_VARIABLE UNSETLINGUAS) |
45 |
+set(langs pt_BR ca nl et de it pt es sv uk) |
46 |
+ |
47 |
+ foreach(mylang ${langs}) |
48 |
+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "") |
49 |
+ add_subdirectory(${mylang}) |
50 |
+ endif() |
51 |
+ endforeach() |
52 |
+endif(ENABLE_NLS) |
53 |
+ |
54 |
+# default doc |
55 |
add_subdirectory(en_US) |
56 |
-add_subdirectory(pt_BR) |
57 |
-add_subdirectory(ca) |
58 |
-add_subdirectory(nl) |
59 |
-add_subdirectory(et) |
60 |
-add_subdirectory(de) |
61 |
-add_subdirectory(it) |
62 |
-add_subdirectory(pt) |
63 |
-add_subdirectory(es) |
64 |
-add_subdirectory(sv) |
65 |
-add_subdirectory(uk) |
66 |
--- a/po/CMakeLists.txt |
67 |
+++ b/po/CMakeLists.txt |
68 |
@@ -11,25 +11,14 @@ endif (NOT GETTEXT_MSGMERGE_EXECUTABLE) |
69 |
if (NOT GETTEXT_MSGFMT_EXECUTABLE) |
70 |
MESSAGE(FATAL_ERROR "Please install msgmerge binary") |
71 |
endif (NOT GETTEXT_MSGFMT_EXECUTABLE) |
72 |
-add_subdirectory(de) |
73 |
-add_subdirectory(da) |
74 |
-add_subdirectory(fr) |
75 |
-add_subdirectory(nl) |
76 |
-add_subdirectory(uk) |
77 |
-add_subdirectory(pt_BR) |
78 |
-add_subdirectory(pl) |
79 |
-add_subdirectory(es) |
80 |
-add_subdirectory(cs) |
81 |
-add_subdirectory(ro) |
82 |
-add_subdirectory(ca) |
83 |
-add_subdirectory(sk) |
84 |
-add_subdirectory(sl) |
85 |
-add_subdirectory(pt) |
86 |
-add_subdirectory(gl) |
87 |
-add_subdirectory(ca@valencia) |
88 |
-add_subdirectory(sv) |
89 |
-add_subdirectory(el) |
90 |
-add_subdirectory(fi) |
91 |
-add_subdirectory(it) |
92 |
-add_subdirectory(zh_TW) |
93 |
-add_subdirectory(et) |
94 |
+ |
95 |
+# gettext behavior |
96 |
+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}" |
97 |
+ OUTPUT_VARIABLE UNSETLINGUAS) |
98 |
+set(langs ca@valencia cs de da fr nl uk pt_BR pl es ro ca sl pt gl sk sv el fi it zh_TW et) |
99 |
+ |
100 |
+foreach(mylang ${langs}) |
101 |
+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "") |
102 |
+ add_subdirectory(${mylang}) |
103 |
+ endif() |
104 |
+endforeach() |
105 |
|
106 |
|
107 |
|
108 |
1.1 app-accessibility/simon/files/simon-0.4.1-sphinx.patch |
109 |
|
110 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.1-sphinx.patch?rev=1.1&view=markup |
111 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.1-sphinx.patch?rev=1.1&content-type=text/plain |
112 |
|
113 |
Index: simon-0.4.1-sphinx.patch |
114 |
=================================================================== |
115 |
--- simon-0.4.1/CMakeLists.txt |
116 |
+++ simon-0.4.1/CMakeLists.txt |
117 |
@@ -59,11 +59,11 @@ |
118 |
macro_optional_find_package(QAccessibilityClient) |
119 |
macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.") |
120 |
|
121 |
-find_package(Sphinxbase) |
122 |
+macro_optional_find_package(Sphinxbase) |
123 |
macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase" |
124 |
"Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/" |
125 |
FALSE "" "Required to build Sphinx backend") |
126 |
-find_package(Pocketsphinx) |
127 |
+macro_optional_find_package(Pocketsphinx) |
128 |
macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx" |
129 |
"PocketSphinx is a small-footprint continuous speech recognition system" |
130 |
"http://cmusphinx.sourceforge.net/" FALSE "" |
131 |
|
132 |
|
133 |
|
134 |
1.1 app-accessibility/simon/files/simon-0.4.1-libdir.patch |
135 |
|
136 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.1-libdir.patch?rev=1.1&view=markup |
137 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.1-libdir.patch?rev=1.1&content-type=text/plain |
138 |
|
139 |
Index: simon-0.4.1-libdir.patch |
140 |
=================================================================== |
141 |
From: Julian Ospald <hasufell@g.o> |
142 |
Date: Fri Mar 29 22:00:19 UTC 2013 |
143 |
Subject: build system |
144 |
|
145 |
make libdir modifiable |
146 |
|
147 |
--- simon-0.4.1/cmake/SimonDirs.cmake |
148 |
+++ simon-0.4.1/cmake/SimonDirs.cmake |
149 |
@@ -29,6 +29,6 @@ |
150 |
#IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") |
151 |
#set(SIMON_LIB_INSTALL_DIR lib64) |
152 |
#ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") |
153 |
- set(SIMON_LIB_INSTALL_DIR lib) |
154 |
+ set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir") |
155 |
#ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") |
156 |
ENDIF(WIN32) |