Sat Apr 27 11:52:59 2024 UTC (26d)
py-qt-builder: updated to 1.16.2

v1.16.2

Broken links to SIP documentation

The links to the SIP documentation have been fixed.

ICU libraries missing from Linux Qt wheels

The ICU libraries were missing from the Linux Qt v6.7 wheels.

v1.16.1

Bundle new QtQuick support libraries

The QtQuick3DHelpersImpl, QtQuickControls2MacOSStyleImpl and QtQuickTimelineBlendTrees libraries added to Qt v6.7.0 are now bundled.

Missing LICENSE file

The missing LICENSE file was added.

v1.16.0

Migration to GitHub

The project repository has been migrated to GitHub.

PyQt-builder is now licensed under the BSD-2-Clause license.

The project has now been migrated from setup.py to setuptools_scm and pyproject.toml.

The documentation is now hosted at Read the Docs.

Bundle new QtQuick support libraries

The QtQuickPhysics libraries added to Qt v6.6.0 are now bundled.

The QtQuickControls2 style libraries added to Qt v6.6.3 are now bundled.

Improvements to example documentation

The example in the documentation no longer uses deprecated features that will be removed in SIP v7.

The example is now PyQt6-based rather than PyQt5.

ABI versions

The default ABI versions are now v12.13 and v13.6.


(adam)
diff -r1.13 -r1.14 pkgsrc/x11/py-qt-builder/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/py-qt-builder/PLIST
diff -r1.12 -r1.13 pkgsrc/x11/py-qt-builder/distinfo
cvs diff -r1.13 -r1.14 pkgsrc/x11/py-qt-builder/Makefile (switch to unified diff)

--- pkgsrc/x11/py-qt-builder/Makefile 2023/12/01 13:30:32 1.13
+++ pkgsrc/x11/py-qt-builder/Makefile 2024/04/27 11:52:59 1.14
@@ -1,30 +1,32 @@ @@ -1,30 +1,32 @@
1# $NetBSD: Makefile,v 1.13 2023/12/01 13:30:32 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2024/04/27 11:52:59 adam Exp $
2 2
3DISTNAME= PyQt-builder-1.15.4 3DISTNAME= pyqt_builder-1.16.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyQt/qt/} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyqt_/qt-/}
5CATEGORIES= x11 python 5CATEGORIES= x11 python
6MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyQt-builder/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyQt-builder/}
7 7
8MAINTAINER= rhialto@NetBSD.org 8MAINTAINER= rhialto@NetBSD.org
9HOMEPAGE= https://www.riverbankcomputing.com/software/pyqt-builder/ 9HOMEPAGE= https://www.riverbankcomputing.com/software/pyqt-builder/
10COMMENT= PyQt-world build tool (sip extension) 10COMMENT= PyQt-world build tool (sip extension)
11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
12 12
13TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=30.3:../../devel/py-setuptools 13TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=30.3:../../devel/py-setuptools
14TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel 14TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
15DEPENDS+= ${PYPKGPREFIX}-packaging>=0:../../devel/py-packaging 15DEPENDS+= ${PYPKGPREFIX}-packaging>=0:../../devel/py-packaging
16DEPENDS+= ${PYPKGPREFIX}-sip6>=6.7:../../x11/py-sip6 16DEPENDS+= ${PYPKGPREFIX}-sip6>=6.7:../../x11/py-sip6
17 17
 18WHEEL_NAME= ${DISTNAME:S/pyqt_/PyQt_/:C/-([^0-9])/_\1/g}
 19
18USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
19 21
20PYTHON_VERSIONS_INCOMPATIBLE= 27 22PYTHON_VERSIONS_INCOMPATIBLE= 27
21 23
22post-install: 24post-install:
23 ${RM} -r ${DESTDIR}${PREFIX}/${PYSITELIB}/pyqtbuild/bundle/dlls 25 ${RM} -r ${DESTDIR}${PREFIX}/${PYSITELIB}/pyqtbuild/bundle/dlls
24.for bin in pyqt-bundle pyqt-qt-wheel 26.for bin in pyqt-bundle pyqt-qt-wheel
25 cd ${DESTDIR}${PREFIX}/bin && \ 27 cd ${DESTDIR}${PREFIX}/bin && \
26 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} 28 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
27.endfor 29.endfor
28 30
29.include "../../lang/python/wheel.mk" 31.include "../../lang/python/wheel.mk"
30.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/x11/py-qt-builder/PLIST (switch to unified diff)

