← Back to branch summary

~ubuntu-branches/ubuntu/raring/gtkhtml3.14/raring

« back to all changes in this revision

Viewing changes to debian/patches/03_no_deprecated_build.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-04-14 17:11:52 UTC
  • Revision ID: james.westby@ubuntu.com-20100414171152-07ckg5lbid58xwft
Tags: 1:3.29.6.is.3.28.3-0ubuntu2
https://launchpad.net/bugs/562633
* debian/patches/02_extra_dialog_translations.patch:
  - change by Mario Carrion to fix some dialogs not being translatable
    (lp: #562633)
* debian/patches/03_no_deprecated_build.patch:
  - don't use disable deprecation build option so fix build with current gtk

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_no_deprecated_build.patch
 
1
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.29.6.is.3.28.3/a11y/Makefile.am gtkhtml3.14-3.29.6.is.3.28.3.new/a11y/Makefile.am
 
2
--- gtkhtml3.14-3.29.6.is.3.28.3/a11y/Makefile.am       2009-07-03 06:46:11.000000000 +0200
 
3
+++ gtkhtml3.14-3.29.6.is.3.28.3.new/a11y/Makefile.am   2010-04-14 17:27:02.000000000 +0200
 
4
@@ -2,7 +2,7 @@
 
5
 
 
6
 AM_CPPFLAGS = -I$(top_srcdir)/gtkhtml $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
 
7
 
 
8
-AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
 
9
+AM_CFLAGS = $(GAIL_CFLAGS)
 
10
 
 
11
 noinst_LTLIBRARIES = libgtkhtml-a11y.la
 
12
 
 
13
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.29.6.is.3.28.3/a11y/Makefile.in gtkhtml3.14-3.29.6.is.3.28.3.new/a11y/Makefile.in
 
14
--- gtkhtml3.14-3.29.6.is.3.28.3/a11y/Makefile.in       2010-03-01 10:16:50.000000000 +0100
 
15
+++ gtkhtml3.14-3.29.6.is.3.28.3.new/a11y/Makefile.in   2010-04-14 17:27:02.000000000 +0200
 
16
@@ -259,7 +259,7 @@
 
17
 top_srcdir = @top_srcdir@
 
18
 END = 
 
19
 AM_CPPFLAGS = -I$(top_srcdir)/gtkhtml $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
 
20
-AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
 
21
+AM_CFLAGS = $(GAIL_CFLAGS)
 
22
 noinst_LTLIBRARIES = libgtkhtml-a11y.la
 
23
 libgtkhtml_a11y_la_SOURCES = \
 
24
        cell.h                                          \
 
25
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.29.6.is.3.28.3/configure gtkhtml3.14-3.29.6.is.3.28.3.new/configure
 
26
--- gtkhtml3.14-3.29.6.is.3.28.3/configure      2010-03-01 10:16:49.000000000 +0100
 
27
+++ gtkhtml3.14-3.29.6.is.3.28.3.new/configure  2010-04-14 17:27:36.000000000 +0200
 
28
@@ -4587,15 +4587,7 @@
 
29
 # Compiler Warning Flags
 
30
 
 
31
 
 
32
-  list="-DG_DISABLE_DEPRECATED
 
33
-       -DPANGO_DISABLE_DEPRECATED
 
34
-       -DGDK_DISABLE_DEPRECATED
 
35
-       -DGDK_PIXBUF_DISABLE_DEPRECATED
 
36
-       -DGTK_DISABLE_DEPRECATED
 
37
-       -DGNOME_DISABLE_DEPRECATED
 
38
-       -DG_DISABLE_SINGLE_INCLUDES
 
39
-       -DGTK_DISABLE_SINGLE_INCLUDES
 
40
-       -Wall -Wextra
 
41
+  list="-Wall -Wextra
 
42
        -Wno-missing-field-initializers
 
43
        -Wno-sign-compare
 
44
        -Wno-unused-parameter
 
45
@@ -24080,7 +24072,8 @@
 
46
 if test -n "$CONFIG_FILES"; then
 
47
 
 
48
 
 
49
-ac_cr='
 
 
b"'"
 
50
+ac_cr='
 
51
+'
 
52
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 
53
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
 
54
   ac_cs_awk_cr='\\r'
 
55
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.29.6.is.3.28.3/configure.ac gtkhtml3.14-3.29.6.is.3.28.3.new/configure.ac
 
56
--- gtkhtml3.14-3.29.6.is.3.28.3/configure.ac   2010-04-14 17:27:02.000000000 +0200
 
57
+++ gtkhtml3.14-3.29.6.is.3.28.3.new/configure.ac       2010-04-14 17:27:02.000000000 +0200
 
58
@@ -47,15 +47,7 @@
 
59
 # Compiler Warning Flags
 
60
 
 
61
 AS_COMPILER_FLAGS(WARNING_FLAGS,
 
62
-       "-DG_DISABLE_DEPRECATED
 
63
-       -DPANGO_DISABLE_DEPRECATED
 
64
-       -DGDK_DISABLE_DEPRECATED
 
65
-       -DGDK_PIXBUF_DISABLE_DEPRECATED
 
66
-       -DGTK_DISABLE_DEPRECATED
 
67
-       -DGNOME_DISABLE_DEPRECATED
 
68
-       -DG_DISABLE_SINGLE_INCLUDES
 
69
-       -DGTK_DISABLE_SINGLE_INCLUDES
 
70
-       -Wall -Wextra
 
71
+       "-Wall -Wextra
 
72
        -Wno-missing-field-initializers
 
73
        -Wno-sign-compare
 
74
        -Wno-unused-parameter