1 |
yngwin 13/11/04 04:51:59 |
2 |
|
3 |
Added: qtcurve_kwin_automagic_fix.patch |
4 |
Log: |
5 |
Move stable qtcurve-qt4 here to complete the move |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x2B2474AD43CE296E!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-themes/qtcurve/files/qtcurve_kwin_automagic_fix.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/files/qtcurve_kwin_automagic_fix.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/qtcurve/files/qtcurve_kwin_automagic_fix.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: qtcurve_kwin_automagic_fix.patch |
16 |
=================================================================== |
17 |
diff -u -r QtCurve-KDE4-1.6.4-old/CMakeLists.txt QtCurve-KDE4-1.6.4/CMakeLists.txt |
18 |
--- QtCurve-KDE4-1.6.4-old/CMakeLists.txt 2010-10-19 12:24:18.725632000 +0300 |
19 |
+++ QtCurve-KDE4-1.6.4/CMakeLists.txt 2010-10-19 12:26:30.469632000 +0300 |
20 |
@@ -88,14 +88,16 @@ |
21 |
add_subdirectory(colors) |
22 |
add_subdirectory(po) |
23 |
|
24 |
- find_file(KWINGLOBALS_H kwinglobals.h ${KDE4_INCLUDES}) # kwinglobals.h is new for KDE4 |
25 |
+ if (QTC_KWIN) |
26 |
+ find_file(KWINGLOBALS_H kwinglobals.h ${KDE4_INCLUDES}) # kwinglobals.h is new for KDE4 |
27 |
|
28 |
- if (KWINGLOBALS_H) |
29 |
- add_subdirectory(kwin) |
30 |
- add_subdirectory(kwinconfig) |
31 |
- else (KWINGLOBALS_H) |
32 |
- message("** KWin headers not found - KWin decoration will not be built") |
33 |
- endif (KWINGLOBALS_H) |
34 |
+ if (KWINGLOBALS_H) |
35 |
+ add_subdirectory(kwin) |
36 |
+ add_subdirectory(kwinconfig) |
37 |
+ else (KWINGLOBALS_H) |
38 |
+ message("** KWin headers not found - KWin decoration will not be built") |
39 |
+ endif (KWINGLOBALS_H) |
40 |
+ endif (QTC_KWIN) |
41 |
else (NOT QTC_QT_ONLY) |
42 |
set(CMAKE_INSTALL_PREFIX ${OLD_CMAKE_INSTALL_PREFIX}) |
43 |
add_definitions(${QT_DEFINITIONS}) |
44 |
diff -u -r QtCurve-KDE4-1.6.4-old/config.h.cmake QtCurve-KDE4-1.6.4/config.h.cmake |
45 |
--- QtCurve-KDE4-1.6.4-old/config.h.cmake 2010-10-19 12:24:18.725632000 +0300 |
46 |
+++ QtCurve-KDE4-1.6.4/config.h.cmake 2010-10-19 12:24:42.264632000 +0300 |
47 |
@@ -6,6 +6,7 @@ |
48 |
#define KDE4PREFIX "@KDE4PREFIX@" |
49 |
|
50 |
#cmakedefine QTC_QT_ONLY |
51 |
+#cmakedefine QTC_KWIN |
52 |
#cmakedefine QTC_OLD_NVIDIA_ARROW_FIX |
53 |
#cmakedefine QTC_STYLE_SUPPORT |
54 |
#cmakedefine QTC_KWIN_MAX_BUTTON_HACK |