diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-09-26 10:19:52 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-09-26 10:19:52 +0000 |
| commit | 69c05807eba1fe85bb58e7fe88588b277dc97f78 (patch) | |
| tree | 9de1a603c48284a3a5fce704a53217d71ba07f5c /kde-base/umbrello | |
| parent | Reverted libdockapp dependancy change, as it turns out this package works wel... (diff) | |
| download | gentoo-2-69c05807eba1fe85bb58e7fe88588b277dc97f78.tar.gz gentoo-2-69c05807eba1fe85bb58e7fe88588b277dc97f78.tar.bz2 gentoo-2-69c05807eba1fe85bb58e7fe88588b277dc97f78.zip | |
Add patch to fix compilation error (#107167).
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'kde-base/umbrello')
| -rw-r--r-- | kde-base/umbrello/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/umbrello/files/kdesdk-3.5_beta1-compile.patch | 42 | ||||
| -rw-r--r-- | kde-base/umbrello/umbrello-3.5_beta1.ebuild | 5 |
3 files changed, 51 insertions, 2 deletions
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 <greg_g@gentoo.org> + +files/kdesdk-3.5_beta1-compile.patch, umbrello-3.5_beta1.ebuild: + Add patch to fix compilation error (#107167). 24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -umbrello-3.5_alpha1.ebuild: 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" |