From da1be5a21ba06235b67a999f696ec66e35dc17a1 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 00:06:49 +0100 Subject: Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0. KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015 --- kde/patch/amarok.patch | 2 +- kde/patch/amarok/amarok_kdebug_320855.patch | 37 +++ kde/patch/amarok/amarok_kdebug_320855.patch.gz | Bin 797 -> 0 bytes kde/patch/baloo5.patch | 2 +- kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff | 69 +++++ kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff.gz | Bin 845 -> 0 bytes kde/patch/kde-baseapps.patch | 2 +- kde/patch/kde-baseapps/dolphin_kdebug_327224.patch | 57 ++++ .../kde-baseapps/dolphin_kdebug_327224.patch.gz | Bin 917 -> 0 bytes kde/patch/kde-cli-tools.patch | 4 +- kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch | 11 + kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz | Bin 237 -> 0 bytes .../kde-cli-tools/kde-cli-tools_kaboutdata.diff | 59 ++++ .../kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz | Bin 1073 -> 0 bytes kde/patch/kde-runtime.patch | 2 +- .../kde-runtime/kde-runtime.kdebug324470.diff | 49 ++++ .../kde-runtime/kde-runtime.kdebug324470.diff.gz | Bin 585 -> 0 bytes kde/patch/kde-workspace.patch | 6 +- .../kde-workspace/kde-workspace.batteryapplet.diff | 13 + .../kde-workspace.batteryapplet.diff.gz | Bin 301 -> 0 bytes .../kde-workspace/kde-workspace.desktopnames.diff | 34 +++ .../kde-workspace.desktopnames.diff.gz | Bin 545 -> 0 bytes .../kde-workspace.kdm.server.timeout.diff | 14 + .../kde-workspace.kdm.server.timeout.diff.gz | Bin 247 -> 0 bytes kde/patch/kdelibs.patch | 10 +- kde/patch/kdelibs/coding-style-fixes.patch | 62 ++++ kde/patch/kdelibs/coding-style-fixes.patch.gz | Bin 916 -> 0 bytes kde/patch/kdelibs/kdelibs.docbook.patch | 11 + kde/patch/kdelibs/kdelibs.docbook.patch.gz | Bin 361 -> 0 bytes kde/patch/kdelibs/kdelibs.upnp_conditional.patch | 15 + .../kdelibs/kdelibs.upnp_conditional.patch.gz | Bin 347 -> 0 bytes .../return-application-icons-properly.patch | 56 ++++ .../return-application-icons-properly.patch.gz | Bin 955 -> 0 bytes .../return-not-break.-copy-paste-error.patch | 31 ++ .../return-not-break.-copy-paste-error.patch.gz | Bin 572 -> 0 bytes kde/patch/kdelibs4support.patch | 2 +- kde/patch/kdelibs4support/update-FindGettext.patch | 36 +++ .../kdelibs4support/update-FindGettext.patch.gz | Bin 747 -> 0 bytes kde/patch/kdepim.patch | 2 +- .../kdepim/kdepim-install_kleopatra_headers.patch | 122 ++++++++ .../kdepim-install_kleopatra_headers.patch.gz | Bin 1193 -> 0 bytes kde/patch/kdepimlibs-framework.patch | 2 +- .../kdepimlibs-framework/kdepimlibs_autotests.diff | 10 + .../kdepimlibs_autotests.diff.gz | Bin 272 -> 0 bytes kde/patch/kdeplasma-addons.patch | 2 +- .../random_generator_cve-2013-2120.patch | 76 +++++ .../random_generator_cve-2013-2120.patch.gz | Bin 945 -> 0 bytes kde/patch/kdewebdev.patch | 2 +- kde/patch/kdewebdev/include-tidy.patch | 13 + kde/patch/kdewebdev/include-tidy.patch.gz | Bin 260 -> 0 bytes kde/patch/kinfocenter.patch | 2 +- kde/patch/kinfocenter/kinfocenter_libpci.patch | 13 + kde/patch/kinfocenter/kinfocenter_libpci.patch.gz | Bin 274 -> 0 bytes kde/patch/korundum.patch | 2 +- kde/patch/korundum/korundum_ruby19.patch | 31 ++ kde/patch/korundum/korundum_ruby19.patch.gz | Bin 488 -> 0 bytes kde/patch/milou.patch | 2 +- kde/patch/milou/milou_krunner_include.diff | 11 + kde/patch/milou/milou_krunner_include.diff.gz | Bin 212 -> 0 bytes kde/patch/oxygen-gtk3.patch | 2 +- .../oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch | 29 ++ .../oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch.gz | Bin 553 -> 0 bytes kde/patch/plasma-desktop.patch | 4 +- .../plasma-desktop-4.99.0_kfontinst_po.diff | 60 ++++ .../plasma-desktop-4.99.0_kfontinst_po.diff.gz | Bin 625 -> 0 bytes .../plasma-desktop_kdelibs4support.diff | 88 ++++++ .../plasma-desktop_kdelibs4support.diff.gz | Bin 1258 -> 0 bytes kde/patch/plasma-nm.patch | 2 +- kde/patch/plasma-nm/plasma-nm-fixes.patch | 322 +++++++++++++++++++++ kde/patch/plasma-nm/plasma-nm-fixes.patch.gz | Bin 3437 -> 0 bytes kde/patch/sddm-qt5.patch | 4 +- kde/patch/sddm-qt5/sddm_auth.diff | 25 ++ kde/patch/sddm-qt5/sddm_auth.diff.gz | Bin 379 -> 0 bytes kde/patch/sddm-qt5/sddm_consolekit.diff | 13 + kde/patch/sddm-qt5/sddm_consolekit.diff.gz | Bin 294 -> 0 bytes kde/patch/sddm-theme-breeze.patch | 2 +- .../sddm-theme-breeze/sddm-theme-breeze_path.diff | 10 + .../sddm-theme-breeze_path.diff.gz | Bin 395 -> 0 bytes kde/patch/strigi-multimedia.patch | 2 +- .../strigi-multimedia/strigi-multimedia_port.patch | 29 ++ .../strigi-multimedia_port.patch.gz | Bin 639 -> 0 bytes kde/patch/umbrello.patch | 2 +- kde/patch/umbrello/umbrello-4.11.4_listitem.patch | 13 + .../umbrello/umbrello-4.11.4_listitem.patch.gz | Bin 255 -> 0 bytes 84 files changed, 1450 insertions(+), 31 deletions(-) create mode 100644 kde/patch/amarok/amarok_kdebug_320855.patch delete mode 100644 kde/patch/amarok/amarok_kdebug_320855.patch.gz create mode 100644 kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff delete mode 100644 kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff.gz create mode 100644 kde/patch/kde-baseapps/dolphin_kdebug_327224.patch delete mode 100644 kde/patch/kde-baseapps/dolphin_kdebug_327224.patch.gz create mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch delete mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz create mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff delete mode 100644 kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz create mode 100644 kde/patch/kde-runtime/kde-runtime.kdebug324470.diff delete mode 100644 kde/patch/kde-runtime/kde-runtime.kdebug324470.diff.gz create mode 100644 kde/patch/kde-workspace/kde-workspace.batteryapplet.diff delete mode 100644 kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz create mode 100644 kde/patch/kde-workspace/kde-workspace.desktopnames.diff delete mode 100644 kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gz create mode 100644 kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff delete mode 100644 kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz create mode 100644 kde/patch/kdelibs/coding-style-fixes.patch delete mode 100644 kde/patch/kdelibs/coding-style-fixes.patch.gz create mode 100644 kde/patch/kdelibs/kdelibs.docbook.patch delete mode 100644 kde/patch/kdelibs/kdelibs.docbook.patch.gz create mode 100644 kde/patch/kdelibs/kdelibs.upnp_conditional.patch delete mode 100644 kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz create mode 100644 kde/patch/kdelibs/return-application-icons-properly.patch delete mode 100644 kde/patch/kdelibs/return-application-icons-properly.patch.gz create mode 100644 kde/patch/kdelibs/return-not-break.-copy-paste-error.patch delete mode 100644 kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz create mode 100644 kde/patch/kdelibs4support/update-FindGettext.patch delete mode 100644 kde/patch/kdelibs4support/update-FindGettext.patch.gz create mode 100644 kde/patch/kdepim/kdepim-install_kleopatra_headers.patch delete mode 100644 kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz create mode 100644 kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff delete mode 100644 kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz create mode 100644 kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch delete mode 100644 kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz create mode 100644 kde/patch/kdewebdev/include-tidy.patch delete mode 100644 kde/patch/kdewebdev/include-tidy.patch.gz create mode 100644 kde/patch/kinfocenter/kinfocenter_libpci.patch delete mode 100644 kde/patch/kinfocenter/kinfocenter_libpci.patch.gz create mode 100644 kde/patch/korundum/korundum_ruby19.patch delete mode 100644 kde/patch/korundum/korundum_ruby19.patch.gz create mode 100644 kde/patch/milou/milou_krunner_include.diff delete mode 100644 kde/patch/milou/milou_krunner_include.diff.gz create mode 100644 kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch delete mode 100644 kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch.gz create mode 100755 kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff delete mode 100755 kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz create mode 100644 kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff delete mode 100644 kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz create mode 100644 kde/patch/plasma-nm/plasma-nm-fixes.patch delete mode 100644 kde/patch/plasma-nm/plasma-nm-fixes.patch.gz create mode 100644 kde/patch/sddm-qt5/sddm_auth.diff delete mode 100644 kde/patch/sddm-qt5/sddm_auth.diff.gz create mode 100644 kde/patch/sddm-qt5/sddm_consolekit.diff delete mode 100644 kde/patch/sddm-qt5/sddm_consolekit.diff.gz create mode 100644 kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff delete mode 100644 kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff.gz create mode 100644 kde/patch/strigi-multimedia/strigi-multimedia_port.patch delete mode 100644 kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz create mode 100644 kde/patch/umbrello/umbrello-4.11.4_listitem.patch delete mode 100644 kde/patch/umbrello/umbrello-4.11.4_listitem.patch.gz (limited to 'kde/patch') diff --git a/kde/patch/amarok.patch b/kde/patch/amarok.patch index ffc66be..9fc3963 100644 --- a/kde/patch/amarok.patch +++ b/kde/patch/amarok.patch @@ -1,4 +1,4 @@ # Fix a crash in KDE 4.11: # See also https://bugs.kde.org/show_bug.cgi?id=320855 -zcat $CWD/patch/amarok/amarok_kdebug_320855.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/amarok/amarok_kdebug_320855.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/amarok/amarok_kdebug_320855.patch b/kde/patch/amarok/amarok_kdebug_320855.patch new file mode 100644 index 0000000..ce36100 --- /dev/null +++ b/kde/patch/amarok/amarok_kdebug_320855.patch @@ -0,0 +1,37 @@ +From: Hrvoje Senjan +Date: Mon, 10 Jun 2013 07:26:37 +0000 +Subject: Remove usage of (fake) Amarok-Mockup theme +X-Git-Tag: v2.7.90 +X-Git-Url: http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=e899704b3db4af2ff228eb0d4dbbec05fb9a2448 +--- +Remove usage of (fake) Amarok-Mockup theme + +This is due to https://bugs.kde.org/show_bug.cgi?id=320855 +Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11 +If it is still needed, or there is a better solution, i'll discard the review... + +From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan +Date: Sun, 9 Jun 2013 19:55:58 +0200 +Subject: [PATCH 1/1] Kill Amarok-Mockup + +BUG: 320855 +FIXED-IN: 2.8 +REVIEW: 110917 +--- + + +--- a/src/context/ContextView.cpp ++++ b/src/context/ContextView.cpp +@@ -78,11 +78,6 @@ + p.setColor( QPalette::Base, c ); + setPalette( p ); + +- PERF_LOG( "Accessing Plasma::Theme" ); +- // here we initialize all the Plasma paths to Amarok paths +- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false ); +- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" ); +- PERF_LOG( "Access to Plasma::Theme complete" ) + contextScene()->setAppletMimeType( "text/x-amarokappletservicename" ); + + cont->setPos( 0, 0 ); diff --git a/kde/patch/amarok/amarok_kdebug_320855.patch.gz b/kde/patch/amarok/amarok_kdebug_320855.patch.gz deleted file mode 100644 index ba0d690..0000000 Binary files a/kde/patch/amarok/amarok_kdebug_320855.patch.gz and /dev/null differ diff --git a/kde/patch/baloo5.patch b/kde/patch/baloo5.patch index e1836fd..794bcd9 100644 --- a/kde/patch/baloo5.patch +++ b/kde/patch/baloo5.patch @@ -1,3 +1,3 @@ # Adapt to changes in KAboutData (will be fixed in next release): -#zcat $CWD/patch/baloo5/baloo-4.96.0_kaboutdata.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/baloo5/baloo-4.96.0_kaboutdata.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff b/kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff new file mode 100644 index 0000000..36ec0d1 --- /dev/null +++ b/kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff @@ -0,0 +1,69 @@ +From: Andreas Hartmetz +Date: Wed, 14 May 2014 02:36:57 +0000 +Subject: Adapt to changes in KAboutData. +X-Git-Url: http://quickgit.kde.org/?p=baloo.git&a=commitdiff&h=46e3ea7828c8066e75bec87ba0a19d5ef3bd700a +--- +Adapt to changes in KAboutData. +--- + + +--- a/src/file/kcm/kcm.cpp ++++ b/src/file/kcm/kcm.cpp +@@ -58,8 +58,8 @@ + : KCModule(parent, args) + { + KAboutData* about = new KAboutData( +- "kcm_baloofile", "kcm_baloofile", i18n("Configure Desktop Search"), +- "0.1", QString(), KAboutData::License_GPL, ++ "kcm_baloofile", i18n("Configure Desktop Search"), ++ "0.1", QString(), KAboutLicense::GPL, + i18n("Copyright 2007-2010 Sebastian Trüg")); + about->addAuthor(i18n("Sebastian Trüg"), QString(), "trueg@kde.org"); + about->addAuthor(i18n("Vishesh Handa"), QString(), "vhanda@kde.org"); + +--- a/src/file/main.cpp ++++ b/src/file/main.cpp +@@ -44,9 +44,9 @@ + lowerSchedulingPriority(); + lowerPriority(); + +- KAboutData aboutData("baloo_file", "baloo_file", i18n("Baloo File"), "0.1", ++ KAboutData aboutData("baloo_file", i18n("Baloo File"), "0.1", + i18n("An application to handle file metadata"), +- KAboutData::License_LGPL_V2); ++ KAboutLicense::LGPL_V2); + aboutData.addAuthor(i18n("Vishesh Handa"), i18n("Maintainer"), "me@vhanda.in", "http://vhanda.in"); + + KAboutData::setApplicationData(aboutData); + +--- a/src/tools/baloosearch/main.cpp ++++ b/src/tools/baloosearch/main.cpp +@@ -55,11 +55,10 @@ + int main(int argc, char* argv[]) + { + KAboutData aboutData("baloosearch", +- "baloosearch", + i18n("Baloo Search"), + "0.1", + i18n("Baloo Search - A debugging tool"), +- KAboutData::License_GPL, ++ KAboutLicense::GPL, + i18n("(c) 2013, Vishesh Handa")); + aboutData.addAuthor(i18n("Vishesh Handa"), i18n("Maintainer"), "me@vhanda.in"); + + +--- a/src/tools/balooshow/main.cpp ++++ b/src/tools/balooshow/main.cpp +@@ -46,11 +46,10 @@ + int main(int argc, char* argv[]) + { + KAboutData aboutData("balooshow", +- "balooshow", + i18n("Baloo Show"), + "0.1", + i18n("The Baloo data Viewer - A debugging tool"), +- KAboutData::License_GPL, ++ KAboutLicense::GPL, + i18n("(c) 2012, Vishesh Handa")); + aboutData.addAuthor(i18n("Vishesh Handa"), i18n("Maintainer"), "me@vhanda.in"); + diff --git a/kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff.gz b/kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff.gz deleted file mode 100644 index e94d3ae..0000000 Binary files a/kde/patch/baloo5/baloo-4.96.0_kaboutdata.diff.gz and /dev/null differ diff --git a/kde/patch/kde-baseapps.patch b/kde/patch/kde-baseapps.patch index de218f2..988504d 100644 --- a/kde/patch/kde-baseapps.patch +++ b/kde/patch/kde-baseapps.patch @@ -1,5 +1,5 @@ # Fix for bug https://bugs.kde.org/show_bug.cgi?id=327224 # "Regression: Dolphin doesn't accept URLs containing a kio-slave as parameter" # Fixed in KDE 4.11.4. -#zcat $CWD/patch/kde-baseapps/dolphin_kdebug_327224.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kde-baseapps/dolphin_kdebug_327224.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kde-baseapps/dolphin_kdebug_327224.patch b/kde/patch/kde-baseapps/dolphin_kdebug_327224.patch new file mode 100644 index 0000000..8210d87 --- /dev/null +++ b/kde/patch/kde-baseapps/dolphin_kdebug_327224.patch @@ -0,0 +1,57 @@ +Revert "Files passed as arguments: Ignore unsupported files" + +This reverts commit cd9e50ae4f3ded5a78d0cfb09a67684a9c15d726. + +See bug#327224 for details. + +--- a/dolphin/src/dolphinmainwindow.cpp ++++ b/dolphin/src/dolphinmainwindow.cpp +@@ -31,7 +31,6 @@ + #include "panels/information/informationpanel.h" + #include "settings/dolphinsettingsdialog.h" + #include "statusbar/dolphinstatusbar.h" +-#include "views/dolphinview.h" + #include "views/dolphinviewactionhandler.h" + #include "views/dolphinremoteencoding.h" + #include "views/draganddrophelper.h" +@@ -244,20 +243,8 @@ + return; + } + +- // dirs could contain URLs that actually point to archives or other files. +- // Replace them by URLs we can open where possible and filter the rest out. +- QList urlsToOpen; +- foreach (const KUrl& rawUrl, dirs) { +- const KFileItem& item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, rawUrl); +- item.determineMimeType(); +- const KUrl& url = DolphinView::openItemAsFolderUrl(item); +- if (!url.isEmpty()) { +- urlsToOpen.append(url); +- } +- } +- +- if (urlsToOpen.count() == 1) { +- m_activeViewContainer->setUrl(urlsToOpen.first()); ++ if (dirs.count() == 1) { ++ m_activeViewContainer->setUrl(dirs.first()); + return; + } + +@@ -267,12 +254,12 @@ + + // Open each directory inside a new tab. If the "split view" option has been enabled, + // always show two directories within one tab. +- QList::const_iterator it = urlsToOpen.begin(); +- while (it != urlsToOpen.end()) { ++ QList::const_iterator it = dirs.begin(); ++ while (it != dirs.end()) { + openNewTab(*it); + ++it; + +- if (hasSplitView && (it != urlsToOpen.end())) { ++ if (hasSplitView && (it != dirs.end())) { + const int tabIndex = m_viewTab.count() - 1; + m_viewTab[tabIndex].secondaryView->setUrl(*it); + ++it; + + diff --git a/kde/patch/kde-baseapps/dolphin_kdebug_327224.patch.gz b/kde/patch/kde-baseapps/dolphin_kdebug_327224.patch.gz deleted file mode 100644 index f920cbb..0000000 Binary files a/kde/patch/kde-baseapps/dolphin_kdebug_327224.patch.gz and /dev/null differ diff --git a/kde/patch/kde-cli-tools.patch b/kde/patch/kde-cli-tools.patch index 2dc0fe3..a76227d 100644 --- a/kde/patch/kde-cli-tools.patch +++ b/kde/patch/kde-cli-tools.patch @@ -1,6 +1,6 @@ # Remove CONFIG argument from find_package(KF5); # This is no longer wanted, since ECM has a FindKF5 module. -#zcat $CWD/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kde-cli-tools/kde-cli-tools_ecm.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Adjust for the change in KAboutData: -#zcat $CWD/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch b/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch new file mode 100644 index 0000000..1ff1f84 --- /dev/null +++ b/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch @@ -0,0 +1,11 @@ +--- kde-cli-tools-20140602git/CMakeLists.txt.orig 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/CMakeLists.txt 2014-06-02 23:45:22.337682384 +0200 +@@ -21,7 +21,7 @@ + Test + ) + +-find_package(KF5 CONFIG REQUIRED COMPONENTS ++find_package(KF5 REQUIRED COMPONENTS + Config + Init + KCMUtils diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz b/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz deleted file mode 100644 index 41dc277..0000000 Binary files a/kde/patch/kde-cli-tools/kde-cli-tools_ecm.patch.gz and /dev/null differ diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff b/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff new file mode 100644 index 0000000..e88a512 --- /dev/null +++ b/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff @@ -0,0 +1,59 @@ +diff -uar kde-cli-tools-20140602git.orig/kdesu/kdesu.cpp kde-cli-tools-20140602git/kdesu/kdesu.cpp +--- kde-cli-tools-20140602git.orig/kdesu/kdesu.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kdesu/kdesu.cpp 2014-06-03 00:41:16.998697492 +0200 +@@ -81,9 +81,9 @@ + if (duser.isEmpty()) + duser = "root"; + +- KAboutData aboutData("kdesu", 0, i18n("KDE su"), ++ KAboutData aboutData("kdesu", i18n("KDE su"), + Version, i18n("Runs a program with elevated privileges."), +- KAboutData::License_Artistic, ++ KAboutLicense::Artistic, + i18n("Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio")); + aboutData.addAuthor(i18n("Geert Jansen"), i18n("Maintainer"), + "jansen@kde.org", "http://www.stack.nl/~geertj/"); +diff -uar kde-cli-tools-20140602git.orig/kioclient/kioclient.cpp kde-cli-tools-20140602git/kioclient/kioclient.cpp +--- kde-cli-tools-20140602git.orig/kioclient/kioclient.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kioclient/kioclient.cpp 2014-06-03 00:41:50.446696159 +0200 +@@ -133,7 +133,7 @@ + QString programName = i18n("KIO Client"); + QString description = i18n("Command-line tool for network-transparent operations"); + QString version = "2.0"; +- KAboutData data(appName, appName, programName, version, description, KAboutData::License_LGPL_V2); ++ KAboutData data(appName, programName, version, description, KAboutLicense::LGPL_V2); + + QCommandLineParser parser; + parser.addOption(QCommandLineOption("noninteractive", i18n("Non-interactive use: no message boxes. If you don't want a" +diff -uar kde-cli-tools-20140602git.orig/kreadconfig/kreadconfig.cpp kde-cli-tools-20140602git/kreadconfig/kreadconfig.cpp +--- kde-cli-tools-20140602git.orig/kreadconfig/kreadconfig.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kreadconfig/kreadconfig.cpp 2014-06-03 00:40:33.820702023 +0200 +@@ -53,10 +53,10 @@ + int main(int argc, char **argv) + { + QCoreApplication app(argc, argv); +- KAboutData aboutData("kreadconfig", 0, i18n("KReadConfig"), ++ KAboutData aboutData("kreadconfig", i18n("KReadConfig"), + "1.0.1", + i18n("Read KConfig entries - for use in shell scripts"), +- KAboutData::License_GPL, ++ KAboutLicense::GPL, + i18n("(c) 2001 Red Hat, Inc.")); + aboutData.addAuthor(i18n("Bernhard Rosenkraenzer"), QString(), "bero@redhat.com"); + +diff -uar kde-cli-tools-20140602git.orig/kreadconfig/kwriteconfig.cpp kde-cli-tools-20140602git/kreadconfig/kwriteconfig.cpp +--- kde-cli-tools-20140602git.orig/kreadconfig/kwriteconfig.cpp 2014-06-02 13:45:49.000000000 +0200 ++++ kde-cli-tools-20140602git/kreadconfig/kwriteconfig.cpp 2014-06-03 00:39:54.811701204 +0200 +@@ -31,10 +31,10 @@ + int main(int argc, char **argv) + { + QCoreApplication app(argc, argv); +- KAboutData aboutData("kwriteconfig", 0, i18n("KWriteConfig"), ++ KAboutData aboutData("kwriteconfig", i18n("KWriteConfig"), + "1.0.0", + i18n("Write KConfig entries - for use in shell scripts"), +- KAboutData::License_GPL, ++ KAboutLicense::GPL, + i18n("(c) 2001 Red Hat, Inc. & Luís Pedro Coelho")); + aboutData.addAuthor("Luís Pedro Coelho", QString(), "luis_pedro@netcabo.pt"); + aboutData.addAuthor("Bernhard Rosenkraenzer", i18n("Wrote kreadconfig on which this is based"), "bero@redhat.com"); diff --git a/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz b/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz deleted file mode 100644 index 80650da..0000000 Binary files a/kde/patch/kde-cli-tools/kde-cli-tools_kaboutdata.diff.gz and /dev/null differ diff --git a/kde/patch/kde-runtime.patch b/kde/patch/kde-runtime.patch index b0efb11..7d65729 100644 --- a/kde/patch/kde-runtime.patch +++ b/kde/patch/kde-runtime.patch @@ -1,4 +1,4 @@ # Fix KDE bug 324470 - solved in KDE 4.11.2. # - Minimize/maximize by clicking taskbar entries requires double click. -#zcat $CWD/patch/kde-runtime/kde-runtime.kdebug324470.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kde-runtime/kde-runtime.kdebug324470.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kde-runtime/kde-runtime.kdebug324470.diff b/kde/patch/kde-runtime/kde-runtime.kdebug324470.diff new file mode 100644 index 0000000..4269df8 --- /dev/null +++ b/kde/patch/kde-runtime/kde-runtime.kdebug324470.diff @@ -0,0 +1,49 @@ +commit be1a5d484c70f4f6a383150810afbfbb367db2ac +Author: Eike Hein +Date: Tue Sep 3 20:29:23 2013 +0200 + + Discard the recorded events in the item-local handlers. + + Solves problems with identical events being ignored due to + QGraphicsView's reuse of QGraphicsSceneMouseEvent instances. + + CCMAIL:rdieter@fedoraproject.org + BUG:324470 + BUG:324471 + +diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp +index b534845..36530e0 100644 +--- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp ++++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp +@@ -90,6 +90,7 @@ bool MouseEventListener::containsMouse() const + void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me) + { + if (m_lastEvent == me) { ++ m_lastEvent = 0; + return; + } + +@@ -112,6 +113,7 @@ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me) + void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me) + { + if (m_lastEvent == me) { ++ m_lastEvent = 0; + return; + } + +@@ -122,6 +124,7 @@ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me) + void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me) + { + if (m_lastEvent == me) { ++ m_lastEvent = 0; + return; + } + +@@ -138,6 +141,7 @@ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me) + void MouseEventListener::wheelEvent(QGraphicsSceneWheelEvent *we) + { + if (m_lastEvent == we) { ++ m_lastEvent = 0; + return; + } + diff --git a/kde/patch/kde-runtime/kde-runtime.kdebug324470.diff.gz b/kde/patch/kde-runtime/kde-runtime.kdebug324470.diff.gz deleted file mode 100644 index 99d9296..0000000 Binary files a/kde/patch/kde-runtime/kde-runtime.kdebug324470.diff.gz and /dev/null differ diff --git a/kde/patch/kde-workspace.patch b/kde/patch/kde-workspace.patch index 270c10a..a653e5c 100644 --- a/kde/patch/kde-workspace.patch +++ b/kde/patch/kde-workspace.patch @@ -1,9 +1,9 @@ # Increase the timeout to accomodate slow-to-initialize video chipset drivers: -zcat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Always show 'remaining time' in the popup of the battery plasmoid: -zcat $CWD/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kde-workspace/kde-workspace.batteryapplet.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Fix crash when DesktopNames isn't set (fixed in 4.11.10): -zcat $CWD/patch/kde-workspace/kde-workspace.desktopnames.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kde-workspace/kde-workspace.desktopnames.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff new file mode 100644 index 0000000..7958278 --- /dev/null +++ b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff @@ -0,0 +1,13 @@ +diff -ur kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml +--- kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml 2012-05-23 01:55:18.000000000 +0200 ++++ kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml 2012-05-26 22:09:44.000000000 +0200 +@@ -10,7 +10,7 @@ + false + + +- false ++ true + + + + diff --git a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz b/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz deleted file mode 100644 index 7e16f14..0000000 Binary files a/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz and /dev/null differ diff --git a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff b/kde/patch/kde-workspace/kde-workspace.desktopnames.diff new file mode 100644 index 0000000..59aef1c --- /dev/null +++ b/kde/patch/kde-workspace/kde-workspace.desktopnames.diff @@ -0,0 +1,34 @@ +commit e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f +Author: David Faure +Date: Fri May 2 10:26:38 2014 +0200 + + Fix crash when DesktopNames isn't set + + BUG: 334159 + FIXED-IN: 4.11.10 + +diff --git a/kdm/backend/client.c b/kdm/backend/client.c +index 335cc3e..a2d06c2 100644 +--- a/kdm/backend/client.c ++++ b/kdm/backend/client.c +@@ -1810,12 +1810,14 @@ startClient(volatile int *pid) + !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0))) + sessargs = ""; + buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0); +- for (buf2 = buf; *buf2; ++buf2) { +- if (*buf2 == ';') +- *buf2 = ':'; ++ if (buf) { ++ for (buf2 = buf; *buf2; ++buf2) { ++ if (*buf2 == ';') ++ *buf2 = ':'; ++ } ++ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf); ++ free(buf); + } +- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf); +- free(buf); + free(str); + free(fname); + goto gotit; + diff --git a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gz b/kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gz deleted file mode 100644 index add85ed..0000000 Binary files a/kde/patch/kde-workspace/kde-workspace.desktopnames.diff.gz and /dev/null differ diff --git a/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff b/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff new file mode 100644 index 0000000..4dd9848 --- /dev/null +++ b/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff @@ -0,0 +1,14 @@ +--- ./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: 30 ++Default: 45 + User: core +-Instance: #:*/ ++Instance: :*/ + Comment: + How long to wait for a local &X-Server; to come up. + Description: diff --git a/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz b/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz deleted file mode 100644 index a9c2bae..0000000 Binary files a/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz and /dev/null differ diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch index c314b55..e083090 100644 --- a/kde/patch/kdelibs.patch +++ b/kde/patch/kdelibs.patch @@ -1,14 +1,14 @@ # Slackware ships a different version of XML DTDs: -zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/kdelibs.docbook.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Make uPnP support depend on the environment variable SOLID_UPNP, # e.g. by creating an /etc/profile.d/upnp.sh file with the following contents: # export SOLID_UPNP=1 -zcat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Revert 3 patches which (although they probably follow the FDo spec better), # cause incorrect icon overrides: -zcat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/kdelibs/coding-style-fixes.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -zcat $CWD/patch/kdelibs/return-application-icons-properly.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/coding-style-fixes.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdelibs/return-application-icons-properly.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdelibs/coding-style-fixes.patch b/kde/patch/kdelibs/coding-style-fixes.patch new file mode 100644 index 0000000..11108f0 --- /dev/null +++ b/kde/patch/kdelibs/coding-style-fixes.patch @@ -0,0 +1,62 @@ +From 2173580f070e806d4715e13048c697c49ec262e2 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Thu, 21 Feb 2013 17:59:58 +0100 +Subject: [PATCH 047/111] coding style fixes + +--- + kdeui/icons/kiconloader.cpp | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index 6fed667..dba474d 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -938,32 +938,29 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + } + } + +- foreach (KIconThemeNode *themeNode, links) +- { ++ foreach (KIconThemeNode *themeNode, links) { + QString currentName = name; + +- while (!currentName.isEmpty()) +- { +- ++ while (!currentName.isEmpty()) { + //kDebug(264) << "Looking up" << currentName; + +-// The following code has been commented out because the Qt SVG renderer needs +-// to be improved. If you are going to change/remove some code from this part, +-// please contact me before (ereslibre@kde.org), or kde-core-devel@kde.org. (ereslibre) +- for (int i = 0 ; i < 4 ; i++) +- { ++ for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); +- if (icon.isValid()) +- return icon; ++ if (icon.isValid()) { ++ break; ++ } + } ++ //kDebug(264) << "Looking up" << currentName; + +- if (genericFallback) ++ if (genericFallback) { + // we already tested the base name + break; ++ } + + int rindex = currentName.lastIndexOf('-'); + if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc +-- +1.8.1.4 + + diff --git a/kde/patch/kdelibs/coding-style-fixes.patch.gz b/kde/patch/kdelibs/coding-style-fixes.patch.gz deleted file mode 100644 index 0e0ec0f..0000000 Binary files a/kde/patch/kdelibs/coding-style-fixes.patch.gz and /dev/null differ diff --git a/kde/patch/kdelibs/kdelibs.docbook.patch b/kde/patch/kdelibs/kdelibs.docbook.patch new file mode 100644 index 0000000..6a20cd2 --- /dev/null +++ b/kde/patch/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/kde/patch/kdelibs/kdelibs.docbook.patch.gz b/kde/patch/kdelibs/kdelibs.docbook.patch.gz deleted file mode 100644 index 2de9a66..0000000 Binary files a/kde/patch/kdelibs/kdelibs.docbook.patch.gz and /dev/null differ diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch new file mode 100644 index 0000000..3a19447 --- /dev/null +++ b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch @@ -0,0 +1,15 @@ +--- kdelibs-4.8.0/solid/solid/managerbase.cpp.orig 2011-07-27 20:34:39.000000000 +0200 ++++ kdelibs-4.8.0/solid/solid/managerbase.cpp 2012-01-26 09:17:49.409993419 +0100 +@@ -90,7 +90,11 @@ + # endif + + # if defined (HUPNP_FOUND) +- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ bool solidUpnpEnabled ++ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1; ++ if (solidUpnpEnabled) { ++ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); ++ } + # endif + } + } diff --git a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz b/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz deleted file mode 100644 index 479980f..0000000 Binary files a/kde/patch/kdelibs/kdelibs.upnp_conditional.patch.gz and /dev/null differ diff --git a/kde/patch/kdelibs/return-application-icons-properly.patch b/kde/patch/kdelibs/return-application-icons-properly.patch new file mode 100644 index 0000000..2bdb53a --- /dev/null +++ b/kde/patch/kdelibs/return-application-icons-properly.patch @@ -0,0 +1,56 @@ +From 613c951a1157df0d8a907a155a5eaa706816d5f9 Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Thu, 21 Feb 2013 17:58:11 +0100 +Subject: return application icons properly + +BUG:315578 +--- + kdeui/icons/kiconloader.cpp | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index f65e941..6fed667 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -909,7 +909,36 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + const char * const ext[4] = { ".png", ".svgz", ".svg", ".xpm" }; + bool genericFallback = name.endsWith(QLatin1String("-x-generic")); + +- foreach(KIconThemeNode *themeNode, links) ++ // Do two passes through themeNodes. ++ // ++ // The first pass looks for an exact match in each themeNode one after the other. ++ // If one is found and it is an app icon then return that icon. ++ // ++ // In the next pass (assuming the first pass failed), it looks for exact matches ++ // and then generic fallbacks in each themeNode one after the other ++ // ++ // The reasoning is that application icons should always match exactly, all other ++ // icons may fallback. Since we do not know what the context is here when we start ++ // looking for it, we can only go by the path found. ++ foreach (KIconThemeNode *themeNode, links) { ++ for (int i = 0 ; i < 4 ; i++) { ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchExact); ++ if (icon.isValid()) { ++ break; ++ } ++ ++ icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchBest); ++ if (icon.isValid()) { ++ break; ++ } ++ } ++ ++ if (icon.isValid() && icon.path.contains("/apps/")) { ++ return icon; ++ } ++ } ++ ++ foreach (KIconThemeNode *themeNode, links) + { + QString currentName = name; + +-- +1.8.1.4 + + diff --git a/kde/patch/kdelibs/return-application-icons-properly.patch.gz b/kde/patch/kdelibs/return-application-icons-properly.patch.gz deleted file mode 100644 index 76e3d75..0000000 Binary files a/kde/patch/kdelibs/return-application-icons-properly.patch.gz and /dev/null differ diff --git a/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch b/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch new file mode 100644 index 0000000..b62818e --- /dev/null +++ b/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch @@ -0,0 +1,31 @@ +From 0edfd42151ad57322a10a24ab4971b638e220e6e Mon Sep 17 00:00:00 2001 +From: Aaron Seigo +Date: Thu, 21 Feb 2013 18:14:54 +0100 +Subject: [PATCH 049/111] return, not break. copy/paste error + +--- + kdeui/icons/kiconloader.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp +index dba474d..ce6aeea 100644 +--- a/kdeui/icons/kiconloader.cpp ++++ b/kdeui/icons/kiconloader.cpp +@@ -947,12 +947,12 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const + for (int i = 0 ; i < 4 ; i++) { + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact); + if (icon.isValid()) { +- break; ++ return icon; + } + + icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest); + if (icon.isValid()) { +- break; ++ return icon; + } + } + //kDebug(264) << "Looking up" << currentName; +-- +1.8.1.4 + diff --git a/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz b/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz deleted file mode 100644 index 77d86ba..0000000 Binary files a/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz and /dev/null differ diff --git a/kde/patch/kdelibs4support.patch b/kde/patch/kdelibs4support.patch index a1199e6..ada5f0a 100644 --- a/kde/patch/kdelibs4support.patch +++ b/kde/patch/kdelibs4support.patch @@ -1,4 +1,4 @@ # Make FindGettext compatible with the one provided by CMake: # Fixed in 5.1.0. -#zcat $CWD/patch/kdelibs4support/update-FindGettext.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kdelibs4support/update-FindGettext.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdelibs4support/update-FindGettext.patch b/kde/patch/kdelibs4support/update-FindGettext.patch new file mode 100644 index 0000000..1b75cd8 --- /dev/null +++ b/kde/patch/kdelibs4support/update-FindGettext.patch @@ -0,0 +1,36 @@ +From: Alex Merry +Date: Fri, 04 Jul 2014 10:10:27 +0000 +Subject: Make FindGettext compatible with the one provided by CMake +X-Git-Url: http://quickgit.kde.org/?p=kdelibs4support.git&a=commitdiff&h=581ee6b370d8b5627196c8d6d8760d3655f6daea +--- +Make FindGettext compatible with the one provided by CMake + +This version will accept the old GETTEXT_PROCESS_PO_FILES() syntax (no +PO_FILES argument), but will also accept the new syntax required by +CMake's version of this file. It will also warn when PO_FILES is not +given. + +REVIEW: 119111 +--- + + +--- a/cmake/modules/FindGettext.cmake ++++ b/cmake/modules/FindGettext.cmake +@@ -212,7 +212,16 @@ + LIST(REMOVE_AT _args 0 1) + ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION") + +-# message(STATUS "2 all ${_addToAll} dest ${_installDest} args: ${_args}") ++ LIST(GET _args 0 _tmp) ++ IF("${_tmp}" STREQUAL "PO_FILES") ++ LIST(REMOVE_AT _args 0) ++ ELSE() ++ SET(_deprecation_arg DEPRECATION) ++ IF(CMAKE_VERSION VERSION_LESS 3.0.0) ++ SET(_deprecation_arg AUTHOR_WARNING) ++ ENDIF() ++ MESSAGE(${_deprecation_arg} "GETTEXT_PROCESS_PO_FILES without a PO_FILES argument is deprecated") ++ ENDIF() + + FOREACH(_current_PO_FILE ${_args}) + GET_FILENAME_COMPONENT(_name ${_current_PO_FILE} NAME) diff --git a/kde/patch/kdelibs4support/update-FindGettext.patch.gz b/kde/patch/kdelibs4support/update-FindGettext.patch.gz deleted file mode 100644 index 5cefcb0..0000000 Binary files a/kde/patch/kdelibs4support/update-FindGettext.patch.gz and /dev/null differ diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch index fc41774..f8b34ac 100644 --- a/kde/patch/kdepim.patch +++ b/kde/patch/kdepim.patch @@ -1,4 +1,4 @@ # Install Kleopatra headers, needed by kopete-cryptography: # This used to be fixed? -zcat $CWD/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdepim/kdepim-install_kleopatra_headers.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch b/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch new file mode 100644 index 0000000..8960ab8 --- /dev/null +++ b/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch @@ -0,0 +1,122 @@ +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt 2013-11-16 13:17:30.289810575 -0600 +@@ -6,3 +6,7 @@ add_subdirectory(gui) + + add_subdirectory(tests) + ++install( ++ FILES kleopatraclient_export.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient ++ ) +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -72,3 +72,13 @@ else() + endif() + + install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS}) ++ ++install( ++ FILES ++ initialization.h ++ command.h ++ selectcertificatecommand.h ++ signencryptfilescommand.h ++ decryptverifyfilescommand.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core ++ ) +diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt +--- kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui + ) + + install(TARGETS kleopatraclientgui ${INSTALL_TARGETS_DEFAULT_ARGS}) ++ ++install( ++ FILES ++ certificaterequester.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui ++ ) +diff -up kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkleo/CMakeLists.txt +--- kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers 2013-11-14 02:23:52.000000000 -0600 ++++ kdepim-4.11.90/libkleo/CMakeLists.txt 2013-11-16 13:17:30.290810557 -0600 +@@ -121,3 +121,61 @@ install ( FILES libkleopatrarc-win32.des + else () + install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) + endif () ++ ++install( FILES ++ kleo/kleo_export.h ++ kleo/enum.h ++ kleo/oidmap.h ++ kleo/cryptobackend.h ++ kleo/cryptobackendfactory.h ++ kleo/cryptoconfig.h ++ kleo/dn.h ++ kleo/job.h ++ kleo/keylistjob.h ++ kleo/keygenerationjob.h ++ kleo/abstractimportjob.h ++ kleo/importjob.h ++ kleo/importfromkeyserverjob.h ++ kleo/exportjob.h ++ kleo/changeexpiryjob.h ++ kleo/changeownertrustjob.h ++ kleo/downloadjob.h ++ kleo/deletejob.h ++ kleo/encryptjob.h ++ kleo/decryptjob.h ++ kleo/signjob.h ++ kleo/specialjob.h ++ kleo/verifydetachedjob.h ++ kleo/verifyopaquejob.h ++ kleo/decryptverifyjob.h ++ kleo/signencryptjob.h ++ kleo/signkeyjob.h ++ kleo/adduseridjob.h ++ kleo/refreshkeysjob.h ++ kleo/multideletejob.h ++ kleo/hierarchicalkeylistjob.h ++ kleo/keyfilter.h ++ kleo/keyfiltermanager.h ++ kleo/changepasswdjob.h ++ kleo/checksumdefinition.h ++ kleo/exception.h ++ kleo/kconfigbasedkeyfilter.h ++ kleo/listallkeysjob.h ++ kleo/stl_util.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel) ++ ++install ( FILES ++ ui/kdhorizontalline.h ++ ui/messagebox.h ++ ui/progressbar.h ++ ui/progressdialog.h ++ ui/keylistview.h ++ ui/keyselectiondialog.h ++ ui/keyrequester.h ++ ui/keyapprovaldialog.h ++ ui/dnattributeorderconfigwidget.h ++ ui/cryptoconfigmodule.h ++ ui/cryptoconfigdialog.h ++ ui/directoryserviceswidget.h ++ ui/filenamerequester.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel) +diff -up kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkpgp/CMakeLists.txt +--- kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers 2013-11-16 13:17:30.290810557 -0600 ++++ kdepim-4.11.90/libkpgp/CMakeLists.txt 2013-11-16 13:20:55.258111864 -0600 +@@ -35,3 +35,11 @@ add_subdirectory( tests ) + install(FILES kconf_update/kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) + ++install(FILES ++ kpgp.h ++ kpgpbase.h ++ kpgpblock.h ++ kpgpkey.h ++ kpgpui.h ++ libkpgp_export.h ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel ) + diff --git a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz b/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz deleted file mode 100644 index c842649..0000000 Binary files a/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz and /dev/null differ diff --git a/kde/patch/kdepimlibs-framework.patch b/kde/patch/kdepimlibs-framework.patch index 123d8da..36c99fa 100644 --- a/kde/patch/kdepimlibs-framework.patch +++ b/kde/patch/kdepimlibs-framework.patch @@ -1,3 +1,3 @@ # The autotests generate ECM errors so skip building them: -zcat $CWD/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kdepimlibs-framework/kdepimlibs_autotests.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff new file mode 100644 index 0000000..24b21ff --- /dev/null +++ b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff @@ -0,0 +1,10 @@ +--- a/syndication/CMakeLists.txt 2014-06-02 13:44:23.000000000 +0200 ++++ b/syndication/CMakeLists.txt 2014-06-02 16:51:00.393339484 +0200 +@@ -41,7 +41,6 @@ + ########### Targets ########### + + add_subdirectory(src/syndication) +-add_subdirectory(autotests) + + ########### CMake Config Files ########### + set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Syndication") diff --git a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz deleted file mode 100644 index 28cc49a..0000000 Binary files a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff.gz and /dev/null differ diff --git a/kde/patch/kdeplasma-addons.patch b/kde/patch/kdeplasma-addons.patch index 3512d84..8c997b2 100644 --- a/kde/patch/kdeplasma-addons.patch +++ b/kde/patch/kdeplasma-addons.patch @@ -1,4 +1,4 @@ # CVE 2013-2120: paste widget "password" generator uses insecure randomness: # Fixed in KDE 4.11. -#zcat $CWD/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch b/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch new file mode 100644 index 0000000..7a394a5 --- /dev/null +++ b/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch @@ -0,0 +1,76 @@ +From: Aaron Seigo +Date: Mon, 03 Jun 2013 17:16:32 +0000 +Subject: use KRandom, avoid modulo bias +X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commitdiff&h=36a1fe49cb70f717c4a6e9eeee2c9186503a8dce +--- +use KRandom, avoid modulo bias +--- + + +--- a/applets/paste/pastemacroexpander.cpp ++++ b/applets/paste/pastemacroexpander.cpp +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + class PasteMacroExpanderSingleton + { +@@ -142,35 +143,49 @@ + << "01234567890" + << "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"; + +- int charCount; ++ int charCount = 8; + QString chars; + QString result; + + if (a.count() > 0) { +- charCount = qMax(a[0].trimmed().toInt(), 1); +- } else { +- charCount = 8; ++ charCount = qMax(a[0].trimmed().toInt(), 8); + } ++ + if (a.count() < 2) { + chars = characterSets.join(""); + } ++ + if (a.count() > 1) { + chars += (a[1].trimmed() == "true") ? characterSets[0] : ""; + } ++ + if (a.count() > 2) { + chars += (a[2].trimmed() == "true") ? characterSets[1] : ""; + } ++ + if (a.count() > 3) { + chars += (a[3].trimmed() == "true") ? characterSets[2] : ""; + } ++ + if (a.count() > 4) { + chars += (a[4].trimmed() == "true") ? characterSets[3] : ""; + } + +- QDateTime now = QDateTime::currentDateTime(); +- qsrand(now.toTime_t() / now.time().msec()); ++ const int setSize = chars.count(); ++ const int top = (RAND_MAX / setSize) * setSize; ++ kDebug() << "topping out at " << setSize << RAND_MAX << top; + for (int i = 0; i < charCount; ++i) { +- result += chars[qrand() % chars.count()]; ++ // to prevent modulo bias, discard random numbers at the ++ // 'top end' of INT_MAX ++ int rand = -1; ++ do { ++ if (rand > 0) { ++ kDebug() << "Ha!" << rand; ++ } ++ rand = KRandom::random(); ++ } while (rand >= top); ++ ++ result += chars[rand % setSize]; + } + //kDebug() << result; + return result; diff --git a/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz b/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz deleted file mode 100644 index a6f723a..0000000 Binary files a/kde/patch/kdeplasma-addons/random_generator_cve-2013-2120.patch.gz and /dev/null differ diff --git a/kde/patch/kdewebdev.patch b/kde/patch/kdewebdev.patch index ccac0a7..1f678fd 100644 --- a/kde/patch/kdewebdev.patch +++ b/kde/patch/kdewebdev.patch @@ -1,5 +1,5 @@ # Make it find tidy: -zcat $CWD/patch/kdewebdev/include-tidy.patch.gz \ +cat $CWD/patch/kdewebdev/include-tidy.patch \ | sed -e "s#/tmp/package-kdewebdev#${SLACK_KDE_BUILD_DIR}/${module}/package-kdewebdev#" \ | patch -p0 --verbose \ || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdewebdev/include-tidy.patch b/kde/patch/kdewebdev/include-tidy.patch new file mode 100644 index 0000000..fd4de94 --- /dev/null +++ b/kde/patch/kdewebdev/include-tidy.patch @@ -0,0 +1,13 @@ +--- klinkstatus/src/tidy/tidyx.h.orig 2009-09-03 09:55:38.886267704 -0500 ++++ klinkstatus/src/tidy/tidyx.h 2009-09-03 09:57:29.032269520 -0500 +@@ -48,8 +48,8 @@ + Created 2002-07-11 by Charles Reitzel + */ + +-#include +-#include ++#include "/tmp/package-kdewebdev/usr/include/tidy/tidy.h" ++#include "/tmp/package-kdewebdev/usr/include/tidy/buffio.h" + + #include + diff --git a/kde/patch/kdewebdev/include-tidy.patch.gz b/kde/patch/kdewebdev/include-tidy.patch.gz deleted file mode 100644 index be1d83a..0000000 Binary files a/kde/patch/kdewebdev/include-tidy.patch.gz and /dev/null differ diff --git a/kde/patch/kinfocenter.patch b/kde/patch/kinfocenter.patch index a50e251..5a65977 100644 --- a/kde/patch/kinfocenter.patch +++ b/kde/patch/kinfocenter.patch @@ -1,3 +1,3 @@ # Fix linking error : -zcat $CWD/patch/kinfocenter/kinfocenter_libpci.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/kinfocenter/kinfocenter_libpci.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kinfocenter/kinfocenter_libpci.patch b/kde/patch/kinfocenter/kinfocenter_libpci.patch new file mode 100644 index 0000000..24dc265 --- /dev/null +++ b/kde/patch/kinfocenter/kinfocenter_libpci.patch @@ -0,0 +1,13 @@ +--- kinfocenter-4.96.0/cmake/FindPCIUTILS.cmake.orig 2014-05-22 15:11:30.928207370 +0200 ++++ kinfocenter-4.96.0/cmake/FindPCIUTILS.cmake 2014-05-22 15:19:31.091188117 +0200 +@@ -19,6 +19,10 @@ + else(RESOLV_LIBRARY) + set(PCIUTILS_LIBRARIES ${PCIUTILS_LIBRARY}) + endif(RESOLV_LIBRARY) ++ FIND_LIBRARY(ZLIB_LIBRARY NAMES z) ++ if(ZLIB_LIBRARY) ++ set(ZLIB_LIBRARIES ${ZLIB_LIBRARY}) ++ endif(ZLIB_LIBRARY) + endif(PCIUTILS_LIBRARY) + + diff --git a/kde/patch/kinfocenter/kinfocenter_libpci.patch.gz b/kde/patch/kinfocenter/kinfocenter_libpci.patch.gz deleted file mode 100644 index c056f7a..0000000 Binary files a/kde/patch/kinfocenter/kinfocenter_libpci.patch.gz and /dev/null differ diff --git a/kde/patch/korundum.patch b/kde/patch/korundum.patch index 900f006..10deb29 100644 --- a/kde/patch/korundum.patch +++ b/kde/patch/korundum.patch @@ -1,5 +1,5 @@ # Build against Ruby 1.9.3. # See also https://bugs.kde.org/show_bug.cgi?id=287057 # No longer needed in KDE 4.11. -#zcat $CWD/patch/korundum/korundum_ruby19.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/korundum/korundum_ruby19.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/korundum/korundum_ruby19.patch b/kde/patch/korundum/korundum_ruby19.patch new file mode 100644 index 0000000..561d8de --- /dev/null +++ b/kde/patch/korundum/korundum_ruby19.patch @@ -0,0 +1,31 @@ +diff -up korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 korundum-4.8.0/src/krubypluginfactory.cpp +--- korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 2011-07-27 13:37:29.000000000 -0500 ++++ korundum-4.8.0/src/krubypluginfactory.cpp 2012-02-17 08:30:38.785635819 -0600 +@@ -39,7 +39,7 @@ + extern "C" { + extern VALUE rb_load_path; + extern VALUE qt_internal_module; +-void Init_prelude(void); ++// void Init_prelude(void); + } + + // +@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons + #if RUBY_VERSION >= 0x10900 + VALUE gem = rb_define_module("Gem"); + rb_const_set(gem, rb_intern("Enable"), Qtrue); +- Init_prelude(); ++// Init_prelude(); + #endif + + ruby_incpush(QFile::encodeName(program.path())); +@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv) + #if RUBY_VERSION >= 0x10900 + VALUE gem = rb_define_module("Gem"); + rb_const_set(gem, rb_intern("Enable"), Qtrue); +- Init_prelude(); ++// Init_prelude(); + #endif + + ruby_incpush(QFile::encodeName(program.path())); + diff --git a/kde/patch/korundum/korundum_ruby19.patch.gz b/kde/patch/korundum/korundum_ruby19.patch.gz deleted file mode 100644 index 2463d0a..0000000 Binary files a/kde/patch/korundum/korundum_ruby19.patch.gz and /dev/null differ diff --git a/kde/patch/milou.patch b/kde/patch/milou.patch index c15cc65..2caee00 100644 --- a/kde/patch/milou.patch +++ b/kde/patch/milou.patch @@ -1,2 +1,2 @@ # Forgotten include: -zcat $CWD/patch/milou/milou_krunner_include.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/milou/milou_krunner_include.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/milou/milou_krunner_include.diff b/kde/patch/milou/milou_krunner_include.diff new file mode 100644 index 0000000..ffd075c --- /dev/null +++ b/kde/patch/milou/milou_krunner_include.diff @@ -0,0 +1,11 @@ +--- a/lib/qml/CMakeLists.txt 2014-07-10 17:30:16.000000000 +0200 ++++ b/lib/qml/CMakeLists.txt 2014-08-01 14:50:57.417710976 +0200 +@@ -7,7 +7,7 @@ + + target_link_libraries (milouqmlplugin + Qt5::Qml +- ++ KF5::Runner + milou + ) + diff --git a/kde/patch/milou/milou_krunner_include.diff.gz b/kde/patch/milou/milou_krunner_include.diff.gz deleted file mode 100644 index 7abed38..0000000 Binary files a/kde/patch/milou/milou_krunner_include.diff.gz and /dev/null differ diff --git a/kde/patch/oxygen-gtk3.patch b/kde/patch/oxygen-gtk3.patch index abee503..1f0f0aa 100644 --- a/kde/patch/oxygen-gtk3.patch +++ b/kde/patch/oxygen-gtk3.patch @@ -1,3 +1,3 @@ # Compile against Slackware's older version of gtk+3: -zcat $CWD/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch b/kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch new file mode 100644 index 0000000..075cd08 --- /dev/null +++ b/kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch @@ -0,0 +1,29 @@ +diff -urN oxygen-gtk3-1.3.1/src/oxygenthemingengine.cpp oxygen-gtk3-1.3.1-patched/src/oxygenthemingengine.cpp +--- oxygen-gtk3-1.3.1/src/oxygenthemingengine.cpp 2013-12-11 23:38:20.000000000 +1100 ++++ oxygen-gtk3-1.3.1-patched/src/oxygenthemingengine.cpp 2013-12-17 23:11:11.684864006 +1100 +@@ -493,13 +493,6 @@ + + } + +- } else if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_LIST_ROW ) ) { +- +- GtkStateFlags state( gtk_theming_engine_get_state( engine ) ); +- StyleOptions options( widget, state ); +- if( options & (Selected|Hover) ) +- { Style::instance().renderSelection( context, x, y, w, h, TileSet::Horizontal, options ); } +- + } else if( + gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_SPINBUTTON ) && + !gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_ENTRY ) ) +@@ -507,10 +500,7 @@ + + return; + +- } else if( +- gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_TOOLBAR ) || +- gtk_widget_path_is_type( path, GTK_TYPE_HEADER_BAR ) ) +- { ++ } else if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_TOOLBAR ) ) { + + // render background + if( !Gtk::gtk_widget_is_applet( widget ) ) diff --git a/kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch.gz b/kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch.gz deleted file mode 100644 index 494d4a3..0000000 Binary files a/kde/patch/oxygen-gtk3/oxygen-gtk3-1.3.1_gtk3.8.patch.gz and /dev/null differ diff --git a/kde/patch/plasma-desktop.patch b/kde/patch/plasma-desktop.patch index 1bccac9..0439348 100644 --- a/kde/patch/plasma-desktop.patch +++ b/kde/patch/plasma-desktop.patch @@ -1,5 +1,5 @@ # Fix errors in translation strings for bs and sr: -#zcat $CWD/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Forgotten includes: -zcat $CWD/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff b/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff new file mode 100755 index 0000000..3b96d54 --- /dev/null +++ b/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff @@ -0,0 +1,60 @@ +diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/bs/kfontinst.po b/po/bs/kfontinst.po +--- a/po/bs/kfontinst.po 2014-05-09 17:23:01.000000000 +0200 ++++ b/po/bs/kfontinst.po 2014-05-18 18:38:26.513853094 +0200 +@@ -1169,7 +1169,7 @@ msgstr "abcčćdđefghijklmnoprsštuvzž + #: lib/FcEngine.cpp:1004 + msgctxt "Numbers and characters" + msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" +-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@ ++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" + + #: lib/FcEngine.cpp:1401 + msgid "ERROR: Could not determine font's name." +diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr/kfontinst.po b/po/sr/kfontinst.po +--- a/po/sr/kfontinst.po 2014-05-09 17:27:16.000000000 +0200 ++++ b/po/sr/kfontinst.po 2014-05-18 18:38:40.837414520 +0200 +@@ -1221,7 +1221,7 @@ msgstr "абвгдђежзијклљмн + #: lib/FcEngine.cpp:1004 + msgctxt "Numbers and characters" + msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" +-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@ ++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" + + #: lib/FcEngine.cpp:1401 + msgid "ERROR: Could not determine font's name." +diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr@ijekavian/kfontinst.po b/po/sr@ijekavian/kfontinst.po +--- a/po/sr@ijekavian/kfontinst.po 2014-05-09 17:27:20.000000000 +0200 ++++ b/po/sr@ijekavian/kfontinst.po 2014-05-18 18:38:54.049932456 +0200 +@@ -1221,7 +1221,7 @@ msgstr "абвгдђежзијклљмн + #: lib/FcEngine.cpp:1004 + msgctxt "Numbers and characters" + msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" +-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@ ++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" + + #: lib/FcEngine.cpp:1401 + msgid "ERROR: Could not determine font's name." +diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr@ijekavianlatin/kfontinst.po b/po/sr@ijekavianlatin/kfontinst.po +--- a/po/sr@ijekavianlatin/kfontinst.po 2014-05-09 17:27:24.000000000 +0200 ++++ b/po/sr@ijekavianlatin/kfontinst.po 2014-05-18 18:39:09.884553255 +0200 +@@ -1224,7 +1224,7 @@ msgstr "abcčćdđefghijklmnoprsštuvzž + #: lib/FcEngine.cpp:1004 + msgctxt "Numbers and characters" + msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" +-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@ ++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" + + #: lib/FcEngine.cpp:1401 + msgid "ERROR: Could not determine font's name." +diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr@latin/kfontinst.po b/po/sr@latin/kfontinst.po +--- a/po/sr@latin/kfontinst.po 2014-05-09 17:27:27.000000000 +0200 ++++ b/po/sr@latin/kfontinst.po 2014-05-18 18:39:21.351002849 +0200 +@@ -1223,7 +1223,7 @@ msgstr "abcčćdđefghijklmnoprsštuvzž + #: lib/FcEngine.cpp:1004 + msgctxt "Numbers and characters" + msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" +-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@ ++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]" + + #: lib/FcEngine.cpp:1401 + msgid "ERROR: Could not determine font's name." \ No newline at end of file diff --git a/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz b/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz deleted file mode 100755 index c93e8a6..0000000 Binary files a/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz and /dev/null differ diff --git a/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff b/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff new file mode 100644 index 0000000..74d541c --- /dev/null +++ b/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff @@ -0,0 +1,88 @@ +--- plasma-desktop-20140602git/kcms/kfontinst/lib/CMakeLists.txt.orig 2014-06-03 16:08:19.294297273 +0200 ++++ plasma-desktop-20140602git/kcms/kfontinst/lib/CMakeLists.txt 2014-06-03 16:09:12.420293700 +0200 +@@ -15,6 +15,6 @@ + set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION 5 ) + + add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS}) +-target_link_libraries(kfontinstui Qt5::X11Extras KF5::KIOCore KF5::KIOWidgets ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${X11_X11_LIB} ${X11_Xft_LIB} kfontinst ) ++target_link_libraries(kfontinstui Qt5::X11Extras KF5::KIOCore KF5::KIOWidgets KF5::KDELibs4Support XCB::XCB XCB::IMAGE ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${X11_X11_LIB} ${X11_Xft_LIB} kfontinst ) + set_target_properties(kfontinstui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION 5 ) + install(TARGETS kfontinst kfontinstui ${INSTALL_TARGETS_DEFAULT_ARGS} ) +--- plasma-desktop-20140602git/kcms/kfontinst/dbus/CMakeLists.txt.orig 2014-06-02 13:47:27.000000000 +0200 ++++ plasma-desktop-20140602git/kcms/kfontinst/dbus/CMakeLists.txt 2014-06-03 17:17:01.382378586 +0200 +@@ -14,11 +14,11 @@ + + set_target_properties(fontinst_bin PROPERTIES OUTPUT_NAME fontinst) + target_link_libraries(fontinst_bin +- Qt5::DBus Qt5::Xml ${FONTCONFIG_LIBRARIES} kfontinst) ++ Qt5::DBus Qt5::Xml Qt5::X11Extras KF5::KDELibs4Support XCB::XCB XCB::IMAGE ${FONTCONFIG_LIBRARIES} kfontinst) + + set_target_properties(fontinst_helper PROPERTIES OUTPUT_NAME fontinst_helper) + target_link_libraries(fontinst_helper +- Qt5::DBus Qt5::Xml ${FONTCONFIG_LIBRARIES} kfontinst) ++ Qt5::DBus Qt5::Xml Qt5::X11Extras KF5::KDELibs4Support XCB::XCB XCB::IMAGE ${FONTCONFIG_LIBRARIES} kfontinst) + + install(TARGETS fontinst_bin DESTINATION ${LIBEXEC_INSTALL_DIR} ) + install(TARGETS fontinst_helper DESTINATION ${LIBEXEC_INSTALL_DIR} ) +--- plasma-desktop-20140602git/kcms/kfontinst/kcmfontinst/CMakeLists.txt.orig 2014-06-02 13:47:27.000000000 +0200 ++++ plasma-desktop-20140602git/kcms/kfontinst/kcmfontinst/CMakeLists.txt 2014-06-03 19:19:00.376164975 +0200 +@@ -10,6 +10,7 @@ + add_library(kcm_fontinst MODULE ${kcm_fontinst_PART_SRCS}) + + target_link_libraries(kcm_fontinst ++ Qt5::X11Extras + KF5::Archive + KF5::KCMUtils + KF5::Su +--- plasma-desktop-20140602git/kcms/kfontinst/apps/CMakeLists.txt.orig 2014-06-02 13:47:27.000000000 +0200 ++++ plasma-desktop-20140602git/kcms/kfontinst/apps/CMakeLists.txt 2014-06-03 19:27:47.209175028 +0200 +@@ -31,6 +31,7 @@ + ) + target_link_libraries(kfontprint_bin + Qt5::PrintSupport ++ Qt5::X11Extras + KF5::IconThemes + KF5::KDELibs4Support + ${X11_X11_LIB} +@@ -38,7 +39,7 @@ + kfontinstui + kfontinst + ) +-target_link_libraries(kfontview_bin KF5::Parts KF5::XmlGui kfontinstui kfontinst ) ++target_link_libraries(kfontview_bin KF5::Parts KF5::XmlGui KF5::KDELibs4Support kfontinstui kfontinst ) + + install(TARGETS kfontinst_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) + install(TARGETS kfontprint_bin DESTINATION ${LIBEXEC_INSTALL_DIR} ) +--- plasma-desktop-20140602git/kcms/kfontinst/kio/CMakeLists.txt.orig 2014-06-02 13:47:27.000000000 +0200 ++++ plasma-desktop-20140602git/kcms/kfontinst/kio/CMakeLists.txt 2014-06-03 19:31:34.379189708 +0200 +@@ -5,7 +5,7 @@ + set(kio_fonts_PART_SRCS FontInstInterface.cpp KioFonts.cpp ${libkfontinstdbusiface_SRCS}) + # qt5_add_dbus_interface(kio_fonts_PART_SRCS ../dbus/org.kde.fontinst.xml FontinstIface) + add_library(kio_fonts MODULE ${kio_fonts_PART_SRCS} ${KFI_FONTINST_AUTH_SRC} ) +-target_link_libraries(kio_fonts Qt5::DBus Qt5::X11Extras Qt5::Xml KF5::Archive KF5::KIOCore KF5::KIOWidgets kfontinst ) ++target_link_libraries(kio_fonts Qt5::DBus Qt5::X11Extras Qt5::Xml KF5::Archive KF5::KIOCore KF5::KIOWidgets KF5::KDELibs4Support kfontinst ) + install(TARGETS kio_fonts DESTINATION ${PLUGIN_INSTALL_DIR} ) + install( FILES fonts.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services ) + install( FILES fonts.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +--- plasma-desktop-20140602git/kcms/kfontinst/thumbnail/CMakeLists.txt.orig 2014-06-02 13:47:27.000000000 +0200 ++++ plasma-desktop-20140602git/kcms/kfontinst/thumbnail/CMakeLists.txt 2014-06-03 19:34:23.357198688 +0200 +@@ -7,7 +7,7 @@ + + add_library(fontthumbnail MODULE ${fontthumbnail_PART_SRCS}) + +-target_link_libraries(fontthumbnail KF5::Archive KF5::KIOCore KF5::KIOWidgets kfontinstui kfontinst ) ++target_link_libraries(fontthumbnail KF5::Archive KF5::KIOCore KF5::KIOWidgets KF5::KDELibs4Support kfontinstui kfontinst ) + + install(TARGETS fontthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} ) + install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +--- plasma-desktop-20140602git/kcms/kfontinst/viewpart/CMakeLists.txt.orig 2014-06-02 13:47:27.000000000 +0200 ++++ plasma-desktop-20140602git/kcms/kfontinst/viewpart/CMakeLists.txt 2014-06-03 19:42:35.590219674 +0200 +@@ -8,7 +8,7 @@ + + add_library(kfontviewpart MODULE ${kfontviewpart_PART_SRCS}) + +-target_link_libraries(kfontviewpart KF5::Archive KF5::Parts KF5::XmlGui ${FONTCONFIG_LIBRARIES} kfontinstui kfontinst ) ++target_link_libraries(kfontviewpart KF5::Archive KF5::Parts KF5::XmlGui KF5::KDELibs4Support ${FONTCONFIG_LIBRARIES} kfontinstui kfontinst ) + + install(TARGETS kfontviewpart DESTINATION ${PLUGIN_INSTALL_DIR} ) + install( FILES kfontviewpart.rc DESTINATION ${DATA_INSTALL_DIR}/kfontinst ) diff --git a/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz b/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz deleted file mode 100644 index 0b27171..0000000 Binary files a/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz and /dev/null differ diff --git a/kde/patch/plasma-nm.patch b/kde/patch/plasma-nm.patch index 76ce62c..b35d625 100644 --- a/kde/patch/plasma-nm.patch +++ b/kde/patch/plasma-nm.patch @@ -1,4 +1,4 @@ # Patches that address reported bugs in plasma-nm 0.9.3.1: -#zcat $CWD/patch/plasma-nm/plasma-nm-fixes.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/plasma-nm/plasma-nm-fixes.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/plasma-nm/plasma-nm-fixes.patch b/kde/patch/plasma-nm/plasma-nm-fixes.patch new file mode 100644 index 0000000..d98448d --- /dev/null +++ b/kde/patch/plasma-nm/plasma-nm-fixes.patch @@ -0,0 +1,322 @@ +diff --git a/applet/declarative/contents/ui/main.qml b/applet/declarative/contents/ui/main.qml +index 8ea88cc..aa81707 100644 +--- a/applet/declarative/contents/ui/main.qml ++++ b/applet/declarative/contents/ui/main.qml +@@ -19,6 +19,7 @@ + */ + + import QtQuick 1.1 ++import org.kde.plasma.extras 0.1 as PlasmaExtras + import org.kde.plasma.components 0.1 as PlasmaComponents + import org.kde.plasma.core 0.1 as PlasmaCore + import org.kde.networkmanagement 0.1 as PlasmaNM +@@ -77,16 +78,7 @@ Item { + anchors.fill: parent + } + +- ListView { +- id: connectionView; +- +- property bool expandedItem: false; +- property string previouslyExpandedItem: ""; +- +- property bool activeExpanded: true; +- property bool previousExpanded: true; +- property bool unknownExpanded: true; +- ++ PlasmaExtras.ScrollArea { + anchors { + left: parent.left; + right: parent.right; +@@ -95,50 +87,64 @@ Item { + topMargin: padding.margins.top; + bottomMargin: padding.margins.bottom + } +- clip: true +- model: connectionSortModel; +- currentIndex: -1; +- interactive: true; +- boundsBehavior: Flickable.StopAtBounds; +- section.property: "itemSection"; +- section.delegate: SectionHeader { +- onHideSection: { +- if (section == i18n("Active connections")) { +- connectionView.activeExpanded = false; +- } else if (section == i18n("Previous connections")) { +- connectionView.previousExpanded = false; +- } else { +- connectionView.unknownExpanded = false; ++ ++ ListView { ++ id: connectionView; ++ ++ property bool expandedItem: false; ++ property string previouslyExpandedItem: ""; ++ ++ property bool activeExpanded: true; ++ property bool previousExpanded: true; ++ property bool unknownExpanded: true; ++ ++ anchors.fill: parent; ++ ++ clip: true ++ model: connectionSortModel; ++ currentIndex: -1; ++ interactive: true; ++ boundsBehavior: Flickable.StopAtBounds; ++ section.property: "itemSection"; ++ section.delegate: SectionHeader { ++ onHideSection: { ++ if (section == i18n("Active connections")) { ++ connectionView.activeExpanded = false; ++ } else if (section == i18n("Previous connections")) { ++ connectionView.previousExpanded = false; ++ } else { ++ connectionView.unknownExpanded = false; ++ } + } +- } + +- onShowSection: { +- if (section == i18n("Active connections")) { +- connectionView.activeExpanded = true; +- } else if (section == i18n("Previous connections")) { +- connectionView.previousExpanded = true; +- } else { +- connectionView.unknownExpanded = true; ++ onShowSection: { ++ if (section == i18n("Active connections")) { ++ connectionView.activeExpanded = true; ++ } else if (section == i18n("Previous connections")) { ++ connectionView.previousExpanded = true; ++ } else { ++ connectionView.unknownExpanded = true; ++ } + } + } +- } + +- delegate: ConnectionItem { +- expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni; +- onItemExpanded: { +- if (itemExpanded) { +- connectionView.expandedItem = true; +- connectionView.previouslyExpandedItem = itemUni;; +- connectionView.currentIndex = index; +- } else { +- connectionView.expandedItem = false; +- connectionView.previouslyExpandedItem = ""; ++ delegate: ConnectionItem { ++ expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni; ++ onItemExpanded: { ++ if (itemExpanded) { ++ connectionView.expandedItem = true; ++ connectionView.previouslyExpandedItem = itemUni;; ++ connectionView.currentIndex = index; ++ } else { ++ connectionView.expandedItem = false; ++ connectionView.previouslyExpandedItem = ""; ++ } + } +- } + +- ListView.onRemove: { +- if (ListView.isCurrentItem) { +- connectionView.previouslyExpandedItem = ""; ++ ListView.onRemove: { ++ if (ListView.isCurrentItem) { ++ connectionView.previouslyExpandedItem = ""; ++ } + } + } + } +diff --git a/declarative-plugins/applet/connectionicon.cpp b/declarative-plugins/applet/connectionicon.cpp +index c3f8540..76bdca0 100644 +--- a/declarative-plugins/applet/connectionicon.cpp ++++ b/declarative-plugins/applet/connectionicon.cpp +@@ -166,12 +166,24 @@ void ConnectionIcon::setIcons() + + foreach (const NetworkManager::ActiveConnection::Ptr & active, actives) { + if (((active->default4() || active->default6()) && active->state() == NetworkManager::ActiveConnection::Activated) || !defaultRouteExists) { ++ NetworkManager::ActiveConnection::Ptr activeConnection; ++ if (active->vpn()) { ++ NetworkManager::ActiveConnection::Ptr activeTmp; ++ activeTmp = NetworkManager::findActiveConnection(active->specificObject()); ++ if (activeTmp) { ++ activeConnection = activeTmp; ++ } + +- if (active->vpn() || active->devices().isEmpty()) { ++ vpnFound = true; ++ NMAppletDebug() << "Emit signal setHoverIcon(object-locked)"; ++ Q_EMIT setHoverIcon("object-locked"); ++ } else { ++ activeConnection = active; ++ } ++ if (activeConnection->devices().isEmpty()) { + continue; + } +- +- NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(active->devices().first()); ++ NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(activeConnection->devices().first()); + if (device) { + NetworkManager::Device::Type type = device->type(); + +@@ -184,7 +196,7 @@ void ConnectionIcon::setIcons() + setWirelessIconForSignalStrength(100); + connectionFound = true; + } else { +- NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(active->specificObject()); ++ NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(activeConnection->specificObject()); + if (ap) { + setWirelessIcon(device, ap->ssid()); + connectionFound = true; +@@ -222,9 +234,7 @@ void ConnectionIcon::setIcons() + } + } + } +- } +- +- if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) { ++ } else if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) { + vpnFound = true; + NMAppletDebug() << "Emit signal setHoverIcon(object-locked)"; + Q_EMIT setHoverIcon("object-locked"); +diff --git a/declarative-plugins/applet/networkstatus.cpp b/declarative-plugins/applet/networkstatus.cpp +index d63066d..8149da9 100644 +--- a/declarative-plugins/applet/networkstatus.cpp ++++ b/declarative-plugins/applet/networkstatus.cpp +@@ -129,8 +129,8 @@ void NetworkStatus::changeTooltip() + } + + QString tooltip = ""; +- QString format = "%1 - %2
%3

