Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4d36849a4c9b4347ba4f0d1a007f1d2a2f24b86d
commit 4d36849a4c9b4347ba4f0d1a007f1d2a2f24b86d Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Dec 14 13:12:02 2009 +0100 doxygen-1.6.1-1-i686 - version bump diff --git a/source/devel-extra/doxygen/FrugalBuild b/source/devel-extra/doxygen/FrugalBuild index c27ef5b..048244b 100644 --- a/source/devel-extra/doxygen/FrugalBuild +++ b/source/devel-extra/doxygen/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu> pkgname=doxygen -pkgver=1.5.9 +pkgver=1.6.1 pkgrel=1 pkgdesc="Doxygen is the documentation system for C/C++" url="http://www.doxygen.org/"; @@ -13,8 +13,10 @@ archs=('x86_64' 'i686' 'ppc') up2date="lynx -dump http://www.stack.nl/~dimitri/doxygen/download.html|grep 'latest'|sed 's/.* v\([^ ]*\) .*/\1/;q'" source=(ftp://ftp.stack.nl/pub/users/dimitri/$pkgname-$pkgver.src.tar.gz \ doxygen-cflags-and-misc-fixes.patch \ - doxygen-use-system-png.patch \ doxygen-qstring-gcc4.patch0) +sha1sums=('31f861841eba1ebdded1b4bf70bdecb42441dafd' \ + '08e08e9fee37844a00db0eb261bd704c95ac109e' \ + '4d4583ea8acc976a7f0f9dafa28c70f6cc494729') build() { Fcd @@ -35,8 +37,4 @@ build() { $Fdestdir/usr/share/doc/$pkgname-$pkgver } -sha1sums=('6211b850bdaa2198e35546e4299a27774c957ece' \ - '08e08e9fee37844a00db0eb261bd704c95ac109e' \ - 'a500895e541227daf5791af1ae5f267ebb1ae7d4' \ - '4d4583ea8acc976a7f0f9dafa28c70f6cc494729') # optimization OK diff --git a/source/devel-extra/doxygen/doxygen-use-system-png.patch b/source/devel-extra/doxygen/doxygen-use-system-png.patch deleted file mode 100644 index 8da4240..0000000 --- a/source/devel-extra/doxygen/doxygen-use-system-png.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -Naur doxygen-1.5.0.orig/configure doxygen-1.5.0/configure ---- doxygen-1.5.0.orig/configure 2006-10-29 00:17:09.000000000 +0200 -+++ doxygen-1.5.0/configure 2006-10-29 00:18:42.000000000 +0200 -@@ -525,7 +525,7 @@ - EOF - fi - --f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" -+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" - - for i in $f_inmakefiles ; do - SRC=$i -@@ -542,7 +542,6 @@ - echo "" >> $DST - echo "all: src/version.cpp " >> $DST - echo " \$(MAKE) -C qtools" >> $DST -- echo " \$(MAKE) -C libpng" >> $DST - echo " \$(MAKE) -C libmd5" >> $DST - echo " \$(MAKE) -C src" >> $DST - if test $f_wizard = YES; then -@@ -562,7 +561,7 @@ - echo " Created $DST from $SRC..." - done - --f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" -+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" - - for i in $f_inprofiles ; do - SRC=$i -diff -Naur doxygen-1.5.0.orig/Makefile.in doxygen-1.5.0/Makefile.in ---- doxygen-1.5.0.orig/Makefile.in 2006-10-29 00:17:09.000000000 +0200 -+++ doxygen-1.5.0/Makefile.in 2006-10-29 00:18:08.000000000 +0200 -@@ -7,7 +7,6 @@ - cd doc ; $(MAKE) clean - cd qtools ; $(MAKE) clean - cd src ; $(MAKE) clean -- cd libpng ; $(MAKE) clean - cd libmd5 ; $(MAKE) clean - cd addon/doxywizard ; $(MAKE) clean - cd addon/doxmlparser/src ; $(MAKE) clean -@@ -18,7 +17,6 @@ - - distclean: clean - cd src ; $(MAKE) distclean -- cd libpng ; $(MAKE) distclean - cd libmd5 ; $(MAKE) distclean - cd addon/doxywizard ; $(MAKE) distclean - cd addon/doxmlparser/src ; $(MAKE) distclean -@@ -32,11 +30,10 @@ - -rm -f objects/*.o - -rm -f src/Makefile.doxygen src/Makefile.libdoxygen - -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -- -rm -f libpng/Makefile.libpng - -rm -f libmd5/Makefile.libmd5 - -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile - -rm -f .makeconfig .tmakeconfig -- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro -+ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro - -rm -f src/version.cpp - -rm -r addon/doxywizard/Makefile - -rm -f addon/doxywizard/Makefile.doxywizard -diff -Naur doxygen-1.5.0.orig/src/doxygen.pro.in doxygen-1.5.0/src/doxygen.pro.in ---- doxygen-1.5.0.orig/src/doxygen.pro.in 2006-10-29 00:17:09.000000000 +0200 -+++ doxygen-1.5.0/src/doxygen.pro.in 2006-10-29 00:19:08.000000000 +0200 -@@ -28,7 +28,7 @@ - win32:TMAKE_CXXFLAGS += -DQT_NODLL - win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 - win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti --INCLUDEPATH += ../qtools ../libpng ../libmd5 . -+INCLUDEPATH += ../qtools ../libmd5 . - #win32-g++:INCLUDEPATH -= ../libpng - DESTDIR = ../bin - TARGET = doxygen -diff -Naur doxygen-1.5.0.orig/src/libdoxygen.pro doxygen-1.5.0/src/libdoxygen.pro ---- doxygen-1.5.0.orig/src/libdoxygen.pro 2006-10-29 00:17:10.000000000 +0200 -+++ doxygen-1.5.0/src/libdoxygen.pro 2006-10-29 00:19:26.000000000 +0200 -@@ -211,7 +211,6 @@ - win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - INCLUDEPATH += ../qtools --INCLUDEPATH += ../libpng - INCLUDEPATH += ../libmd5 - win32:INCLUDEPATH += . - win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 -diff -Naur doxygen-1.5.0.orig/src/libdoxygen.pro.in doxygen-1.5.0/src/libdoxygen.pro.in ---- doxygen-1.5.0.orig/src/libdoxygen.pro.in 2006-10-29 00:17:10.000000000 +0200 -+++ doxygen-1.5.0/src/libdoxygen.pro.in 2006-10-29 00:19:23.000000000 +0200 -@@ -207,7 +207,6 @@ - win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - INCLUDEPATH += ../qtools --INCLUDEPATH += ../libpng - INCLUDEPATH += ../libmd5 - win32:INCLUDEPATH += . - win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 -diff -Naur doxygen-1.5.0.orig/src/pngenc.cpp doxygen-1.5.0/src/pngenc.cpp ---- doxygen-1.5.0.orig/src/pngenc.cpp 2006-10-29 00:17:10.000000000 +0200 -+++ doxygen-1.5.0/src/pngenc.cpp 2006-10-29 00:19:36.000000000 +0200 -@@ -25,7 +25,7 @@ - #endif - - #define ALL_STATIC --#include <../libpng/png.h> -+#include <png.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
