[gentoo-commits] repo/gentoo:master commit in: app-emacs/doxymacs/files/, app-emacs/doxymacs/

[gentoo-commits] repo/gentoo:master commit in: app-emacs/doxymacs/files/, app-emacs/doxymacs/

[Ulrich Müller]

commit:     8a9b51adb08313fd58cb7df7f3f98511d42cb528
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 09:38:56 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov  3 09:38:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9b51ad

app-emacs/doxymacs: Fix compilation with GCC 7.

Closes: https://bugs.gentoo.org/635746
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild        |   3 +-
 app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch | 104 +++++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)

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)
+ {

[gentoo-commits] repo/gentoo:master commit in: app-emacs/doxymacs/files/, app-emacs/doxymacs/

[Maciej Barć]

commit:     3c8a5575bbe0bbf417de0a455fa1a1005150bf7e
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 20:10:45 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed May 10 21:03:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8a5575

app-emacs/doxymacs: remove -Werror; bump EAPI

Closes: https://bugs.gentoo.org/906024
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 ...acs-1.8.0-r4.ebuild => doxymacs-1.8.0-r5.ebuild} | 21 +++++++++++++--------
 app-emacs/doxymacs/files/doxymacs-1.8.0-flags.patch | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/app-emacs/doxymacs/doxymacs-1.8.0-r4.ebuild b/app-emacs/doxymacs/doxymacs-1.8.0-r5.ebuild
similarity index 65%
rename from app-emacs/doxymacs/doxymacs-1.8.0-r4.ebuild
rename to app-emacs/doxymacs/doxymacs-1.8.0-r5.ebuild
index 8f6f1f24fd89..6f379856aac5 100644
--- a/app-emacs/doxymacs/doxymacs-1.8.0-r4.ebuild
+++ b/app-emacs/doxymacs/doxymacs-1.8.0-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit elisp flag-o-matic
+inherit elisp
 
 DESCRIPTION="Doxygen editing minor mode"
 HOMEPAGE="http://doxymacs.sourceforge.net/"
@@ -13,14 +13,18 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND=">=dev-libs/libxml2-2.6.13"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-libs/libxml2-2.6.13"
+DEPEND="${RDEPEND}"
 
-PATCHES=("${FILESDIR}"/${P}-gcc7.patch)
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 SITEFILE="50${PN}-gentoo.el"
 
 src_configure() {
-	append-flags -Wno-error		#260874
 	econf --with-lispdir="${SITELISP}/${PN}"
 }
 
@@ -31,5 +35,6 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	einstalldocs
 }

diff --git a/app-emacs/doxymacs/files/doxymacs-1.8.0-flags.patch b/app-emacs/doxymacs/files/doxymacs-1.8.0-flags.patch
new file mode 100644
index 000000000000..4aeef48c7fbe
--- /dev/null
+++ b/app-emacs/doxymacs/files/doxymacs-1.8.0-flags.patch
@@ -0,0 +1,21 @@
+--- a/c/Makefile.am
++++ b/c/Makefile.am
+@@ -7,6 +7,6 @@ doxymacs_parser_SOURCES = doxymacs_parser.c
+ 
+ INCLUDES = $(XML_CPPFLAGS)
+ 
+-AM_CFLAGS = -Wall -Werror -fexpensive-optimizations -fomit-frame-pointer
++AM_CFLAGS = -Wall
+ 
+ doxymacs_parser_LDADD = $(XML_LIBS)
+--- a/c/Makefile.in
++++ b/c/Makefile.in
+@@ -153,7 +153,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ doxymacs_parser_SOURCES = doxymacs_parser.c
+ INCLUDES = $(XML_CPPFLAGS)
+-AM_CFLAGS = -Wall -Werror -fexpensive-optimizations -fomit-frame-pointer
++AM_CFLAGS = -Wall
+ doxymacs_parser_LDADD = $(XML_LIBS)
+ all: all-am
+