From 58d092aed7d62e275333f497d90863c192c499f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 08:29:28 +0700 Subject: [PATCH 1/5] sabnzbd: update to 3.0.2. --- ...-00-system-configobj-feedparser-gntp.patch | 22 -------------- srcpkgs/sabnzbd/template | 29 +++++++++---------- 2 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch diff --git a/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch b/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch deleted file mode 100644 index e0b1cb98a0b..00000000000 --- a/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj-feedparser-gntp.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- sabnzbd/config.py.orig -+++ sabnzbd/config.py -@@ -30,7 +30,7 @@ - from urlparse import urlparse - import sabnzbd.misc - from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER --from sabnzbd.utils import configobj -+import configobj - from sabnzbd.decorators import synchronized - - CONFIG_LOCK = threading.Lock() ---- sabnzbd/rss.py.orig -+++ sabnzbd/rss.py -@@ -35,7 +35,7 @@ - import sabnzbd.emailer as emailer - from sabnzbd.encoding import unicoder, xml_name - --import sabnzbd.utils.feedparser as feedparser -+import feedparser - - __RSS = None # Global pointer to RSS-scanner instance - diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template index a45b6535c33..ed3dd23016b 100644 --- a/srcpkgs/sabnzbd/template +++ b/srcpkgs/sabnzbd/template @@ -1,40 +1,39 @@ # Template file for 'sabnzbd' pkgname=sabnzbd -version=2.3.9 +version=3.0.2 revision=1 -archs=noarch wrksrc="SABnzbd-${version}" pycompile_dirs="/usr/share/sabnzbd" -depends="par2cmdline python-cheetah python-configobj python-feedparser - python-gntp python-openssl python-yenc unzip" +hostmakedepends="python3 gettext" +depends="par2cmdline python3-sabyenc3 python3-cheetah3 python3-cryptography + python3-feedparser python3-configobj python3-CherryPy + python3-portend python3-chardet python3-notify2 unzip" short_desc="Open Source Binary Newsreader written in Python" maintainer="Orphaned " -license="GPL-2.0-or-later" +license="GPL-2.0-or-later, custom:Bundled" homepage="https://sabnzbd.org/" changelog="https://github.com/sabnzbd/sabnzbd/releases" distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz" -checksum=f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c -python_version=2 #unverified +checksum=c93f95d9193061ba653c2ab592704c7a8e9b6146817f80e4e2420b3f74b976b2 +python_version=3 post_extract() { rm -rf gntp sabnzbd/utils/{feedparser,configobj}.py rm -f licenses/License-{feedparser,configobj,gntp,Python}.txt rm -rf solaris +} - # sabnzbd bundles a heavily modified version of cherrypy. It's - # uncertain what base version they use, or where each individual - # patch came from, so using upstream cherrypy isn't an option. - - # sabnzbd also bundles a variety of small libraries, some of which - # haven't been maintained since 2006. There may be no point to - # packaging them separately. +do_build() { + python3 tools/make_mo.py } do_install() { vbin ${FILESDIR}/sabnzbd - vmkdir usr/share/sabnzbd vcopy "*" usr/share/sabnzbd + rm -rf $DESTDIR/usr/share/sabnzbd/po + rm -rf $DESTDIR/usr/share/sabnzbd/tools + rm -rf $DESTDIR/usr/share/sabnzbd/tests for _f in licenses/* COPYRIGHT.txt; do vlicense ${_f} From e5f3e8ee6555f954b4d08e4d2abf80103a1ef5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 08:29:38 +0700 Subject: [PATCH 2/5] New package: python3-sabyenc3-4.0.2 --- srcpkgs/python3-sabyenc3/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/python3-sabyenc3/template diff --git a/srcpkgs/python3-sabyenc3/template b/srcpkgs/python3-sabyenc3/template new file mode 100644 index 00000000000..7df3ac9bdb0 --- /dev/null +++ b/srcpkgs/python3-sabyenc3/template @@ -0,0 +1,15 @@ +# Template file for 'python3-sabyenc3' +pkgname=python3-sabyenc3 +version=4.0.2 +revision=1 +wrksrc=sabyenc3-$version +build_style=python3-module +hostmakedepends="python3-setuptools" +makedepends="python3-devel" +depends="python3" +short_desc="SABYEnc - yEnc Decoding for Python 3" +maintainer="Đoàn Trần Công Danh " +license="LGPL-3.0-or-later" +homepage="https://github.com/sabnzbd/sabyenc/" +distfiles="$PYPI_SITE/s/sabyenc3/sabyenc3-$version.tar.gz" +checksum=dfaa0bdd01752a9cfde0d349a8f4e178b04b1cf9c1bc018b287961192cd2bb90 From 97838c94fdfff117bf9f834ed5e658e7e6660f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 23:01:02 +0700 Subject: [PATCH 3/5] numlockx: released under MIT not JSON JSON is non-free-license. --- srcpkgs/numlockx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/numlockx/template b/srcpkgs/numlockx/template index c219eb2e32a..409573ee3fc 100644 --- a/srcpkgs/numlockx/template +++ b/srcpkgs/numlockx/template @@ -1,12 +1,12 @@ # Template file for 'numlockx' pkgname=numlockx version=1.2 -revision=4 +revision=5 build_style=gnu-configure makedepends="libX11-devel libSM-devel libXext-devel libXtst-devel" short_desc="Activate NumLock at startup" maintainer="Carlo Dormeletti " -license="JSON" +license="MIT" homepage="http://www.mike-devlin.com/linux/README-numlockx.htm" distfiles="${DEBIAN_SITE}/main/n/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4 From 2510494a02ff35bfe53065e3390abd84017a95d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 23:07:45 +0700 Subject: [PATCH 4/5] rapidjson: clear all JSON licensed code --- srcpkgs/rapidjson/template | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template index 6bc0b221f88..65aa47cec36 100644 --- a/srcpkgs/rapidjson/template +++ b/srcpkgs/rapidjson/template @@ -1,10 +1,9 @@ # Template build file for 'rapidjson'. pkgname=rapidjson version=1.1.0 -revision=2 +revision=3 build_style=cmake -archs=noarch -short_desc="A fast JSON parser/generator for C++ with both SAX/DOM style API" +short_desc="Fast JSON parser/generator for C++ with both SAX/DOM style API" maintainer="Alexander Egorenkov " license="BSD, MIT" homepage="https://github.com/miloyip/rapidjson" @@ -13,6 +12,14 @@ checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e CXXFLAGS="-Wno-type-limits" +post_patch() { + # Remove bin/jsonchecker, which is the JSON licensed files + rm -rf bin/jsonchecker + vsed -i license.txt \ + -e 's/To avoid the problematic JSON.*//' \ + -e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d' +} + post_install() { vlicense license.txt } From 2716f990b500238d9b2a7fedcfa4e3e3b020a727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 1 Oct 2020 23:18:37 +0700 Subject: [PATCH 5/5] rlottie: clear JSON license mention The tarball never contains any non-free JSON licensed code. --- srcpkgs/rlottie/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rlottie/template b/srcpkgs/rlottie/template index c4c9b65ff1e..8902680b215 100644 --- a/srcpkgs/rlottie/template +++ b/srcpkgs/rlottie/template @@ -2,19 +2,23 @@ pkgname=rlottie _commit=f6fc61f214945ac9961ba49fdfc9a3d3336e999b version=0.0.20200110 -revision=1 +revision=2 wrksrc="rlottie-${_commit}" build_style=cmake configure_args="-DLOTTIE_CACHE=OFF" short_desc="Platform independent standalone library that plays Lottie Animation" maintainer="John " -license="LGPL-2.1-or-later, FTL, MIT, JSON, BSD-3-Clause" +license="LGPL-2.1-or-later, FTL, MIT, BSD-3-Clause" homepage="https://github.com/Samsung/rlottie" distfiles="https://github.com/Samsung/rlottie/archive/${_commit}.tar.gz" checksum=399bb06d8d2120f794eff8bc3e4cbbee13b9f22abcfd9f3f746f595d43ea0b42 post_patch() { vsed -e 's/c++14/c++17/g' -i CMakeLists.txt + # No JSON licensed source code included + vsed -i licenses/COPYING.RPD \ + -e 's/To avoid the problematic JSON.*//' \ + -e '/Under the JSON License/,/OTHER DEALINGS IN THE SOFTWARE/d' } post_install() {