diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-01 19:40:37 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-01 19:51:53 +0200 |
| commit | 343a18a34ce2e4b099d519556e8ca58c875cbdad (patch) | |
| tree | e75c214fa121b11f62beb82801445339758f5d06 /sci-geosciences/merkaartor | |
| parent | sci-geosciences/merkaartor: EAPI-7 bump, gnome2-utils -> xdg-utils (diff) | |
| download | gentoo-343a18a34ce2e4b099d519556e8ca58c875cbdad.tar.gz gentoo-343a18a34ce2e4b099d519556e8ca58c875cbdad.tar.bz2 gentoo-343a18a34ce2e4b099d519556e8ca58c875cbdad.zip | |
sci-geosciences/merkaartor: Fix build with exiv2-0.27.1
Closes: https://bugs.gentoo.org/689098
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-geosciences/merkaartor')
| -rw-r--r-- | sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch | 12 | ||||
| -rw-r--r-- | sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch new file mode 100644 index 000000000000..d54422be14e9 --- /dev/null +++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch @@ -0,0 +1,12 @@ +--- a/src/Docks/GeoImageDock.h 2016-09-06 00:29:45.000000000 +0200 ++++ b/src/Docks/GeoImageDock.h 2019-07-01 19:20:43.450789475 +0200 +@@ -7,8 +7,7 @@ + #include <QDockWidget> + #include <QMouseEvent> + #include <QShortcut> +-#include <exiv2/image.hpp> +-#include <exiv2/exif.hpp> ++#include <exiv2/exiv2.hpp> + #include <QDrag> + + class ImageView; diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild index b998c164e0c0..6eed24c61504 100644 --- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild +++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild @@ -42,6 +42,7 @@ PATCHES=( "${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826 "${FILESDIR}"/${P}-desktopfile.patch "${FILESDIR}"/${P}-webengine{1,2,3}.patch + "${FILESDIR}"/${P}-exiv2-0.27.1.patch # bug 689098 ) DOCS=( AUTHORS CHANGELOG ) |