From 37037acb8006e7454b94fbebcab9ce3053880ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 27 Sep 2020 14:13:29 +0700 Subject: [PATCH 1/2] calibre: update to 5.0.1. --- srcpkgs/calibre/template | 42 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 48397fdd6d2..444e7c2b7f6 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,23 +1,24 @@ # Template file for 'calibre' pkgname=calibre -version=4.23.0 +version=5.0.1 revision=1 -build_style=python2-module +build_style=python3-module pycompile_dirs="/usr/lib/calibre/" -hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg - python-PyQt5-webengine python-apsw python-css-parser python-dateutil - python-devel python-html5-parser python-msgpack python-regex qt5-qmake - xdg-utils rapydscript-ng" +hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg + python3-PyQt5-webengine python3-apsw python3-css-parser python3-dateutil + python3-devel python3-html5-parser python3-msgpack python3-regex qt5-qmake + libpodofo-devel python3-PyQt-builder python3-PyQt5-devel qt5-host-tools + python3-zeroconf xdg-utils rapydscript-ng" makedepends="glib-devel libchmlib-devel libinput-devel libmagick-devel libmtp-devel - libpodofo-devel libwmf-devel libxkbcommon-devel python-PyQt5-devel + libpodofo-devel libwmf-devel libxkbcommon-devel python3-PyQt5-devel qt5-devel sqlite-devel tslib-devel hunspell-devel hyphen-devel" -depends="desktop-file-utils optipng poppler-utils python-BeautifulSoup4 - python-Markdown python-Pillow python-PyQt5-svg - python-PyQt5-webengine python-PyQt5-webchannel python-Pygments python-apsw - python-css-parser python-cssselect python-dateutil python-dbus - python-dnspython python-feedparser python-html5-parser python-mechanize - python-msgpack python-netifaces python-psutil python-regex python-html2text - qt5-webengine python-ipaddress" +depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4 + python3-Markdown python3-Pillow python3-PyQt5-svg python3-zeroconf + python3-PyQt5-webengine python3-PyQt5-webchannel python3-Pygments python3-apsw + python3-css-parser python3-cssselect python3-dateutil python3-dbus + python3-dnspython python3-feedparser python3-html5-parser python3-mechanize + python3-msgpack python3-netifaces python3-psutil python3-regex python3-html2text + qt5-webengine" checkdepends="${depends} libjpeg-turbo-tools jxrlib" short_desc="Ebook management application" maintainer="skmpz " @@ -25,7 +26,8 @@ license="GPL-3.0-only" homepage="https://calibre-ebook.com" changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=16de51473cf0e336f946a57251a1e4f4fbba1f857f17d8fc14aa132e7eb59518 +checksum=949fffb683708345daa84df24f73b01479043f08c67d0b13209d5977789f4802 +lib32disabled=yes nocross=yes do_configure() { @@ -41,15 +43,15 @@ do_configure() { } do_build() { - python2 setup.py build - python2 setup.py gui - python2 setup.py rapydscript + python3 setup.py build + python3 setup.py gui + python3 setup.py rapydscript } do_check() { # qt test crashes without any error messages # disabled for now - python2 setup.py test \ + python3 setup.py test \ --exclude-test-name unrar \ --exclude-test-name qt } @@ -57,7 +59,7 @@ do_check() { do_install() { vmkdir usr/share/zsh/site-functions - python2 setup.py \ + python3 setup.py \ install --prefix=/usr --staging-root=${DESTDIR}/usr for m in man-pages/man1/*.1; do From 92ce73f35d359e4e112df10c7996897fc729c65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 28 Sep 2020 19:41:25 +0700 Subject: [PATCH 2/2] python-PyQt5-webengine: drop package Last user: calibre moved to Python 3 --- srcpkgs/python-PyQt5-webengine/template | 44 ------------------------- srcpkgs/python-PyQt5-webengine/update | 1 - 2 files changed, 45 deletions(-) delete mode 100644 srcpkgs/python-PyQt5-webengine/template delete mode 100644 srcpkgs/python-PyQt5-webengine/update diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template deleted file mode 100644 index 257a9e1387b..00000000000 --- a/srcpkgs/python-PyQt5-webengine/template +++ /dev/null @@ -1,44 +0,0 @@ -# Template file for 'python-PyQt5-webengine' -pkgname=python-PyQt5-webengine -version=5.15.0 -revision=1 -wrksrc="PyQtWebEngine-${version}" -hostmakedepends="pkg-config qt5-qmake python python-PyQt5" -makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel - qt5-webengine-devel python-devel python-PyQt5-devel" -depends="python-PyQt5>=${version}_1 python-PyQt5-webchannel>=${version}_1" -short_desc="Python2 bindings for the Qt5 toolkit - webengine module" -maintainer="Orphaned " -license="GPL-3.0-only" -homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" -distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz" -checksum=670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75 -lib32disabled=yes -nocross="configure script is broken for cross builds" - -case "$XBPS_TARGET_MACHINE" in - ppc64le*) ;; - ppc*) broken="no webengine for big endian ppc";; - arm*) broken="depends on qt5-webengine";; -esac - -post_extract() { - rm -rf pyuic/uic/port_v3 -} - -do_configure() { - python2 configure.py \ - QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" - QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP="" -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install - rm -rf ${DESTDIR}/usr/share -} diff --git a/srcpkgs/python-PyQt5-webengine/update b/srcpkgs/python-PyQt5-webengine/update deleted file mode 100644 index 4e03873e2a7..00000000000 --- a/srcpkgs/python-PyQt5-webengine/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="PyQtWebEngine_gpl"