I have made the following changes intended for : CE:MW:Shared / phonon Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/6499 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6499: Messages from BOSS: State: review at 2012-08-31T06:52:36 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:MW:Shared / phonon -> CE:MW:Shared / phonon changes files: -------------- --- phonon.changes +++ phonon.changes @@ -0,0 +1,3 @@ +* Fri Aug 31 2012 Marko Saukko <[email protected]> - 4.4.3 +- Fix build with new glib 0001-With-new-glib-you-can-only-include-glib.h.patch + new: ---- 0001-With-new-glib-you-can-only-include-glib.h.patch spec files: ----------- --- phonon.spec +++ phonon.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.25 # + +Name: phonon + # >> macros # << macros -Name: phonon Summary: Phonon multimedia framework Version: 4.4.3 Release: 1 @@ -18,6 +20,7 @@ Patch0: 01_phonon-inc.patch Patch1: 02_no_rpath.patch Patch2: 03_phonon_is_not_forced_in_KDE.patch +Patch3: 0001-With-new-glib-you-can-only-include-glib.h.patch BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtOpenGL) BuildRequires: pkgconfig(alsa) @@ -33,13 +36,11 @@ BuildRequires: cmake BuildRequires: gcc-c++ - %description Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction layer for capturing, mixing, processing, and playing audio and video content. - %package -n lib%{name}-devel Summary: Phonon multimedia framework - development files Group: Development/Libraries @@ -99,6 +100,8 @@ %patch1 -p1 # 03_phonon_is_not_forced_in_KDE.patch %patch2 -p1 +# 0001-With-new-glib-you-can-only-include-glib.h.patch +%patch3 -p1 # >> setup # << setup @@ -112,6 +115,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -130,27 +134,15 @@ # << install post - - - - - - - - %post -n lib%{name}4 -p /sbin/ldconfig %postun -n lib%{name}4 -p /sbin/ldconfig - - - %files %defattr(-,root,root,-) # >> files # << files - %files -n lib%{name}-devel %defattr(-,root,root,-) # >> files lib%{name}-devel @@ -295,4 +287,3 @@ %{_libdir}/qt4/plugins/phonon_backend/phonon_gstreamer.so %{_datadir}/kde4/services/phononbackends/gstreamer.desktop # << files %{name}-backend-gstreamer - other changes: -------------- ++++++ 0001-With-new-glib-you-can-only-include-glib.h.patch (new) --- 0001-With-new-glib-you-can-only-include-glib.h.patch +++ 0001-With-new-glib-you-can-only-include-glib.h.patch @@ -0,0 +1,26 @@ +From c0895e83c7d77d54e10eb53989d551e85259bbc2 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Fri, 31 Aug 2012 06:13:30 +0000 +Subject: [PATCH] With new glib you can only include glib.h + +Signed-off-by: Marko Saukko <[email protected]> +--- + gstreamer/message.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gstreamer/message.h b/gstreamer/message.h +index c0b8473..bbeab16 100644 +--- a/gstreamer/message.h ++++ b/gstreamer/message.h +@@ -20,7 +20,7 @@ + + #include <QtCore/QMetaType> + +-#include <glib-2.0/glib/gmacros.h> // For G_*_DECLS macros primarily ++#include <glib-2.0/glib.h> // For G_*_DECLS macros primarily + #include <gst/gstmessage.h> + + QT_BEGIN_NAMESPACE +-- +1.7.10.3 + ++++++ phonon.yaml --- phonon.yaml +++ phonon.yaml @@ -14,6 +14,8 @@ - 01_phonon-inc.patch - 02_no_rpath.patch - 03_phonon_is_not_forced_in_KDE.patch + - 0001-With-new-glib-you-can-only-include-glib.h.patch + Description: | Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction layer for capturing, mixing, processing, and playing audio and video content.
