From 708fac7b3bffb49dbafc3626aec1d94c40e0cfd2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Oct 2019 17:35:25 -0700 Subject: [PATCH 1/2] gammu: Update to 1.41 Remove upstreamed patch. Switched conditional dependency to python3 in preparation for deprecating Python 2. Signed-off-by: Rosen Penev (cherry picked from 99bbb8af310f058162cbf132f347759fd2267dc3) --- utils/gammu/Makefile | 8 ++++---- utils/gammu/patches/010-utils-shell-fix.patch | 16 ---------------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 utils/gammu/patches/010-utils-shell-fix.patch diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile index 81342a535..da938a3e7 100644 --- 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 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 index d1b3ec35b..000000000 --- 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 - # 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ř - # vim: expandtab sw=4 ts=4 sts=4: From 236e6a08cf574fe59335524b0817e6f401b84dfa Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 9 Oct 2019 18:08:10 +0800 Subject: [PATCH 2/2] gammu: Remove python dependency, fix lib symlinks This removes the python dependency from the package; according to the maintainer[1][2] the software does not depend on python. This also fixes the symlinks for libGammu.so and libgsmsd.so. Previously, the symlinks were overwritten by $(INSTALL_BIN) with copies of their sources. [1]: https://github.com/openwrt/packages/issues/8893#issuecomment-539136531 [2]: https://github.com/openwrt/packages/issues/8893#issuecomment-539152794 Signed-off-by: Jeffery To (cherry picked from 027ed92f6ed4adb1a90d36c2d3429106b326a53b) --- utils/gammu/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile index da938a3e7..cfb22d0e5 100644 --- a/utils/gammu/Makefile +++ b/utils/gammu/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gammu PKG_VERSION:=1.41.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dl.cihar.com/gammu/releases @@ -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_python3:python3 +PACKAGE_bluez-libs:bluez-libs + DEPENDS+=+PACKAGE_bluez-libs:bluez-libs DEPENDS+=+PACKAGE_libmariadb:libmariadb +PACKAGE_unixodbc:unixodbc +PACKAGE_libpq:libpq DEPENDS+=+PACKAGE_libusb-1.0:libusb-1.0 endef @@ -54,7 +54,7 @@ define Package/gammu/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu-{smsd,smsd-inject,smsd-monitor} $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/gammu $(1)/etc/config/gammu