libindicate

Merge lp:~ballogy/libindicate/diff-dir-for-gtk3 into lp:libindicate/0.6

  1. diff-dir-for-gtk3
  2. Merge into trunk
Proposed by Balló György
Status: Superseded
Proposed branch: lp:~ballogy/libindicate/diff-dir-for-gtk3
Merge into: lp:libindicate/0.6
Diff against target: 37 lines (+3/-3)
3 files modified
libindicate-gtk/Makefile.am (+1/-1)
libindicate-gtk/indicate-gtk-0.6.pc.in (+1/-1)
libindicate-gtk/indicate-gtk3-0.6.pc.in (+1/-1)
To merge this branch: bzr merge lp:~ballogy/libindicate/diff-dir-for-gtk3
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+82846@code.launchpad.net

This proposal has been superseded by a proposal from 2012-02-09.

Description of the change

Currently, both GTK2 and GTK3 build install header files into the same directory (/usr/include/libindicate-0.6). This causes conflict between the two package if the header files are packaged together with binaries (e.g. on Arch Linux).

This change modify the location of header files for GTK3 library.

To post a comment you must log in.
lp:~ballogy/libindicate/diff-dir-for-gtk3 updated
440. By Balló György

Separate libindicate and libindicate-gtk include directories

Revision history for this message
Balló György (ballogy) wrote :

Now I modified my proposal to use three different top-level header location for libindicate, libindicate-gtk and libindicate-gtk3.

Unmerged revisions

440. By Balló György

Separate libindicate and libindicate-gtk include directories

439. By Balló György

Use different directory for headers of gtk3 library

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicate-gtk/Makefile.am'
2--- libindicate-gtk/Makefile.am 2011-08-10 18:40:09 +0000
3+++ libindicate-gtk/Makefile.am 2012-01-05 20:08:23 +0000
4@@ -20,7 +20,7 @@
5 indicate-gtk-0.6.pc.in \
6 indicate-gtk3-0.6.pc.in
7
8-libindicate_gtkincludedir=$(includedir)/libindicate-0.6/libindicate-gtk
9+libindicate_gtkincludedir=$(includedir)/libindicate-gtk$(VER)-0.6/libindicate-gtk
10
11 indicate_gtk_headers = \
12 indicator.h \
13
14=== modified file 'libindicate-gtk/indicate-gtk-0.6.pc.in'
15--- libindicate-gtk/indicate-gtk-0.6.pc.in 2011-08-11 03:03:27 +0000
16+++ libindicate-gtk/indicate-gtk-0.6.pc.in 2012-01-05 20:08:23 +0000
17@@ -4,7 +4,7 @@
18 bindir=@bindir@
19 includedir=@includedir@
20
21-Cflags: -I${includedir}/libindicate-0.6
22+Cflags: -I${includedir}/libindicate-gtk-0.6
23 Requires: gtk+-2.0 indicate-0.6
24 Libs: -L${libdir} -lindicate-gtk
25
26
27=== modified file 'libindicate-gtk/indicate-gtk3-0.6.pc.in'
28--- libindicate-gtk/indicate-gtk3-0.6.pc.in 2011-08-11 03:03:27 +0000
29+++ libindicate-gtk/indicate-gtk3-0.6.pc.in 2012-01-05 20:08:23 +0000
30@@ -4,7 +4,7 @@
31 bindir=@bindir@
32 includedir=@includedir@
33
34-Cflags: -I${includedir}/libindicate-0.6
35+Cflags: -I${includedir}/libindicate-gtk3-0.6
36 Requires: gtk+-3.0 indicate-0.6
37 Libs: -L${libdir} -lindicate-gtk3
38

Subscribers

People subscribed via source and target branches