Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/compiz-06-gconf-cflags.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 18110 93461edb1490
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18110
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     1
 
--- compiz-0.8.2/gtk/gnome/Makefile.am.ori	2009-09-01 08:20:23.609171985 +0100
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     2
 
+++ compiz-0.8.2/gtk/gnome/Makefile.am	2009-09-01 08:22:39.006031796 +0100
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     3
 
@@ -77,6 +77,7 @@
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     4
 
 endif
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     5
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     6
 
 INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@			   \
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     7
 
+	@GCONF_CFLAGS@						\
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     8
 
 	-DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     9
 
 	-DLOCALEDIR="\"@datadir@/locale"\"
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    10
upstream/oracle/spec-files