Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/liboxygenstyle/files/, kde-base/liboxygenstyle/
Date: Sun, 25 Dec 2011 17:07:42
Message-Id: 6755710ef0ba63442cf624e5296e978b2ac6e8fb.dilfridge@gentoo
1 commit: 6755710ef0ba63442cf624e5296e978b2ac6e8fb
2 Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 25 17:08:22 2011 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 25 17:08:22 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6755710e
7
8 [kde-base/liboxygenstyle] Fix kdeenablefinal build, bug 395993
9
10 (Portage version: 2.1.10.41/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 .../files/liboxygenstyle-4.7.4-enablefinal.patch | 9 +++++++++
14 .../liboxygenstyle-4.7.49.9999.ebuild | 2 ++
15 .../liboxygenstyle/liboxygenstyle-4.7.95.ebuild | 2 ++
16 .../liboxygenstyle-4.8.49.9999.ebuild | 2 ++
17 kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild | 2 ++
18 5 files changed, 17 insertions(+), 0 deletions(-)
19
20 diff --git a/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch
21 new file mode 100644
22 index 0000000..3699248
23 --- /dev/null
24 +++ b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch
25 @@ -0,0 +1,9 @@
26 +diff -U2 -rxi kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp
27 +--- kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp 2011-10-28 09:42:34.000000000 +0200
28 ++++ kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp 2011-12-25 13:39:03.487455177 +0100
29 +@@ -37,4 +37,5 @@
30 + #include <X11/Xlib.h>
31 + #include <X11/Xatom.h>
32 ++#include <fixx11h.h>
33 + #endif
34 +
35
36 diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.49.9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.49.9999.ebuild
37 index 37bd8a7..a4ec4b1 100644
38 --- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.49.9999.ebuild
39 +++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.49.9999.ebuild
40 @@ -11,3 +11,5 @@ inherit kde4-meta
41 DESCRIPTION="Library to support the Oxygen style in KDE"
42 KEYWORDS=""
43 IUSE="debug"
44 +
45 +PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )
46
47 diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild
48 index 9328653..476ac86 100644
49 --- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild
50 +++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild
51 @@ -11,3 +11,5 @@ inherit kde4-meta
52 DESCRIPTION="Library to support the Oxygen style in KDE"
53 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
54 IUSE="debug"
55 +
56 +PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )
57
58 diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild
59 index 37bd8a7..a4ec4b1 100644
60 --- a/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild
61 +++ b/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild
62 @@ -11,3 +11,5 @@ inherit kde4-meta
63 DESCRIPTION="Library to support the Oxygen style in KDE"
64 KEYWORDS=""
65 IUSE="debug"
66 +
67 +PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )
68
69 diff --git a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
70 index 37bd8a7..a4ec4b1 100644
71 --- a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
72 +++ b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
73 @@ -11,3 +11,5 @@ inherit kde4-meta
74 DESCRIPTION="Library to support the Oxygen style in KDE"
75 KEYWORDS=""
76 IUSE="debug"
77 +
78 +PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )