Patch for kdm for using GUIStyle,fonts. Some plasmoids.

git-svn-id: http://svn.calculate.ru/overlay@853 c91db197-33c1-4113-bf15-f8a5c547ca64
atratsevskiy
mhiretskiy 15 years ago
parent fd2f5029c7
commit 0e982dcd98

@ -0,0 +1,4 @@
AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
AUX kdm-4.2.0-guistyle.patch 491 RMD160 c94a389e49361631c5b051ba0d481fc4a72fd985 SHA1 2d9c2f4a8f0d2b063ab419f380254ed9cd165728 SHA256 9f368ad8b2e2a307b57a84d5ad47d00f644a9bfcfe5ee2d1f2db8a57e7b15e25
DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
EBUILD kdm-4.2.0-r9.ebuild 2494 RMD160 21e84006321dc7df8ea869f1288018966f6e2ae0 SHA1 2419e68df4076a4b088e1aa4245f597f6e6eb10a SHA256 374174632bb6c14c98a66d271e491ee16569c7ed15f3d9813fc97e2ff8cb6e0f

@ -0,0 +1,29 @@
diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
index 3499836..cd1c2bb 100644
--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
@@ -5,6 +5,8 @@
# PAM_INCLUDE_DIR - the pam include directory
# PAM_LIBRARIES - libpam library
+if (WITH_PAM)
+
if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
# Already in cache, be silent
set(PAM_FIND_QUIETLY TRUE)
@@ -72,3 +74,5 @@ else (PAM_FOUND)
endif (PAM_FOUND)
mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
+
+endif (WITH_PAM)
diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
index ed8ab9e..ce3bcc2 100644
--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
@@ -1,4 +1,4 @@
-find_package(PAM)
+macro_optional_find_package(PAM)
set(UNIXAUTH_LIBRARIES)
set(UNIXAUTH_INCLUDE_DIRS)

