rpms/doxygen/F-8 doxygen-1.5.5-brokenpaths.patch, NONE, 1.1 doxygen.spec, 1.48, 1.49

Than Ngo (than) fedora-extras-commits at redhat.com
Mon Mar 17 13:15:34 UTC 2008


Author: than

Update of /cvs/extras/rpms/doxygen/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31438

Modified Files:
	doxygen.spec 
Added Files:
	doxygen-1.5.5-brokenpaths.patch 
Log Message:
apply patch to not break partial include paths, thanks to Tim Niemueller



doxygen-1.5.5-brokenpaths.patch:

--- NEW FILE doxygen-1.5.5-brokenpaths.patch ---
diff -urN doxygen-1.5.5/src/util.cpp doxygen-1.5.5.brokenpaths/src/util.cpp
--- doxygen-1.5.5/src/util.cpp	2008-01-19 16:54:27.000000000 +0100
+++ doxygen-1.5.5.brokenpaths/src/util.cpp	2008-03-14 16:45:47.000000000 +0100
@@ -4468,7 +4468,7 @@
       QCString pathStripped = stripFromIncludePath(path);
       for (fni.toFirst();(fd=fni.current());++fni)
       {
-        QCString fdStripPath = stripFromIncludePath(fd->getPath());
+        QCString fdStripPath = stripFromIncludePath(fd->getPath().right(path.length()));
         if (path.isEmpty() || fdStripPath==pathStripped) 
         { 
           count++; 


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-8/doxygen.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- doxygen.spec	22 Feb 2008 15:59:55 -0000	1.48
+++ doxygen.spec	17 Mar 2008 13:14:59 -0000	1.49
@@ -4,7 +4,7 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
@@ -13,6 +13,9 @@
 Patch3: doxygen-1.2.18-libdir64.patch
 Patch4: doxygen-1.5.5-system-png.patch
 
+# upstream patches
+Patch100: doxygen-1.5.5-brokenpaths.patch
+
 Group: Development/Tools
 License: GPL
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
@@ -58,6 +61,9 @@
 %endif
 %patch4 -p1 -b .system-png
 
+# upstream patches
+%patch100 -p1 -b .brokenpaths
+
 %build
 %if %{with_qt}
 QTDIR="" && . /etc/profile.d/qt.sh
@@ -104,6 +110,9 @@
 %endif
 
 %changelog
+* Mon Mar 17 2008 Than Ngo <than at redhat.com> 1.5.5-2
+- apply patch to not break partial include paths, thanks to Tim Niemueller
+
 * Fri Feb 22 2008 Than Ngo <than at redhat.com> 1.5.5-1
 - 1.5.5
 - use system libpng/zlib




More information about the fedora-extras-commits mailing list