From c6e24a54291c6ae29651c8aedebfd2068fff89f9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 03:40:06 -0400 Subject: [PATCH 1/2] electron19: remove unused dep on libgnome-keyring-devel --- srcpkgs/electron19/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template index 0ef959125cb085..b1fdb63cb67d46 100644 --- a/srcpkgs/electron19/template +++ b/srcpkgs/electron19/template @@ -14,7 +14,7 @@ hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nod alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sndio sndio-devel) jq python3.11" makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel - libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel + libXi-devel libgcrypt-devel cups-devel elfutils-devel libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel From 7fa02e182c5f9c9ea0f7dcff13447948733f61c6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 03:40:27 -0400 Subject: [PATCH 2/2] libgnome-keyring: remove package deprecated, not used by any other library closes #26333 --- common/shlibs | 1 - srcpkgs/libgnome-keyring-devel | 1 - srcpkgs/libgnome-keyring/template | 38 ------------------------------- srcpkgs/removed-packages/template | 12 ++++++---- 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 120000 srcpkgs/libgnome-keyring-devel delete mode 100644 srcpkgs/libgnome-keyring/template diff --git a/common/shlibs b/common/shlibs index 4b88c10b0d390f..508415c48ed1ea 100644 --- a/common/shlibs +++ b/common/shlibs @@ -596,7 +596,6 @@ libgnome-menu-3.so.0 gnome-menus-2.91.6_1 libart_lgpl_2.so.2 libart-2.3.20_1 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1 libgnomecanvasmm-2.6.so.1 libgnomecanvasmm-2.26.0_1 -libgnome-keyring.so.0 libgnome-keyring-3.0.0_1 libical.so.3 libical-3.0.4_1 libical_cxx.so.3 libical-3.0.4_1 libicalss.so.3 libical-3.0.4_1 diff --git a/srcpkgs/libgnome-keyring-devel b/srcpkgs/libgnome-keyring-devel deleted file mode 120000 index e37fa1e03b92eb..00000000000000 --- a/srcpkgs/libgnome-keyring-devel +++ /dev/null @@ -1 +0,0 @@ -libgnome-keyring \ No newline at end of file diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template deleted file mode 100644 index 84418574389a3f..00000000000000 --- a/srcpkgs/libgnome-keyring/template +++ /dev/null @@ -1,38 +0,0 @@ -# Template file for 'libgnome-keyring' -pkgname=libgnome-keyring -version=3.12.0 -revision=5 -build_style=gnu-configure -build_helper="gir" -configure_args="$(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool" -makedepends="dbus-devel libglib-devel libgcrypt-devel" -checkdepends="glib-devel" -short_desc="GNOME keyring client library" -maintainer="Orphaned " -license="GPL-2.0-or-later, LGPL-2.0-or-later" -homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 - -# Package build options -build_options="gir" -build_options_default="gir" - -post_patch() { - vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure -} - -libgnome-keyring-devel_package() { - depends="libglib-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - 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/removed-packages/template b/srcpkgs/removed-packages/template index a9821553808851..9d17096426b0ab 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20240312 +version=0.1.20240418 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -329,6 +329,8 @@ replaces=" libbitcoin-server<=3.6.0_10 libbitcoin-system-devel<=3.6.0_10 libbitcoin-system<=3.6.0_10 + libclang-32bit<=15.0.7_3 + libclang-cpp-32bit<=15.0.7_3 libco-devel<=20_1 libco<=20_1 libdbusmenu-qt<=0.9.2_4 @@ -342,6 +344,8 @@ replaces=" libglademm-devel<=2.6.7_6 libglademm<=2.6.7_6 libglib-static<=2.58.3_5 + libgnome-keyring-devel<=3.12.0_5 + libgnome-keyring<=3.12.0_5 libgroff<=1.22.4_3 libgtkhtml<=4.10.0_1 libllvm10<=10.0.0_8 @@ -401,6 +405,8 @@ replaces=" libzapojit<=0.0.3_10 litecoin<=0.18.1_11 livewallpaper<=0.5.0_2 + lld-devel<=15.0.7_3 + lldb-devel<=15.0.7_3 llvm10<=10.0.0_8 llvm11<=11.0.0_2 llvm3.9<=3.9.1_5 @@ -729,10 +735,6 @@ replaces=" zou<=0.2.0_7 zuluplay-devel<=1.1_1 zuluplay<=1.1_1 - lldb-devel<=15.0.7_3 - lld-devel<=15.0.7_3 - libclang-32bit<=15.0.7_3 - libclang-cpp-32bit<=15.0.7_3 " if [ "$XBPS_TARGET_LIBC" = "musl" ]; then