From patchwork Thu Jan 12 01:23:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: noreply@launchpad.net X-Patchwork-Id: 91020 Delivered-To: patches@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1399203qgi; Wed, 11 Jan 2017 17:23:28 -0800 (PST) X-Received: by 10.99.199.69 with SMTP id v5mr14291176pgg.90.1484184208037; Wed, 11 Jan 2017 17:23:28 -0800 (PST) Return-Path: Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id 20si7424783pfu.287.2017.01.11.17.23.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 11 Jan 2017 17:23:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mailfrom=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.76 #1 (Debian)) id 1cRU6w-00088u-JE for ; Thu, 12 Jan 2017 01:23:26 +0000 Received: from ackee.canonical.com (unknown [IPv6:::1]) by ackee.canonical.com (Postfix) with ESMTP id 82345E0149 for ; Thu, 12 Jan 2017 01:23:26 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Message-For: patches-linaro X-Launchpad-Notification-Type: branch-revision X-Launchpad-Branch: ~unity-team/nux/trunk X-Launchpad-Project: nux X-Launchpad-Branch-Revision-Number: 885 To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~unity-team/nux/trunk] Rev 885: debian/control: add libgtest-dev to build-dependency Message-Id: <20170112012326.32180.63698.launchpad@ackee.canonical.com> Date: Thu, 12 Jan 2017 01:23:26 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="18302"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 757a28809e9e5a6ac5e7e35fe15505da7794c978 Merge authors: Marco Trevisan (Treviño) (3v1n0) Related merge proposals: https://code.launchpad.net/~3v1n0/nux/gtest-dependency/+merge/314424 proposed by: Marco Trevisan (Treviño) (3v1n0) review: Approve - Andrea Azzarone (azzar1) ------------------------------------------------------------ revno: 885 [merge] author: Marco Trevisan (Treviño) committer: Bileto Bot branch nick: nux timestamp: Tue 2017-01-10 14:29:32 +0000 message: debian/control: add libgtest-dev to build-dependency modified: NuxCore/PropertyAnimation.h autogen.sh debian/control tests/gtest-nuxcore-animation.cpp -- lp:nux https://code.launchpad.net/~unity-team/nux/trunk You are subscribed to branch lp:nux. To unsubscribe from this branch go to https://code.launchpad.net/~unity-team/nux/trunk/+edit-subscription === modified file 'NuxCore/PropertyAnimation.h' --- NuxCore/PropertyAnimation.h 2016-07-22 09:35:47 +0000 +++ NuxCore/PropertyAnimation.h 2017-01-10 14:24:57 +0000 @@ -37,7 +37,7 @@ T const& finish, int ms_duration) { - std::shared_ptr > anim(new AnimateValue(start, finish, ms_duration)); + auto anim = std::make_shared>(start, finish, ms_duration); anim->updated.connect([&prop](T const& v) { prop = v; }); return anim; } === modified file 'autogen.sh' --- autogen.sh 2016-07-22 09:35:47 +0000 +++ autogen.sh 2017-01-10 14:25:59 +0000 @@ -2,8 +2,6 @@ srcdir=`dirname $0` -#PKG_NAME="Nux" - which gnome-autogen.sh || { echo "You need gnome-common from GNOME SVN" exit 1 === modified file 'debian/control' --- debian/control 2016-11-07 01:24:23 +0000 +++ debian/control 2017-01-10 12:51:14 +0000 @@ -13,6 +13,7 @@ libboost-filesystem-dev, libboost-system-dev, google-mock (>= 1.6.0+svn437), + libgtest-dev, libcairo2-dev (>= 1.9.14), libpng-dev, libglewmx-dev [!armel !armhf], === modified file 'tests/gtest-nuxcore-animation.cpp' --- tests/gtest-nuxcore-animation.cpp 2015-09-16 01:31:56 +0000 +++ tests/gtest-nuxcore-animation.cpp 2017-01-10 14:19:28 +0000 @@ -21,8 +21,6 @@ #include -#include - namespace na = nux::animation; namespace nt = nux::testing; @@ -789,7 +787,7 @@ nux::Property int_property; EXPECT_THAT(int_property(), Eq(0)); - boost::shared_ptr > anim = na::animate_property(int_property, 10, 20, 1000); + std::shared_ptr > anim = na::animate_property(int_property, 10, 20, 1000); anim->finished.connect([&anim]() {anim.reset();}); anim->Start();