Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (48602c2eb72c7a596dd670305ff1f9769308b59a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (48602c2eb72c7a596dd670305ff1f9769308b59a)
  • Date: Sun, 15 Jan 2012 08:19:07 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

doc/po4a/DEPENDS | 1 +
doc/po4a/HISTORY | 3 +++
kde4-support/phonon-backend-gstreamer/HISTORY | 4 ++++
kde4-support/phonon-backend-gstreamer/PRE_BUILD | 3 +++
kde4-support/phonon-backend-gstreamer/message.h.patch | 11 +++++++++++
5 files changed, 22 insertions(+)

New commits:
commit 48602c2eb72c7a596dd670305ff1f9769308b59a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

doc/po4a: added dependency on podlators

commit 9a4ee868a217f68b7aa81f65e870b1e24390d368
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kde4-support/phonon-backend-gstreamer: fixed compile error with current
versions of glib2

diff --git a/doc/po4a/DEPENDS b/doc/po4a/DEPENDS
index 755fbfb..6d4cf1e 100755
--- a/doc/po4a/DEPENDS
+++ b/doc/po4a/DEPENDS
@@ -1,4 +1,5 @@
depends perl &&
+depends podlators &&
depends sgmlspm &&
# I really don't think they mean J. Clark's SP
depends opensp &&
diff --git a/doc/po4a/HISTORY b/doc/po4a/HISTORY
index c520811..87066dd 100644
--- a/doc/po4a/HISTORY
+++ b/doc/po4a/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on podlators
+
2010-10-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.40.1

diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY
b/kde4-support/phonon-backend-gstreamer/HISTORY
index a4e799d..ce0626f 100644
--- a/kde4-support/phonon-backend-gstreamer/HISTORY
+++ b/kde4-support/phonon-backend-gstreamer/HISTORY
@@ -1,3 +1,7 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, message.h.patch: fixed compile error with current
+ versions of glib2
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-support/phonon-backend-gstreamer/PRE_BUILD
b/kde4-support/phonon-backend-gstreamer/PRE_BUILD
new file mode 100755
index 0000000..b2a0a0f
--- /dev/null
+++ b/kde4-support/phonon-backend-gstreamer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/message.h.patch
diff --git a/kde4-support/phonon-backend-gstreamer/message.h.patch
b/kde4-support/phonon-backend-gstreamer/message.h.patch
new file mode 100644
index 0000000..a6ab7cf
--- /dev/null
+++ b/kde4-support/phonon-backend-gstreamer/message.h.patch
@@ -0,0 +1,11 @@
+--- phonon-backend-gstreamer-4.4.4/gstreamer/message.h.orig 2012-01-15
15:11:10.270718918 +0100
++++ phonon-backend-gstreamer-4.4.4/gstreamer/message.h 2012-01-15
15:11:21.532577144 +0100
+@@ -20,7 +20,7 @@
+
+ #include <QtCore/QMetaType>
+
+-#include <glib-2.0/glib/gmacros.h> // For G_*_DECLS macros primarily
++#include <glib.h> // For G_*_DECLS macros primarily
+ #include <gst/gstmessage.h>
+
+ QT_BEGIN_NAMESPACE



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (48602c2eb72c7a596dd670305ff1f9769308b59a), Florian Franzmann, 01/15/2012

Archive powered by MHonArc 2.6.24.

Top of Page