[gxine] Try to fix build on F18.
Martin Sourada
mso at fedoraproject.org
Thu Feb 23 00:04:53 UTC 2012
commit e052f7364e052e9937703b01d094060bf37bf8c5
Author: Martin Sourada <mso at fedoraproject.org>
Date: Thu Feb 23 00:58:58 2012 +0100
Try to fix build on F18.
gxine-0.5.907-glibc.patch | 35 +++++++++++++++++++++++++++++++++++
gxine.spec | 7 ++++++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/gxine-0.5.907-glibc.patch b/gxine-0.5.907-glibc.patch
new file mode 100644
index 0000000..cda8135
--- /dev/null
+++ b/gxine-0.5.907-glibc.patch
@@ -0,0 +1,35 @@
+diff -up gxine-0.5.907/src/console_output.h.glibc gxine-0.5.907/src/console_output.h
+--- gxine-0.5.907/src/console_output.h.glibc 2010-04-11 16:46:54.000000000 +0200
++++ gxine-0.5.907/src/console_output.h 2012-02-23 00:52:00.158725579 +0100
+@@ -21,7 +21,7 @@
+ #ifndef GXINE_CONSOLE_OUTPUT_H
+ #define GXINE_CONSOLE_OUTPUT_H
+
+-#include <glib/gmessages.h>
++#include <glib.h>
+
+ void console_output_init (void);
+
+diff -up gxine-0.5.907/src/engine.c.glibc gxine-0.5.907/src/engine.c
+--- gxine-0.5.907/src/engine.c.glibc 2011-10-12 00:47:52.000000000 +0200
++++ gxine-0.5.907/src/engine.c 2012-02-23 00:50:04.560170759 +0100
+@@ -30,8 +30,6 @@
+ #include <errno.h>
+ #include <unistd.h>
+
+-#include <glib/gthread.h>
+-
+ #include "engine.h"
+ #include "ui.h"
+ #include "utils.h"
+diff -up gxine-0.5.907/src/main.c.glibc gxine-0.5.907/src/main.c
+--- gxine-0.5.907/src/main.c.glibc 2010-12-05 12:38:44.000000000 +0100
++++ gxine-0.5.907/src/main.c 2012-02-23 00:50:23.126938644 +0100
+@@ -46,7 +46,6 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <glib.h>
+-#include <glib/gmessages.h>
+
+ #include "desktop_integration.h"
+ #include "engine.h"
diff --git a/gxine.spec b/gxine.spec
index 87c2739..6feb7b2 100644
--- a/gxine.spec
+++ b/gxine.spec
@@ -1,6 +1,6 @@
Name: gxine
Version: 0.5.907
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK frontend for the xine multimedia library
Group: Applications/Multimedia
@@ -13,6 +13,7 @@ Patch1: gxine-0.5.902-non-separate-toolbar.patch
# some multilib issues
Patch3: gxine-0.5.907-lirc.patch
Patch4: gxine-0.5.907-dso.patch
+Patch5: gxine-0.5.907-glibc.patch
BuildRequires: js-devel
BuildRequires: desktop-file-utils
@@ -53,6 +54,7 @@ This plugin allows gxine to be embedded in a web browser.
%patch1 -p1 -b .non-separate-toolbar
%patch3 -p1 -b .lirc
%patch4 -p1 -b .dso
+%patch5 -p1 -b .glibc
%{__sed} -i 's/Name=gxine/Name=GXine/' gxine.desktop.in
@@ -124,6 +126,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
+* Thu Feb 23 2012 Martin Sourada <mso at fedoraproject.org> - 0.5.907-2
+- Try to fix build with newer glibc
+
* Wed Feb 22 2012 Martin Sourada <mso at fedoraproject.org> - 0.5.907-1
- Update to 0.5.907
- Drop .desktop and JS patches -- fixed upstream.
More information about the scm-commits
mailing list