Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6737 from neheb/gammu

Browse source 
gammu: Update to 1.39.0
This commit is contained in:
Dirk Brenken 2018-08-12 09:52:45 +02:00 committed by GitHub
commit ad8554b6d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/gammu/Makefile
View file

@ -9,15 +9,17 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gammu PKG_NAME:=gammu
PKG_VERSION:=1.38.4 PKG_VERSION:=1.39.0
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE_URL:=http://dl.cihar.com/gammu/releases/ PKG_SOURCE_URL:=https://dl.cihar.com/gammu/releases
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=a8ba1dc52ee82562abd57e9546c409f2f887f45187aae012fe43af0b730611ae PKG_HASH:=66d1d991d7a993fdf254d4c425f0fdd38c9cca15b1735936695a486067a6a9f8
PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru> PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
PKG_LICENCE:=GPL-2.0 PKG_LICENCE:=GPL-2.0
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -28,7 +30,7 @@ define Package/gammu
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=Cell phone/modem SMS and control tool TITLE:=Cell phone/modem SMS and control tool
URL:=http://dl.cihar.com/gammu/releases/ URL:=https://wammu.eu/gammu/
DEPENDS:=+libpthread +libcurl +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS) DEPENDS:=+libpthread +libcurl +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
DEPENDS+=+PACKAGE_python:python +PACKAGE_bluez-libs:bluez-libs DEPENDS+=+PACKAGE_python:python +PACKAGE_bluez-libs:bluez-libs
DEPENDS+=+PACKAGE_libmariadb:libmariadb +PACKAGE_unixodbc:unixodbc +PACKAGE_libpq:libpq DEPENDS+=+PACKAGE_libmariadb:libmariadb +PACKAGE_unixodbc:unixodbc +PACKAGE_libpq:libpq

41
utils/gammu/patches/001-iconv-disabling-option.patch
View file

@ -1,36 +1,41 @@
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
index 3ec0493..f716700 100644
--- a/cmake/FindIconv.cmake --- a/cmake/FindIconv.cmake
+++ b/cmake/FindIconv.cmake +++ b/cmake/FindIconv.cmake
@@ -34,9 +34,9 @@ string(REGEX REPLACE "(.*)/include/?" "\ @@ -9,10 +9,10 @@
include(CheckCCompilerFlag)
include(CheckCSourceCompiles)
FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c HINTS "${ICONV_INCLUDE_BASE_DIR}/lib" PATHS /opt/local/lib) -IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+IF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) # Already in cache, be silent
+IF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) SET(ICONV_FIND_QUIETLY TRUE)
SET(ICONV_FOUND TRUE) -ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) +ENDIF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+ENDIF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) IF(APPLE)
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) FIND_PATH(ICONV_INCLUDE_DIR iconv.h
diff --git a/configure b/configure
index 4f51ca7..5b0d993 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -31,6 +31,7 @@ Usage: ./configure [options] @@ -33,6 +33,7 @@ Usage: ./configure [options]
--enable-backup enable backup support --enable-backup enable backup support
--enable-win32 enable mingw crosscomilation --enable-win32 enable mingw crosscomilation
--enable-protection enable compile time protections --enable-protection enable compile time protections
+--disable-iconv disable iconv support +--disable-iconv disable iconv support
--with-python=<path> path to Python interpreter
--without-gnapplet disable installation of gnapplet --without-gnapplet disable installation of gnapplet
--without-completion disable installation of bash completion script --without-completion disable installation of bash completion script
@@ -57,6 +58,7 @@ CMAKE_PROTECTION=
CMAKE_PYTHON= @@ -57,6 +58,7 @@ CMAKE_CROSS=
CMAKE_PROTECTION=
CMAKE_GNAP= CMAKE_GNAP=
CMAKE_COMPLETE= CMAKE_COMPLETE=
+CMAKE_ICONV= +CMAKE_ICONV=
# process command line # process command line
while [ "$#" -gt 0 ] ; do while [ "$#" -gt 0 ] ; do
@@ -94,6 +96,12 @@ while [ "$#" -gt 0 ] ; do @@ -91,6 +93,12 @@ while [ "$#" -gt 0 ] ; do
--disable-protection) --disable-protection)
CMAKE_PROTECTION="-DENABLE_PROTECTION=OFF" CMAKE_PROTECTION="-DENABLE_PROTECTION=OFF"
;; ;;
@ -43,9 +48,9 @@
--enable-debug) --enable-debug)
CMAKE_DEBUG="-DCMAKE_BUILD_TYPE=Debug" CMAKE_DEBUG="-DCMAKE_BUILD_TYPE=Debug"
;; ;;
@@ -142,4 +150,4 @@ fi @@ -139,4 +147,4 @@ fi
cd "$BUILD_DIR" cd "$BUILD_DIR"
# invoke cmake to do configuration # invoke cmake to do configuration
-cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE -cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE
+cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV +cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV

