NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
port-i386/49608: devel/xulrunner compiler error due to different version of freetype in the base system
>Number: 49608
>Category: port-i386
>Synopsis: devel/xulrunner compiler error due to different version of freetype in the base system
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: port-i386-maintainer
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon Jan 26 22:10:00 +0000 2015
>Originator: ser
>Release: pkgsrc HEAD
>Organization:
http://www.k1.com.br
>Environment:
etBSD m237.lenzicasa 6.1.5_PATCH NetBSD 6.1.5_PATCH (LZT) #0: Sat Jan 17 21:29:06 BRST 2015 root@z5000.lenzicasa:/usr/obj/sys/arch/i386/compile/LZT i386
>Description:
devel/xulrunner192 does not compile
it complains about freetype2 missing entry point, because the version xulrunner192 needs (the bundled one) is different that the one in the base system
>How-To-Repeat:
cd /usr/pkgsrc/www/xulrunner192
make
>Fix:
apply a fix to the xulrunner port... to build it using the bundled one in the xulrunner code.
this fix must be run on the /usr/pkgsrc/devel/xulrunner192 directory
after the patch, must rebuild distinfo with the command: make mps
than xulrunner builds and firefox36 runs
==========================================================
diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig 2014-10-07 13:47:24.000000000 -0300
+++ ./Makefile 2015-01-26 12:49:27.000000000 -0200
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2014/10/07 16:47:24 adam Exp $
+# $NetBSD: Makefile,v 1.41 2015/01/26 10:12:26 sergiolenzi
.include "dist.mk"
PKGNAME= xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
@@ -12,6 +12,8 @@ LICENSE= mpl-1.1
MOZILLA_DIR= # empty
+PKG_OPTIONS.xulrunner= gnome
+
PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in
PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in
PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
diff -up ./PLIST.orig ./PLIST
--- ./PLIST.orig 2012-02-22 09:00:06.000000000 -0200
+++ ./PLIST 2015-01-26 08:26:53.000000000 -0200
@@ -1,22 +1,34 @@
-@comment $NetBSD: PLIST,v 1.3 2012/02/22 11:00:06 obache Exp $
+@comment $NetBSD$
bin/xulrunner192
-${PLIST.jit}include/xulrunner192/Allocator.h
-${PLIST.jit}include/xulrunner192/Assembler.h
-${PLIST.jit}include/xulrunner192/CodeAlloc.h
-${PLIST.jit}include/xulrunner192/Containers.h
-${PLIST.jit}include/xulrunner192/Fragmento.h
+include/xulrunner192/Allocator.h
+include/xulrunner192/Assembler.h
+include/xulrunner192/CodeAlloc.h
+include/xulrunner192/Containers.h
+include/xulrunner192/Fragmento.h
include/xulrunner192/ImageErrors.h
include/xulrunner192/ImageLogging.h
-${PLIST.jit}include/xulrunner192/LIR.h
+include/xulrunner192/LIR.h
include/xulrunner192/NSReg.h
-${PLIST.jit}include/xulrunner192/Native.h
-${PLIST.jit}include/xulrunner192/Native${NANOJIT_ARCH}.h
-${PLIST.jit}include/xulrunner192/RegAlloc.h
+include/xulrunner192/Native.h
+include/xulrunner192/Native${MACHINE_ARCH}.h
+include/xulrunner192/RegAlloc.h
include/xulrunner192/VerReg.h
include/xulrunner192/XPCIDispatch.h
-${PLIST.jit}include/xulrunner192/avmplus.h
+include/xulrunner192/avmplus.h
include/xulrunner192/base64.h
include/xulrunner192/blapit.h
+include/xulrunner192/bzlib.h
+include/xulrunner192/cairo/cairo-deprecated.h
+include/xulrunner192/cairo/cairo-features.h
+include/xulrunner192/cairo/cairo-ft.h
+include/xulrunner192/cairo/cairo-pdf.h
+include/xulrunner192/cairo/cairo-platform.h
+include/xulrunner192/cairo/cairo-ps.h
+include/xulrunner192/cairo/cairo-rename.h
+include/xulrunner192/cairo/cairo-version.h
+include/xulrunner192/cairo/cairo-xlib-xrender.h
+include/xulrunner192/cairo/cairo-xlib.h
+include/xulrunner192/cairo/cairo.h
include/xulrunner192/cert.h
include/xulrunner192/certdb.h
include/xulrunner192/certt.h
@@ -100,7 +112,13 @@ include/xulrunner192/inISearchProcess.h
include/xulrunner192/jar-ds.h
include/xulrunner192/jar.h
include/xulrunner192/jarfile.h
-${PLIST.jemalloc}include/xulrunner192/jemalloc.h
+include/xulrunner192/jconfig.h
+include/xulrunner192/jerror.h
+include/xulrunner192/jinclude.h
+include/xulrunner192/jmorecfg.h
+include/xulrunner192/jos2fig.h
+include/xulrunner192/jpegint.h
+include/xulrunner192/jpeglib.h
include/xulrunner192/js-config.h
include/xulrunner192/js.msg
include/xulrunner192/jsapi.h
@@ -111,7 +129,7 @@ include/xulrunner192/jsautocfg.h
include/xulrunner192/jsautokw.h
include/xulrunner192/jsbit.h
include/xulrunner192/jsbool.h
-${PLIST.jit}include/xulrunner192/jsbuiltins.h
+include/xulrunner192/jsbuiltins.h
include/xulrunner192/jsclist.h
include/xulrunner192/jscntxt.h
include/xulrunner192/jscompat.h
@@ -157,6 +175,7 @@ include/xulrunner192/jsutil.h
include/xulrunner192/jsversion.h
include/xulrunner192/jsxdrapi.h
include/xulrunner192/jsxml.h
+include/xulrunner192/jwinfig.h
include/xulrunner192/key.h
include/xulrunner192/keyhi.h
include/xulrunner192/keyt.h
@@ -238,7 +257,8 @@ include/xulrunner192/mozilla/storage.h
include/xulrunner192/mozilla/storage/Variant.h
include/xulrunner192/mozilla/storage/Variant_inl.h
include/xulrunner192/mozpngconf.h
-${PLIST.jit}include/xulrunner192/nanojit.h
+include/xulrunner192/mozzconf.h
+include/xulrunner192/nanojit.h
include/xulrunner192/necko-config.h
include/xulrunner192/netCore.h
include/xulrunner192/npapi.h
@@ -1201,7 +1221,6 @@ include/xulrunner192/nsILocalFileWin.h
include/xulrunner192/nsILocalStore.h
include/xulrunner192/nsILocale.h
include/xulrunner192/nsILocaleService.h
-${PLIST.debug}include/xulrunner192/nsILoggingSink.h
include/xulrunner192/nsILoginInfo.h
include/xulrunner192/nsILoginManager.h
include/xulrunner192/nsILoginManagerIEMigrationHelper.h
@@ -2050,6 +2069,8 @@ include/xulrunner192/ots-memory-stream.h
include/xulrunner192/p12.h
include/xulrunner192/p12plcy.h
include/xulrunner192/p12t.h
+include/xulrunner192/pixman-version.h
+include/xulrunner192/pixman.h
include/xulrunner192/pk11func.h
include/xulrunner192/pk11pqg.h
include/xulrunner192/pk11priv.h
@@ -2146,6 +2167,7 @@ include/xulrunner192/secpkcs7.h
include/xulrunner192/secport.h
include/xulrunner192/shsign.h
include/xulrunner192/smime.h
+include/xulrunner192/sqlite3.h
include/xulrunner192/ssl.h
include/xulrunner192/sslerr.h
include/xulrunner192/sslproto.h
@@ -2183,16 +2205,10 @@ include/xulrunner192/xptcstubsdecl.inc
include/xulrunner192/xptcstubsdef.inc
include/xulrunner192/xptinfo.h
include/xulrunner192/xrecore.h
+include/xulrunner192/zconf.h
include/xulrunner192/zipfile.h
include/xulrunner192/zipstruct.h
-lib/xulrunner192/pkgconfig/libxul-embedding.pc
-lib/xulrunner192/pkgconfig/libxul.pc
-lib/xulrunner192/pkgconfig/mozilla-gtkmozembed-embedding.pc
-lib/xulrunner192/pkgconfig/mozilla-gtkmozembed.pc
-lib/xulrunner192/pkgconfig/mozilla-js.pc
-lib/xulrunner192/pkgconfig/mozilla-nspr.pc
-lib/xulrunner192/pkgconfig/mozilla-nss.pc
-lib/xulrunner192/pkgconfig/mozilla-plugin.pc
+include/xulrunner192/zlib.h
lib/xulrunner192-sdk/bin
lib/xulrunner192-sdk/idl
lib/xulrunner192-sdk/include
@@ -2235,10 +2251,10 @@ lib/xulrunner192/components/GPSDGeolocat
lib/xulrunner192/components/NetworkGeolocationProvider.js
lib/xulrunner192/components/components.list
lib/xulrunner192/components/jsconsole-clhandler.js
-${PLIST.gnome}lib/xulrunner192/components/libdbusservice.so
+lib/xulrunner192/components/libdbusservice.so
lib/xulrunner192/components/libimgicon.so
-${PLIST.gnome}lib/xulrunner192/components/libmozgnome.so
-${PLIST.gnome}lib/xulrunner192/components/libnkgnomevfs.so
+lib/xulrunner192/components/libmozgnome.so
+lib/xulrunner192/components/libnkgnomevfs.so
lib/xulrunner192/components/nsAddonRepository.js
lib/xulrunner192/components/nsBadCertHandler.js
lib/xulrunner192/components/nsBlocklistService.js
@@ -2307,6 +2323,7 @@ lib/xulrunner192/libplds4.so
lib/xulrunner192/libsmime3.so
lib/xulrunner192/libsoftokn3.chk
lib/xulrunner192/libsoftokn3.so
+lib/xulrunner192/libsqlite3.so
lib/xulrunner192/libssl3.so
lib/xulrunner192/libunicharutil_external_s.a
lib/xulrunner192/libxpcom.so
@@ -2332,6 +2349,14 @@ lib/xulrunner192/modules/debug.js
lib/xulrunner192/modules/utils.js
lib/xulrunner192/mozilla-xremote-client
lib/xulrunner192/nspr-config
+lib/xulrunner192/pkgconfig/libxul-embedding.pc
+lib/xulrunner192/pkgconfig/libxul.pc
+lib/xulrunner192/pkgconfig/mozilla-gtkmozembed-embedding.pc
+lib/xulrunner192/pkgconfig/mozilla-gtkmozembed.pc
+lib/xulrunner192/pkgconfig/mozilla-js.pc
+lib/xulrunner192/pkgconfig/mozilla-nspr.pc
+lib/xulrunner192/pkgconfig/mozilla-nss.pc
+lib/xulrunner192/pkgconfig/mozilla-plugin.pc
lib/xulrunner192/platform.ini
lib/xulrunner192/plugins/libnullplugin.so
lib/xulrunner192/plugins/libunixprintplugin.so
diff -up ./distinfo.orig ./distinfo
--- ./distinfo.orig 2014-05-15 18:16:16.000000000 -0300
+++ ./distinfo 2015-01-26 08:26:53.000000000 -0200
@@ -40,6 +40,7 @@ SHA1 (patch-content_svg_content_src_nsSV
SHA1 (patch-dom_src_threads_nsDOMWorkerEvents.cpp) = 2e29c52ddefa76a7ce28307d6dc8c0a87d8cecc2
SHA1 (patch-dom_src_threads_nsDOMWorkerEvents.h) = ab131c359b0a354615381ba4991b7f2d9d4cb723
SHA1 (patch-embedding_browser_gtk_src_EmbedPrivate.cpp) = a0ec26c6ca751e51586498e33b4f51b63799e3d2
+SHA1 (patch-freetype) = 780a475f7fe478cf014ea183b55c32782a214ea0
SHA1 (patch-gfx_ots_src_os2.cc) = bf42e5aa49a24f44b49f0d80bdf5d3b0947a3ea5
SHA1 (patch-gfx_thebes_src_gfxPangoFonts.cpp) = 3285c81fef35475a88e78192ab50bbbcb507c28b
SHA1 (patch-js_src_build_autoconf_moznbytetype.m4) = 2409b0ee9e889886c3f0fd2317d109fe9b51c699
diff -up ./mozilla-common.mk.orig ./mozilla-common.mk
--- ./mozilla-common.mk.orig 2014-05-09 04:37:04.000000000 -0300
+++ ./mozilla-common.mk 2015-01-26 08:26:53.000000000 -0200
@@ -22,14 +22,15 @@ CONFIGURE_ARGS+= --enable-optimize=-O2 -
CONFIGURE_ARGS+= --disable-javaxpcom
CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
CONFIGURE_ARGS+= --enable-svg --enable-mathml
-CONFIGURE_ARGS+= --enable-system-cairo
-CONFIGURE_ARGS+= --with-system-jpeg
-CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2
-CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
-CONFIGURE_ARGS+= --enable-system-sqlite
+#CONFIGURE_ARGS+= --enable-system-cairo
+#CONFIGURE_ARGS+= --with-system-jpeg
+#CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2
+#CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
+#CONFIGURE_ARGS+= --enable-system-sqlite
CONFIGURE_ARGS+= --disable-crashreporter
CONFIGURE_ARGS+= --disable-libnotify
CONFIGURE_ARGS+= --disable-necko-wifi
+CONFIGURE_ARGS+= --enable-tree-freetype
CONFIGURE_ARGS+= --enable-chrome-format=flat
SUBST_CLASSES+= fix-paths
@@ -86,9 +87,13 @@ BUILDLINK_API_DEPENDS.libevent+= libeven
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.8
.include "../../graphics/cairo/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
+########more buildlinks###########
+.include "../../net/wget/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
diff -up ./patches/patch-freetype.orig ./patches/patch-freetype
--- ./patches/patch-freetype.orig 2015-01-26 08:26:53.000000000 -0200
+++ ./patches/patch-freetype 2015-01-26 08:26:53.000000000 -0200
@@ -0,0 +1,40 @@
+diff -up ./configure.in.orig ./configure.in
+--- ./configure.in.orig 2015-01-19 22:14:21.000000000 -0200
++++ ./configure.in 2015-01-19 22:14:57.000000000 -0200
+@@ -6086,8 +6086,8 @@ if test -n "$MOZ_TREE_FREETYPE"; then
+ FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
+ FT2_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
+ CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
+- FT2_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
+- CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
++ FT2_LIBS='$(LIBXUL_DIST)/lib/libfreetype2.a'
++ CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/libfreetype2.a'
+ AC_DEFINE(HAVE_FT_BITMAP_SIZE_Y_PPEM)
+ AC_DEFINE(HAVE_FT_GLYPHSLOT_EMBOLDEN)
+ AC_DEFINE(HAVE_FT_LOAD_SFNT_TABLE)
+diff -up ./configure.orig ./configure
+--- ./configure.orig 2015-01-19 22:14:26.000000000 -0200
++++ ./configure 2015-01-19 22:15:18.000000000 -0200
+@@ -17270,8 +17270,8 @@ EOF
+ FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
+ FT2_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
+ CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
+- FT2_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
+- CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
++ FT2_LIBS='$(LIBXUL_DIST)/lib/libfreetype2.a'
++ CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/libfreetype2.a'
+ cat >> confdefs.h <<\EOF
+ #define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
+ EOF
+diff -up ./modules/freetype2/Makefile.in.orig ./modules/freetype2/Makefile.in
+--- ./modules/freetype2/Makefile.in.orig 2015-01-19 22:15:31.000000000 -0200
++++ ./modules/freetype2/Makefile.in 2015-01-19 22:15:46.000000000 -0200
+@@ -127,7 +127,7 @@ CSRCS = \
+ $(NULL)
+
+
+-DEFINES += -DFT2_BUILD_LIBRARY -DFT_OPTION_AUTOFIT2 -FI $(srcdir)/include/freetype/config/ftstdlib.h
++DEFINES += -DFT2_BUILD_LIBRARY -DFT_OPTION_AUTOFIT2 -include $(srcdir)/include/freetype/config/ftstdlib.h
+
+ ifdef WINCE
+ DEFINES += -DCHAR_BIT=8
Home |
Main Index |
Thread Index |
Old Index