diff --git a/libs/gpgme/Makefile b/libs/gpgme/Makefile index 44bc374f79..f3f97b732a 100644 --- a/libs/gpgme/Makefile +++ b/libs/gpgme/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpgme -PKG_VERSION:=1.24.2 +PKG_VERSION:=2.0.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) -PKG_HASH:=e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581 +PKG_HASH:=821ab0695c842eab51752a81980c92b0410c7eadd04103f791d5d2a526784966 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=LGPL-2.1-or-later @@ -27,14 +27,6 @@ define Package/libgpgme DEPENDS:=+libassuan +libgpg-error endef -define Package/libgpgmepp - SECTION:=libs - CATEGORY:=Libraries - TITLE:=GnuPG Made Easy (GPGME) library (C++) - URL:=https://gnupg.org/software/gpgme/index.html - DEPENDS:=+libgpgme +libstdcpp -endef - define Package/libgpgme/description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for @@ -51,20 +43,17 @@ CONFIGURE_ARGS += \ --disable-gpg-test \ --disable-gpgsm-test \ --disable-g13-test \ - --enable-languages="cpp" + --enable-languages="" ifneq ($(CONFIG_USE_MUSL),) TARGET_CFLAGS += -D_LARGEFILE64_SOURCE endif define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/gpgme++ + $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/include/gpgme.h \ $(1)/usr/include/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/include/gpgme++/*.h \ - $(1)/usr/include/gpgme++/ $(INSTALL_DIR) $(1)/usr/lib $(CP) \ @@ -84,11 +73,6 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gpgme-glib.pc \ $(1)/usr/lib/pkgconfig - $(INSTALL_DIR) $(1)/usr/lib/cmake/Gpgmepp - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/cmake/Gpgmepp/*.cmake \ - $(1)/usr/lib/cmake/Gpgmepp - $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/bin/gpgme-config \ @@ -104,10 +88,4 @@ define Package/libgpgme/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpgme.so.* $(1)/usr/lib/ endef -define Package/libgpgmepp/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpgmepp.so.* $(1)/usr/lib/ -endef - $(eval $(call BuildPackage,libgpgme)) -$(eval $(call BuildPackage,libgpgmepp))