From 486ac226b4d735ac42633e67a971a4cf267e2017 Mon Sep 17 00:00:00 2001 From: Gregorio Guidi Date: Mon, 26 Sep 2005 10:19:52 +0000 Subject: [PATCH] Add patch to fix compilation error (#107167). Package-Manager: portage-2.0.51.22-r2 --- kde-base/umbrello/ChangeLog | 6 ++- kde-base/umbrello/Manifest | 17 ++------ .../files/kdesdk-3.5_beta1-compile.patch | 42 +++++++++++++++++++ kde-base/umbrello/umbrello-3.5_beta1.ebuild | 5 ++- 4 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 kde-base/umbrello/files/kdesdk-3.5_beta1-compile.patch diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog index 1e4900b146f4..b82b6a4f16bf 100644 --- a/kde-base/umbrello/ChangeLog +++ b/kde-base/umbrello/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/umbrello # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.15 2005/09/24 16:29:56 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.16 2005/09/26 10:19:51 greg_g Exp $ + + 26 Sep 2005; Gregorio Guidi + +files/kdesdk-3.5_beta1-compile.patch, umbrello-3.5_beta1.ebuild: + Add patch to fix compilation error (#107167). 24 Sep 2005; Diego Pettenò -umbrello-3.5_alpha1.ebuild: diff --git a/kde-base/umbrello/Manifest b/kde-base/umbrello/Manifest index 35e2fbd69973..feb4b17e887e 100644 --- a/kde-base/umbrello/Manifest +++ b/kde-base/umbrello/Manifest @@ -1,18 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 b4ee85af48c02e02fa4425daccbd799f ChangeLog 2538 MD5 15c59514c459c17d1785f7a7eaf3efea umbrello-3.4.1.ebuild 390 -MD5 7ef3d17721faca02c998c00eeadf6995 ChangeLog 2374 -MD5 9f1e826ea964a42a7277d3a7b4c8ac01 umbrello-3.5_beta1.ebuild 378 +MD5 4857e930c7870c29742d0d438b1abeb1 umbrello-3.5_beta1.ebuild 466 MD5 d90d841849894a72dda6b8329d44183b umbrello-3.4.2.ebuild 398 -MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-umbrello-3.5_beta1 67 MD5 9b4e9e38740207531ab771519519d01e files/digest-umbrello-3.4.1 206 MD5 0a38813829924b012d8b632f47abb45d files/digest-umbrello-3.4.2 280 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDNX8kj5H05b2HAEkRAkGWAJ4gUWrga9UifW9u1/27zCkdi0ZBjwCfeQn/ -QDQg3eyqMkwBQNPLXoRiK3M= -=axp4 ------END PGP SIGNATURE----- +MD5 e909850d57bdca22b0b476f1acf0fd5d files/kdesdk-3.5_beta1-compile.patch 1406 diff --git a/kde-base/umbrello/files/kdesdk-3.5_beta1-compile.patch b/kde-base/umbrello/files/kdesdk-3.5_beta1-compile.patch new file mode 100644 index 000000000000..5954ef5224e9 --- /dev/null +++ b/kde-base/umbrello/files/kdesdk-3.5_beta1-compile.patch @@ -0,0 +1,42 @@ +diff -Nur kdesdk-3.4.91.orig/umbrello/configure.in.in kdesdk-3.4.91/umbrello/configure.in.in +--- kdesdk-3.4.91.orig/umbrello/configure.in.in 2005-09-10 10:20:57.000000000 +0200 ++++ kdesdk-3.4.91/umbrello/configure.in.in 2005-09-21 14:54:34.000000000 +0200 +@@ -9,22 +9,22 @@ + fi + + dnl Not GPL compatible +-AC_PATH_PROG(DOT_FOUND, dot, no) +-KDE_CHECK_HEADER(graphviz/pathgeom.h, +- [kde_have_graphviz=yes], +- [kde_have_graphviz=no]) +- +-if test "$DOT_FOUND" != "no" -a "$kde_have_graphviz" = "yes"; then +- CXXFLAGS="$CXXFLAGS -DHAVE_DOT" +- GRAPHVIZ_LIB=`pkg-config --libs libgraph` +- AUTOLAYOUT_DIR="autolayout" +- AUTOLAYOUT_LIBS="autolayout/libautolayout.la $GRAPHVIZ_LIB -ldotgen -lgvc" +-else +- AUTOLAYOUT_DIR="" +- AUTOLAYOUT_LIBS="" +-fi +-AC_SUBST(AUTOLAYOUT_DIR) +-AC_SUBST(AUTOLAYOUT_LIBS) ++dnl AC_PATH_PROG(DOT_FOUND, dot, no) ++dnl KDE_CHECK_HEADER(graphviz/pathgeom.h, ++dnl [kde_have_graphviz=yes], ++dnl [kde_have_graphviz=no]) ++dnl ++dnl if test "$DOT_FOUND" != "no" -a "$kde_have_graphviz" = "yes"; then ++dnl CXXFLAGS="$CXXFLAGS -DHAVE_DOT" ++dnl GRAPHVIZ_LIB=`pkg-config --libs libgraph` ++dnl AUTOLAYOUT_DIR="autolayout" ++dnl AUTOLAYOUT_LIBS="autolayout/libautolayout.la $GRAPHVIZ_LIB -ldotgen -lgvc" ++dnl else ++dnl AUTOLAYOUT_DIR="" ++dnl AUTOLAYOUT_LIBS="" ++dnl fi ++dnl AC_SUBST(AUTOLAYOUT_DIR) ++dnl AC_SUBST(AUTOLAYOUT_LIBS) + dnl End of Not GPL compatible + + AC_LANG_RESTORE diff --git a/kde-base/umbrello/umbrello-3.5_beta1.ebuild b/kde-base/umbrello/umbrello-3.5_beta1.ebuild index 02094378807c..d91bad9dd99e 100644 --- a/kde-base/umbrello/umbrello-3.5_beta1.ebuild +++ b/kde-base/umbrello/umbrello-3.5_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5_beta1.ebuild,v 1.1 2005/09/22 21:38:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5_beta1.ebuild,v 1.2 2005/09/26 10:19:51 greg_g Exp $ KMNAME=kdesdk MAXKDEVER=$PV @@ -10,3 +10,6 @@ inherit kde-meta eutils DESCRIPTION="KDE: Umbrello UML Modeller" KEYWORDS="~amd64" IUSE="" + +# Fix compilation. Applied for rc1. +PATCHES1="${FILESDIR}/kdesdk-3.5_beta1-compile.patch" -- 2.26.2