diff options
author | Gregorio Guidi <greg_g@gentoo.org> | 2005-10-13 07:28:33 +0000 |
---|---|---|
committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-10-13 07:28:33 +0000 |
commit | 8784bceb7c23d298386acd6d57adb747a209859c (patch) | |
tree | 3ca6aeb52324b8bf89bc7fdc66c141cab633d585 /kde-base | |
parent | Stable on x86 (diff) | |
download | historical-8784bceb7c23d298386acd6d57adb747a209859c.tar.gz historical-8784bceb7c23d298386acd6d57adb747a209859c.tar.bz2 historical-8784bceb7c23d298386acd6d57adb747a209859c.zip |
Update configure patch. Add small patch for missing entry in Makefile.
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'kde-base')
5 files changed, 175 insertions, 20 deletions
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog index a9c4f1bbd3b7..476c43f85095 100644 --- a/kde-base/kdeartwork-kscreensaver/ChangeLog +++ b/kde-base/kdeartwork-kscreensaver/ChangeLog @@ -1,6 +1,12 @@ # 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.23 2005/10/13 00:09:52 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.24 2005/10/13 07:28:33 greg_g Exp $ + + 13 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdeartwork-3.4.3-configure.patch, + +files/kdeartwork-3.4.3-kfiresaver.patch, + kdeartwork-kscreensaver-3.4.3.ebuild: + Update configure patch. Add small patch for missing entry in Makefile. *kdeartwork-kscreensaver-3.4.3 (13 Oct 2005) diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-base/kdeartwork-kscreensaver/Manifest index 3152d07fee06..08fedb7be734 100644 --- a/kde-base/kdeartwork-kscreensaver/Manifest +++ b/kde-base/kdeartwork-kscreensaver/Manifest @@ -1,12 +1,14 @@ -MD5 9c7022956f803fe93acd2b3e0c621812 ChangeLog 4075 -MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-kscreensaver-3.4.1 220 +MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 c63624b52624e2ed23a1a06aa27452e4 kdeartwork-kscreensaver-3.4.2.ebuild 1062 +MD5 8346d1705aa63bbb96169eeeed670c89 kdeartwork-kscreensaver-3.4.3.ebuild 939 +MD5 7a37670ec5fcd396103ac07e5604c899 ChangeLog 4324 +MD5 bbfe5a3296bd93ab351a917768104c7c kdeartwork-kscreensaver-3.5_beta1.ebuild 753 +MD5 2fe0472a2ca64ac229f658b1414755ac kdeartwork-kscreensaver-3.4.1.ebuild 850 MD5 52630059e55189d550ffb49b50e90d85 files/digest-kdeartwork-kscreensaver-3.4.2 298 -MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-kscreensaver-3.4.3 71 +MD5 45fe881cc7f39f2d70b8b4ccc61cf707 files/kdeartwork-3.4.3-configure.patch 5729 +MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-kscreensaver-3.4.1 220 MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-kscreensaver-3.5_beta1 72 +MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-kscreensaver-3.4.3 71 +MD5 789091c90eea0d565e886b92589f1119 files/kdeartwork-3.4.3-kfiresaver.patch 765 MD5 a51b6bfc735f8cec40cd4481a289309d files/kdeartwork-3.4-configure.patch 7591 MD5 fe55c64ff5050b92d175b2114c2d1667 files/kdeartwork-3.4.1-configure.patch 815 -MD5 2fe0472a2ca64ac229f658b1414755ac kdeartwork-kscreensaver-3.4.1.ebuild 850 -MD5 c63624b52624e2ed23a1a06aa27452e4 kdeartwork-kscreensaver-3.4.2.ebuild 1062 -MD5 26724abe16f76f9ed97ac77c2f924932 kdeartwork-kscreensaver-3.4.3.ebuild 1064 -MD5 bbfe5a3296bd93ab351a917768104c7c kdeartwork-kscreensaver-3.5_beta1.ebuild 753 -MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-configure.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-configure.patch new file mode 100644 index 000000000000..567431d69d75 --- /dev/null +++ b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-configure.patch @@ -0,0 +1,140 @@ +diff -Nur kdeartwork-3.4.3.orig/kscreensaver/configure.in.in kdeartwork-3.4.3/kscreensaver/configure.in.in +--- kdeartwork-3.4.3.orig/kscreensaver/configure.in.in 2005-10-06 08:12:25.000000000 +0200 ++++ kdeartwork-3.4.3/kscreensaver/configure.in.in 2005-10-08 10:02:25.000000000 +0200 +@@ -37,32 +37,41 @@ + AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes) + AM_CONDITIONAL(COMPILE_ARTS_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes && test x$build_arts = xyes) + +-LIBART= ++AC_ARG_WITH(libart, ++ [AC_HELP_STRING(--with-libart, ++ [enable support for libart @<:@default=check@:>@])], ++ [], with_libart=check) + +-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ +- AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) +-]) +- +-if test -n "$LIBART_CONFIG"; then +- vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` +- if test -n "$vers" && test "$vers" -ge 2003008 +- then +- LIBART_LIBS="`$LIBART_CONFIG --libs`" +- LIBART_RPATH= +- for args in $LIBART_LIBS; do ++LIBART= ++if test "x$with_libart" != xno; then ++ KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ ++ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) ++ ]) ++ ++ if test -n "$LIBART_CONFIG"; then ++ vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` ++ if test -n "$vers" && test "$vers" -ge 2003008; then ++ LIBART_LIBS="`$LIBART_CONFIG --libs`" ++ LIBART_RPATH= ++ for args in $LIBART_LIBS; do + case $args in + -L*) + LIBART_RPATH="$LIBART_RPATH $args" + ;; + esac +- done +- LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"` +- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`" +- LIBART=yes +- +- AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library]) +- else +- AC_MSG_WARN([You need at least libart 2.3.8]) ++ done ++ LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"` ++ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`" ++ LIBART=yes ++ ++ AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library]) ++ else ++ AC_MSG_WARN([You need at least libart 2.3.8]) ++ fi ++ fi ++ ++ if test "x$with_libart" != xcheck && test -z "$LIBART"; then ++ AC_MSG_ERROR([--with-libart was given, but test for libart failed]) + fi + fi + +diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.bot +--- kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.bot 2005-10-05 15:11:48.000000000 +0200 ++++ kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.bot 2005-10-08 10:02:25.000000000 +0200 +@@ -1,4 +1,4 @@ +-if test "$XSCREENSAVER" = "NO"; then ++if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then + echo "" + echo "xscreensaver could not be detected on your system." + echo "Check www.jwz.org/xscreensaver if you're loving to" +diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.in +--- kdeartwork-3.4.3.orig/kscreensaver/kxsconfig/configure.in.in 2005-10-05 15:11:48.000000000 +0200 ++++ kdeartwork-3.4.3/kscreensaver/kxsconfig/configure.in.in 2005-10-08 10:03:21.000000000 +0200 +@@ -22,25 +22,30 @@ + done + IFS=$old_IFS + +-KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ], +- [ +- KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ], +- [ +- KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, +- [ $xscreensaver_prefixes ], +- [ +- KDE_FIND_PATH(hacks/flame, XSCREENSAVER, +- [ $xscreensaver_prefixes ], +- [ +- XSCREENSAVER=NO +- ]) +- ]) +- ]) +- ]) ++AC_ARG_WITH(xscreensaver, ++ [AC_HELP_STRING(--with-xscreensaver, ++ [enable support for xscreensaver @<:@default=check@:>@])], ++ [], with_xscreensaver=check) ++ ++XSCREENSAVER='' ++echo "Searching in $xscreensaver_prefixes" ++if test "x$with_xscreensaver" != xno; then ++ for xsdir in lib$kdelibsuff/xscreensaver lib/xscreensaver \ ++ lib$kdelibsuff/misc/xscreensaver lib/misc/xscreensaver \ ++ libexec$kdelibsuff/xscreensaver libexec/xscreensaver \ ++ bin/xscreensaver-hacks hacks; do ++ test -n "$XSCREENSAVER" && break ++ KDE_FIND_PATH("$xsdir/flame", XSCREENSAVER, [ $xscreensaver_prefixes ]) ++ done ++ ++ if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = x; then ++ AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed]) ++ fi ++fi + + XSCREENSAVER_HACKS_DIR= + +-if test "$XSCREENSAVER" != "NO"; then ++if test -n "$XSCREENSAVER"; then + XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'` + AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks]) + +@@ -48,7 +53,6 @@ + for subdir in lib/xscreensaver/config \ + lib/X11/xscreensaver/config \ + share/control-center/screensavers \ +- share/control-center/screensavers \ + share/xscreensaver/config \ + xscreensaver \ + config/control-center-2.0; do +@@ -62,6 +66,5 @@ + [Defines where xscreensaver stores it's config files]) + fi + +-AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO") ++AM_CONDITIONAL(include_XSCREENSAVER, test -n "$XSCREENSAVER") + AC_SUBST(XSCREENSAVER_HACKS_DIR) +- diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-kfiresaver.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-kfiresaver.patch new file mode 100644 index 000000000000..53e69720b1bd --- /dev/null +++ b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.3-kfiresaver.patch @@ -0,0 +1,12 @@ +diff -Nur kdeartwork-3.4.3.orig/kscreensaver/kdesavers/Makefile.am kdeartwork-3.4.3/kscreensaver/kdesavers/Makefile.am +--- kdeartwork-3.4.3.orig/kscreensaver/kdesavers/Makefile.am 2005-10-05 15:11:45.000000000 +0200 ++++ kdeartwork-3.4.3/kscreensaver/kdesavers/Makefile.am 2005-10-10 16:19:25.000000000 +0200 +@@ -95,7 +95,7 @@ + desktop_DATA = KBanner.desktop KPolygon.desktop \ + KSlideshow.desktop KLines-saver.desktop KLorenz.desktop \ + KBlob.desktop KVm.desktop \ +- KClock.desktop $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES) ++ KClock.desktop $(X11_DESKTOP_FILES) $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES) $(ARTS_GL_DESKTOP_FILES) + + desktopdir = $(kde_appsdir)/System/ScreenSavers + diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild index bcf91fe0dd89..ed514fed71ec 100644 --- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild +++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.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.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild,v 1.2 2005/10/13 07:28:33 greg_g Exp $ KMMODULE=kscreensaver KMNAME=kdeartwork @@ -16,19 +16,14 @@ DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kscreensaver) opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver )" -PATCHES1="${FILESDIR}/kdeartwork-3.4-configure.patch" +PATCHES="${FILESDIR}/kdeartwork-3.4.3-configure.patch" + +# Fix Makefile. Applied for 3.4.4. +PATCHES="${PATCHES} ${FILESDIR}/kdeartwork-3.4.3-kfiresaver.patch" src_compile() { local myconf="$myconf --with-dpms --with-libart - $(use_with opengl gl)" - - if use xscreensaver; then - myconf="${myconf} --with-xscreensaver - --with-xscreensaver-dir=/usr/lib/misc/xscreensaver - --with-xscreensaver-config=/usr/share/xscreensaver/config" - else - myconf="${myconf} --without-xscreensaver" - fi + $(use_with opengl gl) $(use_with xscreensaver)" kde-meta_src_compile } |