[vlc-devel] commit: Contribs: Kate, update to 0.3. 0 and disable-doc by default without patching. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Feb 11 12:08:17 2009 +0100| [d8704994aa813b256a42764e5edae3c2a9a26d23] | committer: Jean-Baptiste Kempf 

Contribs: Kate, update to 0.3.0 and disable-doc by default without patching.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8704994aa813b256a42764e5edae3c2a9a26d23
---

 extras/contrib/src/Makefile                     |    3 +-
 extras/contrib/src/Patches/libkate-nodocs.patch |   24 -----------------------
 extras/contrib/src/packages.mak                 |    2 +-
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d358d39..71bc1fc 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2321,8 +2321,7 @@ libkate: libkate-$(KATE_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .kate: libkate .ogg
-	(cd $<; patch -p1) < Patches/libkate-nodocs.patch
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-valgrind && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-valgrind --disable-doc && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
diff --git a/extras/contrib/src/Patches/libkate-nodocs.patch b/extras/contrib/src/Patches/libkate-nodocs.patch
deleted file mode 100644
index 93ebc60..0000000
--- a/extras/contrib/src/Patches/libkate-nodocs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru libkate-0.1.7/doc/Makefile libkate/doc/Makefile
-diff -ru libkate-0.1.7/doc/Makefile.am libkate/doc/Makefile.am
---- libkate-0.1.7/doc/Makefile.am	2008-08-11 01:59:03.000000000 +0300
-+++ libkate/doc/Makefile.am	2009-02-09 23:41:53.000000000 +0200
-@@ -31,7 +31,6 @@
- else
- .doc-dummy-target:
- 	echo "doxygen not found, cannot build docs"
--	/bin/false
- endif
- 
- dist-hook: .doc-dummy-target
-Seulement dans libkate/doc: Makefile.am~
-diff -ru libkate-0.1.7/doc/Makefile.in libkate/doc/Makefile.in
---- libkate-0.1.7/doc/Makefile.in	2008-08-11 01:59:03.000000000 +0300
-+++ libkate/doc/Makefile.in	2009-02-09 23:42:13.000000000 +0200
-@@ -389,7 +389,6 @@
- @HAVE_DOXYGEN_TRUE@	doxygen kate.doxygen
- @HAVE_DOXYGEN_FALSE at .doc-dummy-target:
- @HAVE_DOXYGEN_FALSE@	echo "doxygen not found, cannot build docs"
-- at HAVE_DOXYGEN_FALSE@	/bin/false
- 
- dist-hook: .doc-dummy-target
- 	cp -fR * $(distdir)
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index b564ca6..816e980 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -218,7 +218,7 @@ FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VER
 YASM_VERSION=0.7.2
 #YASM_URL=$(VIDEOLAN)/testing/contrib/yasm-$(YASM_VERSION).tar.gz
 YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
-KATE_VERSION=0.1.7
+KATE_VERSION=0.3.0
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
 TIGER_VERSION=0.3.1
 TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz