From 737c2cc29ea681e43faa7222b834e81d827d5878 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sun, 23 Jan 2011 18:06:11 -0800 Subject: [PATCH] cflags.patch: fix passing in cflags --- compiz-0.9.2.1-cflags.patch | 18 ++++++++++++++++++ compiz.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 compiz-0.9.2.1-cflags.patch diff --git a/compiz-0.9.2.1-cflags.patch b/compiz-0.9.2.1-cflags.patch new file mode 100644 index 0000000..fa97afc --- /dev/null +++ b/compiz-0.9.2.1-cflags.patch @@ -0,0 +1,18 @@ +--- compiz-with-glib-mainloop/cmake/CompizCommon.cmake 2011-01-23 10:26:25.896687232 -0800 ++++ compiz-with-glib-mainloop/cmake/CompizCommon.cmake.new 2011-01-23 17:25:58.739038552 -0800 +@@ -42,11 +42,11 @@ + option (COMPIZ_SIGN_WARNINGS "Should compiz use -Wsign-conversion during compilation." OFF) + + if (COMPIZ_SIGN_WARNINGS) +- set (CMAKE_CXX_FLAGS "-Wall -Wsign-conversion") +- set (CMAKE_C_FLAGS "-Wall -Wsign-conversion") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-conversion") ++ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wsign-conversion") + else () +- set (CMAKE_CXX_FLAGS "-Wall") +- set (CMAKE_C_FLAGS "-Wall") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") ++ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + endif () + + function (compiz_ensure_linkage) diff --git a/compiz.spec b/compiz.spec index 4366afc..e7376a7 100644 --- a/compiz.spec +++ b/compiz.spec @@ -17,7 +17,7 @@ URL: http://www.compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.9.2.2 -Release: 0.10.git619abc05b1%{?dist} +Release: 0.11.git619abc05b1%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -77,6 +77,9 @@ Patch121: compiz-0.9.2.1-schemas.patch # settings stuff (sent upstream) Patch122: compiz-0.9.2.1-keybindings.patch +# Fix to not overwrite any passed-in cflags (sent upstream) +Patch123: compiz-0.9.2.1-cflags.patch + %description Compiz is one of the first OpenGL-accelerated compositing window managers for the X Window System. The integration allows it to perform @@ -183,6 +186,7 @@ and other kde integration related stuff. %endif %patch121 -p1 -b .schemas %patch122 -p1 -b .keybindings +%patch123 -p1 -b .cflags %build rm -rf $RPM_BUILD_ROOT @@ -343,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 23 2011 Adam Williamson - 0.9.2.2-0.11.git619abc05b1 +- cflags.patch: don't overwrite passed-in CFLAGS + * Wed Jan 19 2011 Adam Williamson - 0.9.2.2-0.10.git619abc05b1 - adjust GNOME and KDE package requirements