From d15af037a8d587dad9932e1ded75b9949873d530 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:59:26 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 88578c039b81f80b98adc6d626b2039a0b615e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:51:36 +0200 Subject: [PATCH 2/9] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xfce4-notes-plugin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 59b320b..77e6060 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -7,7 +7,8 @@ Version: 1.11.0 Release: %autorelease Summary: Notes plugin for the Xfce panel -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 From df25228024db7ac658f4d61190b06140e8e17fca Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 22 Dec 2024 16:46:51 -0600 Subject: [PATCH 3/9] fix FTBFS and rebuild for xfce 4.20 --- 0001-Fix-FTBFS-with-gcc-14.patch | 359 +++++++++++++++++++++++++++++++ xfce4-notes-plugin.spec | 6 +- 2 files changed, 364 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-FTBFS-with-gcc-14.patch diff --git a/0001-Fix-FTBFS-with-gcc-14.patch b/0001-Fix-FTBFS-with-gcc-14.patch new file mode 100644 index 0000000..9f1edec --- /dev/null +++ b/0001-Fix-FTBFS-with-gcc-14.patch @@ -0,0 +1,359 @@ +From: Yves-Alexis Perez +Date: Fri, 26 Jul 2024 10:32:39 +0200 +Subject: Fix FTBFS with gcc-14 + +- add pragma generated by more recent vala compiler to explicitely + disable some warnings +- use menu.insert() instead of menu.append() to fix ftbfs with gcc-14 + (https://gitlab.gnome.org/GNOME/gtk/-/issues/5870) +--- + lib/application.c | 17 +++++++++++++---- + lib/application.vala | 6 +++--- + lib/hypertextview.c | 9 +++++++++ + lib/icon-button.c | 9 +++++++++ + lib/note.c | 9 +++++++++ + lib/theme-gtkcss.c | 9 +++++++++ + lib/theme.c | 9 +++++++++ + lib/window-monitor.c | 9 +++++++++ + lib/window.c | 9 +++++++++ + src/main-panel-plugin.c | 9 +++++++++ + src/main-popup.c | 9 +++++++++ + src/main-status-icon.c | 14 +++++++++++--- + src/main-status-icon.vala | 6 +++--- + 13 files changed, 111 insertions(+), 13 deletions(-) + +diff --git a/lib/application.c b/lib/application.c +index aff74db..2ecf377 100644 +--- a/lib/application.c ++++ b/lib/application.c +@@ -1,4 +1,4 @@ +-/* application.c generated by valac 0.56.14, the Vala compiler ++/* application.c generated by valac 0.56.17, the Vala compiler + * generated from application.vala, do not modify */ + + /* +@@ -37,6 +37,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + enum { + XNP_APPLICATION_0_PROPERTY, + XNP_APPLICATION_NOTES_PATH_PROPERTY, +@@ -3458,7 +3467,7 @@ __lambda16_ (Block2Data* _data2_) + _tmp8_ = mi; + g_signal_connect_object (_tmp8_, "activate", (GCallback) _____lambda18__gtk_menu_item_activate, self, 0); + _tmp9_ = mi; +- gtk_menu_shell_append ((GtkMenuShell*) _data2_->menu, _tmp9_); ++ gtk_menu_shell_insert ((GtkMenuShell*) _data2_->menu, G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp9_) : NULL, -1); + _g_object_unref0 (mi); + _g_object_unref0 (win); + } +@@ -3467,7 +3476,7 @@ __lambda16_ (Block2Data* _data2_) + _tmp10_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); + g_object_ref_sink (_tmp10_); + mi_sep = _tmp10_; +- gtk_menu_shell_append ((GtkMenuShell*) _data2_->menu, (GtkMenuItem*) mi_sep); ++ gtk_menu_shell_insert ((GtkMenuShell*) _data2_->menu, G_TYPE_CHECK_INSTANCE_TYPE (mi_sep, gtk_widget_get_type ()) ? ((GtkWidget*) mi_sep) : NULL, -1); + _tmp11_ = (GtkImageMenuItem*) gtk_image_menu_item_new_with_mnemonic (_ ("_Add a new group")); + g_object_ref_sink (_tmp11_); + mi_add = _tmp11_; +@@ -3476,7 +3485,7 @@ __lambda16_ (Block2Data* _data2_) + g_object_ref_sink (_tmp12_); + image = _tmp12_; + gtk_image_menu_item_set_image (mi_add, (GtkWidget*) image); +- gtk_menu_shell_append ((GtkMenuShell*) _data2_->menu, (GtkMenuItem*) mi_add); ++ gtk_menu_shell_insert ((GtkMenuShell*) _data2_->menu, G_TYPE_CHECK_INSTANCE_TYPE (mi_add, gtk_widget_get_type ()) ? ((GtkWidget*) mi_add) : NULL, -1); + gtk_widget_show_all ((GtkWidget*) _data2_->menu); + _g_object_unref0 (image); + _g_object_unref0 (mi_add); +diff --git a/lib/application.vala b/lib/application.vala +index 12fef77..e154de9 100644 +--- a/lib/application.vala ++++ b/lib/application.vala +@@ -1052,12 +1052,12 @@ namespace Xnp { + var w = i.get_data ("window"); + w.present (); + }); +- menu.append (mi); ++ menu.append (mi as Gtk.Widget, -1); + } + + // New group menu item + var mi_sep = new Gtk.SeparatorMenuItem (); +- menu.append (mi_sep); ++ menu.append (mi_sep as Gtk.Widget, -1); + var mi_add = new Gtk.ImageMenuItem.with_mnemonic (_("_Add a new group")); + mi_add.activate.connect (() => { + var new_win = create_window (); +@@ -1066,7 +1066,7 @@ namespace Xnp { + }); + var image = new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.MENU); + mi_add.set_image (image); +- menu.append (mi_add); ++ menu.insert (mi_add as Gtk.Widget, -1); + + // Show all items + menu.show_all (); +diff --git a/lib/hypertextview.c b/lib/hypertextview.c +index 8577647..29f0ea4 100644 +--- a/lib/hypertextview.c ++++ b/lib/hypertextview.c +@@ -32,6 +32,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + enum { + XNP_HYPERTEXT_VIEW_0_PROPERTY, + XNP_HYPERTEXT_VIEW_FONT_PROPERTY, +diff --git a/lib/icon-button.c b/lib/icon-button.c +index fc6f956..2dfe650 100644 +--- a/lib/icon-button.c ++++ b/lib/icon-button.c +@@ -31,6 +31,15 @@ + + #define M_PI 3.14159265358979323846 + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + enum { + XNP_ICON_BUTTON_0_PROPERTY, + XNP_ICON_BUTTON_ENABLED_PROPERTY, +diff --git a/lib/note.c b/lib/note.c +index 3e28543..a151932 100644 +--- a/lib/note.c ++++ b/lib/note.c +@@ -27,6 +27,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + enum { + XNP_NOTE_0_PROPERTY, + XNP_NOTE_NAME_PROPERTY, +diff --git a/lib/theme-gtkcss.c b/lib/theme-gtkcss.c +index 5d53157..a882bbb 100644 +--- a/lib/theme-gtkcss.c ++++ b/lib/theme-gtkcss.c +@@ -34,6 +34,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + enum { + XNP_THEME_GTKCSS_0_PROPERTY, + XNP_THEME_GTKCSS_USE_GTK_STYLE_PROPERTY, +diff --git a/lib/theme.c b/lib/theme.c +index 4b9aef8..a0382ef 100644 +--- a/lib/theme.c ++++ b/lib/theme.c +@@ -30,6 +30,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + enum { + XNP_THEME_0_PROPERTY, + XNP_THEME_NUM_PROPERTIES +diff --git a/lib/window-monitor.c b/lib/window-monitor.c +index 6eb43b0..5fe0c04 100644 +--- a/lib/window-monitor.c ++++ b/lib/window-monitor.c +@@ -27,6 +27,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + enum { + XNP_WINDOW_MONITOR_0_PROPERTY, + XNP_WINDOW_MONITOR_NUM_PROPERTIES +diff --git a/lib/window.c b/lib/window.c +index 8198818..afa80bb 100644 +--- a/lib/window.c ++++ b/lib/window.c +@@ -33,6 +33,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + #define XNP_WINDOW_ui_string "\n" \ + "\n" \ + " \n" \ +diff --git a/src/main-panel-plugin.c b/src/main-panel-plugin.c +index 2a90d4d..803c5e4 100644 +--- a/src/main-panel-plugin.c ++++ b/src/main-panel-plugin.c +@@ -31,6 +31,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + #if !defined(VALA_EXTERN) + #if defined(_MSC_VER) + #define VALA_EXTERN __declspec(dllexport) extern +diff --git a/src/main-popup.c b/src/main-popup.c +index 8371935..d804cb9 100644 +--- a/src/main-popup.c ++++ b/src/main-popup.c +@@ -26,6 +26,15 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif ++ + #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) + #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) + +diff --git a/src/main-status-icon.c b/src/main-status-icon.c +index ee1f095..8a6eb73 100644 +--- a/src/main-status-icon.c ++++ b/src/main-status-icon.c +@@ -31,6 +31,14 @@ + #include + #include + ++#if !defined(VALA_STRICT_C) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) ++#pragma GCC diagnostic warning "-Wincompatible-pointer-types" ++#elif defined(__clang__) && (__clang_major__ >= 16) ++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" ++#pragma clang diagnostic ignored "-Wincompatible-pointer-types" ++#endif ++#endif + #if !defined(VALA_EXTERN) + #if defined(_MSC_VER) + #define VALA_EXTERN __declspec(dllexport) extern +@@ -261,7 +269,7 @@ menu_add_icon_item (GtkMenu* menu, + image = _tmp1_; + gtk_image_menu_item_set_image (mi, (GtkWidget*) image); + g_signal_connect_data ((GtkMenuItem*) mi, "activate", (GCallback) ___lambda6__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); +- gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkMenuItem*) mi); ++ gtk_menu_shell_insert ((GtkMenuShell*) menu, G_TYPE_CHECK_INSTANCE_TYPE (mi, gtk_widget_get_type ()) ? ((GtkWidget*) mi) : NULL, -1); + _g_object_unref0 (image); + _g_object_unref0 (mi); + block1_data_unref (_data1_); +@@ -277,7 +285,7 @@ menu_add_separator (GtkMenu* menu) + _tmp0_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); + g_object_ref_sink (_tmp0_); + mi = _tmp0_; +- gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkMenuItem*) mi); ++ gtk_menu_shell_insert ((GtkMenuShell*) menu, G_TYPE_CHECK_INSTANCE_TYPE (mi, gtk_widget_get_type ()) ? ((GtkWidget*) mi) : NULL, -1); + _g_object_unref0 (mi); + } + +@@ -345,7 +353,7 @@ build_context_menu (void) + _tmp3_ = xnp_application_context_menu (_tmp2_); + menu_go = _tmp3_; + gtk_menu_item_set_submenu (mi, menu_go); +- gtk_menu_shell_append ((GtkMenuShell*) menu, mi); ++ gtk_menu_shell_insert ((GtkMenuShell*) menu, G_TYPE_CHECK_INSTANCE_TYPE (mi, gtk_widget_get_type ()) ? ((GtkWidget*) mi) : NULL, -1); + menu_add_separator (menu); + menu_add_icon_item (menu, _ ("_Properties"), "gtk-properties", ___lambda7__callback, NULL); + menu_add_icon_item (menu, _ ("_About"), "gtk-about", ___lambda8__callback, NULL); +diff --git a/src/main-status-icon.vala b/src/main-status-icon.vala +index 9f5141d..e09cf24 100644 +--- a/src/main-status-icon.vala ++++ b/src/main-status-icon.vala +@@ -54,12 +54,12 @@ static void menu_add_icon_item (Gtk.Menu menu, string text, string icon, Callbac + var image = new Gtk.Image.from_icon_name (icon, Gtk.IconSize.MENU); + mi.set_image (image); + mi.activate.connect (() => { callback (); }); +- menu.append (mi); ++ menu.insert (mi as Gtk.Widget, -1); + } + + static void menu_add_separator (Gtk.Menu menu) { + var mi = new Gtk.SeparatorMenuItem (); +- menu.append (mi); ++ menu.insert (mi as Gtk.Widget, -1); + } + + static Gtk.Menu build_context_menu () { +@@ -68,7 +68,7 @@ static Gtk.Menu build_context_menu () { + var mi = new Gtk.MenuItem.with_mnemonic (_("_Groups")); + var menu_go = application.context_menu (); + mi.set_submenu (menu_go); +- menu.append (mi); ++ menu.insert (mi as Gtk.Widget, -1); + + menu_add_separator (menu); + menu_add_icon_item (menu, _("_Properties"), "gtk-properties", () => { application.open_settings_dialog (); }); diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 77e6060..7339488 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -12,6 +12,10 @@ License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +# patch from upstream git +# https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/-/issues/84 +Patch0: 0001-Fix-FTBFS-with-gcc-14.patch + BuildRequires: make BuildRequires: gcc-c++ BuildRequires: xfce4-panel-devel >= %{xfceversion} @@ -30,7 +34,7 @@ background color and much more. %prep -%autosetup +%autosetup -p1 %build %configure --disable-static From 73add2ff3c58280cf6dc4275080d068e90ef6020 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 4 Jan 2025 08:17:08 -0600 Subject: [PATCH 4/9] Update to v1.11.1; drop unneded patch; add BR: gtksourceview4-devel --- .gitignore | 1 + 0001-Fix-FTBFS-with-gcc-14.patch | 359 ------------------------------- sources | 2 +- xfce4-notes-plugin.spec | 10 +- 4 files changed, 6 insertions(+), 366 deletions(-) delete mode 100644 0001-Fix-FTBFS-with-gcc-14.patch diff --git a/.gitignore b/.gitignore index c135ebc..e6911e0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xfce4-notes-plugin-1.7.6.tar.bz2 /xfce4-notes-plugin-1.9.0.tar.bz2 /xfce4-notes-plugin-1.10.0.tar.bz2 /xfce4-notes-plugin-1.11.0.tar.bz2 +/xfce4-notes-plugin-1.11.1.tar.bz2 diff --git a/0001-Fix-FTBFS-with-gcc-14.patch b/0001-Fix-FTBFS-with-gcc-14.patch deleted file mode 100644 index 9f1edec..0000000 --- a/0001-Fix-FTBFS-with-gcc-14.patch +++ /dev/null @@ -1,359 +0,0 @@ -From: Yves-Alexis Perez -Date: Fri, 26 Jul 2024 10:32:39 +0200 -Subject: Fix FTBFS with gcc-14 - -- add pragma generated by more recent vala compiler to explicitely - disable some warnings -- use menu.insert() instead of menu.append() to fix ftbfs with gcc-14 - (https://gitlab.gnome.org/GNOME/gtk/-/issues/5870) ---- - lib/application.c | 17 +++++++++++++---- - lib/application.vala | 6 +++--- - lib/hypertextview.c | 9 +++++++++ - lib/icon-button.c | 9 +++++++++ - lib/note.c | 9 +++++++++ - lib/theme-gtkcss.c | 9 +++++++++ - lib/theme.c | 9 +++++++++ - lib/window-monitor.c | 9 +++++++++ - lib/window.c | 9 +++++++++ - src/main-panel-plugin.c | 9 +++++++++ - src/main-popup.c | 9 +++++++++ - src/main-status-icon.c | 14 +++++++++++--- - src/main-status-icon.vala | 6 +++--- - 13 files changed, 111 insertions(+), 13 deletions(-) - -diff --git a/lib/application.c b/lib/application.c -index aff74db..2ecf377 100644 ---- a/lib/application.c -+++ b/lib/application.c -@@ -1,4 +1,4 @@ --/* application.c generated by valac 0.56.14, the Vala compiler -+/* application.c generated by valac 0.56.17, the Vala compiler - * generated from application.vala, do not modify */ - - /* -@@ -37,6 +37,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - enum { - XNP_APPLICATION_0_PROPERTY, - XNP_APPLICATION_NOTES_PATH_PROPERTY, -@@ -3458,7 +3467,7 @@ __lambda16_ (Block2Data* _data2_) - _tmp8_ = mi; - g_signal_connect_object (_tmp8_, "activate", (GCallback) _____lambda18__gtk_menu_item_activate, self, 0); - _tmp9_ = mi; -- gtk_menu_shell_append ((GtkMenuShell*) _data2_->menu, _tmp9_); -+ gtk_menu_shell_insert ((GtkMenuShell*) _data2_->menu, G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp9_) : NULL, -1); - _g_object_unref0 (mi); - _g_object_unref0 (win); - } -@@ -3467,7 +3476,7 @@ __lambda16_ (Block2Data* _data2_) - _tmp10_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - g_object_ref_sink (_tmp10_); - mi_sep = _tmp10_; -- gtk_menu_shell_append ((GtkMenuShell*) _data2_->menu, (GtkMenuItem*) mi_sep); -+ gtk_menu_shell_insert ((GtkMenuShell*) _data2_->menu, G_TYPE_CHECK_INSTANCE_TYPE (mi_sep, gtk_widget_get_type ()) ? ((GtkWidget*) mi_sep) : NULL, -1); - _tmp11_ = (GtkImageMenuItem*) gtk_image_menu_item_new_with_mnemonic (_ ("_Add a new group")); - g_object_ref_sink (_tmp11_); - mi_add = _tmp11_; -@@ -3476,7 +3485,7 @@ __lambda16_ (Block2Data* _data2_) - g_object_ref_sink (_tmp12_); - image = _tmp12_; - gtk_image_menu_item_set_image (mi_add, (GtkWidget*) image); -- gtk_menu_shell_append ((GtkMenuShell*) _data2_->menu, (GtkMenuItem*) mi_add); -+ gtk_menu_shell_insert ((GtkMenuShell*) _data2_->menu, G_TYPE_CHECK_INSTANCE_TYPE (mi_add, gtk_widget_get_type ()) ? ((GtkWidget*) mi_add) : NULL, -1); - gtk_widget_show_all ((GtkWidget*) _data2_->menu); - _g_object_unref0 (image); - _g_object_unref0 (mi_add); -diff --git a/lib/application.vala b/lib/application.vala -index 12fef77..e154de9 100644 ---- a/lib/application.vala -+++ b/lib/application.vala -@@ -1052,12 +1052,12 @@ namespace Xnp { - var w = i.get_data ("window"); - w.present (); - }); -- menu.append (mi); -+ menu.append (mi as Gtk.Widget, -1); - } - - // New group menu item - var mi_sep = new Gtk.SeparatorMenuItem (); -- menu.append (mi_sep); -+ menu.append (mi_sep as Gtk.Widget, -1); - var mi_add = new Gtk.ImageMenuItem.with_mnemonic (_("_Add a new group")); - mi_add.activate.connect (() => { - var new_win = create_window (); -@@ -1066,7 +1066,7 @@ namespace Xnp { - }); - var image = new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.MENU); - mi_add.set_image (image); -- menu.append (mi_add); -+ menu.insert (mi_add as Gtk.Widget, -1); - - // Show all items - menu.show_all (); -diff --git a/lib/hypertextview.c b/lib/hypertextview.c -index 8577647..29f0ea4 100644 ---- a/lib/hypertextview.c -+++ b/lib/hypertextview.c -@@ -32,6 +32,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - enum { - XNP_HYPERTEXT_VIEW_0_PROPERTY, - XNP_HYPERTEXT_VIEW_FONT_PROPERTY, -diff --git a/lib/icon-button.c b/lib/icon-button.c -index fc6f956..2dfe650 100644 ---- a/lib/icon-button.c -+++ b/lib/icon-button.c -@@ -31,6 +31,15 @@ - - #define M_PI 3.14159265358979323846 - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - enum { - XNP_ICON_BUTTON_0_PROPERTY, - XNP_ICON_BUTTON_ENABLED_PROPERTY, -diff --git a/lib/note.c b/lib/note.c -index 3e28543..a151932 100644 ---- a/lib/note.c -+++ b/lib/note.c -@@ -27,6 +27,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - enum { - XNP_NOTE_0_PROPERTY, - XNP_NOTE_NAME_PROPERTY, -diff --git a/lib/theme-gtkcss.c b/lib/theme-gtkcss.c -index 5d53157..a882bbb 100644 ---- a/lib/theme-gtkcss.c -+++ b/lib/theme-gtkcss.c -@@ -34,6 +34,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - enum { - XNP_THEME_GTKCSS_0_PROPERTY, - XNP_THEME_GTKCSS_USE_GTK_STYLE_PROPERTY, -diff --git a/lib/theme.c b/lib/theme.c -index 4b9aef8..a0382ef 100644 ---- a/lib/theme.c -+++ b/lib/theme.c -@@ -30,6 +30,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - enum { - XNP_THEME_0_PROPERTY, - XNP_THEME_NUM_PROPERTIES -diff --git a/lib/window-monitor.c b/lib/window-monitor.c -index 6eb43b0..5fe0c04 100644 ---- a/lib/window-monitor.c -+++ b/lib/window-monitor.c -@@ -27,6 +27,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - enum { - XNP_WINDOW_MONITOR_0_PROPERTY, - XNP_WINDOW_MONITOR_NUM_PROPERTIES -diff --git a/lib/window.c b/lib/window.c -index 8198818..afa80bb 100644 ---- a/lib/window.c -+++ b/lib/window.c -@@ -33,6 +33,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - #define XNP_WINDOW_ui_string "\n" \ - "\n" \ - " \n" \ -diff --git a/src/main-panel-plugin.c b/src/main-panel-plugin.c -index 2a90d4d..803c5e4 100644 ---- a/src/main-panel-plugin.c -+++ b/src/main-panel-plugin.c -@@ -31,6 +31,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - #if !defined(VALA_EXTERN) - #if defined(_MSC_VER) - #define VALA_EXTERN __declspec(dllexport) extern -diff --git a/src/main-popup.c b/src/main-popup.c -index 8371935..d804cb9 100644 ---- a/src/main-popup.c -+++ b/src/main-popup.c -@@ -26,6 +26,15 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif -+ - #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) - #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) - -diff --git a/src/main-status-icon.c b/src/main-status-icon.c -index ee1f095..8a6eb73 100644 ---- a/src/main-status-icon.c -+++ b/src/main-status-icon.c -@@ -31,6 +31,14 @@ - #include - #include - -+#if !defined(VALA_STRICT_C) -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 14) -+#pragma GCC diagnostic warning "-Wincompatible-pointer-types" -+#elif defined(__clang__) && (__clang_major__ >= 16) -+#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types" -+#pragma clang diagnostic ignored "-Wincompatible-pointer-types" -+#endif -+#endif - #if !defined(VALA_EXTERN) - #if defined(_MSC_VER) - #define VALA_EXTERN __declspec(dllexport) extern -@@ -261,7 +269,7 @@ menu_add_icon_item (GtkMenu* menu, - image = _tmp1_; - gtk_image_menu_item_set_image (mi, (GtkWidget*) image); - g_signal_connect_data ((GtkMenuItem*) mi, "activate", (GCallback) ___lambda6__gtk_menu_item_activate, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); -- gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkMenuItem*) mi); -+ gtk_menu_shell_insert ((GtkMenuShell*) menu, G_TYPE_CHECK_INSTANCE_TYPE (mi, gtk_widget_get_type ()) ? ((GtkWidget*) mi) : NULL, -1); - _g_object_unref0 (image); - _g_object_unref0 (mi); - block1_data_unref (_data1_); -@@ -277,7 +285,7 @@ menu_add_separator (GtkMenu* menu) - _tmp0_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); - g_object_ref_sink (_tmp0_); - mi = _tmp0_; -- gtk_menu_shell_append ((GtkMenuShell*) menu, (GtkMenuItem*) mi); -+ gtk_menu_shell_insert ((GtkMenuShell*) menu, G_TYPE_CHECK_INSTANCE_TYPE (mi, gtk_widget_get_type ()) ? ((GtkWidget*) mi) : NULL, -1); - _g_object_unref0 (mi); - } - -@@ -345,7 +353,7 @@ build_context_menu (void) - _tmp3_ = xnp_application_context_menu (_tmp2_); - menu_go = _tmp3_; - gtk_menu_item_set_submenu (mi, menu_go); -- gtk_menu_shell_append ((GtkMenuShell*) menu, mi); -+ gtk_menu_shell_insert ((GtkMenuShell*) menu, G_TYPE_CHECK_INSTANCE_TYPE (mi, gtk_widget_get_type ()) ? ((GtkWidget*) mi) : NULL, -1); - menu_add_separator (menu); - menu_add_icon_item (menu, _ ("_Properties"), "gtk-properties", ___lambda7__callback, NULL); - menu_add_icon_item (menu, _ ("_About"), "gtk-about", ___lambda8__callback, NULL); -diff --git a/src/main-status-icon.vala b/src/main-status-icon.vala -index 9f5141d..e09cf24 100644 ---- a/src/main-status-icon.vala -+++ b/src/main-status-icon.vala -@@ -54,12 +54,12 @@ static void menu_add_icon_item (Gtk.Menu menu, string text, string icon, Callbac - var image = new Gtk.Image.from_icon_name (icon, Gtk.IconSize.MENU); - mi.set_image (image); - mi.activate.connect (() => { callback (); }); -- menu.append (mi); -+ menu.insert (mi as Gtk.Widget, -1); - } - - static void menu_add_separator (Gtk.Menu menu) { - var mi = new Gtk.SeparatorMenuItem (); -- menu.append (mi); -+ menu.insert (mi as Gtk.Widget, -1); - } - - static Gtk.Menu build_context_menu () { -@@ -68,7 +68,7 @@ static Gtk.Menu build_context_menu () { - var mi = new Gtk.MenuItem.with_mnemonic (_("_Groups")); - var menu_go = application.context_menu (); - mi.set_submenu (menu_go); -- menu.append (mi); -+ menu.insert (mi as Gtk.Widget, -1); - - menu_add_separator (menu); - menu_add_icon_item (menu, _("_Properties"), "gtk-properties", () => { application.open_settings_dialog (); }); diff --git a/sources b/sources index bc00893..3fab280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-notes-plugin-1.11.0.tar.bz2) = 3644049bb2aa77bbed5b391f47d67dbf6528cb535448287a28a011d78a6fb31971a3556fe37ad380858d2b561ef67fee2bc93c4ed0c19c75c564d832cd4d47f1 +SHA512 (xfce4-notes-plugin-1.11.1.tar.bz2) = 7d81c3535a8c8dea922d88cf8bc3498db5c3f4b49aff1a4bc6c34ec93dc37381dd97403202e2828af521045445848cd72ccce5436b5fa24b567a68a6f4cb42dc diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 7339488..6e86e5a 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -3,7 +3,7 @@ %global xfceversion 4.16 Name: xfce4-notes-plugin -Version: 1.11.0 +Version: 1.11.1 Release: %autorelease Summary: Notes plugin for the Xfce panel @@ -12,16 +12,14 @@ License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -# patch from upstream git -# https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/-/issues/84 -Patch0: 0001-Fix-FTBFS-with-gcc-14.patch - BuildRequires: make BuildRequires: gcc-c++ BuildRequires: xfce4-panel-devel >= %{xfceversion} BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: xfconf-devel >= %{xfceversion} -BuildRequires: gettext, intltool, desktop-file-utils +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: gtksourceview4-devel Requires: xfce4-panel >= %{xfceversion} Requires: xfconf >= %{xfceversion} Requires: exo From eadcd890133a6db781dd608f60ab6832d3adbcd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:44:38 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 35b12f2d085a90f8f54440cd8384168c22e6a4d5 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 2 Feb 2025 07:57:43 -0600 Subject: [PATCH 6/9] Update to v1.11.2 --- .gitignore | 1 + sources | 2 +- xfce4-notes-plugin.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e6911e0..0134662 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xfce4-notes-plugin-1.7.6.tar.bz2 /xfce4-notes-plugin-1.10.0.tar.bz2 /xfce4-notes-plugin-1.11.0.tar.bz2 /xfce4-notes-plugin-1.11.1.tar.bz2 +/xfce4-notes-plugin-1.11.2.tar.bz2 diff --git a/sources b/sources index 3fab280..631f2aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-notes-plugin-1.11.1.tar.bz2) = 7d81c3535a8c8dea922d88cf8bc3498db5c3f4b49aff1a4bc6c34ec93dc37381dd97403202e2828af521045445848cd72ccce5436b5fa24b567a68a6f4cb42dc +SHA512 (xfce4-notes-plugin-1.11.2.tar.bz2) = 65d6ec24f67969ddc34a8da696c9df178f7d9469012b1866fd964d3ab3b58388dff6d66f1a477087d9c165fd536b711808177bf62cbee1c843221b289abba524 diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 6e86e5a..70a093d 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -3,7 +3,7 @@ %global xfceversion 4.16 Name: xfce4-notes-plugin -Version: 1.11.1 +Version: 1.11.2 Release: %autorelease Summary: Notes plugin for the Xfce panel From bb2ce3168b786b78006a0cf1baed528ad6f82beb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:47:30 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 941f34eb7cf0dd80e4303bae3d9458fb7fb46a4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:37:30 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 5f224dce0d4fb110f12c9d8e172f8a021c2593d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:10:37 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild