<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/68a0f867bd2a19734a2e03a7a0dcb23ff8bb0141">https://github.com/macports/macports-ports/commit/68a0f867bd2a19734a2e03a7a0dcb23ff8bb0141</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 68a0f867bd2 kde4 pg: use correct jasper2 paths
</span>68a0f867bd2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 68a0f867bd2a19734a2e03a7a0dcb23ff8bb0141
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Sep 11 05:32:46 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> kde4 pg: use correct jasper2 paths
</span>---
_resources/port1.0/group/kde4-1.1.tcl | 4 ++--
kde/digikam/Portfile | 2 --
kde/kdelibs4/Portfile | 4 +---
kde/kopete/Portfile | 4 +---
4 files changed, 4 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/kde4-1.1.tcl b/_resources/port1.0/group/kde4-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ea342c78df..d532a7f20c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/kde4-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/kde4-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,8 +81,8 @@ proc kde4::configure_build {} {
</span> -DGETTEXT_LIBRARY=${prefix}/lib/libgettextlib.dylib \
-DGIF_INCLUDE_DIR=${prefix}/include \
-DGIF_LIBRARY=${prefix}/lib/libgif.dylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY=${prefix}/lib/libjasper.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_INCLUDE_DIR=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJASPER_LIBRARY=${prefix}/libexec/jasper2/lib/libjasper.dylib \
</span> -DJPEG_INCLUDE_DIR=${prefix}/include \
-DJPEG_LIBRARY=${prefix}/lib/libjpeg.dylib \
-DLBER_LIBRARIES=${prefix}/lib/liblber.dylib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/digikam/Portfile b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de0083b0a33..27f80a9fc50 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,8 +108,6 @@ configure.args-append -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON \
</span> -DOpenCV_DIR=${prefix}/libexec/opencv${opencv_ver}/cmake \
-DDIGIKAMSC_COMPILE_LIBKGEOMAP:BOOL=ON -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE:BOOL=ON \
-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI:BOOL=ON -DDIGIKAMSC_COMPILE_LIBKFACE:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR:FILEPATH=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY_RELEASE:FILEPATH=${prefix}/libexec/jasper2/lib/libjasper.dylib \
</span> -Wno-dev \
../${distname}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/Portfile b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 35bc6f28224..49a00e510a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,9 +87,7 @@ configure.args-append -DWITH_ENCHANT=ON \
</span> -DKDE_DEFAULT_HOME=Library/Preferences/KDE \
-DWITH_HSPELL=OFF \
-DWITH_FAM=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKDE4_AUTH_BACKEND_NAME="OSX" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR:FILEPATH=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY_RELEASE:FILEPATH=${prefix}/libexec/jasper2/lib/libjasper.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKDE4_AUTH_BACKEND_NAME="OSX"
</span>
# Install the kdelibs headerfiles in their own directory to prevent clashes with KF5 headers
configure.args-append -DINCLUDE_INSTALL_DIR=${kde4.include_dirs}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kopete/Portfile b/kde/kopete/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bacb85f6302..019276c1c67 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kopete/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kopete/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,9 +43,7 @@ configure.args-append -DWITH_Libgadu=OFF \
</span> -DWITH_LibMeanwhile=OFF \
-DWITH_meanwhile=OFF \
-DWITH_Mediastreamer=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_nowlistening=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_INCLUDE_DIR:FILEPATH=${prefix}/libexec/jasper2/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJASPER_LIBRARY_RELEASE:FILEPATH=${prefix}/libexec/jasper2/lib/libjasper.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_nowlistening=OFF
</span>
patchfiles-append patch-no-xmms.diff
</pre><pre style='margin:0'>
</pre>