summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2017-11-03 10:38:56 +0100
committerUlrich Müller <ulm@gentoo.org>2017-11-03 10:38:56 +0100
commit8a9b51adb08313fd58cb7df7f3f98511d42cb528 (patch)
treee16609ffa091cb62f3f01e17bbb6eb6b256dbd6e /app-emacs
parentnet-p2p/rtorrent: 0.9.6-r1 stable on amd64 and x86 (diff)
downloadgentoo-8a9b51adb08313fd58cb7df7f3f98511d42cb528.tar.gz
gentoo-8a9b51adb08313fd58cb7df7f3f98511d42cb528.tar.bz2
gentoo-8a9b51adb08313fd58cb7df7f3f98511d42cb528.zip
app-emacs/doxymacs: Fix compilation with GCC 7.
Closes: https://bugs.gentoo.org/635746 Package-Manager: Portage-2.3.13, Repoman-2.3.4
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild3
-rw-r--r--app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch104
2 files changed, 106 insertions, 1 deletions
diff --git a/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
index 9cd5531e593..5d9ed4e59e7 100644
--- a/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
+++ b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,6 +16,7 @@ KEYWORDS="amd64 x86"
DEPEND=">=dev-libs/libxml2-2.6.13"
RDEPEND="${DEPEND}"
+ELISP_PATCHES="${P}-gcc7.patch"
SITEFILE="50${PN}-gentoo.el"
src_configure() {
diff --git a/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
new file mode 100644
index 00000000000..b30a955baa8
--- /dev/null
+++ b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
@@ -0,0 +1,104 @@
+Fix compilation with GCC 7.
+https://bugs.gentoo.org/635746
+
+--- doxymacs-1.8.0.orig/c/doxymacs_parser.c
++++ doxymacs-1.8.0/c/doxymacs_parser.c
+@@ -70,6 +70,7 @@
+
+ hash_entry *symbol_hash[HASH_SIZE];
+
++static inline unsigned int hash(const char *s);
+ inline unsigned int hash(const char *s)
+ {
+ unsigned int h = 0;
+@@ -82,6 +83,7 @@
+ return abs(h % HASH_SIZE);
+ }
+
++static inline void AddToHash(completion_list *cl);
+ inline void AddToHash(completion_list *cl)
+ {
+ unsigned int h = hash(cl->symbol);
+@@ -96,6 +98,7 @@
+ }
+
+ /* mmmmm... free hash */
++static inline void FreeHash(void);
+ inline void FreeHash(void)
+ {
+ unsigned int i;
+@@ -117,6 +120,7 @@
+
+ /* XML Helper Functions */
+
++static inline char *XMLTagChild(xmlNodePtr node, const char *name);
+ inline char *XMLTagChild(xmlNodePtr node, const char *name)
+ {
+ xmlNodePtr cur = node->xmlChildrenNode;
+@@ -141,6 +145,7 @@
+ return NULL;
+ }
+
++static inline char *XMLTagAttr(xmlNodePtr node, const char *attr);
+ inline char *XMLTagAttr(xmlNodePtr node, const char *attr)
+ {
+ xmlAttrPtr props = node->properties;
+@@ -167,6 +172,7 @@
+
+ /* Look up functions for symbols and descriptions */
+
++static inline completion_list *LookUpSymbol(const char *symbol);
+ inline completion_list *LookUpSymbol(const char *symbol)
+ {
+ unsigned int h = hash(symbol);
+@@ -187,6 +193,7 @@
+ return NULL;
+ }
+
++static inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc);
+ inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc)
+ {
+ desc_url_list *cur = entry->descs;
+@@ -206,6 +213,8 @@
+
+ /* Add the given name, description and url to our completion list */
+
++static inline int AddToCompletionList(const char *name,
++ const char *desc, const char *url);
+ inline int AddToCompletionList(const char *name,
+ const char *desc, const char *url)
+ {
+@@ -274,6 +283,7 @@
+ }
+
+ /* Encode the given string so that {X}Emacs will understand it */
++static inline char *Encode(const char *s);
+ inline char *Encode(const char *s)
+ {
+ unsigned int extra_len = 0;
+@@ -341,6 +351,7 @@
+
+ /* Output the completion list in a way {X}Emacs can easily read in */
+
++static inline int OutputCompletionList(void);
+ inline int OutputCompletionList(void)
+ {
+ completion_list *cur = comp_list;
+@@ -400,6 +411,7 @@
+
+ /* Clean up */
+
++static inline void FreeCompletionList(void);
+ inline void FreeCompletionList(void)
+ {
+ completion_list *cur = comp_list;
+@@ -428,7 +440,8 @@
+ }
+
+ /* Add the members of a compound to the completion list */
+-
++static inline int AddCompoundMembers(xmlNodePtr compound,
++ const char *name, const char *url);
+ inline int AddCompoundMembers(xmlNodePtr compound,
+ const char *name, const char *url)
+ {