public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/smplayer] rawhide: fix FTBFS rhbz#2435111
@ 2026-07-24  3:36 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-07-24  3:36 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/smplayer
            Branch : rawhide
            Commit : beb4f01db1de886ed6c02b24971bb1cf6db5e7df
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-07-24T00:03:04-03:00
            Stats  : +33/-8 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/smplayer/c/beb4f01db1de886ed6c02b24971bb1cf6db5e7df?branch=rawhide

            Log:
            fix FTBFS rhbz#2435111

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/smplayer-25.6.0-mongoose-unused-variable.patch b/smplayer-25.6.0-mongoose-unused-variable.patch
new file mode 100644
index 0000000..8e9dc92
--- /dev/null
+++ b/smplayer-25.6.0-mongoose-unused-variable.patch
@@ -0,0 +1,25 @@
+diff -up smplayer-25.6.0/webserver/mongoose.c.orig smplayer-25.6.0/webserver/mongoose.c
+--- smplayer-25.6.0/webserver/mongoose.c.orig	2025-06-25 00:00:00.000000000 +0200
++++ smplayer-25.6.0/webserver/mongoose.c	2025-06-25 00:00:00.000000000 +0200
+@@ -3762,7 +3762,7 @@ time_t mg_socket_if_poll(struct mg_iface
+   struct timeval tv;
+   fd_set read_set, write_set, err_set;
+   sock_t max_fd = INVALID_SOCKET;
+-  int num_fds, num_ev, num_timers = 0;
++  int num_ev, num_timers = 0;
+ #ifdef __unix__
+   int try_dup = 1;
+ #endif
+@@ -3779,11 +3779,10 @@ time_t mg_socket_if_poll(struct mg_iface
+    * e.g. timer-only "connections".
+    */
+   min_timer = 0;
+-  for (nc = mgr->active_connections, num_fds = 0; nc != NULL; nc = tmp) {
++  for (nc = mgr->active_connections; nc != NULL; nc = tmp) {
+     tmp = nc->next;
+ 
+     if (nc->sock != INVALID_SOCKET) {
+-      num_fds++;
+ 
+ #ifdef __unix__
+       /* A hack to make sure all our file descriptos fit into FD_SETSIZE. */

diff --git a/smplayer.spec b/smplayer.spec
index 43c33a4..fe69c94 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -6,7 +6,7 @@
 Name:           smplayer
 Version:        25.6.0
 Release:        %autorelease
-Summary:        Graphical frontend for mplayer and mpv
+Summary:        Graphical front-end for mplayer and mpv
 
 License:        GPL-2.0-or-later
 URL:            https://www.smplayer.info/
@@ -17,6 +17,8 @@ Source4:        https://downloads.sourceforge.net/smplayer/smplayer-skins-%{smpl
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
 Patch0:         smplayer-21.08.0-desktop-files.patch
 Patch1:         smplayer-14.9.0.6966-system-qtsingleapplication.patch
+# mongoose.c - num_fds set but not used -Werror=unused-but-set-variable
+Patch2:         smplayer-25.6.0-mongoose-unused-variable.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
@@ -49,9 +51,6 @@ Suggests:       yt-dlp
 Provides:       bundled(mongoose) = 6.11
 Provides:       bundled(libmaia) = 0.9.0
 
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
 %description
 SMPlayer is a graphical user interface (GUI) for the award-winning mplayer
 and also for mpv. But apart from providing access for the most common
@@ -84,13 +83,14 @@ rm -rf src/qtsingleapplication/
 %if %{with system_qtsingleapplication}
 %patch -P1 -p1 -b .qtsingleapplication
 %endif
+%patch -P2 -p1
 
 # correction for wrong-file-end-of-line-encoding
-%{__sed} -i 's/\r//' *.txt
+sed -i 's/\r//' *.txt *.md
 
 # change rcc binary
-%{__sed} -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-themes-%{smplayer_themes_ver}/themes/Makefile
-%{__sed} -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-skins-%{smplayer_skins_ver}/themes/Makefile
+sed -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-themes-%{smplayer_themes_ver}/themes/Makefile
+sed -e 's/rcc -binary/rcc-qt5 -binary/' -i smplayer-skins-%{smplayer_skins_ver}/themes/Makefile
 
 %build
 pushd src
@@ -112,7 +112,7 @@ pushd smplayer-skins-%{smplayer_skins_ver}
     %make_build
 popd
 pushd webserver
-export CFLAGS_EXTRA="%{optflags}"
+export CFLAGS_EXTRA="%{optflags} %{?__global_ldflags}"
 %make_build
 popd
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-24  3:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-24  3:36 [rpms/smplayer] rawhide: fix FTBFS rhbz#2435111 Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox