diff options
author | Matteo Bernardini | 2024-05-15 10:27:40 +0200 |
---|---|---|
committer | Matteo Bernardini | 2024-06-01 14:00:58 +0200 |
commit | 11075a96c0e25aab40c708dae26ca0fb6d3a5c9c (patch) | |
tree | 0f90f5fe7f9ed90fef56ea66e57d0e39d0e0345a | |
parent | a0d1ab69c9963cb2cc62703291fae30c09d35fea (diff) | |
download | slackbuilds-libfm.tar.gz |
libraries/libfm: Updated for version 20230916_5346a53.libfm
Patched for gcc >= 14.x
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r-- | libraries/libfm/gcc14.patch | 55 | ||||
-rw-r--r-- | libraries/libfm/libfm.SlackBuild | 6 | ||||
-rw-r--r-- | libraries/libfm/libfm.info | 6 |
3 files changed, 62 insertions, 5 deletions
diff --git a/libraries/libfm/gcc14.patch b/libraries/libfm/gcc14.patch new file mode 100644 index 0000000000..c04fd53cc0 --- /dev/null +++ b/libraries/libfm/gcc14.patch @@ -0,0 +1,55 @@ +From ec6a21263d150aea918826941a80f335b45470a8 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Fri, 1 Mar 2024 14:19:46 +0900 +Subject: [PATCH] FIX: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types . +To support this, cast GTK related objects for assignment +properly. + +Fixes #100 . +--- + src/gtk/exo/exo-icon-view.c | 2 +- + src/gtk/fm-dnd-dest.c | 2 +- + src/gtk/fm-standard-view.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/gtk/exo/exo-icon-view.c b/src/gtk/exo/exo-icon-view.c +index 3ce98099..79e1c7ab 100644 +--- a/src/gtk/exo/exo-icon-view.c ++++ b/src/gtk/exo/exo-icon-view.c +@@ -2819,7 +2819,7 @@ 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 (icon_view->priv->search_entry))); ++ new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)))); + + /* send the event to the search entry. If the "preedit-changed" signal is + * emitted during this event, priv->search_imcontext_changed will be set. +diff --git a/src/gtk/fm-dnd-dest.c b/src/gtk/fm-dnd-dest.c +index 95d310d3..ce752758 100644 +--- a/src/gtk/fm-dnd-dest.c ++++ b/src/gtk/fm-dnd-dest.c +@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget, + gtk_action_set_sensitive(act, FALSE); + } + } +- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")); ++ ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"))); + g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL); + unmap_handler = g_signal_connect(ri.menu, "unmap", + G_CALLBACK(run_unmap_handler), &ri); +diff --git a/src/gtk/fm-standard-view.c b/src/gtk/fm-standard-view.c +index e0ff5a06..df920254 100644 +--- a/src/gtk/fm-standard-view.c ++++ b/src/gtk/fm-standard-view.c +@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels) + "text", FM_FOLDER_MODEL_COL_NAME ); + if(fv->renderer_text) + g_object_unref(fv->renderer_text); +- fv->renderer_text = g_object_ref_sink(render); ++ fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render)); + exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME); + g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv); + g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv); diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild index 99a22733f4..1cd6e3da53 100644 --- a/libraries/libfm/libfm.SlackBuild +++ b/libraries/libfm/libfm.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20230916_5346a53} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,6 +83,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc14.patch + NOCONFIGURE=1 sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libfm/libfm.info b/libraries/libfm/libfm.info index 33d95cb239..54af9b127a 100644 --- a/libraries/libfm/libfm.info +++ b/libraries/libfm/libfm.info @@ -1,8 +1,8 @@ PRGNAM="libfm" -VERSION="1.3.2" +VERSION="20230916_5346a53" HOMEPAGE="https://wiki.lxde.org/en/Libfm" -DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz" -MD5SUM="c87a0ff41ae77825079b2f785ec0741e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/libfm-20230916_5346a53.tar.xz" +MD5SUM="9c32dde43dda170979358eea298ba10e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxmenu-data menu-cache" |