From 5b796c9c5eadb29fe2d7fdf5af8836bc3845fa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz> Date: Wed, 13 Feb 2019 18:30:16 +0100 Subject: [PATCH] patches: packages: drop patch accepted by upstream --- .../0012-twisted-add-Python3-variant.patch | 77 ------------------- 1 file changed, 77 deletions(-) delete mode 100644 patches/packages/to-upstream/0012-twisted-add-Python3-variant.patch diff --git a/patches/packages/to-upstream/0012-twisted-add-Python3-variant.patch b/patches/packages/to-upstream/0012-twisted-add-Python3-variant.patch deleted file mode 100644 index 1923b5d39..000000000 --- a/patches/packages/to-upstream/0012-twisted-add-Python3-variant.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 045e76c8e9e6c2514278cf73eed25dcf34a73c1a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz> -Date: Tue, 12 Feb 2019 12:48:43 +0100 -Subject: [PATCH] twisted: add Python3 variant -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Karel KoÄŤĂ <karel.koci@nic.cz> ---- - lang/python/twisted/Makefile | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/lang/python/twisted/Makefile b/lang/python/twisted/Makefile -index 3b5608d3b..16e3ff7c1 100644 ---- a/lang/python/twisted/Makefile -+++ b/lang/python/twisted/Makefile -@@ -24,6 +24,7 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> - - include $(INCLUDE_DIR)/package.mk - include ../python-package.mk -+include ../python3-package.mk - - PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE) - -@@ -48,18 +49,48 @@ $(call Package/twisted/Default) - VARIANT:=python - endef - -+define Package/python3-twisted -+$(call Package/twisted/Default) -+ TITLE:=Python3 networking engine -+ DEPENDS:= \ -+ +PACKAGE_python3-twisted:python3-light \ -+ +PACKAGE_python3-twisted:python3-attrs \ -+ +PACKAGE_python3-twisted:python3-automat \ -+ +PACKAGE_python3-twisted:python3-constantly \ -+ +PACKAGE_python3-twisted:python3-incremental \ -+ +PACKAGE_python3-twisted:python3-hyperlink \ -+ +PACKAGE_python3-twisted:python3-zope-interface -+ VARIANT:=python3 -+endef -+ - define Package/twisted/description - Twisted is a networking engine written in Python, supporting numerous - protocols. It contains a web server, numerous chat clients, chat servers, - mail servers, and more. - endef - -+define Package/python3-twisted/description -+$(call Package/twisted/description) -+. -+(Variant for Python3) -+endef -+ - define PyPackage/twisted/filespec - +|/usr/bin - +|$(PYTHON_PKG_DIR) - -|$(PYTHON_PKG_DIR)/twisted/conch/scripts/tkconch.py - endef - -+define Py3Package/python3-twisted/filespec -++|/usr/bin -++|$(PYTHON3_PKG_DIR) -+-|$(PYTHON3_PKG_DIR)/twisted/conch/scripts/tkconch.py -+endef -+ - $(eval $(call PyPackage,twisted)) - $(eval $(call BuildPackage,twisted)) - $(eval $(call BuildPackage,twisted-src)) -+ -+$(eval $(call Py3Package,python3-twisted)) -+$(eval $(call BuildPackage,python3-twisted)) -+$(eval $(call BuildPackage,python3-twisted-src)) --- -2.20.1 - -- GitLab