summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Liffey <amynka@gentoo.org>2018-08-05 16:34:43 +0100
committerAmy Liffey <amynka@gentoo.org>2018-08-05 16:37:17 +0100
commit0553c73ec423b80b07df52b87db616d17a2f00eb (patch)
tree06baed8ebd31bc2d0758308ef09f361810585d16 /sci-geosciences/merkaartor/files
parentapp-xemacs/egg-its: version bump (diff)
downloadgentoo-0553c73ec423b80b07df52b87db616d17a2f00eb.tar.gz
gentoo-0553c73ec423b80b07df52b87db616d17a2f00eb.tar.bz2
gentoo-0553c73ec423b80b07df52b87db616d17a2f00eb.zip
sci-geosciences/merkaartor: fix plugins path
Closes: https://bugs.gentoo.org/621826 Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'sci-geosciences/merkaartor/files')
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
new file mode 100644
index 000000000000..46f5964e17cb
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
@@ -0,0 +1,28 @@
+--- a/src/src.pro 2018-08-05 13:25:02.761849538 +0100
++++ b/src/src.pro 2018-08-05 13:25:55.935846789 +0100
+@@ -155,8 +155,10 @@
+ isEmpty( LIBDIR ) {
+ LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
+ }
+-
+- DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++ isEmpty( PLUGINS_DIR ){
++ PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++ }
++ DEFINES += PLUGINS_DIR=$${PLUGINS_DIR}
+
+ target.path = $${PREFIX}/bin
+ SHARE_DIR = $${PREFIX}/share/merkaartor
+
+--- a/src/src.pro 2018-08-05 16:20:33.759305219 +0100
++++ b/src/src.pro 2018-08-05 16:20:53.094304220 +0100
+@@ -181,7 +181,7 @@
+
+
+
+-DEFINES += SHARE_DIR=$${SHARE_DIR}
++DEFINES += SHARE_DIR=$${SHARE_DIR_PATH}
+ INSTALLS += target
+
+ win32-msvc* {
+