From e9bef854b3cd20040a15cde658969d3aa2ad3a53f855b15e7898614ac00acb1b Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 09:13:40 +0000 Subject: [PATCH 1/7] osc copypac from project:KDE:Unstable:Frameworks package:breeze-gtk revision:13 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze-gtk?expand=0&rev=1 --- ...me-version-depending-on-present-libg.patch | 624 ------------------ _service | 12 + ...k-5.7.90git~20160915T100442~88cd75f.tar.xz | 3 + _service:set_version:breeze-gtk.spec | 100 +++ breeze-gtk-5.7.4.tar.xz | 3 - breeze-gtk.changes | 78 --- breeze-gtk.spec | 14 +- update_from_BreezeGTK.patch | 54 -- 8 files changed, 119 insertions(+), 769 deletions(-) delete mode 100644 Install-GTK3-theme-version-depending-on-present-libg.patch create mode 100644 _service create mode 100644 _service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz create mode 100644 _service:set_version:breeze-gtk.spec delete mode 100644 breeze-gtk-5.7.4.tar.xz delete mode 100644 update_from_BreezeGTK.patch diff --git a/Install-GTK3-theme-version-depending-on-present-libg.patch b/Install-GTK3-theme-version-depending-on-present-libg.patch deleted file mode 100644 index fd3aa8d..0000000 --- a/Install-GTK3-theme-version-depending-on-present-libg.patch +++ /dev/null @@ -1,624 +0,0 @@ -From d60226d8c8c29c01f5c5a3447d6b42370e29f658 Mon Sep 17 00:00:00 2001 -From: Hrvoje Senjan -Date: Sat, 11 Jun 2016 18:05:14 +0200 -Subject: [PATCH 1/1] Install GTK3 theme version depending on present libgtk3 - version - ---- - Breeze-gtk/CMakeLists.txt | 8 +- - CMakeLists.txt | 7 +- - cmake/FindGTK3.cmake | 563 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 572 insertions(+), 6 deletions(-) - create mode 100644 cmake/FindGTK3.cmake - -diff --git a/Breeze-gtk/CMakeLists.txt b/Breeze-gtk/CMakeLists.txt -index 957665f..a1de41c 100644 ---- a/Breeze-gtk/CMakeLists.txt -+++ b/Breeze-gtk/CMakeLists.txt -@@ -3,8 +3,10 @@ install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Bre - install(DIRECTORY assets DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze - ${directory_EXCLUDES}) - --if (WITH_GTK3_VERSION VERSION_LESS "3.20") --install(FILES gtk-3.18/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/) --else() -+if (WITH_GTK3_VERSION VERSION_EQUAL "3.20") - install(FILES gtk-3.20/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/) -+elseif (WITH_GTK3_VERSION VERSION_EQUAL "3.18") -+install(FILES gtk-3.18/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/) -+elseif (WITH_GTK3_VERSION VERSION_LESS "3.18") -+install(FILES gtk-3.0/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/) - endif() -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c5abafe..bcca32b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,12 +7,13 @@ cmake_minimum_required(VERSION 2.8.12) - find_package(ECM 0.0.9 REQUIRED NO_MODULE) - include(FeatureSummary) - --set(WITH_GTK3_VERSION 3.18 CACHE STRING -- "Use the theme for the specified GTK+3 version (default: 3.18)") -- - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake") - include(KDEInstallDirs) - -+find_package(GTK3 3.0 REQUIRED gtk) -+set(WITH_GTK3_VERSION ${GTK3_MAJOR_VERSION}.${GTK3_MINOR_VERSION} CACHE STRING -+ "Use the theme for the specified GTK+3 version (default: 3.18)") -+ - # Exclude these patterns when installing directories as they have no use - # in production. - set(directory_EXCLUDES -diff --git a/cmake/FindGTK3.cmake b/cmake/FindGTK3.cmake -new file mode 100644 -index 0000000..9017c07 ---- /dev/null -+++ b/cmake/FindGTK3.cmake -@@ -0,0 +1,563 @@ -+# - FindGTK3.cmake -+# This module can find the GTK3 widget libraries and several of its other -+# optional components like gtkmm, glade, and glademm. -+# -+# NOTE: If you intend to use version checking, CMake 2.6.2 or later is -+# required. -+# -+# Specify one or more of the following components -+# as you call this find module. See example below. -+# -+# gtk -+# gtkmm -+# glade -+# glademm -+# -+# The following variables will be defined for your use -+# -+# GTK3_FOUND - Were all of your specified components found? -+# GTK3_INCLUDE_DIRS - All include directories -+# GTK3_LIBRARIES - All libraries -+# -+# GTK3_VERSION - The version of GTK3 found (x.y.z) -+# GTK3_MAJOR_VERSION - The major version of GTK3 -+# GTK3_MINOR_VERSION - The minor version of GTK3 -+# GTK3_PATCH_VERSION - The patch version of GTK3 -+# -+# Optional variables you can define prior to calling this module: -+# -+# GTK3_DEBUG - Enables verbose debugging of the module -+# GTK3_SKIP_MARK_AS_ADVANCED - Disable marking cache variables as advanced -+# GTK3_ADDITIONAL_SUFFIXES - Allows defining additional directories to -+# search for include files -+# -+#================= -+# Example Usage: -+# -+# Call find_package() once, here are some examples to pick from: -+# -+# Require GTK 3.0 or later -+# find_package(GTK3 3.0 REQUIRED gtk) -+# -+# if(GTK3_FOUND) -+# include_directories(${GTK3_INCLUDE_DIRS}) -+# add_executable(mygui mygui.cc) -+# target_link_libraries(mygui ${GTK3_LIBRARIES}) -+# endif() -+# -+ -+#============================================================================= -+# Copyright 2009 Kitware, Inc. -+# Copyright 2008-2009 Philip Lowman -+# -+# Distributed under the OSI-approved BSD License (the "License"); -+# see accompanying file Copyright.txt for details. -+# -+# This software is distributed WITHOUT ANY WARRANTY; without even the -+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+# See the License for more information. -+#============================================================================= -+# (To distribute this file outside of CMake, substitute the full -+# License text for the above reference.) -+ -+ -+# Version 0.1 (5/13/2011) -+# * First cut at a GTK3 version (Heavily derived from -+# FindGTK2.cmake) -+ -+ -+#============================================================= -+# _GTK3_GET_VERSION -+# Internal function to parse the version number in gtkversion.h -+# _OUT_major = Major version number -+# _OUT_minor = Minor version number -+# _OUT_micro = Micro version number -+# _gtkversion_hdr = Header file to parse -+#============================================================= -+function(_GTK3_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr) -+ file(READ ${_gtkversion_hdr} _contents) -+ if(_contents) -+ string(REGEX REPLACE ".*#define GTK_MAJOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_major} "${_contents}") -+ string(REGEX REPLACE ".*#define GTK_MINOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_minor} "${_contents}") -+ string(REGEX REPLACE ".*#define GTK_MICRO_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_micro} "${_contents}") -+ -+ if(NOT ${_OUT_major} MATCHES "[0-9]+") -+ message(FATAL_ERROR "Version parsing failed for GTK3_MAJOR_VERSION!") -+ endif() -+ if(NOT ${_OUT_minor} MATCHES "[0-9]+") -+ message(FATAL_ERROR "Version parsing failed for GTK3_MINOR_VERSION!") -+ endif() -+ if(NOT ${_OUT_micro} MATCHES "[0-9]+") -+ message(FATAL_ERROR "Version parsing failed for GTK3_MICRO_VERSION!") -+ endif() -+ -+ set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE) -+ set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE) -+ set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE) -+ else() -+ message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist") -+ endif() -+endfunction() -+ -+#============================================================= -+# _GTK3_FIND_INCLUDE_DIR -+# Internal function to find the GTK include directories -+# _var = variable to set -+# _hdr = header file to look for -+#============================================================= -+function(_GTK3_FIND_INCLUDE_DIR _var _hdr) -+ -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "_GTK3_FIND_INCLUDE_DIR( ${_var} ${_hdr} )") -+ endif() -+ -+ set(_relatives -+ # If these ever change, things will break. -+ ${GTK3_ADDITIONAL_SUFFIXES} -+ glibmm-2.0 -+ glib-2.0 -+ atk-1.0 -+ atkmm-1.0 -+ cairo -+ cairomm-1.0 -+ gdk-pixbuf-2.0 -+ gdkmm-2.4 -+ giomm-2.4 -+ gtk-3.0 -+ gtkmm-2.4 -+ libglade-2.0 -+ libglademm-2.4 -+ pango-1.0 -+ pangomm-1.4 -+ sigc++-2.2 -+ gtk-unix-print-2.0 -+ ) -+ -+ set(_suffixes) -+ foreach(_d ${_relatives}) -+ list(APPEND _suffixes ${_d}) -+ list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include -+ endforeach() -+ -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "include suffixes = ${_suffixes}") -+ endif() -+ -+ find_path(${_var} ${_hdr} -+ PATHS -+ /usr/local/lib64 -+ /usr/local/lib -+ # fix for Ubuntu == 11.04 (Natty Narwhal) -+ /usr/lib/i386-linux-gnu/ -+ /usr/lib/x86_64-linux-gnu/ -+ # end -+ # fix for Ubuntu >= 11.10 (Oneiric Ocelot) -+ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} -+ # end -+ /usr/lib64 -+ /usr/lib -+ /opt/gnome/include -+ /opt/gnome/lib -+ /opt/openwin/include -+ /usr/openwin/lib -+ /sw/include -+ /sw/lib -+ /opt/local/include -+ /opt/local/lib -+ $ENV{GTKMM_BASEPATH}/include -+ $ENV{GTKMM_BASEPATH}/lib -+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include -+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib -+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include -+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib -+ PATH_SUFFIXES -+ ${_suffixes} -+ ) -+ -+ if(${_var}) -+ set(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS} ${${_var}} PARENT_SCOPE) -+ if(NOT GTK3_SKIP_MARK_AS_ADVANCED) -+ mark_as_advanced(${_var}) -+ endif() -+ endif() -+ -+endfunction(_GTK3_FIND_INCLUDE_DIR) -+ -+#============================================================= -+# _GTK3_FIND_LIBRARY -+# Internal function to find libraries packaged with GTK3 -+# _var = library variable to create -+#============================================================= -+function(_GTK3_FIND_LIBRARY _var _lib _expand_vc _append_version) -+ -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "_GTK3_FIND_LIBRARY( ${_var} ${_lib} ${_expand_vc} ${_append_version} )") -+ endif() -+ -+ # Not GTK versions per se but the versions encoded into Windows -+ # import libraries (GtkMM 2.14.1 has a gtkmm-vc80-2_4.lib for example) -+ # Also the MSVC libraries use _ for . (this is handled below) -+ # ********* SOMEONE WITH WINDOWS NEEDS TO CHECK THIS BIT FOR V3 ********* -+ # ********* the plain 3 is needed to get Debian Sid to find the libraries -+ set(_versions 3.0 3 2.20 2.18 2.16 2.14 2.12 -+ 2.10 2.8 2.6 2.4 2.2 2.0 -+ 1.20 1.18 1.16 1.14 1.12 -+ 1.10 1.8 1.6 1.4 1.2 1.0) -+ -+ set(_library) -+ set(_library_d) -+ -+ set(_library ${_lib}) -+ -+ if(_expand_vc AND MSVC) -+ # Add vc80/vc90/vc100 midfixes -+ if(MSVC80) -+ set(_library ${_library}-vc80) -+ elseif(MSVC90) -+ set(_library ${_library}-vc90) -+ elseif(MSVC10) -+ set(_library ${_library}-vc100) -+ endif() -+ set(_library_d ${_library}-d) -+ endif() -+ -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "After midfix addition = ${_library} and ${_library_d}") -+ endif() -+ -+ set(_lib_list) -+ set(_libd_list) -+ if(_append_version) -+ foreach(_ver ${_versions}) -+ list(APPEND _lib_list "${_library}-${_ver}") -+ list(APPEND _libd_list "${_library_d}-${_ver}") -+ endforeach() -+ else() -+ set(_lib_list ${_library}) -+ set(_libd_list ${_library_d}) -+ endif() -+ -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "library list = ${_lib_list} and library debug list = ${_libd_list}") -+ endif() -+ -+ # For some silly reason the MSVC libraries use _ instead of . -+ # in the version fields -+ if(_expand_vc AND MSVC) -+ set(_no_dots_lib_list) -+ set(_no_dots_libd_list) -+ foreach(_l ${_lib_list}) -+ string(REPLACE "." "_" _no_dots_library ${_l}) -+ list(APPEND _no_dots_lib_list ${_no_dots_library}) -+ endforeach() -+ # And for debug -+ set(_no_dots_libsd_list) -+ foreach(_l ${_libd_list}) -+ string(REPLACE "." "_" _no_dots_libraryd ${_l}) -+ list(APPEND _no_dots_libd_list ${_no_dots_libraryd}) -+ endforeach() -+ -+ # Copy list back to original names -+ set(_lib_list ${_no_dots_lib_list}) -+ set(_libd_list ${_no_dots_libd_list}) -+ endif() -+ -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "While searching for ${_var}, our proposed library list is ${_lib_list}") -+ endif() -+ -+ find_library(${_var} -+ NAMES ${_lib_list} -+ PATHS -+ /opt/gnome/lib -+ /opt/gnome/lib64 -+ /usr/openwin/lib -+ /usr/openwin/lib64 -+ /sw/lib -+ $ENV{GTKMM_BASEPATH}/lib -+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib -+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib -+ ) -+ -+ if(_expand_vc AND MSVC) -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "While searching for ${_var}_DEBUG our proposed library list is ${_libd_list}") -+ endif() -+ -+ find_library(${_var}_DEBUG -+ NAMES ${_libd_list} -+ PATHS -+ $ENV{GTKMM_BASEPATH}/lib -+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib -+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib -+ ) -+ -+ if(${_var} AND ${_var}_DEBUG) -+ if(NOT GTK3_SKIP_MARK_AS_ADVANCED) -+ mark_as_advanced(${_var}_DEBUG) -+ endif() -+ set(GTK3_LIBRARIES ${GTK3_LIBRARIES} optimized ${${_var}} debug ${${_var}_DEBUG}) -+ set(GTK3_LIBRARIES ${GTK3_LIBRARIES} PARENT_SCOPE) -+ endif() -+ else() -+ if(NOT GTK3_SKIP_MARK_AS_ADVANCED) -+ mark_as_advanced(${_var}) -+ endif() -+ set(GTK3_LIBRARIES ${GTK3_LIBRARIES} ${${_var}}) -+ set(GTK3_LIBRARIES ${GTK3_LIBRARIES} PARENT_SCOPE) -+ # Set debug to release -+ set(${_var}_DEBUG ${${_var}}) -+ set(${_var}_DEBUG ${${_var}} PARENT_SCOPE) -+ endif() -+endfunction(_GTK3_FIND_LIBRARY) -+ -+#============================================================= -+ -+# -+# main() -+# -+ -+set(GTK3_FOUND) -+set(GTK3_INCLUDE_DIRS) -+set(GTK3_LIBRARIES) -+ -+if(NOT GTK3_FIND_COMPONENTS) -+ # Assume they only want GTK -+ set(GTK3_FIND_COMPONENTS gtk) -+endif() -+ -+# -+# If specified, enforce version number -+# -+if(GTK3_FIND_VERSION) -+ cmake_minimum_required(VERSION 2.6.2) -+ set(GTK3_FAILED_VERSION_CHECK true) -+ if(GTK3_DEBUG) -+ message(STATUS "[FindGTK3.cmake:${CMAKE_CURRENT_LIST_LINE}] " -+ "Searching for version ${GTK3_FIND_VERSION}") -+ endif() -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GTK_INCLUDE_DIR gtk/gtk.h) -+ if(GTK3_GTK_INCLUDE_DIR) -+ _GTK3_GET_VERSION(GTK3_MAJOR_VERSION -+ GTK3_MINOR_VERSION -+ GTK3_PATCH_VERSION -+ ${GTK3_GTK_INCLUDE_DIR}/gtk/gtkversion.h) -+ set(GTK3_VERSION -+ ${GTK3_MAJOR_VERSION}.${GTK3_MINOR_VERSION}.${GTK3_PATCH_VERSION}) -+ if(GTK3_FIND_VERSION_EXACT) -+ if(GTK3_VERSION VERSION_EQUAL GTK3_FIND_VERSION) -+ set(GTK3_FAILED_VERSION_CHECK false) -+ endif() -+ else() -+ if(GTK3_VERSION VERSION_EQUAL GTK3_FIND_VERSION OR -+ GTK3_VERSION VERSION_GREATER GTK3_FIND_VERSION) -+ set(GTK3_FAILED_VERSION_CHECK false) -+ endif() -+ endif() -+ else() -+ # If we can't find the GTK include dir, we can't do version checking -+ if(GTK3_FIND_REQUIRED AND NOT GTK3_FIND_QUIETLY) -+ message(FATAL_ERROR "Could not find GTK3 include directory") -+ endif() -+ return() -+ endif() -+ -+ if(GTK3_FAILED_VERSION_CHECK) -+ if(GTK3_FIND_REQUIRED AND NOT GTK3_FIND_QUIETLY) -+ if(GTK3_FIND_VERSION_EXACT) -+ message(FATAL_ERROR "GTK3 version check failed. Version ${GTK3_VERSION} was found, version ${GTK3_FIND_VERSION} is needed exactly.") -+ else() -+ message(FATAL_ERROR "GTK3 version check failed. Version ${GTK3_VERSION} was found, at least version ${GTK3_FIND_VERSION} is required") -+ endif() -+ endif() -+ -+ # If the version check fails, exit out of the module here -+ return() -+ endif() -+endif() -+ -+# -+# Find all components -+# -+ -+find_package(Freetype) -+list(APPEND GTK3_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) -+list(APPEND GTK3_LIBRARIES ${FREETYPE_LIBRARIES}) -+ -+foreach(_GTK3_component ${GTK3_FIND_COMPONENTS}) -+ if(_GTK3_component STREQUAL "gtk") -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GLIB_INCLUDE_DIR glib.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GLIBCONFIG_INCLUDE_DIR glibconfig.h) -+ _GTK3_FIND_LIBRARY (GTK3_GLIB_LIBRARY glib false true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GOBJECT_INCLUDE_DIR gobject/gobject.h) -+ _GTK3_FIND_LIBRARY (GTK3_GOBJECT_LIBRARY gobject false true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) -+ _GTK3_FIND_LIBRARY (GTK3_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GDK_INCLUDE_DIR gdk/gdk.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GDKCONFIG_INCLUDE_DIR gdk/gdkconfig.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GTK_INCLUDE_DIR gtk/gtk.h) -+ -+ # ********* At least on Debian the gdk & gtk libraries -+ # ********* don't have the -x11 suffix. -+ if(UNIX) -+ _GTK3_FIND_LIBRARY (GTK3_GDK_LIBRARY gdk false true) -+ _GTK3_FIND_LIBRARY (GTK3_GTK_LIBRARY gtk false true) -+ else() -+ _GTK3_FIND_LIBRARY (GTK3_GDK_LIBRARY gdk-win32 false true) -+ _GTK3_FIND_LIBRARY (GTK3_GTK_LIBRARY gtk-win32 false true) -+ endif() -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_CAIRO_INCLUDE_DIR cairo.h) -+ _GTK3_FIND_LIBRARY (GTK3_CAIRO_LIBRARY cairo false false) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_PANGO_INCLUDE_DIR pango/pango.h) -+ _GTK3_FIND_LIBRARY (GTK3_PANGO_LIBRARY pango false true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_ATK_INCLUDE_DIR atk/atk.h) -+ _GTK3_FIND_LIBRARY (GTK3_ATK_LIBRARY atk false true) -+ -+ -+ elseif(_GTK3_component STREQUAL "gtkmm") -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GLIBMM_INCLUDE_DIR glibmm.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GLIBMMCONFIG_INCLUDE_DIR glibmmconfig.h) -+ _GTK3_FIND_LIBRARY (GTK3_GLIBMM_LIBRARY glibmm true true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GDKMM_INCLUDE_DIR gdkmm.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GDKMMCONFIG_INCLUDE_DIR gdkmmconfig.h) -+ _GTK3_FIND_LIBRARY (GTK3_GDKMM_LIBRARY gdkmm true true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GTKMM_INCLUDE_DIR gtkmm.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GTKMMCONFIG_INCLUDE_DIR gtkmmconfig.h) -+ _GTK3_FIND_LIBRARY (GTK3_GTKMM_LIBRARY gtkmm true true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_CAIROMM_INCLUDE_DIR cairomm/cairomm.h) -+ _GTK3_FIND_LIBRARY (GTK3_CAIROMM_LIBRARY cairomm true true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_PANGOMM_INCLUDE_DIR pangomm.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h) -+ _GTK3_FIND_LIBRARY (GTK3_PANGOMM_LIBRARY pangomm true true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_SIGC++_INCLUDE_DIR sigc++/sigc++.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_SIGC++CONFIG_INCLUDE_DIR sigc++config.h) -+ _GTK3_FIND_LIBRARY (GTK3_SIGC++_LIBRARY sigc true true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GIOMM_INCLUDE_DIR giomm.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GIOMMCONFIG_INCLUDE_DIR giommconfig.h) -+ _GTK3_FIND_LIBRARY (GTK3_GIOMM_LIBRARY giomm true true) -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_ATKMM_INCLUDE_DIR atkmm.h) -+ _GTK3_FIND_LIBRARY (GTK3_ATKMM_LIBRARY atkmm true true) -+ -+ elseif(_GTK3_component STREQUAL "glade") -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GLADE_INCLUDE_DIR glade/glade.h) -+ _GTK3_FIND_LIBRARY (GTK3_GLADE_LIBRARY glade false true) -+ -+ elseif(_GTK3_component STREQUAL "glademm") -+ -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GLADEMM_INCLUDE_DIR libglademm.h) -+ _GTK3_FIND_INCLUDE_DIR(GTK3_GLADEMMCONFIG_INCLUDE_DIR libglademmconfig.h) -+ _GTK3_FIND_LIBRARY (GTK3_GLADEMM_LIBRARY glademm true true) -+ -+ else() -+ message(FATAL_ERROR "Unknown GTK3 component ${_component}") -+ endif() -+endforeach() -+ -+# -+# Solve for the GTK3 version if we haven't already -+# -+if(NOT GTK3_FIND_VERSION AND GTK3_GTK_INCLUDE_DIR) -+ _GTK3_GET_VERSION(GTK3_MAJOR_VERSION -+ GTK3_MINOR_VERSION -+ GTK3_PATCH_VERSION -+ ${GTK3_GTK_INCLUDE_DIR}/gtk/gtkversion.h) -+ set(GTK3_VERSION ${GTK3_MAJOR_VERSION}.${GTK3_MINOR_VERSION}.${GTK3_PATCH_VERSION}) -+endif() -+ -+# -+# Try to enforce components -+# -+ -+set(_GTK3_did_we_find_everything true) # This gets set to GTK3_FOUND -+ -+include(FindPackageHandleStandardArgs) -+#include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -+ -+foreach(_GTK3_component ${GTK3_FIND_COMPONENTS}) -+ string(TOUPPER ${_GTK3_component} _COMPONENT_UPPER) -+ -+ if(_GTK3_component STREQUAL "gtk") -+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3_${_COMPONENT_UPPER} "Some or all of the gtk libraries were not found." -+ GTK3_GTK_LIBRARY -+ GTK3_GTK_INCLUDE_DIR -+ -+ GTK3_GLIB_INCLUDE_DIR -+ GTK3_GLIBCONFIG_INCLUDE_DIR -+ GTK3_GLIB_LIBRARY -+ -+ GTK3_GDK_INCLUDE_DIR -+ GTK3_GDKCONFIG_INCLUDE_DIR -+ GTK3_GDK_LIBRARY -+ ) -+ elseif(_GTK3_component STREQUAL "gtkmm") -+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3_${_COMPONENT_UPPER} "Some or all of the gtkmm libraries were not found." -+ GTK3_GTKMM_LIBRARY -+ GTK3_GTKMM_INCLUDE_DIR -+ GTK3_GTKMMCONFIG_INCLUDE_DIR -+ -+ GTK3_GLIBMM_INCLUDE_DIR -+ GTK3_GLIBMMCONFIG_INCLUDE_DIR -+ GTK3_GLIBMM_LIBRARY -+ -+ GTK3_GDKMM_INCLUDE_DIR -+ GTK3_GDKMMCONFIG_INCLUDE_DIR -+ GTK3_GDKMM_LIBRARY -+ ) -+ elseif(_GTK3_component STREQUAL "glade") -+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3_${_COMPONENT_UPPER} "The glade library was not found." -+ GTK3_GLADE_LIBRARY -+ GTK3_GLADE_INCLUDE_DIR -+ ) -+ elseif(_GTK3_component STREQUAL "glademm") -+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3_${_COMPONENT_UPPER} "The glademm library was not found." -+ GTK3_GLADEMM_LIBRARY -+ GTK3_GLADEMM_INCLUDE_DIR -+ GTK3_GLADEMMCONFIG_INCLUDE_DIR -+ ) -+ endif() -+ -+ if(NOT GTK3_${_COMPONENT_UPPER}_FOUND) -+ set(_GTK3_did_we_find_everything false) -+ endif() -+endforeach() -+ -+if(_GTK3_did_we_find_everything AND NOT GTK3_VERSION_CHECK_FAILED) -+ set(GTK3_FOUND true) -+else() -+ # Unset our variables. -+ set(GTK3_FOUND false) -+ set(GTK3_VERSION) -+ set(GTK3_VERSION_MAJOR) -+ set(GTK3_VERSION_MINOR) -+ set(GTK3_VERSION_PATCH) -+ set(GTK3_INCLUDE_DIRS) -+ set(GTK3_LIBRARIES) -+endif() -+ -+if(GTK3_INCLUDE_DIRS) -+ list(REMOVE_DUPLICATES GTK3_INCLUDE_DIRS) -+endif() --- -2.6.6 - diff --git a/_service b/_service new file mode 100644 index 0000000..e571505 --- /dev/null +++ b/_service @@ -0,0 +1,12 @@ + + + git://anongit.kde.org/breeze-gtk.git + git + 5.7.90git~%ci~%h + + + *.tar + xz + + + diff --git a/_service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz b/_service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz new file mode 100644 index 0000000..4d5ba60 --- /dev/null +++ b/_service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:795b57fadc3492fb508151ab56f6e8ff5c9261243547fc2f22fefacf463a8886 +size 211388 diff --git a/_service:set_version:breeze-gtk.spec b/_service:set_version:breeze-gtk.spec new file mode 100644 index 0000000..6eb4d27 --- /dev/null +++ b/_service:set_version:breeze-gtk.spec @@ -0,0 +1,100 @@ +# +# spec file for package breeze-gtk +# +# Copyright (c) 2015 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +%define _name breeze +Name: breeze-gtk +Version: 5.7.90git~20160915T100442~88cd75f +Release: 0 +Summary: GTK+ theme matching KDE's Breeze +License: LGPL-2.1 +Group: System/GUI/KDE +Url: https://projects.kde.org/breeze-gtk +Source: %{version}/%{name}-%{version}.tar.xz +BuildRequires: cmake >= 2.8.12 +BuildRequires: extra-cmake-modules +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: kf5-filesystem +BuildRequires: pkgconfig(Qt5Core) + +%description +A GTK+ theme created to match with the new Plasma 5 Breeze theme. + +%package -n metatheme-%{_name}-common +Summary: GTK+ theme matching KDE's Breeze -- Common Files +Group: System/GUI/KDE +Suggests: gtk2-metatheme-%{_name} +Suggests: gtk3-metatheme-%{_name} +Provides: %{_name}-gtk = %{version} +Obsoletes: %{_name}-gtk < %{version} + +%description -n metatheme-%{_name}-common +A GTK+ theme created to match with the new Plasma 5 Breeze theme. + +%package -n gtk2-metatheme-%{_name} +Summary: GTK+ theme matching KDE's Breeze -- GTK+ 2 Support +Group: System/GUI/KDE +Requires: metatheme-%{_name}-common = %{version} +Supplements: packageand(metatheme-%{_name}-common:gtk2) +BuildArch: noarch + +%description -n gtk2-metatheme-%{_name} +A GTK+ theme created to match with the new Plasma 5 Breeze theme. + +%package -n gtk3-metatheme-%{_name} +Summary: GTK+ theme matching KDE's Breeze -- GTK+ 3 Support +Group: System/GUI/KDE +Requires: metatheme-%{_name}-common = %{version} +Supplements: packageand(metatheme-%{_name}-common:gtk3) +BuildArch: noarch + +%description -n gtk3-metatheme-%{_name} +A GTK+ theme created to match with the new Plasma 5 Breeze theme. + +%prep +%setup -q +chmod a-x COPYING* README.md + +%build +%cmake_kf5 -- -DWITH_GTK3_VERSION=3.20 +make %{?_smp_mflags} + +%install +%kf5_makeinstall +%fdupes %{buildroot}%{_datadir}/ + +%files -n metatheme-%{_name}-common +%defattr(-,root,root) +%doc COPYING* README.md +%{_datadir}/themes/Breeze*/ +%exclude %{_datadir}/themes/Breeze*/gtk-?.0/ +%dir %{_kf5_sharedir}/kconf_update/ +%dir %{_kf5_sharedir}/themes/Breeze*/assets/ +%{_kf5_sharedir}/kconf_update/*%{_name}* +%dir %{_kf5_libdir}/kconf_update_bin/ +%{_kf5_libdir}/kconf_update_bin/*%{_name}* + +%files -n gtk2-metatheme-%{_name} +%defattr(-,root,root) +%{_datadir}/themes/Breeze*/gtk-2.0/ + +%files -n gtk3-metatheme-%{_name} +%defattr(-,root,root) +%{_datadir}/themes/Breeze*/gtk-3.0/ + +%changelog diff --git a/breeze-gtk-5.7.4.tar.xz b/breeze-gtk-5.7.4.tar.xz deleted file mode 100644 index 5e200e0..0000000 --- a/breeze-gtk-5.7.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d3cc83367cc5d68648039c8f5a85c12a0538cd88f0a98c24b66e6cb04caf945 -size 210724 diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 4cd6e21..36b7bc0 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,81 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de - -- Update to 5.7.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.4.php - -------------------------------------------------------------------- -Mon Aug 22 11:33:33 UTC 2016 - wbauer@tmo.at - -- Add update_from_BreezeGTK.patch to fix the GTK theme settings on - upgrades from Leap 42.1, which shipped with BreezyGTK (boo#994832) - -------------------------------------------------------------------- -Tue Aug 2 11:35:50 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.3.php - -------------------------------------------------------------------- -Wed Jul 20 08:54:14 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.2.php - -------------------------------------------------------------------- -Wed Jul 13 06:13:23 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.1.php - -------------------------------------------------------------------- -Thu Jun 30 12:02:17 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.0 - * New feature release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.0.php - -------------------------------------------------------------------- -Sat Jun 11 16:06:24 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.90~g4fcde88 - * Support GTK 3.20.x -- Add Install-GTK3-theme-version-depending-on-present-libg.patch -- Add gtk3-devel buildrequires, needed for above patch - -------------------------------------------------------------------- -Sun May 15 16:50:10 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.4.php - -------------------------------------------------------------------- -Tue Apr 19 20:45:26 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.3.php - -------------------------------------------------------------------- -Tue Apr 5 15:53:41 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.2.php - ------------------------------------------------------------------- Wed Mar 30 16:31:21 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 5400da0..b190e6d 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -18,24 +18,19 @@ %define _name breeze Name: breeze-gtk -Version: 5.7.4 +Version: 5.6.1 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1 Group: System/GUI/KDE Url: https://projects.kde.org/breeze-gtk -Source: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE Install-GTK3-theme-version-depending-on-present-libg.patch -Patch0: Install-GTK3-theme-version-depending-on-present-libg.patch -# PATCH-FIX-OPENSUSE update_from_BreezeGTK.patch boo#994832 -- update user's config from the old BreezyGTK theme -Patch1: update_from_BreezeGTK.patch +Source: %{version}/%{name}-%{version}.tar.xz BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) -BuildRequires: gtk3-devel %description A GTK+ theme created to match with the new Plasma 5 Breeze theme. @@ -73,12 +68,10 @@ A GTK+ theme created to match with the new Plasma 5 Breeze theme. %prep %setup -q -%patch0 -p1 -%patch1 -p1 chmod a-x COPYING* README.md %build -%cmake_kf5 +%cmake_kf5 -- -DWITH_GTK3_VERSION=3.20 make %{?_smp_mflags} %install @@ -91,6 +84,7 @@ make %{?_smp_mflags} %{_datadir}/themes/Breeze*/ %exclude %{_datadir}/themes/Breeze*/gtk-?.0/ %dir %{_kf5_sharedir}/kconf_update/ +%dir %{_kf5_sharedir}/themes/Breeze*/assets/ %{_kf5_sharedir}/kconf_update/*%{_name}* %dir %{_kf5_libdir}/kconf_update_bin/ %{_kf5_libdir}/kconf_update_bin/*%{_name}* diff --git a/update_from_BreezeGTK.patch b/update_from_BreezeGTK.patch deleted file mode 100644 index a89957a..0000000 --- a/update_from_BreezeGTK.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- breeze-gtk-5.5.5.orig/kconf_update/main.cpp 2016-03-01 14:27:02.000000000 +0100 -+++ breeze-gtk-5.5.5/kconf_update/main.cpp 2016-03-08 17:24:37.883095403 +0100 -@@ -46,7 +46,7 @@ QString isGtkThemeInstalled(QString them - } - - /* -- * Check if gtk theme is already set to oxygen or Orion, if it is then we want to upgrade to the breeze theme -+ * Check if gtk theme is already set to oxygen, BreezyGTK or Orion, if it is then we want to upgrade to the breeze theme - * gtkSettingsFile: filename to use - * settingsKey: ini group to read from - * returns: full path to settings file -@@ -67,9 +67,9 @@ bool isGtkThemeSetToOldTheme(QString gtk - if (!settingsKey.isNull()) { - gtkrcSettings.beginGroup(settingsKey); - } -- //if it is set to Oxygen or Orion then we want to upgrade it to Breeze -- if (gtkrcSettings.value("gtk-theme-name") == QLatin1String("oxygen-gtk") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("Orion")) { -- qCDebug(GTKBREEZE) << "using oxygen or orion " << gtkrcSettings.value("gtk-theme-name"); -+ //if it is set to Oxygen, BreezyGTK or Orion then we want to upgrade it to Breeze -+ if (gtkrcSettings.value("gtk-theme-name") == QLatin1String("oxygen-gtk") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("BreezyGTK") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("Orion")) { -+ qCDebug(GTKBREEZE) << "using oxygen, BreezyGTK or orion " << gtkrcSettings.value("gtk-theme-name"); - return true; - } else { - return false; -@@ -98,11 +98,11 @@ int setGtk2() - - bool needsUpdate = isGtkThemeSetToOldTheme(gtkrc2path, QString()); - if (needsUpdate == false) { -- qCDebug(GTKBREEZE) << "gtkrc2 already exists and is not using oxygen or orion, quitting"; -+ qCDebug(GTKBREEZE) << "gtkrc2 already exists and is not using oxygen, BreezyGTK or orion, quitting"; - return 0; - } - -- qCDebug(GTKBREEZE) << "no gtkrc2 file or oxygen/orion being used, setting to new theme"; -+ qCDebug(GTKBREEZE) << "no gtkrc2 file or oxygen/BreezyGTK/orion being used, setting to new theme"; - QFile gtkrc2writer(gtkrc2path); - bool opened = gtkrc2writer.open(QIODevice::WriteOnly | QIODevice::Text); - if (!opened) { -@@ -145,13 +145,13 @@ int setGtk3() - QString gtkrc3path = configPath + "/gtk-3.0/settings.ini"; - bool needsUpdate = isGtkThemeSetToOldTheme(gtkrc3path, "Settings"); - if ( !needsUpdate ) { -- qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen/orion, quitting"; -+ qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen/BreezyGTK/orion, quitting"; - return 0; - } - QDir dir = QFileInfo(gtkrc3path).dir(); - dir.mkpath(dir.path()); - -- qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen/orion being used, setting to new theme"; -+ qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen/BreezyGTK/orion being used, setting to new theme"; - QFile gtkrc3writer(gtkrc3path); - bool opened = gtkrc3writer.open(QIODevice::WriteOnly | QIODevice::Text); - if (!opened) { From 8c4c13ee03fa80571bcdfaf20e548aa34ec97014c63fa0b6a5f28a739517e874 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 17:10:39 +0000 Subject: [PATCH 2/7] Update to Plasma 5.7.95 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze-gtk?expand=0&rev=2 --- _service | 12 --- ...k-5.7.90git~20160915T100442~88cd75f.tar.xz | 3 - _service:set_version:breeze-gtk.spec | 100 ------------------ breeze-gtk.changes | 94 ++++++++++++++++ breeze-gtk.spec | 4 +- 5 files changed, 96 insertions(+), 117 deletions(-) delete mode 100644 _service delete mode 100644 _service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz delete mode 100644 _service:set_version:breeze-gtk.spec diff --git a/_service b/_service deleted file mode 100644 index e571505..0000000 --- a/_service +++ /dev/null @@ -1,12 +0,0 @@ - - - git://anongit.kde.org/breeze-gtk.git - git - 5.7.90git~%ci~%h - - - *.tar - xz - - - diff --git a/_service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz b/_service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz deleted file mode 100644 index 4d5ba60..0000000 --- a/_service:recompress:tar_scm:breeze-gtk-5.7.90git~20160915T100442~88cd75f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:795b57fadc3492fb508151ab56f6e8ff5c9261243547fc2f22fefacf463a8886 -size 211388 diff --git a/_service:set_version:breeze-gtk.spec b/_service:set_version:breeze-gtk.spec deleted file mode 100644 index 6eb4d27..0000000 --- a/_service:set_version:breeze-gtk.spec +++ /dev/null @@ -1,100 +0,0 @@ -# -# spec file for package breeze-gtk -# -# Copyright (c) 2015 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# 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/ -# - - -%define _name breeze -Name: breeze-gtk -Version: 5.7.90git~20160915T100442~88cd75f -Release: 0 -Summary: GTK+ theme matching KDE's Breeze -License: LGPL-2.1 -Group: System/GUI/KDE -Url: https://projects.kde.org/breeze-gtk -Source: %{version}/%{name}-%{version}.tar.xz -BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules -BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: kf5-filesystem -BuildRequires: pkgconfig(Qt5Core) - -%description -A GTK+ theme created to match with the new Plasma 5 Breeze theme. - -%package -n metatheme-%{_name}-common -Summary: GTK+ theme matching KDE's Breeze -- Common Files -Group: System/GUI/KDE -Suggests: gtk2-metatheme-%{_name} -Suggests: gtk3-metatheme-%{_name} -Provides: %{_name}-gtk = %{version} -Obsoletes: %{_name}-gtk < %{version} - -%description -n metatheme-%{_name}-common -A GTK+ theme created to match with the new Plasma 5 Breeze theme. - -%package -n gtk2-metatheme-%{_name} -Summary: GTK+ theme matching KDE's Breeze -- GTK+ 2 Support -Group: System/GUI/KDE -Requires: metatheme-%{_name}-common = %{version} -Supplements: packageand(metatheme-%{_name}-common:gtk2) -BuildArch: noarch - -%description -n gtk2-metatheme-%{_name} -A GTK+ theme created to match with the new Plasma 5 Breeze theme. - -%package -n gtk3-metatheme-%{_name} -Summary: GTK+ theme matching KDE's Breeze -- GTK+ 3 Support -Group: System/GUI/KDE -Requires: metatheme-%{_name}-common = %{version} -Supplements: packageand(metatheme-%{_name}-common:gtk3) -BuildArch: noarch - -%description -n gtk3-metatheme-%{_name} -A GTK+ theme created to match with the new Plasma 5 Breeze theme. - -%prep -%setup -q -chmod a-x COPYING* README.md - -%build -%cmake_kf5 -- -DWITH_GTK3_VERSION=3.20 -make %{?_smp_mflags} - -%install -%kf5_makeinstall -%fdupes %{buildroot}%{_datadir}/ - -%files -n metatheme-%{_name}-common -%defattr(-,root,root) -%doc COPYING* README.md -%{_datadir}/themes/Breeze*/ -%exclude %{_datadir}/themes/Breeze*/gtk-?.0/ -%dir %{_kf5_sharedir}/kconf_update/ -%dir %{_kf5_sharedir}/themes/Breeze*/assets/ -%{_kf5_sharedir}/kconf_update/*%{_name}* -%dir %{_kf5_libdir}/kconf_update_bin/ -%{_kf5_libdir}/kconf_update_bin/*%{_name}* - -%files -n gtk2-metatheme-%{_name} -%defattr(-,root,root) -%{_datadir}/themes/Breeze*/gtk-2.0/ - -%files -n gtk3-metatheme-%{_name} -%defattr(-,root,root) -%{_datadir}/themes/Breeze*/gtk-3.0/ - -%changelog diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 36b7bc0..c7de550 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,97 @@ +------------------------------------------------------------------- +Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.95 (Plasma 5.8 Beta) + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.95.php + +------------------------------------------------------------------- +Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.5 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.5.php + +------------------------------------------------------------------- +Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- +Mon Aug 22 11:33:33 UTC 2016 - wbauer@tmo.at + +- Add update_from_BreezeGTK.patch to fix the GTK theme settings on + upgrades from Leap 42.1, which shipped with BreezyGTK (boo#994832) + +------------------------------------------------------------------- +Tue Aug 2 11:35:50 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.3.php + +------------------------------------------------------------------- +Wed Jul 20 08:54:14 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.2.php + +------------------------------------------------------------------- +Wed Jul 13 06:13:23 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.1.php + +------------------------------------------------------------------- +Thu Jun 30 12:02:17 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.0 + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.0.php + +------------------------------------------------------------------- +Sat Jun 11 16:06:24 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.90~g4fcde88 + * Support GTK 3.20.x +- Add Install-GTK3-theme-version-depending-on-present-libg.patch +- Add gtk3-devel buildrequires, needed for above patch + +------------------------------------------------------------------- +Sun May 15 16:50:10 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.4.php + +------------------------------------------------------------------- +Tue Apr 19 20:45:26 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.3.php + +------------------------------------------------------------------- +Tue Apr 5 15:53:41 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.2.php + ------------------------------------------------------------------- Wed Mar 30 16:31:21 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/breeze-gtk.spec b/breeze-gtk.spec index b190e6d..74957e5 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -18,13 +18,13 @@ %define _name breeze Name: breeze-gtk -Version: 5.6.1 +Version: 5.7.95 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1 Group: System/GUI/KDE Url: https://projects.kde.org/breeze-gtk -Source: %{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/unstable/plasma/%{version}/%{version}/%{name}-%{version}.tar.xz BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: fdupes From ec41188b79d9fa1b36d2843b3a16c9df56def6865cafaf178539c6d84f3d7352 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 17:38:41 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze-gtk?expand=0&rev=3 --- breeze-gtk-5.7.95.tar.xz | 3 +++ breeze-gtk.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 breeze-gtk-5.7.95.tar.xz diff --git a/breeze-gtk-5.7.95.tar.xz b/breeze-gtk-5.7.95.tar.xz new file mode 100644 index 0000000..b38875a --- /dev/null +++ b/breeze-gtk-5.7.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a5ce03d76100559e207fe910fa572d7b351d14c19244d2d34e712ce062ac598 +size 211372 diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 74957e5..7a70bf1 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -24,7 +24,7 @@ Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1 Group: System/GUI/KDE Url: https://projects.kde.org/breeze-gtk -Source: http://download.kde.org/unstable/plasma/%{version}/%{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: fdupes From 591ffb80c2a944bf608e57387fe5fd458567d5ace027a7108113ad5fdf6a2495 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Fri, 16 Sep 2016 14:42:39 +0000 Subject: [PATCH 4/7] Accepting request 428235 from home:alarrosa:branches:KDE:Frameworks5:LTS - Removed patches: Install-GTK3-theme-version-depending-on-present-libg.patch update_from_BreezeGTK.patch OBS-URL: https://build.opensuse.org/request/show/428235 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze-gtk?expand=0&rev=4 --- breeze-gtk.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/breeze-gtk.changes b/breeze-gtk.changes index c7de550..67f4034 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -5,6 +5,9 @@ Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de * New LTS feature release * For more details please see: https://www.kde.org/announcements/plasma-5.7.95.php +- Removed patches: + Install-GTK3-theme-version-depending-on-present-libg.patch + update_from_BreezeGTK.patch ------------------------------------------------------------------- Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de From c6c9d3c0982c0257a65b17a84ef371584d48dbfa0dca9d169f5c886463a3bfdc Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 19 Sep 2016 13:31:33 +0000 Subject: [PATCH 5/7] Accepting request 428696 from home:wolfi323:test - Re-add update_from_BreezeGTK.patch to fix the GTK theme settings on upgrades from Leap 42.1, which shipped with BreezyGTK (boo#994832) - build the proper theme for distributions which have gtk3 < 3.20 (13.2 and Leap 42.1) OBS-URL: https://build.opensuse.org/request/show/428696 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze-gtk?expand=0&rev=5 --- breeze-gtk.changes | 8 ++++++ breeze-gtk.spec | 7 +++++ update_from_BreezeGTK.patch | 54 +++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 update_from_BreezeGTK.patch diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 67f4034..62ba71e 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 19 12:30:19 UTC 2016 - wbauer@tmo.at + +- Re-add update_from_BreezeGTK.patch to fix the GTK theme settings on + upgrades from Leap 42.1, which shipped with BreezyGTK (boo#994832) +- build the proper theme for distributions which have gtk3 < 3.20 + (13.2 and Leap 42.1) + ------------------------------------------------------------------- Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 7a70bf1..14b7958 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -25,6 +25,8 @@ License: LGPL-2.1 Group: System/GUI/KDE Url: https://projects.kde.org/breeze-gtk Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE update_from_BreezeGTK.patch boo#994832 -- update user's config from the old BreezyGTK theme +Patch: update_from_BreezeGTK.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -68,10 +70,15 @@ A GTK+ theme created to match with the new Plasma 5 Breeze theme. %prep %setup -q +%patch -p1 chmod a-x COPYING* README.md %build +%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} > 120100) %cmake_kf5 -- -DWITH_GTK3_VERSION=3.20 +%else +%cmake_kf5 +%endif make %{?_smp_mflags} %install diff --git a/update_from_BreezeGTK.patch b/update_from_BreezeGTK.patch new file mode 100644 index 0000000..a89957a --- /dev/null +++ b/update_from_BreezeGTK.patch @@ -0,0 +1,54 @@ +--- breeze-gtk-5.5.5.orig/kconf_update/main.cpp 2016-03-01 14:27:02.000000000 +0100 ++++ breeze-gtk-5.5.5/kconf_update/main.cpp 2016-03-08 17:24:37.883095403 +0100 +@@ -46,7 +46,7 @@ QString isGtkThemeInstalled(QString them + } + + /* +- * Check if gtk theme is already set to oxygen or Orion, if it is then we want to upgrade to the breeze theme ++ * Check if gtk theme is already set to oxygen, BreezyGTK or Orion, if it is then we want to upgrade to the breeze theme + * gtkSettingsFile: filename to use + * settingsKey: ini group to read from + * returns: full path to settings file +@@ -67,9 +67,9 @@ bool isGtkThemeSetToOldTheme(QString gtk + if (!settingsKey.isNull()) { + gtkrcSettings.beginGroup(settingsKey); + } +- //if it is set to Oxygen or Orion then we want to upgrade it to Breeze +- if (gtkrcSettings.value("gtk-theme-name") == QLatin1String("oxygen-gtk") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("Orion")) { +- qCDebug(GTKBREEZE) << "using oxygen or orion " << gtkrcSettings.value("gtk-theme-name"); ++ //if it is set to Oxygen, BreezyGTK or Orion then we want to upgrade it to Breeze ++ if (gtkrcSettings.value("gtk-theme-name") == QLatin1String("oxygen-gtk") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("BreezyGTK") || gtkrcSettings.value("gtk-theme-name") == QLatin1String("Orion")) { ++ qCDebug(GTKBREEZE) << "using oxygen, BreezyGTK or orion " << gtkrcSettings.value("gtk-theme-name"); + return true; + } else { + return false; +@@ -98,11 +98,11 @@ int setGtk2() + + bool needsUpdate = isGtkThemeSetToOldTheme(gtkrc2path, QString()); + if (needsUpdate == false) { +- qCDebug(GTKBREEZE) << "gtkrc2 already exists and is not using oxygen or orion, quitting"; ++ qCDebug(GTKBREEZE) << "gtkrc2 already exists and is not using oxygen, BreezyGTK or orion, quitting"; + return 0; + } + +- qCDebug(GTKBREEZE) << "no gtkrc2 file or oxygen/orion being used, setting to new theme"; ++ qCDebug(GTKBREEZE) << "no gtkrc2 file or oxygen/BreezyGTK/orion being used, setting to new theme"; + QFile gtkrc2writer(gtkrc2path); + bool opened = gtkrc2writer.open(QIODevice::WriteOnly | QIODevice::Text); + if (!opened) { +@@ -145,13 +145,13 @@ int setGtk3() + QString gtkrc3path = configPath + "/gtk-3.0/settings.ini"; + bool needsUpdate = isGtkThemeSetToOldTheme(gtkrc3path, "Settings"); + if ( !needsUpdate ) { +- qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen/orion, quitting"; ++ qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen/BreezyGTK/orion, quitting"; + return 0; + } + QDir dir = QFileInfo(gtkrc3path).dir(); + dir.mkpath(dir.path()); + +- qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen/orion being used, setting to new theme"; ++ qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen/BreezyGTK/orion being used, setting to new theme"; + QFile gtkrc3writer(gtkrc3path); + bool opened = gtkrc3writer.open(QIODevice::WriteOnly | QIODevice::Text); + if (!opened) { From b4449b64af46a71ff13c27d6b2f319a8f8d7b3f180504d6f2c5ecda5df18ca55 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Sat, 1 Oct 2016 22:14:55 +0000 Subject: [PATCH 6/7] Accepting request 432186 from home:Vogtinator:branches:KDE:Frameworks5:LTS OBS-URL: https://build.opensuse.org/request/show/432186 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze-gtk?expand=0&rev=6 --- breeze-gtk-5.7.95.tar.xz | 3 --- breeze-gtk-5.8.0.tar.xz | 3 +++ breeze-gtk.changes | 8 ++++++++ breeze-gtk.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 breeze-gtk-5.7.95.tar.xz create mode 100644 breeze-gtk-5.8.0.tar.xz diff --git a/breeze-gtk-5.7.95.tar.xz b/breeze-gtk-5.7.95.tar.xz deleted file mode 100644 index b38875a..0000000 --- a/breeze-gtk-5.7.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a5ce03d76100559e207fe910fa572d7b351d14c19244d2d34e712ce062ac598 -size 211372 diff --git a/breeze-gtk-5.8.0.tar.xz b/breeze-gtk-5.8.0.tar.xz new file mode 100644 index 0000000..eabf23e --- /dev/null +++ b/breeze-gtk-5.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c312832cc5a729af17ef017b4073318927de834db2fd6252bbacd09a1157f0d3 +size 211424 diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 62ba71e..6d022ca 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.8.0 + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.8.0.php + ------------------------------------------------------------------- Mon Sep 19 12:30:19 UTC 2016 - wbauer@tmo.at diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 14b7958..590d96f 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -18,7 +18,7 @@ %define _name breeze Name: breeze-gtk -Version: 5.7.95 +Version: 5.8.0 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1 From 43f2a3a583b0e6d4b11dc1defa515063db29475ce16e851278e5121d00dd9762 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 2 Oct 2016 08:45:26 +0000 Subject: [PATCH 7/7] Remove source URLs temporarily OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze-gtk?expand=0&rev=7 --- breeze-gtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 590d96f..04d875c 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -24,7 +24,7 @@ Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1 Group: System/GUI/KDE Url: https://projects.kde.org/breeze-gtk -Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE update_from_BreezeGTK.patch boo#994832 -- update user's config from the old BreezyGTK theme Patch: update_from_BreezeGTK.patch BuildRequires: cmake >= 2.8.12