From ef77f9940e50b9e6db760437ab79a54a608b26ee Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 15 May 2019 16:42:19 -0300 Subject: [PATCH 1/2] python-rcssmin: restore & update removed package This is a dependency of django-compressor. The package Makefile was reworked, and a python3 variant was added. Maintainer was changed to Alexandru Ardelean & Eneas U de Queiroz. Signed-off-by: Eneas U de Queiroz --- lang/python/python-rcssmin/Makefile | 71 +++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 lang/python/python-rcssmin/Makefile diff --git a/lang/python/python-rcssmin/Makefile b/lang/python/python-rcssmin/Makefile new file mode 100644 index 000000000..f1e4477fa --- /dev/null +++ b/lang/python/python-rcssmin/Makefile @@ -0,0 +1,71 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-rcssmin +PKG_VERSION:=1.0.6 +PKG_RELEASE=1 + +PKG_MAINTAINER:=Alexandru Ardelean , Eneas U de Queiroz +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=LICENSE + +PKG_SOURCE:=rcssmin-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/r/rcssmin +PKG_HASH:=ca87b695d3d7864157773a61263e5abb96006e9ff0e021eff90cbe0e1ba18270 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-rcssmin-$(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/python-rcssmin/Default + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Fast CSS minifier for Python + URL:=http://opensource.perlig.de/rcssmin/ +endef + +define Package/python-rcssmin + $(call Package/python-rcssmin/Default) + DEPENDS:= \ + +PACKAGE_python-rcssmin:python-light \ + +PACKAGE_python-rcssmin:python-codecs + VARIANT:=python +endef + +define Package/python3-rcssmin + $(call Package/python-rcssmin/Default) + DEPENDS:= \ + +PACKAGE_python3-rcssmin:python3-light + VARIANT:=python3 +endef + +define Package/python-rcssmin/description + This module is a re-implementation aiming for speed instead of maximum compression, + so it can be used at runtime (rather than during a preprocessing step). + RCSSmin does syntactical compression only (removing spaces, comments and possibly + semicolons). It does not provide semantic compression (like removing empty blocks, + collapsing redundant properties etc). +endef + +define Package/python3-rcssmin/description +$(call Package/python-rcssmin/description) +. +(Variant for Python3) +endef + +$(eval $(call PyPackage,python-rcssmin)) +$(eval $(call BuildPackage,python-rcssmin)) +$(eval $(call BuildPackage,python-rcssmin-src)) + +$(eval $(call Py3Package,python3-rcssmin)) +$(eval $(call BuildPackage,python3-rcssmin)) +$(eval $(call BuildPackage,python3-rcssmin-src)) From 016ef28dff0444504a05073cc9a5ac0bc8f64002 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 15 May 2019 16:45:56 -0300 Subject: [PATCH 2/2] django-compressor: add missing dependencies. Added python-rcssmin, and django-appconfig as dependencies, and a note in the package help text about not having a rjsmin package, so the jsmin (javascript) filter will not work. Adjusted the Makefile to conform to current python-package style, and to display the package title correctly in menuconfig. Signed-off-by: Eneas U de Queiroz --- lang/python/django-compressor/Makefile | 30 ++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/lang/python/django-compressor/Makefile b/lang/python/django-compressor/Makefile index 36a9e91b6..52018abd7 100644 --- a/lang/python/django-compressor/Makefile +++ b/lang/python/django-compressor/Makefile @@ -9,14 +9,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django-compressor PKG_VERSION:=2.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 + +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_BUILD_DIR:=$(BUILD_DIR)/django_compressor-$(PKG_VERSION)/ PKG_HASH:=9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f -PKG_MAINTAINER:=Alexandru Ardelean + +PKG_BUILD_DIR:=$(BUILD_DIR)/django_compressor-$(PKG_VERSION)/ include $(INCLUDE_DIR)/package.mk include ../python-package.mk @@ -25,24 +28,19 @@ define Package/django-compressor SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - TITLE:=Compresses linked and inline JavaScript or CSS into single cached files. + TITLE:=Compress CSS/JS into single cached files URL:=http://django-compressor.readthedocs.org/ - DEPENDS:=+python +django + DEPENDS:=+python +django +django-appconf +python-rcssmin + VARIANT:=python endef define Package/django-compressor/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 -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) -endef - -define Package/django-compressor/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - +$(eval $(call PyPackage,django-compressor)) $(eval $(call BuildPackage,django-compressor)) +$(eval $(call BuildPackage,django-compressor-src))