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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
diff -urN mozilla/xulrunner/installer/Makefile.in mozilla.new/xulrunner/installer/Makefile.in
--- mozilla/xulrunner/installer/Makefile.in 2008-04-10 16:50:48.000000000 +0200
+++ mozilla.new/xulrunner/installer/Makefile.in 2008-07-07 20:01:44.000000000 +0200
@@ -116,6 +116,7 @@
-e "s|%includedir%|$(includedir)|" \
-e "s|%idldir%|$(idldir)|" \
-e "s|%sdkdir%|$(sdkdir)|" \
+ -e "s|%libdir%|$(installdir)|" \
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
diff -urN mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in mozilla.new/xulrunner/installer/libxul-embedding-unstable.pc.in
--- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-01-05 07:50:34.000000000 +0100
+++ mozilla.new/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-07-07 19:59:29.000000000 +0200
@@ -7,5 +7,6 @@
Name: libxul-embedding-unstable
Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
Version: %MOZILLA_VERSION%
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+Cflags: -DXPCOM_GLUE -I${includedir} -fshort-wchar
diff -urN mozilla/xulrunner/installer/libxul-embedding.pc.in mozilla.new/xulrunner/installer/libxul-embedding.pc.in
--- mozilla/xulrunner/installer/libxul-embedding.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/libxul-embedding.pc.in 2008-07-07 19:59:11.000000000 +0200
@@ -1,7 +1,7 @@
prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
-idldir=%idldir%
+idldir=%idldir%/stable
includetype=stable
# Note: the default pkg-config cflags will only list include directories
@@ -11,5 +11,6 @@
Name: libxul-embedding
Description: Static library for version-independent embedding of the Mozilla runtime
Version: %MOZILLA_VERSION%
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
diff -urN mozilla/xulrunner/installer/libxul-unstable.pc.in mozilla.new/xulrunner/installer/libxul-unstable.pc.in
--- mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-01-05 07:50:34.000000000 +0100
+++ mozilla.new/xulrunner/installer/libxul-unstable.pc.in 2008-07-07 20:00:35.000000000 +0200
@@ -1,5 +1,6 @@
prefix=%prefix%
sdkdir=%sdkdir%
+libdir=%libdir%
includedir=%includedir%
idldir=%idldir%
includetype=unstable
@@ -9,4 +10,4 @@
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-Cflags: -I${includedir}/${includetype} -fshort-wchar
+Cflags: -I${includedir} -fshort-wchar
diff -urN mozilla/xulrunner/installer/libxul.pc.in mozilla.new/xulrunner/installer/libxul.pc.in
--- mozilla/xulrunner/installer/libxul.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/libxul.pc.in 2008-07-07 20:00:09.000000000 +0200
@@ -1,7 +1,8 @@
prefix=%prefix%
sdkdir=%sdkdir%
+libdir=%libdir%
includedir=%includedir%
-idldir=%idldir%
+idldir=%idldir%/stable
includetype=stable
# Note: the default pkg-config includes will only list include directories
@@ -13,4 +14,4 @@
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-Cflags: -I${includedir}/${includetype} -fshort-wchar
\ No newline at end of file
+Cflags: -I${includedir}/${includetype} -fshort-wchar
diff -urN mozilla/xulrunner/installer/mozilla-nspr.pc.in mozilla.new/xulrunner/installer/mozilla-nspr.pc.in
--- mozilla/xulrunner/installer/mozilla-nspr.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/mozilla-nspr.pc.in 2008-07-07 19:56:15.000000000 +0200
@@ -7,5 +7,3 @@
Version: %NSPR_VERSION%
Libs: %FULL_NSPR_LIBS%
Cflags: %FULL_NSPR_CFLAGS%
-
-
diff -urN mozilla/xulrunner/installer/mozilla-plugin.pc.in mozilla.new/xulrunner/installer/mozilla-plugin.pc.in
--- mozilla/xulrunner/installer/mozilla-plugin.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/mozilla-plugin.pc.in 2008-07-07 19:56:15.000000000 +0200
@@ -6,4 +6,4 @@
Description: Mozilla Plug-In API
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Cflags: -I${includedir}/stable
+Cflags: -I${includedir}/stable -I${includedir}/plugin
diff -urN mozilla/xulrunner/installer/mozilla-js.pc.in mozilla.new/xulrunner/installer/mozilla-js.pc.in
--- mozilla/xulrunner/installer/mozilla-js.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/mozilla-js.pc.in 2009-02-18 23:15:40.681314523 +0100
@@ -7,4 +7,4 @@
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lmozjs
-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
|
