~ubuntu-branches/ubuntu/trusty/gtkhtml3.14/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/gtkhtml3.14_ftbfs.patch

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2010-11-02 14:34:48 UTC
  • mfrom: (1.6.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102143448-3cxzy1h4oh5v7igz
Tags: 1:3.32.0-0ubuntu1
* New upstream release 3.32.0
  - Crash after closing inline view of text attachment (LP: #178959, #284060)
  - Translations not working in Emoticons, Find/Replace dialogs (LP: #562633)
* debian/patches/gtkhtml3.14_ftbfs.patch: dropped.
* debian/rules: append API_VER for libgtkhtml-editor chrpath as well
* debian/libgtkhtml-editor-dev.install: append api version to pkgconfig
  file name.
* debian/*.shlibs: update shlibs files for new version with same soname, also
  rename libgtkhtml-editor to libgtkhtml-editor-3.14
* debian/control: Replaces/Conflicts gtkhtml3.14 (<< 3.32.0)
* debian/control: bump libgtk2.0-dev and libgail-dev Build-Depends to 2.20
* debian/rules: disable deprecation warnings so the build completes

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Author: Bhavani Shankar <bhavi@ubuntu.com>
2
 
Bug-Ubuntu: https://bugs.launchpad.net/bugs/613450
3
 
Bug-Debian: http://bugs.debian.org/591662
4
 
Description: Fix ftbfs due to newer gtk (depreceated variables)
5
 
 
6
 
Index: gtkhtml-3.30.3/configure
7
 
===================================================================
8
 
--- gtkhtml-3.30.3.orig/configure       2010-08-25 14:26:39.865928000 +1000
9
 
+++ gtkhtml-3.30.3/configure    2010-08-25 14:27:34.565927998 +1000
10
 
@@ -5854,9 +5854,7 @@
11
 
 
12
 
   list="-DG_DISABLE_DEPRECATED
13
 
        -DPANGO_DISABLE_DEPRECATED
14
 
-       -DGDK_DISABLE_DEPRECATED
15
 
        -DGDK_PIXBUF_DISABLE_DEPRECATED
16
 
-       -DGTK_DISABLE_DEPRECATED
17
 
        -DGNOME_DISABLE_DEPRECATED
18
 
        -DG_DISABLE_SINGLE_INCLUDES
19
 
        -DGTK_DISABLE_SINGLE_INCLUDES