Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/opensp/, app-text/opensp/files/
Date: Wed, 31 Jan 2018 15:57:00
Message-Id: 1517414153.688d9675782dfc162d4e6cff04c668f7516118d0.vapier@gentoo
1 commit: 688d9675782dfc162d4e6cff04c668f7516118d0
2 Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3 AuthorDate: Wed Jan 31 15:55:37 2018 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 31 15:55:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688d9675
7
8 app-test/opensp: fix builds w/newer clang
9
10 Bug: https://crbug.com/806958
11
12 app-text/opensp/files/opensp-1.5.2-c11-using.patch | 77 ++++++++++++++++++++++
13 app-text/opensp/opensp-1.5.2-r6.ebuild | 1 +
14 2 files changed, 78 insertions(+)
15
16 diff --git a/app-text/opensp/files/opensp-1.5.2-c11-using.patch b/app-text/opensp/files/opensp-1.5.2-c11-using.patch
17 new file mode 100644
18 index 00000000000..a12bf9a9b55
19 --- /dev/null
20 +++ b/app-text/opensp/files/opensp-1.5.2-c11-using.patch
21 @@ -0,0 +1,77 @@
22 +Fix build issues due to access declarations: https://crbug.com/806958
23 + ISO C++11 does not allow access declarations; use using declarations instead.
24 +
25 +The link to "Bug Tracker" on http://openjade.sourceforge.net/bugs.html
26 +is not working. Sent a mail containing bug report to the Openjade-devel@
27 +address on that page.
28 +
29 +Patch by Rahul Chaudhry <rahulchaudhry@××××××××.org>
30 +
31 +--- a/include/IList.h
32 ++++ b/include/IList.h
33 +@@ -26,8 +26,8 @@ public:
34 + void swap(IList<T> &list) { IListBase::swap(list); }
35 + T *head() const { return (T *)IListBase::head(); }
36 + T *get() { return (T *)IListBase::get(); }
37 +- IListBase::clear;
38 +- IListBase::empty;
39 ++ using IListBase::clear;
40 ++ using IListBase::empty;
41 + friend class IListIter<T>;
42 + private:
43 + IList(const IList<T> &); // undefined
44 +--- a/include/IListIter.h
45 ++++ b/include/IListIter.h
46 +@@ -17,8 +17,8 @@ public:
47 + IListIter(const IList<T> &list) : IListIterBase(list) { }
48 + T *cur() const { return (T *)IListIterBase::cur(); }
49 +
50 +- IListIterBase::next;
51 +- IListIterBase::done;
52 ++ using IListIterBase::next;
53 ++ using IListIterBase::done;
54 + };
55 +
56 + #ifdef SP_NAMESPACE
57 +--- a/include/Ptr.h
58 ++++ b/include/Ptr.h
59 +@@ -69,8 +69,8 @@ public:
60 + const T *operator->() const { return Ptr<T>::pointer(); }
61 + const T &operator*() const { return *Ptr<T>::pointer(); }
62 + void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
63 +- Ptr<T>::isNull;
64 +- Ptr<T>::clear;
65 ++ using Ptr<T>::isNull;
66 ++ using Ptr<T>::clear;
67 + Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
68 + Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
69 + Boolean operator==(const ConstPtr<T> &p) const {
70 +--- a/lib/Parser.h
71 ++++ b/lib/Parser.h
72 +@@ -62,16 +62,16 @@ public:
73 + Parser(const SgmlParser::Params &);
74 + Event *nextEvent();
75 + void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
76 +- ParserState::sdPointer;
77 +- ParserState::instanceSyntaxPointer;
78 +- ParserState::prologSyntaxPointer;
79 +- ParserState::activateLinkType;
80 +- ParserState::allLinkTypesActivated;
81 +- ParserState::entityManager;
82 +- ParserState::entityCatalog;
83 +- ParserState::baseDtd;
84 +- ParserState::options;
85 +- ParserState::instantiateDtd;
86 ++ using ParserState::sdPointer;
87 ++ using ParserState::instanceSyntaxPointer;
88 ++ using ParserState::prologSyntaxPointer;
89 ++ using ParserState::activateLinkType;
90 ++ using ParserState::allLinkTypesActivated;
91 ++ using ParserState::entityManager;
92 ++ using ParserState::entityCatalog;
93 ++ using ParserState::baseDtd;
94 ++ using ParserState::options;
95 ++ using ParserState::instantiateDtd;
96 + friend class PiAttspecParser;
97 + private:
98 + Parser(const Parser &); // undefined
99
100 diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
101 index bb6d63be113..738ed37fc6b 100644
102 --- a/app-text/opensp/opensp-1.5.2-r6.ebuild
103 +++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
104 @@ -34,6 +34,7 @@ S=${WORKDIR}/${MY_P}
105
106 src_prepare() {
107 epatch "${FILESDIR}"/${P}-fix-segfault.patch
108 + epatch "${FILESDIR}"/${P}-c11-using.patch
109 use prefix && eautoreconf
110 }