From 8672cdc222ae67665368b0cbe9b63b4686edfff6 Mon Sep 17 00:00:00 2001 From: Dan Armak Date: Tue, 29 Oct 2002 20:34:52 +0000 Subject: [PATCH] a new revision, masked, that attempts to fix #9423 --- kde-base/kdebase/ChangeLog | 9 +- .../kdebase/files/digest-kdebase-3.0.4-r1 | 1 + .../files/kdebase-3.0.4-xfree421.diff.gz | Bin 0 -> 4589 bytes .../files/startkde-3.0.4-r1-gentoo.diff | 55 ++++++++ kde-base/kdebase/kdebase-3.0.4-r1.ebuild | 129 ++++++++++++++++++ 5 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 kde-base/kdebase/files/digest-kdebase-3.0.4-r1 create mode 100644 kde-base/kdebase/files/kdebase-3.0.4-xfree421.diff.gz create mode 100644 kde-base/kdebase/files/startkde-3.0.4-r1-gentoo.diff create mode 100644 kde-base/kdebase/kdebase-3.0.4-r1.ebuild diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 80ac4771c696..70d546f2fcb7 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdebase # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.27 2002/10/09 16:50:50 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.28 2002/10/29 20:34:17 danarmak Exp $ + +*kdebase-3.0.4-r1 (29 Oct 2002) + + 29 Oct 2002; Dan Armak ChangeLog : + + A new version that adds a patch described in comment #20 of bug #9423 + (kfontinst not compiling with xfree 4.2.1) in an attempt to fix that bug. *kdebase-3.0.4 (09 Oct 2002) diff --git a/kde-base/kdebase/files/digest-kdebase-3.0.4-r1 b/kde-base/kdebase/files/digest-kdebase-3.0.4-r1 new file mode 100644 index 000000000000..ace35a6b782e --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.0.4-r1 @@ -0,0 +1 @@ +MD5 d82ddae716912a3195139c8755e5c668 kdebase-3.0.4.tar.bz2 13111203 diff --git a/kde-base/kdebase/files/kdebase-3.0.4-xfree421.diff.gz b/kde-base/kdebase/files/kdebase-3.0.4-xfree421.diff.gz new file mode 100644 index 0000000000000000000000000000000000000000..08bd52bb43b3f30032922428bf9a96803c255916 GIT binary patch literal 4589 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/cdparanoia-3.9.8 + ldap? ( >=net-nds/openldap-1.2 ) + pam? ( >=sys-libs/pam-0.73 ) + motif? ( >=x11-libs/openmotif-2.1.30 ) + encode? ( >=media-sound/lame-3.89b ) + oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 ) + cups? ( net-print/cups ) + ssl? ( >=dev-libs/openssl-0.9.6b ) + opengl? ( virtual/opengl ) + samba? ( net-fs/samba )" +# lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet + +DEPEND="$DEPEND sys-apps/gzip" + +myconf="$myconf --with-dpms --with-cdparanoia" + +use ldap && myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap" +use pam && myconf="$myconf --with-pam" || myconf="$myconf --with-shadow" +use motif && myconf="$myconf --with-motif" || myconf="$myconf --without-motif" +use encode && myconf="$myconf --with-lame" || myconf="$myconf --without-lame" +use cups && myconf="$myconf --with-cups" || myconf="$myconf --disable-cups" +use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vorbis" +use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl" +use ssl && myconf="$myconf --with-ssl" || myconf="$myconf --without-ssl" +use pam && myconf="$myconf --with-pam=yes" || myconf="$myconf --with-pam=no --with-shadow" + +src_unpack() { + + base_src_unpack + + # Enable this local USE flag to allow nspluginviewer to compile with qt 3.1.x. + # It will patch nsplugins/viewer dir to cvs HEAD status. + # THIS MAY BE UNSTABLE AND YOU SHOULD NOT USE IT UNLESS YOU REALLY HAVE TO + # USE KDE 3.0.4 WITH QT >=3.1.X! + # Also note that kdebase 3.0.3 will compile just fine with all version of QT. + # However kdebase 3.0.4 introduced an nspluginviewer fix that necessitates this + # additional patch to work with qt 3.1. + # UPDATE: dunno if this is sill needed for current qt 3.1 cvs? qt 3.0.6 owuld be best here + # but Im' probably going to skip right to qt3.1, kde3.1. + if [ -n "`use qt31patch`" ]; then + cd $S + /bin/zcat "$FILESDIR/$PN-$PV-nspluginviewer-qt31.diff.gz" | patch -p0 -- + fi + + # fix in testing for bug #9423. may not work with xfree <4.2.x, so I've put that + # in DEPEND. nothing but xfree provides virtual/x11 anyway, and there's no reason + # for anyone to use xfree 4.1.x or earlier AFAIK; anyone who does can use kdebase-3.0.4. + # oh, and kde 3.1* doesn't need this fix and works with any xfree. + cd $S + /bin/zcat "$FILESDIR/$PN-$PV-xfree421.diff.gz" | patch -p0 -- + +} + +src_compile() { + + kde_src_compile myconf configure + kde_remove_flag kdm/kfrontend -fomit-frame-pointer + kde_src_compile make + +} + +src_install() { + + kde_src_install + + # cf bug #5953 + insinto /etc/pam.d + newins ${FILESDIR}/kscreensaver.pam kscreensaver + newins ${FILESDIR}/kde.pam kde + + # startkde script + cd ${D}/${KDEDIR}/bin + patch -p0 < ${FILESDIR}/startkde-${PVR}-gentoo.diff || die + mv startkde startkde.orig + sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde + rm startkde.orig + chmod a+x startkde + + # x11 session script + cd ${T} + echo "#!/bin/sh +${KDEDIR}/bin/startkde" > kde-${PV} + chmod a+x kde-${PV} + # old scheme - compatibility + exeinto /usr/X11R6/bin/wm + doexe kde-${PV} + # new scheme - for now >=xfree-4.2-r3 only + exeinto /etc/X11/Sessions + doexe kde-${PV} + + cd ${D}/${PREFIX}/share/config/kdm || die + mv kdmrc kdmrc.orig + sed -e "s:SessionTypes=:SessionTypes=kde-${PV},:" \ + -e "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:" kdmrc.orig > kdmrc + rm kdmrc.orig + + #backup splashscreen images, so they can be put back when unmerging + #mosfet or so. + if [ ! -d ${KDEDIR}/share/apps/ksplash.default ] + then + cd ${D}/${KDEDIR}/share/apps + cp -rf ksplash/ ksplash.default + fi + + # Show gnome icons when choosing new icon for desktop shortcut + mkdir -p ${D}/usr/share/pixmaps + mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/ + rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/ + cd ${D}/${KDEDIR}/share/apps/kdesktop/ + ln -sf /usr/share/pixmaps/ pics + + rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir + +} + +pkg_postinst() { + mkdir -p ${KDEDIR}/share/templates/.source/emptydir +} -- 2.26.2