diff options
| -rw-r--r-- | net-libs/accounts-qt/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/accounts-qt/accounts-qt-1.17.ebuild (renamed from net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild) | 26 | ||||
| -rw-r--r-- | profiles/package.mask | 2 |
3 files changed, 7 insertions, 23 deletions
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest index 3d17843c22ac..420110949655 100644 --- a/net-libs/accounts-qt/Manifest +++ b/net-libs/accounts-qt/Manifest @@ -1,2 +1,2 @@ -DIST accounts-qt-1.16_p20220803.tar.bz2 55304 BLAKE2B 3143894e0b0887cbcd07391330a6c5fc423b2d1609c3057b2ee921a8c3ae78d9c149c39f74c29b50cc5e28428bef31d8ed598ca76beacd3946d6f99109d24aa0 SHA512 c919cc2b70de5a0a288a942297480ee68568ab5f708a504801ce953193a5d7e30be159a517f1566c283436663052e6d0fbd6eef1386376cb3cba0144505318df DIST accounts-qt-1.16a.tar.gz 64376 BLAKE2B 39abe10249efff2edeae1a8ce210be3ce06656311ed5a3a3fbcb847194ebbd8ec6e111ef070fb29a2a847591304cf22a7cb60e9d1178a201b886313c4c8aaadb SHA512 a2a65899a258ac41c67fe496ba14468a95615fe8cfc518b7aaf7d3e72e0088304c61f5d76d50bd26a95b5f56dea4d0191bf08ecead508286504161aa05b7a05b +DIST accounts-qt-1.17.tar.bz2 55907 BLAKE2B e13debd3f7bc9a17cf73c55777b62e904a6bf7791fe3ad0e1af25a72622a8c21cb56bf033afb50d17a1dd703be0af88de9e557d0947d9b7c12e1ac241b45b743 SHA512 ceab67d5db1acb68e391be0557e5fd4b9675f1401b1fe81ff431d5d1eb1d7124cd5170fde44658d7db8b46f721e9d3f7db719c5b727aa681a9e35ea026a71908 diff --git a/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild b/net-libs/accounts-qt/accounts-qt-1.17.ebuild index d90c6af12cdd..3cb5ade1897a 100644 --- a/net-libs/accounts-qt/accounts-qt-1.16_p20220803.ebuild +++ b/net-libs/accounts-qt/accounts-qt-1.17.ebuild @@ -6,18 +6,11 @@ EAPI=8 inherit qmake-utils multibuild if [[ ${PV} = *9999* ]] ; then - EGIT_REPO_URI="https://gitlab.com/nicolasfella/lib${PN}.git/" - EGIT_BRANCH="qt6" + EGIT_REPO_URI="https://gitlab.com/accounts-sso/lib${PN}.git/" inherit git-r3 else - COMMIT=c86db79be389601bf6798f815ca5b8f78a524156 - if [[ -n ${COMMIT} ]] ; then - SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/${COMMIT}/lib${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/lib${PN}-${COMMIT}" - else - SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}a.tar.bz2" - S="${WORKDIR}/lib${PN}-VERSION_${PV}" - fi + SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/-/archive/VERSION_${PV}/lib${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/lib${PN}-VERSION_${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi @@ -42,9 +35,7 @@ RDEPEND=" >=net-libs/libaccounts-glib-1.23:= " DEPEND="${RDEPEND} - test? ( - qt5? ( dev-qt/qttest:5 ) - ) + test? ( qt5? ( dev-qt/qttest:5 ) ) " BDEPEND=" doc? ( @@ -56,14 +47,7 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}"/0001-Port-away-from-deprecated-QList-toSet.patch - "${FILESDIR}"/0002-Add-Qt6-CI.patch - "${FILESDIR}"/0003-Use-undeprecated-Account-value.patch - "${FILESDIR}"/0004-Don-t-access-a-QString-out-of-bounds.patch - "${FILESDIR}"/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch - "${FILESDIR}/${PN}-1.16-libdir.patch" -) +PATCHES=( "${FILESDIR}/${PN}-1.16-libdir.patch" ) pkg_setup() { MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) diff --git a/profiles/package.mask b/profiles/package.mask index a9990e7aa127..8fe5273260c3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -701,7 +701,7 @@ sci-libs/mpir ~net-libs/kdsoap-2.2.0 ~net-libs/kdsoap-ws-discovery-client-0.4.0 ~net-libs/signon-ui-0.15_p20231016 -~net-libs/accounts-qt-1.16_p20220803 +~net-libs/accounts-qt-1.17 ~net-libs/accounts-qml-0.7_p20231028 ~net-libs/signon-oauth2-0.25_p20210102 =net-libs/signond-8.61-r100 |