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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d358d3921743192e192280411d0e168bddc6486b..71bc1fcc386b520b2e837f6b09155474fdcb66f6 100644 (file)
--- 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 (file)
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@.doc-dummy-target:
- @HAVE_DOXYGEN_FALSE@  echo "doxygen not found, cannot build docs"
--@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 b564ca6890803b3de76b5b14045c3ae6a7e29a2f..816e980cc95658922bea73c7871bad6e1a012e04 100644 (file)
--- 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