[smokekde] don't override CXXFLAGS (#884839, kde#315774)
Rex Dieter
rdieter at fedoraproject.org
Tue Feb 26 02:41:47 UTC 2013
commit 7d7d1c7f40b7a8bc12da8305548097165c819eb5
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Feb 25 20:41:21 2013 -0600
don't override CXXFLAGS (#884839, kde#315774)
smokekde-build_flags.patch | 30 ++++++++++++++++++++++++++++++
smokekde.spec | 11 ++++++++++-
2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/smokekde-build_flags.patch b/smokekde-build_flags.patch
new file mode 100644
index 0000000..c4925b1
--- /dev/null
+++ b/smokekde-build_flags.patch
@@ -0,0 +1,30 @@
+From 830f649ffb238f43f8b6321d401675ec37e0c403 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Mon, 25 Feb 2013 23:24:32 +0200
+Subject: [PATCH] Don't override user set CXXFLAGS.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Ville Skyttä <ville.skytta at iki.fi>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8504ddf..c8ece6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} )
+
+ ## disable deprecation waringins
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- set(CMAKE_CXX_FLAGS "-Wno-deprecated-declarations")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+ endif()
+
+ macro_optional_find_package(LibAttica)
+--
+1.7.11.7
+
diff --git a/smokekde.spec b/smokekde.spec
index 92454b3..c46a279 100644
--- a/smokekde.spec
+++ b/smokekde.spec
@@ -1,6 +1,6 @@
Name: smokekde
Version: 4.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Bindings for KDE libraries
License: LGPLv2+
@@ -13,6 +13,10 @@ URL: https://projects.kde.org/projects/kde/kdebindings/smoke
%endif
Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+## upstreamable patches
+# http://bugs.kde.org/315774
+Patch50: smokekde-build_flags.patch
+
BuildRequires: kate-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: okular-devel >= %{version}
@@ -53,6 +57,8 @@ Requires: smokeqt-devel
%prep
%setup -q
+%patch50 -p1 -b .build_flags
+
%build
mkdir -p %{_target_platform}
@@ -103,6 +109,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Mon Feb 25 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.0-2
+- don't override CXXFLAGS (#884839, kde#315774)
+
* Fri Feb 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.0-1
- 4.10.0
More information about the scm-commits
mailing list