diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-01-23 18:07:19 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-01-23 18:07:19 +0000 |
| commit | 2afb9dfff5114c1d43db6ddef59648f4e11b6820 (patch) | |
| tree | feb9ecd109edbb7366975c71b8645d7e6ac16880 /app-office | |
| parent | Revision bump using new Debian patchset (diff) | |
| download | gentoo-2-2afb9dfff5114c1d43db6ddef59648f4e11b6820.tar.gz gentoo-2-2afb9dfff5114c1d43db6ddef59648f4e11b6820.tar.bz2 gentoo-2-2afb9dfff5114c1d43db6ddef59648f4e11b6820.zip | |
Fix linkage against X11 libs, bug 352425
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/krita/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/krita/files/krita-2.3.1-linkx11.patch | 14 | ||||
| -rw-r--r-- | app-office/krita/krita-2.3.1.ebuild | 4 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog index 6032c44135a2..8cb4b1f2653f 100644 --- a/app-office/krita/ChangeLog +++ b/app-office/krita/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/krita # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.127 2011/01/20 00:09:09 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.128 2011/01/23 18:07:19 dilfridge Exp $ + + 23 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org> krita-2.3.1.ebuild, + +files/krita-2.3.1-linkx11.patch: + Fix linkage against X11 libs, bug 352425 *krita-2.3.1 (19 Jan 2011) diff --git a/app-office/krita/files/krita-2.3.1-linkx11.patch b/app-office/krita/files/krita-2.3.1-linkx11.patch new file mode 100644 index 000000000000..3ec09f54e16f --- /dev/null +++ b/app-office/krita/files/krita-2.3.1-linkx11.patch @@ -0,0 +1,14 @@ +diff -ruN krita-2.3.1.orig/krita/ui/CMakeLists.txt krita-2.3.1/krita/ui/CMakeLists.txt +--- krita-2.3.1.orig/krita/ui/CMakeLists.txt 2011-01-15 21:07:11.000000000 +0100 ++++ krita-2.3.1/krita/ui/CMakeLists.txt 2011-01-23 18:56:56.824000099 +0100 +@@ -216,6 +216,10 @@ + + target_link_libraries(kritaui ${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain kowidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}) + ++IF(Q_WS_X11) ++ TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES}) ++ENDIF(Q_WS_X11) ++ + if(HAVE_OPENGL) + target_link_libraries(kritaui ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENEXR_LIBRARIES}) + set (GL_INTERFACE_LIBRARIES ";${OPENGL_LIBRARIES};${QT_QTOPENGL_LIBRARY}") diff --git a/app-office/krita/krita-2.3.1.ebuild b/app-office/krita/krita-2.3.1.ebuild index 5f4f32c9241d..71d969337ed0 100644 --- a/app-office/krita/krita-2.3.1.ebuild +++ b/app-office/krita/krita-2.3.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/app-office/krita/krita-2.3.1.ebuild,v 1.1 2011/01/20 00:09:09 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.3.1.ebuild,v 1.2 2011/01/23 18:07:19 dilfridge Exp $ EAPI=3 @@ -35,6 +35,8 @@ KMEXTRACTONLY=" KMLOADLIBS="koffice-libs" +PATCHES=( "${FILESDIR}/${P}"-linkx11.patch ) + src_configure() { mycmakeargs=( -DWITH_Eigen2=ON |