git.iko.soy/unity8
on xenial help sign in
even more lens → scope renames
c4f013aMichał Sawicz
build_unity−10
compare with xenial
unifiedsplit
@@ -6,7 +6,6 @@ SETUP=false
6UPDATE=false
6UPDATE=false
7CLEAN=false
7CLEAN=false
8NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
8NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))
9−LENSES="applications mockmusic mockvideos"
10
9
11# verified working revisions
10# verified working revisions
12LIBUNITY_REV=228
11LIBUNITY_REV=228
@@ -136,14 +135,6 @@ compile_hud() {
136
135
137}
136}
138
137
139−link_lenses() {
140− echo "Linking system lenses.."
141− mkdir -p $BUILD_DIR/share/unity/lenses/
142− for LENS in $LENSES; do
143− [ -e $BUILD_DIR/share/unity/lenses/$LENS ] || ln -ivs /usr/share/unity/lenses/$LENS $BUILD_DIR/share/unity/lenses/$LENS
144− done
145−}
146−
147if $SETUP; then
138if $SETUP; then
148 echo "Setting up environment for building Unity.."
139 echo "Setting up environment for building Unity.."
149 install_utils
140 install_utils
@@ -163,6 +154,5 @@ else
163 compile_libunity
154 compile_libunity
164 compile_unity_core
155 compile_unity_core
165 compile_hud
156 compile_hud
166− link_lenses
167fi
157fi
168
158
plugins/Unity/scope.cpp+1−1
@@ -136,7 +136,7 @@ void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::Sco
136void Scope::fallbackActivate(const QString& uri)
136void Scope::fallbackActivate(const QString& uri)
137{
137{
138 /* FIXME: stripping all content before the first column because for some
138 /* FIXME: stripping all content before the first column because for some
139− reason the lenses give uri with junk content at their beginning.
139+ reason the scopes give uri with junk content at their beginning.
140 */
140 */
141 QString tweakedUri = uri;
141 QString tweakedUri = uri;
142 int firstColumnAt = tweakedUri.indexOf(":");
142 int firstColumnAt = tweakedUri.indexOf(":");