From 6bd1681d0641d535feaaa83c326c59196a1d61d9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 4 Jan 2023 16:45:25 +0100 Subject: [PATCH 1/3] geany-plugins: remove libwnck2 build dep only needed for devhelp which is disabled --- srcpkgs/geany-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index aa227f66a6dc..c8e469c2d589 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -7,7 +7,7 @@ configure_args="--enable-all-plugins --disable-devhelp --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm" hostmakedepends="automake gettext-devel intltool libtool pkg-config vala glib-devel" -makedepends="geany-devel lua51-devel ctpl-devel libwnck2-devel zlib-devel +makedepends="geany-devel lua51-devel ctpl-devel zlib-devel gpgme-devel enchant2-devel libgit2-devel libsoup-devel gtkspell-devel webkit2gtk-devel vte3-devel" short_desc="Geany IDE plugins" From 8a8a686b5b35711a3c30d92d2d81d5fd2d67659f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 4 Jan 2023 16:49:45 +0100 Subject: [PATCH 2/3] xfce4-taskmanager: use new libwnck libwnck 3 is supported since 2014, libwnck 2 is not supported since 2020 (1.4.0) --- srcpkgs/xfce4-taskmanager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template index 8ca483c0620a..85323727cb53 100644 --- a/srcpkgs/xfce4-taskmanager/template +++ b/srcpkgs/xfce4-taskmanager/template @@ -1,11 +1,11 @@ # Template file for 'xfce4-taskmanager' pkgname=xfce4-taskmanager version=1.5.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale --disable-static" hostmakedepends="pkg-config intltool" -makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel" +makedepends="libxfce4ui-devel libwnck-devel libXmu-devel gtk+3-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="XFCE task manager plugin" maintainer="Ulf " From 6a2ee8ee89e6cd08e4fa7def8a22a189f3fa83f8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 4 Jan 2023 16:55:45 +0100 Subject: [PATCH 3/3] libwnck2: remove package gtk2, very old version of libwnck, unused --- common/shlibs | 1 - srcpkgs/libwnck2/template | 42 ------------------------------- srcpkgs/libwnck2/update | 2 -- srcpkgs/removed-packages/template | 2 ++ 4 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/libwnck2/template delete mode 100644 srcpkgs/libwnck2/update diff --git a/common/shlibs b/common/shlibs index 52a6d3e6d5fb..5a06ade2f153 100644 --- a/common/shlibs +++ b/common/shlibs @@ -171,7 +171,6 @@ libXau.so.6 libXau-1.0.4_1 libexslt.so.0 libxslt-1.1.24_1 libxslt.so.1 libxslt-1.1.24_1 libstartup-notification-1.so.0 startup-notification-0.10_1 -libwnck-1.so.22 libwnck2-2.30_1 libwnck-3.so.0 libwnck-2.91.90_1 libnl.so.1 libnl-1.1_1 libnl-3.so.200 libnl3-3.2.1_1 diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template deleted file mode 100644 index a787f94573d1..000000000000 --- a/srcpkgs/libwnck2/template +++ /dev/null @@ -1,42 +0,0 @@ -# Template file for 'libwnck2' -pkgname=libwnck2 -version=2.30.7 -revision=8 -build_style=gnu-configure -build_helper="gir" -configure_args="$(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)" -makedepends="startup-notification-devel libXres-devel gtk+-devel" -short_desc="Library for layout and rendering of text (GTK+2)" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://www.gnome.org/" -distfiles="${GNOME_SITE}/libwnck/2.30/libwnck-$version.tar.bz2" -checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c - -# Package build options -build_options="gir" -build_options_default="gir" - -post_patch() { - vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure -} - -post_install() { - rm -rf ${DESTDIR}/usr/bin -} - -libwnck2-devel_package() { - depends="gtk+-devel startup-notification-devel libXres-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - vmove usr/share/gtk-doc - } -} diff --git a/srcpkgs/libwnck2/update b/srcpkgs/libwnck2/update deleted file mode 100644 index 759b51fbd9d7..000000000000 --- a/srcpkgs/libwnck2/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=libwnck -ignore="[!2].*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6348bc031851..a6a9e09bca86 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -289,6 +289,8 @@ replaces=" libunique1-devel<=1.1.6_12 libunique1<=1.1.6_12 libunique<=3.0.2_11 + libwnck2-devel<=2.30.7_8 + libwnck2<=2.30.7_8 libxml2-python<=2.9.10_4 libxnoise<=0.2.21_4 libxslt-python<=1.1.34_5