summaryrefslogtreecommitdiffstats
path: root/debian/patches/fix_doxygen.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 09:11:39 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 09:11:39 +0000
commitea1e02e35290c7ddf12ff4115bcd0923eb45ca9c (patch)
tree4358ff30f29d4cacb2992ec6b4fce360dace2853 /debian/patches/fix_doxygen.patch
parentAdding upstream version 1.7.2. (diff)
downloadapr-ea1e02e35290c7ddf12ff4115bcd0923eb45ca9c.tar.xz
apr-ea1e02e35290c7ddf12ff4115bcd0923eb45ca9c.zip
Adding debian version 1.7.2-3.debian/1.7.2-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/fix_doxygen.patch')
-rw-r--r--debian/patches/fix_doxygen.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/debian/patches/fix_doxygen.patch b/debian/patches/fix_doxygen.patch
new file mode 100644
index 0000000..cba7489
--- /dev/null
+++ b/debian/patches/fix_doxygen.patch
@@ -0,0 +1,69 @@
+From: Stefan Fritsch <sf@debian.org>
+Subject: Fix generation of docs for out-of-tree builds and newer doxygen versions
+
+---
+ docs/doxygen.conf | 2 +-
+ include/apr.h.in | 24 ++++++++++++------------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+--- apr.orig/docs/doxygen.conf
++++ apr/docs/doxygen.conf
+@@ -1,6 +1,6 @@
+ PROJECT_NAME="Apache Portable Runtime"
+
+-INPUT=.
++INPUT=../../include include
+ QUIET=YES
+ RECURSIVE=YES
+ FILE_PATTERNS=*.h
+--- apr.orig/include/apr.h.in
++++ apr/include/apr.h.in
+@@ -464,11 +464,11 @@ typedef apr_uint32_t apr_uin
+ /**
+ * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
+ * so that they follow the platform's calling convention.
+- * <PRE>
+- *
++ */
++/**
++ * @code
+ * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+- *
+- * </PRE>
++ * @endcode
+ */
+ #define APR_THREAD_FUNC @apr_thread_func@
+
+@@ -502,11 +502,11 @@ typedef apr_uint32_t apr_uin
+ * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
+ * @see APR_DECLARE @see APR_DECLARE_DATA
+ * @remark Both the declaration and implementations must use the same macro.
+- * <PRE>
+- *
++ */
++/**
++ * @code
+ * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+- *
+- * </PRE>
++ * @endcode
+ */
+ #define APR_DECLARE_NONSTD(type) type
+
+@@ -517,12 +517,12 @@ typedef apr_uint32_t apr_uin
+ * @remark Note that the declaration and implementations use different forms,
+ * but both must include the macro.
+ *
+- * <PRE>
+- *
++ */
++/**
++ * @code
+ * extern APR_DECLARE_DATA type apr_variable;\n
+ * APR_DECLARE_DATA type apr_variable = value;
+- *
+- * </PRE>
++ * @endcode
+ */
+ #define APR_DECLARE_DATA
+