diff -Nru unity-7.4.5+16.04.20171116/ChangeLog unity-7.4.5+16.04.20171201.3/ChangeLog --- unity-7.4.5+16.04.20171116/ChangeLog 2017-11-16 22:11:55.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/ChangeLog 2017-12-01 18:45:37.000000000 +0000 @@ -130,11 +130,7 @@ Panel: ensure the menu-manager tracker is updated to match monitor - Also always use an unique name for panel depending on monitor - -2017-04-07 Marco Trevisan (Treviño) - - Dash: fix the neko regression we have since a couple of cycles + Also always use an unique name for panel depending on monitor 2017-03-01 Marco Trevisan (Treviño) diff -Nru unity-7.4.5+16.04.20171116/dash/DashView.cpp unity-7.4.5+16.04.20171201.3/dash/DashView.cpp --- unity-7.4.5+16.04.20171116/dash/DashView.cpp 2017-11-16 22:11:55.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/dash/DashView.cpp 2017-12-01 18:45:19.000000000 +0000 @@ -122,7 +122,6 @@ , last_activated_timestamp_(0) , activate_on_finish_(false) , visible_(false) - , neko_mode_(false) , opening_column_x_(-1) , opening_row_y_(-1) , opening_column_width_(0) @@ -139,10 +138,6 @@ QueueDraw(); }); - gsize tmp_sz; - glib::String neko((gchar*)g_base64_decode("VU5JVFlfTkVLTw==", &tmp_sz)); - neko_mode_ = g_getenv(neko) != nullptr; - SetupViews(); SetupUBusConnections(); AddChild(overlay_window_buttons_.GetPointer()); @@ -1295,7 +1290,6 @@ nux::ObjectPtr view(new ScopeView(scope, search_bar_->show_filters())); AddChild(view.GetPointer()); view->scale = scale(); - view->neko_mode = neko_mode_; view->SetVisible(false); view->result_activated.connect(sigc::mem_fun(this, &DashView::OnResultActivated)); @@ -1433,25 +1427,6 @@ { if (active_scope_view_.IsValid()) { - const std::array nekos = { - "d2VsY29tZSBiYWNrIHVuaXR5=", - "ZmFyZXdlbGwgdW5pdHk=", - }; - - for (unsigned i = 0; i < nekos.size(); ++i) - { - gsize tmp_sz; - glib::String neko((gchar*)g_base64_decode(nekos[i], &tmp_sz)); - if (search_bar_->search_string() == neko.Str()) - { - for (auto const& view : scope_views_) - view.second->neko_mode = (i != 0); - - search_bar_->search_string = ""; - return; - } - } - if (!activate_delay_ && !search_bar_->in_live_search()) active_scope_view_->ActivateFirst(); else diff -Nru unity-7.4.5+16.04.20171116/dash/DashView.h unity-7.4.5+16.04.20171201.3/dash/DashView.h --- unity-7.4.5+16.04.20171116/dash/DashView.h 2017-11-16 22:11:55.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/dash/DashView.h 2017-12-01 18:45:19.000000000 +0000 @@ -175,7 +175,6 @@ bool activate_on_finish_; glib::Source::UniquePtr activate_delay_; bool visible_; - bool neko_mode_; nux::ObjectPtr dash_view_copy_; nux::ObjectPtr search_view_copy_; diff -Nru unity-7.4.5+16.04.20171116/dash/ResultRendererTile.cpp unity-7.4.5+16.04.20171201.3/dash/ResultRendererTile.cpp --- unity-7.4.5+16.04.20171116/dash/ResultRendererTile.cpp 2017-11-16 22:11:55.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/dash/ResultRendererTile.cpp 2017-12-01 18:45:37.000000000 +0000 @@ -90,9 +90,8 @@ NUX_IMPLEMENT_OBJECT_TYPE(ResultRendererTile); -ResultRendererTile::ResultRendererTile(NUX_FILE_LINE_DECL, bool neko_mode) +ResultRendererTile::ResultRendererTile(NUX_FILE_LINE_DECL) : ResultRenderer(NUX_FILE_LINE_PARAM) - , neko_mode_(neko_mode) { UpdateWidthHeight(); scale.changed.connect([this] (double) { UpdateWidthHeight(); }); @@ -272,20 +271,7 @@ int tile_gsize = style.GetTileGIconSize().CP(scale); std::string const& icon_hint = row.icon_hint; - std::string icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON; - - if (neko_mode_) - { - const std::array pool = { - "aHR0cDovL3BsYWNla2l0dGVuLmNvbS9nLyVpLyVpLw==", - "aHR0cDovL3BsYWNla2l0dGVuLmNvbS8laS8laS8=", - }; - gsize tmp0; - int tmp1 = tile_size - (rand() % RawPixel(16).CP(scale)); - int tmp2 = tile_size - (rand() % RawPixel(16).CP(scale)); - glib::String tmp3((gchar*)g_base64_decode(pool[rand() % pool.size()], &tmp0)); - icon_name = glib::String(g_strdup_printf(tmp3, tmp1, tmp2)).Str(); - } + std::string const& icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON; glib::Object icon(g_icon_new_for_string(icon_name.c_str(), nullptr)); TextureContainer* container = row.renderer(); diff -Nru unity-7.4.5+16.04.20171116/dash/ResultRendererTile.h unity-7.4.5+16.04.20171201.3/dash/ResultRendererTile.h --- unity-7.4.5+16.04.20171116/dash/ResultRendererTile.h 2017-11-16 22:11:55.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/dash/ResultRendererTile.h 2017-12-01 18:45:19.000000000 +0000 @@ -59,7 +59,7 @@ public: NUX_DECLARE_OBJECT_TYPE(ResultRendererTile, ResultRenderer); - ResultRendererTile(NUX_FILE_LINE_PROTO, bool neko_mode = false); + ResultRendererTile(NUX_FILE_LINE_PROTO); virtual ~ResultRendererTile() {} virtual void Render(nux::GraphicsEngine& GfxContext, @@ -95,8 +95,6 @@ int width, int height); void UpdateWidthHeight(); - - bool neko_mode_; }; } diff -Nru unity-7.4.5+16.04.20171116/dash/ScopeView.cpp unity-7.4.5+16.04.20171201.3/dash/ScopeView.cpp --- unity-7.4.5+16.04.20171116/dash/ScopeView.cpp 2017-11-16 22:11:55.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/dash/ScopeView.cpp 2017-12-01 18:45:19.000000000 +0000 @@ -143,7 +143,6 @@ , filters_expanded(false) , can_refine_search(false) , scale(DEFAULT_SCALE) -, neko_mode(false) , scope_(scope) , no_results_active_(false) , last_good_filter_model_(-1) @@ -173,8 +172,6 @@ conn_manager_.Add(scope_->filters.changed.connect(sigc::mem_fun(this, &ScopeView::SetupFilters))); SetupFilters(scope->filters); - neko_mode.changed.connect([this] (bool) { SetupCategories(scope_->categories); }); - scope_->connected.changed.connect([this](bool is_connected) { // We need to search again if we were reconnected after being connected before. @@ -488,7 +485,7 @@ } else { - results_view->SetModelRenderer(new ResultRendererTile(NUX_TRACKER_LOCATION, neko_mode())); + results_view->SetModelRenderer(new ResultRendererTile(NUX_TRACKER_LOCATION)); } if (scope_) diff -Nru unity-7.4.5+16.04.20171116/dash/ScopeView.h unity-7.4.5+16.04.20171201.3/dash/ScopeView.h --- unity-7.4.5+16.04.20171116/dash/ScopeView.h 2017-11-16 22:11:55.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/dash/ScopeView.h 2017-12-01 18:45:19.000000000 +0000 @@ -72,7 +72,6 @@ nux::Property view_type; nux::Property can_refine_search; nux::Property scale; - nux::Property neko_mode; sigc::signal result_activated; diff -Nru unity-7.4.5+16.04.20171116/debian/changelog unity-7.4.5+16.04.20171201.3/debian/changelog --- unity-7.4.5+16.04.20171116/debian/changelog 2017-12-04 20:04:13.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/debian/changelog 2017-12-04 20:04:13.000000000 +0000 @@ -1,4 +1,4 @@ -unity (7.4.5+16.04.20171116) xenial; urgency=medium +unity (7.4.5+16.04.20171201.3) xenial; urgency=medium [ Marco Trevisan (Treviño) ] * InputMonitor: add an unity class that monitors XInput2 events and @@ -30,8 +30,6 @@ scaling (LP: #1666359) * UnityWindow: safely check validity of UnityWindow from scaled one (LP: #1659847) - * Dash: fix the neko regression we have since a couple of cycles (LP: - #1680927) * Panel: ensure the menu-manager tracker is updated to match monitor (LP: #1671432) * compiz-profile-setter: tool to update the current profile and use in @@ -76,7 +74,7 @@ [ Nick Dedekind ] * Fixed tooltip scaling issues. (LP: #1673950) - -- Marco Trevisan (Treviño) Thu, 16 Nov 2017 22:12:17 +0000 + -- Marco Trevisan (Treviño) Fri, 01 Dec 2017 18:46:01 +0000 unity (7.4.0+16.04.20160906-0ubuntu1) xenial; urgency=medium diff -Nru unity-7.4.5+16.04.20171116/debian/rules unity-7.4.5+16.04.20171201.3/debian/rules --- unity-7.4.5+16.04.20171116/debian/rules 2017-12-04 20:04:13.000000000 +0000 +++ unity-7.4.5+16.04.20171201.3/debian/rules 2017-12-04 20:04:13.000000000 +0000 @@ -6,6 +6,7 @@ DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) gles2_architectures := armel armhf +disable_tests_archs := powerpc DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') @@ -53,8 +54,10 @@ override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disable_tests_archs))) make -C obj-$(DEB_HOST_GNU_TYPE) check-headless endif +endif %: dh $@ --with translations,quilt,python2,python3,migrations --parallel