From de6a2a00754e47b8997192e111af28f323bc3393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> Date: Fri, 17 Jan 2025 15:28:09 +0100 Subject: [PATCH 1/3] libxfce4panel: Don't install xfce-panel-plugin-provider.h It is not included in libxfce4panel.h, is not documented and should probably always have been kept private. --- libxfce4panel/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index 8d74895d5..42547275a 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -29,7 +29,6 @@ libxfce4panel_headers = \ xfce-panel-convenience.h \ xfce-panel-macros.h \ xfce-panel-plugin.h \ - xfce-panel-plugin-provider.h \ xfce-panel-image.h libxfce4panel_includedir = \ @@ -47,6 +46,7 @@ libxfce4panel_2_0_la_SOURCES = \ xfce-panel-convenience.c \ xfce-panel-plugin.c \ xfce-panel-plugin-provider.c \ + xfce-panel-plugin-provider.h \ xfce-panel-image.c libxfce4panel_2_0_la_CFLAGS = \ -- GitLab From 3b5bab50591365636265dfd2489baeaef8804c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> Date: Fri, 17 Jan 2025 15:35:31 +0100 Subject: [PATCH 2/3] libxfce4panel: Add missing include guards --- common/Makefile.am | 1 - common/panel-xfconf.c | 2 +- libxfce4panel/Makefile.am | 2 +- libxfce4panel/libxfce4panel-enums.h | 4 ++++ libxfce4panel/xfce-arrow-button.h | 4 ++++ libxfce4panel/xfce-panel-convenience.h | 4 ++++ libxfce4panel/xfce-panel-macros.h | 4 ++++ libxfce4panel/xfce-panel-plugin.h | 4 ++++ migrate/main.c | 2 +- migrate/migrate-default.c | 2 +- plugins/systray/sn-config.h | 2 +- 11 files changed, 25 insertions(+), 6 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index b8b26d9f7..8eca4ea9a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -2,7 +2,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"libpanel-common\" \ - -DLIBXFCE4PANEL_COMPILATION \ -DHELPDIR=\"$(docdir)/html\" \ $(PLATFORM_CPPFLAGS) diff --git a/common/panel-xfconf.c b/common/panel-xfconf.c index 081f20e0f..b0e5bb416 100644 --- a/common/panel-xfconf.c +++ b/common/panel-xfconf.c @@ -23,7 +23,7 @@ #include "panel-private.h" #include "panel-xfconf.h" -#include "libxfce4panel/xfce-panel-macros.h" +#include "libxfce4panel/libxfce4panel.h" diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am index 42547275a..03af44c4f 100644 --- a/libxfce4panel/Makefile.am +++ b/libxfce4panel/Makefile.am @@ -96,7 +96,7 @@ libxfce4panel-visibility.c: libxfce4panel.symbols Makefile libxfce4panel-enum-types.h: $(libxfce4panel_headers) Makefile $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \ - --fhead "#ifndef __LIBXFCE4PANEL_ENUM_TYPES_H__\n#define __LIBXFCE4PANEL_ENUM_TYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \ + --fhead "#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)\n#error \"Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents\"\n#endif\n\n#ifndef __LIBXFCE4PANEL_ENUM_TYPES_H__\n#define __LIBXFCE4PANEL_ENUM_TYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define XFCE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* !__LIBXFCE4PANEL_ENUM_TYPES_H__ */" \ diff --git a/libxfce4panel/libxfce4panel-enums.h b/libxfce4panel/libxfce4panel-enums.h index e803e48ce..b13634f8a 100644 --- a/libxfce4panel/libxfce4panel-enums.h +++ b/libxfce4panel/libxfce4panel-enums.h @@ -19,6 +19,10 @@ +#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION) +#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents" +#endif + #ifndef __LIBXFCE4PANEL_ENUMS_H__ #define __LIBXFCE4PANEL_ENUMS_H__ diff --git a/libxfce4panel/xfce-arrow-button.h b/libxfce4panel/xfce-arrow-button.h index 0a0f4f08d..1c620b5e9 100644 --- a/libxfce4panel/xfce-arrow-button.h +++ b/libxfce4panel/xfce-arrow-button.h @@ -19,6 +19,10 @@ +#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION) +#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents" +#endif + #ifndef __XFCE_ARROW_BUTTON_H__ #define __XFCE_ARROW_BUTTON_H__ diff --git a/libxfce4panel/xfce-panel-convenience.h b/libxfce4panel/xfce-panel-convenience.h index 8dc931b45..0ac562ee3 100644 --- a/libxfce4panel/xfce-panel-convenience.h +++ b/libxfce4panel/xfce-panel-convenience.h @@ -19,6 +19,10 @@ +#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION) +#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents" +#endif + #ifndef __XFCE_PANEL_CONVENIENCE_H__ #define __XFCE_PANEL_CONVENIENCE_H__ diff --git a/libxfce4panel/xfce-panel-macros.h b/libxfce4panel/xfce-panel-macros.h index 52b998e8c..1a3ed7fad 100644 --- a/libxfce4panel/xfce-panel-macros.h +++ b/libxfce4panel/xfce-panel-macros.h @@ -18,6 +18,10 @@ +#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION) +#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents" +#endif + #ifndef __XFCE_PANEL_MACROS_H__ #define __XFCE_PANEL_MACROS_H__ diff --git a/libxfce4panel/xfce-panel-plugin.h b/libxfce4panel/xfce-panel-plugin.h index 293602c4a..c86640886 100644 --- a/libxfce4panel/xfce-panel-plugin.h +++ b/libxfce4panel/xfce-panel-plugin.h @@ -18,6 +18,10 @@ +#if !defined(_LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION) +#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents" +#endif + #ifndef __XFCE_PANEL_PLUGIN_H__ #define __XFCE_PANEL_PLUGIN_H__ diff --git a/migrate/main.c b/migrate/main.c index 01810890d..423b7806d 100644 --- a/migrate/main.c +++ b/migrate/main.c @@ -24,7 +24,7 @@ #include "migrate-default.h" #include "common/panel-private.h" -#include "libxfce4panel/xfce-panel-macros.h" +#include "libxfce4panel/libxfce4panel.h" #include <gtk/gtk.h> #include <libxfce4ui/libxfce4ui.h> diff --git a/migrate/migrate-default.c b/migrate/migrate-default.c index c6003bbb4..cfecc162b 100644 --- a/migrate/migrate-default.c +++ b/migrate/migrate-default.c @@ -22,7 +22,7 @@ #include "migrate-default.h" -#include "libxfce4panel/xfce-panel-macros.h" +#include "libxfce4panel/libxfce4panel.h" #include <gtk/gtk.h> #include <libxfce4util/libxfce4util.h> diff --git a/plugins/systray/sn-config.h b/plugins/systray/sn-config.h index c5401fb3a..bc7337e91 100644 --- a/plugins/systray/sn-config.h +++ b/plugins/systray/sn-config.h @@ -20,7 +20,7 @@ #ifndef __SN_CONFIG_H__ #define __SN_CONFIG_H__ -#include "libxfce4panel/xfce-panel-plugin.h" +#include "libxfce4panel/libxfce4panel.h" #include <gtk/gtk.h> -- GitLab From e1912fa76fec800fe2114daed1d2f7f25ec7e8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> Date: Fri, 17 Jan 2025 15:45:39 +0100 Subject: [PATCH 3/3] autotools-build: Remove some deprecated or unused CFLAGS --- common/Makefile.am | 1 - panel/Makefile.am | 1 - plugins/launcher/Makefile.am | 1 - 3 files changed, 3 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 8eca4ea9a..80a9fc08e 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -2,7 +2,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"libpanel-common\" \ - -DHELPDIR=\"$(docdir)/html\" \ $(PLATFORM_CPPFLAGS) noinst_LTLIBRARIES = \ diff --git a/panel/Makefile.am b/panel/Makefile.am index 31ae45dd1..0f6dc9b6e 100644 --- a/panel/Makefile.am +++ b/panel/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -DLIBDIR=\"$(libdir)\" \ -DHELPERDIR=\"$(HELPER_PATH_PREFIX)/xfce4/panel\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DDBUS_API_SUBJECT_TO_CHANGE \ $(PLATFORM_CPPFLAGS) bin_PROGRAMS = \ diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am index 9aa0535bc..8b7ef2dd9 100644 --- a/plugins/launcher/Makefile.am +++ b/plugins/launcher/Makefile.am @@ -2,7 +2,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"liblauncher\" \ - -DSN_API_NOT_YET_FROZEN \ $(PLATFORM_CPPFLAGS) plugindir = $(libdir)/xfce4/panel/plugins -- GitLab