Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/krita/files: krita-2.3.1-linkx11.patch
Date: Sun, 23 Jan 2011 18:07:29
Message-Id: 20110123180719.9093520054@flycatcher.gentoo.org
1 dilfridge 11/01/23 18:07:19
2
3 Added: krita-2.3.1-linkx11.patch
4 Log:
5 Fix linkage against X11 libs, bug 352425
6
7 (Portage version: 2.1.9.35/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-office/krita/files/krita-2.3.1-linkx11.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/krita/files/krita-2.3.1-linkx11.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/krita/files/krita-2.3.1-linkx11.patch?rev=1.1&content-type=text/plain
14
15 Index: krita-2.3.1-linkx11.patch
16 ===================================================================
17 diff -ruN krita-2.3.1.orig/krita/ui/CMakeLists.txt krita-2.3.1/krita/ui/CMakeLists.txt
18 --- krita-2.3.1.orig/krita/ui/CMakeLists.txt 2011-01-15 21:07:11.000000000 +0100
19 +++ krita-2.3.1/krita/ui/CMakeLists.txt 2011-01-23 18:56:56.824000099 +0100
20 @@ -216,6 +216,10 @@
21
22 target_link_libraries(kritaui ${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain kowidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})
23
24 +IF(Q_WS_X11)
25 + TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES})
26 +ENDIF(Q_WS_X11)
27 +
28 if(HAVE_OPENGL)
29 target_link_libraries(kritaui ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENEXR_LIBRARIES})
30 set (GL_INTERFACE_LIBRARIES ";${OPENGL_LIBRARIES};${QT_QTOPENGL_LIBRARY}")