diff options
| author | gdt <gdt@pkgsrc.org> | 2014-03-22 18:02:14 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2014-03-22 18:02:14 +0000 |
| commit | 2d3b321d5b5b295c5965f9fe6f1704b505101f6c (patch) | |
| tree | b545a853d4fed77b0a8700803368dbd10bdebe15 /devel | |
| parent | 7d9e52bcae7a4ea250cc38c44a3e8428af5b42a7 (diff) | |
| download | pkgsrc-2d3b321d5b5b295c5965f9fe6f1704b505101f6c.tar.gz | |
Partially cope with freeetyp2 update lossage.
Adjust perl program that prints include statements to use the
ft2build/constant method, from Patrick Welche.
This doesn't fix my build, but it gets a lot further.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/xulrunner192/Makefile | 4 | ||||
| -rw-r--r-- | devel/xulrunner192/distinfo | 3 | ||||
| -rw-r--r-- | devel/xulrunner192/patches/patch-nsprpub_config_make-system-wrappers.pl | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/devel/xulrunner192/Makefile b/devel/xulrunner192/Makefile index e78c9896358..37e7225385e 100644 --- a/devel/xulrunner192/Makefile +++ b/devel/xulrunner192/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2014/02/12 23:17:51 tron Exp $ +# $NetBSD: Makefile,v 1.37 2014/03/22 18:02:14 gdt Exp $ .include "dist.mk" PKGNAME= xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -PKGREVISION= 20 +PKGREVISION= 21 CATEGORIES= devel www MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/xulrunner192/distinfo b/devel/xulrunner192/distinfo index a006a001133..ee41fe0f0a9 100644 --- a/devel/xulrunner192/distinfo +++ b/devel/xulrunner192/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/10/20 18:17:04 joerg Exp $ +$NetBSD: distinfo,v 1.16 2014/03/22 18:02:14 gdt Exp $ SHA1 (firefox-3.6.28.source.tar.bz2) = adeaa9bdd367878c5b522766e681798178e31577 RMD160 (firefox-3.6.28.source.tar.bz2) = 87cfca8e3f1df30e06eccffbf994825904eeedbc @@ -52,6 +52,7 @@ SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00 SHA1 (patch-mm) = 8db6fbb1197147978bce1de5c9b8017ed940efd1 SHA1 (patch-mn) = e7e5e615ca26f7cee0fb27b796fd3d423d693f6b SHA1 (patch-mp) = 34bf95224cdecedd93566f9405f725b0c9b5ee0f +SHA1 (patch-nsprpub_config_make-system-wrappers.pl) = d9f71cc3080b5bf8a89ae2c131c368fd2857e090 SHA1 (patch-pa) = df6b19762f03070794fb4cdce79fe792ed9284b1 SHA1 (patch-pb) = 61f9b8aa5bc377167980f8c2a8715062ac00e66e SHA1 (patch-pc) = 4fac35249d1a36c6ccaa3f4e3b4677998ee1d6ee diff --git a/devel/xulrunner192/patches/patch-nsprpub_config_make-system-wrappers.pl b/devel/xulrunner192/patches/patch-nsprpub_config_make-system-wrappers.pl new file mode 100644 index 00000000000..4c75aefbe56 --- /dev/null +++ b/devel/xulrunner192/patches/patch-nsprpub_config_make-system-wrappers.pl @@ -0,0 +1,18 @@ +$NetBSD: patch-nsprpub_config_make-system-wrappers.pl,v 1.1 2014/03/22 18:02:14 gdt Exp $ + +--- ./nsprpub/config/make-system-wrappers.pl.orig 2012-03-06 14:45:41.000000000 +0000 ++++ ./nsprpub/config/make-system-wrappers.pl +@@ -52,7 +52,12 @@ while (<STDIN>) { + open OUT, ">$output_dir/$_"; + print OUT "#pragma GCC system_header\n"; # suppress include_next warning + print OUT "#pragma GCC visibility push(default)\n"; +- print OUT "#include_next \<$_\>\n"; ++ if ($_ =~ "freetype/tttables.h") { ++ print OUT "#include \<ft2build.h\>\n"; ++ print OUT "#include_next FT_TRUETYPE_TABLES_H\n"; ++ } else { ++ print OUT "#include_next \<$_\>\n"; ++ } + print OUT "#pragma GCC visibility pop\n"; + close OUT; + } |