cairo needs merge from debian

Bug #1353362 reported by Gianfranco Costamagna
14
This bug affects 2 people
Affects Status Importance Assigned to Milestone
cairo (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

Some changes in debian, but not (obviously merged in ubuntu since the packaging is different) needs manual merge
http://anonscm.debian.org/cgit/collab-maint/cairo.git/commit/debian/control?id=0d4aad4798725a9fb99450091dfdf3cc4b34dd63

is currently causing a FTBFS
https://launchpad.net/ubuntu/+source/wxpython3.0/3.0.0.0+dfsg-1

(due to a probabile wxwidgets3.0 bug)

Tags: patch
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

attached the debdiff of the only debian directory

Revision history for this message
Timo Aaltonen (tjaalton) wrote :

you can't enable GL backend or bug #725434 would get reopened.. you'd need to check the drivers if they are fixed before enabling this

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

Thanks Timo for the precious feedback!

Ok, I have a nvidia card on my acer aspire 6910G, I'm installing nvidia-current right now, will reboot, test something and cat /proc/meminfo after a while.

I'll install the new cairo with this debdiff, reboot and see if it makes any difference.

Should I test something more in your opinion?

AFAICS cairo doesn't build-depend from nvidia, so I don't think a rebuild with it installed or not makes any difference, right? I can test the new cairo without reinstalling nvidia, right?

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

nvidia-current, cairo from repository, trusty environment
head /proc/meminfo
MemTotal: 4012744 kB
MemFree: 2278428 kB
Buffers: 81984 kB
Cached: 567580 kB
SwapCached: 0 kB
Active: 1114508 kB
Inactive: 472348 kB
Active(anon): 938328 kB
Inactive(anon): 11220 kB
Active(file): 176180 kB

firefox, hexchat and bash open,
uptime
 17:41:48 up 5 min, 3 users, load average: 0,85, 1,00, 0,52

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

sudo dpkg -i libcairo2_1.13.0~20140204-0ubuntu2_amd64.deb libcairo2-dev_1.13.0~20140204-0ubuntu2_amd64.deb libcairo2-udeb_1.13.0~20140204-0ubuntu2_amd64.udeb libcairo-gobject2_1.13.0~20140204-0ubuntu2_amd64.deb libcairo-script-interpreter2_1.13.0~20140204-0ubuntu2_amd64.deb

and rebooting now

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

(I didn't install the udeb package, wasn't there before)

head /proc/meminfo
MemTotal: 4012744 kB
MemFree: 2226292 kB
Buffers: 98984 kB
Cached: 554632 kB
SwapCached: 0 kB
Active: 1140792 kB
Inactive: 501532 kB
Active(anon): 989764 kB
Inactive(anon): 10688 kB
Active(file): 151028 kB
uptime
 17:58:39 up 6 min, 3 users, load average: 0,32, 0,40, 0,23

same firefox tabs, seems that the bug is not here anymore, right?

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

Updated debdiff, against the latest debian release.

Note: debian has disabled GL again.

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

this merge needs probably a "weston" sync
and a webkitgtk merge.

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

debdiff against webkitgtk

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

debdiff against webkitgtk

Revision history for this message
Iain Lane (laney) wrote :

Per IRC chat, this isn't necessary any more (but I sponsored the webkit diff, thanks!)

Changed in cairo (Ubuntu):
status: New → Incomplete
status: Incomplete → Invalid
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

Hi again Laney and Sebastian,

I looked again to the new cairo changes in debian, seems that we can almost drop all now, because the new release addressed all the patches that were backported from upstream.

Attached the trivial debdiff :)

cheers,

G.

Changed in cairo (Ubuntu):
status: Invalid → New
Mathew Hodson (mhodson)
tags: added: patch
Revision history for this message
Launchpad Janitor (janitor) wrote :

Status changed to 'Confirmed' because the bug affects multiple users.

Changed in cairo (Ubuntu):
status: New → Confirmed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package cairo - 1.14.0-2.1ubuntu1

---------------
cairo (1.14.0-2.1ubuntu1) vivid; urgency=low

  * Merge from Debian unstable (LP: #1353362). Remaining changes:
    - server_side_gradients.patch

cairo (1.14.0-2.1) unstable; urgency=medium

  * Non-maintainer upload.
  * debian/patches - picked two post-release patches resolving Debian-reported
    issues:
    - 0005-CFF-Fix-unaligned-access.patch
      fixes unaligned access reported on sparc (Closes: #712836)
    - 0008-tor-scan-converter-can-t-do_fullrow-when-intersectio.patch
      resolves segfault while rendering some graphs (Closes: #766479)

cairo (1.14.0-2) unstable; urgency=medium

  * Modernise debian/rules using minimised dh.
  * Use list-missing to show uninstalled files.
  * Don't install libtool .la files.
  * Add --as-needed to dh-autoreconf.
  * Use canonical URLs for Vcs-* fields.
  * Set <email address hidden> as Maintainer.
  * Install cairo-analyse-trace binary into cairo-perf-utils package.

cairo (1.14.0-1) unstable; urgency=medium

  * New upstream release.
  * Add debian/gbp.conf for git-buildpackage and configure it to use
    pristine-tar.
  * Update patches:
    - Remove patches which have been merged upstream or no longer apply.
    - Refresh remaining patches.
  * Bump Standards-Version to 3.9.6.
  * Drop initial article from description synopsis.
  * Update symbols file and use the upstream version for the symbols
    introduced in 1.12.16-3. Update shlibs version info accordingly for
    libcairo2.
 -- Gianfranco Costamagna <email address hidden> Mon, 05 Jan 2015 17:35:18 +0000

Changed in cairo (Ubuntu):
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.