summaryrefslogtreecommitdiff
path: root/source/kde/kdebase-runtime
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kdebase-runtime')
-rw-r--r--source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff14
-rwxr-xr-xsource/kde/kdebase-runtime/kdebase-runtime.SlackBuild6
-rw-r--r--source/kde/kdebase-runtime/local.options1
-rw-r--r--source/kde/kdebase-runtime/slack-desc2
4 files changed, 3 insertions, 20 deletions
diff --git a/source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff b/source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff
deleted file mode 100644
index 811f922e..00000000
--- a/source/kde/kdebase-runtime/kdebase-runtime-text-render-969192.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: trunk/KDE/kdebase/runtime/kstyles/oxygen/oxygen.cpp
-===================================================================
---- trunk/KDE/kdebase/runtime/kstyles/oxygen/oxygen.cpp (revision 969191)
-+++ trunk/KDE/kdebase/runtime/kstyles/oxygen/oxygen.cpp (revision 969192)
-@@ -3067,7 +3067,8 @@
-
- if (const QStyleOptionToolButton* tbOpt = qstyleoption_cast<const QStyleOptionToolButton*>(option)) {
- if ((!tbOpt->icon.isNull()) && (!tbOpt->text.isEmpty()) && tbOpt->toolButtonStyle == Qt::ToolButtonTextUnderIcon)
-- size.setHeight(size.height()-9);
-+ // TODO: Make this font size dependent
-+ size.setHeight(size.height()-5);
- }
-
- // We want to avoid super-skiny buttons, for things like "up" when icons + text
diff --git a/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild b/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild
index 90b25549..0b2cddc8 100755
--- a/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild
+++ b/source/kde/kdebase-runtime/kdebase-runtime.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -47,9 +47,6 @@ echo "Building kdebase-runtime-$VERSION..."
tar xvf $CWD/../src/kdebase-runtime-$VERSION.tar.?z* || exit 1
cd kdebase-runtime-$VERSION
-# Fix a bug where the top and bottom of text is improperly cropped:
-zcat $CWD/kdebase-runtime-text-render-969192.diff.gz | patch -p4 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -60,6 +57,7 @@ find . \
mkdir -p build
cd build
cmake \
+ $KDE_OPT_ARGS \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/source/kde/kdebase-runtime/local.options b/source/kde/kdebase-runtime/local.options
deleted file mode 100644
index aae3c765..00000000
--- a/source/kde/kdebase-runtime/local.options
+++ /dev/null
@@ -1 +0,0 @@
-BUILD=2
diff --git a/source/kde/kdebase-runtime/slack-desc b/source/kde/kdebase-runtime/slack-desc
index 0b8de17b..09bf5774 100644
--- a/source/kde/kdebase-runtime/slack-desc
+++ b/source/kde/kdebase-runtime/slack-desc
@@ -5,7 +5,7 @@
# exactly 11 lines for the formatting to be correct. It's also customary to
# leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-kdebase-runtime: kdebase-runtime
+kdebase-runtime: kdebase-runtime (KDE runtime core)
kdebase-runtime:
kdebase-runtime: This package contains core components of the KDE base runtime module.
kdebase-runtime: