Merge lp:~bellini666/ubuntu/wily/xcffib/fix-for-1532883 into lp:ubuntu/wily/xcffib

Proposed by Thiago Bellini
Status: Needs review
Proposed branch: lp:~bellini666/ubuntu/wily/xcffib/fix-for-1532883
Merge into: lp:ubuntu/wily/xcffib
Diff against target: 61 lines (+26/-1)
5 files modified
.pc/applied-patches (+1/-0)
debian/changelog (+9/-0)
debian/patches/libxcb-so-1.patch (+14/-0)
debian/patches/series (+1/-0)
module/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~bellini666/ubuntu/wily/xcffib/fix-for-1532883
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Review via email: mp+282207@code.launchpad.net

Description of the change

The file "/usr/lib/python2.7/dist-packages/xcffib/__init__.py" tries to "ffi.dlopen('libxcb.so')", but 'libxcb.so' doesn't exist considering the package's declared dependencies. libxcb1 provides 'libxcb.so.1' and not 'libxcb.so' (that one is only provided by the '-dev' package)

This only affects wily. Looking at the same file on xenial, it seems that it changed the dlopen to use 'libxcb.so.1', which I think is the right solution.

To post a comment you must log in.
4. By Thiago Bellini

dlopen the right lib

* debian/patches/libxcb-so-1.patch: dlopen the right lib. libxcb1 provides
  libxcb.so.1 and not libxcb.so (the later one is provided by its -dev
  package)
* Fixes: https://bugs.launchpad.net/ubuntu/+source/xcffib/+bug/1532883

Revision history for this message
Daniel Holbach (dholbach) wrote :

I'm going to upload the fix in a bit. A few small changes:

 - use 'wily' instead of 'unstable' in debian/changelog
 - add 'LP: #1532883' to the changelog entry to get the bug automatically closed on package upload

review: Approve
5. By Thiago Bellini

Small fixes to debian/changelog

* Add "Closes: #1532883" to changelog

* Use "wily" instead of "unstable"

Revision history for this message
Thiago Bellini (bellini666) wrote :

@dholbach: Done! Thanks for the review :)

Unmerged revisions

5. By Thiago Bellini

Small fixes to debian/changelog

* Add "Closes: #1532883" to changelog

* Use "wily" instead of "unstable"

4. By Thiago Bellini

dlopen the right lib

* debian/patches/libxcb-so-1.patch: dlopen the right lib. libxcb1 provides
  libxcb.so.1 and not libxcb.so (the later one is provided by its -dev
  package)
* Fixes: https://bugs.launchpad.net/ubuntu/+source/xcffib/+bug/1532883

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2015-07-20 00:28:04 +0000
3+++ .pc/applied-patches 2016-02-01 16:08:56 +0000
4@@ -1,1 +1,2 @@
5 language-python.patch
6+libxcb-so-1.patch
7
8=== modified file 'debian/changelog'
9--- debian/changelog 2015-07-20 00:28:04 +0000
10+++ debian/changelog 2016-02-01 16:08:56 +0000
11@@ -1,3 +1,12 @@
12+xcffib (0.3.4-1ubuntu0.1) wily; urgency=medium
13+
14+ * debian/patches/libxcb-so-1.patch: dlopen the right lib. libxcb1 provides
15+ libxcb.so.1 and not libxcb.so (the later one is provided by its -dev
16+ package)
17+ * Closes: #1532883
18+
19+ -- Thiago Bellini Ribeiro <hackedbellini@gmail.com> Mon, 11 Jan 2016 15:37:05 -0200
20+
21 xcffib (0.3.4-1) unstable; urgency=medium
22
23 * Version bump for cffi 1.0 and upstream release.
24
25=== added file 'debian/patches/libxcb-so-1.patch'
26--- debian/patches/libxcb-so-1.patch 1970-01-01 00:00:00 +0000
27+++ debian/patches/libxcb-so-1.patch 2016-02-01 16:08:56 +0000
28@@ -0,0 +1,14 @@
29+## Description: libxcb1 provides libxcb.so.1 and not libxcb.so
30+## Origin/Author: Thiago Bellini Ribeiro <hackedbellini@gmail.com>
31+## Bug: https://bugs.launchpad.net/ubuntu/+source/xcffib/+bug/1532883
32+--- a/module/__init__.py
33++++ b/module/__init__.py
34+@@ -25,7 +25,7 @@
35+ except ImportError:
36+ from xcffib.ffi_build import ffi
37+
38+-lib = ffi.dlopen('libxcb.so')
39++lib = ffi.dlopen('libxcb.so.1')
40+
41+ __xcb_proto_version__ = 'placeholder'
42+
43
44=== modified file 'debian/patches/series'
45--- debian/patches/series 2015-07-20 00:28:04 +0000
46+++ debian/patches/series 2016-02-01 16:08:56 +0000
47@@ -1,1 +1,2 @@
48 language-python.patch
49+libxcb-so-1.patch
50
51=== modified file 'module/__init__.py'
52--- module/__init__.py 2015-07-20 00:28:04 +0000
53+++ module/__init__.py 2016-02-01 16:08:56 +0000
54@@ -25,7 +25,7 @@
55 except ImportError:
56 from xcffib.ffi_build import ffi
57
58-lib = ffi.dlopen('libxcb.so')
59+lib = ffi.dlopen('libxcb.so.1')
60
61 __xcb_proto_version__ = 'placeholder'
62

Subscribers

People subscribed via source and target branches