From 3683df27174b1db3858018c21e532c456716fe66 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 16 Oct 2018 18:02:16 -0700 Subject: [PATCH] openobex: Update to 1.7.2 Add myself as maintainer. Cosmetic Makefile fixes for consistency between projects. Signed-off-by: Rosen Penev --- utils/openobex/Makefile | 9 +++++---- utils/openobex/patches/001-cxx.patch | 15 +++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/utils/openobex/Makefile b/utils/openobex/Makefile index bb50a3d709..88a2fa46c1 100644 --- a/utils/openobex/Makefile +++ b/utils/openobex/Makefile @@ -8,17 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openobex -PKG_VERSION:=1.7.1 +PKG_VERSION:=1.7.2 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-Source PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-Source.tar.gz PKG_SOURCE_URL:=@SF/openobex -PKG_HASH:=3b264665d90901ea4ff720332ffb9b6d1d8f67187463d3a3279caddc7205ea57 +PKG_HASH:=158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-Source +PKG_MAINTAINER:=Rosen Penev PKG_LICENSE:=GPL-2.0+ LGPL-2.1+ PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Nicolas Thill +PKG_CPE_ID:=cpe:/a:openobex:openobex include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/utils/openobex/patches/001-cxx.patch b/utils/openobex/patches/001-cxx.patch index 650458f0a7..ec53b4d1da 100644 --- a/utils/openobex/patches/001-cxx.patch +++ b/utils/openobex/patches/001-cxx.patch @@ -1,10 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 813f900..a0942e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required ( VERSION 2.8.5 FATAL_ERROR ) +@@ -1,7 +1,7 @@ + cmake_minimum_required ( VERSION 3.1 FATAL_ERROR ) --project ( openobex C ) -+project ( openobex C CXX ) + project ( openobex +- LANGUAGES C ++ LANGUAGES C CXX + VERSION 1.7.2 + ) - # - # The project version