diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-21 20:11:00 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-21 20:11:00 +0000 |
| commit | eac01fa7bdfa4560c080f23d007f39f282f4e935 (patch) | |
| tree | 7f0f24140ecd62742a4edf972bc78df84150f257 /media-libs | |
| parent | Seems like git was bit different, fix not applying patch. (diff) | |
| download | gentoo-2-eac01fa7bdfa4560c080f23d007f39f282f4e935.tar.gz gentoo-2-eac01fa7bdfa4560c080f23d007f39f282f4e935.tar.bz2 gentoo-2-eac01fa7bdfa4560c080f23d007f39f282f4e935.zip | |
Fix one more multilib issue and revbump for it.
(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libprojectm-qt/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch | 13 | ||||
| -rw-r--r-- | media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild (renamed from media-libs/libprojectm-qt/libprojectm-qt-2.1.0.ebuild) | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/media-libs/libprojectm-qt/ChangeLog b/media-libs/libprojectm-qt/ChangeLog index 14e1dc3af334..53289a1aff69 100644 --- a/media-libs/libprojectm-qt/ChangeLog +++ b/media-libs/libprojectm-qt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/libprojectm-qt # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm-qt/ChangeLog,v 1.13 2013/01/21 19:52:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm-qt/ChangeLog,v 1.14 2013/01/21 20:11:00 scarabeus Exp $ + +*libprojectm-qt-2.1.0-r1 (21 Jan 2013) + + 21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> + +libprojectm-qt-2.1.0-r1.ebuild, -libprojectm-qt-2.1.0.ebuild, + files/libprojectm-qt-2.1.0-multilib.patch: + Fix one more multilib issue and revbump for it. 21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> -libprojectm-qt-1.2.0.ebuild, libprojectm-qt-2.1.0.ebuild: diff --git a/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch b/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch index c1db9af17483..99c5b25068cf 100644 --- a/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch +++ b/media-libs/libprojectm-qt/files/libprojectm-qt-2.1.0-multilib.patch @@ -1,8 +1,8 @@ -Index: projectM-qt-2.1.0-Source/CMakeLists.txt -=================================================================== ---- projectM-qt-2.1.0-Source.orig/CMakeLists.txt -+++ projectM-qt-2.1.0-Source/CMakeLists.txt -@@ -131,8 +131,8 @@ include_directories(${PROJECTM_INCLUDE} +diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt +index 750d1ed..ed14840 100644 +--- a/src/projectM-qt/CMakeLists.txt ++++ b/src/projectM-qt/CMakeLists.txt +@@ -131,6 +131,6 @@ include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES}) install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt) @@ -11,5 +11,4 @@ Index: projectM-qt-2.1.0-Source/CMakeLists.txt +install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX}) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig) install(FILES "images/icons/prjm16-transparent.svg" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) - - MESSAGE(STATUS "<<< Gentoo configuration >>> + diff --git a/media-libs/libprojectm-qt/libprojectm-qt-2.1.0.ebuild b/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild index 57d88d51bd38..4c53937d3a5a 100644 --- a/media-libs/libprojectm-qt/libprojectm-qt-2.1.0.ebuild +++ b/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm-qt/libprojectm-qt-2.1.0.ebuild,v 1.2 2013/01/21 19:52:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm-qt/libprojectm-qt-2.1.0-r1.ebuild,v 1.1 2013/01/21 20:11:00 scarabeus Exp $ EAPI=5 |