diff options
author | 2002-08-02 09:17:15 +0000 | |
---|---|---|
committer | 2002-08-02 09:17:15 +0000 | |
commit | 74203f7c378c7773da98cfad086ad1429dc886f4 (patch) | |
tree | bb940b84682e99a1e996b1013c02aeab3b5accfd /kde-base/kdebase | |
parent | Narrow down arts dependencies: don't allow usage of a more recent version of ... (diff) | |
download | historical-74203f7c378c7773da98cfad086ad1429dc886f4.tar.gz historical-74203f7c378c7773da98cfad086ad1429dc886f4.tar.bz2 historical-74203f7c378c7773da98cfad086ad1429dc886f4.zip |
removing 3.1_alpha1 ebuilds: too many fixes have gone into the kde cvs which i don't want to baclport in response to bugreports. use the cvs ebuilds or wait for beta1.
Diffstat (limited to 'kde-base/kdebase')
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.1_alpha1 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/kdebase-3.1_alpha1-menushadows.diff | 174 | ||||
-rw-r--r-- | kde-base/kdebase/files/startkde-3.1_alpha1-gentoo.diff | 48 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.1_alpha1.ebuild | 99 |
4 files changed, 0 insertions, 322 deletions
diff --git a/kde-base/kdebase/files/digest-kdebase-3.1_alpha1 b/kde-base/kdebase/files/digest-kdebase-3.1_alpha1 deleted file mode 100644 index 17be38c283e2..000000000000 --- a/kde-base/kdebase/files/digest-kdebase-3.1_alpha1 +++ /dev/null @@ -1 +0,0 @@ -MD5 feef9da060d4ce425b1ce046dffc4f2b kdebase-3.0.6.tar.bz2 13123850 diff --git a/kde-base/kdebase/files/kdebase-3.1_alpha1-menushadows.diff b/kde-base/kdebase/files/kdebase-3.1_alpha1-menushadows.diff deleted file mode 100644 index 8de92ecb3e0d..000000000000 --- a/kde-base/kdebase/files/kdebase-3.1_alpha1-menushadows.diff +++ /dev/null @@ -1,174 +0,0 @@ ---- kcontrol/style/kcmstyle.cpp 2002/06/28 12:35:51 1.37 -+++ kcontrol/style/kcmstyle.cpp 2002/07/05 13:52:02 1.38 -@@ -1,5 +1,5 @@ - /* -- * $Id: kdebase-3.1_alpha1-menushadows.diff,v 1.1 2002/07/16 20:37:01 danarmak Exp $ -+ * $Id: kdebase-3.1_alpha1-menushadows.diff,v 1.1 2002/07/16 20:37:01 danarmak Exp $ - * - * KCMStyle - * Copyright (C) 2002 Karol Szwed <gallium@kde.org> -@@ -249,6 +249,9 @@ - lblMenuHandle->setBuddy( comboMenuHandle ); - containerLayout->addWidget( lblMenuHandle, 3, 0 ); - containerLayout->addWidget( comboMenuHandle, 3, 1 ); -+ -+ cbMenuShadow = new QCheckBox( i18n("Menu &drop shadow"), containerFrame ); -+ containerLayout->addWidget( cbMenuShadow, 4, 0 ); - - // Push the [label combo] to the left. - comboSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); -@@ -295,6 +298,7 @@ - lblMenuEffectType->setAlignment( AlignBottom | AlignLeft ); - lblMenuOpacity = new QLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); - lblMenuOpacity->setAlignment( AlignBottom | AlignLeft ); -+ - menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); - menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 ); - menuContainerLayout->addWidget( lblMenuOpacity, 2, 0 ); -@@ -353,12 +357,14 @@ - connect(lvStyle, SIGNAL(selectionChanged()), this, SLOT(setStyleDirty())); - // Page2 - connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty())); -+ connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty())); - connect( comboTooltipEffect, SIGNAL(highlighted(int)), this, SLOT(setEffectsDirty())); - connect( comboComboEffect, SIGNAL(highlighted(int)), this, SLOT(setEffectsDirty())); - connect( comboMenuEffect, SIGNAL(highlighted(int)), this, SLOT(setStyleDirty())); - connect( comboMenuHandle, SIGNAL(highlighted(int)), this, SLOT(setStyleDirty())); - connect( comboMenuEffectType, SIGNAL(highlighted(int)), this, SLOT(setStyleDirty())); -- connect( slOpacity, SIGNAL(valueChanged(int)),this, SLOT(setEffectsDirty())); -+ connect( slOpacity, SIGNAL(valueChanged(int)),this, SLOT(setStyleDirty())); -+ connect( cbMenuShadow, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty())); - // Page3 - connect( cbHoverButtons, SIGNAL(toggled(bool)), this, SLOT(setToolbarsDirty())); - connect( cbTransparentToolbars, SIGNAL(toggled(bool)), this, SLOT(setToolbarsDirty())); -@@ -413,11 +419,13 @@ - return; - - bool allowMenuTransparency = false; -+ bool allowMenuDropShadow = false; - - // Read the KStyle flags to see if the style writer - // has enabled menu translucency in the style. - if (appliedStyle && appliedStyle->inherits("KStyle")) - { -+ allowMenuDropShadow = true; - KStyle* style = dynamic_cast<KStyle*>(appliedStyle); - if (style) { - KStyle::KStyleFlags flags = style->styleFlags(); -@@ -426,19 +434,35 @@ - } - } - -+ QString warn_string( i18n("<qt>Selected style: <b>%1</b><br><br>" -+ "Some effects(s) that you have chosen could not be applied because the selected style " -+ "does not support these effects. They have therefore been disabled.<br>" -+ "<br>" ).arg( lvStyle->currentItem()->text(2)) ); -+ bool show_warning = false; -+ - // Warn the user if they're applying a style that doesn't support - // menu translucency and they enabled it. - if ( (!allowMenuTransparency) && - (cbEnableEffects->isChecked()) && - (comboMenuEffect->currentItem() == 3) ) // Make Translucent - { -- KMessageBox::information( this, -- i18n("This module has detected that the currently selected style (%1) " -- "does not support Menu Translucency, therefore " -- "this Menu Effect has been disabled.").arg( lvStyle->currentItem()->text( 2 ) ) ); -- comboMenuEffect->setCurrentItem(0); // Disable menu effect. -+ warn_string += "Menu translucency is not available.<br>"; -+ comboMenuEffect->setCurrentItem(0); // Disable menu effect. -+ show_warning = true; -+ } -+ -+ if (!allowMenuDropShadow && cbMenuShadow->isChecked()) -+ { -+ warn_string += "Menu drop-shadows are not available."; -+ cbMenuShadow->setChecked(false); -+ show_warning = true; - } - -+ // Tell the user what features we could not apply on their behalf. -+ if (show_warning) -+ KMessageBox::information(this, warn_string); -+ -+ - // Save effects. - KConfig config( "kdeglobals" ); - config.setGroup("KDE"); -@@ -470,6 +494,8 @@ - QSettings settings; // Only for KStyle stuff - settings.writeEntry("/KStyle/Settings/MenuTransparencyEngine", engine); - settings.writeEntry("/KStyle/Settings/MenuOpacity", slOpacity->value()/100.0); -+ settings.writeEntry("/KStyle/Settings/MenuDropShadow", -+ cbEnableEffects->isChecked() && cbMenuShadow->isChecked() ); - } - - // Misc page -@@ -556,9 +582,10 @@ - comboTooltipEffect->setCurrentItem(0); - comboComboEffect->setCurrentItem(0); - comboMenuEffect->setCurrentItem(0); -- comboMenuHandle->setCurrentItem(0); -+ comboMenuHandle->setCurrentItem(0); - comboMenuEffectType->setCurrentItem(0); - slOpacity->setValue(90); -+ cbMenuShadow->setChecked(false); - - // Miscellanous - cbHoverButtons->setChecked(true); -@@ -703,6 +730,8 @@ - - currentStyle = lvStyle->currentItem()->text(2); - m_bStyleDirty = false; -+ -+ switchStyle( currentStyle ); // make resets visible - } - - -@@ -801,7 +830,7 @@ - - comboMenuHandle->setCurrentItem(config.readNumEntry("InsertTearOffHandle", 0)); - -- // KStyle Menu transparency options... -+ // KStyle Menu transparency and drop-shadow options... - QSettings settings; - QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled"); - -@@ -832,6 +861,9 @@ - - slOpacity->setValue( (int)(100 * settings.readDoubleEntry("/KStyle/Settings/MenuOpacity", 0.90)) ); - -+ // Menu Drop-shadows... -+ cbMenuShadow->setChecked( settings.readBoolEntry("/KStyle/Settings/MenuDropShadow", false) ); -+ - if (cbEnableEffects->isChecked()) { - containerFrame->setEnabled( true ); - menuContainer->setEnabled( comboMenuEffect->currentItem() == 3 ); -@@ -934,6 +966,9 @@ - "<p><b>Animate: </b>Do some animation.</p>\n" - "<p><b>Fade: </b>Fade in menus using alpha-blending.</p>\n" - "<b>Make Translucent: </b>Alpha-blend menus for a see-through effect. (KDE styles only)") ); -+ QWhatsThis::add( cbMenuShadow, i18n( "When enabled, all popup menus will have a drop-shadow, otherwise " -+ "drop-shadows will not be displayed. At present, only KDE styles can have this " -+ "effect enabled.") ); - QWhatsThis::add( comboMenuEffectType, i18n( "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n" - "<p><b>Software Blend: </b>Alpha-blend using an image.</p>\n" - "<b>XRender Blend: </b>Use the XFree RENDER extension for image blending (if available). " ---- kcontrol/style/kcmstyle.h 2002/04/26 17:04:19 1.9 -+++ kcontrol/style/kcmstyle.h 2002/07/05 13:52:02 1.10 -@@ -1,5 +1,5 @@ - /* -- * $Id: kdebase-3.1_alpha1-menushadows.diff,v 1.1 2002/07/16 20:37:01 danarmak Exp $ -+ * $Id: kdebase-3.1_alpha1-menushadows.diff,v 1.1 2002/07/16 20:37:01 danarmak Exp $ - * - * KCMStyle - * Copyright (C) 2002 Karol Szwed <gallium@kde.org> -@@ -135,6 +135,7 @@ - QComboBox* comboMenuEffectType; - QLabel* lblMenuEffectType; - QLabel* lblMenuOpacity; -+ QCheckBox* cbMenuShadow; - - // Page3 widgets - QGroupBox* gbToolbarSettings; diff --git a/kde-base/kdebase/files/startkde-3.1_alpha1-gentoo.diff b/kde-base/kdebase/files/startkde-3.1_alpha1-gentoo.diff deleted file mode 100644 index 232f018cf3fa..000000000000 --- a/kde-base/kdebase/files/startkde-3.1_alpha1-gentoo.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- startkde Mon Jul 1 22:21:54 2002 -+++ startkde Fri Jul 12 19:59:26 2002 -@@ -1,8 +1,28 @@ --#!/bin/sh -+#!/bin/sh --login - # --# DEFAULT KDE STARTUP SCRIPT ( KDE-3.1 ) -+# GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.1 ) - # - -+# Gentoo part: -+export PATH="_KDEDIR_/bin:${PATH}" -+export KDEDIR="_KDEDIR_" -+export KDEDIRS="_KDEDIR_:${KDEDIRS//${KDEDIR}}" -+ -+cd ~ -+[ -d .kde ] && mv .kde .kde.backup -+if [ ! -e .kde3.1 ]; then -+ if [ -e .kde3 ]; then -+ cp -r .kde3 .kde3.1 -+ else -+ mkdir .kde3.1 -+ fi -+fi -+ln -sf .kde3.1 .kde -+ -+#export KDEHOME="${HOME}/.kde3.1" -+ -+# Gentoo part ends -+ - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -25,12 +45,12 @@ - # especially necessary on slow machines, where starting KDE takes one or two - # minutes until anything appears on the screen. - # --# Set the background to plain grey. -+# Set the background to cyan (Gentoo version change). - # The standard X background is nasty, causing moire effects and exploding - # people's heads. We use colours from the standard KDE palette for those with - # palettised displays. - --test "$XDM_MANAGED" || bkg="-solid #C0C0C0" -+test "$XDM_MANAGED" || bkg="-solid #5477A0" - xsetroot -cursor_name left_ptr $bkg - - # The user's personal KDE directory is usually ~/.kde, but this setting diff --git a/kde-base/kdebase/kdebase-3.1_alpha1.ebuild b/kde-base/kdebase/kdebase-3.1_alpha1.ebuild deleted file mode 100644 index e4657eb369e6..000000000000 --- a/kde-base/kdebase/kdebase-3.1_alpha1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1_alpha1.ebuild,v 1.4 2002/07/26 15:40:20 danarmak Exp $ -inherit kde-dist - -DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..." - -KEYWORDS="x86" - -newdepend ">=media-sound/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 - -PATCHES="${FILESDIR}/${P}-menushadows.diff" - -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_compile() { - - kde_src_compile myconf configure - kde_remove_flag kdm/kfrontend -fomit-frame-pointer - kde_src_compile make - -} - -src_install() { - - kde_src_install - - insinto /etc/pam.d - newins ${FILESDIR}/kscreensaver.pam kscreensaver - newins kde.pamd 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}/${KDEDIR}/share/config/kdm || die - mv kdmrc kdmrc.orig - sed -e 's:SessionTypes=:SessionTypes=kde-${PV},:' 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 -} |