[packages/fbpanel] Rel 2

[arekm]

commit eed34f2893d5fe6ab906c5e4d6d2b87578265530
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 21 15:37:21 2026 +0200

    Rel 2

 fbpanel-flags.patch | 35 +++++++++++++++++++++++++++++++++++
 fbpanel-gcc14.patch | 11 +++++++++++
 fbpanel.spec        | 10 ++++++++--
 3 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/fbpanel.spec b/fbpanel.spec
index 79999c5..1cd337c 100644
--- a/fbpanel.spec
+++ b/fbpanel.spec
@@ -2,12 +2,14 @@ Summary:	Lightweight and NETWM compliant desktop panel
 Summary(pl.UTF-8):	Lekki i zgodny z NETWM panel
 Name:		fbpanel
 Version:	6.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/project/fbpanel/fbpanel/%{version}/%{name}-%{version}.tbz2
 # Source0-md5:	80ca0c64195b30587cfcb8c2cd9887a0
 Source1:	%{name}.menu.readme
+Patch0:		%{name}-flags.patch
+Patch1:		%{name}-gcc14.patch
 URL:		http://fbpanel.sourceforge.net/
 BuildRequires:	gtk+2-devel >= 2:2.4.0
 BuildRequires:	pkgconfig
@@ -23,6 +25,8 @@ fbpanel to lekki i zgodny ze specyfikacją NETWM panel.
 
 %prep
 %setup -q
+%patch -P0 -p1
+%patch -P1 -p1
 
 %build
 # no auto* tools here
@@ -30,7 +34,9 @@ fbpanel to lekki i zgodny ze specyfikacją NETWM panel.
 	--prefix=%{_prefix}
 
 %{__make} \
-	OPTFLAGS="%{rpmcflags}"
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/fbpanel-flags.patch b/fbpanel-flags.patch
new file mode 100644
index 0000000..744a61a
--- /dev/null
+++ b/fbpanel-flags.patch
@@ -0,0 +1,35 @@
+--- fbpanel-6.1/rules.mk.orig	2026-05-21 02:00:00.000000000 +0200
++++ fbpanel-6.1/rules.mk	2026-05-21 02:00:00.000000000 +0200
+@@ -38,8 +38,9 @@
+ ifeq ($(DEBUG),enabled)
+ 	override CFLAGS = -Wall -I$(TOPDIR) -g -Werror 
+ else
+-	CFLAGS += -O2 -Wall -I$(TOPDIR) 
++	CFLAGS += -O2
+ endif
++override CFLAGS += -Wall -I$(TOPDIR)
+ 
+  
+ T := $(subst $(TOPDIR)/,,$(CURDIR)/)
+--- fbpanel-6.1/panel/Makefile.in.orig	2026-05-21 02:00:00.000000000 +0200
++++ fbpanel-6.1/panel/Makefile.in	2026-05-21 02:00:00.000000000 +0200
+@@ -5,7 +5,7 @@
+ #SRCS += configurator.c 
+ 
+ BINTARGET = fbpanel
+-LDFLAGS += $(GMODULE_LIBS)
++override LDFLAGS += $(GMODULE_LIBS) -lm
+ 
+ ifeq (enabled,$(STATIC_BUILD))
+ OBJS += $(wildcard $(TOPDIR)/plugins/*/*.o)
+--- fbpanel-6.1/panel/plugin.h.orig	2026-05-21 02:00:00.000000000 +0200
++++ fbpanel-6.1/panel/plugin.h	2026-05-21 02:00:00.000000000 +0200
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include "panel.h"
+ 
+-struct _plugin_instance *stam;
++struct _plugin_instance;
+ 
+ typedef struct {
+     /* common */
diff --git a/fbpanel-gcc14.patch b/fbpanel-gcc14.patch
new file mode 100644
index 0000000..2e9d9e9
--- /dev/null
+++ b/fbpanel-gcc14.patch
@@ -0,0 +1,11 @@
+--- fbpanel-6.1/panel/misc.h.orig	2026-05-21 01:33:59.488079123 +0200
++++ fbpanel-6.1/panel/misc.h	2026-05-21 01:34:03.419552356 +0200
+@@ -45,7 +45,7 @@
+
+ void menu_pos(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *widget);
+
+-void configure();
++void configure(xconf *xc);
+ gchar *indent(int level);
+
+ FILE *get_profile_file(gchar *profile, char *perm);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fbpanel.git/commitdiff/eed34f2893d5fe6ab906c5e4d6d2b87578265530