From f0a46ce0f5a0420be114c6b2db53a307ae1ae165 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 10 Aug 2018 01:28:58 +0200 Subject: [PATCH] xbps-src: remove pygtk dep from packages migrated to pygi (pygi != pygtk) --- srcpkgs/avahi-discover/template | 8 ++++---- srcpkgs/avahi/template | 2 +- srcpkgs/flowblade/template | 4 ++-- srcpkgs/gpodder/template | 4 ++-- srcpkgs/gpsd/template | 10 +++++----- srcpkgs/gtk-vnc/template | 6 ++---- srcpkgs/mypaint/template | 4 ++-- srcpkgs/scanmem/template | 4 ++-- srcpkgs/tryton/template | 4 ++-- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template index 3fd948cd3f1..6cb682f741b 100644 --- a/srcpkgs/avahi-discover/template +++ b/srcpkgs/avahi-discover/template @@ -1,7 +1,7 @@ # Template file for 'avahi-discover' # # WARNING: THIS TEMPLATE MUST BE SYNCHRONIZED WITH AVAHI. IT IS SPLITTED TO DROP -# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PYGTK. +# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI. # pkgname=avahi-discover version=0.7 @@ -25,11 +25,11 @@ homepage="https://github.com/lathiat/avahi" distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz" checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 -hostmakedepends="automake libtool pkg-config intltool pygtk-devel +hostmakedepends="automake libtool pkg-config intltool python-dbus gobject-introspection glib-devel" makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel - pygtk-devel python-dbus gtk+3-devel $(vopt_if gir python-gobject-devel)" -depends="avahi>=${version} python avahi-python>=${version} python-dbus pygtk desktop-file-utils" + python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)" +depends="avahi>=${version} python avahi-python>=${version} python-dbus desktop-file-utils" pycompile_module="avahi_discover" # Package build options diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index 7abed02138c..5d018085bb0 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -8,7 +8,7 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi --with-avahi-priv-access-group=network --with-autoipd-user=avahi --with-autoipd-group=avahi --with-distro=none --disable-xmltoman - --disable-static ssp_cv_lib=no --enable-python --disable-pygtk + --disable-static ssp_cv_lib=no --enable-python --disable-glib --disable-python-dbus --disable-gobject --disable-gtk --disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin --disable-pygobject" diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template index 65d7f1059b1..2ba5376c779 100644 --- a/srcpkgs/flowblade/template +++ b/srcpkgs/flowblade/template @@ -1,12 +1,12 @@ # Template file for 'flowblade' pkgname=flowblade version=1.16 -revision=1 +revision=2 build_wrksrc="flowblade-trunk" build_style=python2-module hostmakedepends="python-setuptools" # https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/DEPENDENCIES.md -depends="frei0r-plugins gmic mlt-python pygtk python-Pillow python-dbus +depends="frei0r-plugins gmic mlt-python python-Pillow python-dbus gtk+3 python-gobject python-numpy swh-plugins" short_desc="Non-linear video editor for Linux" maintainer="maxice8 " diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template index f7b4b913add..3c48ab8a087 100644 --- a/srcpkgs/gpodder/template +++ b/srcpkgs/gpodder/template @@ -1,13 +1,13 @@ # Template file for 'gpodder' pkgname=gpodder version=3.10.3 -revision=1 +revision=2 noarch=yes wrksrc="gpodder-${version}" pycompile_module="gpodder" hostmakedepends="python3-devel intltool" makedepends="python3-devel" -depends="eyeD3 hicolor-icon-theme pygtk python3-dbus python3-gobject +depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject python3-html5lib python3-mygpoclient python3-podcastparser" checkdepends="${depends} python3-MiniMock" short_desc="Podcast client" diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 44a12ea9fb5..a23710034e5 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,7 +1,7 @@ # Template file for 'gpsd' pkgname=gpsd version=3.17 -revision=1 +revision=2 build_style=scons patch_args=-p1 make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC}" @@ -42,9 +42,9 @@ post_install() { } gpsd-python_package() { - short_desc+=" - python tools/bindings" + short_desc+=" - Python2 tools/bindings" depends="python gnuplot ${sourcepkg}>=${version}_${revision}" - pycompile_module="gpsd" + pycompile_module="gps" pkg_install() { vmove usr/lib/python2.7 vmove usr/bin/gegps @@ -59,8 +59,8 @@ gpsd-python_package() { } gpsd-xgps_package() { - short_desc+=" - PyGTK based clients" - depends="pygtk ${sourcepkg}-python>=${version}_${revision} python-gobject" + short_desc+=" - PyGI based clients" + depends="${sourcepkg}-python>=${version}_${revision} gtk+3 python-gobject" pkg_install() { vmove usr/bin/xgps vmove usr/bin/xgpsspeed diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template index 60772dbcafc..b744e19de02 100644 --- a/srcpkgs/gtk-vnc/template +++ b/srcpkgs/gtk-vnc/template @@ -3,9 +3,8 @@ pkgname=gtk-vnc version=0.8.0 revision=1 hostmakedepends="automake gettext-devel glib-devel gobject-introspection - intltool libgcrypt-devel pkg-config pygtk-devel" -makedepends="gnutls-devel gtk+3-devel libsasl-devel pygtk-devel - $(vopt_if gir 'vala-devel')" + intltool libgcrypt-devel pkg-config" +makedepends="gnutls-devel gtk+3-devel libsasl-devel $(vopt_if gir 'vala-devel')" configure_args="$(vopt_enable gir introspection)" short_desc="VNC viewer widget for GTK" maintainer="Juan RP " @@ -19,7 +18,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" post_extract() { cp -a ${wrksrc} /tmp/gtk2-build cp -a ${wrksrc} /tmp/gtk3-build diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template index 53c85d51a27..75bbd965d7e 100644 --- a/srcpkgs/mypaint/template +++ b/srcpkgs/mypaint/template @@ -1,11 +1,11 @@ # Template file for 'mypaint' pkgname=mypaint version=1.2.1 -revision=4 +revision=5 hostmakedepends="scons swig pkg-config" makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel lcms2-devel gtk+3-devel python-gobject-devel" -depends="librsvg pygtk python-numpy python-gobject" +depends="librsvg python-numpy python-gobject" pycompile_dirs="/usr/share/mypaint" short_desc="Graphics application for digital painters" maintainer="Stefan Mühlinghaus " diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template index 2fa949d3354..5d261227566 100644 --- a/srcpkgs/scanmem/template +++ b/srcpkgs/scanmem/template @@ -1,11 +1,11 @@ # Template file for 'scanmem' pkgname=scanmem version=0.17 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="libtool intltool m4 automake python" makedepends="readline-devel gettext-devel" -depends="pygtk polkit python-gobject" +depends="polkit gtk+3 python-gobject" short_desc="Memory scanner designed to isolate the address of an arbitrary var" maintainer="Andrea Brancaleoni " license="GPL-3" diff --git a/srcpkgs/tryton/template b/srcpkgs/tryton/template index 2e50da46012..6e7aa5796a4 100644 --- a/srcpkgs/tryton/template +++ b/srcpkgs/tryton/template @@ -1,12 +1,12 @@ # Template file for 'tryton' pkgname=tryton version=4.8.4 -revision=1 +revision=2 noarch=yes build_style=python2-module pycompile_module="tryton" hostmakedepends="python-setuptools" -depends="pygtk python-dateutil python-gobject" +depends="gtk+3 python-dateutil python-gobject" short_desc="Three-tier high-level general purpose application platform" maintainer="cr6git " license="GPL-3.0-or-later"