Contents of /trunk/mozilla-thunderbird/patches/mozilla-firefox-1.5.0.11-pkgconfig.patch
Parent Directory
| 
Revision Log
Revision 280 -
(show annotations)
(download)
Mon Jul 23 20:57:47 2007 UTC (16 years, 9 months ago) by niro
File size: 4197 byte(s)
Mon Jul 23 20:57:47 2007 UTC (16 years, 9 months ago) by niro
File size: 4197 byte(s)
mozilla-thunderbird-2.0.0.5-r1
| 1 | --- mozilla/config/autoconf.mk.in 2005-08-17 19:17:17.000000000 +0200 |
| 2 | +++ mozilla/config/autoconf.mk.in 2005-11-17 14:23:11.000000000 +0100 |
| 3 | @@ -54,13 +54,13 @@ |
| 4 | prefix = @prefix@ |
| 5 | exec_prefix = @exec_prefix@ |
| 6 | bindir = @bindir@ |
| 7 | -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
| 8 | +includedir = $(mozappdir)/include |
| 9 | libdir = @libdir@ |
| 10 | datadir = @datadir@ |
| 11 | mandir = @mandir@ |
| 12 | -idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
| 13 | +idldir = $(mozappdir)/idl |
| 14 | |
| 15 | -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
| 16 | +mozappdir = $(libdir)/mozilla-$(MOZ_APP_NAME) |
| 17 | mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) |
| 18 | mrelibdir = $(mredir)/lib |
| 19 | |
| 20 | --- mozilla/build/unix/Makefile.in 2005-07-07 20:24:39.000000000 +0200 |
| 21 | +++ mozilla/build/unix/Makefile.in 2005-11-17 21:41:47.000000000 +0100 |
| 22 | @@ -61,6 +61,19 @@ |
| 23 | NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) |
| 24 | endif |
| 25 | |
| 26 | +# Hack to make sure that mozilla-nss.pc has the proper nss dependencies |
| 27 | +ifdef MOZ_NATIVE_NSS |
| 28 | +FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags) |
| 29 | +FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs) |
| 30 | +NSS_NAME=nss |
| 31 | +NSS_VERSION=$(shell $(NSS_CONFIG) --version) |
| 32 | +else |
| 33 | +FULL_NSS_CFLAGS=-I$(includedir)/nss |
| 34 | +FULL_NSS_LIBS=-L$(mozappdir)/nss -lnss3 -lsmime3 -lssl3 -lsoftokn3 |
| 35 | +NSS_NAME=$(MOZ_APP_NAME)-nss |
| 36 | +NSS_VERSION=$(MOZ_APP_VERSION) |
| 37 | +endif |
| 38 | + |
| 39 | ifdef MOZ_ENABLE_GTK |
| 40 | SUPERWIN_LIBS=-lgtksuperwin |
| 41 | endif |
| 42 | @@ -82,7 +82,8 @@ |
| 43 | -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ |
| 44 | -e "s|%DEFS%|$(_DEFS)|" \ |
| 45 | -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
| 46 | - -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@ |
| 47 | + -e 's|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|' \ |
| 48 | + -e 's|\(echo -L.*\)\($$\)|\1 -Wl,-R$(mozappdir)\2|' > $@ |
| 49 | |
| 50 | $(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk |
| 51 | cat $< | sed \ |
| 52 | @@ -99,7 +112,12 @@ |
| 53 | -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
| 54 | -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ |
| 55 | -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ |
| 56 | - -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ |
| 57 | + -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ |
| 58 | + -e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \ |
| 59 | + -e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \ |
| 60 | + -e "s|%NSS_NAME%|$(NSS_NAME)|" \ |
| 61 | + -e "s|%NSS_VERSION%|$(NSS_VERSION)|" \ |
| 62 | + -e "s|\(^Libs: -L.*\)|\1 -Wl,-R\$$\{libdir}|" > $@ |
| 63 | |
| 64 | libs:: $(MOZ_APP_NAME)-config |
| 65 | chmod 755 $< |
| 66 | --- mozilla/build/unix/mozilla-js.pc.in.orig 2005-07-05 23:21:52.000000000 +0000 |
| 67 | +++ mozilla/build/unix/mozilla-js.pc.in 2006-01-15 10:03:00.000000000 +0000 |
| 68 | @@ -6,6 +6,6 @@ |
| 69 | Name: JavaScript |
| 70 | Description: The Mozilla JavaScript Library |
| 71 | Version: %MOZILLA_VERSION% |
| 72 | -Requires: %NSPR_NAME% >= %NSPR_VERSION% |
| 73 | +Requires: %MOZ_APP_NAME%-%NSPR_NAME% >= %NSPR_VERSION% |
| 74 | Libs: -L${libdir} -lmozjs |
| 75 | Cflags: -I${includedir}/js -DXP_UNIX |
| 76 | --- mozilla/build/unix/mozilla-nspr.pc.in.orig 2005-07-05 23:21:52.000000000 +0000 |
| 77 | +++ mozilla/build/unix/mozilla-nspr.pc.in 2006-01-15 10:01:16.000000000 +0000 |
| 78 | @@ -1,12 +1,5 @@ |
| 79 | -prefix=%prefix% |
| 80 | -exec_prefix=%exec_prefix% |
| 81 | -libdir=%libdir% |
| 82 | -includedir=%includedir% |
| 83 | - |
| 84 | Name: NSPR |
| 85 | Description: The Netscape Portable Runtime |
| 86 | Version: %NSPR_VERSION% |
| 87 | -Libs: %FULL_NSPR_LIBS% |
| 88 | -Cflags: %FULL_NSPR_CFLAGS% |
| 89 | - |
| 90 | +Requires: %NSPR_NAME% >= %NSPR_VERSION% |
| 91 | |
| 92 | --- mozilla/build/unix/mozilla-xpcom.pc.in.orig 2005-07-05 23:21:52.000000000 +0000 |
| 93 | +++ mozilla/build/unix/mozilla-xpcom.pc.in 2006-01-15 10:02:34.000000000 +0000 |
| 94 | @@ -7,6 +7,6 @@ |
| 95 | Name: XPCOM |
| 96 | Description: The Mozilla Cross Platform Component Library |
| 97 | Version: %MOZILLA_VERSION% |
| 98 | -Requires: %NSPR_NAME% >= %NSPR_VERSION% |
| 99 | +Requires: %MOZ_APP_NAME%-%NSPR_NAME% >= %NSPR_VERSION% |
| 100 | Libs: -L${libdir} -lxpcom |
| 101 | Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string |
| 102 | --- mozilla/build/unix/mozilla-nss.pc.in.orig 2005-07-05 23:21:52.000000000 +0000 |
| 103 | +++ mozilla/build/unix/mozilla-nss.pc.in 2006-01-15 10:26:13.000000000 +0000 |
| 104 | @@ -1,11 +1,4 @@ |
| 105 | -prefix=%prefix% |
| 106 | -exec_prefix=%exec_prefix% |
| 107 | -libdir=%libdir% |
| 108 | -includedir=%includedir% |
| 109 | - |
| 110 | Name: NSS |
| 111 | Description: Mozilla Network Security Services |
| 112 | -Version: %MOZILLA_VERSION% |
| 113 | -Requires: %NSPR_NAME% >= %NSPR_VERSION% |
| 114 | -Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 |
| 115 | -Cflags: -I${includedir}/nss |
| 116 | +Version: %NSS_VERSION% |
| 117 | +Requires: %NSS_NAME% >= %NSS_VERSION% |