diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-25 17:03:28 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-25 17:03:28 +0000 |
commit | 2669e1078dc0a2a7bcc37b90c1500fa579392990 (patch) | |
tree | 383c297ff58737a0ab6632c9ed4d4c873d2a5cc7 /kde-base/liboxygenstyle | |
parent | version bump, minor bug fixes/improvements (diff) | |
download | gentoo-2-2669e1078dc0a2a7bcc37b90c1500fa579392990.tar.gz gentoo-2-2669e1078dc0a2a7bcc37b90c1500fa579392990.tar.bz2 gentoo-2-2669e1078dc0a2a7bcc37b90c1500fa579392990.zip |
Fix kdeenablefinal build, bug 395993
(Portage version: 2.1.10.41/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base/liboxygenstyle')
-rw-r--r-- | kde-base/liboxygenstyle/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch | 9 | ||||
-rw-r--r-- | kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/kde-base/liboxygenstyle/ChangeLog b/kde-base/liboxygenstyle/ChangeLog index 23ad74d4e908..33e10ac430d9 100644 --- a/kde-base/liboxygenstyle/ChangeLog +++ b/kde-base/liboxygenstyle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/liboxygenstyle # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.36 2011/12/18 19:46:39 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.37 2011/12/25 17:03:27 dilfridge Exp $ + + 25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> + liboxygenstyle-4.7.4.ebuild, +files/liboxygenstyle-4.7.4-enablefinal.patch: + Fix kdeenablefinal build, bug 395993 18 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> -liboxygenstyle-4.6.5.ebuild: diff --git a/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch new file mode 100644 index 000000000000..369924858e20 --- /dev/null +++ b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch @@ -0,0 +1,9 @@ +diff -U2 -rxi kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp +--- kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp 2011-10-28 09:42:34.000000000 +0200 ++++ kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp 2011-12-25 13:39:03.487455177 +0100 +@@ -37,4 +37,5 @@ + #include <X11/Xlib.h> + #include <X11/Xatom.h> ++#include <fixx11h.h> + #endif + diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild index 5125ef509999..777b98fb7fcf 100644 --- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild +++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.1 2011/12/11 18:52:24 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.2 2011/12/25 17:03:27 dilfridge Exp $ EAPI=4 @@ -11,3 +11,5 @@ inherit kde4-meta DESCRIPTION="Library to support the Oxygen style in KDE" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" + +PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" ) |