summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Elias Pipping <pipping@exherbo.org> 2010-11-04 20:30:03 +0100
committerAvatar Elias Pipping <pipping@exherbo.org> 2010-11-04 20:30:03 +0100
commite8e7a12df03fd3ebc3fbbcb67e8e741792acb499 (patch)
treefc695ed97f06e1cd9e30f1856551a943bb47386e
parent89dd8fa245cb1d0fdb4727a997fe29ef1f823278 (diff)
downloadgstreamer-e8e7a12df03fd3ebc3fbbcb67e8e741792acb499.tar.gz
gstreamer-e8e7a12df03fd3ebc3fbbcb67e8e741792acb499.tar.xz
Use sed instead of a patch
-rw-r--r--packages/media-libs/gstreamer/files/gstreamer-0.10.30-make-3.82.patch24
-rw-r--r--packages/media-libs/gstreamer/gstreamer-0.10.30.exheres-02
-rw-r--r--packages/media-libs/gstreamer/gstreamer.exlib3
3 files changed, 3 insertions, 26 deletions
diff --git a/packages/media-libs/gstreamer/files/gstreamer-0.10.30-make-3.82.patch b/packages/media-libs/gstreamer/files/gstreamer-0.10.30-make-3.82.patch
deleted file mode 100644
index 77c717e..0000000
--- a/packages/media-libs/gstreamer/files/gstreamer-0.10.30-make-3.82.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: Gentoo, http://bugs.gentoo.org/338866
-Upstream: unknown
-Reason: fails to build with make 3.82
---- common/gtk-doc.mak
-+++ common/gtk-doc.mak
-@@ -232,6 +232,6 @@
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
---- common/gtk-doc-plugins.mak
-+++ common/gtk-doc-plugins.mak
-@@ -332,7 +332,7 @@
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
-- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
- .PHONY : dist-hook-local docs
-
diff --git a/packages/media-libs/gstreamer/gstreamer-0.10.30.exheres-0 b/packages/media-libs/gstreamer/gstreamer-0.10.30.exheres-0
index 0bf213f..96f6230 100644
--- a/packages/media-libs/gstreamer/gstreamer-0.10.30.exheres-0
+++ b/packages/media-libs/gstreamer/gstreamer-0.10.30.exheres-0
@@ -19,5 +19,3 @@ DEPENDENCIES="
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc' 'gobject-introspection introspection' )
-DEFAULT_SRC_PREPARE_PATCHES=( -p0 "${FILES}/${PNV}-make-3.82.patch" )
-
diff --git a/packages/media-libs/gstreamer/gstreamer.exlib b/packages/media-libs/gstreamer/gstreamer.exlib
index 30e57fd..e651d22 100644
--- a/packages/media-libs/gstreamer/gstreamer.exlib
+++ b/packages/media-libs/gstreamer/gstreamer.exlib
@@ -32,6 +32,9 @@ gstreamer_src_prepare() {
-i 'tests/check/libs/gstnettimeprovider.c' ||
die "Failed to change bind address to 127.0.0.1"
+ # Convert leading spaces to tabs so make[>=3.82] doesn't barf
+ edo sed -i -e 's/^ \+\(-gtkdoc-rebase\)/\t\1/' common/gtk-doc{-plugins,}.mak
+
autotools_src_prepare
}