diff --git a/lang/python/django-compressor/Makefile b/lang/python/django-compressor/Makefile index f015d5dd2..a4c9c4e09 100644 --- a/lang/python/django-compressor/Makefile +++ b/lang/python/django-compressor/Makefile @@ -9,38 +9,69 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-compressor PKG_VERSION:=2.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 + +PKG_SOURCE:=django_compressor-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/$(PKG_NAME)/ +PKG_HASH:=9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_SOURCE:=django_compressor-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://pypi.python.org/packages/82/76/1355459f90714517c52f264aa7245b52e59a273ec16e8f8d505fa6c342f8/ -PKG_HASH:=9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f - -PKG_BUILD_DIR:=$(BUILD_DIR)/django_compressor-$(PKG_VERSION)/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include ../python-package.mk +include ../python3-package.mk + +PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) -define Package/django-compressor +define Package/$(PKG_NAME)/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages TITLE:=Compress CSS/JS into single cached files - URL:=http://django-compressor.readthedocs.org/ - DEPENDS:=+python +python-django +django-appconf +python-rcssmin + URL:=https://$(PKG_NAME).readthedocs.io +endef + +define Package/python-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python-$(PKG_NAME):python \ + +PACKAGE_python-$(PKG_NAME):python-django \ + +PACKAGE_python-$(PKG_NAME):python-django-appconf \ + +PACKAGE_python-$(PKG_NAME):python-rcssmin VARIANT:=python endef -define Package/django-compressor/description +define Package/python-$(PKG_NAME)/description Compresses linked and inline JavaScript or CSS into single cached files. Note that the JavaScript filter is not being installed as a dependency. You'll need to build the rjsmin module (it is not par of the openwrt standard feeds) to use JavaScript functionality. endef -$(eval $(call PyPackage,django-compressor)) -$(eval $(call BuildPackage,django-compressor)) -$(eval $(call BuildPackage,django-compressor-src)) +define Package/python3-$(PKG_NAME) +$(call Package/$(PKG_NAME)/Default) + DEPENDS:= \ + +PACKAGE_python3-$(PKG_NAME):python3 \ + +PACKAGE_python3-$(PKG_NAME):python3-django \ + +PACKAGE_python3-$(PKG_NAME):python3-django-appconf \ + +PACKAGE_python3-$(PKG_NAME):python3-rcssmin + VARIANT:=python3 +endef + +define Package/python3-$(PKG_NAME)/description +$(call define Package/python-$(PKG_NAME)/description) +. +(Variant for Python3) +endef + +$(eval $(call PyPackage,python-$(PKG_NAME))) +$(eval $(call BuildPackage,python-$(PKG_NAME))) +$(eval $(call BuildPackage,python-$(PKG_NAME)-src)) + +$(eval $(call Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index 0a7fef9ce..962689ea5 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -24,7 +24,7 @@ include ../../lang/python/python-package.mk SEAFILE_PYTHON_DEPENDS:= \ simplejson chardet dateutil mysql pytz qrcode requests requests-oauthlib \ - django django-constance django-appconf + django django-constance django-appconf django-compressor define Package/seafile-seahub SECTION:=net @@ -32,7 +32,7 @@ define Package/seafile-seahub TITLE:=Seafile server - seahub component URL:=https://seafile.com/ DEPENDS:=+python +pillow \ - +django-compressor +django-formtools +django-jsonfield \ + +django-formtools +django-jsonfield \ +django-picklefield +django-postoffice +django-restframework \ +django-simple-captcha +django-statici18n +django-webpack-loader \ +python-flup +gunicorn +openpyxl \