Add patch provided by Yaakov S, to make libsvnqt a static lib, bug 296624

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-vcs/qsvn/ChangeLog b/dev-vcs/qsvn/ChangeLog
index 3ec7202af75e16ce18149b8764e5ab091e536cd2..e498af47ba7e37b2643fca9c8e2f55aa8567f000 100644 (file)
--- 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/Manifest b/dev-vcs/qsvn/Manifest
index 2cbd85772ba178bf36e005d88fe7ea6252d6577d..436f0f694ae9f35ef64537be5402386ae4b8cf9c 100644 (file)
--- a/dev-vcs/qsvn/Manifest
+++ b/dev-vcs/qsvn/Manifest
@@ -1,5 +1,6 @@
+AUX qsvn-0.8.3-static-lib.patch 888 RMD160 ea1446866e1551d47664c399b2846d41473e53cd SHA1 a9b44cb1279677167cdd9f2b44894254fa160a33 SHA256 2f6f83635846f484a9252aa806d6e25348ee0600c7963537ea3a0b8f62075b0e
 AUX qsvn-0.8.3-tests.patch 678 RMD160 8636441a9b37d3f2d61a06de3ba5c4842909e2f6 SHA1 a9549baf6a1944c39b786ba7297328d15d43ece1 SHA256 9de94e08215bbb969429b388c47bdc1a2345cd8d396f740a46aff65678d086c0
 DIST qsvn-0.8.3-src.tar.gz 782750 RMD160 2ccf427fb74fdb8982378089e1bce7685844b56a SHA1 21291e9c91f2765485f06832ea61affe1c2091c0 SHA256 8396f667dc7f09de2eead056608e90febb089fc26529b7fcebe157797c320f73
-EBUILD qsvn-0.8.3.ebuild 806 RMD160 d32b8364c04fe19994d5880588a36e0c4ab72ac2 SHA1 1450c6a52ea6ceb30c6ea1dd4e8d6790df24e763 SHA256 12840b3db9372e7ae3d01b92e826ada2a12394d8ad6a2242c645f51b5138d637
-MISC ChangeLog 1120 RMD160 3885345b973c93b70ec52f0e3565934044ad9618 SHA1 ca8403fe815f47e07ce91eeaa9653ef61719f847 SHA256 036664c00f8a7cb6bac9a3a6072bc55e6ba52e1d145543a68145c3f5d935caad
+EBUILD qsvn-0.8.3.ebuild 885 RMD160 684ebd58bffb387da5d2561b090a9cbdd3631595 SHA1 186f75df222e8f45c1255c9fd72fddf30c60d10c SHA256 c3ae02fe3ad5ec5400672b13e921a53d52b095078eea3b352e99c0109d362c03
+MISC ChangeLog 1310 RMD160 9527d9d80f003b1d4d648bb59988a2327de55d97 SHA1 d5a78746bdfba2e30a9ba895ccafb828a0c4823d SHA256 8e2c105b70d133ea8d6ba828e941466a784c2534c825d05df5f3f0c6f7e09f1e
 MISC metadata.xml 247 RMD160 f701117ab0c6a173f3023786f1aea56dcfa6044a SHA1 45298f613f70ba5f592ebe47c9dcd61027e4f824 SHA256 b6c61278f07fe703c39c69a96922075bf6cd3251efc4d63d9ab1dae0d401ad36

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 (file)
index 0000000..4bef9d6
--- /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 bdf436d332eb605d14f7c1fd3e6e10ac07227325..38c1c6b806fb73ae3f205c9128e5cc56445ec90a 100644 (file)
--- 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