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

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 62 insertions, 5 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/Manifest b/kde-base/ksvg/Manifest
index bf2e410e430f..e74849f8d16b 100644
--- a/kde-base/ksvg/Manifest
+++ b/kde-base/ksvg/Manifest
@@ -1,6 +1,7 @@
+AUX ksvg-fribidi.patch 2166 RMD160 b1bd73a0d287568cb0c4d7c9b6e9b9d2b4f50029 SHA1 d37a05115c6560a1dc3d7dc708aeea55aabdfac2 SHA256 43c3b946dfb2d7185e13df15c1a93912dd63a86631db871c36b3e81f1746e5bf
 DIST kdegraphics-3.5.10.tar.bz2 7440912 RMD160 94278e4419ab99885fc9efae9b6ba5ba787f831e SHA1 9634e3ab364d017152fb6d636efad8811aeec6c3 SHA256 bdc73fa98008aa64b72636282bf0d83c7bb3e6d4ba1d0831277dda469b57408b
 DIST kdegraphics-3.5.9.tar.bz2 7441533 RMD160 047a02352858300b6be8db686e95fc55d257ac2d SHA1 62062f2e0274c4fb35e4988ede10072b0267ada7 SHA256 81514a8234158522440b0ecd269dbeb2e3622f72956fcdf38e726866d8100cb2
-EBUILD ksvg-3.5.10.ebuild 538 RMD160 770b6ebfb55cc8b9802257fa0808538720196ec1 SHA1 dc8652d79d51e28f1bcd315b030c352ad2069e77 SHA256 4825fd1dbe0b486d5d9b9255e9abb5ad95146efae0a75fd91468cc0ad027f6f7
+EBUILD ksvg-3.5.10.ebuild 713 RMD160 1b4963121ca4152708a73198a4c18fa183867c46 SHA1 d7afca1c15f5ed710df9336f81d1ec09cf6dbb79 SHA256 fd41fd834b61b1e7bc86707a62caf5afeb3794452bbd9b6debd8840a1e524491
 EBUILD ksvg-3.5.9.ebuild 530 RMD160 e90c8fd17de4bd381925dec8cbb75191362060c1 SHA1 624becc5b646c1e9bc857e3d2ab9c0cf929e3a04 SHA256 9fea3617b1bf3aa6378c462828d013b18a416e4d5e2d477605bbb6723cafb324
-MISC ChangeLog 10014 RMD160 0428af53e75c58c4718a6aacd8d9e80f219fb521 SHA1 defbfaeef5c756750d0a9364241701a6dfb13264 SHA256 f0006c720f50f19dd6df1a9ef45817e6f9c17a3e973cd8d1345552438d030e0b
+MISC ChangeLog 10193 RMD160 83a5218f1f7f60c41b39bf04e63e4d32e05d6883 SHA1 8377ed9129633156876ed8a3cd38dc56ffa8ad5c SHA256 1f99cf344224c4b578695344cfd9e9cfb537c3725725db09e4c2c1d4a25a3ed3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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
+}