gammu: Update to 1.41

Remove upstreamed patch.

Switched conditional dependency to python3 in preparation for deprecating
Python 2.

Signed-off-by: Rosen Penev <redacted>

diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile
index 81342a535a373df5714d2fdc164bbc5655c9a585..da938a3e77a53c220ddd056dd425cfebe4b73707 100644 (file)
--- a/utils/gammu/Makefile
+++ b/utils/gammu/Makefile
@@ -9,19 +9,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gammu
-PKG_VERSION:=1.40.0
+PKG_VERSION:=1.41.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://dl.cihar.com/gammu/releases
-PKG_HASH:=a760a3520d9f3a16a4ed73cefaabdbd86125bec73c6fa056ca3f0a4be8478dd6
+PKG_HASH:=8426b69b07b259de301f41163fab5587935e27b94cc5eefab9277773b3e4df8f
 
 PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
 PKG_LICENCE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -33,7 +33,7 @@ define Package/gammu
        TITLE:=Cell phone/modem SMS and control tool
        URL:=https://wammu.eu/gammu/
        DEPENDS:=+libpthread +libcurl +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
-       DEPENDS+=+PACKAGE_python:python +PACKAGE_bluez-libs:bluez-libs
+       DEPENDS+=+PACKAGE_python3:python3 +PACKAGE_bluez-libs:bluez-libs
        DEPENDS+=+PACKAGE_libmariadb:libmariadb +PACKAGE_unixodbc:unixodbc +PACKAGE_libpq:libpq
        DEPENDS+=+PACKAGE_libusb-1.0:libusb-1.0
 endef

diff --git a/utils/gammu/patches/010-utils-shell-fix.patch b/utils/gammu/patches/010-utils-shell-fix.patch
deleted file mode 100644 (file)
index d1b3ec3..0000000
--- a/utils/gammu/patches/010-utils-shell-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/utils/gammu-config
-+++ b/utils/gammu-config
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # Gammu configuration generator
- # Copyright (C) 2003 - 2009 Michal Cihar <michal@cihar.com>
- # vim: expandtab sw=4 ts=4 sts=4:
---- a/utils/jadmaker
-+++ b/utils/jadmaker
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # JAD file generator
- # Copyright © 2008 - 2009 Michal Čihař <michal@cihar.com>
- # vim: expandtab sw=4 ts=4 sts=4: