summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2013-03-15 23:04:40 +0000
committerChris Reffett <creffett@gentoo.org>2013-03-15 23:04:40 +0000
commit6744a16545e12e9525181abc43cd748fdc2633fd (patch)
treee3571c8859964d29d5347916e07e2bf1e2f156fe /kde-base
parentdefault to EHG_QUIET="OFF" (bug #461858) (diff)
downloadgentoo-2-6744a16545e12e9525181abc43cd748fdc2633fd.tar.gz
gentoo-2-6744a16545e12e9525181abc43cd748fdc2633fd.tar.bz2
gentoo-2-6744a16545e12e9525181abc43cd748fdc2633fd.zip
Fix build with USE=qq wrt bug 460636 by patching to remove fatal warnings during build.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 42618354)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kopete/ChangeLog7
-rw-r--r--kde-base/kopete/files/kopete-4.10.1-nofatalwarn.patch13
-rw-r--r--kde-base/kopete/kopete-4.10.1.ebuild4
3 files changed, 22 insertions, 2 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 3492da8edbdb..6a13d651d9ff 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kopete
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.352 2013/03/06 13:41:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.353 2013/03/15 23:04:40 creffett Exp $
+
+ 15 Mar 2013; Chris Reffett <creffett@gentoo.org>
+ +files/kopete-4.10.1-nofatalwarn.patch, kopete-4.10.1.ebuild:
+ Fix build with USE=qq wrt bug 460636 by patching to remove fatal warnings
+ during build.
*kopete-4.10.1 (06 Mar 2013)
diff --git a/kde-base/kopete/files/kopete-4.10.1-nofatalwarn.patch b/kde-base/kopete/files/kopete-4.10.1-nofatalwarn.patch
new file mode 100644
index 000000000000..3116dd19419e
--- /dev/null
+++ b/kde-base/kopete/files/kopete-4.10.1-nofatalwarn.patch
@@ -0,0 +1,13 @@
+diff -ruN kopete-4.10.1/CMakeLists.txt kopete-4.10.1-patched/CMakeLists.txt
+--- kopete-4.10.1/CMakeLists.txt 2013-03-15 18:42:36.582537588 -0400
++++ kopete-4.10.1-patched/CMakeLists.txt 2013-03-15 18:52:43.437521238 -0400
+@@ -28,6 +28,9 @@
+ set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} )
+ endif (WIN32)
+
++set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-fatal-warnings")
++set ( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-fatal-warnings")
++
+ macro_optional_find_package(KdepimLibs)
+ # find_package(X11VidMode) not used at this time
+
diff --git a/kde-base/kopete/kopete-4.10.1.ebuild b/kde-base/kopete/kopete-4.10.1.ebuild
index ac001f6a674c..3596d538584b 100644
--- a/kde-base/kopete/kopete-4.10.1.ebuild
+++ b/kde-base/kopete/kopete-4.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.10.1.ebuild,v 1.1 2013/03/06 13:41:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.10.1.ebuild,v 1.2 2013/03/15 23:04:40 creffett Exp $
EAPI=5
@@ -16,6 +16,8 @@ IUSE="debug ssl v4l"
# tests hang, last checked for 4.2.96
RESTRICT=test
+PATCHES=( "${FILESDIR}/${PN}-4.10.1-nofatalwarn.patch" )
+
# Available plugins
#
# addbookmarks: NO DEPS