summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/qsvn')
-rw-r--r--dev-vcs/qsvn/ChangeLog6
-rw-r--r--dev-vcs/qsvn/files/qsvn-0.8.3-static-lib.patch23
-rw-r--r--dev-vcs/qsvn/qsvn-0.8.3.ebuild15
3 files changed, 37 insertions, 7 deletions
diff --git a/dev-vcs/qsvn/ChangeLog b/dev-vcs/qsvn/ChangeLog
index 3ec7202af75e..e498af47ba7e 100644
--- a/dev-vcs/qsvn/ChangeLog
+++ b/dev-vcs/qsvn/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-vcs/qsvn
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qsvn/ChangeLog,v 1.2 2010/03/05 03:12:34 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qsvn/ChangeLog,v 1.3 2010/03/30 23:41:59 tampakrap Exp $
+
+ 30 Mar 2010; Theo Chatzimichos <tampakrap@gentoo.org> qsvn-0.8.3.ebuild,
+ +files/qsvn-0.8.3-static-lib.patch:
+ Add patch provided by Yaakov S, to make libsvnqt a static lib, bug 296624
05 Mar 2010; Theo Chatzimichos <tampakrap@gentoo.org> qsvn-0.8.3.ebuild:
update category of kdesvn blocker
diff --git a/dev-vcs/qsvn/files/qsvn-0.8.3-static-lib.patch b/dev-vcs/qsvn/files/qsvn-0.8.3-static-lib.patch
new file mode 100644
index 000000000000..4bef9d63ea7d
--- /dev/null
+++ b/dev-vcs/qsvn/files/qsvn-0.8.3-static-lib.patch
@@ -0,0 +1,23 @@
+--- origsrc/qsvn-0.8.3/src/svnqt/CMakeLists.txt 2009-07-05 04:56:34.000000000 -0500
++++ src/qsvn-0.8.3/src/svnqt/CMakeLists.txt 2009-08-25 00:56:52.432416800 -0500
+@@ -131,7 +131,7 @@ CONFIGURE_FILE(
+ SET(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp)
+ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
+-ADD_LIBRARY(${svnqt-name} SHARED ${SOURCES} ${svnhdr})
++ADD_LIBRARY(${svnqt-name} STATIC ${SOURCES} ${svnhdr})
+ IF(WIN32)
+ ADD_DEFINITIONS(-D_USE_32BIT_TIME_T)
+ ELSE(WIN32)
+@@ -175,9 +175,11 @@ ENDIF (BUILD_TESTS)
+ # install rules
+ # in win32 we don't install it
+ IF(NOT WIN32)
++IF(FALSE)
+ INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
+ INSTALL(FILES ${INST_HEADERS} DESTINATION include/svnqt)
+ INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/svnqt/cache)
++ENDIF(FALSE)
+ ENDIF(NOT WIN32)
+
+ IF (BUILD_TESTS)
diff --git a/dev-vcs/qsvn/qsvn-0.8.3.ebuild b/dev-vcs/qsvn/qsvn-0.8.3.ebuild
index bdf436d332eb..38c1c6b806fb 100644
--- a/dev-vcs/qsvn/qsvn-0.8.3.ebuild
+++ b/dev-vcs/qsvn/qsvn-0.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qsvn/qsvn-0.8.3.ebuild,v 1.2 2010/03/05 03:12:34 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qsvn/qsvn-0.8.3.ebuild,v 1.3 2010/03/30 23:41:59 tampakrap Exp $
EAPI="2"
@@ -17,16 +17,19 @@ IUSE=""
RDEPEND="x11-libs/qt-gui:4[qt3support]
x11-libs/qt-sql:4[sqlite]
- dev-util/subversion
- !dev-vcs/kdesvn"
+ dev-util/subversion"
DEPEND="${RDEPEND}
x11-libs/qt-test"
S=${WORKDIR}/${P}/src
-src_prepare() {
- epatch "${FILESDIR}/${P}-tests.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-tests.patch"
+ "${FILESDIR}/${P}-static-lib.patch" )
+
+#src_prepare() {
+# epatch "${FILESDIR}/${P}-tests.patch"
+# epatch "
+#}
src_install() {
cmake-utils_src_install