← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gtkhtml4.0/quantal-proposed

« back to all changes in this revision

Viewing changes to debian/patches/01_deprecated.patch

  • Committer: Package Import Robot
  • Author(s): Josselin Mouette
  • Date: 2011-12-16 19:49:17 UTC
  • mfrom: (1.1.6) (3.3.3 sid)
  • Revision ID: package-import@ubuntu.com-20111216194917-17k8hwpdrb6vhu62
Tags: 4.2.2-1
* New upstream release.
* 01_deprecated.patch: patch from upstream git. Don’t use 
  _DISABLE_DEPRECATED flags.
* Use dh-autoreconf.
* Update Vcs-* fields.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_deprecated.patch
 
1
From cbe46cc7690cc91e3f04388c2fafc164cafbd229 Mon Sep 17 00:00:00 2001
 
2
From: Matthew Barnes <mbarnes@redhat.com>
 
3
Date: Thu, 24 Nov 2011 22:57:59 +0000
 
4
Subject: Remove all *_DISABLE_DEPRECATED_FLAGS.
 
5
 
 
6
I'll care about deprecated APIs again when a gtk4 release date is
 
7
announced.  Meanwhile it's just causing distros unnecessary pain.
 
8
 
 
9
(cherry picked from commit 580892db87f3ab5bb88495e7d5e9fde71a371e9f)
 
10
---
 
11
diff --git a/configure.ac b/configure.ac
 
12
index d22ff6c..28d9864 100644
 
13
--- a/configure.ac
 
14
+++ b/configure.ac
 
15
@@ -48,19 +48,6 @@ AM_GLIB_GNU_GETTEXT
 
16
 dnl **********************************
 
17
 dnl Compiler Warning Flags
 
18
 dnl **********************************
 
19
-AC_ARG_ENABLE([deprecated_warning_flags],
 
20
-       AS_HELP_STRING([--enable-deprecated-warning-flags],
 
21
-       [Enable warning flags for deprecated apis]),
 
22
-       [enable_deprecated_flags=$enableval],[enable_deprecated_flags=yes])
 
23
-
 
24
-if test "x${enable_deprecated_flags}" = "xyes"; then
 
25
-       AS_COMPILER_FLAGS(DEPRECATED_WARNING_FLAGS,
 
26
-               "-DPANGO_DISABLE_DEPRECATED
 
27
-               -DGDK_PIXBUF_DISABLE_DEPRECATED
 
28
-               -DGNOME_DISABLE_DEPRECATED")
 
29
-       AC_SUBST(WARNING_FLAGS)
 
30
-fi
 
31
-
 
32
 AS_COMPILER_FLAGS(WARNING_FLAGS,
 
33
        "-DG_DISABLE_SINGLE_INCLUDES
 
34
        -DGTK_DISABLE_SINGLE_INCLUDES
 
35
@@ -85,7 +72,7 @@ dnl   -Wshadow
 
36
 dnl    -Wstrict-aliasing=2
 
37
 
 
38
 dnl XXX This really belongs in AM_CPPFLAGS.
 
39
-CFLAGS="$CFLAGS $DEPRECATED_WARNING_FLAGS  $WARNING_FLAGS"
 
40
+CFLAGS="$CFLAGS $WARNING_FLAGS"
 
41
 
 
42
 dnl *********************
 
43
 dnl Necessary programs
 
44
--
 
45
cgit v0.9.0.2