Gentoo Archives: gentoo-commits

From: "Michael Palimaka (kensington)" <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/kpovmodeler/files: kpovmodeler-1.1.3-desktop.patch kpovmodeler-1.1.3-freetype-include.patch kpovmodeler-1.1.3-underlinking.patch
Date: Mon, 03 Jun 2013 17:12:29
Message-Id: 20130603171223.6A8FB2171E@flycatcher.gentoo.org
1 kensington 13/06/03 17:12:23
2
3 Modified: kpovmodeler-1.1.3-underlinking.patch
4 Added: kpovmodeler-1.1.3-desktop.patch
5 kpovmodeler-1.1.3-freetype-include.patch
6 Log:
7 Migrate to EAPI 5. Add missing dependencies. Fix .desktop validation. Improve underlinking patch. Fix build failure with freetype wrt bug #467998.
8
9 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
10
11 Revision Changes Path
12 1.2 media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch?r1=1.1&r2=1.2
17
18 Index: kpovmodeler-1.1.3-underlinking.patch
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- kpovmodeler-1.1.3-underlinking.patch 6 Aug 2011 20:42:29 -0000 1.1
25 +++ kpovmodeler-1.1.3-underlinking.patch 3 Jun 2013 17:12:23 -0000 1.2
26 @@ -6,7 +6,7 @@
27 kde4_add_executable(kpovmodeler ${kpovmodeler_SRCS})
28
29 -target_link_libraries(kpovmodeler ${KDE4_KDECORE_LIBS} lkpovmodeler )
30 -+target_link_libraries(kpovmodeler ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} lkpovmodeler )
31 ++target_link_libraries(kpovmodeler ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} lkpovmodeler )
32
33 install(TARGETS kpovmodeler ${INSTALL_TARGETS_DEFAULT_ARGS} )
34
35
36
37
38 1.1 media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch?rev=1.1&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch?rev=1.1&content-type=text/plain
42
43 Index: kpovmodeler-1.1.3-desktop.patch
44 ===================================================================
45 Remove deprecated/useless entries causing validation warnings.
46
47 --- kpovmodeler.desktop
48 +++ kpovmodeler.desktop
49 @@ -49,12 +49,8 @@
50 GenericName[tr]=Povray Modelleyici
51 GenericName[x-test]=xxPovray Modelerxx
52 GenericName[zh_HK]=Povray 建模器
53 -Path=
54 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KPovModeler/Document
55 -SwallowExec=
56 -SwallowTitle=
57 Terminal=false
58 Type=Application
59 X-KDE-Library=libkpovmodelerpart
60 Categories=Qt;KDE;Graphics;
61 -Encoding=UTF-8
62
63
64
65 1.1 media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch?rev=1.1&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch?rev=1.1&content-type=text/plain
69
70 Index: kpovmodeler-1.1.3-freetype-include.patch
71 ===================================================================
72 Use the correct freetype include directory to avoid a build failure.
73
74 Gentoo bug #467998.
75
76 --- CMakeLists.txt
77 +++ CMakeLists.txt
78 @@ -11,7 +11,7 @@
79
80 configure_file(config-kpovmodeler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kpovmodeler.h )
81
82 -include_directories(${FREETYPE_INCLUDE_DIR})
83 +include_directories(${FREETYPE_INCLUDE_DIRS})
84 add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
85
86 ########### next target ###############