Add patch for hal-0.5 compatibility (#105553). Add patch to fix opengl related crash (#103937).

Package-Manager: portage-2.0.51.22-r2

5 files changed, 201 insertions, 35 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index b9b4f849c177..5895a45a32b7 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.219 2005/10/03 14:36:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.220 2005/10/04 09:40:15 greg_g Exp $
+
+*kdebase-3.4.2-r2 (04 Oct 2005)
+
+  04 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.2-kinfocenter-opengl-fix.patch,
+  +kdebase-3.4.2-r2.ebuild:
+  Add patch for hal-0.5 compatibility (#105553). Add patch to fix opengl
+  related crash (#103937).
 
   03 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdebase-3.4.1-r1.ebuild:
   Mark 3.4.1-r1 stable on alpha
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index b510aa1e4709..98630b36ac1c 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,48 +1,51 @@
-MD5 6c3e64729fba168a32ee89887da2ed82 kdebase-3.4.1-r1.ebuild 3882
-MD5 c9a8dd6584d378e6e0130a37ab107632 kdebase-3.5_beta1.ebuild 4087
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 dfe3f5174e5329accdffada020f64230 ChangeLog 38169
-MD5 23b40c617edadacd8cbd163054f3960d kdebase-3.4.2-r1.ebuild 4220
-MD5 d97f07ad36c0135703d7d85d89fe8785 kdebase-3.4.2.ebuild 4086
+MD5 3e5f9d9151b0e949e220754c4466d29c kdebase-3.3.2-r1.ebuild 3843
+MD5 771fb9eceec5b0d9c5bae83af47b7882 kdebase-3.2.3-r3.ebuild 3476
+MD5 c9a8dd6584d378e6e0130a37ab107632 kdebase-3.5_beta1.ebuild 4087
+MD5 5a09138115f474528bf00b3eb0286cbe ChangeLog 38432
 MD5 9ea970c24377c122bfd0d1024d1aed0e kdebase-3.3.2-r2.ebuild 3627
+MD5 bca1b08e31bfa89d6d04e9996a77c0bd kdebase-3.4.2-r2.ebuild 4527
+MD5 6c3e64729fba168a32ee89887da2ed82 kdebase-3.4.1-r1.ebuild 3882
+MD5 23b40c617edadacd8cbd163054f3960d kdebase-3.4.2-r1.ebuild 4220
 MD5 acf208f77b0607c97763d9f91cb8da35 kdebase-3.3.2-r3.ebuild 3751
-MD5 771fb9eceec5b0d9c5bae83af47b7882 kdebase-3.2.3-r3.ebuild 3476
-MD5 3e5f9d9151b0e949e220754c4466d29c kdebase-3.3.2-r1.ebuild 3843
-MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2-r1 68
-MD5 32b1688a08fad29a985e0d300828ccc8 files/post-3.2.3-kdebase-htmlframes2.patch 1414
-MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
-MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r3 68
+MD5 d97f07ad36c0135703d7d85d89fe8785 kdebase-3.4.2.ebuild 4086
+MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r2 68
+MD5 f7875ce8a2e0dde4822449ec3deac74e files/digest-kdebase-3.4.1-r1 68
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r1 68
+MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
 MD5 dfb258d599bf770949dff416197af77f files/kdebase-3.5-configure-openexr.patch 780
-MD5 bd3cde92164bce3a560d0e62a5895757 files/post-3.2.3-kdebase-smb.diff 496
 MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebase-3.5_beta1 69
-MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-3.4.1-startkde-gentoo.patch 1284
-MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r2 68
-MD5 a60fd1628607d4abdeb930662d126171 files/post-3.2.3-kdebase-htmlframes.patch 6728
-MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2 68
 MD5 acf270f97062baaaa0576f0b2d28b3ce files/kdebase-3.5-startkde-gentoo.patch 1283
+MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
+MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2 68
+MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r3 68
+MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
-MD5 f7875ce8a2e0dde4822449ec3deac74e files/digest-kdebase-3.4.1-r1 68
+MD5 bd3cde92164bce3a560d0e62a5895757 files/post-3.2.3-kdebase-smb.diff 496
+MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2-r1 68
 MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r3 68
 MD5 78fb451ad534b71fc3e541e9e5759dac files/kde.desktop 3910
-MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
-MD5 c6866e71fa56d6d12a18e96499716d2c files/post-3.3.2-kdebase-htmlframes2.patch 1342
-MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201
-MD5 49ebf63cda60ba3265f1231f295bc51b files/kdebase-3.4.1-configure.patch 6497
-MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r1 68
+MD5 387a99610a8332cea995ed48d7e3339b files/digest-kdebase-3.4.2-r2 143
 MD5 c13bb6243f0c10dd3892ca00a9fce333 files/kdebase-3.4-configure.patch 7273
-MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
-MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r3/backgroundrc 342
-MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r3/kdmrc 19864
+MD5 49ebf63cda60ba3265f1231f295bc51b files/kdebase-3.4.1-configure.patch 6497
+MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-3.4.1-startkde-gentoo.patch 1284
+MD5 c6866e71fa56d6d12a18e96499716d2c files/post-3.3.2-kdebase-htmlframes2.patch 1342
+MD5 a60fd1628607d4abdeb930662d126171 files/post-3.2.3-kdebase-htmlframes.patch 6728
+MD5 32b1688a08fad29a985e0d300828ccc8 files/post-3.2.3-kdebase-htmlframes2.patch 1414
+MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
+MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
 MD5 e4c7caf47cbddd4251ee76f0fe4070ba files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff 1544
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r1/backgroundrc 342
-MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.2-r1/kdmrc 19878
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.2-r1/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r3/backgroundrc 342
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r3/kdmrc 18202
-MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r3/startkde-3.2.3-r3-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r3/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r2/backgroundrc 342
+MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.2-r1/kdmrc 19878
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r1/backgroundrc 342
 MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r2/startkde-3.3.2-r2-gentoo.diff 1420
 MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r2/kdmrc 19864
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r3/Xsetup 758
+MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r3/startkde-3.2.3-r3-gentoo.diff 1923
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r3/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r3/backgroundrc 342
+MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
+MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r3/kdmrc 19864
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r3/backgroundrc 342
diff --git a/kde-base/kdebase/files/digest-kdebase-3.4.2-r2 b/kde-base/kdebase/files/digest-kdebase-3.4.2-r2
new file mode 100644
index 000000000000..b117baac8525
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.4.2-r2
@@ -0,0 +1,2 @@
+MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
+MD5 81bc814fdd3d572f305a8fb93daa6949 kdebase-3.4-kubuntu-hal.patch.gz 8340
diff --git a/kde-base/kdebase/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch b/kde-base/kdebase/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch
new file mode 100644
index 000000000000..f18c216257ff
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch
@@ -0,0 +1,12 @@
+--- kcontrol/info/opengl.cpp.bak	2005-05-23 07:13:35.000000000 -0500
++++ kcontrol/info/opengl.cpp	2005-08-27 10:45:08.000000000 -0500
+@@ -235,6 +235,9 @@
+       GL_COMPRESSED_TEXTURE_FORMATS
+ */
+ 
++  if (!glExtensions)
++	return;
++
+   struct token_name {
+       GLuint type;  // count and flags, !!! count must be <=2 for now
+       GLenum token;
diff --git a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild b/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
new file mode 100644
index 000000000000..9dc4e896132e
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2-r2.ebuild,v 1.1 2005/10/04 09:40:15 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+SRC_URI="${SRC_URI} mirror://gentoo/kdebase-3.4-kubuntu-hal.patch.gz"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl pam samba ssl"
+# hal: enables hal backend for 'media:' ioslave
+
+DEPEND="arts? ( ~kde-base/arts-${PV} )
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	pam? ( kde-base/kdebase-pam )
+	>=dev-libs/cyrus-sasl-2
+	ldap? ( >=net-nds/openldap-2 )
+	cups? ( net-print/cups )
+	ssl? ( dev-libs/openssl )
+	opengl? ( virtual/opengl )
+	openexr? ( >=media-libs/openexr-1.2 )
+	samba? ( >=net-fs/samba-3.0.4 )
+	lm_sensors? ( sys-apps/lm_sensors )
+	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
+	ieee1394? ( sys-libs/libraw1394 )
+	hal? ( sys-apps/dbus
+	       sys-apps/hal )"
+
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.4 )
+	virtual/eject"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}/kdebase-3.4.1-startkde-gentoo.patch"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdebase-3.4-configure.patch"
+
+	# Avoid name-filter expansion for files that do exists (kde bug 107170). Applied for 3.4.3.
+	epatch "${FILESDIR}/kdebase-3.4.2-konqueror-filter.patch"
+
+	# Support for hal-0.5, backported from 3.5 branch.
+	epatch "${WORKDIR}/kdebase-3.4-kubuntu-hal.patch"
+
+	# Fix crash related to opengl (kde bug 101154). Applied for 3.4.3.
+	epatch "${FILESDIR}/${P}-kinfocenter-opengl-fix.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local myconf="--with-dpms
+	              $(use_with arts) $(use_with ldap)
+	              $(use_with cups) $(use_with opengl gl)
+	              $(use_with ssl) $(use_with samba) $(use_with openexr)
+	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
+	              $(use_with ieee1394 libraw1394) $(use_with hal)"
+
+	if use pam; then
+		myconf="${myconf} --with-pam=yes"
+	else
+		myconf="${myconf} --with-pam=no --with-shadow"
+	fi
+
+	# the java test is problematic (see kde bug 100729) and
+	# useless. All that's needed for java applets to work is
+	# to have the 'java' executable in PATH.
+	myconf="${myconf} --without-java"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
+
+	# startup and shutdown scripts
+	insinto ${KDEDIR}/env
+	doins ${FILESDIR}/agent-startup.sh
+
+	exeinto ${KDEDIR}/shutdown
+	doexe ${FILESDIR}/agent-shutdown.sh
+
+	# freedesktop environment variables
+	cat <<EOF > ${T}/xdg.sh
+export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
+EOF
+	insinto ${KDEDIR}/env
+	doins ${T}/xdg.sh
+
+	# x11 session script
+	cat <<EOF > ${T}/kde-${SLOT}
+#!/bin/sh
+exec ${KDEDIR}/bin/startkde
+EOF
+	exeinto /etc/X11/Sessions
+	doexe ${T}/kde-${SLOT}
+
+	# freedesktop compliant session script
+	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
+	insinto /usr/share/xsessions
+	doins ${T}/kde-${SLOT}.desktop
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
+	       -e "s:#GreetFont=:GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0\n#GreetFont=:" \
+	       -e "s:#StdFont=:StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0\n#StdFont=:" \
+	       -e "s:#FailFont=:FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0\n#FailFont=:" \
+	       -e "s:#AntiAliasing=:AntiAliasing=true\n#AntiAliasing=:" \
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
+
+	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
+}
+
+pkg_postinst() {
+	# set the default kdm face icon if it's not already set by the system admin
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+
+	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
+
+	echo
+	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
+	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
+	echo
+}