diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-07-16 13:30:17 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-07-16 13:30:17 +0000 |
| commit | a8b7cf25f3179f9701d2215f7784d4f08f38c5fc (patch) | |
| tree | a8835eef604e690099fc5f4ecf793225898a7710 | |
| parent | Depend on unbundled ssm (diff) | |
| download | gentoo-2-a8b7cf25f3179f9701d2215f7784d4f08f38c5fc.tar.gz gentoo-2-a8b7cf25f3179f9701d2215f7784d4f08f38c5fc.tar.bz2 gentoo-2-a8b7cf25f3179f9701d2215f7784d4f08f38c5fc.zip | |
Drop obsolete patch that caused build failure, bug #375363.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
| -rw-r--r-- | www-plugins/lightspark/ChangeLog | 6 | ||||
| -rw-r--r-- | www-plugins/lightspark/files/lightspark-0.4.8.1-cmakelists.patch | 30 | ||||
| -rw-r--r-- | www-plugins/lightspark/lightspark-0.4.8.1.ebuild | 3 |
3 files changed, 6 insertions, 33 deletions
diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog index d97dad09bfce..85d267161a29 100644 --- a/www-plugins/lightspark/ChangeLog +++ b/www-plugins/lightspark/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-plugins/lightspark # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.31 2011/06/15 13:16:55 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.32 2011/07/16 13:30:16 chithanh Exp $ + + 16 Jul 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + lightspark-0.4.8.1.ebuild, -files/lightspark-0.4.8.1-cmakelists.patch: + Drop obsolete patch that caused build failure, bug #375363. *lightspark-0.4.8.1 (15 Jun 2011) diff --git a/www-plugins/lightspark/files/lightspark-0.4.8.1-cmakelists.patch b/www-plugins/lightspark/files/lightspark-0.4.8.1-cmakelists.patch deleted file mode 100644 index 373bff9d7fd0..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.4.8.1-cmakelists.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2011-05-27 14:02:19.000000000 +0200 -+++ b/src/CMakeLists.txt 2011-06-15 15:05:03.274733225 +0200 -@@ -101,7 +101,7 @@ - ${Boost_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} - ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${JPEG_LIBRARIES} - ${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRE_LIBRARIES} -- ${Threads_LIBRARIES} ${XMLPP_LIBRARIES} ${CMAKE_DL_LIBS}) -+ ${Threads_LIBRARIES} ${XMLPP_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_MODULE_LINKER_FLAGS}) - SET_TARGET_PROPERTIES(spark PROPERTIES VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") - SET_TARGET_PROPERTIES(spark PROPERTIES SOVERSION "${MAJOR_VERSION}.${MINOR_VERSION}") - -@@ -113,7 +113,7 @@ - IF(COMPILE_LIGHTSPARK) - ADD_EXECUTABLE(lightspark main.cpp) - TARGET_LINK_LIBRARIES(lightspark spark) -- TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${Boost_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_MODULE_LINKER_FLAGS}) - - IF(UNIX) - INSTALL(FILES ${PROJECT_SOURCE_DIR}/src/lightspark.frag DESTINATION ${DATADIR}/lightspark) -@@ -128,7 +128,7 @@ - IF(COMPILE_TIGHTSPARK) - ADD_EXECUTABLE(tightspark tightspark.cpp) - TARGET_LINK_LIBRARIES(tightspark spark) -- TARGET_LINK_LIBRARIES(tightspark ${Boost_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(tightspark ${Boost_LIBRARIES} ${CMAKE_MODULE_LINKER_FLAGS}) - - IF(UNIX) - INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR}) diff --git a/www-plugins/lightspark/lightspark-0.4.8.1.ebuild b/www-plugins/lightspark/lightspark-0.4.8.1.ebuild index 118919337aaf..0ff04ede2b6a 100644 --- a/www-plugins/lightspark/lightspark-0.4.8.1.ebuild +++ b/www-plugins/lightspark/lightspark-0.4.8.1.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/www-plugins/lightspark/lightspark-0.4.8.1.ebuild,v 1.1 2011/06/15 13:16:55 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.8.1.ebuild,v 1.2 2011/07/16 13:30:16 chithanh Exp $ EAPI=3 inherit cmake-utils nsplugins multilib versionator @@ -44,7 +44,6 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P/_rc*/} PATCHES=( - "${FILESDIR}"/${PN}-0.4.8.1-cmakelists.patch "${FILESDIR}"/${PN}-0.4.8.1-allow-disabling-pulseaudio.patch ) |