Created attachment 575438 [details, diff] merkaartor-0.18.3-r4.ebuild.patch The new sci-libs/proj-6.0.0 is preparing for v. 7.0.0 where the usage of proj_api.h will be deprecated, so now at version 6.0.0 an error occurs when trying to use it. Packages must be updated properly upstream, but till that happens a way to fix this is to append the necessary flags. The sci-geosciences/merkaartor-0.18.3-r4 package gives the error too: In file included from common/Projection.h:12:0, from common/MapView.h:4, from Features/Feature.h:8, from Features/Features.h:2, from Backend/MemoryBackend.h:4, from common/Global.h:19, from common/Global.cpp:13: /usr/include/proj_api.h:37:2: error: #error 'To use the proj_api.h you must define the macro ACCEPT_USE_OF_DEPRECATED_PROJ_API_H' #error 'To use the proj_api.h you must define the macro ACCEPT_USE_OF_DEPRECATED_PROJ_API_H' I am uploading a proposed fix for the ebuild tested to be working OK ...
*** Bug 685526 has been marked as a duplicate of this bug. ***
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fee9321d16014b12fe82a608c79f860dba68a61 commit 7fee9321d16014b12fe82a608c79f860dba68a61 Author: Amy Liffey <amynka@gentoo.org> AuthorDate: 2019-06-30 07:17:40 +0000 Commit: Amy Liffey <amynka@gentoo.org> CommitDate: 2019-06-30 07:18:42 +0000 sci-geosciences/merkaartor: fix compilation with proj-6.0.0 Closes: https://bugs.gentoo.org/685234 Submitted-by: <phobosk@fastmail.fm> Signed-off-by: Amy Liffey <amynka@gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Re-opening as a workaround is no fix and it is running out of time.
The following patch https://src.fedoraproject.org/rpms/merkaartor/raw/f529682d49b0a8433a523bc257a9d05323c2489b/f/merkaartor-0.18.4-proj-remove-legacy-api.patch seems to help with this, although, I couldn't build merkaartor successfully even with it due to unrelated problem: GPS/qgpsdevice.cpp: In member function ‘virtual void QGPSDDevice::onDataAvailable()’: GPS/qgpsdevice.cpp:1055:22: error: could not convert ‘((QGPSDDevice*)this)->QGPSDDevice::gpsdata->gps_data_t::fix.gps_fix_t::time’ from ‘timespec_t’ {aka ‘timespec’} to ‘bool’ 1055 | if (gpsdata->fix.time) | ~~~~~~~~~~~~~^~~~ | | | timespec_t {aka timespec} GPS/qgpsdevice.cpp:1056:63: error: no matching function for call to ‘QDateTime::fromTime_t(timespec_t&)’ 1056 | cur_datetime = QDateTime::fromTime_t(gpsdata->fix.time); | ^ Presumably it is only a problem with USE=gps
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8d0f22a739a4ca454c9e14504426dad06f9188 commit 6b8d0f22a739a4ca454c9e14504426dad06f9188 Author: Sam James <sam@gentoo.org> AuthorDate: 2021-04-10 12:21:13 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2021-04-10 12:40:26 +0000 sci-geosciences/merkaartor: add 0.18.4_p20210410 (snapshot for PROJ 8) Hot off the press snapshot to add compatibility with PROJ 8. Closes: https://bugs.gentoo.org/685234 Signed-off-by: Sam James <sam@gentoo.org> sci-geosciences/merkaartor/Manifest | 1 + .../merkaartor/merkaartor-0.18.4_p20210410.ebuild | 113 +++++++++++++++++++++ sci-geosciences/merkaartor/merkaartor-9999.ebuild | 7 +- 3 files changed, 120 insertions(+), 1 deletion(-)
