forked from mirrors/nixpkgs
* Fix Compiz build failure with recent GTK+
(http://hydra.nixos.org/build/955799). svn path=/nixpkgs/branches/x-updates/; revision=26295
This commit is contained in:
parent
27e2e063fb
commit
aaecb6430b
|
@ -16,6 +16,9 @@ stdenv.mkDerivation {
|
|||
# directories to be overriden through $COMPIZ_PLUGINDIR and
|
||||
# $COMPIZ_METADATADIR, respectively.
|
||||
./plugindir-core.patch
|
||||
|
||||
# Fix compilation with recent GTK versions.
|
||||
./gdk-deprecated.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c
|
||||
--- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200
|
||||
+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100
|
||||
@@ -31,10 +31,6 @@
|
||||
#include <X11/extensions/Xrender.h>
|
||||
#include <X11/Xregion.h>
|
||||
|
||||
-#ifndef GDK_DISABLE_DEPRECATED
|
||||
-#define GDK_DISABLE_DEPRECATED
|
||||
-#endif
|
||||
-
|
||||
#ifndef GTK_DISABLE_DEPRECATED
|
||||
#define GTK_DISABLE_DEPRECATED
|
||||
#endif
|
Loading…
Reference in a new issue