]> git.pld-linux.org Git - packages/nautilus.git/commitdiff
- drop -DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to allow
authorhawk <hawk@pld-linux.org>
Tue, 25 Oct 2011 09:08:16 +0000 (09:08 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
  building againts glib2 2.30 and pango 1.28, fix from gentoo

Changed files:
    nautilus-build-fix.patch -> 1.1

nautilus-build-fix.patch [new file with mode: 0644]

diff --git a/nautilus-build-fix.patch b/nautilus-build-fix.patch
new file mode 100644 (file)
index 0000000..25d98d2
--- /dev/null
@@ -0,0 +1,36 @@
+diff -ur nautilus-2.32.2.1.orig//configure.in nautilus-2.32.2.1/configure.in
+--- nautilus-2.32.2.1.orig//configure.in       2010-12-28 15:57:51.000000000 +0000
++++ nautilus-2.32.2.1/configure.in     2011-10-25 09:01:19.812210325 +0000
+@@ -342,7 +342,7 @@
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+ AC_SUBST(CORE_LIBS)
+-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
++DISABLE_DEPRECATED_CFLAGS=""
+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ dnl Multimedia keys
+diff -ur nautilus-2.32.2.1.orig//eel/Makefile.am nautilus-2.32.2.1/eel/Makefile.am
+--- nautilus-2.32.2.1.orig//eel/Makefile.am    2010-12-28 15:54:38.000000000 +0000
++++ nautilus-2.32.2.1/eel/Makefile.am  2011-10-25 09:01:50.004151536 +0000
+@@ -10,8 +10,6 @@
+       -DDATADIR=\""$(datadir)"\"                      \
+       -DSOURCE_DATADIR=\""$(top_srcdir)/data"\"       \
+       -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"  \
+-      -DG_DISABLE_DEPRECATED                          \
+-      -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -DGMENU_I_KNOW_THIS_IS_UNSTABLE                 \
+       $(NULL)
+diff -ur nautilus-2.32.2.1.orig//eel/Makefile.in nautilus-2.32.2.1/eel/Makefile.in
+--- nautilus-2.32.2.1.orig//eel/Makefile.in    2011-10-25 08:58:30.000000000 +0000
++++ nautilus-2.32.2.1/eel/Makefile.in  2011-10-25 09:02:04.150147677 +0000
+@@ -322,8 +322,6 @@
+       -DDATADIR=\""$(datadir)"\"                      \
+       -DSOURCE_DATADIR=\""$(top_srcdir)/data"\"       \
+       -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"  \
+-      -DG_DISABLE_DEPRECATED                          \
+-      -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -DGMENU_I_KNOW_THIS_IS_UNSTABLE                 \
+       $(NULL)
This page took 0.152753 seconds and 4 git commands to generate.