@ -0,0 +1,12 @@
diff -uNr kdebase-workspace-4.2.0.old/kdm/kfrontend/kgapp.cpp kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp
--- kdebase-workspace-4.2.0.old/kdm/kfrontend/kgapp.cpp 2008-09-18 00:54:59.000000000 +0400
+++ kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp 2009-02-12 15:50:05.000000000 +0300
@@ -377,6 +377,8 @@
setCursor( dpy, app.desktop()->winId(), XC_left_ptr );
int rslt = ex_exit;
+ app.setStyle( _GUIStyle );
+ app.setFont( *_normalFont );
for (;;) {
int cmd = gRecvInt();

@ -0,0 +1,84 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.2.0.ebuild,v 1.2 2009/02/01 07:09:01 jmbsvicetto Exp $
EAPI="2"
KMNAME="kdebase-workspace"
inherit kde4-meta
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="consolekit debug htmlhandbook kerberos pam"
DEPEND="x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXtst
kerberos? ( virtual/krb5 )
pam? (
>=kde-base/kcheckpass-${PV}:${SLOT}
sys-libs/pam
)
consolekit? (
>=sys-apps/dbus-1.0.2
sys-auth/consolekit
)"
RDEPEND="${DEPEND}
>=kde-base/kdepasswd-${PV}:${SLOT}
>=x11-apps/xinit-1.0.5-r2
x11-apps/xmessage"
KMEXTRACTONLY="kcontrol/kdm/"
KMEXTRA="libs/kdm/"
PATCHES=("${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/kdm-4.2.0-guistyle.patch")
src_configure() {
mycmakeargs="${mycmakeargs}
$(use kerberos && echo "-DKDE4_KRB5AUTH=ON" || echo "-DKDE4_KRB5AUTH=OFF")
$(cmake-utils_use_with pam PAM)
$(cmake-utils_use_with consolekit CkConnector)"
kde4-meta_src_configure
}
src_install() {
export GENKDMCONF_FLAGS="--no-old --no-backup"
kde4-meta_src_install
# Customize the kdmrc configuration
sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=/usr/share/xsessions:" \
"${D}"/${PREFIX}/share/config/kdm/kdmrc \
|| die "Failed to set SessionsDirs correctly."
# Don't install empty dir
rmdir "${D}${KDEDIR}"/share/config/kdm/sessions
}
pkg_postinst() {
kde4-meta_pkg_postinst
# Set the default kdm face icon if it's not already set by the system admin
# because this is user-overrideable in that way, it's not in src_install
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
if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
fi
if use consolekit; then
echo
elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
elog "make sure consolekit daemon is running and started at login time"
elog
elog "rc-update add consolekit default && /etc/init.d/consolekit start"
echo
fi
}

@ -0,0 +1,3 @@
AUX color.patch 962 RMD160 e9dd9d3872a8577e3b12d72d6970f5a0a9b36c69 SHA1 4a4d22611f5d31d2f2acba934ac1bad782976bb1 SHA256 e2873d64f4f5190547fc331f6729b1fdaf83d46f281fc6f148406326d7feb762
DIST 92309-0.2-beta1.tar.bz2 27400 RMD160 3eef883c160c934efebd0ff1329f643ae13947a0 SHA1 84219f6e063c7c0d7c1e4c289b5467daab1184fc SHA256 29c2ea5bcddffb1b3d0e2326bb50025a413bc904e50093582ba928812ddb8d6d
EBUILD stdin-plasmoid-0.2_beta1.ebuild 755 RMD160 e29301d075a4a608405aa42a6571df1715cdd27c SHA1 29f6a51586137fa06df204b0c4b7b006b1a749e9 SHA256 fd25d6caff168f3581df5da8ed0b95c530fa8dbc7eb0226efa842c09228e4817

@ -0,0 +1,34 @@
diff -uNr 0.2-beta1.orig/0.2/label.cpp 0.2-beta1/0.2/label.cpp
--- 0.2-beta1.orig/0.2/label.cpp 2009-02-09 03:01:10.000000000 +0300
+++ 0.2-beta1/0.2/label.cpp 2009-02-11 11:15:12.000000000 +0300
@@ -18,6 +18,7 @@
*/
#include <QGraphicsWidget>
#include <QGraphicsLinearLayout>
+#include <QStringList>
#include <plasma/widgets/label.h>
#include "label.h"
@@ -40,7 +41,14 @@
void Label::setText ( const QString &str )
{
- m_label->setText ( str );
+ QStringList strList = str.split("|");
+ if( strList.count() > 1 )
+ {
+ setColor( QColor(strList[0]) );
+ strList.removeAt(0);
+ }
+ QString outstr = strList.join("|");
+ m_label->setText ( outstr );
layout ()->setPreferredSize ( m_label->nativeWidget ()->sizeHint () );
/*delete layout ();
@@ -61,4 +69,4 @@
return m_label->nativeWidget ()->palette ().color ( QPalette::WindowText );
}
-#include "label.moc"
\ В конце файла нет новой строки
+#include "label.moc"

@ -0,0 +1,30 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit kde eutils
MY_P="0.2-beta1"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Plasmoid executes a process and captures its stdout output stream"
HOMEPAGE="http://kde-look.org/content/show.php/STDIN+Plasmoid?content=92309"
SRC_URI="http://kde-look.org/CONTENT/content-files/92309-0.2-beta1.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND="
>=kde-base/kdelibs-4.2.0
>=dev-util/cmake-2.4"
src_compile() {
epatch "${FILESDIR}/color.patch"
cmake -DCMAKE_INSTALL_PREFIX=/usr/ || die "cmake failed"
emake || die "emake failed"
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}

@ -0,0 +1,3 @@
AUX paste.patch 1177 RMD160 b443e02573bbc62094fe2724e26242d7c868143c SHA1 848a81f7b9e74f341bec6d47fc09d4ba5982d5a2 SHA256 a098f21aa89b3fc05df264edbc20982d93ec5e6f6dd5548b098f20c05e8c3815
DIST 97511-translatoid0.4.1.tar.gz 132268 RMD160 5fe3b3aaa1c328c925b6f8fa87be5093ddee1b52 SHA1 1c3f7dc8402dda705ddfb103ac3b10cffa888f1f SHA256 f5e417ea2cf56ede5fe9a683ae659f63cb0c7326a0483e5531eb4fea399a661b
EBUILD translatoid-0.4.1.ebuild 730 RMD160 b95aba41abe0d8359ffdfc0d5768fddb86dd594f SHA1 19e916b55790cdb2745d2231d1edf253c61d415e SHA256 224371bc5dd8df1af438111871919d6bd26bf764dc1a037c29d49b83100927c0

@ -0,0 +1,34 @@
diff -uNr translatoid2.old/ktranslatoid.cpp translatoid2/ktranslatoid.cpp
--- translatoid2.old/ktranslatoid.cpp 2009-01-31 15:57:29.000000000 +0300
+++ translatoid2/ktranslatoid.cpp 2009-02-11 12:53:30.000000000 +0300
@@ -34,6 +34,8 @@
#include <QGraphicsRectItem>
#include <QToolButton>
#include <KPushButton>
+#include <QApplication>
+#include <QClipboard>
#include <QLabel>
KTranslatoid ::KTranslatoid (QObject *parent, const QVariantList &args)
: Plasma::PopupApplet(parent, args)
@@ -68,9 +70,9 @@
setAspectRatioMode(Plasma::IgnoreAspectRatio);
- m_languageA.code = "fr";
- m_languageA.name= "french";
- m_languageA.icon = "kbflags/fr.png";
+ m_languageA.code = "ru";
+ m_languageA.name= "russe";
+ m_languageA.icon = "kbflags/ru.png";
m_languageB.code = "en";
m_languageB.name= "english";
@@ -279,7 +281,7 @@
void KTranslatoid::paste()
{
m_textEditA->nativeWidget()->clear();
- m_textEditA->nativeWidget()->paste();
+ m_textEditA->nativeWidget()->setText(QApplication::clipboard()->text(QClipboard::Selection));
}
//==========================================================================================

@ -0,0 +1,30 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit kde eutils
MY_P="translatoid2"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Translator using google translator"
HOMEPAGE="http://kde-look.org/content/show.php/translatoid?content=97511"
SRC_URI="http://kde-look.org/CONTENT/content-files/97511-translatoid0.4.1.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND="
>=kde-base/kdelibs-4.2.0
>=dev-util/cmake-2.4"
src_compile() {
epatch "${FILESDIR}/paste.patch"
cmake -DCMAKE_INSTALL_PREFIX=/usr/ || die "cmake failed"
emake || die "emake failed"
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}
Loading…
Cancel
Save