From 1f39915de3509337872a87b7650734bb85b9e945 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 14 Feb 2023 20:00:53 +0100 Subject: [PATCH 1/2] libappindicator: remove package uses python2, not maintained since 2012, replaced by libayatana-appindicator --- common/shlibs | 1 - srcpkgs/libappindicator-devel | 1 - srcpkgs/libappindicator/template | 45 -------------------------------- 3 files changed, 47 deletions(-) delete mode 120000 srcpkgs/libappindicator-devel delete mode 100644 srcpkgs/libappindicator/template diff --git a/common/shlibs b/common/shlibs index 6d01ee351af6..04785fa8b039 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3057,7 +3057,6 @@ libappstream-builder.so.8 appstream-glib-0.6.13_1 libflatpak.so.0 flatpak-0.9.3_2 libnanomsg.so.5 nanomsg-1.1.3_1 libindicator3.so.7 libindicator-12.10.1_1 -libappindicator3.so.1 libappindicator-12.10.0_1 libscanmem.so.1 libscanmem-0.17_5 libsctp.so.1 lksctp-tools-1.0.17_1 libwithsctp.so.1 lksctp-tools-1.0.17_1 diff --git a/srcpkgs/libappindicator-devel b/srcpkgs/libappindicator-devel deleted file mode 120000 index 8bd81b384994..000000000000 --- a/srcpkgs/libappindicator-devel +++ /dev/null @@ -1 +0,0 @@ -libappindicator \ No newline at end of file diff --git a/srcpkgs/libappindicator/template b/srcpkgs/libappindicator/template deleted file mode 100644 index 11fc6f6d1527..000000000000 --- a/srcpkgs/libappindicator/template +++ /dev/null @@ -1,45 +0,0 @@ -# Template file for 'libappindicator' -pkgname=libappindicator -version=12.10.0 -revision=3 -build_style=gnu-configure -build_helper="gir" -configure_args="--with-gtk=3" -hostmakedepends="pkg-config python glib-devel" -makedepends="gtk+3-devel glib-devel glib-networking libdbusmenu-glib-devel - libdbusmenu-gtk3-devel libindicator-devel dbus-glib-devel python-devel - python-gobject2-devel pygtk-devel" -short_desc="Library to allow applications to export a menu" -maintainer="Toyam Cox " -license="LGPL-2.1" -homepage="https://launchpad.net/libappindicator" -distfiles="https://launchpad.net/libappindicator/${version%.*}/${version}/+download/libappindicator-${version}.tar.gz" -checksum=d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f - -# since this package depends on features that have already been removed in -# gtk+4, we need to ignore the depreciated problem. GTK is going away from the -# idea of app indicators in taskbars. -CFLAGS="-Wno-deprecated-declarations -Wno-error=incompatible-pointer-types" - -# Avoid errors for macros deprecated since glib-2.58 */ -CFLAGS+=" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_56" - - -pre_configure() { - if [ "$CROSS_BUILD" ]; then - sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure - fi -} - -libappindicator-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libdbusmenu-glib-devel" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.so - vmove usr/lib/*.a - vmove usr/share/gir-1.0 - vmove usr/share/gtk-doc - } -} From 5f3b07e31785e70076f60fcc12536a17b2edc63d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 14 Feb 2023 20:07:07 +0100 Subject: [PATCH 2/2] libindicator: remove package last release in 2012, replaced by libayatana-indicator --- common/shlibs | 1 - srcpkgs/libindicator-devel | 1 - srcpkgs/libindicator/patches/gtk+3.patch | 11 -------- srcpkgs/libindicator/template | 36 ------------------------ 4 files changed, 49 deletions(-) delete mode 120000 srcpkgs/libindicator-devel delete mode 100644 srcpkgs/libindicator/patches/gtk+3.patch delete mode 100644 srcpkgs/libindicator/template diff --git a/common/shlibs b/common/shlibs index 04785fa8b039..8ffd4426a551 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3056,7 +3056,6 @@ libappstream-glib.so.8 appstream-glib-0.6.13_1 libappstream-builder.so.8 appstream-glib-0.6.13_1 libflatpak.so.0 flatpak-0.9.3_2 libnanomsg.so.5 nanomsg-1.1.3_1 -libindicator3.so.7 libindicator-12.10.1_1 libscanmem.so.1 libscanmem-0.17_5 libsctp.so.1 lksctp-tools-1.0.17_1 libwithsctp.so.1 lksctp-tools-1.0.17_1 diff --git a/srcpkgs/libindicator-devel b/srcpkgs/libindicator-devel deleted file mode 120000 index 67d163620094..000000000000 --- a/srcpkgs/libindicator-devel +++ /dev/null @@ -1 +0,0 @@ -libindicator \ No newline at end of file diff --git a/srcpkgs/libindicator/patches/gtk+3.patch b/srcpkgs/libindicator/patches/gtk+3.patch deleted file mode 100644 index 200609d58a9f..000000000000 --- a/srcpkgs/libindicator/patches/gtk+3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libindicator/indicator-image-helper.c.bck 2017-06-14 03:46:33.174214553 -0400 -+++ b/libindicator/indicator-image-helper.c 2017-06-14 03:47:00.594494305 -0400 -@@ -69,7 +69,7 @@ - GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); - - if (icon_info != NULL) { -- gtk_icon_info_free(icon_info); -+ g_object_unref(icon_info); - } - - if (pixbuf == NULL) { diff --git a/srcpkgs/libindicator/template b/srcpkgs/libindicator/template deleted file mode 100644 index 1ad0e5f9c6e7..000000000000 --- a/srcpkgs/libindicator/template +++ /dev/null @@ -1,36 +0,0 @@ -# Template file for 'libindicator' -pkgname=libindicator -version=12.10.1 -revision=1 -build_style=gnu-configure -configure_args="--with-gtk=3" -hostmakedepends="pkg-config glib-devel" -makedepends="garcon gtk+3-devel libglib-devel" -short_desc="Convenient symbols and functions for indicators in the Ayatana project" -maintainer="Toyam Cox " -license="GPL-3" -homepage="https://launchpad.net/libindicator" -distfiles="https://launchpad.net/libindicator/${version%.*}/${version}/+download/libindicator-${version}.tar.gz" -checksum=b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f - -CFLAGS="-Wno-deprecated-declarations" -# Avoid errors for macros deprecated since glib-2.58 */ -CFLAGS+=" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_56" - - -post_configure() { - # Due to laziness, let's just fix the problem here without - # understanding it - sed -i -e 's/-lglib-2.0-lm/-lglib-2.0 -lm/' Makefile */Makefile -} - -libindicator-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.so - vmove usr/lib/*.a - } -}