[gentoo-commits] gentoo-x86 commit in app-accessibility/simon/files: simon-0.4.0-opencv.patch simon-0.4.0-linguas.patch simon-0.4.0-libdir.patch

[Julian Ospald (hasufell)]

hasufell    13/03/31 18:28:32

  Added:                simon-0.4.0-opencv.patch simon-0.4.0-linguas.patch
                        simon-0.4.0-libdir.patch
  Log:
  initial import wrt #244945
  
  (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.1                  app-accessibility/simon/files/simon-0.4.0-opencv.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.0-opencv.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.0-opencv.patch?rev=1.1&content-type=text/plain

Index: simon-0.4.0-opencv.patch
===================================================================
--- simon-0.4.0/CMakeLists.txt
+++ simon-0.4.0/CMakeLists.txt
@@ -68,7 +68,7 @@
   "PocketSphinx is a small-footprint continuous speech recognition system"
   "http://cmusphinx.sourceforge.net/" FALSE "" 
   "Required to build Pocket Sphinx backend")
-find_package(OpenCV)
+macro_optional_find_package(OpenCV)
 macro_log_feature(OpenCV_FOUND "OpenCV"
   "OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision" "http://http://opencv.willowgarage.com/"
   FALSE "" "Required for Simon Vision")



1.1                  app-accessibility/simon/files/simon-0.4.0-linguas.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.0-linguas.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.0-linguas.patch?rev=1.1&content-type=text/plain

Index: simon-0.4.0-linguas.patch
===================================================================
--- simon-0.4.0/CMakeLists.txt
+++ simon-0.4.0/CMakeLists.txt
@@ -14,6 +14,9 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
+# NLS
+option(ENABLE_NLS "Enable native language support" 1)
+
 find_package(KDE4 "4.4" REQUIRED)
 find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
 find_package(Qwt6 REQUIRED)
@@ -143,4 +146,6 @@
 macro_display_feature_log()
 
 include(MacroOptionalAddSubdirectory)
-macro_optional_add_subdirectory( po )
+if(ENABLE_NLS)
+	macro_optional_add_subdirectory( po )
+endif(ENABLE_NLS)
--- simon-0.4.0/po/CMakeLists.txt
+++ simon-0.4.0/po/CMakeLists.txt
@@ -11,24 +11,14 @@
 if (NOT GETTEXT_MSGFMT_EXECUTABLE)
 MESSAGE(FATAL_ERROR "Please install msgmerge binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
-add_subdirectory(cs)
-add_subdirectory(de)
-add_subdirectory(da)
-add_subdirectory(fr)
-add_subdirectory(nl)
-add_subdirectory(uk)
-add_subdirectory(pt_BR)
-add_subdirectory(pl)
-add_subdirectory(es)
-add_subdirectory(ro)
-add_subdirectory(ca)
-add_subdirectory(sl)
-add_subdirectory(pt)
-add_subdirectory(hu)
-add_subdirectory(gl)
-add_subdirectory(sv)
-add_subdirectory(el)
-add_subdirectory(fi)
-add_subdirectory(it)
-add_subdirectory(zh_TW)
-add_subdirectory(et)
+
+# gettext behavior
+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
+	OUTPUT_VARIABLE UNSETLINGUAS)
+set(langs cs de da fr nl uk pt_BR pl es ro ca sl pt hu gl sv el fi it zh_TW et)
+
+foreach(mylang ${langs})
+	if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
+		add_subdirectory(${mylang})
+	endif()
+endforeach()
--- simon-0.4.0/doc/CMakeLists.txt
+++ simon-0.4.0/doc/CMakeLists.txt
@@ -1,9 +1,15 @@
+if(ENABLE_NLS)
+	# gettext behavior
+	execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
+	OUTPUT_VARIABLE UNSETLINGUAS)
+set(langs pt_BR ca nl de it pt sv uk)
+
+	foreach(mylang ${langs})
+		if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
+			add_subdirectory(${mylang})
+		endif()
+	endforeach()
+endif(ENABLE_NLS)
+
+# default doc
 add_subdirectory(en_US)
-add_subdirectory(pt_BR)
-add_subdirectory(ca)
-add_subdirectory(nl)
-add_subdirectory(de)
-add_subdirectory(it)
-add_subdirectory(pt)
-add_subdirectory(sv)
-add_subdirectory(uk)



1.1                  app-accessibility/simon/files/simon-0.4.0-libdir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.0-libdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/files/simon-0.4.0-libdir.patch?rev=1.1&content-type=text/plain

Index: simon-0.4.0-libdir.patch
===================================================================
From: Julian Ospald <hasufell@g.o>
Date: Fri Mar 29 22:00:19 UTC 2013
Subject: build system

make libdir modifiable

--- simon-0.4.0/cmake/SimonDirs.cmake
+++ simon-0.4.0/cmake/SimonDirs.cmake
@@ -29,6 +29,6 @@
   #IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
     #set(SIMON_LIB_INSTALL_DIR lib64)
   #ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-    set(SIMON_LIB_INSTALL_DIR lib)
+  set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir")
   #ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
 ENDIF(WIN32)