| 1 |
commit: b2ab6a8f5354a899d9637574ee0eb7b4a43961a2 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 23 13:10:45 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 23 13:10:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ab6a8f |
| 7 |
|
| 8 |
sci-chemistry/ghemical: Fix building against GCC 9 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/687450 |
| 11 |
Package-Manager: Portage-2.3.67, Repoman-2.3.15 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch | 37 +++++++++++++++++++++++ |
| 15 |
sci-chemistry/ghemical/ghemical-3.0.0.ebuild | 5 ++- |
| 16 |
2 files changed, 41 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch b/sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..d3d80bbd00b |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+https://bugs.gentoo.org/687450 |
| 25 |
+ |
| 26 |
+project.h:210:14: error: friend declaration of ‘bool ReadGPR_OLD(project&, std::istream&, bool, bool)’ specifies default arguments and isn’t a definition [-fpermissive] |
| 27 |
+ 210 | friend bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version. |
| 28 |
+ | ^~~~~~~~~~~ |
| 29 |
+ |
| 30 |
+--- a/src/project.h |
| 31 |
++++ b/src/project.h |
| 32 |
+@@ -122,6 +122,12 @@ |
| 33 |
+ graphical user interface. |
| 34 |
+ */ |
| 35 |
+ |
| 36 |
++class project; |
| 37 |
++bool ReadGPR_OLD(project &, istream &, bool, bool = false); |
| 38 |
++bool ReadGPR_v100(project &, istream &, bool, bool = false); |
| 39 |
++bool ReadGPR_v110(project &, istream &, bool, bool = false); |
| 40 |
++bool ReadGPR(project &, istream &, bool, bool = false); |
| 41 |
++ |
| 42 |
+ class project : |
| 43 |
+ public custom_transformer_client, |
| 44 |
+ public model |
| 45 |
+@@ -207,11 +213,11 @@ |
| 46 |
+ |
| 47 |
+ // methods for file I/O : ReadGPR and WriteGPR are friend functions so that it would be easier to "borrow" them elsewhere... |
| 48 |
+ // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 49 |
+- friend bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version. |
| 50 |
+- friend bool ReadGPR_v100(project &, istream &, bool, bool = false); ///< this is for the version 1.00. |
| 51 |
+- friend bool ReadGPR_v110(project &, istream &, bool, bool = false); ///< this is for the version 1.10. |
| 52 |
++ friend bool ReadGPR_OLD(project &, istream &, bool, bool); ///< this is for the very old version. |
| 53 |
++ friend bool ReadGPR_v100(project &, istream &, bool, bool); ///< this is for the version 1.00. |
| 54 |
++ friend bool ReadGPR_v110(project &, istream &, bool, bool); ///< this is for the version 1.10. |
| 55 |
+ /// This is an input function for the v1.11 ghemical file format. |
| 56 |
+- friend bool ReadGPR(project &, istream &, bool, bool = false); |
| 57 |
++ friend bool ReadGPR(project &, istream &, bool, bool); |
| 58 |
+ |
| 59 |
+ friend void WriteGPR_v100(project &, ostream &); ///< this is for the version 1.00. |
| 60 |
+ /// This is an output function for the v1.11 ghemical file format. |
| 61 |
|
| 62 |
diff --git a/sci-chemistry/ghemical/ghemical-3.0.0.ebuild b/sci-chemistry/ghemical/ghemical-3.0.0.ebuild |
| 63 |
index 4186af7e725..477c41439c2 100644 |
| 64 |
--- a/sci-chemistry/ghemical/ghemical-3.0.0.ebuild |
| 65 |
+++ b/sci-chemistry/ghemical/ghemical-3.0.0.ebuild |
| 66 |
@@ -28,7 +28,10 @@ RDEPEND=" |
| 67 |
DEPEND="${RDEPEND} |
| 68 |
virtual/pkgconfig" |
| 69 |
|
| 70 |
-PATCHES=( "${FILESDIR}"/2.99.2-docs.patch ) |
| 71 |
+PATCHES=( |
| 72 |
+ "${FILESDIR}"/2.99.2-docs.patch |
| 73 |
+ "${FILESDIR}"/3.0.0-fix-gcc9.patch |
| 74 |
+) |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
default |
Archives