diff options
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/Manifest.gz | bin | 11248 -> 11252 bytes | |||
| -rw-r--r-- | sci-geosciences/merkaartor/Manifest | 3 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch | 50 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild | 5 |
4 files changed, 56 insertions, 2 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex 7cddd63ad961..b5e5f525ab6b 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest index d14075bd23d1..fba057d581e4 100644 --- a/sci-geosciences/merkaartor/Manifest +++ b/sci-geosciences/merkaartor/Manifest @@ -1,5 +1,6 @@ AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9 +AUX merkaartor-0.19.0-exiv2-0.28.patch 1874 BLAKE2B 6ba8bae160ef8693ae92396051348cd48e857d3cace7c57aab45aea0c6c7756cadf6b73894391dcd7ff8de3e39eb29694e459070aebe3f2cc776adbe80c51e51 SHA512 a2c8c053cdda1cb94b3e7f6b315cfb6a061f956a86f74db96f0a0f174af6aa4f3b46829a6f447e3f067edbc9c7ba923c7619c8ceb7480e145c1b31e2129cf92e DIST merkaartor-0.19.0.tar.gz 5665947 BLAKE2B 1ade571b8e429b9da89206d50b0f33f69cb0973d4ada30dc0d84d4c6c47394170ddb8503490eeda8666656eeb07159498d02bbc36e61f2dffedef167f221be01 SHA512 2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d -EBUILD merkaartor-0.19.0-r1.ebuild 2578 BLAKE2B c75be6e26cd264bafc3455af31c0e6ee0d6bfc32fc1c0d1af6ebcf0d60d7f39b908e137ff9365c3b527e908e17cab9f2ecb90f718afd25f81c2200c2935f3b95 SHA512 bc905a13cc28388f7cb7b9030ca8dc1a87bcc5ed3500449ad5bfb64e5038375bf61ce4c0148c54a56eaf1d3c30a48a04a839c49b1f5c39e36dafed40bd2159e9 +EBUILD merkaartor-0.19.0-r1.ebuild 2662 BLAKE2B 0f0297f2f8eef5d1cf27bbdfe1e237fedd67c7b6ca2adf7c2b589febcbeb3a8ec815a1076164e80f1c917b39207cb55eb2c7bfcdd3bd496f7519d4c72fcfaab1 SHA512 d3f595dbf560b21d1bb7f2b3a269836ee52005a5f2a737e754e5ce21a9419095c944c841584b44e64a6b46627390365cc4a1050da04711bfd159b5d87511446d EBUILD merkaartor-9999.ebuild 2578 BLAKE2B c75be6e26cd264bafc3455af31c0e6ee0d6bfc32fc1c0d1af6ebcf0d60d7f39b908e137ff9365c3b527e908e17cab9f2ecb90f718afd25f81c2200c2935f3b95 SHA512 bc905a13cc28388f7cb7b9030ca8dc1a87bcc5ed3500449ad5bfb64e5038375bf61ce4c0148c54a56eaf1d3c30a48a04a839c49b1f5c39e36dafed40bd2159e9 MISC metadata.xml 576 BLAKE2B a768f64dba4052d56e3ae00ccb0ddb95e1d4712ec5bb99216ebfad87012a2d9aece4acfa3eee2715625f9726d70a620209f4b4a83ed323188a92205953cc1406 SHA512 e099e0546c907c76f864ff5cdc4cb91fe1b8d72289022e6f621d827bc7140c4b1b47f6ba97783a4d703d46245013695e2d8a213272b665298e89f5ed332f7ff9 diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch new file mode 100644 index 000000000000..4f98b9a4fa36 --- /dev/null +++ b/sci-geosciences/merkaartor/files/merkaartor-0.19.0-exiv2-0.28.patch @@ -0,0 +1,50 @@ +From 1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org> +Date: Sat, 16 Jul 2022 12:41:33 +0200 +Subject: [PATCH] Replaced use of AutoPtr with std::unique_ptr in + GeoImageDock.cpp. + +--- + src/Docks/GeoImageDock.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp +index 02b5cdc0..e2fa1601 100644 +--- a/src/Docks/GeoImageDock.cpp ++++ b/src/Docks/GeoImageDock.cpp +@@ -457,7 +457,7 @@ void GeoImageDock::loadImages(QStringList fileNames) + Document *theDocument = Main->document(); + MapView *theView = Main->view(); + +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr<Exiv2::Image> image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -869,7 +869,7 @@ void GeoImageDock::saveImage() + // fn = QFileDialog::getSaveFileName(0, "Specify output filename", fn, tr("JPEG Images (*.jpg)")); + qDebug() << fn; + if (!fn.isEmpty()) { +- Exiv2::Image::AutoPtr imageIn, imageOut; ++ std::unique_ptr<Exiv2::Image> imageIn, imageOut; + Exiv2::ExifData exifData; + try { + imageIn = Exiv2::ImageFactory::open(usedTrackPoints.at(index).filename.toStdString()); +@@ -893,7 +893,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file) + { + Coord pos; + double lat = 0.0, lon = 0.0; +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr<Exiv2::Image> image; + Exiv2::ExifData exifData; + bool positionValid = false; + +@@ -933,7 +933,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file) + + void GeoImageDock::addGeoDataToImage(Coord position, const QString & file) + { +- Exiv2::Image::AutoPtr image; ++ std::unique_ptr<Exiv2::Image> image; + + try { + image = Exiv2::ImageFactory::open(file.toStdString()); diff --git a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild index f0f4b1dbd195..c959fecd8c1c 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.19.0-r1.ebuild @@ -45,7 +45,10 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826 +PATCHES=( + "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # downstream, bug 621826 + "${FILESDIR}"/${P}-exiv2-0.28.patch # upstream git master, bug 906501 +) DOCS=( AUTHORS CHANGELOG ) |