Applying fribidi patch, bugs 254045 and 260837, thanks to Dmitry Halturin

(Portage version: 2.2_rc31/cvs/Linux x86_64)

3 files changed, 59 insertions, 3 deletions

diff --git a/kde-base/ksvg/ChangeLog b/kde-base/ksvg/ChangeLog
index d4713753dbcf..4150729798b8 100644
--- a/kde-base/ksvg/ChangeLog
+++ b/kde-base/ksvg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksvg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ChangeLog,v 1.88 2008/09/13 23:59:54 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ChangeLog,v 1.89 2009/04/30 12:00:35 tampakrap Exp $
+
+  30 Apr 2009; Theo Chatzimichos <tampakrap@gentoo.org> +files/ksvg-fribidi.patch,
+  ksvg-3.5.10:
+  Applying fribidi patch, bugs 254045 and 260837, thanks to Dmitry Halturin
 
 *ksvg-3.5.10 (13 Sep 2008)
 
diff --git a/kde-base/ksvg/files/ksvg-fribidi.patch b/kde-base/ksvg/files/ksvg-fribidi.patch
new file mode 100644
index 000000000000..37e2e56cea35
--- /dev/null
+++ b/kde-base/ksvg/files/ksvg-fribidi.patch
@@ -0,0 +1,43 @@
+diff -Naur origin.ksvg-3.5.10/ksvg/impl/libs/libtext2path/src/Converter.cpp ksvg-3.5.10/ksvg/impl/libs/libtext2path/src/Converter.cpp
+--- origin.ksvg-3.5.10/ksvg/impl/libs/libtext2path/src/Converter.cpp	2005-10-10 18:56:48.000000000 +0400
++++ ksvg-3.5.10/ksvg/impl/libs/libtext2path/src/Converter.cpp	2009-03-14 00:36:21.000000000 +0300
+@@ -23,7 +23,7 @@
+ #include "myboost/shared_ptr.hpp"
+ #include <fontconfig/fontconfig.h>
+ #include <fribidi/fribidi.h>
+-#include <fribidi/fribidi_types.h>
++#include <fribidi/fribidi-types.h>
+ 
+ #include "Font.h"
+ #include "Glyph.h"
+diff -Naur origin.ksvg-3.5.10/ksvg/test/external/Makefile.am ksvg-3.5.10/ksvg/test/external/Makefile.am
+--- origin.ksvg-3.5.10/ksvg/test/external/Makefile.am	2005-09-10 12:19:09.000000000 +0400
++++ ksvg-3.5.10/ksvg/test/external/Makefile.am	2009-03-14 00:51:42.000000000 +0300
+@@ -5,9 +5,9 @@
+ bin_PROGRAMS = svgdisplay printnodetest
+ 
+ svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc
+-svgdisplay_LDADD =  $(LIB_KDECORE) ../../libksvg.la
++svgdisplay_LDADD =  $(LIB_KDECORE) -lfribidi ../../libksvg.la
+ svgdisplay_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ printnodetest_SOURCES = printnodetest.cpp
+-printnodetest_LDADD =  $(LIB_KDECORE) ../../libksvg.la
++printnodetest_LDADD =  $(LIB_KDECORE) -lfribidi ../../libksvg.la
+ printnodetest_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+diff -Naur origin.ksvg-3.5.10/ksvg/test/external/Makefile.in ksvg-3.5.10/ksvg/test/external/Makefile.in
+--- origin.ksvg-3.5.10/ksvg/test/external/Makefile.in	2008-08-20 19:45:01.000000000 +0400
++++ ksvg-3.5.10/ksvg/test/external/Makefile.in	2009-03-14 00:51:44.000000000 +0300
+@@ -414,10 +414,10 @@
+ #>- METASOURCES = AUTO
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+ svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc
+-svgdisplay_LDADD = $(LIB_KDECORE) ../../libksvg.la
++svgdisplay_LDADD = $(LIB_KDECORE) -lfribidi ../../libksvg.la
+ svgdisplay_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ printnodetest_SOURCES = printnodetest.cpp
+-printnodetest_LDADD = $(LIB_KDECORE) ../../libksvg.la
++printnodetest_LDADD = $(LIB_KDECORE) -lfribidi ../../libksvg.la
+ printnodetest_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ #>- all: all-am
+ #>+ 1
diff --git a/kde-base/ksvg/ksvg-3.5.10.ebuild b/kde-base/ksvg/ksvg-3.5.10.ebuild
index c1e19a951fc5..7d7b234a36d9 100644
--- a/kde-base/ksvg/ksvg-3.5.10.ebuild
+++ b/kde-base/ksvg/ksvg-3.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.5.10.ebuild,v 1.1 2008/09/13 23:59:54 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.5.10.ebuild,v 1.2 2009/04/30 12:00:35 tampakrap Exp $
 
 KMNAME=kdegraphics
 EAPI="1"
@@ -16,3 +16,12 @@ DEPEND=">=media-libs/freetype-2.3
 	media-libs/lcms
 	dev-libs/fribidi"
 RDEPEND="${DEPEND}"
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	if has_version ">=dev-libs/fribidi-0.19.1"; then
+		epatch "${FILESDIR}/${PN}-fribidi.patch"
+		filter-ldflags -Wl, --as-needed
+	fi
+}