From 8f40538d01f3b521d06adc4efcec7c4c4ce401c8 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Tue, 26 Sep 2017 00:56:50 -0400 Subject: [PATCH 1/4] readme: update issue tracker link --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 8d470c1c9..17136fb37 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ as those based upon the OpenSim platform. Singularity is maintained by a small group of volunteers who can be contacted both, in-world (SingularityViewer group) as well as on IRC (#SingularityViewer @ FreeNode). Bug requests and features requests can be submitted through our -Issue Tracker (http://code.google.com/p/singularity-viewer/issues/list or from +Issue Tracker (http://links.singularityviewer.org/?to=issues or from the viewer menu: Help --> Bug Reporting --> Singularity Issue Tracker...) From 740153475c85d9bfd6a05fea6a7acf3fafbf09c1 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Tue, 26 Sep 2017 00:22:29 -0400 Subject: [PATCH 2/4] Fix debian detection My OS wasn't getting detected as Debian. This fixes that. --- scripts/install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index 83c0ca69e..926c09ac3 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -15,7 +15,7 @@ if [ -f /etc/arch-release ]; then else pacman -S --asdeps ${DEPS} fi -elif [ -f /etc/lsb-release ]; then +elif [ -f /etc/lsb-release ] || [ -f /etc/debian_version ]; then $echo -e "\e[1;31mDebian/Ubuntu Linux detected!\e[0m" DEPS="libapr1-dev libaprutil1-dev build-essential libboost-dev libc-ares-dev cmake libcurl4-openssl-dev libdb-dev libdbus-glib-1-dev libexpat1-dev fontconfig libalut-dev libfreetype6-dev libgoogle-perftools-dev libglib2.0-dev libgstreamer-plugins-base0.10-dev libgtk2.0-dev libhunspell-dev libjpeg-turbo8-dev libogg-dev libpng12-dev libvorbis-dev libopenal-dev libssl-dev libpcre3-dev libqtwebkit-dev libsdl1.2-dev" for dep in $DEPS; do From c68b7ff4a89321cf3ed6b07ef33fc5864dd8a281 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Sat, 30 Sep 2017 14:12:58 -0400 Subject: [PATCH 3/4] Variables.cmake: typo fix - BOOl -> BOOL --- indra/cmake/Variables.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index ea904742e..76c0b1427 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -85,7 +85,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(LINUX ON BOOl FORCE) + set(LINUX ON BOOL FORCE) # If someone has specified a word size, use that to determine the # architecture. Otherwise, let the architecture specify the word size. From 5e3e46847e56bd411cbc8c3c7f8698cdb06034b2 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Sat, 30 Sep 2017 23:48:25 -0400 Subject: [PATCH 4/4] Variables.cmake: fix typo - Unkown -> Unknown --- indra/cmake/Variables.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index ea904742e..54b80ea00 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -108,7 +108,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(WORD_SIZE 32) set(AUTOBUILD_PLATFORM_NAME "linux") else() - message(FATAL_ERROR "Unkown Architecture!") + message(FATAL_ERROR "Unknown Architecture!") endif (CMAKE_SIZEOF_VOID_P EQUAL 8) endif (WORD_SIZE EQUAL 32)