Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2019-05-05 21:22:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk2" Sun May 5 21:22:01 2019 rev:29 rq:700492 version:1.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2017-04-11 12:44:09.879059167 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new.5148/oxygen-gtk2.changes 2019-05-05 21:22:03.681382122 +0200 @@ -1,0 +2,11 @@ +Fri May 3 19:37:08 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Run spec-cleaner +- Trim the packages description + +------------------------------------------------------------------- +Fri May 3 18:55:10 UTC 2019 - Alexei Podvalsky <avvi...@yandex.by> + +- Add oxygen-gtk2-1.4.6-xul.patch to fix crashes in newmoon/palemoon + +------------------------------------------------------------------- New: ---- oxygen-gtk2-1.4.6-xul.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.pMQqjN/_old 2019-05-05 21:22:04.309383834 +0200 +++ /var/tmp/diff_new_pack.pMQqjN/_new 2019-05-05 21:22:04.309383834 +0200 @@ -1,7 +1,7 @@ # # spec file for package oxygen-gtk2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,10 +20,10 @@ Version: 1.4.6 Release: 0 Summary: A Port of the KDE Oxygen Widget Theme, to GTK 2.x -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE -Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk -Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 +URL: https://www.kde.org +Source: https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 Source100: baselibs.conf # PATCH-FIX-OPENSUSE fix-menu-items-look.patch fi...@opensuse.org -- Vertical center text in menuitems. Patch0: fix-menu-items-look.patch @@ -31,8 +31,11 @@ Patch1: qt-config-path.patch # PATCH-FIX-UPSTREAM fix-crash-about-invalid-columns.patch kde#338012 -- Fix crash in eclipse Patch2: fix-crash-about-invalid-columns.patch +# PATCH-FIX-UPSTREAM oxygen-gtk2-1.4.6-xul.patch -- Add a number of xul applications to prevent crash for these CCBUG: 341181 +Patch3: oxygen-gtk2-1.4.6-xul.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gtk+-2.0) @@ -40,16 +43,10 @@ Oxygen-Gtk2 is a port of the KDE Oxygen widget theme to Gtk 2.x. It's primary goal is to ensure visual consistency between Gtk-based -and Qt-based applications running under KDE. A secondary objective +and Qt-based applications. A secondary objective is to also have a stand-alone nice looking gtk theme that would behave well on other Desktop Environments. -Unlike other attempts made to port the KDE oxygen theme to gtk, -this attempt does not depend on Qt (via some Qt to Gtk conversion -engine), nor does render the widget appearance via hard coded -pixmaps, which otherwise breaks everytime some setting is changed -in KDE. - %package -n gtk2-engine-oxygen Summary: Oxygen GTK 2.x Theme Engine Group: System/GUI/Other @@ -58,16 +55,10 @@ Oxygen-Gtk2 is a port of the KDE Oxygen widget theme to Gtk 2.x. It's primary goal is to ensure visual consistency between Gtk-based -and Qt-based applications running under KDE. A secondary objective +and Qt-based applications. A secondary objective is to also have a stand-alone nice looking gtk theme that would behave well on other Desktop Environments. -Unlike other attempts made to port the KDE oxygen theme to gtk, -this attempt does not depend on Qt (via some Qt to Gtk conversion -engine), nor does render the widget appearance via hard coded -pixmaps, which otherwise breaks everytime some setting is changed -in KDE. - This package contains the Oxygen Gtk 2.x theme engine. %package -n gtk2-theme-oxygen @@ -82,16 +73,10 @@ Oxygen-Gtk2 is a port of the KDE Oxygen widget theme to Gtk 2.x. It's primary goal is to ensure visual consistency between Gtk-based -and Qt-based applications running under KDE. A secondary objective +and Qt-based applications. A secondary objective is to also have a stand-alone nice looking gtk theme that would behave well on other Desktop Environments. -Unlike other attempts made to port the KDE oxygen theme to gtk, -this attempt does not depend on Qt (via some Qt to Gtk conversion -engine), nor does render the widget appearance via hard coded -pixmaps, which otherwise breaks everytime some setting is changed -in KDE. - This package contains the Oxygen Gtk 2.x theme. %prep @@ -99,26 +84,27 @@ %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Switch to the oxygen-qt5 default. sed -i 's/^\(TabStyle=\).*$/\1TS_PLAIN/' rc/oxygenrc %build %cmake -make %{?_smp_mflags} +%cmake_build %install %cmake_install %files -n gtk2-engine-oxygen -%defattr(-,root,root) -%doc AUTHORS COPYING README TODO +%license COPYING +%doc AUTHORS README TODO %{_libdir}/gtk-2.0/*/engines/liboxygen-gtk.so %files -n gtk2-theme-oxygen -%defattr(-,root,root) -%doc AUTHORS COPYING README TODO -%{_bindir}/oxygen-gtk-demo +%license COPYING +%doc AUTHORS README TODO %dir %{_datadir}/themes/oxygen-gtk/ +%{_bindir}/oxygen-gtk-demo %{_datadir}/themes/oxygen-gtk/gtk-2.0/ %changelog ++++++ oxygen-gtk2-1.4.6-xul.patch ++++++ >From b1ee5fb80c44c6c8a625333af1cfdc997d408805 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa <hugo.pere...@free.fr> Date: Sat, 18 Jul 2015 20:09:28 +0200 Subject: moved xul application names to dedicated header file, added a number of xul applications to prevent crash for these CCBUG: 341181 --- src/oxygenapplicationname.cpp | 18 ++----------- src/oxygenxulapplicationnames.h | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 src/oxygenxulapplicationnames.h diff --git a/src/oxygenapplicationname.cpp b/src/oxygenapplicationname.cpp index feb5a23..17c8a1a 100644 --- a/src/oxygenapplicationname.cpp +++ b/src/oxygenapplicationname.cpp @@ -25,6 +25,7 @@ #include "oxygenapplicationname.h" #include "oxygengtkutils.h" +#include "oxygenxulapplicationnames.h" #include "config.h" #include <cstdlib> @@ -79,23 +80,8 @@ namespace Oxygen gtkAppName == "chromium" || gtkAppName == "chromium-browser" || gtkAppName == "google-chrome" ) _name = GoogleChrome; - else { - // tag all mozilla-like applications (XUL) - static const std::string XulAppNames[] = - { - "firefox", - "thunderbird", - "seamonkey", - "iceweasel", - "icecat", - "icedove", - "xulrunner", - "komodo", - "aurora", - "zotero", - "" - }; + else { for( unsigned int index = 0; !XulAppNames[index].empty(); ++index ) { diff --git a/src/oxygenxulapplicationnames.h b/src/oxygenxulapplicationnames.h new file mode 100644 index 0000000..252a1fc --- /dev/null +++ b/src/oxygenxulapplicationnames.h @@ -0,0 +1,56 @@ +#ifndef oxygenxulapplicationname_h +#define oxygenxulapplicationname_h +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2010 Hugo Pereira Da Costa <hugo.pere...@free.fr> +* +* inspired notably from kdelibs/kdeui/color/kcolorutils.h +* Copyright (C) 2007 Matthew Woehlke <mw_tr...@users.sourceforge.net> +* Copyright (C) 2007 Thomas Zander <zan...@kde.org> +* Copyright (C) 2007 Zack Rusin <z...@kde.org> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or( at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include <string> + +namespace Oxygen +{ + + // tag all mozilla-like applications (XUL) + static const std::string XulAppNames[] = + { + "aurora", + "earlybird", + "icecat", + "icedove", + "iceweasel", + "instantbird", + "firefox", + "fossamail", + "komodo", + "newmoon", + "palemoon", + "seamonkey", + "thunderbird", + "xulrunner", + "zotero", + "" + }; + +} + +#endif -- cgit v0.11.2
