Hello community, here is the log from the commit of package breeze for openSUSE:Factory checked in at 2015-10-19 22:44:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/breeze (Old) and /work/SRC/openSUSE:Factory/.breeze.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "breeze" Changes: -------- --- /work/SRC/openSUSE:Factory/breeze/breeze.changes 2015-09-24 07:06:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.breeze.new/breeze.changes 2015-10-19 22:44:22.000000000 +0200 @@ -1,0 +2,22 @@ +Sun Oct 18 14:50:37 UTC 2015 - [email protected] + +- Add set-breezyGTK-as-default-gtk-theme.patch and install gtkbreeze + kconf update script, so the GTK theme is correctly set (boo#950897) +- Make sure we require breeze-gtk so the change makes sense + +------------------------------------------------------------------- +Sat Oct 10 13:52:44 UTC 2015 - [email protected] + +- Create GTK icon cache +- Added Use-NETRootInfo-to-initiate-wm-move-operation.patch + (kde#353749) +- Added Install-emotes-and-mimtetypes-directories-of-the-dark-icon-theme.patch + +------------------------------------------------------------------- +Sun Oct 4 10:43:28 UTC 2015 - [email protected] + +- Update to 5.4.2: + * For more details please see: + https://www.kde.org/announcements/plasma-5.4.2.php + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/breeze/breeze4-style.changes 2015-09-24 07:06:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.breeze.new/breeze4-style.changes 2015-10-19 22:44:22.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Oct 10 13:52:44 UTC 2015 - [email protected] + +- Added Use-NETRootInfo-to-initiate-wm-move-operation.patch + (kde#353749) + +------------------------------------------------------------------- +Sun Oct 4 10:43:28 UTC 2015 - [email protected] + +- Update to 5.4.2: + * For more details please see: + https://www.kde.org/announcements/plasma-5.4.2.php + +------------------------------------------------------------------- Old: ---- breeze-5.4.1.tar.xz New: ---- Install-emotes-and-mimtetypes-directories-of-the-dark-icon-theme.patch Use-NETRootInfo-to-initiate-wm-move-operation.patch breeze-5.4.2.tar.xz set-breezyGTK-as-default-gtk-theme.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ breeze.spec ++++++ --- /var/tmp/diff_new_pack.uQ7X06/_old 2015-10-19 22:44:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uQ7X06/_new 2015-10-19 22:44:24.000000000 +0200 @@ -18,11 +18,12 @@ %bcond_without lang Name: breeze -Version: 5.4.1 +Version: 5.4.2 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: frameworkintegration-devel +BuildRequires: hicolor-icon-theme BuildRequires: kcmutils-devel BuildRequires: kcompletion-devel BuildRequires: kconfig-devel @@ -49,6 +50,12 @@ #Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM Use-NETRootInfo-to-initiate-wm-move-operation.patch +Patch0: Use-NETRootInfo-to-initiate-wm-move-operation.patch +# PATCH-FIX-UPSTREAM Install-emotes-and-mimtetypes-directories-of-the-dark-icon-theme.patch +Patch1: Install-emotes-and-mimtetypes-directories-of-the-dark-icon-theme.patch +# PATCH-FIX-OPENSUSE set-breezyGTK-as-default-gtk-theme.patch +Patch2: set-breezyGTK-as-default-gtk-theme.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,8 +83,9 @@ %package -n breeze5-style Summary: Plasma Desktop artwork, styles and assets Group: System/GUI/KDE -Requires: kconf_update5 # needed for kde4breeze +Requires: breeze-gtk +Requires: kconf_update5 Recommends: breeze4-style %if %{with lang} Recommends: breeze5-style-lang @@ -107,6 +115,9 @@ %lang_package -n breeze5-style %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 @@ -115,7 +126,12 @@ %install %kf5_makeinstall -C build - find %{buildroot} -type f -name '*gtkbreeze*' -exec rm -fv {} ';' + %icon_theme_cache_create_ghost breeze + %icon_theme_cache_create_ghost breeze-dark + +%post -n breeze5-icons +%icon_theme_cache_post breeze +%icon_theme_cache_post breeze-dark %if %{with lang} %files -n breeze5-style-lang @@ -127,6 +143,8 @@ %files -n breeze5-icons %defattr(-,root,root) %doc COPYING* +%ghost %{_kf5_iconsdir}/breeze/icon-theme.cache +%ghost %{_kf5_iconsdir}/breeze-dark/icon-theme.cache %{_kf5_iconsdir}/breeze/ %{_kf5_iconsdir}/breeze-dark/ ++++++ breeze4-style.spec ++++++ --- /var/tmp/diff_new_pack.uQ7X06/_old 2015-10-19 22:44:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uQ7X06/_new 2015-10-19 22:44:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: breeze4-style -Version: 5.4.1 +Version: 5.4.2 Release: 0 BuildRequires: automoc4 BuildRequires: cmake >= 2.8.12 @@ -31,6 +31,8 @@ Url: http://www.kde.org #Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz Source: breeze-%{version}.tar.xz +# PATCH-FIX-UPSTREAM Use-NETRootInfo-to-initiate-wm-move-operation.patch +Patch0: Use-NETRootInfo-to-initiate-wm-move-operation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,6 +41,7 @@ %prep %setup -q -n breeze-%{version} +%patch0 -p1 %build %cmake_kde4 -d build -- -DBUILD_po=OFF -DUSE_KDE4=ON ++++++ Install-emotes-and-mimtetypes-directories-of-the-dark-icon-theme.patch ++++++ From: Harald Sitter <[email protected]> Date: Mon, 05 Oct 2015 13:14:00 +0000 Subject: Install emotes and mimtetypes directories of the dark icon theme X-Git-Url: http://quickgit.kde.org/?p=breeze.git&a=commitdiff&h=12d8b9a9907b28ba1cbaffc380f4eeae4de9774d --- Install emotes and mimtetypes directories of the dark icon theme CCMAIL: [email protected] --- --- a/icons-dark/CMakeLists.txt +++ b/icons-dark/CMakeLists.txt @@ -11,7 +11,7 @@ ########### install files ############### -set( breeze_icon_dark_dirs actions apps categories devices emblems places status) +set( breeze_icon_dark_dirs actions apps categories devices emblems emotes mimetypes places status) set(BREEZE_INSTALL_DIR ${ICON_INSTALL_DIR}/breeze-dark) ++++++ Use-NETRootInfo-to-initiate-wm-move-operation.patch ++++++ From: David Rosca <[email protected]> Date: Thu, 08 Oct 2015 18:46:45 +0000 Subject: Use NETRootInfo to initiate wm move operation X-Git-Url: http://quickgit.kde.org/?p=breeze.git&a=commitdiff&h=ca72ca904f7fb8872667322bf5143e2b81eaf2f3 --- Use NETRootInfo to initiate wm move operation Also remove hack that messes with cursor position, which results in window sometimes rendered in wrong position for a moment after starting window move. REVIEW: 125522 BUG: 353749 --- --- a/kstyle/breezewindowmanager.cpp +++ b/kstyle/breezewindowmanager.cpp @@ -83,6 +83,14 @@ #if BREEZE_HAVE_X11 #include <QX11Info> +#include <xcb/xcb.h> + +#if BREEZE_USE_KDE4 +#include <NETRootInfo> +#else +#include <NETWM> +#endif + #endif namespace Breeze @@ -139,11 +147,8 @@ //* application-wise event. /** needed to catch end of XMoveResize events */ - bool appMouseEvent( QObject*, QEvent* event ) - { - - // store target window (see later) - QWidget* window( _parent->_target.data()->window() ); + bool appMouseEvent( QObject*, QEvent* ) + { /* post some mouseRelease event to the target, in order to counter balance @@ -151,19 +156,6 @@ */ QMouseEvent mouseEvent( QEvent::MouseButtonRelease, _parent->_dragPoint, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier ); qApp->sendEvent( _parent->_target.data(), &mouseEvent ); - - if( event->type() == QEvent::MouseMove ) - { - /* - HACK: quickly move the main cursor out of the window and back - this is needed to get the focus right for the window children - the origin of this issue is unknown at the moment - */ - const QPoint cursor = QCursor::pos(); - QCursor::setPos(window->mapToGlobal( window->rect().topRight() ) + QPoint(1, 0) ); - QCursor::setPos(cursor); - - } return false; @@ -194,19 +186,6 @@ _appEventFilter = new AppEventFilter( this ); qApp->installEventFilter( _appEventFilter ); - #if BREEZE_HAVE_X11 - _moveResizeAtom = 0; - if( Helper::isX11() ) - { - // create move-resize atom - xcb_connection_t* connection( Helper::connection() ); - const QString atomName( QStringLiteral( "_NET_WM_MOVERESIZE" ) ); - xcb_intern_atom_cookie_t cookie( xcb_intern_atom( connection, false, atomName.size(), qPrintable( atomName ) ) ); - ScopedPointer<xcb_intern_atom_reply_t> reply( xcb_intern_atom_reply( connection, cookie, nullptr) ); - _moveResizeAtom = reply ? reply->atom:0; - } - #endif - } //_____________________________________________________________ @@ -755,43 +734,15 @@ const qreal dpiRatio = 1; #endif - // from bespin/virtuality - xcb_button_release_event_t releaseEvent; - memset(&releaseEvent, 0, sizeof(releaseEvent)); - - releaseEvent.response_type = XCB_BUTTON_RELEASE; - releaseEvent.event = window; - releaseEvent.child = XCB_WINDOW_NONE; - releaseEvent.root = QX11Info::appRootWindow(); - releaseEvent.event_x = _dragPoint.x()*dpiRatio; - releaseEvent.event_y = _dragPoint.y()*dpiRatio; - releaseEvent.root_x = position.x()*dpiRatio; - releaseEvent.root_y = position.y()*dpiRatio; - releaseEvent.detail = XCB_BUTTON_INDEX_1; - releaseEvent.state = XCB_BUTTON_MASK_1; - releaseEvent.time = XCB_CURRENT_TIME; - releaseEvent.same_screen = true; - xcb_send_event( connection, false, window, XCB_EVENT_MASK_BUTTON_RELEASE, reinterpret_cast<const char*>(&releaseEvent)); + #if BREEZE_USE_KDE4 + Display* net_connection = QX11Info::display(); + #else + xcb_connection_t* net_connection = connection; + #endif xcb_ungrab_pointer( connection, XCB_TIME_CURRENT_TIME ); - - // from QtCurve - xcb_client_message_event_t clientMessageEvent; - memset(&clientMessageEvent, 0, sizeof(clientMessageEvent)); - - clientMessageEvent.response_type = XCB_CLIENT_MESSAGE; - clientMessageEvent.format = 32; - clientMessageEvent.window = window; - clientMessageEvent.type = _moveResizeAtom; - clientMessageEvent.data.data32[0] = position.x()*dpiRatio; - clientMessageEvent.data.data32[1] = position.y()*dpiRatio; - clientMessageEvent.data.data32[2] = 8; // NET::Move - clientMessageEvent.data.data32[3] = XCB_KEY_BUT_MASK_BUTTON_1; - xcb_send_event( connection, false, QX11Info::appRootWindow(), - XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | - XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, reinterpret_cast<const char*>(&clientMessageEvent) ); - - xcb_flush( connection ); + NETRootInfo rootInfo( net_connection, NET::WMMoveResize ); + rootInfo.moveResizeRequest( window, position.x() * dpiRatio, position.y() * dpiRatio, NET::Move ); #else --- a/kstyle/breezewindowmanager.h +++ b/kstyle/breezewindowmanager.h @@ -31,10 +31,6 @@ #include <QString> #include <QWidget> -#if BREEZE_HAVE_X11 -#include <xcb/xcb.h> -#endif - namespace Breeze { @@ -260,10 +256,6 @@ //* application event filter QObject* _appEventFilter; - #if BREEZE_HAVE_X11 - xcb_atom_t _moveResizeAtom; - #endif - //* allow access of all private members to the app event filter friend class AppEventFilter; ++++++ breeze-5.4.1.tar.xz -> breeze-5.4.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/breeze/breeze-5.4.1.tar.xz /work/SRC/openSUSE:Factory/.breeze.new/breeze-5.4.2.tar.xz differ: char 26, line 1 ++++++ set-breezyGTK-as-default-gtk-theme.patch ++++++ --- breeze-5.4.2/misc/gtkbreeze/main.cpp 2015-10-01 11:33:03.000000000 +0200 +++ breeze-5.4.2.new/misc/gtkbreeze/main.cpp 2015-10-18 16:45:26.142502413 +0200 @@ -74,7 +74,7 @@ QString isGtkThemeSetToOxygen(QString gt */ int setGtk2() { - const QString gtk2Theme = QStringLiteral("Orion"); // Orion looks kindae like breeze + const QString gtk2Theme = QStringLiteral("BreezyGTK"); // BreezyGTK looks kindae like breeze const QString gtk2ThemeSettings = QStringLiteral("gtk-2.0/gtkrc"); // system installed file to check for const QString gtkThemeDirectory = isGtkThemeInstalled(gtk2Theme, gtk2ThemeSettings); @@ -106,7 +106,7 @@ int setGtk2() out << QStringLiteral("}\n"); out << QStringLiteral("widget_class \"*\" style \"user-font\"\n"); out << QStringLiteral("gtk-font-name=\"Oxygen-Sans Sans-Book 10\"\n"); // matches plasma-workspace:startkde/startkde.cmake - out << QStringLiteral("gtk-theme-name=\"Orion\"\n"); + out << QStringLiteral("gtk-theme-name=\"BreezyGTK\"\n"); out << QStringLiteral("gtk-icon-theme-name=\"breeze\"\n"); out << QStringLiteral("gtk-fallback-icon-theme=\"gnome\"\n"); out << QStringLiteral("gtk-toolbar-style=GTK_TOOLBAR_ICONS\n"); @@ -123,8 +123,8 @@ int setGtk3() { qCDebug(GTKBREEZE) << "setGtk3()"; - const QString gtk3Theme = QStringLiteral("Orion"); // Orion looks kindae like breeze - const QString gtk3ThemeSettings = QStringLiteral("gtk-3.0/settings.ini"); // check for installed /usr/share/themes/Orion/gtk-3.0/settings.ini + const QString gtk3Theme = QStringLiteral("BreezyGTK"); // BreezyGTK looks kindae like breeze + const QString gtk3ThemeSettings = QStringLiteral("gtk-3.0/settings.ini"); // check for installed /usr/share/themes/BreezyGTK/gtk-3.0/settings.ini const QString gtkThemeDirectory = isGtkThemeInstalled(gtk3Theme, gtk3ThemeSettings); if (gtkThemeDirectory == 0) { @@ -158,26 +158,6 @@ int setGtk3() out << QStringLiteral("gtk-menu-images=1\n"); out << QStringLiteral("gtk-button-images=1\n"); qCDebug(GTKBREEZE) << "gtk3rc written"; - - QString cssFile = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first() + - QDir::separator() + ".config/gtk-3.0/gtk.css"; - QFile gtkcss3writer(cssFile); - opened = gtkcss3writer.open(QIODevice::WriteOnly | QIODevice::Text); - if (!opened) { - qCWarning(GTKBREEZE) << "failed to open " << cssFile; - return 1; - } - QTextStream outcss(>kcss3writer); - outcss << QStringLiteral(".window-frame, .window-frame:backdrop {\n"); - outcss << QStringLiteral(" box-shadow: 0 0 0 black;\n"); - outcss << QStringLiteral(" border-style: none;\n"); - outcss << QStringLiteral(" margin: 0;\n"); - outcss << QStringLiteral(" border-radius: 0;\n"); - outcss << QStringLiteral("}\n\n"); - outcss << QStringLiteral(".titlebar {\n"); - outcss << QStringLiteral(" border-radius: 0;\n"); - outcss << QStringLiteral("}\n"); - qCDebug(GTKBREEZE) << ".config/gtk-3.0/gtk.css written"; return 0; }
