Skip to content

Instantly share code, notes, and snippets.

15 Dec 12:33:56 - [nodemon] v0.9.16
15 Dec 12:33:56 - [nodemon] to restart at any time, enter `rs`
15 Dec 12:33:56 - [nodemon] watching: /Users/user/Projects/src/node/project
15 Dec 12:33:56 - [nodemon] watching extensions: .*\.js$
15 Dec 12:33:56 - [nodemon] ignoring: \.git
15 Dec 12:33:56 - [nodemon] ignoring: node_modules/.*.*/node_modules
15 Dec 12:33:56 - [nodemon] starting `node server.js`
15 Dec 12:33:56 - [nodemon] pid: 41573
[2013-12-15 GMT+0000 12:33:58.266] INFO /Users/user/Projects/src/node/project/config/environment.js:39 - Environment: development
Compound server listening on 0.0.0.0:3000 within development environment
--- CMakeLists.txt~ 2013-12-14 15:46:27.000000000 +0000
+++ CMakeLists.txt 2013-12-14 15:48:33.000000000 +0000
@@ -178,10 +178,12 @@
#SET (lib_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
SET (data_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/data)
SET (plugin_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/plugins)
+ set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_ROOT}/Modules)
else (QTONLY) # KDE4 on Mac...
set(data_dir ${DATA_INSTALL_DIR}/marble/data)
set(plugin_dir ${PLUGIN_INSTALL_DIR}/plugins/marble)
--- patch-src-shared-CLucene-config-repl_tchar.h.diff 2013-11-03 07:10:04.000000000 +0000
+++ CLucene-config-repl_tchar.h.diff 2013-12-12 21:09:32.000000000 +0000
@@ -1,63 +1,38 @@
-https://sourceforge.net/p/clucene/bugs/219/
---- a/src/shared/CLucene/config/repl_tchar.h
-+++ b/src/shared/CLucene/config/repl_tchar.h
-@@ -28,26 +28,26 @@
- #define _istdigit iswdigit //* digit char check
- #define _totlower towlower //* convert char to lower case
- #define _totupper towupper //* convert char to lower case
--- patch-src-shared-CLucene-LuceneThreads.h.diff 2013-11-03 07:10:04.000000000 +0000
+++ d 2013-12-12 21:09:20.000000000 +0000
@@ -1,13 +1,12 @@
-https://sourceforge.net/p/clucene/bugs/219/
---- a/src/shared/CLucene/LuceneThreads.h
-+++ b/src/shared/CLucene/LuceneThreads.h
+--- src/CLucene/LuceneThreads.h
++++ src/CLucene/LuceneThreads.h
@@ -7,6 +7,9 @@
#ifndef _LuceneThreads_h
--- patch-src-shared-CLucene-LuceneThreads.h.diff 2013-11-03 07:10:04.000000000 +0000
+++ CLucene-LuceneThreads.h.diff 2013-12-12 21:09:20.000000000 +0000
@@ -1,13 +1,12 @@
-https://sourceforge.net/p/clucene/bugs/219/
---- a/src/shared/CLucene/LuceneThreads.h
-+++ b/src/shared/CLucene/LuceneThreads.h
+--- src/CLucene/LuceneThreads.h
++++ src/CLucene/LuceneThreads.h
@@ -7,6 +7,9 @@
#ifndef _LuceneThreads_h
--- src/CLucene/config/repl_tchar.h
+++ src/CLucene/config/repl_tchar.h
@@ -26,28 +26,28 @@
#define _istdigit iswdigit //* digit char check
#define _totlower towlower //* convert char to lower case
#define _totupper towupper //* convert char to lower case
- #define _tcslwr wcslwr //* convert string to lower case
+ #define _tcslwr std::wcslwr //* convert string to lower case
//these are the string handling functions
--- src/CLucene/LuceneThreads.h
+++ src/CLucene/LuceneThreads.h
@@ -7,6 +7,9 @@
#ifndef _LuceneThreads_h
#define _LuceneThreads_h
+#if defined(_CL_HAVE_PTHREAD)
+ #include <pthread.h>
+#endif
--- qt.rb 2013-12-07 13:00:06.000000000 +0000
+++ ../../Formula/qt.rb 2013-12-01 23:59:19.000000000 +0000
@@ -2,20 +2,92 @@
class Qt < Formula
homepage 'http://qt-project.org/'
- url 'http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz'
- sha1 '745f9ebf091696c0d5403ce691dc28c039d77b9e'
+ if MacOS.version < :mavericks
+ url 'http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz'
bower angular#~1.x ENOTEMPTY ENOTEMPTY, rename '/tmp/ubuntu/bower/angular-1330-vHyk2C'
Stack trace:
Error: ENOTEMPTY, rename '/tmp/ubuntu/bower/angular-1330-vHyk2C'
Console trace:
Trace
at StandardRenderer.error (/pipeline/build/client-angular/node_modules/bower/lib/renderers/StandardRenderer.js:74:17)
at Logger.updateNotifier.packageName (/pipeline/build/client-angular/node_modules/bower/bin/bower:109:18)
at Logger.EventEmitter.emit (events.js:95:17)