diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /sci-chemistry/ghemical/files | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'sci-chemistry/ghemical/files')
-rw-r--r-- | sci-chemistry/ghemical/files/2.99.2-docs.patch | 22 | ||||
-rw-r--r-- | sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch | 37 |
2 files changed, 0 insertions, 59 deletions
diff --git a/sci-chemistry/ghemical/files/2.99.2-docs.patch b/sci-chemistry/ghemical/files/2.99.2-docs.patch deleted file mode 100644 index 85f31dfd729f..000000000000 --- a/sci-chemistry/ghemical/files/2.99.2-docs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/docs/user-docs/Makefile.am b/docs/user-docs/Makefile.am -index 030f67c..dcb207b 100644 ---- a/docs/user-docs/Makefile.am -+++ b/docs/user-docs/Makefile.am -@@ -1,6 +1,6 @@ - SUBDIRS = images - --helpfilesdir = $(datadir)/ghemical/@APPVERSION@/user-docs -+helpfilesdir = $(datadir)/doc/ghemical-@APPVERSION@/html - helpfiles_DATA = *.css *.html - - EXTRA_DIST = $(helpfiles_DATA) -diff --git a/docs/user-docs/images/Makefile.am b/docs/user-docs/images/Makefile.am -index fae0ffd..a569151 100644 ---- a/docs/user-docs/images/Makefile.am -+++ b/docs/user-docs/images/Makefile.am -@@ -1,4 +1,4 @@ --helpimagesdir = $(datadir)/ghemical/@APPVERSION@/user-docs/images -+helpimagesdir = $(datadir)/doc/ghemical-@APPVERSION@/html/images - helpimages_DATA = *.png - - EXTRA_DIST = $(helpimages_DATA) diff --git a/sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch b/sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch deleted file mode 100644 index d3d80bbd00ba..000000000000 --- a/sci-chemistry/ghemical/files/3.0.0-fix-gcc9.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/687450 - -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] - 210 | friend bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version. - | ^~~~~~~~~~~ - ---- a/src/project.h -+++ b/src/project.h -@@ -122,6 +122,12 @@ - graphical user interface. - */ - -+class project; -+bool ReadGPR_OLD(project &, istream &, bool, bool = false); -+bool ReadGPR_v100(project &, istream &, bool, bool = false); -+bool ReadGPR_v110(project &, istream &, bool, bool = false); -+bool ReadGPR(project &, istream &, bool, bool = false); -+ - class project : - public custom_transformer_client, - public model -@@ -207,11 +213,11 @@ - - // methods for file I/O : ReadGPR and WriteGPR are friend functions so that it would be easier to "borrow" them elsewhere... - // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- friend bool ReadGPR_OLD(project &, istream &, bool, bool = false); ///< this is for the very old version. -- friend bool ReadGPR_v100(project &, istream &, bool, bool = false); ///< this is for the version 1.00. -- friend bool ReadGPR_v110(project &, istream &, bool, bool = false); ///< this is for the version 1.10. -+ friend bool ReadGPR_OLD(project &, istream &, bool, bool); ///< this is for the very old version. -+ friend bool ReadGPR_v100(project &, istream &, bool, bool); ///< this is for the version 1.00. -+ friend bool ReadGPR_v110(project &, istream &, bool, bool); ///< this is for the version 1.10. - /// This is an input function for the v1.11 ghemical file format. -- friend bool ReadGPR(project &, istream &, bool, bool = false); -+ friend bool ReadGPR(project &, istream &, bool, bool); - - friend void WriteGPR_v100(project &, ostream &); ///< this is for the version 1.00. - /// This is an output function for the v1.11 ghemical file format. |