From 9bbcba4e4bd007f22700088695c07bb59e2feda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 5 Mar 2021 07:56:56 +0700 Subject: [PATCH 1/4] python-dbus: split python3-dbus-devel Avoid unnecessary python (2) dependency when doing development --- srcpkgs/python-dbus/template | 13 ++++++++++--- srcpkgs/python3-dbus-devel | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/python3-dbus-devel diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template index ee6b9ddb79f..a682f49b70b 100644 --- a/srcpkgs/python-dbus/template +++ b/srcpkgs/python-dbus/template @@ -1,7 +1,7 @@ # Template file for 'python-dbus' pkgname=python-dbus version=1.2.16 -revision=2 +revision=3 wrksrc="dbus-python-${version}" build_style=gnu-configure hostmakedepends="pkg-config python-devel python3-devel" @@ -59,9 +59,16 @@ python3-dbus_package() { vmove usr/lib/python3* } } +# This package used to provide both Python 2 and Python 3 development files +# Those files are now in python3-dbus-devel python-dbus-devel_package() { - depends="python-devel python3-devel - python-dbus>=${version}_${revision} python3-dbus>=${version}_${revision}" + depends="python-devel python-dbus>=${version}_${revision} + python3-dbus-devel_package>=${version}_${revision}" + build_style=meta + short_desc+=" - development files (Python 2 meta)" +} +python3-dbus-devel_package() { + depends="python3-devel python3-dbus>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/python3-dbus-devel b/srcpkgs/python3-dbus-devel new file mode 120000 index 00000000000..082b5c2fc19 --- /dev/null +++ b/srcpkgs/python3-dbus-devel @@ -0,0 +1 @@ +python-dbus \ No newline at end of file From 80e6e672a5cc7c5935a4fe25c323d4911c02a582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 5 Mar 2021 07:58:35 +0700 Subject: [PATCH 2/4] python3-PyQt5: build with python3-dbus-devel --- srcpkgs/python3-PyQt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template index 058095e7c69..07958aa9754 100644 --- a/srcpkgs/python3-PyQt5/template +++ b/srcpkgs/python3-PyQt5/template @@ -8,7 +8,7 @@ build_helper=qemu hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake python3-dbus" makedepends="qscintilla-qt5-devel python3-sip-PyQt5 - python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel + python3-devel python3-dbus-devel qt5 qt5-devel qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel From 1808b2e68891dc55c0bf224b8d3d5fa314b198f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 5 Mar 2021 07:59:11 +0700 Subject: [PATCH 3/4] python3-efl: build with python3-dbus-devel --- srcpkgs/python3-efl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-efl/template b/srcpkgs/python3-efl/template index bddfb373625..2476c73b347 100644 --- a/srcpkgs/python3-efl/template +++ b/srcpkgs/python3-efl/template @@ -6,7 +6,7 @@ wrksrc=python-efl-${version} build_style=python3-module pycompile_module="efl" hostmakedepends="pkg-config python3-devel python3-Cython" -makedepends="efl-devel python-dbus-devel" +makedepends="efl-devel python3-dbus-devel" depends="python3-dbus" short_desc="Python3 bindings for Enlightenment Foundation Libraries" maintainer="q66 " From a2a8da4fc0a1bd577ecaf204714c3a1470a602fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 5 Mar 2021 07:59:47 +0700 Subject: [PATCH 4/4] gedit-plugins: build with python3-dbus-devel --- srcpkgs/gedit-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template index 2c274c75da8..e288f0d3812 100644 --- a/srcpkgs/gedit-plugins/template +++ b/srcpkgs/gedit-plugins/template @@ -7,7 +7,7 @@ pycompile_dirs="usr/lib/gedit/plugins" hostmakedepends="gettext glib-devel itstool pkg-config vala appstream-glib python3-gobject gucharmap-devel vte3-devel" makedepends="gedit-devel gtksourceview4-devel gtk+3-devel libgit2-glib-devel - libglib-devel libpeas-devel python-dbus-devel python3-devel zeitgeist-devel" + libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-devel" depends="python3-gobject gucharmap vte3" short_desc="Set of plugins for Gedit" maintainer="Enno Boland "