"; +- QString formatDefault = "%1 - %2
%3

"; ++ const QString format = "%1 - %2
%3

"; ++ const QString formatDefault = "%1 - %2
%3

"; + + foreach (const NetworkManager::ActiveConnection::Ptr & active, NetworkManager::activeConnections()) { + if (!active->devices().isEmpty()) { +@@ -145,7 +145,6 @@ void NetworkStatus::changeTooltip() + } else { + devName = device->ipInterfaceName(); + } +-// conType = NetworkManager::ConnectionSettings::typeAsString(active->connection()->settings()->connectionType()); + if (active->vpn()) { + conType = i18n("VPN Connection"); + } else { +diff --git a/declarative-plugins/model/model.cpp b/declarative-plugins/model/model.cpp +index 1b3f4c3..bb88362 100644 +--- a/declarative-plugins/model/model.cpp ++++ b/declarative-plugins/model/model.cpp +@@ -230,7 +230,7 @@ void Model::addConnection(const QString& connection, const QString& device) + { + NetworkManager::Connection::Ptr con = NetworkManager::findConnection(connection); + +- if (con->settings()->isSlave()) { ++ if (con->settings()->isSlave() || con->name().isEmpty() || con->uuid().isEmpty()) { + return; + } + +@@ -395,7 +395,11 @@ void Model::removeWirelessNetwork(const QString& ssid, const QString& device) + if (wirelessDevice) { + accessPoint = wirelessDevice->findAccessPoint(item->specificPath()); + } +- if (accessPoint && accessPoint->mode() == NetworkManager::AccessPoint::Adhoc && ++ ++ // When accesspoint in ad-hoc mode dissapears, we should remove the item only when there is no connection. Similar case is when ++ // a wireless device is in AP mode, but in this case there could be only one visible AP and this should always be associated with some connection. ++ if (accessPoint && ((accessPoint->mode() == NetworkManager::AccessPoint::Adhoc && !item->connectionPath().isEmpty()) || ++ wirelessDevice->mode() == NetworkManager::WirelessDevice::ApMode) && + NetworkManager::isWirelessEnabled() && NetworkManager::isWirelessHardwareEnabled()) { + item->setWirelessNetwork(QString()); + if (updateItem(item)) { +diff --git a/declarative-plugins/model/modelitem.cpp b/declarative-plugins/model/modelitem.cpp +index 9a5931f..58d5c42 100644 +--- a/declarative-plugins/model/modelitem.cpp ++++ b/declarative-plugins/model/modelitem.cpp +@@ -151,6 +151,17 @@ QString ModelItem::icon() const + break; + case NetworkManager::ConnectionSettings::Wireless: + if (m_signal == 0 ) { ++ if (!m_connectionPath.isEmpty()) { ++ NetworkManager::Connection::Ptr con = NetworkManager::findConnection(m_connectionPath); ++ if (con) { ++ NetworkManager::WirelessSetting::Ptr wirelessSetting; ++ wirelessSetting = con->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast(); ++ if (wirelessSetting && (wirelessSetting->mode() == NetworkManager::WirelessSetting::Adhoc || ++ wirelessSetting->mode() == NetworkManager::WirelessSetting::Ap)) { ++ return "network-wireless-100"; ++ } ++ } ++ } + return "network-wireless-00"; + } else if (m_signal < 20) { + return "network-wireless-20"; +diff --git a/kded/bluetoothmonitor.cpp b/kded/bluetoothmonitor.cpp +index 2221d09..5d0218b 100644 +--- a/kded/bluetoothmonitor.cpp ++++ b/kded/bluetoothmonitor.cpp +@@ -220,6 +220,7 @@ void BluetoothMonitor::init() + + mDunDevice = reply.value(); + } ++ + #if WITH_MODEMMANAGER_SUPPORT + void BluetoothMonitor::modemAdded(const QString &udi) + { +diff --git a/lib/editor/bridgewidget.cpp b/lib/editor/bridgewidget.cpp +index 8815eb2..95344c4 100644 +--- a/lib/editor/bridgewidget.cpp ++++ b/lib/editor/bridgewidget.cpp +@@ -216,5 +216,5 @@ void BridgeWidget::populateBridges() + + bool BridgeWidget::isValid() const + { +- return !m_ui->ifaceName->text().isEmpty() && m_ui->bridges->count() > 0; ++ return !m_ui->ifaceName->text().isEmpty(); + } +diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp +index d4a511d..645249d 100644 +--- a/vpn/vpnc/vpnc.cpp ++++ b/vpn/vpnc/vpnc.cpp +@@ -145,7 +145,6 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName) + KConfigGroup cg(config, "main"); // Keys&Values are stored under [main] + if (cg.exists()) { + // Setup cisco-decrypt binary to decrypt the passwords +- QStringList decrArgs; + const QString ciscoDecryptBinary = KStandardDirs::findExe("cisco-decrypt", QString::fromLocal8Bit(qgetenv("PATH")) + ":/usr/lib/vpnc"); + if (ciscoDecryptBinary.isEmpty()) { + mErrorMessage = i18n("Needed executable cisco-decrypt could not be found."); +@@ -174,11 +173,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName) + } + else if (!decrPlugin->readStringKeyValue(cg,"enc_UserPassword").isEmpty() && !ciscoDecryptBinary.isEmpty()) { + // Decrypt the password and insert into map +- decrArgs.clear(); +- decrArgs << decrPlugin->readStringKeyValue(cg,"enc_UserPassword"); +- decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs); ++ decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary); + decrPlugin->ciscoDecrypt->start(); +- if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) { ++ decrPlugin->ciscoDecrypt->waitForStarted(); ++ decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_UserPassword").toUtf8()); ++ if (decrPlugin->ciscoDecrypt->waitForFinished()) { + secretData.insert(NM_VPNC_KEY_XAUTH_PASSWORD, decrPlugin->decryptedPasswd); + } + } +@@ -203,11 +202,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName) + } + else if (!decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").isEmpty() && !ciscoDecryptBinary.isEmpty()) { + //Decrypt the password and insert into map +- decrArgs.clear(); +- decrArgs << decrPlugin->readStringKeyValue(cg,"enc_GroupPwd"); +- decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs); ++ decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary); + decrPlugin->ciscoDecrypt->start(); +- if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) { ++ decrPlugin->ciscoDecrypt->waitForStarted(); ++ decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").toUtf8()); ++ if (decrPlugin->ciscoDecrypt->waitForFinished()) { + secretData.insert(NM_VPNC_KEY_SECRET, decrPlugin->decryptedPasswd); + data.insert(NM_VPNC_KEY_SECRET"-flags", QString::number(NetworkManager::Setting::AgentOwned)); + } diff --git a/kde/patch/plasma-nm/plasma-nm-fixes.patch.gz b/kde/patch/plasma-nm/plasma-nm-fixes.patch.gz deleted file mode 100644 index 1c67d95..0000000 Binary files a/kde/patch/plasma-nm/plasma-nm-fixes.patch.gz and /dev/null differ diff --git a/kde/patch/sddm-qt5.patch b/kde/patch/sddm-qt5.patch index 610c769..d1a12dc 100644 --- a/kde/patch/sddm-qt5.patch +++ b/kde/patch/sddm-qt5.patch @@ -1,6 +1,6 @@ # Add missing consolekit support # (brings back the switch_user/shutdown/reboot functionality in KDE): -zcat $CWD/patch/sddm-qt5/sddm_consolekit.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/sddm-qt5/sddm_consolekit.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } # Fix a compilation error on passwd backend: -#zcat $CWD/patch/sddm-qt5/sddm_auth.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/sddm-qt5/sddm_auth.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/sddm-qt5/sddm_auth.diff b/kde/patch/sddm-qt5/sddm_auth.diff new file mode 100644 index 0000000..f5d21cf --- /dev/null +++ b/kde/patch/sddm-qt5/sddm_auth.diff @@ -0,0 +1,25 @@ +diff -uar sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.cpp sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.cpp +--- sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.cpp 2014-08-27 16:42:23.000000000 +0200 ++++ sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.cpp 2014-09-15 12:24:06.717173942 +0200 +@@ -20,8 +20,8 @@ + + #include "PasswdBackend.h" + +-#include "auth/AuthMessages.h" +-#include "helper/HelperApp.h" ++#include "Auth.h" ++#include "../HelperApp.h" + + #include + +diff -uar sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.h sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.h +--- sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.h 2014-08-27 16:42:23.000000000 +0200 ++++ sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.h 2014-09-15 12:17:43.135172278 +0200 +@@ -21,6 +21,7 @@ + #if !defined(PASSWDBACKEND_H) && !defined(USE_PAM) + #define PASSWDBACKEND_H + ++#include "AuthMessages.h" + #include "../Backend.h" + + namespace SDDM { diff --git a/kde/patch/sddm-qt5/sddm_auth.diff.gz b/kde/patch/sddm-qt5/sddm_auth.diff.gz deleted file mode 100644 index 28aa239..0000000 Binary files a/kde/patch/sddm-qt5/sddm_auth.diff.gz and /dev/null differ diff --git a/kde/patch/sddm-qt5/sddm_consolekit.diff b/kde/patch/sddm-qt5/sddm_consolekit.diff new file mode 100644 index 0000000..acdfdc1 --- /dev/null +++ b/kde/patch/sddm-qt5/sddm_consolekit.diff @@ -0,0 +1,13 @@ +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index a5d270d..4b48524 100755 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -74,7 +74,7 @@ case $session in + exec xterm -geometry 80x24-0-0 + ;; + *) +- eval exec "$session" ++ eval exec ck-launch-session "$session" + ;; + esac + exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/kde/patch/sddm-qt5/sddm_consolekit.diff.gz b/kde/patch/sddm-qt5/sddm_consolekit.diff.gz deleted file mode 100644 index b20fee0..0000000 Binary files a/kde/patch/sddm-qt5/sddm_consolekit.diff.gz and /dev/null differ diff --git a/kde/patch/sddm-theme-breeze.patch b/kde/patch/sddm-theme-breeze.patch index f2c6181..c500dba 100644 --- a/kde/patch/sddm-theme-breeze.patch +++ b/kde/patch/sddm-theme-breeze.patch @@ -1,2 +1,2 @@ # SDDM changed its location for the themes: -#zcat $CWD/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff b/kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff new file mode 100644 index 0000000..96817ad --- /dev/null +++ b/kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff @@ -0,0 +1,10 @@ +diff -uar sddm-theme-breeze-20140601.orig/CMakeLists.txt sddm-theme-breeze-20140601/CMakeLists.txt +--- sddm-theme-breeze-20140601.orig/CMakeLists.txt 2014-06-01 05:19:59.000000000 +0200 ++++ sddm-theme-breeze-20140601/CMakeLists.txt 2014-09-15 14:08:36.883149093 +0200 +@@ -3,5 +3,5 @@ + message("This cmake file does some weird stuff for the neon ISO") + message("unless you are Rohan or Harold turn back now and revert this commit") + +-INSTALL(DIRECTORY breeze DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/sddm/themes/) ++INSTALL(DIRECTORY breeze DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sddm/themes/) + INSTALL(FILES plasmarc DESTINATION /var/lib/sddm/.config) diff --git a/kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff.gz b/kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff.gz deleted file mode 100644 index 4143096..0000000 Binary files a/kde/patch/sddm-theme-breeze/sddm-theme-breeze_path.diff.gz and /dev/null differ diff --git a/kde/patch/strigi-multimedia.patch b/kde/patch/strigi-multimedia.patch index 8b03abd..aebad0d 100644 --- a/kde/patch/strigi-multimedia.patch +++ b/kde/patch/strigi-multimedia.patch @@ -1,3 +1,3 @@ # Fix build: -zcat $CWD/patch/strigi-multimedia/strigi-multimedia_port.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/strigi-multimedia/strigi-multimedia_port.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/strigi-multimedia/strigi-multimedia_port.patch b/kde/patch/strigi-multimedia/strigi-multimedia_port.patch new file mode 100644 index 0000000..21a29a0 --- /dev/null +++ b/kde/patch/strigi-multimedia/strigi-multimedia_port.patch @@ -0,0 +1,29 @@ +diff -urB strigi-multimedia/CMakeLists.txt new/CMakeLists.txt +--- strigi-multimedia/CMakeLists.txt 2012-04-08 11:47:03.923386124 +0200 ++++ new/CMakeLists.txt 2012-04-08 12:29:05.807989600 +0200 +@@ -1,3 +1,5 @@ ++Project(strigi-multimedia) ++ + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/) + find_package(Qt4 REQUIRED) + find_package(KDE4 REQUIRED) +@@ -5,12 +7,10 @@ + include(MacroLibrary) + + include_directories(${KDE4_INCLUDES} ${QT_INCLUDES}) ++add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ) + + include(CheckIncludeFileCXX) + +-message (STATUS "port strigi-analyzer !!!") +-if(KFILE_PLUGINS_PORTED) +- + macro_optional_find_package(Theora) + macro_log_feature(THEORA_FOUND "Theora" "A video codec intended for use within the Ogg's project's Ogg multimedia streaming system" "http://www.theora.org" FALSE "" "Required to build the Theora Strigi Analyzer.") + +@@ -35,5 +35,3 @@ + if (OGGVORBIS_FOUND) + add_subdirectory(ogg) + endif(OGGVORBIS_FOUND) +- +-endif(KFILE_PLUGINS_PORTED) diff --git a/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz b/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz deleted file mode 100644 index 86a6172..0000000 Binary files a/kde/patch/strigi-multimedia/strigi-multimedia_port.patch.gz and /dev/null differ diff --git a/kde/patch/umbrello.patch b/kde/patch/umbrello.patch index 6cfeacc..96c9e17 100644 --- a/kde/patch/umbrello.patch +++ b/kde/patch/umbrello.patch @@ -1,5 +1,5 @@ # Fix compilation error (undefined listitem in classifierlistpage.cpp) # Fixed post KDE 4.11.4 in # http://quickgit.kde.org/?p=umbrello.git&a=commit&h=5f9f6a68716a8aced2c5f962247d9b05b326fcf5 -#zcat $CWD/patch/umbrello/umbrello-4.11.4_listitem.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +#cat $CWD/patch/umbrello/umbrello-4.11.4_listitem.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/umbrello/umbrello-4.11.4_listitem.patch b/kde/patch/umbrello/umbrello-4.11.4_listitem.patch new file mode 100644 index 0000000..f5cb615 --- /dev/null +++ b/kde/patch/umbrello/umbrello-4.11.4_listitem.patch @@ -0,0 +1,13 @@ +--- a/umbrello/dialogs/classifierlistpage.cpp ++++ b/umbrello/dialogs/classifierlistpage.cpp +@@ -346,7 +346,7 @@ + } + + if (itemIndex >= 0 && (itemIndex < getItemList().size())) { +- listItem = getItemList().at( itemIndex ); ++ UMLClassifierListItem* listItem = getItemList().at( itemIndex ); + + //now update screen + m_docTE->setText( listItem->doc() ); + + diff --git a/kde/patch/umbrello/umbrello-4.11.4_listitem.patch.gz b/kde/patch/umbrello/umbrello-4.11.4_listitem.patch.gz deleted file mode 100644 index f40ab91..0000000 Binary files a/kde/patch/umbrello/umbrello-4.11.4_listitem.patch.gz and /dev/null differ -- cgit v1.2.3