rpms
/
compiz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cflags.patch: fix passing in cflags

This commit is contained in:
Adam Williamson 2011-01-23 18:06:11 -08:00
parent ec0f716be0
commit 737c2cc29e
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiz-0.9.2.1-cflags.patch Normal file
View File

@ -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)

9
compiz.spec
View File

@ -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 <awilliam@redhat.com> - 0.9.2.2-0.11.git619abc05b1
- cflags.patch: don't overwrite passed-in CFLAGS
* Wed Jan 19 2011 Adam Williamson <awilliam@redhat.com> - 0.9.2.2-0.10.git619abc05b1
- adjust GNOME and KDE package requirements