Date: Monday, December 6, 2021 @ 17:32:46 Author: arojas Revision: 1065293
archrelease: copy trunk to community-any Added: fanficfare/repos/community-any/0001-makeplugin-do-not-bundle-system-dependencies.patch (from rev 1065292, fanficfare/trunk/0001-makeplugin-do-not-bundle-system-dependencies.patch) fanficfare/repos/community-any/PKGBUILD (from rev 1065292, fanficfare/trunk/PKGBUILD) fanficfare/repos/community-any/changelog.txt (from rev 1065292, fanficfare/trunk/changelog.txt) Deleted: fanficfare/repos/community-any/0001-makeplugin-do-not-bundle-system-dependencies.patch fanficfare/repos/community-any/PKGBUILD fanficfare/repos/community-any/changelog.txt ---------------------------------------------------------+ 0001-makeplugin-do-not-bundle-system-dependencies.patch | 74 +++++------ PKGBUILD | 92 +++++++------- changelog.txt | 86 ++++++------- 3 files changed, 126 insertions(+), 126 deletions(-) Deleted: 0001-makeplugin-do-not-bundle-system-dependencies.patch =================================================================== --- 0001-makeplugin-do-not-bundle-system-dependencies.patch 2021-12-06 17:32:31 UTC (rev 1065292) +++ 0001-makeplugin-do-not-bundle-system-dependencies.patch 2021-12-06 17:32:46 UTC (rev 1065293) @@ -1,37 +0,0 @@ -From a483e39777470538e2e94cb5048b3dc370a35e83 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwa...@archlinux.org> -Date: Sun, 18 Apr 2021 15:35:15 -0400 -Subject: [PATCH] makeplugin: do not bundle system dependencies - ---- - makeplugin.py | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/makeplugin.py b/makeplugin.py -index 6ee101fb..e6f7c20c 100644 ---- a/makeplugin.py -+++ b/makeplugin.py -@@ -34,19 +34,9 @@ if __name__=="__main__": - files, - exclude=exclude) - -- os.chdir('../included_dependencies') -- files=['bs4','chardet','html2text','soupsieve','backports', -- 'cloudscraper','requests','requests_toolbelt', -- 'requests_file.py','urllib3','certifi','idna','brotlidecpy'] -- ## Kept only for v2.85.1 support now. -- createZipFile("../"+filename,"a", -- files, -- exclude=exclude) -- - os.chdir('..') - # 'a' for append - files=['fanficfare'] - createZipFile(filename,"a", - files, -- exclude=exclude) -- -+ exclude=exclude + ['*.py']) --- -2.31.1 - Copied: fanficfare/repos/community-any/0001-makeplugin-do-not-bundle-system-dependencies.patch (from rev 1065292, fanficfare/trunk/0001-makeplugin-do-not-bundle-system-dependencies.patch) =================================================================== --- 0001-makeplugin-do-not-bundle-system-dependencies.patch (rev 0) +++ 0001-makeplugin-do-not-bundle-system-dependencies.patch 2021-12-06 17:32:46 UTC (rev 1065293) @@ -0,0 +1,37 @@ +From a483e39777470538e2e94cb5048b3dc370a35e83 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@archlinux.org> +Date: Sun, 18 Apr 2021 15:35:15 -0400 +Subject: [PATCH] makeplugin: do not bundle system dependencies + +--- + makeplugin.py | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/makeplugin.py b/makeplugin.py +index 6ee101fb..e6f7c20c 100644 +--- a/makeplugin.py ++++ b/makeplugin.py +@@ -34,19 +34,9 @@ if __name__=="__main__": + files, + exclude=exclude) + +- os.chdir('../included_dependencies') +- files=['bs4','chardet','html2text','soupsieve','backports', +- 'cloudscraper','requests','requests_toolbelt', +- 'requests_file.py','urllib3','certifi','idna','brotlidecpy'] +- ## Kept only for v2.85.1 support now. +- createZipFile("../"+filename,"a", +- files, +- exclude=exclude) +- + os.chdir('..') + # 'a' for append + files=['fanficfare'] + createZipFile(filename,"a", + files, +- exclude=exclude) +- ++ exclude=exclude + ['*.py']) +-- +2.31.1 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-06 17:32:31 UTC (rev 1065292) +++ PKGBUILD 2021-12-06 17:32:46 UTC (rev 1065293) @@ -1,46 +0,0 @@ -# Maintainer: Eli Schwartz <eschwa...@archlinux.org> - -_pkgname=FanFicFare -pkgname=fanficfare -pkgver=4.7.0 -pkgrel=1 -pkgdesc="A tool for downloading fanfiction to eBook formats" -arch=('any') -url="https://github.com/JimmXinu/${_pkgname}" -license=('Apache') -changelog=changelog.txt -_deps=('beautifulsoup4' 'brotli' 'chardet' 'cloudscraper' 'html5lib' 'html2text' - 'requests-file') -depends=("${_deps[@]/#/python-}") -optdepends=('calibre: use FanFicFare as a calibre plugin' - 'python-pillow: support for converting/resizing story images and covers') -source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" - "0001-makeplugin-do-not-bundle-system-dependencies.patch") -sha256sums=('273715de841073ccdce4709650152be9f47f852220591002e79640a8a48de716' - '6d172dcc98a8f6dcef2048272bfabd810ceeb5740969fbe406ebcd7b638e072c') -b2sums=('232466f2b451520fd74b2fbb62674e89354c593ca245f10d4603aa7f08e8e372ea8fb0420d10c92d89c0c493eed9145c3568dacddb9ad00daeefdf6b1cb75f79' - 'eca0e505305ef74e0af1be6f5c1376091da4cd69bfc9f468f6040cf35d71890e3901b9cf0a9f9e25e6cb409651d402d8414116d0a8d43269bfdab2fdd0005279') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - patch -p1 -i ../0001-makeplugin-do-not-bundle-system-dependencies.patch -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - python setup.py build - - for i in calibre-plugin/translations/*.po; do - msgfmt -vv "$i" -o "${i%.po}.mo" - done - python makeplugin.py -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - python setup.py install --root="${pkgdir}" --optimize=1 --skip-build - install -Dm644 FanFicFare.zip "${pkgdir}"/usr/share/calibre/system-plugins/FanFicFare.zip -} Copied: fanficfare/repos/community-any/PKGBUILD (from rev 1065292, fanficfare/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-06 17:32:46 UTC (rev 1065293) @@ -0,0 +1,46 @@ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> + +_pkgname=FanFicFare +pkgname=fanficfare +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A tool for downloading fanfiction to eBook formats" +arch=('any') +url="https://github.com/JimmXinu/${_pkgname}" +license=('Apache') +changelog=changelog.txt +_deps=('beautifulsoup4' 'brotli' 'chardet' 'cloudscraper' 'html5lib' 'html2text' + 'requests-file') +depends=("${_deps[@]/#/python-}") +optdepends=('calibre: use FanFicFare as a calibre plugin' + 'python-pillow: support for converting/resizing story images and covers') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" + "0001-makeplugin-do-not-bundle-system-dependencies.patch") +sha256sums=('cd95f366714b807a793378f0e1ad07f0539ecfd2f4a3fb67caa8bf5ef6aa4036' + '6d172dcc98a8f6dcef2048272bfabd810ceeb5740969fbe406ebcd7b638e072c') +b2sums=('dca2dd5c0fe464d70a5f015b990260cb405e45c00b5a4f4f3e1c1aa860af89ac5ea8a1c9bf8c85480310a7c5a165ac80486b3baa54b1c974520c3d497e9c27d3' + 'eca0e505305ef74e0af1be6f5c1376091da4cd69bfc9f468f6040cf35d71890e3901b9cf0a9f9e25e6cb409651d402d8414116d0a8d43269bfdab2fdd0005279') + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + patch -p1 -i ../0001-makeplugin-do-not-bundle-system-dependencies.patch +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + python setup.py build + + for i in calibre-plugin/translations/*.po; do + msgfmt -vv "$i" -o "${i%.po}.mo" + done + python makeplugin.py +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + python setup.py install --root="${pkgdir}" --optimize=1 --skip-build + install -Dm644 FanFicFare.zip "${pkgdir}"/usr/share/calibre/system-plugins/FanFicFare.zip +} Deleted: changelog.txt =================================================================== --- changelog.txt 2021-12-06 17:32:31 UTC (rev 1065292) +++ changelog.txt 2021-12-06 17:32:46 UTC (rev 1065293) @@ -1,43 +0,0 @@ -Version 4.3.0 - 2021-05-30 -- quotev.com: use_cloudscraper:true by default. -- Update translations -- adapter_bdsmlibrarycom: Set author Anonymous when author not found instead - of sys.exit(). Closes #696 -- Fix XF authorUrl and author_avatar_cover feature. Closes #695 -- Catch exceptions in word count. -- Add CLI --color option for warns and fails. Closes #692 -- Report browser cache load fail as such. - -Version 4.2.0 - 30 Apr 2021 -- Add New Site: novelfull.com (#688 & #689) - Thanks, AlexRiina! -- Need to set logger.setLevel() again with import changes to see debugs in - plugin. -- import changes for arch linux system plugins - As submitted by eli-schwartz -- Remove site: fictionpad.com, completely different site, looks like generic - parked? -- Remove site: www.thundercatsfans.org, no longer efiction, now static pages - and PDFs -- Remove site: www.thepetulantpoetess.com, no longer efiction, URLs like OTW - but different -- Remove site: www.potterfics.com, "Potterfics.com has closed its doors - forever" -- Remove site: fanfic.castletv.net, DNS there, no server, last successful - 2018-10-21 -- Remove site: deandamage.com, site there, efiction broken, last successful - 2018-12-04 -- Remove site: www.deepinmysoul.net, moved to deepinmysoul.nl and changed - software--not eFiction anymore, <100 stories, all old -- Include code for nsapa_proxy for dealing with Captchas (by nsapa -- coming - soon!) -- Some other import cleanup. -- Updates from cloudscraper 1.2.58 -- Use newer Calibre image processing, add JPG quality setting - thanks, Malloc - Voidstar -- Add use_cloudscraper:true under [www.ficbook.net] to defaults.ini -- Fix for adapter_literotica story URL oddities. Again. -- Fix for site change: adapter_fictionmaniatv -- Get storyId for sugarquillnet and siyecouk from the parsed query string. - From mcepl -- Fix for adapter_literotica changing URLs on author page yet again. -- Add [harrypotterfanfiction.com] slow_down_sleep_time:1 -- Site blocking fast - downloads. Copied: fanficfare/repos/community-any/changelog.txt (from rev 1065292, fanficfare/trunk/changelog.txt) =================================================================== --- changelog.txt (rev 0) +++ changelog.txt 2021-12-06 17:32:46 UTC (rev 1065293) @@ -0,0 +1,43 @@ +Version 4.3.0 - 2021-05-30 +- quotev.com: use_cloudscraper:true by default. +- Update translations +- adapter_bdsmlibrarycom: Set author Anonymous when author not found instead + of sys.exit(). Closes #696 +- Fix XF authorUrl and author_avatar_cover feature. Closes #695 +- Catch exceptions in word count. +- Add CLI --color option for warns and fails. Closes #692 +- Report browser cache load fail as such. + +Version 4.2.0 - 30 Apr 2021 +- Add New Site: novelfull.com (#688 & #689) - Thanks, AlexRiina! +- Need to set logger.setLevel() again with import changes to see debugs in + plugin. +- import changes for arch linux system plugins - As submitted by eli-schwartz +- Remove site: fictionpad.com, completely different site, looks like generic + parked? +- Remove site: www.thundercatsfans.org, no longer efiction, now static pages + and PDFs +- Remove site: www.thepetulantpoetess.com, no longer efiction, URLs like OTW + but different +- Remove site: www.potterfics.com, "Potterfics.com has closed its doors + forever" +- Remove site: fanfic.castletv.net, DNS there, no server, last successful + 2018-10-21 +- Remove site: deandamage.com, site there, efiction broken, last successful + 2018-12-04 +- Remove site: www.deepinmysoul.net, moved to deepinmysoul.nl and changed + software--not eFiction anymore, <100 stories, all old +- Include code for nsapa_proxy for dealing with Captchas (by nsapa -- coming + soon!) +- Some other import cleanup. +- Updates from cloudscraper 1.2.58 +- Use newer Calibre image processing, add JPG quality setting - thanks, Malloc + Voidstar +- Add use_cloudscraper:true under [www.ficbook.net] to defaults.ini +- Fix for adapter_literotica story URL oddities. Again. +- Fix for site change: adapter_fictionmaniatv +- Get storyId for sugarquillnet and siyecouk from the parsed query string. + From mcepl +- Fix for adapter_literotica changing URLs on author page yet again. +- Add [harrypotterfanfiction.com] slow_down_sleep_time:1 -- Site blocking fast + downloads.