diff options
Diffstat (limited to 'source/kde')
66 files changed, 683 insertions, 396 deletions
diff --git a/source/kde/KDE.SlackBuild b/source/kde/KDE.SlackBuild index 19f6ba5b..048c09e9 100755 --- a/source/kde/KDE.SlackBuild +++ b/source/kde/KDE.SlackBuild @@ -17,6 +17,10 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR # Get the kde environment variables [ -d kdebase ] && eval $(sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" ./kdebase/profile.d/kde.sh) +# These, and polkit-qt-1 from git, will be needed soon, but are too new to use here. +# polkit-kde-agent-1 \ +# polkit-kde-kcmodules-1 " + KDEMODS=" \ polkit-qt-1 \ kdelibs \ diff --git a/source/kde/KDE.options b/source/kde/KDE.options index 730f3f46..16ae672c 100644 --- a/source/kde/KDE.options +++ b/source/kde/KDE.options @@ -3,7 +3,7 @@ # usually has a different version number), or by setting your own # environment variables. -[ -z $VERSION ] && export VERSION=4.4.3 +[ -z $VERSION ] && export VERSION=4.5.5 [ -z $BUILD ] && export BUILD=1 # Automatically determine the architecture we're building on: diff --git a/source/kde/KDE_extra.SlackBuild b/source/kde/KDE_extra.SlackBuild index 9b702457..d76c18e6 100755 --- a/source/kde/KDE_extra.SlackBuild +++ b/source/kde/KDE_extra.SlackBuild @@ -18,8 +18,8 @@ KDEMODS=" \ kdevplatform \ kdevelop \ konq-plugins \ - guidance-power-manager \ kopete-cryptography \ + libktorrent \ ktorrent \ skanlite \ koffice \ diff --git a/source/kde/amarok/local.options b/source/kde/amarok/local.options index b086e127..c9623084 100644 --- a/source/kde/amarok/local.options +++ b/source/kde/amarok/local.options @@ -1 +1 @@ -VERSION=2.3.0 +VERSION=2.4.0 diff --git a/source/kde/guidance-power-manager/local.options b/source/kde/guidance-power-manager/local.options deleted file mode 100644 index dc6e9bd4..00000000 --- a/source/kde/guidance-power-manager/local.options +++ /dev/null @@ -1 +0,0 @@ -VERSION=4.4.0 diff --git a/source/kde/guidance-power-manager/slack-desc b/source/kde/guidance-power-manager/slack-desc deleted file mode 100644 index e0c200cc..00000000 --- a/source/kde/guidance-power-manager/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -guidance-power-manager: guidance-power-manager (KDE4 power manager daemon) -guidance-power-manager: -guidance-power-manager: This is a frontend to HAL's power features for KDE. -guidance-power-manager: -guidance-power-manager: It supports screen brightness, battery level, plugged/unplugged -guidance-power-manager: notices, and laptop lid closing actions. -guidance-power-manager: -guidance-power-manager: -guidance-power-manager: -guidance-power-manager: -guidance-power-manager: diff --git a/source/kde/k3b/local.options b/source/kde/k3b/local.options index c085ca95..30cc24d0 100644 --- a/source/kde/k3b/local.options +++ b/source/kde/k3b/local.options @@ -1,2 +1,2 @@ -VERSION=1.91.0 -BUILD=3 +VERSION=2.0.2 +BUILD=2 diff --git a/source/kde/kaudiocreator/local.options b/source/kde/kaudiocreator/local.options index 9ec4f05c..758a383e 100644 --- a/source/kde/kaudiocreator/local.options +++ b/source/kde/kaudiocreator/local.options @@ -1,2 +1,2 @@ -VERSION=r1118889 +VERSION=r1212483 BUILD=1 diff --git a/source/kde/kdeadmin/knetworkconf.diff b/source/kde/kdeadmin/knetworkconf.diff index ed5dbeeb..425499d1 100644 --- a/source/kde/kdeadmin/knetworkconf.diff +++ b/source/kde/kdeadmin/knetworkconf.diff @@ -1,40 +1,43 @@ ---- ./knetworkconf/backends/platform.pl.cmake.orig 2009-07-28 14:43:49.000000000 -0500 -+++ ./knetworkconf/backends/platform.pl.cmake 2010-05-03 20:53:00.000000000 -0500 -@@ -93,6 +93,9 @@ +--- ./knetworkconf/backends/platform.pl.cmake.orig 2010-07-06 01:54:42.000000000 -0500 ++++ ./knetworkconf/backends/platform.pl.cmake 2011-03-13 16:43:44.000000000 -0500 +@@ -93,6 +93,10 @@ "slackware-9.1.0" => "Slackware 9.1.0", "slackware-10.0.0" => "Slackware 10.0.0", "slackware-10.1.0" => "Slackware 10.1.0", + "slackware-12.2.0" => "Slackware 12.2.0", + "slackware-13.0.0.0.0" => "Slackware 13.0.0.0.0", + "slackware-13.1.0" => "Slackware 13.1.0", ++ "slackware-13.37.0" => "Slackware 13.37.0", "freebsd-4" => "FreeBSD 4", "freebsd-5" => "FreeBSD 5", "freebsd-6" => "FreeBSD 6", ---- ./knetworkconf/backends/network-conf.cmake.orig 2009-07-28 14:43:49.000000000 -0500 -+++ ./knetworkconf/backends/network-conf.cmake 2010-05-03 20:53:48.000000000 -0500 -@@ -77,7 +77,8 @@ +--- ./knetworkconf/backends/network-conf.cmake.orig 2010-07-06 01:54:42.000000000 -0500 ++++ ./knetworkconf/backends/network-conf.cmake 2011-03-13 16:43:13.000000000 -0500 +@@ -77,7 +77,9 @@ "mandriva-2006.1", "mandriva-2007.0", "mandriva-2007.1", "mandriva-2008.0", "mandriva-2008.1", "mandriva-2009.0", "mandriva-2009.1", "mandriva-2010.0", "vine-3.0", "vine-3.1", - "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", + "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-12.2.0", "slackware-13.0.0.0.0", + "slackware-13.1.0", - "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "ark"); ++ "slackware-13.37.0", + "freebsd-5", "freebsd-6", "freebsd-7", "freebsd-8", "freebsd-9", + "gentoo", "vlos-1.2", "ark"); - $description =<<"end_of_description;"; ---- ./knetworkconf/backends/service.pl.cmake.orig 2009-07-28 14:43:49.000000000 -0500 -+++ ./knetworkconf/backends/service.pl.cmake 2010-05-03 20:54:07.000000000 -0500 -@@ -281,6 +281,9 @@ +--- ./knetworkconf/backends/service.pl.cmake.orig 2010-07-06 01:54:42.000000000 -0500 ++++ ./knetworkconf/backends/service.pl.cmake 2011-03-13 16:42:51.000000000 -0500 +@@ -281,6 +281,10 @@ "slackware-9.1.0" => "slackware-9.1.0", "slackware-10.0.0" => "slackware-9.1.0", "slackware-10.1.0" => "slackware-9.1.0", + "slackware-12.2.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", + "slackware-13.1.0" => "slackware-9.1.0", ++ "slackware-13.37.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "gentoo", -@@ -314,7 +317,11 @@ +@@ -317,7 +321,11 @@ "nonetwork" => "RECOVER" }, "freebsd-5" => {"rc" => "GRAPHICAL" }, @@ -47,49 +50,53 @@ ); $distro = $dist_map{$gst_dist}; ---- ./knetworkconf/backends/network.pl.cmake.orig 2009-07-28 14:43:49.000000000 -0500 -+++ ./knetworkconf/backends/network.pl.cmake 2010-05-03 20:55:09.000000000 -0500 -@@ -537,6 +537,9 @@ +--- ./knetworkconf/backends/network.pl.cmake.orig 2010-07-06 01:54:42.000000000 -0500 ++++ ./knetworkconf/backends/network.pl.cmake 2011-03-13 16:42:24.000000000 -0500 +@@ -528,6 +528,10 @@ "slackware-9.1.0" => "redhat-6.2", "slackware-10.0.0" => "redhat-6.2", "slackware-10.1.0" => "redhat-6.2", + "slackware-12.2.0" => "redhat-6.2", + "slackware-13.0.0.0.0" => "redhat-6.2", + "slackware-13.1.0" => "redhat-6.2", ++ "slackware-13.37.0" => "redhat-6.2", "gentoo" => "debian-2.2", "vlos-1.2" => "debian-2.2", "freebsd-5" => "debian-2.2", -@@ -1839,6 +1842,9 @@ +@@ -1833,6 +1837,10 @@ "slackware-9.1.0" => \&gst_network_deb22_get_file, "slackware-10.0.0" => \&gst_network_deb22_get_file, "slackware-10.1.0" => \&gst_network_deb22_get_file, + "slackware-12.2.0" => \&gst_network_deb22_get_file, + "slackware-13.0.0.0.0" => \&gst_network_deb22_get_file, + "slackware-13.1.0" => \&gst_network_deb22_get_file, ++ "slackware-13.37.0" => \&gst_network_deb22_get_file, "gentoo" => \&gst_network_deb22_get_file, "freebsd-5" => \&gst_network_deb22_get_file, "freebsd-6" => \&gst_network_deb22_get_file, -@@ -3961,6 +3967,9 @@ +@@ -3958,6 +3966,10 @@ "slackware-9.1.0" => "", "slackware-10.0.0" => "", "slackware-10.1.0" => "", + "slackware-12.2.0" => "", + "slackware-13.0.0.0.0" => "", + "slackware-13.1.0" => "", ++ "slackware-13.37.0" => "", "gentoo" => "", "vlos-1.2" => "", "freebsd-5" => "", -@@ -4109,6 +4118,9 @@ +@@ -4109,6 +4121,10 @@ "slackware-9.1.0" => "slackware-9.1.0", "slackware-10.0.0" => "slackware-9.1.0", "slackware-10.1.0" => "slackware-9.1.0", + "slackware-12.2.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", + "slackware-13.1.0" => "slackware-9.1.0", ++ "slackware-13.37.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "vlos-1.2", "freebsd-5" => "freebsd-5", -@@ -4392,6 +4404,7 @@ +@@ -4395,6 +4411,7 @@ [ "hostname", \&gst_parse_fq_hostname, HOSTNAME ], [ "nameserver", \&gst_parse_split_all_unique_hash_comment, RESOLV_CONF, "nameserver", "[ \t]+" ], [ "searchdomain", \&gst_parse_split_first_array_unique, RESOLV_CONF, "search", "[ \t]+", "[ \t]+" ], @@ -97,27 +104,29 @@ [ "domain", \&gst_parse_split_first_str, RESOLV_CONF, "domain", "[ \t]+" ], [ "order", \&gst_parse_split_first_array, HOST_CONF, "order", "[ \t]+", ",[ \t]*" ], [ "hostmatch", \&gst_parse_split_first_bool, HOST_CONF, "multi", "[ \t]+" ], -@@ -4608,6 +4621,9 @@ +@@ -4611,6 +4628,10 @@ "slackware-9.1.0" => "slackware-9.1.0", "slackware-10.0.0" => "slackware-9.1.0", "slackware-10.1.0" => "slackware-9.1.0", + "slackware-12.2.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", + "slackware-13.1.0" => "slackware-9.1.0", ++ "slackware-13.37.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "vlos-1.2", "freebsd-5" => "freebsd-5", -@@ -5502,6 +5518,9 @@ +@@ -5508,6 +5529,10 @@ "slackware-9.1.0" => "slackware-9.1.0", "slackware-10.0.0" => "slackware-9.1.0", "slackware-10.1.0" => "slackware-9.1.0", + "slackware-12.2.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", + "slackware-13.1.0" => "slackware-9.1.0", ++ "slackware-13.37.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "vlos-1.2", "freebsd-5" => "freebsd-5", -@@ -5772,6 +5791,7 @@ +@@ -5781,6 +5806,7 @@ [ "hostname", \&gst_replace_fq_hostname, HOSTNAME, "%hostname%", "%domain%" ], [ "hostname", \&gst_network_run_hostname ], [ "gateway", \&gst_replace_rcinet1conf_global, RC_INET_CONF, GATEWAY ], @@ -125,13 +134,14 @@ [ "domain", \&gst_replace_join_first_str, RESOLV_CONF, "domain", "[ \t]+" ], [ "nameserver", \&gst_replace_join_all, RESOLV_CONF, "nameserver", "[ \t]+" ], [ "searchdomain", \&gst_replace_join_first_array, RESOLV_CONF, "search", "[ \t]+", "[ \t]+" ], -@@ -5951,6 +5971,9 @@ +@@ -5960,6 +5986,10 @@ "slackware-9.1.0" => "slackware-9.1.0", "slackware-10.0.0" => "slackware-9.1.0", "slackware-10.1.0" => "slackware-9.1.0", + "slackware-12.2.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", + "slackware-13.1.0" => "slackware-9.1.0", ++ "slackware-13.37.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "vlos-1.2", "freebsd-5" => "freebsd-5", diff --git a/source/kde/kdenetwork/local.options b/source/kde/kdeadmin/local.options index aae3c765..aae3c765 100644 --- a/source/kde/kdenetwork/local.options +++ b/source/kde/kdeadmin/local.options diff --git a/source/kde/kdeartwork/local.options b/source/kde/kdeartwork/local.options new file mode 100644 index 00000000..aae3c765 --- /dev/null +++ b/source/kde/kdeartwork/local.options @@ -0,0 +1 @@ +BUILD=2 diff --git a/source/kde/kdebase-runtime/local.options b/source/kde/kdebase-runtime/local.options new file mode 100644 index 00000000..aae3c765 --- /dev/null +++ b/source/kde/kdebase-runtime/local.options @@ -0,0 +1 @@ +BUILD=2 diff --git a/source/kde/kdebase-workspace/kcmshell_root_privilege.patch b/source/kde/kdebase-workspace/kcmshell_root_privilege.patch deleted file mode 100644 index f81a98ed..00000000 --- a/source/kde/kdebase-workspace/kcmshell_root_privilege.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp~ 2009-12-11 00:14:03.000000000 +0100 -+++ kdebase-workspace-4.3.85/systemsettings/core/ModuleView.cpp 2009-12-22 15:47:35.000000000 +0100 -@@ -40,6 +40,7 @@ - #include <KCModuleProxy> - #include <KStandardGuiItem> - #include <KDialogButtonBox> -+#include <KStandardDirs> - #include <kauthaction.h> - - #include "MenuItem.h" -@@ -129,6 +130,32 @@ - return; - } - -+ if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) { -+ QString kdesu = KStandardDirs::findExe( "kdesu" ); -+ QString cmd = menuItem->service()->exec().trimmed(); -+ -+ /* Prepare the process to run the kcmshell */ -+ if ( cmd.left(5) == "kdesu" ) -+ { -+ cmd = cmd.remove(0,5).trimmed(); -+ -+ /* Remove all kdesu switches */ -+ while ( cmd.length() > 1 && cmd[ 0 ] == '-' ) -+ cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed(); -+ } -+ -+ if ( cmd.left(9) == "kcmshell4" ) -+ cmd = cmd.remove(0,9).trimmed(); -+ -+ QStringList args; -+ args << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() ); -+ -+ kDebug() << "Starting root module: " << args; -+ QProcess::startDetached( kdesu, args ); -+ -+ return; -+ } -+ - QList<KCModuleInfo*> modules; - if ( menuItem->children().empty() ) { - modules << &menuItem->item(); diff --git a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild index 1dd46d61..91b27dd3 100755 --- a/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild +++ b/source/kde/kdebase-workspace/kdebase-workspace.SlackBuild @@ -53,8 +53,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -cat $CWD/kcmshell_root_privilege.patch | patch -p1 --verbose || exit 1 - # Increase the timeout to accomodate slow-to-initialize video chipset drivers: zcat $CWD/kdebase-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || exit 1 @@ -92,6 +90,9 @@ $PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/shar # this? Even the kdmrc file says this is supposed to be the default. sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \ $PKG/usr/share/config/kdm/kdmrc +# We are also not ready to create a separate 'kdm' non-root user: +sed -i 's/GreeterUID=kdm/#&/' \ + $PKG/usr/share/config/kdm/kdmrc mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig diff --git a/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff index 56deff54..4dd98484 100644 --- a/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff +++ b/source/kde/kdebase-workspace/kdebase-workspace.kdm.server.timeout.diff @@ -1,10 +1,10 @@ ---- ./kdm/config.def.orig 2010-02-26 12:32:20.000000000 -0600 -+++ ./kdm/config.def 2010-05-03 22:11:48.000000000 -0500 -@@ -1332,9 +1332,9 @@ +--- ./kdm/config.def.orig 2010-09-30 16:20:21.000000000 -0500 ++++ ./kdm/config.def 2010-12-01 19:13:02.356002453 -0600 +@@ -1343,9 +1343,9 @@ Key: ServerTimeout Type: int --Default: 15 +-Default: 30 +Default: 45 User: core -Instance: #:*/ diff --git a/source/kde/kdebase-workspace/xinit/xinitrc.kde b/source/kde/kdebase-workspace/xinit/xinitrc.kde index 5e11a9ac..a33eb06c 100755 --- a/source/kde/kdebase-workspace/xinit/xinitrc.kde +++ b/source/kde/kdebase-workspace/xinit/xinitrc.kde @@ -25,4 +25,8 @@ if [ -f $usermodmap ]; then fi # Start the window manager: -ck-launch-session startkde +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + ck-launch-session startkde +else + startkde +fi diff --git a/source/kde/kdebase/kdebase.SlackBuild b/source/kde/kdebase/kdebase.SlackBuild index 89ff3a50..53732fb5 100755 --- a/source/kde/kdebase/kdebase.SlackBuild +++ b/source/kde/kdebase/kdebase.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -54,6 +54,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# patch a problem where closing a konsole tab breaks the right-click context menu: +zcat $CWD/konsole_right_click-185466.patch.gz | patch --verbose -p2 || exit 1 +zcat $CWD/konsole_right_click-185466.patch.patch.gz | patch --verbose -p1 || exit 1 + mkdir -p build cd build cmake \ diff --git a/source/kde/kdebase/konsole_right_click-185466.patch b/source/kde/kdebase/konsole_right_click-185466.patch new file mode 100644 index 00000000..a3e19ab5 --- /dev/null +++ b/source/kde/kdebase/konsole_right_click-185466.patch @@ -0,0 +1,99 @@ +Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp ++++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.cpp +@@ -86,6 +86,8 @@ MainWindow::MainWindow() + connect( _viewManager , SIGNAL(empty()) , this , SLOT(close()) ); + connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this , + SLOT(activeViewChanged(SessionController*)) ); ++ connect( _viewManager , SIGNAL(unplugController(SessionController*)) , this , ++ SLOT(disconnectController(SessionController*)) ); + connect( _viewManager , SIGNAL(viewPropertiesChanged(const QList<ViewProperties*>&)) , + bookmarkHandler() , SLOT(setViews(const QList<ViewProperties*>&)) ); + +Index: tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/MainWindow.h ++++ tmp/kdebase-4.5.5/apps/konsole/src/MainWindow.h +@@ -161,6 +161,7 @@ class MainWindow : public KXmlGuiWindow + void showShortcutsDialog(); + void newFromProfile(Profile::Ptr profile); + void activeViewChanged(SessionController* controller); ++ void disconnectController(SessionController* controller); + void activeViewTitleChanged(ViewProperties*); + + void sessionListChanged(const QList<QAction*>& actions); +@@ -179,7 +180,6 @@ class MainWindow : public KXmlGuiWindow + void setupActions(); + void setupWidgets(); + QString activeSessionDir() const; +- void disconnectController(SessionController* controller); + + // sets the active shortcuts of actions in 'dest' to the shortcuts of actions + // with the same name in 'source' (see KAction::ActiveShortcut) +Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp ++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.cpp +@@ -376,6 +376,10 @@ void ViewManager::sessionFinished() + } + } + ++ // This is needed to remove this controller from factory() in ++ // order to prevent BUG: 185466 - disappearing menu popup ++ if (_pluggedController) ++ emit unplugController(_pluggedController); + } + + void ViewManager::focusActiveView() +@@ -744,6 +748,9 @@ void ViewManager::viewCloseRequest(QWidg + focusActiveView(); + updateDetachViewState(); + } ++ if (_pluggedController) ++ emit unplugController(_pluggedController); ++ + } + + TerminalDisplay* ViewManager::createTerminalDisplay(Session* session) +Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewManager.h ++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewManager.h +@@ -175,6 +175,12 @@ signals: + void activeViewChanged(SessionController* controller); + + /** ++ * Emitted when the current session needs to be unplugged from factory(). ++ * @param controller The controller associated with the view ++ */ ++ void unplugController(SessionController* controller); ++ ++ /** + * Emitted when the list of view properties ( as returned by viewProperties() ) changes. + * This occurs when views are added to or removed from the active container, or + * if the active container is changed. +Index: tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp +=================================================================== +--- tmp.orig/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp ++++ tmp/kdebase-4.5.5/apps/konsole/src/ViewContainer.cpp +@@ -448,6 +448,7 @@ TabbedViewContainer::TabbedViewContainer + _closeTabButton->setIcon(KIcon("tab-close")); + _closeTabButton->adjustSize(); + _closeTabButton->setHidden(true); ++ _closeTabButton->setEnabled(false); + + connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) ); + connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) ); +@@ -500,9 +501,11 @@ TabbedViewContainer::TabbedViewContainer + i18nc("@action:inmenu", "&Rename Tab..."), this, + SLOT(tabContextMenuRenameTab())); + ++/* bug 185466 + _contextPopupMenu->addAction(KIcon("tab-close"), + i18nc("@action:inmenu", "&Close Tab"), this, + SLOT(tabContextMenuCloseTab())); ++*/ + + } + void TabbedViewContainer::setNewViewMenu(QMenu* menu) diff --git a/source/kde/kdebase/konsole_right_click-185466.patch.patch b/source/kde/kdebase/konsole_right_click-185466.patch.patch new file mode 100644 index 00000000..8e6f6c68 --- /dev/null +++ b/source/kde/kdebase/konsole_right_click-185466.patch.patch @@ -0,0 +1,11 @@ +--- ./apps/konsole/src/ViewContainer.cpp.orig 2011-04-04 15:05:38.000000000 -0500 ++++ ./apps/konsole/src/ViewContainer.cpp 2011-04-04 15:08:58.000000000 -0500 +@@ -448,7 +448,7 @@ + _closeTabButton->setIcon(KIcon("tab-close")); + _closeTabButton->adjustSize(); + _closeTabButton->setHidden(true); +- _closeTabButton->setEnabled(false); ++ _closeTabButton->setEnabled(true); + + connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) ); + connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) ); diff --git a/source/kde/kdebase/local.options b/source/kde/kdebase/local.options new file mode 100644 index 00000000..a837340d --- /dev/null +++ b/source/kde/kdebase/local.options @@ -0,0 +1 @@ +BUILD=3 diff --git a/source/kde/kdebase/module_manager_include.diff b/source/kde/kdebase/module_manager_include.diff deleted file mode 100644 index 498b2afb..00000000 --- a/source/kde/kdebase/module_manager_include.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h 2009/11/13 18:46:51 1048689 -+++ trunk/KDE/kdebase/apps/konqueror/sidebar/module_manager.h 2010/01/07 20:09:11 1071281 -@@ -18,6 +18,9 @@ - Boston, MA 02110-1301, USA. - */ - -+#ifndef MODULE_MANAGER_H -+#define MODULE_MANAGER_H -+ - #include <QStringList> - #include <kservice.h> - class KConfigGroup; -@@ -74,3 +77,5 @@ - KConfigGroup *m_config; // owned by SidebarWidget - QString m_localPath; // local path - }; -+ -+#endif - diff --git a/source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff b/source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff new file mode 100644 index 00000000..b925f97c --- /dev/null +++ b/source/kde/kdebindings/kdebindings.1170602.sip_4_11_x.diff @@ -0,0 +1,66 @@ +Index: python/pykde4/sip/kdecore/typedefs.sip +=================================================================== +--- python/pykde4/sip/kdecore/typedefs.sip (revision 1170601) ++++ python/pykde4/sip/kdecore/typedefs.sip (revision 1170602) +@@ -733,61 +733,6 @@ + }; + + +-%MappedType QList<uint> +-{ +-%TypeHeaderCode +-#include <qlist.h> +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) { +- PyObject *pobj; +- +-#if PY_MAJOR_VERSION >= 3 +- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) { +-#else +- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) { +-#endif +- Py_DECREF(l); +- +- return NULL; +- } +- +- PyList_SET_ITEM(l, i, pobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- return PyList_Check(sipPy); +- +- QList<uint> *ql = new QList<uint>; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +-#if PY_MAJOR_VERSION >= 3 +- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i))); +-#else +- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); +-#endif +- } +- +- *sipCppPtr = ql; +- +- return sipGetState(sipTransferObj); +-%End +-}; +- +- + template <TYPE*> + %MappedType QStack<TYPE*> + { diff --git a/source/kde/kdebindings/kdebindings.SlackBuild b/source/kde/kdebindings/kdebindings.SlackBuild index 21df45de..c07ab1ab 100755 --- a/source/kde/kdebindings/kdebindings.SlackBuild +++ b/source/kde/kdebindings/kdebindings.SlackBuild @@ -50,6 +50,8 @@ cd kdebindings-$VERSION zcat $CWD/kdebindings-len-ptr-rfloat.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/kdebindings-ruby-env.h.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/kdebindings-rubyconfig.h.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/kdebindings.1170602.sip_4_11_x.diff.gz | patch -p0 --verbose || exit 1 +( cd python/pykde4/tools/pykdeuic4 ; zcat $CWD/pykdeuic4.patch.gz | patch -p0 --verbose || exit 1 ) || exit 1 chown -R root:root . find . \ @@ -58,6 +60,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Set 'vendorarch' (install location for vendor shipped +# architecture dependent perl modules): +eval $(perl '-V:vendorarch') + # -DENABLE_PYKDE4:BOOL=OFF \ mkdir -p build cd build @@ -69,6 +75,7 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ + -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_QYOTO:BOOL=OFF \ diff --git a/source/kde/kdebindings/pykdeuic4.patch b/source/kde/kdebindings/pykdeuic4.patch new file mode 100644 index 00000000..7cd77946 --- /dev/null +++ b/source/kde/kdebindings/pykdeuic4.patch @@ -0,0 +1,22 @@ +Index: pykdeuic4.py +=================================================================== +--- pykdeuic4.py (revisione 1209658) ++++ pykdeuic4.py (copia locale) +@@ -39,7 +39,7 @@ + def __init__(self,string): + original_i18n_string.__init__(self,string) + def __str__(self): +- return "kdecore.i18n(\"%s\")" % (qtproxies.escape(self.string),) ++ return "kdecore.i18n(\"%s\")" % (qtproxies.as_string(self.string),) + qtproxies.i18n_string = kde_i18n_string + + def kdeFilter(): +@@ -71,7 +71,7 @@ + indenter.indentwidth = indent + comp = compiler.UICompiler() + comp.factory._cwFilters.append(kdeFilter()) +- winfo = comp.compileUi(uifile, output) ++ winfo = comp.compileUi(uifile, output, "") + + if exe: + output.write(""" diff --git a/source/kde/kdegraphics/kdegraphics.SlackBuild b/source/kde/kdegraphics/kdegraphics.SlackBuild index a33ffbcc..dd957444 100755 --- a/source/kde/kdegraphics/kdegraphics.SlackBuild +++ b/source/kde/kdegraphics/kdegraphics.SlackBuild @@ -47,8 +47,6 @@ echo "Building kdegraphics-$VERSION..." tar xvf $CWD/../src/kdegraphics-$VERSION.tar.?z* || exit 1 cd kdegraphics-$VERSION -zcat $CWD/kdegraphics.gwenview.jpeg8.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -68,7 +66,7 @@ cd build -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. - make $NUMJOBS || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - diff --git a/source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff b/source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff deleted file mode 100644 index 8d509f4d..00000000 --- a/source/kde/kdegraphics/kdegraphics.gwenview.jpeg8.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ./gwenview/lib/jpegcontent.cpp.orig 2009-05-14 12:26:10.000000000 -0500 -+++ ./gwenview/lib/jpegcontent.cpp 2010-05-17 21:08:10.000000000 -0500 -@@ -455,9 +455,8 @@ - - // Init transformation - jpeg_transform_info transformoption; -+ memset(&transformoption, 0, sizeof(jpeg_transform_info)); - transformoption.transform = findJxform(d->mTransformMatrix); -- transformoption.force_grayscale = false; -- transformoption.trim = false; - jtransform_request_workspace(&srcinfo, &transformoption); - - /* Read source file as DCT coefficients */ diff --git a/source/kde/kdegraphics/local.options b/source/kde/kdegraphics/local.options index aae3c765..a837340d 100644 --- a/source/kde/kdegraphics/local.options +++ b/source/kde/kdegraphics/local.options @@ -1 +1 @@ -BUILD=2 +BUILD=3 diff --git a/source/kde/kdelibs/kdelibs.SlackBuild b/source/kde/kdelibs/kdelibs.SlackBuild index aa6ddde0..94e67287 100755 --- a/source/kde/kdelibs/kdelibs.SlackBuild +++ b/source/kde/kdelibs/kdelibs.SlackBuild @@ -47,6 +47,12 @@ echo "Building kdelibs-$VERSION..." tar xvf $CWD/../src/kdelibs-$VERSION.tar.?z* || exit 1 cd kdelibs-$VERSION +# Slackware ships a different version of XML DTDs: +zcat $CWD/kdelibs.docbook.patch.gz | patch -p1 --verbose || exit 1 + +# Security fix: +zcat $CWD/kdelibs.khtml.CVE-2011-1168.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -67,7 +73,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DKDE_DISTRIBUTION_TEXT="volkerdi@slackware.com" \ .. - make $NUMJOBS || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - diff --git a/source/kde/kdelibs/kdelibs.docbook.patch b/source/kde/kdelibs/kdelibs.docbook.patch new file mode 100644 index 00000000..6a20cd27 --- /dev/null +++ b/source/kde/kdelibs/kdelibs.docbook.patch @@ -0,0 +1,11 @@ +--- kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake.orig 2010-05-27 19:25:00.000000000 +0200 ++++ kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake 2010-06-07 16:18:35.000000000 +0200 +@@ -12,7 +12,7 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-set (DOCBOOKXML_CURRENTDTD_VERSION "4.2" ++set (DOCBOOKXML_CURRENTDTD_VERSION "4.5" + CACHE INTERNAL "Required version of XML DTDs") + + set (DTD_PATH_LIST diff --git a/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff new file mode 100644 index 00000000..356f30a6 --- /dev/null +++ b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff @@ -0,0 +1,14 @@ +--- a/khtml/khtml_part.cpp ++++ b/khtml/khtml_part.cpp +@@ -1803,7 +1803,10 @@ void KHTMLPart::htmlError( int errorCode + stream >> errorName >> techName >> description >> causes >> solutions; + + QString url, protocol, datetime; +- url = Qt::escape( reqUrl.prettyUrl() ); ++ ++ // This is somewhat confusing, but we have to escape the externally- ++ // controlled URL twice: once for i18n, and once for HTML. ++ url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ); + protocol = reqUrl.protocol(); + datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(), + KLocale::LongDate ); diff --git a/source/kde/kdelibs/local.options b/source/kde/kdelibs/local.options new file mode 100644 index 00000000..aae3c765 --- /dev/null +++ b/source/kde/kdelibs/local.options @@ -0,0 +1 @@ +BUILD=2 diff --git a/source/kde/kdenetwork/kdenetwork.SlackBuild b/source/kde/kdenetwork/kdenetwork.SlackBuild index 9ff64fb9..8f93627d 100755 --- a/source/kde/kdenetwork/kdenetwork.SlackBuild +++ b/source/kde/kdenetwork/kdenetwork.SlackBuild @@ -47,9 +47,6 @@ echo "Building kdenetwork-$VERSION..." tar xvf $CWD/../src/kdenetwork-$VERSION.tar.?z* || exit 1 cd kdenetwork-$VERSION -# CVE-2010-1000 and CVE-2010-1511: -zcat $CWD/kget.kde44.CVE-2010-1000-1511.diff.gz | patch -p0 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff b/source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff deleted file mode 100644 index fdabbff0..00000000 --- a/source/kde/kdenetwork/kget.kde44.CVE-2010-1000-1511.diff +++ /dev/null @@ -1,212 +0,0 @@ -Index: kget/transfer-plugins/metalink/metalink.cpp -=================================================================== ---- kget/transfer-plugins/metalink/metalink.cpp (revision 1124973) -+++ kget/transfer-plugins/metalink/metalink.cpp (revision 1124974) -@@ -99,6 +99,7 @@ - void Metalink::metalinkInit(const KUrl &src, const QByteArray &data) - { - kDebug(5001); -+ - bool justDownloaded = !m_localMetalinkLocation.isValid(); - if (!src.isEmpty()) - { -@@ -121,7 +122,9 @@ - //error - if (!m_metalink.isValid()) - { -- kDebug(5001) << "Unknown error when trying to load the .metalink-file"; -+ kError(5001) << "Unknown error when trying to load the .metalink-file. Metalink is not valid."; -+ setStatus(Job::Aborted); -+ setTransferChange(Tc_Status, true); - return; - } - -@@ -202,7 +205,7 @@ - if (!m_dataSourceFactory.size()) - { - KMessageBox::error(0, i18n("Download failed, no working URLs were found."), i18n("Error")); -- setStatus(Job::Aborted, i18n("An error occurred...."), SmallIcon("document-preview")); -+ setStatus(Job::Aborted); - setTransferChange(Tc_Status, true); - return; - } -@@ -227,16 +230,29 @@ - ui.treeView->hideColumn(FileItem::SignatureVerified); - dialog->setMainWidget(widget); - dialog->setCaption(i18n("File Selection")); -- dialog->setButtons(KDialog::Ok); -- connect(dialog, SIGNAL(finished()), this, SLOT(filesSelected())); -+ dialog->setButtons(KDialog::Ok | KDialog::Cancel); -+ connect(dialog, SIGNAL(finished(int)), this, SLOT(fileDlgFinished(int))); - - dialog->show(); - } - } - --void Metalink::filesSelected() -+void Metalink::fileDlgFinished(int result) - { -+ //BEGIN HACK if the dialog was not accepted untick every file, so that the download does not start -+ //generally setStatus should do the job as well, but does not as it appears -+ if (result != QDialog::Accepted) { -+ for (int row = 0; row < fileModel()->rowCount(); ++row) { -+ QModelIndex index = fileModel()->index(row, FileItem::File); -+ if (index.isValid()) { -+ fileModel()->setData(index, Qt::Unchecked, Qt::CheckStateRole); -+ } -+ } -+ } -+ //END -+ - QModelIndexList files = fileModel()->fileIndexes(FileItem::File); -+ int numFilesSelected = 0; - foreach (const QModelIndex &index, files) - { - const KUrl dest = fileModel()->getUrl(index); -@@ -244,6 +260,9 @@ - if (m_dataSourceFactory.contains(dest)) - { - m_dataSourceFactory[dest]->setDoDownload(doDownload); -+ if (doDownload) { -+ ++numFilesSelected; -+ } - } - } - -@@ -252,9 +271,15 @@ - processedSizeChanged(); - speedChanged(); - -+ //no files selected to download or dialog rejected, stop the download -+ if (!numFilesSelected || (result != QDialog::Accepted)) { -+ setStatus(Job::Stopped);//FIXME -+ setTransferChange(Tc_Status, true); -+ return; -+ } -+ - //some files may be set to download, so start them as long as the transfer is not stopped -- if (status() != Job::Stopped) -- { -+ if (status() != Job::Stopped) { - startMetalink(); - } - } -Index: kget/transfer-plugins/metalink/metalink.h -=================================================================== ---- kget/transfer-plugins/metalink/metalink.h (revision 1124973) -+++ kget/transfer-plugins/metalink/metalink.h (revision 1124974) -@@ -81,7 +81,7 @@ - - private Q_SLOTS: - void metalinkInit(const KUrl &url = KUrl(), const QByteArray &data = QByteArray()); -- void filesSelected(); -+ void fileDlgFinished(int result); - void totalSizeChanged(KIO::filesize_t size); - void processedSizeChanged(); - void speedChanged(); -Index: kget/ui/metalinkcreator/metalinker.h -=================================================================== ---- kget/ui/metalinkcreator/metalinker.h (revision 1124973) -+++ kget/ui/metalinkcreator/metalinker.h (revision 1124974) -@@ -259,6 +259,14 @@ - KIO::filesize_t size; - CommonData data; - Resources resources; -+ -+ private: -+ /** -+ * Controlls if the name attribute is valid, i.e. it is not empty and -+ * does not contain any directory traversal directives or information, -+ * as described in the Metalink 4.0 specification 4.1.2.1. -+ */ -+ bool isValidNameAttribute() const; - }; - - class Files -Index: kget/ui/metalinkcreator/metalinker.cpp -=================================================================== ---- kget/ui/metalinkcreator/metalinker.cpp (revision 1124973) -+++ kget/ui/metalinkcreator/metalinker.cpp (revision 1124974) -@@ -528,14 +528,14 @@ - - bool KGetMetalink::File::isValid() const - { -- return !name.isEmpty() && resources.isValid(); -+ return isValidNameAttribute() && resources.isValid(); - } - - void KGetMetalink::File::load(const QDomElement &e) - { - data.load(e); - -- name = e.attribute("name"); -+ name = QUrl::fromPercentEncoding(e.attribute("name").toAscii()); - size = e.firstChildElement("size").text().toULongLong(); - - verification.load(e); -@@ -575,6 +575,22 @@ - resources.clear(); - } - -+ -+bool KGetMetalink::File::isValidNameAttribute() const -+{ -+ if (name.isEmpty()) { -+ kError(5001) << "Name attribute of Metalink::File is empty."; -+ return false; -+ } -+ -+ if (name.contains(QRegExp("$(\\.\\.?)?/")) || name.contains("/../") || name.endsWith("/..")) { -+ kError(5001) << "Name attribute of Metalink::File contains directory traversal directives:" << name; -+ return false; -+ } -+ -+ return true; -+} -+ - #ifdef HAVE_NEPOMUK - QHash<QUrl, Nepomuk::Variant> KGetMetalink::File::properties() const - { -@@ -584,13 +600,28 @@ - - bool KGetMetalink::Files::isValid() const - { -- bool isValid = !files.empty(); -- foreach (const File &file, files) -- { -- isValid &= file.isValid(); -+ if (files.isEmpty()) { -+ return false; - } - -- return isValid; -+ QStringList fileNames; -+ foreach (const File &file, files) { -+ fileNames << file.name; -+ if (!file.isValid()) { -+ return false; -+ } -+ } -+ -+ //The value of name must be unique for each file -+ while (!fileNames.isEmpty()) { -+ const QString fileName = fileNames.takeFirst(); -+ if (fileNames.contains(fileName)) { -+ kError(5001) << "Metalink::File name" << fileName << "exists multiple times."; -+ return false; -+ } -+ } -+ -+ return true; - } - - void KGetMetalink::Files::load(const QDomElement &e) -@@ -751,7 +782,7 @@ - - for (QDomElement elem = filesElem.firstChildElement("file"); !elem.isNull(); elem = elem.nextSiblingElement("file")) { - File file; -- file.name = elem.attribute("name"); -+ file.name = QUrl::fromPercentEncoding(elem.attribute("name").toAscii()); - file.size = elem.firstChildElement("size").text().toULongLong(); - - file.data = parseCommonData(elem); diff --git a/source/kde/kdepim-runtime/local.options b/source/kde/kdepim-runtime/local.options new file mode 100644 index 00000000..bab1fcbd --- /dev/null +++ b/source/kde/kdepim-runtime/local.options @@ -0,0 +1 @@ +VERSION=4.4.10 diff --git a/source/kde/kdepim/local.options b/source/kde/kdepim/local.options new file mode 100644 index 00000000..bab1fcbd --- /dev/null +++ b/source/kde/kdepim/local.options @@ -0,0 +1 @@ +VERSION=4.4.10 diff --git a/source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff b/source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff new file mode 100644 index 00000000..85a216dd --- /dev/null +++ b/source/kde/kdepimlibs/kdepimlibs-4.5.imap4.cpp.r1216162.diff @@ -0,0 +1,13 @@ +Index: branches/KDE/4.5/kdepimlibs/kioslave/imap4/imap4.cpp +=================================================================== +--- branches/KDE/4.5/kdepimlibs/kioslave/imap4/imap4.cpp (revision 1216161) ++++ branches/KDE/4.5/kdepimlibs/kioslave/imap4/imap4.cpp (revision 1216162) +@@ -2577,7 +2577,7 @@ + ssize_t copyLen = (len < readBufferLen) ? len : readBufferLen; + memcpy(data, readBuffer, copyLen); + readBufferLen -= copyLen; +- if (readBufferLen) memcpy(readBuffer, &readBuffer[copyLen], readBufferLen); ++ if (readBufferLen) memmove(readBuffer, &readBuffer[copyLen], readBufferLen); + return copyLen; + } + if (!isConnected()) return 0; diff --git a/source/kde/kdepimlibs/kdepimlibs.SlackBuild b/source/kde/kdepimlibs/kdepimlibs.SlackBuild index 9fe4b1b8..1cd30a67 100755 --- a/source/kde/kdepimlibs/kdepimlibs.SlackBuild +++ b/source/kde/kdepimlibs/kdepimlibs.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 @@ -46,6 +46,9 @@ cd $TMP echo "Building kdepimlibs-$VERSION..." tar xvf $CWD/../src/kdepimlibs-$VERSION.tar.?z* || exit 1 cd kdepimlibs-$VERSION + +zcat $CWD/kdepimlibs-4.5.imap4.cpp.r1216162.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 \) \ diff --git a/source/kde/kdepimlibs/local.options b/source/kde/kdepimlibs/local.options new file mode 100644 index 00000000..aae3c765 --- /dev/null +++ b/source/kde/kdepimlibs/local.options @@ -0,0 +1 @@ +BUILD=2 diff --git a/source/kde/kdevelop/local.options b/source/kde/kdevelop/local.options index 59095fb9..1e0de715 100644 --- a/source/kde/kdevelop/local.options +++ b/source/kde/kdevelop/local.options @@ -1 +1 @@ -VERSION=4.0.0 +VERSION=4.2.2 diff --git a/source/kde/kdevplatform/local.options b/source/kde/kdevplatform/local.options index 624badec..a9a3ac1c 100644 --- a/source/kde/kdevplatform/local.options +++ b/source/kde/kdevplatform/local.options @@ -1 +1 @@ -VERSION=1.0.0 +VERSION=1.2.2 diff --git a/source/kde/koffice/koffice.SlackBuild b/source/kde/koffice/koffice.SlackBuild index d7332bf5..a87d36e7 100755 --- a/source/kde/koffice/koffice.SlackBuild +++ b/source/kde/koffice/koffice.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -47,8 +47,6 @@ echo "Building koffice-$VERSION..." tar xvf $CWD/../src/koffice-$VERSION.tar.?z* || exit 1 cd koffice-$VERSION -zcat $CWD/koffice.krita.png14.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -62,13 +60,12 @@ cd build $KDE_OPT_ARGS \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. - make $NUMJOBS || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - @@ -76,6 +73,19 @@ if [ -d $PKG/usr/man ]; then gzip -9 $PKG/usr/man/man?/* fi +if [ ! -r $PKG/usr/bin/kformula ]; then # wtf?? + echo "Kludging KFormula installation..." + cp -a build/kformula/kformula $PKG/usr/bin/kformula || exit 1 + cp -a build/lib/kformulapart.so $PKG/usr/lib${LIBDIRSUFFIX}/kde4/kformulapart.so || exit 1 + cp -a build/lib/libkdeinit_kformula.so $PKG/usr/lib${LIBDIRSUFFIX}/libkdeinit_kformula.so || exit 1 + cp -a kformula/kformula.desktop $PKG/usr/share/applications/kde4/kformula.desktop || exit 1 + mkdir -p $PKG/usr/share/apps/kformula || exit 1 + cp -a kformula/kformula.rc $PKG/usr/share/apps/kformula/kformula.rc || exit 1 + cp -a kformula/kformula_readonly.rc $PKG/usr/share/apps/kformula/kformula_readonly.rc || exit 1 + cp -a kformula/tips $PKG/usr/share/apps/kformula/tips || exit 1 + cp -a kformula/kformulapart.desktop $PKG/usr/share/kde4/services/kformulapart.desktop || exit 1 +fi + mkdir -p $PKG/usr/doc/koffice-$VERSION cp -a AUTHORS COPYING* README* $PKG/usr/doc/koffice-$VERSION diff --git a/source/kde/koffice/koffice.krita.png14.diff b/source/kde/koffice/koffice.krita.png14.diff deleted file mode 100644 index 252107de..00000000 --- a/source/kde/koffice/koffice.krita.png14.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./krita/ui/kis_png_converter.cpp.orig 2010-01-08 04:42:41.000000000 -0600 -+++ ./krita/ui/kis_png_converter.cpp 2010-02-25 12:01:11.000000000 -0600 -@@ -404,7 +404,7 @@ - - png_byte signature[8]; - iod->peek((char*)signature, 8); -- if (!png_check_sig(signature, 8)) { -+ if (!(png_sig_cmp(signature, 0, 8) == 0)) { - iod->close(); - return (KisImageBuilder_RESULT_BAD_FETCH); - } diff --git a/source/kde/koffice/local.options b/source/kde/koffice/local.options index d98d655d..504bb683 100644 --- a/source/kde/koffice/local.options +++ b/source/kde/koffice/local.options @@ -1,2 +1,2 @@ -VERSION=2.1.2 +VERSION=2.3.3 BUILD=2 diff --git a/source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch b/source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch new file mode 100644 index 00000000..02614605 --- /dev/null +++ b/source/kde/konq-plugins/konq-plugins-4.4.0-qt47.patch @@ -0,0 +1,12 @@ +diff -up konq-plugins-4.4.0/adblock/adblock.cpp.qt47 konq-plugins-4.4.0/adblock/adblock.cpp +--- konq-plugins-4.4.0/adblock/adblock.cpp.qt47 2010-09-07 15:51:03.776797042 -0500 ++++ konq-plugins-4.4.0/adblock/adblock.cpp 2010-09-07 15:51:47.901818132 -0500 +@@ -300,7 +300,7 @@ void AdBlock::updateFilters() + // ---------------------------------------------------------------------------- + + AdElement::AdElement() : +- m_url(0), m_category(0), m_type(0), m_blocked(false) {} ++ m_blocked(false) {} + + AdElement::AdElement(const QString &url, const QString &category, + const QString &type, bool blocked, const DOM::Node&node) : diff --git a/source/kde/konq-plugins/konq-plugins.SlackBuild b/source/kde/konq-plugins/konq-plugins.SlackBuild index 870e6081..472f8b50 100755 --- a/source/kde/konq-plugins/konq-plugins.SlackBuild +++ b/source/kde/konq-plugins/konq-plugins.SlackBuild @@ -46,6 +46,9 @@ cd $TMP echo "Building konq-plugins-$VERSION..." tar xvf $CWD/../src/extragear/konq-plugins-$VERSION.tar.?z* || exit 1 cd konq-plugins-$VERSION + +zcat $CWD/konq-plugins-4.4.0-qt47.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/kde/konq-plugins/local.options b/source/kde/konq-plugins/local.options index dc6e9bd4..d0a81e8b 100644 --- a/source/kde/konq-plugins/local.options +++ b/source/kde/konq-plugins/local.options @@ -1 +1,2 @@ VERSION=4.4.0 +BUILD=2 diff --git a/source/kde/ktorrent/local.options b/source/kde/ktorrent/local.options index b95a478a..8b19ba5f 100644 --- a/source/kde/ktorrent/local.options +++ b/source/kde/ktorrent/local.options @@ -1 +1 @@ -VERSION=3.3.4 +VERSION=4.0.5 diff --git a/source/kde/guidance-power-manager/guidance-power-manager.SlackBuild b/source/kde/libktorrent/libktorrent.SlackBuild index 5147c978..468039ae 100755 --- a/source/kde/guidance-power-manager/guidance-power-manager.SlackBuild +++ b/source/kde/libktorrent/libktorrent.SlackBuild @@ -1,7 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2008 Robby Workman, Northport, AL, USA +# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,11 +20,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PKGNAM=guidance-power-manager CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +PKG=$TMP/package-libktorrent # Set the config option variables if they are not already set: if [ -r ../KDE.options ]; then @@ -44,12 +42,10 @@ fi rm -rf $PKG mkdir -p $TMP $PKG - cd $TMP -echo "Building $PKGNAM-$VERSION..." -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/../src/extragear/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +echo "Building libktorrent-$VERSION..." +tar xvf $CWD/../src/extragear/libktorrent-${VERSION}.tar.?z* || exit 1 +cd libktorrent-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -63,24 +59,32 @@ cd build $KDE_OPT_ARGS \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. - make $NUMJOBS || exit 1 - make install DESTDIR=$PKG || exit 1 + make $NUMJOBS || exit 1 + make install DESTDIR=$PKG || exit 1 cd - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + +mkdir -p $PKG/usr/doc/libktorrent-$VERSION +cp -a COPYING* ChangeLog \ + $PKG/usr/doc/libktorrent-$VERSION -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a README $PKG/usr/doc/$PKGNAM-$VERSION +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/libktorrent-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz diff --git a/source/kde/libktorrent/local.options b/source/kde/libktorrent/local.options new file mode 100644 index 00000000..dd52e8e3 --- /dev/null +++ b/source/kde/libktorrent/local.options @@ -0,0 +1 @@ +VERSION=1.0.5-3 diff --git a/source/kde/libktorrent/slack-desc b/source/kde/libktorrent/slack-desc new file mode 100644 index 00000000..e8334401 --- /dev/null +++ b/source/kde/libktorrent/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libktorrent: libktorrent (Protocol library for the KDE BitTorrent program) +libktorrent: +libktorrent: Libktorrent is the BitTorrent protocol library for ktorrent, which +libktorrent: contains all the torrent downloading code. Although it is closely +libktorrent: to ktorrent, the goal is to make libktorrent an independent library +libktorrent: which can be used by other applications. +libktorrent: +libktorrent: Homepage: http://ktorrent.org +libktorrent: +libktorrent: +libktorrent: diff --git a/source/kde/polkit-kde-1/local.options b/source/kde/polkit-kde-1/local.options index 711ed9e8..4e14dd77 100644 --- a/source/kde/polkit-kde-1/local.options +++ b/source/kde/polkit-kde-1/local.options @@ -1,2 +1,2 @@ -#VERSION=0.95.1 -VERSION=r1120537 +VERSION=r1145544 +BUILD=2 diff --git a/source/kde/polkit-kde-1/polkit-kde-1.SlackBuild b/source/kde/polkit-kde-1/polkit-kde-1.SlackBuild index eab0d56b..eb896170 100755 --- a/source/kde/polkit-kde-1/polkit-kde-1.SlackBuild +++ b/source/kde/polkit-kde-1/polkit-kde-1.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 @@ -48,6 +48,8 @@ echo "Building polkit-kde-1-$VERSION..." tar xvf $CWD/../src/polkit-kde-1-$VERSION.tar.?z* || exit 1 cd polkit-kde-1-$VERSION +zcat $CWD/polkit-kde-1.nodrkonqi.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff b/source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff new file mode 100644 index 00000000..60fd8b7b --- /dev/null +++ b/source/kde/polkit-kde-1/polkit-kde-1.nodrkonqi.diff @@ -0,0 +1,17 @@ +--- ./agent/main.cpp.orig 2010-07-05 10:08:40.000000000 -0500 ++++ ./agent/main.cpp 2011-03-30 18:52:38.636002143 -0500 +@@ -21,11 +21,14 @@ + #include <KCmdLineArgs> + #include <KAboutData> + #include <KLocale> ++#include <cstdlib> + + #include "policykitkde.h" + + int main(int argc, char *argv[]) + { ++ setenv("KDE_DEBUG", "true", 1); ++ + KAboutData aboutData("policykit1-kde", "polkit-kde-authentication-agent-1", ki18n("PolicyKit1-KDE"), "0.96.1", + ki18n("PolicyKit1-KDE"), KAboutData::License_GPL, + ki18n("(c) 2009 Red Hat, Inc.")); diff --git a/source/kde/polkit-kde-agent-1/local.options b/source/kde/polkit-kde-agent-1/local.options new file mode 100644 index 00000000..416b9670 --- /dev/null +++ b/source/kde/polkit-kde-agent-1/local.options @@ -0,0 +1 @@ +VERSION=20101202git diff --git a/source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild b/source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild new file mode 100755 index 00000000..d49026a1 --- /dev/null +++ b/source/kde/polkit-kde-agent-1/polkit-kde-agent-1.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-polkit-kde-agent-1 + + +# Set the config option variables if they are not already set: +if [ -r ../KDE.options ]; then + . ../KDE.options +fi + +# The global options may be overridden here (if needed): +if [ -r ./local.options ]; then + . ./local.options +fi + +# Avoid a version number in .la files: +if [ -d /usr/lib${LIBDIRSUFFIX}/kde ]; then + QTDIR=/usr/lib${LIBDIRSUFFIX}/kde +fi + +rm -rf $PKG +mkdir -p $PKG/usr +cd $TMP +echo "Building polkit-kde-agent-1-$VERSION..." +tar xvf $CWD/../src/polkit-kde-agent-1-$VERSION.tar.?z* || exit 1 +cd polkit-kde-agent-1-$VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + +mkdir -p $PKG/usr/doc/polkit-kde-agent-1-$VERSION +cp -a \ + COPYING* README* \ + $PKG/usr/doc/polkit-kde-agent-1-$VERSION + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/polkit-kde-agent-1-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1 b/source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1 new file mode 100644 index 00000000..34da1087 --- /dev/null +++ b/source/kde/polkit-kde-agent-1/pull-polkit-kde-agent-1 @@ -0,0 +1,6 @@ +rm -rf polkit-kde-agent-1 +git clone git://anongit.kde.org/polkit-kde-agent-1 +( cd polkit-kde-agent-1 && rm -rf .git* ) +mv polkit-kde-agent-1 polkit-kde-agent-1-$(date +%Y%m%d)git +tar cf polkit-kde-agent-1-$(date +%Y%m%d)git.tar polkit-kde-agent-1-$(date +%Y%m%d)git +xz -9 polkit-kde-agent-1-$(date +%Y%m%d)git.tar diff --git a/source/kde/polkit-kde-agent-1/slack-desc b/source/kde/polkit-kde-agent-1/slack-desc new file mode 100644 index 00000000..8b6f29ba --- /dev/null +++ b/source/kde/polkit-kde-agent-1/slack-desc @@ -0,0 +1,18 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler-----------------------------------------------------| +polkit-kde-agent-1: polkit-kde-agent-1 (KDE polkit authenticator) +polkit-kde-agent-1: +polkit-kde-agent-1: This is a polkit authenticator for KDE. +polkit-kde-agent-1: +polkit-kde-agent-1: +polkit-kde-agent-1: +polkit-kde-agent-1: +polkit-kde-agent-1: +polkit-kde-agent-1: +polkit-kde-agent-1: diff --git a/source/kde/polkit-kde-kcmodules-1/local.options b/source/kde/polkit-kde-kcmodules-1/local.options new file mode 100644 index 00000000..416b9670 --- /dev/null +++ b/source/kde/polkit-kde-kcmodules-1/local.options @@ -0,0 +1 @@ +VERSION=20101202git diff --git a/source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild b/source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild new file mode 100755 index 00000000..1a3bde05 --- /dev/null +++ b/source/kde/polkit-kde-kcmodules-1/polkit-kde-kcmodules-1.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-polkit-kde-kcmodules-1 + + +# Set the config option variables if they are not already set: +if [ -r ../KDE.options ]; then + . ../KDE.options +fi + +# The global options may be overridden here (if needed): +if [ -r ./local.options ]; then + . ./local.options +fi + +# Avoid a version number in .la files: +if [ -d /usr/lib${LIBDIRSUFFIX}/kde ]; then + QTDIR=/usr/lib${LIBDIRSUFFIX}/kde +fi + +rm -rf $PKG +mkdir -p $PKG/usr +cd $TMP +echo "Building polkit-kde-kcmodules-1-$VERSION..." +tar xvf $CWD/../src/polkit-kde-kcmodules-1-$VERSION.tar.?z* || exit 1 +cd polkit-kde-kcmodules-1-$VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + +mkdir -p $PKG/usr/doc/polkit-kde-kcmodules-1-$VERSION +cp -a \ + COPYING* README* \ + $PKG/usr/doc/polkit-kde-kcmodules-1-$VERSION + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/polkit-kde-kcmodules-1-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1 b/source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1 new file mode 100644 index 00000000..de50ef5a --- /dev/null +++ b/source/kde/polkit-kde-kcmodules-1/pull-polkit-kde-kcmodules-1 @@ -0,0 +1,6 @@ +rm -rf polkit-kde-kcmodules-1 +git clone git://anongit.kde.org/polkit-kde-kcmodules-1 +( cd polkit-kde-kcmodules-1 && rm -rf .git* ) +mv polkit-kde-kcmodules-1 polkit-kde-kcmodules-1-$(date +%Y%m%d)git +tar cf polkit-kde-kcmodules-1-$(date +%Y%m%d)git.tar polkit-kde-kcmodules-1-$(date +%Y%m%d)git +xz -9 polkit-kde-kcmodules-1-$(date +%Y%m%d)git.tar diff --git a/source/kde/polkit-kde-kcmodules-1/slack-desc b/source/kde/polkit-kde-kcmodules-1/slack-desc new file mode 100644 index 00000000..57c6169a --- /dev/null +++ b/source/kde/polkit-kde-kcmodules-1/slack-desc @@ -0,0 +1,18 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler-----------------------------------------------------| +polkit-kde-kcmodules-1: polkit-kde-kcmodules (KDE polkit kcmodules) +polkit-kde-kcmodules-1: +polkit-kde-kcmodules-1: This package contains the kcm_polkit modules for KDE. +polkit-kde-kcmodules-1: +polkit-kde-kcmodules-1: +polkit-kde-kcmodules-1: +polkit-kde-kcmodules-1: +polkit-kde-kcmodules-1: +polkit-kde-kcmodules-1: +polkit-kde-kcmodules-1: diff --git a/source/kde/polkit-qt-1/local.options b/source/kde/polkit-qt-1/local.options index c40c7ac4..80b46a0a 100644 --- a/source/kde/polkit-qt-1/local.options +++ b/source/kde/polkit-qt-1/local.options @@ -1,2 +1,3 @@ #VERSION=0.95.1 -VERSION=r1118744 +VERSION=r1145513 +BUILD=2 diff --git a/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild b/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild index 646b6ebb..c2126b95 100755 --- a/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild +++ b/source/kde/polkit-qt-1/polkit-qt-1.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -48,6 +48,8 @@ echo "Building polkit-qt-1-$VERSION..." tar xvf $CWD/../src/polkit-qt-1-$VERSION.tar.?z* || exit 1 cd polkit-qt-1-$VERSION +zcat $CWD/polkit-qt-1.null-checking.diff.gz | patch -p0 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff b/source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff new file mode 100644 index 00000000..0ec2a8e3 --- /dev/null +++ b/source/kde/polkit-qt-1/polkit-qt-1.null-checking.diff @@ -0,0 +1,14 @@ +Index: agent/polkitqt1-agent-listener.cpp +=================================================================== +--- agent/polkitqt1-agent-listener.cpp (revision 1183495) ++++ agent/polkitqt1-agent-listener.cpp (working copy) +@@ -66,7 +66,8 @@ + qDebug("Destroying listener"); + + ListenerAdapter::instance()->removeListener(this); +- g_object_unref(d->listener); ++ if (d->listener != NULL) ++ g_object_unref(d->listener); + } + + bool Listener::registerListener(PolkitQt1::Subject *subject, const QString &objectPath) diff --git a/source/kde/polkit-qt-1/pull-polkit-qt-1 b/source/kde/polkit-qt-1/pull-polkit-qt-1 new file mode 100644 index 00000000..42d64877 --- /dev/null +++ b/source/kde/polkit-qt-1/pull-polkit-qt-1 @@ -0,0 +1,6 @@ +rm -rf polkit-qt-1 +git clone git://anongit.kde.org/polkit-qt-1 +( cd polkit-qt-1 && rm -rf .git* ) +mv polkit-qt-1 polkit-qt-1-$(date +%Y%m%d)git +tar cf polkit-qt-1-$(date +%Y%m%d)git.tar polkit-qt-1-$(date +%Y%m%d)git +xz -9 polkit-qt-1-$(date +%Y%m%d)git.tar diff --git a/source/kde/skanlite/local.options b/source/kde/skanlite/local.options index e7ebfea9..a62bafe0 100644 --- a/source/kde/skanlite/local.options +++ b/source/kde/skanlite/local.options @@ -1 +1 @@ -VERSION=0.4-kde4.4.0 +VERSION=0.7 |