--- pkgsrc/x11/py-qt-builder/PLIST 2023/12/01 13:30:32 1.2
+++ pkgsrc/x11/py-qt-builder/PLIST 2024/04/27 11:52:59 1.3
@@ -1,104 +1,105 @@ @@ -1,104 +1,105 @@
1@comment $NetBSD: PLIST,v 1.2 2023/12/01 13:30:32 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2024/04/27 11:52:59 adam Exp $
2bin/pyqt-bundle-${PYVERSSUFFIX} 2bin/pyqt-bundle-${PYVERSSUFFIX}
3bin/pyqt-qt-wheel-${PYVERSSUFFIX} 3bin/pyqt-qt-wheel-${PYVERSSUFFIX}
4${PYSITELIB}/${WHEEL_INFODIR}/LICENSE 4${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
5${PYSITELIB}/${WHEEL_INFODIR}/LICENSE-GPL2 
6${PYSITELIB}/${WHEEL_INFODIR}/LICENSE-GPL3 
7${PYSITELIB}/${WHEEL_INFODIR}/METADATA 5${PYSITELIB}/${WHEEL_INFODIR}/METADATA
8${PYSITELIB}/${WHEEL_INFODIR}/RECORD 6${PYSITELIB}/${WHEEL_INFODIR}/RECORD
9${PYSITELIB}/${WHEEL_INFODIR}/WHEEL 7${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
10${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt 8${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
11${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt 9${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
12${PYSITELIB}/pyqtbuild/__init__.py 10${PYSITELIB}/pyqtbuild/__init__.py
13${PYSITELIB}/pyqtbuild/__init__.pyc 11${PYSITELIB}/pyqtbuild/__init__.pyc
14${PYSITELIB}/pyqtbuild/__init__.pyo 12${PYSITELIB}/pyqtbuild/__init__.pyo
 13${PYSITELIB}/pyqtbuild/_version.py
 14${PYSITELIB}/pyqtbuild/_version.pyc
 15${PYSITELIB}/pyqtbuild/_version.pyo
15${PYSITELIB}/pyqtbuild/bindings.py 16${PYSITELIB}/pyqtbuild/bindings.py
16${PYSITELIB}/pyqtbuild/bindings.pyc 17${PYSITELIB}/pyqtbuild/bindings.pyc
17${PYSITELIB}/pyqtbuild/bindings.pyo 18${PYSITELIB}/pyqtbuild/bindings.pyo
18${PYSITELIB}/pyqtbuild/builder.py 19${PYSITELIB}/pyqtbuild/builder.py
19${PYSITELIB}/pyqtbuild/builder.pyc 20${PYSITELIB}/pyqtbuild/builder.pyc
20${PYSITELIB}/pyqtbuild/builder.pyo 21${PYSITELIB}/pyqtbuild/builder.pyo
21${PYSITELIB}/pyqtbuild/bundle/__init__.py 22${PYSITELIB}/pyqtbuild/bundle/__init__.py
22${PYSITELIB}/pyqtbuild/bundle/__init__.pyc 23${PYSITELIB}/pyqtbuild/bundle/__init__.pyc
23${PYSITELIB}/pyqtbuild/bundle/__init__.pyo 24${PYSITELIB}/pyqtbuild/bundle/__init__.pyo
24${PYSITELIB}/pyqtbuild/bundle/abstract_package.py 25${PYSITELIB}/pyqtbuild/bundle/abstract_package.py
25${PYSITELIB}/pyqtbuild/bundle/abstract_package.pyc 26${PYSITELIB}/pyqtbuild/bundle/abstract_package.pyc
26${PYSITELIB}/pyqtbuild/bundle/abstract_package.pyo 27${PYSITELIB}/pyqtbuild/bundle/abstract_package.pyo
27${PYSITELIB}/pyqtbuild/bundle/bundle.py 28${PYSITELIB}/pyqtbuild/bundle/bundle.py
28${PYSITELIB}/pyqtbuild/bundle/bundle.pyc 29${PYSITELIB}/pyqtbuild/bundle/bundle.pyc
29${PYSITELIB}/pyqtbuild/bundle/bundle.pyo 30${PYSITELIB}/pyqtbuild/bundle/bundle.pyo
30${PYSITELIB}/pyqtbuild/bundle/bundle_main.py 31${PYSITELIB}/pyqtbuild/bundle/bundle_main.py
31${PYSITELIB}/pyqtbuild/bundle/bundle_main.pyc 32${PYSITELIB}/pyqtbuild/bundle/bundle_main.pyc
32${PYSITELIB}/pyqtbuild/bundle/bundle_main.pyo 33${PYSITELIB}/pyqtbuild/bundle/bundle_main.pyo
33${PYSITELIB}/pyqtbuild/bundle/packages/__init__.py 34${PYSITELIB}/pyqtbuild/bundle/packages/__init__.py
34${PYSITELIB}/pyqtbuild/bundle/packages/__init__.pyc 35${PYSITELIB}/pyqtbuild/bundle/packages/__init__.pyc
35${PYSITELIB}/pyqtbuild/bundle/packages/__init__.pyo 36${PYSITELIB}/pyqtbuild/bundle/packages/__init__.pyo
36${PYSITELIB}/pyqtbuild/bundle/packages/pyqt.py 37${PYSITELIB}/pyqtbuild/bundle/packages/pyqt.py
37${PYSITELIB}/pyqtbuild/bundle/packages/pyqt.pyc 38${PYSITELIB}/pyqtbuild/bundle/packages/pyqt.pyc
38${PYSITELIB}/pyqtbuild/bundle/packages/pyqt.pyo 39${PYSITELIB}/pyqtbuild/bundle/packages/pyqt.pyo
39${PYSITELIB}/pyqtbuild/bundle/packages/pyqt3d.py 40${PYSITELIB}/pyqtbuild/bundle/packages/pyqt3d.py
40${PYSITELIB}/pyqtbuild/bundle/packages/pyqt3d.pyc 41${PYSITELIB}/pyqtbuild/bundle/packages/pyqt3d.pyc
41${PYSITELIB}/pyqtbuild/bundle/packages/pyqt3d.pyo 42${PYSITELIB}/pyqtbuild/bundle/packages/pyqt3d.pyo
42${PYSITELIB}/pyqtbuild/bundle/packages/pyqt5.py 43${PYSITELIB}/pyqtbuild/bundle/packages/pyqt5.py
43${PYSITELIB}/pyqtbuild/bundle/packages/pyqt5.pyc 44${PYSITELIB}/pyqtbuild/bundle/packages/pyqt5.pyc
44${PYSITELIB}/pyqtbuild/bundle/packages/pyqt5.pyo 45${PYSITELIB}/pyqtbuild/bundle/packages/pyqt5.pyo
45${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6.py 46${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6.py
46${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6.pyc 47${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6.pyc
47${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6.pyo 48${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6.pyo
48${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_3d.py 49${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_3d.py
49${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_3d.pyc 50${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_3d.pyc
50${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_3d.pyo 51${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_3d.pyo
51${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_charts.py 52${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_charts.py
52${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_charts.pyc 53${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_charts.pyc
53${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_charts.pyo 54${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_charts.pyo
54${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_datavisualization.py 55${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_datavisualization.py
55${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_datavisualization.pyc 56${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_datavisualization.pyc
56${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_datavisualization.pyo 57${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_datavisualization.pyo
57${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_networkauth.py 58${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_networkauth.py
58${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_networkauth.pyc 59${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_networkauth.pyc
59${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_networkauth.pyo 60${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_networkauth.pyo
60${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_webengine.py 61${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_webengine.py
61${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_webengine.pyc 62${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_webengine.pyc
62${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_webengine.pyo 63${PYSITELIB}/pyqtbuild/bundle/packages/pyqt6_webengine.pyo
63${PYSITELIB}/pyqtbuild/bundle/packages/pyqtchart.py 64${PYSITELIB}/pyqtbuild/bundle/packages/pyqtchart.py
64${PYSITELIB}/pyqtbuild/bundle/packages/pyqtchart.pyc 65${PYSITELIB}/pyqtbuild/bundle/packages/pyqtchart.pyc
65${PYSITELIB}/pyqtbuild/bundle/packages/pyqtchart.pyo 66${PYSITELIB}/pyqtbuild/bundle/packages/pyqtchart.pyo
66${PYSITELIB}/pyqtbuild/bundle/packages/pyqtdatavisualization.py 67${PYSITELIB}/pyqtbuild/bundle/packages/pyqtdatavisualization.py
67${PYSITELIB}/pyqtbuild/bundle/packages/pyqtdatavisualization.pyc 68${PYSITELIB}/pyqtbuild/bundle/packages/pyqtdatavisualization.pyc
68${PYSITELIB}/pyqtbuild/bundle/packages/pyqtdatavisualization.pyo 69${PYSITELIB}/pyqtbuild/bundle/packages/pyqtdatavisualization.pyo
69${PYSITELIB}/pyqtbuild/bundle/packages/pyqtnetworkauth.py 70${PYSITELIB}/pyqtbuild/bundle/packages/pyqtnetworkauth.py
70${PYSITELIB}/pyqtbuild/bundle/packages/pyqtnetworkauth.pyc 71${PYSITELIB}/pyqtbuild/bundle/packages/pyqtnetworkauth.pyc
71${PYSITELIB}/pyqtbuild/bundle/packages/pyqtnetworkauth.pyo 72${PYSITELIB}/pyqtbuild/bundle/packages/pyqtnetworkauth.pyo
72${PYSITELIB}/pyqtbuild/bundle/packages/pyqtpurchasing.py 73${PYSITELIB}/pyqtbuild/bundle/packages/pyqtpurchasing.py
73${PYSITELIB}/pyqtbuild/bundle/packages/pyqtpurchasing.pyc 74${PYSITELIB}/pyqtbuild/bundle/packages/pyqtpurchasing.pyc
74${PYSITELIB}/pyqtbuild/bundle/packages/pyqtpurchasing.pyo 75${PYSITELIB}/pyqtbuild/bundle/packages/pyqtpurchasing.pyo
75${PYSITELIB}/pyqtbuild/bundle/packages/pyqtwebengine.py 76${PYSITELIB}/pyqtbuild/bundle/packages/pyqtwebengine.py
76${PYSITELIB}/pyqtbuild/bundle/packages/pyqtwebengine.pyc 77${PYSITELIB}/pyqtbuild/bundle/packages/pyqtwebengine.pyc
77${PYSITELIB}/pyqtbuild/bundle/packages/pyqtwebengine.pyo 78${PYSITELIB}/pyqtbuild/bundle/packages/pyqtwebengine.pyo
78${PYSITELIB}/pyqtbuild/bundle/qt_metadata.py 79${PYSITELIB}/pyqtbuild/bundle/qt_metadata.py
79${PYSITELIB}/pyqtbuild/bundle/qt_metadata.pyc 80${PYSITELIB}/pyqtbuild/bundle/qt_metadata.pyc
80${PYSITELIB}/pyqtbuild/bundle/qt_metadata.pyo 81${PYSITELIB}/pyqtbuild/bundle/qt_metadata.pyo
81${PYSITELIB}/pyqtbuild/bundle/qt_wheel.py 82${PYSITELIB}/pyqtbuild/bundle/qt_wheel.py
82${PYSITELIB}/pyqtbuild/bundle/qt_wheel.pyc 83${PYSITELIB}/pyqtbuild/bundle/qt_wheel.pyc
83${PYSITELIB}/pyqtbuild/bundle/qt_wheel.pyo 84${PYSITELIB}/pyqtbuild/bundle/qt_wheel.pyo
84${PYSITELIB}/pyqtbuild/bundle/qt_wheel_distinfo/LICENSE 85${PYSITELIB}/pyqtbuild/bundle/qt_wheel_distinfo/LICENSE
85${PYSITELIB}/pyqtbuild/bundle/qt_wheel_distinfo/METADATA 86${PYSITELIB}/pyqtbuild/bundle/qt_wheel_distinfo/METADATA
86${PYSITELIB}/pyqtbuild/bundle/qt_wheel_distinfo/WHEEL 87${PYSITELIB}/pyqtbuild/bundle/qt_wheel_distinfo/WHEEL
87${PYSITELIB}/pyqtbuild/bundle/qt_wheel_main.py 88${PYSITELIB}/pyqtbuild/bundle/qt_wheel_main.py
88${PYSITELIB}/pyqtbuild/bundle/qt_wheel_main.pyc 89${PYSITELIB}/pyqtbuild/bundle/qt_wheel_main.pyc
89${PYSITELIB}/pyqtbuild/bundle/qt_wheel_main.pyo 90${PYSITELIB}/pyqtbuild/bundle/qt_wheel_main.pyo
90${PYSITELIB}/pyqtbuild/bundle/verbose.py 91${PYSITELIB}/pyqtbuild/bundle/verbose.py
91${PYSITELIB}/pyqtbuild/bundle/verbose.pyc 92${PYSITELIB}/pyqtbuild/bundle/verbose.pyc
92${PYSITELIB}/pyqtbuild/bundle/verbose.pyo 93${PYSITELIB}/pyqtbuild/bundle/verbose.pyo
93${PYSITELIB}/pyqtbuild/bundle/wheel.py 94${PYSITELIB}/pyqtbuild/bundle/wheel.py
94${PYSITELIB}/pyqtbuild/bundle/wheel.pyc 95${PYSITELIB}/pyqtbuild/bundle/wheel.pyc
95${PYSITELIB}/pyqtbuild/bundle/wheel.pyo 96${PYSITELIB}/pyqtbuild/bundle/wheel.pyo
96${PYSITELIB}/pyqtbuild/installable.py 97${PYSITELIB}/pyqtbuild/installable.py
97${PYSITELIB}/pyqtbuild/installable.pyc 98${PYSITELIB}/pyqtbuild/installable.pyc
98${PYSITELIB}/pyqtbuild/installable.pyo 99${PYSITELIB}/pyqtbuild/installable.pyo
99${PYSITELIB}/pyqtbuild/project.py 100${PYSITELIB}/pyqtbuild/project.py
100${PYSITELIB}/pyqtbuild/project.pyc 101${PYSITELIB}/pyqtbuild/project.pyc
101${PYSITELIB}/pyqtbuild/project.pyo 102${PYSITELIB}/pyqtbuild/project.pyo
102${PYSITELIB}/pyqtbuild/version.py 103${PYSITELIB}/pyqtbuild/version.py
103${PYSITELIB}/pyqtbuild/version.pyc 104${PYSITELIB}/pyqtbuild/version.pyc
104${PYSITELIB}/pyqtbuild/version.pyo 105${PYSITELIB}/pyqtbuild/version.pyo
cvs diff -r1.12 -r1.13 pkgsrc/x11/py-qt-builder/distinfo (switch to unified diff)

--- pkgsrc/x11/py-qt-builder/distinfo 2023/12/01 13:30:32 1.12
+++ pkgsrc/x11/py-qt-builder/distinfo 2024/04/27 11:52:59 1.13
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.12 2023/12/01 13:30:32 adam Exp $ 1$NetBSD: distinfo,v 1.13 2024/04/27 11:52:59 adam Exp $
2 2
3BLAKE2s (PyQt-builder-1.15.4.tar.gz) = bfe404dd8ccbf945405ccd5290a5b76d5fd7f26d0bd9e6c5bbad15382f8ff1a4 3BLAKE2s (pyqt_builder-1.16.2.tar.gz) = 3c332bee91fe9f1102ed4da1db3ee6a9ad5dc86e39a123db1a42049639d729bf
4SHA512 (PyQt-builder-1.15.4.tar.gz) = ec0b9f7784a32af744111615b93f98d73f284bb752fd71359c798d3b093a01925823effea72c866a5f49f77e3dfc5dee4125bbb289f647d84000bf34b5db6931 4SHA512 (pyqt_builder-1.16.2.tar.gz) = 64fc969799a12a176eb730fdc4581f18293dceb8edff20db0177ce409fe7e712cdfb07449b6c4abdd33f1fd9aabe8bee248fe9aeb5373df533d805f9d2a0c6a5
5Size (PyQt-builder-1.15.4.tar.gz) = 3766458 bytes 5Size (pyqt_builder-1.16.2.tar.gz) = 3671133 bytes
6SHA1 (patch-pyqtbuild_builder.py) = a5ef0e02949ac48d78f1c3cf20d7dd32edbf8028 6SHA1 (patch-pyqtbuild_builder.py) = a5ef0e02949ac48d78f1c3cf20d7dd32edbf8028