summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2002-07-13 09:17:36 +0000
committerDan Armak <danarmak@gentoo.org>2002-07-13 09:17:36 +0000
commit805cb8ae08b8774e50d93627bb3bb774995a953b (patch)
tree2081cf2ab9fd8a99e3df22ee6465d14ef4eef094 /kde-base
parentremove gtk timidity configure option, it doesn\'t compile (diff)
downloadgentoo-2-805cb8ae08b8774e50d93627bb3bb774995a953b.tar.gz
gentoo-2-805cb8ae08b8774e50d93627bb3bb774995a953b.tar.bz2
gentoo-2-805cb8ae08b8774e50d93627bb3bb774995a953b.zip
add patch from 3.0.x, it's still necessary
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdeartwork/files/xsaver-conflicting-typedefs.diff12
-rw-r--r--kde-base/kdeartwork/kdeartwork-3.1_alpha1.ebuild13
2 files changed, 15 insertions, 10 deletions
diff --git a/kde-base/kdeartwork/files/xsaver-conflicting-typedefs.diff b/kde-base/kdeartwork/files/xsaver-conflicting-typedefs.diff
new file mode 100644
index 000000000000..eb350ce370b0
--- /dev/null
+++ b/kde-base/kdeartwork/files/xsaver-conflicting-typedefs.diff
@@ -0,0 +1,12 @@
+diff -ur kscreensaver/xsavers/pipes.cpp kscreensaver/xsavers/pipes.cpp
+--- kscreensaver/xsavers/pipes.cpp 2002-04-22 21:46:54.000000000 -0700
++++ kscreensaver/xsavers/pipes.cpp 2002-04-22 21:46:24.000000000 -0700
+@@ -51,6 +51,8 @@
+ * ------------------------------------------------------------------------ --
+ */
+
++#define LONG64 // Added by gentoo
++
+ //TODO: Overall, the screensaver is in a good shape.
+ // - should reinit when a repaintEvent occures
+ // - antialising would certainly improve drawing
diff --git a/kde-base/kdeartwork/kdeartwork-3.1_alpha1.ebuild b/kde-base/kdeartwork/kdeartwork-3.1_alpha1.ebuild
index 05f322a48dfd..c706bf59724e 100644
--- a/kde-base/kdeartwork/kdeartwork-3.1_alpha1.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.1_alpha1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2001 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.1_alpha1.ebuild,v 1.1 2002/07/12 22:07:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.1_alpha1.ebuild,v 1.2 2002/07/13 09:17:36 danarmak Exp $
inherit kde-dist
newdepend "opengl? ( virtual/opengl ) >=kde-base/kdebase-${PV}"
@@ -10,15 +10,8 @@ DESCRIPTION="${DESCRIPTION}Artwork"
myconf="$myconf --with-dpms"
use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl"
-#src_unpack() {
-#
-# base_src_unpack
-#
-# cd ${S}
-# # added to fix GL problems within xscreensavers
-# patch -p1 < ${FILESDIR}/kdeartwork-screensaver.patch
-#
-#}
+PATCHES="$FILESDIR/xsaver-conflicting-typedefs.diff"
+
#
#src_install() {
# dodir ${KDEDIR}/share/apps/kthememgr/Themes