public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/liboxygenstyle/files/, kde-base/liboxygenstyle/
Date: Sun, 25 Dec 2011 17:07:32 +0000 (UTC)	[thread overview]
Message-ID: <6755710ef0ba63442cf624e5296e978b2ac6e8fb.dilfridge@gentoo> (raw)

commit:     6755710ef0ba63442cf624e5296e978b2ac6e8fb
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 17:08:22 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 17:08:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6755710e

[kde-base/liboxygenstyle] Fix kdeenablefinal build, bug 395993

(Portage version: 2.1.10.41/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/liboxygenstyle-4.7.4-enablefinal.patch   |    9 +++++++++
 .../liboxygenstyle-4.7.49.9999.ebuild              |    2 ++
 .../liboxygenstyle/liboxygenstyle-4.7.95.ebuild    |    2 ++
 .../liboxygenstyle-4.8.49.9999.ebuild              |    2 ++
 kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild |    2 ++
 5 files changed, 17 insertions(+), 0 deletions(-)

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 0000000..3699248
--- /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.49.9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.49.9999.ebuild
index 37bd8a7..a4ec4b1 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.49.9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.49.9999.ebuild
@@ -11,3 +11,5 @@ inherit kde4-meta
 DESCRIPTION="Library to support the Oxygen style in KDE"
 KEYWORDS=""
 IUSE="debug"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild
index 9328653..476ac86 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.95.ebuild
@@ -11,3 +11,5 @@ inherit kde4-meta
 DESCRIPTION="Library to support the Oxygen style in KDE"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild
index 37bd8a7..a4ec4b1 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.8.49.9999.ebuild
@@ -11,3 +11,5 @@ inherit kde4-meta
 DESCRIPTION="Library to support the Oxygen style in KDE"
 KEYWORDS=""
 IUSE="debug"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
index 37bd8a7..a4ec4b1 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
@@ -11,3 +11,5 @@ inherit kde4-meta
 DESCRIPTION="Library to support the Oxygen style in KDE"
 KEYWORDS=""
 IUSE="debug"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" )



             reply	other threads:[~2011-12-25 17:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-25 17:07 Andreas Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-01-17 10:11 [gentoo-commits] proj/kde:master commit in: kde-base/liboxygenstyle/files/, kde-base/liboxygenstyle/ Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6755710ef0ba63442cf624e5296e978b2ac6e8fb.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox