diff options
| author | Gergely Kiss <mail.gery@gmail.com> | 2017-10-22 23:43:09 +0200 |
|---|---|---|
| committer | Gergely Kiss <mail.gery@gmail.com> | 2017-10-22 23:43:09 +0200 |
| commit | 252442d2946daa207446a43a44921c7f3e3578ac (patch) | |
| tree | f21e36345cfca23933988e3923e10143a5f2cba2 /net/seafile-seahub | |
| parent | 39a9b7867c5d93ea5bca0419901b7293352081f8 (diff) | |
seafile: upgrade to 6.2.2
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
Diffstat (limited to 'net/seafile-seahub')
| -rw-r--r-- | net/seafile-seahub/Makefile | 8 | ||||
| -rw-r--r-- | net/seafile-seahub/patches/020-Makefile-fixes.patch | 26 |
2 files changed, 24 insertions, 10 deletions
diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index 32eebf5fa..332739cae 100644 --- a/net/seafile-seahub/Makefile +++ b/net/seafile-seahub/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-seahub -PKG_VERSION:=6.0.7 -PKG_RELEASE=$(PKG_SOURCE_VERSION)-2 +PKG_VERSION:=6.2.2 +PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 PKG_LICENSE:=Apache-2.0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/haiwen/seahub.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=2cf75b17a372216a88842172f769d61f621416fd +PKG_SOURCE_VERSION:=120e7a299e77968f1af48ea2dcf4bd9b909c426f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=69e90cff3bb63967bca1bd04c8e25ff6f89aa5dba595df29854115c3560d9804 +PKG_MIRROR_HASH:=511500c40dd7b1009f77109c6df810df1cf2c17a84a8f6841d592a9e05d22064 include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk) diff --git a/net/seafile-seahub/patches/020-Makefile-fixes.patch b/net/seafile-seahub/patches/020-Makefile-fixes.patch index 49b67f8f1..c25f3d555 100644 --- a/net/seafile-seahub/patches/020-Makefile-fixes.patch +++ b/net/seafile-seahub/patches/020-Makefile-fixes.patch @@ -1,6 +1,6 @@ -diff -rupN seafile-seahub-5.1.1.orig/Makefile seafile-seahub-5.1.1/Makefile ---- seafile-seahub-5.1.1.orig/Makefile 2016-04-26 23:59:48.000000000 +0200 -+++ seafile-seahub-5.1.1/Makefile 2016-04-28 09:03:35.507105416 +0200 +diff -rupN seafile-seahub-6.2.2.orig/Makefile seafile-seahub-6.2.2/Makefile +--- seafile-seahub-6.2.2.orig/Makefile 2017-10-22 22:28:22.000000000 +0200 ++++ seafile-seahub-6.2.2/Makefile 2017-10-22 22:46:18.007470936 +0200 @@ -1,3 +1,6 @@ +include $(TOPDIR)/rules.mk +$(call include_mk, python-package.mk) @@ -8,16 +8,18 @@ diff -rupN seafile-seahub-5.1.1.orig/Makefile seafile-seahub-5.1.1/Makefile PROJECT=seahub develop: setup-git -@@ -9,7 +12,7 @@ dist: locale uglify statici18n collectst +@@ -9,7 +12,9 @@ dist: locale uglify statici18n collectst locale: @echo "--> Compile locales" -- django-admin.py compilemessages +- django-admin.py compilemessages && cd seahub/two_factor && django-admin.py compilemessages ++ $(call HostPython,,$(STAGING_DIR)/usr/bin/django-admin.py compilemessages) ++ cd seahub/two_factor + $(call HostPython,,$(STAGING_DIR)/usr/bin/django-admin.py compilemessages) @echo "" uglify: -@@ -19,7 +22,7 @@ uglify: +@@ -19,17 +24,17 @@ uglify: statici18n: @echo "--> Generate JS locale files in static/scripts/i18n" @@ -26,3 +28,15 @@ diff -rupN seafile-seahub-5.1.1.orig/Makefile seafile-seahub-5.1.1/Makefile collectstatic: @echo "--> Collect django static files to media/assets" + rm -rf media/assets 2> /dev/null +- python manage.py collectstatic --noinput ++ $(call HostPython,,manage.py collectstatic --noinput) + + compressstatic: + @echo "--> Compress static files(css) to media/CACHE" + rm -rf media/CACHE 2> /dev/null +- python manage.py compress ++ $(call HostPython,,manage.py compress) + + clean: + @echo '--> Cleaning media/static cache & dist' |