From 74281231ca6a856ffb929484fbdf3de6f4f36daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr> Date: Thu, 28 Aug 2014 18:39:21 +0200 Subject: [PATCH] [wip/hatptester] Move to version 1.5.0 Fix a linker error (remove the needed patch) Improve link with hatponboard --- hatptester/Makefile | 4 ++-- hatptester/depend.mk | 2 +- hatptester/distinfo | 7 +++---- hatptester/patches/patch-aa | 27 --------------------------- 4 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 hatptester/patches/patch-aa diff --git a/hatptester/Makefile b/hatptester/Makefile index 2f712ccb..3ea9bc0a 100644 --- a/hatptester/Makefile +++ b/hatptester/Makefile @@ -3,8 +3,8 @@ # DISTNAME= hatptester-${VERSION} -VERSION= 1.4.1 -PKGREVISION= 1 +VERSION= 1.5.0 +PKGREVISION= CATEGORIES= planning MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hatptester/} MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}hatp/hatptester diff --git a/hatptester/depend.mk b/hatptester/depend.mk index 3a4b8fc2..f560a88f 100644 --- a/hatptester/depend.mk +++ b/hatptester/depend.mk @@ -14,7 +14,7 @@ PREFER.hatpconsole?= robotpkg DEPEND_USE+= hatptester -DEPEND_ABI.hatptester?= hatptester>=1.4.1 +DEPEND_ABI.hatptester?= hatptester>=1.5.0 DEPEND_DIR.hatptester?= ../../wip/hatptester SYSTEM_SEARCH.hatptester=\ diff --git a/hatptester/distinfo b/hatptester/distinfo index d5ea497f..b87f960b 100644 --- a/hatptester/distinfo +++ b/hatptester/distinfo @@ -1,4 +1,3 @@ -SHA1 (hatptester-1.4.1.tar.gz) = 7a6533fed88358ece49bc841ab8bcd3a064c5cdf -RMD160 (hatptester-1.4.1.tar.gz) = 493b5f4301b188aa8a9b4d4e38e3e287a33ef05c -Size (hatptester-1.4.1.tar.gz) = 19698 bytes -SHA1 (patch-aa) = 20be8bb6cef5500bfbe9928ec02e7984c4d24c14 +SHA1 (hatptester-1.5.0.tar.gz) = 493693eaa10b25751887d5b59db6a07535a8ace1 +RMD160 (hatptester-1.5.0.tar.gz) = 921f9beb4eb00879b90cf409dedd4300eab26a0d +Size (hatptester-1.5.0.tar.gz) = 20947 bytes diff --git a/hatptester/patches/patch-aa b/hatptester/patches/patch-aa deleted file mode 100644 index 56aa58fd..00000000 --- a/hatptester/patches/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ -From c4ce62ce08fcabc00e6e89e3e503db5fbca2241b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr> -Date: Fri, 23 May 2014 18:16:16 +0200 -Subject: [PATCH] [CMake] Fix linker issue - -With the new version of Boost the System library is no longer -automatically linked, fix this issue. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git CMakeLists.txt CMakeLists.txt -index c32c382..6f49a83 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -14,7 +14,7 @@ set(APP_ASSOCIATED_TAG "v${APP_VERSION}") #Tag associated to the software versio - - find_package(msgconnector REQUIRED msgconnector) - find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui) --find_package(Boost REQUIRED thread regex signals program_options) -+find_package(Boost REQUIRED thread regex signals program_options system) - find_package(Threads) - - if(msgconnector_FOUND) --- -1.7.9.5 - -- GitLab