diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-07-04 19:39:36 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-07-04 19:39:36 +0000 |
| commit | 3491a5043bbc0dcbc5daf88687e37526ec8b0841 (patch) | |
| tree | fd07129b0c440c5a288143ea205cf8cd04ebda3b /x11/kdelibs3 | |
| parent | Update to 3.0.2 (full log): (diff) | |
Update to 3.0.2 -- full log available in ports/x11/kde3/Makefile,v 1.51.
Notes
Notes:
svn path=/head/; revision=62445
Diffstat (limited to 'x11/kdelibs3')
| -rw-r--r-- | x11/kdelibs3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs3/distinfo | 2 | ||||
| -rw-r--r-- | x11/kdelibs3/files/patch-kdecore-kiconloader.cpp | 55 |
3 files changed, 3 insertions, 58 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 62c8a4fdff0b..98f7ab0f5d0a 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdelibs -PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTVERSION= ${KDE_VERSION} CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -36,6 +35,7 @@ SOMINOR= 0 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +PREFIX?= ${KDE_PREFIX} CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install .include "${.CURDIR}/../kde3/Makefile.kde" diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index e3b0d1a9d84b..530b93986456 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdelibs-3.0.1.tar.bz2) = 3a9b75af1d8916194cae27935c1c59d5 +MD5 (KDE/kdelibs-3.0.2.tar.bz2) = 0ad90a338aed63e54d073f511a99f0f2 diff --git a/x11/kdelibs3/files/patch-kdecore-kiconloader.cpp b/x11/kdelibs3/files/patch-kdecore-kiconloader.cpp deleted file mode 100644 index 0fc6507298c4..000000000000 --- a/x11/kdelibs3/files/patch-kdecore-kiconloader.cpp +++ /dev/null @@ -1,55 +0,0 @@ ---- kdecore/kiconloader.cpp Wed May 8 14:27:24 2002 -+++ /home/alane/kiconloader-3.0.cpp Sat Jun 8 12:05:25 2002 -@@ -1,6 +1,6 @@ - /* vi: ts=8 sts=4 sw=4 - * -- * $Id: kiconloader.cpp,v 1.186 2002/03/18 00:27:25 carewolf Exp $ -+ * $Id: kiconloader.cpp,v 1.186.2.2 2002/06/03 11:14:08 faure Exp $ - * - * This file is part of the KDE project, module kdecore. - * Copyright (C) 2000 Geert Jansen <jansen@kde.org> -@@ -220,7 +220,7 @@ - d->mpGroups[i].size = config->readNumEntry("Size", 0); - d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false); - if (QPixmap::defaultDepth()>8) -- d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", false); -+ d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", true); - else - d->mpGroups[i].alphaBlending = false; - -@@ -266,21 +266,23 @@ - - void KIconLoader::addAppThemes(const QString& appname) - { -- KIconThemeNode *node = 0L; -- KIconTheme *theme = 0L; -- -- theme = new KIconTheme("hicolor", appname); -- if (theme->isValid()) -- node = new KIconThemeNode(theme); -- else -- delete theme; -- -- if (node) -+ if ( KIconTheme::current() != "hicolor" ) - { -- node->links.append(d->mpThemeRoot); -- d->mpThemeRoot = node; -+ KIconTheme *def = new KIconTheme(KIconTheme::current(), appname); -+ if (def->isValid()) -+ { -+ KIconThemeNode* node = new KIconThemeNode(def); -+ d->mpThemeRoot->links.append(node); -+ addBaseThemes(node, appname); -+ } -+ else -+ delete def; - } - -+ KIconTheme *def = new KIconTheme(QString::fromLatin1("hicolor"), appname); -+ KIconThemeNode* node = new KIconThemeNode(def); -+ d->mpThemeRoot->links.append(node); -+ addBaseThemes(node, appname); - } - - void KIconLoader::addBaseThemes(KIconThemeNode *node, const QString &appname) |