From a3bb28551df94028000fb72308a9e9baa01458b0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 3 Jun 2024 00:07:26 +0100 Subject: gentoo auto-resync : 03:06:2024 - 00:07:25 --- x11-misc/Manifest.gz | Bin 46552 -> 46554 bytes x11-misc/spacefm/Manifest | 2 + .../spacefm/files/spacefm-gcc14-build-fix.patch | 76 ++++++++++++++++++++ x11-misc/spacefm/spacefm-1.0.6-r3.ebuild | 78 +++++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 x11-misc/spacefm/files/spacefm-gcc14-build-fix.patch create mode 100644 x11-misc/spacefm/spacefm-1.0.6-r3.ebuild (limited to 'x11-misc') diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index 3b3da948f10d..998321dfcff3 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest index 3bd93f082205..bacb0ed5dc3f 100644 --- a/x11-misc/spacefm/Manifest +++ b/x11-misc/spacefm/Manifest @@ -1,7 +1,9 @@ AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428 AUX spacefm-dash.patch 1737 BLAKE2B 8101c05d2c4f268433d92244f7a78bb7ebef17714ee29139adb6a02ba6c7a60cb8a14a8bc2e1ef8e43b374fdbc20216cad68e1fe36d8ac2671da595f34761587 SHA512 4e4c89c546e48a1972877c02a9b635bb56fe91a1a2f561cff85c836d7f8f4cb8638b5852c13a29c707061959d501a6033c93eff57ac488a833a82f55ef9746f4 AUX spacefm-fno-common.patch 2316 BLAKE2B 3f91d4eb0039a3b0e4ba3fe13b9d6436bd91beca0e224af7722d3fa2002e413c6e78cdb7f2eb690e2d58dda90638d896c8f186de8de544829a5bd0ff078b7a60 SHA512 02cd669d89080b5644adfa3092c452ebd3e6a1c39610ba96f5e49e23f3b6697996aa7e35709e46e6b8eb3fc73ff026cc9cf2c7183d4d867ef52e880fc33d31c4 +AUX spacefm-gcc14-build-fix.patch 3586 BLAKE2B 3e2ff0a26fb927f2dbdd95cd25ba9f38478055f9e77552975fade7f53d359f9cc012c7f30bf38ac98255f2b077c9c4ff2eab38cc8d8082370522f33b18e0c4fe SHA512 042e9868ec850e4764cfdf0108f919b22406dd9bffbd0731dcb6a78759e1b56c0300079cd70e4491e5b1ccce1387bef407f997532c87c4f1dc6949f40db08061 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c EBUILD spacefm-1.0.6-r1.ebuild 1983 BLAKE2B d21ef66e6f1cb27179f2d783a4153c6b4fd65491f0fdc4379c0e99ab64d69b47264218779efad5fc25c37052d11a61d34643b71d7ad3a9eb3a1230d3ff61f816 SHA512 8eae7ba5c9665173c17529d9286cc5effa44294eec6622af51af7ce8421f36fe5cf0b997de57afd0e11a648d901309386cb92c29bbe8aa0ec01eb1bcdf2fdd6d EBUILD spacefm-1.0.6-r2.ebuild 2074 BLAKE2B ffd12edbf1484e5f9b0914ffe467366e928b15cb5261ad286fdcfb70280aa1409a9e37878826ea5f1a391cb4324eeb14a040d54543d7753e67375040cf3a4568 SHA512 2230c856408b00295e240d8aa546db3fd508cfef3abb461d99c1e0e086d78292583ffbd61c23987137d20db637cebb4553a30543299ef20f408b1f4df46e5817 +EBUILD spacefm-1.0.6-r3.ebuild 2148 BLAKE2B 3649fd95078a55f2765efdf3d8c8b424fed0f966789cfa274ad2e50a653ec3b83c72d20ae5ec21445cee19512d286a8fb0bd5b4201253a64c1d413343f0c3c78 SHA512 d792361ab3c90e40f9ecff67ab181605fa6a3ec77fac87ee6af2d3abda6bdce344585bb5c0dfb15e02989136197915e3340d1665c23679c0ff45e02dee1e6204 MISC metadata.xml 1074 BLAKE2B bb1ae823905cb180e7a65c7c157b97fef75c6839f38f31451876e0697de50ba77a72aed90692fc6df87ede02cd0b2c5e9b7970c01bb2bcf2c598999ea49f2671 SHA512 486c0afcc309a15ed8dff31faa40f8b2f6bfc6d6a6a414661fba7acebbd5e58548e10e5e71185e9ed2ab34f151b7237685428f42b0a48ae8b103fab174b34e88 diff --git a/x11-misc/spacefm/files/spacefm-gcc14-build-fix.patch b/x11-misc/spacefm/files/spacefm-gcc14-build-fix.patch new file mode 100644 index 000000000000..7212241c68e0 --- /dev/null +++ b/x11-misc/spacefm/files/spacefm-gcc14-build-fix.patch @@ -0,0 +1,76 @@ +https://github.com/IgnorantGuru/spacefm/pull/816 +From: Brahmajit Das +Date: Mon, 22 Apr 2024 02:09:09 +0530 +Subject: [PATCH 1/1] Fix build issues with GCC 14 + +GCC 14 enables -Wincompatible-pointer-types by default thus resulting in +build error such as: +exo-icon-view.c:2686:27: error: assignment to GdkWindow {aka struct _GdkWindow } from incompatible pointer type GObject {aka struct _GObject } [-Wincompatible-pointer-types] + +Much of the code changes are borrowed from older code segments. + +First reported on Gentoo linux, for more reference please bug: +https://bugs.gentoo.org/928492 + +Signed-off-by: Brahmajit Das +--- a/src/exo/exo-gdk-pixbuf-extensions.c ++++ b/src/exo/exo-gdk-pixbuf-extensions.c +@@ -492,7 +492,10 @@ exo_gdk_pixbuf_scale_down (GdkPixbuf *source, + + /* check if we need to scale */ + if (G_UNLIKELY (source_width <= dest_width && source_height <= dest_height)) +- return g_object_ref (G_OBJECT (source)); ++ { ++ g_object_ref (G_OBJECT (source)); ++ return source; ++ } + + /* check if aspect ratio should be preserved */ + if (G_LIKELY (preserve_aspect_ratio)) +--- a/src/exo/exo-icon-chooser-model.c ++++ b/src/exo/exo-icon-chooser-model.c +@@ -671,7 +671,8 @@ _exo_icon_chooser_model_get_for_icon_theme (GtkIconTheme *icon_theme) + g_object_set_data (G_OBJECT (icon_theme), "exo-icon-chooser-default-model", model); + + /* associated the model with the icon theme */ +- model->icon_theme = g_object_ref (G_OBJECT (icon_theme)); ++ model->icon_theme = icon_theme; ++ g_object_ref (G_OBJECT (icon_theme)); + exo_icon_chooser_model_icon_theme_changed (icon_theme, model); + g_signal_connect (G_OBJECT (icon_theme), "changed", G_CALLBACK (exo_icon_chooser_model_icon_theme_changed), model); + } +--- a/src/exo/exo-icon-view.c ++++ b/src/exo/exo-icon-view.c +@@ -2683,7 +2683,8 @@ exo_icon_view_key_press_event (GtkWidget *widget, + /* allocate a new event to forward */ + new_event = gdk_event_copy ((GdkEvent *) event); + g_object_unref (G_OBJECT (new_event->key.window)); +- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (GTK_WIDGET(icon_view->priv->search_entry)))); ++ new_event->key.window = gtk_widget_get_window (GTK_WIDGET(icon_view->priv->search_entry)); ++ g_object_ref (G_OBJECT (gtk_widget_get_window (GTK_WIDGET(new_event->key.window)))); + + /* send the event to the search entry. If the "preedit-changed" signal is + * emitted during this event, priv->search_imcontext_changed will be set. +@@ -3082,7 +3083,8 @@ exo_icon_view_set_hadjustment (ExoIconView *icon_view, + if (!hadj) + hadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + +- icon_view->priv->hadjustment = g_object_ref_sink (G_OBJECT (hadj)); ++ icon_view->priv->hadjustment = hadj; ++ g_object_ref_sink (G_OBJECT (icon_view->priv->hadjustment)); + + g_signal_connect (icon_view->priv->hadjustment, "value-changed", + G_CALLBACK (exo_icon_view_adjustment_changed), +@@ -3109,7 +3111,8 @@ exo_icon_view_set_vadjustment (ExoIconView *icon_view, + if (!vadj) + vadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + +- icon_view->priv->vadjustment = g_object_ref_sink (G_OBJECT (vadj)); ++ icon_view->priv->vadjustment = vadj; ++ g_object_ref_sink(G_OBJECT (icon_view->priv->vadjustment)); + + g_signal_connect (icon_view->priv->vadjustment, "value-changed", + G_CALLBACK (exo_icon_view_adjustment_changed), +-- +2.44.0 + diff --git a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild new file mode 100644 index 000000000000..6b688c387c0a --- /dev/null +++ b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info optfeature xdg + +DESCRIPTION="A multi-panel tabbed file manager" +HOMEPAGE="https://ignorantguru.github.io/spacefm/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" + EGIT_BRANCH="next" + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="+startup-notification +video-thumbnails" + +RDEPEND="dev-libs/glib:2 + dev-util/desktop-file-utils + virtual/udev + virtual/freedesktop-icon-theme + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/pango + x11-libs/libX11 + x11-misc/shared-mime-info + startup-notification? ( x11-libs/startup-notification ) + video-thumbnails? ( media-video/ffmpegthumbnailer )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-9999-include-sysmacros.patch + "${FILESDIR}"/${PN}-fno-common.patch + "${FILESDIR}"/${PN}-dash.patch #891181 + "${FILESDIR}"/${PN}-gcc14-build-fix.patch #928492 +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable startup-notification) \ + $(use_enable video-thumbnails) \ + --disable-hal \ + --enable-inotify \ + --disable-pixmaps \ + --with-gtk3 +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks + optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil + optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu] + # sys-apps/util-linux is required for eject + optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux + + if ! has_version 'sys-fs/udisks' ; then + elog "When using SpaceFM without udisks, and without the udisks-daemon running," + elog "you may need to enable kernel polling for device media changes to be detected." + elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll" + fi +} -- cgit v1.2.3