From 8270382d553871b1426ad30fdf7b8cafc5185b2a Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Apr 16 2017 08:26:43 +0000 Subject: Updated patch --- diff --git a/libyui-3.3.1-CMP0043.patch b/libyui-3.3.1-CMP0043.patch deleted file mode 100644 index 4ef6e08..0000000 --- a/libyui-3.3.1-CMP0043.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 61218921749f92de241fa79480a536b67a4e4925 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Fri, 14 Apr 2017 11:01:58 +0200 -Subject: [PATCH] Avoid several warnings in cmake-files from Qt5 - ---- - buildtools/CMakeLists.common | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/buildtools/CMakeLists.common b/buildtools/CMakeLists.common -index 55843f5..dbde70e 100644 ---- a/buildtools/CMakeLists.common -+++ b/buildtools/CMakeLists.common -@@ -6,6 +6,12 @@ if( POLICY CMP0053 ) - cmake_policy( SET CMP0053 OLD ) - endif() - -+# Avoid several warnings in cmake-files from Qt5. -+# CMP0043: Ignore COMPILE_DEFINITIONS_ properties -+if( POLICY CMP0043 ) -+ cmake_policy( SET CMP0043 OLD ) -+endif() -+ - INCLUDE( "${CMAKE_SOURCE_DIR}/PROJECTINFO.cmake" ) - - SET( BUILDTOOLS_DIR "buildtools/" ) diff --git a/libyui-3.3.1-CMake_warnings.patch b/libyui-3.3.1-CMake_warnings.patch new file mode 100644 index 0000000..4da2d0f --- /dev/null +++ b/libyui-3.3.1-CMake_warnings.patch @@ -0,0 +1,32 @@ +From 45bc75ca188f52c92ffced79df69a7c15853e999 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Fri, 14 Apr 2017 11:01:58 +0200 +Subject: [PATCH] Avoid several warnings from CMake + +--- + buildtools/CMakeLists.common | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/buildtools/CMakeLists.common b/buildtools/CMakeLists.common +index 55843f5..6038834 100644 +--- a/buildtools/CMakeLists.common ++++ b/buildtools/CMakeLists.common +@@ -6,6 +6,18 @@ if( POLICY CMP0053 ) + cmake_policy( SET CMP0053 OLD ) + endif() + ++# Avoid several warnings in cmake-files from Qt5. ++# CMP0043: Ignore COMPILE_DEFINITIONS_ properties ++if( POLICY CMP0043 ) ++ cmake_policy( SET CMP0043 OLD ) ++endif() ++ ++# Avoid several warnings when building qt-graph. ++# CMP0028: Double colon in target name means ALIAS or IMPORTED target ++if( POLICY CMP0028 ) ++ cmake_policy( SET CMP0028 OLD ) ++endif() ++ + INCLUDE( "${CMAKE_SOURCE_DIR}/PROJECTINFO.cmake" ) + + SET( BUILDTOOLS_DIR "buildtools/" ) diff --git a/libyui.spec b/libyui.spec index 16b3a51..fe08db2 100644 --- a/libyui.spec +++ b/libyui.spec @@ -14,7 +14,7 @@ Name: lib%{libsuffix} Version: 3.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI-abstraction library License: (LGPLv2 or LGPLv3) and MIT @@ -24,7 +24,7 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Improvements, submitted upstream. # See: https://github.com/libyui/libyui/pull/115 Patch0: https://github.com/besser82/libyui/commit/5e04743f9fb669d26d3814b1b9ba089d0a8c5b14.patch#/%{name}-3.3.1-env_YUI_PREFERED_BACKEND.patch -Patch1: https://github.com/besser82/libyui/commit/61218921749f92de241fa79480a536b67a4e4925.patch#/%{name}-3.3.1-CMP0043.patch +Patch1: https://github.com/besser82/libyui/commit/45bc75ca188f52c92ffced79df69a7c15853e999.patch#/%{name}-3.3.1-CMake_warnings.patch BuildRequires: boost-devel BuildRequires: cmake @@ -146,6 +146,9 @@ popd %changelog +* Sun Apr 16 2017 Björn Esser - 3.3.1-6 +- Updated patch + * Sat Apr 15 2017 Björn Esser - 3.3.1-5 - Updated patches