~ubuntu-branches/ubuntu/raring/cairo/raring

« back to all changes in this revision

Viewing changes to debian/patches/01_build_perf_utils.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2013-01-23 21:19:34 UTC
  • mfrom: (1.3.11) (28.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20130123211934-q9qb538ujcmkliic
Tags: 1.12.10-1ubuntu1
* Merge from Debian, remaining changes:
* debian/patches/server_side_gradients.patch:
  - Don't use server side gradients, most drivers don't handle those and
    are really slow
* debian/control: Add missing libxext-dev dependency to libcairo2-dev.
  Spotted by autopkgtest.
* debian/patches/git_evince_rendering_fix.patch:
  Backport GIT commit to fix a rendering bug in evince
* debian/control, debian/libcairo2.symbols, debian/rules:
  - Disable GL backend due to LP: #725434

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
Last-Update: 2010-08-03
5
5
Index: cairo/configure.ac
6
6
===================================================================
7
 
--- cairo.orig/configure.ac     2012-04-30 14:27:05.078793292 +0200
8
 
+++ cairo/configure.ac  2012-04-30 14:27:27.686792484 +0200
9
 
@@ -803,6 +803,11 @@
 
7
--- cairo.orig/configure.ac     2012-10-08 10:21:12.572973848 +0200
 
8
+++ cairo/configure.ac  2012-10-08 10:21:17.528973922 +0200
 
9
@@ -808,6 +808,11 @@
10
10
 PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no)
11
11
 AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
12
12
 
20
20
 boilerplate/Makefile
21
21
Index: cairo/perf/Makefile.am
22
22
===================================================================
23
 
--- cairo.orig/perf/Makefile.am 2012-04-30 14:27:05.078793292 +0200
24
 
+++ cairo/perf/Makefile.am      2012-04-30 14:27:27.686792484 +0200
 
23
--- cairo.orig/perf/Makefile.am 2012-10-08 10:21:12.572973848 +0200
 
24
+++ cairo/perf/Makefile.am      2012-10-08 10:21:17.528973922 +0200
25
25
@@ -15,11 +15,25 @@
26
26
 
27
27
 SUBDIRS = micro
50
50
        cairo-analyse-trace \
51
51
Index: cairo/build/configure.ac.features
52
52
===================================================================
53
 
--- cairo.orig/build/configure.ac.features      2012-04-30 14:27:05.078793292 +0200
54
 
+++ cairo/build/configure.ac.features   2012-04-30 14:27:27.686792484 +0200
 
53
--- cairo.orig/build/configure.ac.features      2012-10-08 10:21:12.572973848 +0200
 
54
+++ cairo/build/configure.ac.features   2012-10-08 10:21:17.528973922 +0200
55
55
@@ -408,6 +408,7 @@
56
56
        echo "The following features and utilities:"
57
57
        echo "  cairo-trace:                $use_trace"