diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2010-11-04 10:19:34 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2010-11-04 10:19:34 +0000 |
| commit | 5730e10bab723da9f44cf226ac9c8aa0893de6f5 (patch) | |
| tree | e6d6623dfcd58735ca25e55c9751ed2638db493d /app-office/krita | |
| parent | Version bump. (diff) | |
| download | gentoo-2-5730e10bab723da9f44cf226ac9c8aa0893de6f5.tar.gz gentoo-2-5730e10bab723da9f44cf226ac9c8aa0893de6f5.tar.bz2 gentoo-2-5730e10bab723da9f44cf226ac9c8aa0893de6f5.zip | |
Added patch to fix x11 linkage (needed only on x86???), fixes bug 343283
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'app-office/krita')
| -rw-r--r-- | app-office/krita/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/krita/files/krita-2.2.2-xlibs.patch | 14 | ||||
| -rw-r--r-- | app-office/krita/krita-2.2.2.ebuild | 4 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog index 4f066fedd95e..84b17eb1e34c 100644 --- a/app-office/krita/ChangeLog +++ b/app-office/krita/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/krita # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.120 2010/10/29 20:56:48 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.121 2010/11/04 10:19:34 dilfridge Exp $ + + 04 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org> krita-2.2.2.ebuild, + +files/krita-2.2.2-xlibs.patch: + Added patch to fix x11 linkage (needed only on x86???), fixes bug 343283 29 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml: Added myself to maintainers diff --git a/app-office/krita/files/krita-2.2.2-xlibs.patch b/app-office/krita/files/krita-2.2.2-xlibs.patch new file mode 100644 index 000000000000..24b626905e79 --- /dev/null +++ b/app-office/krita/files/krita-2.2.2-xlibs.patch @@ -0,0 +1,14 @@ +diff -urN krita-2.2.2.vanilla/krita/ui/CMakeLists.txt krita-2.2.2/krita/ui/CMakeLists.txt +--- krita-2.2.2.vanilla/krita/ui/CMakeLists.txt 2010-08-21 07:38:52.000000000 +0200 ++++ krita-2.2.2/krita/ui/CMakeLists.txt 2010-11-03 23:43:28.000000000 +0100 +@@ -217,6 +217,10 @@ + + target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage komain ${GL_INTERFACE_LIBRARIES} ) + ++IF(Q_WS_X11) ++ TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES}) ++ENDIF(Q_WS_X11) ++ + set_target_properties(kritaui + PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} + ) diff --git a/app-office/krita/krita-2.2.2.ebuild b/app-office/krita/krita-2.2.2.ebuild index ae851facdc09..f0ed2c859f8f 100644 --- a/app-office/krita/krita-2.2.2.ebuild +++ b/app-office/krita/krita-2.2.2.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/app-office/krita/krita-2.2.2.ebuild,v 1.2 2010/10/15 21:49:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.2.2.ebuild,v 1.3 2010/11/04 10:19:34 dilfridge Exp $ EAPI="2" @@ -26,6 +26,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-xlibs.patch" ) + KMEXTRACTONLY="libs/" KMLOADLIBS="koffice-libs" |