2
utils/gammu/patches/002-no-fstack-protector.patch
View file

@ -1,6 +1,6 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -537,8 +537,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP @@ -511,8 +511,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
# MACRO_TUNE_LINKER("-pie") # MACRO_TUNE_LINKER("-pie")
# These do not work on Windows right now # These do not work on Windows right now
if (NOT WIN32) if (NOT WIN32)

14
utils/gammu/patches/003-cmake-cross-toolchain.patch
View file

@ -8,7 +8,7 @@
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -25,6 +25,7 @@ Usage: ./configure [options] @@ -27,6 +27,7 @@ Usage: ./configure [options]
--help|-h shows this help --help|-h shows this help
--prefix=<path> installation prefix --prefix=<path> installation prefix
@ -16,7 +16,7 @@
--enable-shared enables shared build --enable-shared enables shared build
--enable-debug enables debug build --enable-debug enables debug build
--enable-tiger enables Mac OS X 10.4 (Tiger) build --enable-tiger enables Mac OS X 10.4 (Tiger) build
@@ -50,6 +51,7 @@ SOURCE_DIR=`pwd` @@ -51,6 +52,7 @@ SOURCE_DIR=`pwd`
# cmake parameters # cmake parameters
CMAKE_PREFIX= CMAKE_PREFIX=
@ -32,12 +32,12 @@
+ CMAKE_ROOT="-DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/Toolchain-cross.cmake" + CMAKE_ROOT="-DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/Toolchain-cross.cmake"
+ echo "SET(CMAKE_FIND_ROOT_PATH ${1##--cross-root=})" >> $SOURCE_DIR/cmake/Toolchain-cross.cmake + echo "SET(CMAKE_FIND_ROOT_PATH ${1##--cross-root=})" >> $SOURCE_DIR/cmake/Toolchain-cross.cmake
+ ;; + ;;
--with-python=*) --enable-backup)
CMAKE_PYTHON="-DBUILD_PYTHON=${1##--with-python=}" CMAKE_BACKUP="-DWITH_BACKUP=ON"
;; ;;
@@ -150,4 +156,4 @@ fi @@ -147,4 +153,4 @@ fi
cd "$BUILD_DIR" cd "$BUILD_DIR"
# invoke cmake to do configuration # invoke cmake to do configuration
-cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV -cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV +cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV

12
utils/gammu/patches/004-cmake_libdbi_optional.patch
View file

@ -1,7 +1,7 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -36,6 +36,7 @@ Usage: ./configure [options] @@ -37,6 +37,7 @@ Usage: ./configure [options]
--with-python=<path> path to Python interpreter --disable-iconv disable iconv support
--without-gnapplet disable installation of gnapplet --without-gnapplet disable installation of gnapplet
--without-completion disable installation of bash completion script --without-completion disable installation of bash completion script
+--without-libdbi disable libdbi support +--without-libdbi disable libdbi support
@ -16,7 +16,7 @@
# process command line # process command line
while [ "$#" -gt 0 ] ; do while [ "$#" -gt 0 ] ; do
@@ -120,6 +122,9 @@ while [ "$#" -gt 0 ] ; do @@ -117,6 +119,9 @@ while [ "$#" -gt 0 ] ; do
--without-completion) --without-completion)
CMAKE_COMPLETE="-DINSTALL_BASH_COMPLETION=OFF" CMAKE_COMPLETE="-DINSTALL_BASH_COMPLETION=OFF"
;; ;;
@ -26,9 +26,9 @@
--build=*) --build=*)
;; ;;
--disable-dependency-tracking) --disable-dependency-tracking)
@@ -156,4 +161,4 @@ fi @@ -153,4 +158,4 @@ fi
cd "$BUILD_DIR" cd "$BUILD_DIR"
# invoke cmake to do configuration # invoke cmake to do configuration
-cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV -cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV
+cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV $CMAKE_LIBDBI +cmake $SOURCE_DIR $CMAKE_ROOT $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV $CMAKE_LIBDBI