diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-05-26 15:26:53 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-05-26 15:26:53 +0000 |
| commit | 8fe2972d460abed06f8aa98e8bbf6c91ab0ac7d2 (patch) | |
| tree | 5c5501a4ff508945b4fb9d1f17efa300678362cf /kde-base | |
| parent | Added latest version and removed old versions. (diff) | |
| download | gentoo-2-8fe2972d460abed06f8aa98e8bbf6c91ab0ac7d2.tar.gz gentoo-2-8fe2972d460abed06f8aa98e8bbf6c91ab0ac7d2.tar.bz2 gentoo-2-8fe2972d460abed06f8aa98e8bbf6c91ab0ac7d2.zip | |
Add patch to fix detection of arts (#91696).
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base')
3 files changed, 25 insertions, 3 deletions
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog index 1d7662a9922b..04695d893276 100644 --- a/kde-base/kdeartwork-kscreensaver/ChangeLog +++ b/kde-base/kdeartwork-kscreensaver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdeartwork-kscreensaver # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.11 2005/05/25 21:23:03 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.12 2005/05/26 15:26:53 greg_g Exp $ + + 26 May 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdeartwork-3.4.1-configure.patch, + kdeartwork-kscreensaver-3.4.1.ebuild: + Add patch to fix detection of arts (#91696). *kdeartwork-kscreensaver-3.4.1 (25 May 2005) diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.1-configure.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.1-configure.patch new file mode 100644 index 000000000000..6b86d10bbb66 --- /dev/null +++ b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.1-configure.patch @@ -0,0 +1,15 @@ +diff -Nur kdeartwork-3.4.1.orig/kscreensaver/configure.in.in kdeartwork-3.4.1/kscreensaver/configure.in.in +--- kdeartwork-3.4.1.orig/kscreensaver/configure.in.in 2005-05-23 14:01:05.000000000 +0200 ++++ kdeartwork-3.4.1/kscreensaver/configure.in.in 2005-05-25 14:58:51.000000000 +0200 +@@ -32,9 +32,9 @@ + AC_HAVE_GL( have_gl=yes, have_gl=no ) + + AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes) +-AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes) ++AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes) + AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x) +-AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$have_arts = xyes) ++AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes) + + LIBART= + diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild index 844c119c60c6..1e066235a4ba 100644 --- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild +++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.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/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild,v 1.2 2005/05/26 15:26:53 greg_g Exp $ KMMODULE=kscreensaver KMNAME=kdeartwork @@ -15,7 +15,9 @@ DEPEND="$(deprange $PV $MAXKDEVER kde-base/kscreensaver) opengl? ( virtual/opengl ) !ppc64? ( xscreensaver? ( x11-misc/xscreensaver ) )" -PATCHES="${FILESDIR}/kdeartwork-3.4.0-gl-kdesavers.patch" +# Fix compilation with --without-gl and detection of arts. +# See kde bug 89387 and 102398. +PATCHES1="${FILESDIR}/kdeartwork-3.4.1-configure.patch" src_compile() { myconf="$myconf --with-dpms $(use_with opengl gl)" |