Skip to content
Permalink
Browse files
qt5-quickcontrols2 revert 1 commit added in 5.15.9
change breaks SwipeView with any loading more then 2 tabs, fixes croeso & welcome
geoip-database 20230414
python3-pip 23.1, move to python build, remove ancient sed line, was not applied anyway
  • Loading branch information
demmm committed Apr 15, 2023
1 parent 62d967e commit 891d61c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 15 deletions.
@@ -1,6 +1,6 @@

pkgname=geoip-database
pkgver=20230204
pkgver=20230414
pkgrel=1
pkgdesc="GeoLite country geolocation database compiled by MaxMind"
arch=('x86_64')
@@ -13,9 +13,9 @@ source=("GeoIP-${pkgver}.dat.gz::https://mailfud.org/geoip-legacy/GeoIP.dat.gz"
"https://github.com/mschmitt/GeoLite2xtables/blob/master/LICENSE.txt")
noextract=("GeoIP-${pkgver}.dat.gz"
"GeoIPv6-${pkgver}.dat.gz")
md5sums=('f4cb14c0c1e4c5463825ebd006fa55db'
'68ea8815ffcca0a4d9957f32d7f54103'
'0f5f63ce7e6f8f11155b226a47ad2873')
md5sums=('37496ff043e9fe940a9f44c7602466a1'
'21a8d34c984a062bc58789134d927cb3'
'8fd4bb5a1e35bdb7ba8dee32d34f1ce9')

build() {
cd ${srcdir}
@@ -1,22 +1,25 @@

pkgname=python3-pip
pkgver=23.0.1
pkgver=23.1
pkgrel=1
pkgdesc="An easy_install replacement for installing pypi python3 packages"
url="https://pip.pypa.io/"
arch=('x86_64')
license=('MIT')
depends=('python3' 'python3-setuptools' 'python3-wheel')
depends=('python3')
makedepends=('python3-build' 'python3-installer' 'python3-setuptools' 'python3-wheel')
source=("https://files.pythonhosted.org/packages/source/p/pip/pip-${pkgver}.tar.gz")
sha256sums=('cd015ea1bfb0fcef59d8a286c1f8bebcb983f6317719d415dc5351efb7cd7024')
sha256sums=('408539897ee535dbfb83a153f7bc4d620f990d8bd44a52a986efc0b4d330d34a')

package() {
build() {
cd pip-${pkgver}
python3 setup.py build
python3 setup.py install --prefix=/usr --root=${pkgdir}

python3 -m build -nw
}

sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python3|" \
${pkgdir}/usr/lib/python3.10/site-packages/pip/__init__.py
package() {
cd pip-${pkgver}

python3 -m installer --destdir=${pkgdir} dist/*.whl
install -D -m644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
@@ -6,7 +6,7 @@ pkgname=qt5-quickcontrols2
pkgver=${qtver}
subver=${subver}
_pkgver=${_qtver}
pkgrel=1
pkgrel=2
pkgdesc="A cross-platform application and UI framework, QtControls"
arch=('x86_64')
url='https://www.qt.io/'
@@ -17,14 +17,18 @@ options=('!libtool')
_pkgfqn="qtquickcontrols2-everywhere-opensource-src-${subver}"
__pkgfqn="qtquickcontrols2-everywhere-src-${subver}"
source=("${_qtmirror}/${_pkgver}/${subver}/submodules/${_pkgfqn}.tar.xz"
'qt_kde.patch')
'qt_kde.patch'
"https://github.com/qt/qtquickcontrols2/commit/edb18d6101e8bb9dd265330dbe019722181d7577.diff")
#source=("https://download.qt-project.org/development_releases/qt/${_pkgver}/${subver}/submodules/${_pkgfqn}.tar.xz")
md5sums=(`grep ${_pkgfqn}.tar.xz ../qt.md5 | cut -d" " -f1`
'68460cc14f4870aaef4c315cf01ebb11')
'68460cc14f4870aaef4c315cf01ebb11'
'776447c945e6fcf82ecafff6d7cce3be')

build() {
cd ${__pkgfqn}
patch -p1 -i ${srcdir}/qt_kde.patch
# reverting, breaks SwipeView on any Page loading, fixes welcome & croeso
patch -R -p1 -i ${srcdir}/edb18d6101e8bb9dd265330dbe019722181d7577.diff

/usr/lib/qt5/bin/qmake
make

0 comments on commit 891d61c

Please sign in to comment.