From 48d5e8acc1095a28b92f26f82ef19f3807bf15d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sun, 31 Jul 2011 20:21:12 +0000 Subject: [PATCH] Fix building of tests, but restrict them anyway, see bug 366505 Package-Manager: portage-2.1.10.8/cvs/Linux x86_64 --- media-gfx/digikam/ChangeLog | 6 ++- media-gfx/digikam/Manifest | 31 +++++++------- media-gfx/digikam/digikam-2.0.0.ebuild | 9 +++- .../digikam/files/digikam-2.0.0-tests-1.patch | 41 +++++++++++++++++++ 4 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 media-gfx/digikam/files/digikam-2.0.0-tests-1.patch diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index edd01068802d..f1a695be1d8f 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/digikam # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.190 2011/07/29 19:28:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.191 2011/07/31 20:21:12 dilfridge Exp $ + + 31 Jul 2011; Andreas K. Huettel digikam-2.0.0.ebuild, + +files/digikam-2.0.0-tests-1.patch: + Fix building of tests, but restrict them anyway, see bug 366505 *digikam-2.0.0 (29 Jul 2011) diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 0df8cd273ec9..8f8de319276b 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -6,28 +6,29 @@ AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11b AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c87868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8 AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc +AUX digikam-2.0.0-tests-1.patch 1880 RMD160 8961d7cd5cc31469da1e0d338f05b56c0c90f43d SHA1 f52a04eb8fc4288cbadf6c975622af0cffbf8776 SHA256 ca07b4ce9651386f7355007a4c02727b0097962f2664a2a2b20c7208fdc01bc2 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2 EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75 -EBUILD digikam-2.0.0.ebuild 3613 RMD160 6bd78e6877402a39bcb4e4a578ae23633c8afce2 SHA1 2130c990f18079cda92f078e07df39af759b41cf SHA256 22d3411ccf4e4fe75956d565516556862b926a6f92fac2d958b6ff9c254ccb9b -MISC ChangeLog 31990 RMD160 ad94204b78a268b97b2d76d06e7579c5549d9560 SHA1 044b78493eb66c2d999a8ade4d72e36b6c13b992 SHA256 77f89b15401eb4b9d6bde0670bf38beea3bd29c0d482eee0f10b9fea8b433e4a +EBUILD digikam-2.0.0.ebuild 3688 RMD160 478c7fc9e93324451613645fd4d3a557f480bcc7 SHA1 5d3e31c6efff9c0bcf82167699d297ea9f6beb77 SHA256 65b3186f55a12a0b4487cbd4d2709bfb295479979d4dcb67d635631911f34836 +MISC ChangeLog 32174 RMD160 48c581073b9288ab98dc7c019e7a60637f46bf8e SHA1 10848b0ccaef394a7f2ab8d8485474ff11350a11 SHA256 b0905fa51257f3f0bac8e39b4cc9c67b034beeaab5eb296e1fdbfcde56cfb09c MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOMwn2AAoJENwGBM22xffeDf4P+gIb6Z5bZBaCzzt3DzKb7Avi -3MnpIsiDTVWfaSJ+LtQGjFIzwilessjyX3/1M9Vr+aWdB81WMIT0KbztWdC10hgV -vL11Lzj2elB1cwDdZZC9cRzW9JuZ/NFwfMYf1V5DqYw7vrTN/b7nCZrNjNm3staC -jwO/HhWKzLu7npcy/+gijcvNWlZh/uRlsB0qLNdFn7cwgNJwBEHUNnWmCa8z87K0 -EmEaUdfyd67299O3rfYLGp/yYpRXmFka5wZyh7wKM+WwvQN1GbCZFP8AiahhkoEw -seKVVdy+0/2E7HC+0oSMLNDuwFddaClOB4tiTSVgQHm2Eb1LIKIXCxzM4gPrhs3Y -t1Xs1awFj/5s0xEcuOQqWcURlbVGlnzvvecJBP20dYws/O3MS4PoP1BIicSjD1fE -R6Z8Xi22XGjvxZ6JFU5XSrxFFFRaSdnY54IfNG8GFjjN6hwFDfwB865Oz051XcmA -qi1PU67WMvDMYqVLu3P5cfTixJQIvDgBXTB9QcQorqFKCqb4g2KZz8+y3DdeNsb9 -dUlgv/1MHdb6MIw+MmI8rFhOQCc0+KyXxPc7WmU4f7C5LYS+DTEmh78gNOe9m9Sz -R06zBSAk1k261gh0qp22IoKZSgzzpge3HH3BuszjP8DV4y9UxEKo/L5G3/YwsimI -1iGW+iPfFLXQGS+fwpjS -=nKsG +iQIcBAEBCgAGBQJONblIAAoJENwGBM22xffeyY8P+wXPgulKcb1yMeZYscMx/Wbt +pwiEilUu/+pJDqp6iFBURYN7SqMRTQsIB+wjf1UoIQ2Ow081YxRDtmu386NJ/Yul +7O8yGyAv+70aJ0oVhqvCK+6FgAGJr+mpRZ6mMlZKTHjLxDJrPuRBNztagLNyZnOC +PEgaz4I+Kn70XosqKXD/XLrUuqNdeyCi1XjDw5Yi5qdQE4cNvLQxhigGUgGRiv5X +AEgG3my1Xdy5sPQn4G3vKgposKFF0u/lug1obC0RIN9kKhWhlCmPrFgxIL1Rf52y +hhvaM7kEhM4lPyptjy14yYFbMtAjaHDuSfMaYvJDA4F4VgXv3hkYZog3HifZOSN3 +/c/3L8/nhjG4rwQXXU6812AfeceKzc+ISXViqsyBsJVdFis/4f133rR7CVSmSgcM +jloMSJ+BweKZrUt+1wWfIiqq/5wFgY87ny0x5snLOVTTC+Q8BEpr1NLFMGo8ERpP +JAYP1ShLp8l6zWzCfn4aEsurrWXzKXNTMTokjnAqAChU2iXYl/+n9cBU4VhEyuf9 +s+NO0pMD8i3NAoIpdmNiHFUTEkQSEjP+40Fi5GI4Y3ceM6iu9XaocJiYVn4Ik4f3 +koP18zhPcP0XI8KRjCKqiGjqGUeu8H2EOtOdnBw8DKu8H6iWHXFEGi5cT7MA4wk9 +1YUQnqs/GFXuL7f35I6D +=PyYm -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-2.0.0.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild index 1cae284751fd..12e64ffba5f0 100644 --- a/media-gfx/digikam/digikam-2.0.0.ebuild +++ b/media-gfx/digikam/digikam-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0.ebuild,v 1.1 2011/07/29 19:28:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0.ebuild,v 1.2 2011/07/31 20:21:12 dilfridge Exp $ EAPI=4 @@ -68,6 +68,13 @@ DEPEND="${CDEPEND} S="${WORKDIR}/${MY_P}/core" +PATCHES=( + "${FILESDIR}/${P}-tests-1.patch" +) + +RESTRICT=test +# bug 366505 + src_prepare() { # just to make absolutely sure rm -rf "${WORKDIR}/${MY_P}/extra" || die diff --git a/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch b/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch new file mode 100644 index 000000000000..298ce901ada8 --- /dev/null +++ b/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch @@ -0,0 +1,41 @@ +diff -ruN digikam-2.0.0.orig/core/tests/CMakeLists.txt digikam-2.0.0/core/tests/CMakeLists.txt +--- digikam-2.0.0.orig/core/tests/CMakeLists.txt 2011-07-28 01:28:08.000000000 +0200 ++++ digikam-2.0.0/core/tests/CMakeLists.txt 2011-07-31 21:47:05.000000000 +0200 +@@ -223,9 +223,13 @@ + + #------------------------------------------------------------------------ + +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio +- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf +- ) ++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio) ++ ++IF(PGF_FOUND) ++ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) ++ELSE(PGF_FOUND) ++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf) ++ENDIF(PGF_FOUND) + + # Disable libpgf warnings. + SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") +@@ -233,11 +237,20 @@ + SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) + KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS}) + TARGET_LINK_LIBRARIES(qtpgftest ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++IF(PGF_FOUND) ++ TARGET_LINK_LIBRARIES(qtpgftest ${PGF_LIBRARIES}) ++ENDIF(PGF_FOUND) + + SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) + KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS}) + TARGET_LINK_LIBRARIES(pgfscaled ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++IF(PGF_FOUND) ++ TARGET_LINK_LIBRARIES(pgfscaled ${PGF_LIBRARIES}) ++ENDIF(PGF_FOUND) + + SET(loadpgfdata_SRCS loadpgfdata.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) + KDE4_ADD_EXECUTABLE(loadpgfdata NOGUI ${loadpgfdata_SRCS}) + TARGET_LINK_LIBRARIES(loadpgfdata ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++IF(PGF_FOUND) ++ TARGET_LINK_LIBRARIES(loadpgfdata ${PGF_LIBRARIES}) ++ENDIF(PGF_FOUND) -- 2.26.2