1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Description: Correct gdk-pixbuf paths so the header file parsing will work properly.
Author: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Bug-Debian: http://bugs.debian.org/599239
Reviewed-By: NIIBE Yutaka <gniibe@fsij.org>
Last-Update: 2013-01-21
--- a/src/h2stub.scm
+++ b/src/h2stub.scm
@@ -33,6 +33,7 @@
;; Gtk and Pango version (major.minor) we're dealing with
(define gtk-version (make-parameter "2.0"))
+(define gdk-pixbuf-version (make-parameter "2.0"))
(define pango-version (make-parameter "1.0"))
;; Directories to search input header files.
@@ -45,6 +46,10 @@
(cut port->string-list <>)
:on-abnormal-exit :ignore)
(call-with-input-process
+ #`"pkg-config --variable=includedir gdk-pixbuf-,(gdk-pixbuf-version)"
+ (cut port->string-list <>)
+ :on-abnormal-exit :ignore)
+ (call-with-input-process
#`"pkg-config --variable=includedir pango-,(pango-version)"
(cut port->string-list <>)
:on-abnormal-exit :ignore)
@@ -62,6 +67,9 @@
(define gtk-directory
(make-parameter (find-header-dir #`"gtk-,(gtk-version)/gtk/gtk.h"
*header-search-paths* )))
+(define gdk-pixbuf-directory
+ (make-parameter (find-header-dir #`"gdk-pixbuf,(gdk-pixbuf-version)/gdk-pixbuf/gdk-pixbuf.h"
+ *header-search-paths* )))
(define pango-directory
(make-parameter (find-header-dir #`"pango-,(pango-version)/pango/pango.h"
*header-search-paths*)))
@@ -1277,7 +1285,7 @@
(call-with-input-file "GDKFILES" port->string-list)))
(define (parse-gdk-pixbuf)
- (parse-headers #`",(gtk-directory)/gdk-pixbuf"
+ (parse-headers #`",(gdk-pixbuf-directory)/gdk-pixbuf"
(call-with-input-file "GDKPIXBUFFILES" port->string-list)))
(define (parse-gtk)
|
