[114084] trunk/dports/kde/kdesvn
nicos at macports.org
nicos at macports.org
Thu Nov 28 07:09:31 PST 2013
Revision: 114084
https://trac.macports.org/changeset/114084
Author: nicos at macports.org
Date: 2013-11-28 07:09:31 -0800 (Thu, 28 Nov 2013)
Log Message:
-----------
kdesvn: enforcing docs variant to prevent meinproc4 crashing (ticket #41575)
Modified Paths:
--------------
trunk/dports/kde/kdesvn/Portfile
trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff
trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff
trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff
trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff
Added Paths:
-----------
trunk/dports/kde/kdesvn/files/patch-CMakeLists.diff
Modified: trunk/dports/kde/kdesvn/Portfile
===================================================================
--- trunk/dports/kde/kdesvn/Portfile 2013-11-28 14:32:59 UTC (rev 114083)
+++ trunk/dports/kde/kdesvn/Portfile 2013-11-28 15:09:31 UTC (rev 114084)
@@ -27,7 +27,6 @@
port:kde4-runtime \
port:subversion
-patch.dir ${workpath}/${distname}/src
patchfiles patch-app-install-and-icon-fix.diff \
patch-ignore-apr0-and-apr-util0.diff \
patch-no-kdesdk-conflict.diff \
@@ -39,6 +38,10 @@
${worksrcpath}/doc/nl/CMakeLists.txt
}
+if {![variant_isset docs]} {
+ patchfiles-append patch-CMakeLists.diff
+}
+
configure.args-append -DSUBVERSION_INSTALL_PATH=${prefix}
livecheck.type regex
Added: trunk/dports/kde/kdesvn/files/patch-CMakeLists.diff
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-CMakeLists.diff (rev 0)
+++ trunk/dports/kde/kdesvn/files/patch-CMakeLists.diff 2013-11-28 15:09:31 UTC (rev 114084)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2013-11-28 23:43:58.000000000 +0900
++++ CMakeLists.txt 2013-11-28 23:44:06.000000000 +0900
+@@ -150,7 +150,7 @@
+ SET(svnqt-name svnqt)
+ ADD_SUBDIRECTORY(src)
+ ADD_SUBDIRECTORY(po)
+-ADD_SUBDIRECTORY(doc)
++#ADD_SUBDIRECTORY(doc)
+
+ CONFIGURE_FILE(kdesvn-config.h.in kdesvn-config.h @ONLY)
+ CONFIGURE_FILE(kdesvn.spec.in ${PROJECT_NAME}.spec @ONLY)
Modified: trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff 2013-11-28 14:32:59 UTC (rev 114083)
+++ trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff 2013-11-28 15:09:31 UTC (rev 114084)
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig 2010-03-06 22:24:54.000000000 +0000
-+++ CMakeLists.txt 2010-03-06 23:54:27.000000000 +0000
+--- src/CMakeLists.txt.orig 2010-03-06 22:24:54.000000000 +0000
++++ src/CMakeLists.txt 2010-03-06 23:54:27.000000000 +0000
@@ -50,7 +50,10 @@
ADD_SUBDIRECTORY(pics)
ADD_SUBDIRECTORY(icons)
Modified: trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff 2013-11-28 14:32:59 UTC (rev 114083)
+++ trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff 2013-11-28 15:09:31 UTC (rev 114084)
@@ -1,5 +1,5 @@
---- svnqt/CMakeLists.txt.orig 2012-09-21 21:59:38.000000000 -0500
-+++ svnqt/CMakeLists.txt 2012-09-21 21:59:39.000000000 -0500
+--- src/svnqt/CMakeLists.txt.orig 2012-09-21 21:59:38.000000000 -0500
++++ src/svnqt/CMakeLists.txt 2012-09-21 21:59:39.000000000 -0500
@@ -202,9 +202,6 @@
SOVERSION ${LIB_MAJOR}
VERSION ${_soversion})
@@ -10,8 +10,8 @@
IF(WIN32 OR APPLE)
SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
ELSE(WIN32 OR APPLE)
---- svnqt/cmakemodules/FindSubversion.cmake.orig 2010-12-10 10:30:20.000000000 -0500
-+++ svnqt/cmakemodules/FindSubversion.cmake 2010-12-10 10:31:41.000000000 -0500
+--- src/svnqt/cmakemodules/FindSubversion.cmake.orig 2010-12-10 10:30:20.000000000 -0500
++++ src/svnqt/cmakemodules/FindSubversion.cmake 2010-12-10 10:31:41.000000000 -0500
@@ -90,21 +90,31 @@
EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
Modified: trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff 2013-11-28 14:32:59 UTC (rev 114083)
+++ trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff 2013-11-28 15:09:31 UTC (rev 114084)
@@ -1,5 +1,5 @@
---- svnqt/cmakemodules/FindSubversion.cmake.orig 2010-04-02 10:24:51.000000000 -0500
-+++ svnqt/cmakemodules/FindSubversion.cmake 2010-04-02 10:25:29.000000000 -0500
+--- src/svnqt/cmakemodules/FindSubversion.cmake.orig 2010-04-02 10:24:51.000000000 -0500
++++ src/svnqt/cmakemodules/FindSubversion.cmake 2010-04-02 10:25:29.000000000 -0500
@@ -60,12 +60,12 @@
FIND_SUB_LIB(SUBVERSION_RALIB svn_ra-1)
FIND_SUB_LIB(SUBVERSION_DIFFLIB svn_diff-1)
Modified: trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff 2013-11-28 14:32:59 UTC (rev 114083)
+++ trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff 2013-11-28 15:09:31 UTC (rev 114084)
@@ -1,5 +1,5 @@
---- kiosvn/CMakeLists.txt.orig 2010-03-07 01:03:23.000000000 +0000
-+++ kiosvn/CMakeLists.txt 2010-03-07 01:03:42.000000000 +0000
+--- src/kiosvn/CMakeLists.txt.orig 2010-03-07 01:03:23.000000000 +0000
++++ src/kiosvn/CMakeLists.txt 2010-03-07 01:03:42.000000000 +0000
@@ -41,7 +41,7 @@
INSTALL(TARGETS kio_ksvn
LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131128/0199c8ac/attachment-0001.html>
More information about the macports-changes
mailing list