diff -Nru kde4libs-4.14.12/debian/changelog kde4libs-4.14.12/debian/changelog --- kde4libs-4.14.12/debian/changelog 2015-09-28 14:59:22.000000000 +0000 +++ kde4libs-4.14.12/debian/changelog 2015-10-06 09:18:40.000000000 +0000 @@ -1,3 +1,16 @@ +kde4libs (4:4.14.12-0ubuntu3) wily; urgency=medium + + * Fix optional gcc4 symbols format. Two symbols in libkio5.symbols had + incorrect optional|arch annotation breaking gensymbols parsing. + + -- Harald Sitter Tue, 06 Oct 2015 11:16:56 +0200 + +kde4libs (4:4.14.12-0ubuntu2) wily; urgency=medium + + * Add kubuntu_breezify.patch to change default values from oxygen to breeze. + + -- Harald Sitter Mon, 05 Oct 2015 16:18:38 +0200 + kde4libs (4:4.14.12-0ubuntu1) wily; urgency=medium * New Upstream Release diff -Nru kde4libs-4.14.12/debian/libkio5.symbols kde4libs-4.14.12/debian/libkio5.symbols --- kde4libs-4.14.12/debian/libkio5.symbols 2015-09-22 15:36:54.000000000 +0000 +++ kde4libs-4.14.12/debian/libkio5.symbols 2015-10-06 09:18:40.000000000 +0000 @@ -1391,8 +1391,8 @@ _ZN32KFileMetaDataConfigurationWidgetD0Ev@Base 4:4.4.95 _ZN32KFileMetaDataConfigurationWidgetD1Ev@Base 4:4.4.95 _ZN32KFileMetaDataConfigurationWidgetD2Ev@Base 4:4.4.95 - (optional)(arch=amd64 arm64 armhf i386 powerpc ppc64el)_ZN3KDE4statERK7QStringP4stat@Base 4:4.13.97 - (optional)(arch=amd64 armhf powerpc ppc64el)_ZN3KDE6renameERK7QStringS2_@Base 4:4.14.10 + (optional|arch=amd64 arm64 armhf i386 powerpc ppc64el)_ZN3KDE4statERK7QStringP4stat@Base 4:4.13.97 + (optional|arch=amd64 armhf powerpc ppc64el)_ZN3KDE6renameERK7QStringS2_@Base 4:4.14.10 _ZN3KIO10Connection11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.3.4 _ZN3KIO10Connection11qt_metacastEPKc@Base 4:4.3.4 _ZN3KIO10Connection15connectToRemoteERK7QString@Base 4:4.3.4 diff -Nru kde4libs-4.14.12/debian/patches/kubuntu_breezify.patch kde4libs-4.14.12/debian/patches/kubuntu_breezify.patch --- kde4libs-4.14.12/debian/patches/kubuntu_breezify.patch 1970-01-01 00:00:00.000000000 +0000 +++ kde4libs-4.14.12/debian/patches/kubuntu_breezify.patch 2015-10-06 09:18:40.000000000 +0000 @@ -0,0 +1,178 @@ +Description: switch kde4libs defaults from oxygen to breeze + This enables tighter integration with default Plasma 5 appearance in all cases, + previously all KDE4 applications would be themed using the Plasma 5 Breeze + style through a kconf_update script called kde4breeze. This util writes configs + into the user home to make sure KDE4 apps appear breeze themed. Unfortunately + this does not work with sudo'd applications as they would use a different + HOME and thus use the Oxygen theme by default, making them not fit in with the + rest of the default theming. + The patch switches the default icon theme as well as widget style + from oxygen to breeze. + It also adjusts the hardcoded default color values in kcolorscheme from oxygen + to breeze (thanks to Kai Uwe Broulik https://git.reviewboard.kde.org/r/124872/) +Author: Harald Sitter +Origin: vendor +Forwarded: https://git.reviewboard.kde.org/r/125529/ +Reviewed-by: Philip Muškovac +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: kde4libs-4.14.12/kdeui/icons/kicontheme.cpp +=================================================================== +--- kde4libs-4.14.12.orig/kdeui/icons/kicontheme.cpp ++++ kde4libs-4.14.12/kdeui/icons/kicontheme.cpp +@@ -593,7 +593,7 @@ void KIconTheme::reconfigure() + // static + QString KIconTheme::defaultThemeName() + { +- return QLatin1String("oxygen"); ++ return QLatin1String("breeze"); + } + + void KIconTheme::assignIconsToContextMenu( ContextMenus type, +Index: kde4libs-4.14.12/kdeui/kernel/kstyle.cpp +=================================================================== +--- kde4libs-4.14.12.orig/kdeui/kernel/kstyle.cpp ++++ kde4libs-4.14.12/kdeui/kernel/kstyle.cpp +@@ -360,7 +360,7 @@ KStyle::SubElement KStyle::newSubElement + QString KStyle::defaultStyle() + { + #if defined(Q_WS_X11) && !defined(Q_WS_MAEMO_5) || defined(Q_WS_WIN) +- return QString("oxygen"); ++ return QString("breeze"); + #else + return QString(); // native style + #endif +Index: kde4libs-4.14.12/kdeui/colors/kcolorscheme.cpp +=================================================================== +--- kde4libs-4.14.12.orig/kdeui/colors/kcolorscheme.cpp ++++ kde4libs-4.14.12/kdeui/colors/kcolorscheme.cpp +@@ -165,77 +165,73 @@ struct DecoDefaultColors { + }; + + SetDefaultColors defaultViewColors = { +- { 255, 255, 255 }, // Background +- { 248, 247, 246 }, // Alternate +- { 31, 28, 27 }, // Normal +- { 137, 136, 135 }, // Inactive +- { 146, 76, 157 }, // Active +- { 0, 87, 174 }, // Link +- { 100, 74, 155 }, // Visited +- { 191, 3, 3 }, // Negative +- { 176, 128, 0 }, // Neutral +- { 0, 110, 40 } // Positive ++ { 252, 252, 252 }, // Background ++ { 239, 240, 241 }, // Alternate ++ { 49, 54, 59 }, // Normal ++ { 127, 140, 141 }, // Inactive ++ { 61, 174, 233 }, // Active ++ { 41, 128, 185 }, // Link ++ { 127, 140, 141 }, // Visited ++ { 218, 68, 83 }, // Negative ++ { 246, 116, 0 }, // Neutral ++ { 39, 174, 96 } // Positive + }; + +- + SetDefaultColors defaultWindowColors = { +- { 214, 210, 208 }, // Background +- { 218, 217, 216 }, // Alternate +- { 34, 31, 30 }, // Normal +- { 137, 136, 135 }, // Inactive +- { 146, 76, 157 }, // Active +- { 0, 87, 174 }, // Link +- { 100, 74, 155 }, // Visited +- { 191, 3, 3 }, // Negative +- { 176, 128, 0 }, // Neutral +- { 0, 110, 40 } // Positive ++ { 239, 240, 241 }, // Background ++ { 189, 195, 199 }, // Alternate ++ { 49, 54, 59 }, // Normal ++ { 127, 140, 141 }, // Inactive ++ { 61, 174, 233 }, // Active ++ { 41, 128, 185 }, // Link ++ { 127, 140, 141 }, // Visited ++ { 218, 68, 83 }, // Negative ++ { 246, 116, 0 }, // Neutral ++ { 39, 174, 96 } // Positive + }; + +- + SetDefaultColors defaultButtonColors = { +- { 223, 220, 217 }, // Background +- { 224, 223, 222 }, // Alternate +- { 34, 31, 30 }, // Normal +- { 137, 136, 135 }, // Inactive +- { 146, 76, 157 }, // Active +- { 0, 87, 174 }, // Link +- { 100, 74, 155 }, // Visited +- { 191, 3, 3 }, // Negative +- { 176, 128, 0 }, // Neutral +- { 0, 110, 40 } // Positive ++ { 239, 240, 241 }, // Background ++ { 189, 195, 199 }, // Alternate ++ { 49, 54, 59 }, // Normal ++ { 127, 140, 141 }, // Inactive ++ { 61, 174, 233 }, // Active ++ { 41, 128, 185 }, // Link ++ { 127, 140, 141 }, // Visited ++ { 218, 68, 83 }, // Negative ++ { 246, 116, 0 }, // Neutral ++ { 39, 174, 96 } // Positive + }; + +- + SetDefaultColors defaultSelectionColors = { +- { 67, 172, 232 }, // Background +- { 62, 138, 204 }, // Alternate +- { 255, 255, 255 }, // Normal +- { 199, 226, 248 }, // Inactive +- { 108, 36, 119 }, // Active +- { 0, 49, 110 }, // Link +- { 69, 40, 134 }, // Visited +- { 156, 14, 14 }, // Negative +- { 255, 221, 0 }, // Neutral +- { 128, 255, 128 } // Positive ++ { 61, 174, 233 }, // Background ++ { 29, 153, 243 }, // Alternate ++ { 239, 240, 241 }, // Normal ++ { 239, 240, 241 }, // Inactive ++ { 252, 252, 252 }, // Active ++ { 253, 188, 75 }, // Link ++ { 189, 195, 199 }, // Visited ++ { 218, 68, 83 }, // Negative ++ { 246, 116, 0 }, // Neutral ++ { 39, 174, 96 } // Positive + }; + +- + SetDefaultColors defaultTooltipColors = { +- { 24, 21, 19 }, // Background +- { 196, 224, 255 }, // Alternate +- { 231, 253, 255 }, // Normal +- { 137, 136, 135 }, // Inactive +- { 255, 128, 224 }, // Active +- { 88, 172, 255 }, // Link +- { 150, 111, 232 }, // Visited +- { 191, 3, 3 }, // Negative +- { 176, 128, 0 }, // Neutral +- { 0, 110, 40 } // Positive ++ { 49, 54, 59 }, // Background ++ { 77, 77, 77 }, // Alternate ++ { 239, 240, 241 }, // Normal ++ { 189, 195, 199 }, // Inactive ++ { 61, 174, 233 }, // Active ++ { 41, 128, 185 }, // Link ++ { 127, 140, 141 }, // Visited ++ { 218, 68, 83 }, // Negative ++ { 246, 116, 0 }, // Neutral ++ { 39, 174, 96 } // Positive + }; + + DecoDefaultColors defaultDecorationColors = { +- { 110, 214, 255 }, // Hover +- { 58, 167, 221 }, // Focus ++ { 147, 206, 233 }, // Hover ++ { 61, 174, 233 }, // Focus + }; + //END default colors + diff -Nru kde4libs-4.14.12/debian/patches/series kde4libs-4.14.12/debian/patches/series --- kde4libs-4.14.12/debian/patches/series 2015-09-22 15:36:54.000000000 +0000 +++ kde4libs-4.14.12/debian/patches/series 2015-10-06 09:18:40.000000000 +0000 @@ -33,3 +33,4 @@ kubuntu_patched_l10n.diff kubuntu_raise_after_drkonqi.patch kubuntu_revert_findpythonlibrary.diff +kubuntu_breezify.patch