Magellan Linux

Diff of /smage/trunk/extras/firefox/firefox-43.0.4-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 8410 by niro, Mon Jan 25 09:27:35 2016 UTC revision 8419 by niro, Mon Jan 25 11:04:02 2016 UTC
# Line 15  FIREFOX_DEPEND=">= x11-libs/libXrender-0 Line 15  FIREFOX_DEPEND=">= x11-libs/libXrender-0
15   >= x11-libs/libXmu-1   >= x11-libs/libXmu-1
16   >= dev-libs/expat-2   >= dev-libs/expat-2
17   >= sys-libs/zlib-1.2   >= sys-libs/zlib-1.2
18   >= sys-apps/dbus-1.10   >= sys-apps/dbus-libs-1.10
19   >= dev-libs/dbus-glib-0.104   >= dev-libs/dbus-glib-0.104
20   >= media-libs/fontconfig-2.11   >= media-libs/fontconfig-2.11
21   >= media-libs/libjpeg-8   >= media-libs/libjpeg-8
# Line 38  FIREFOX_DEPEND=">= x11-libs/libXrender-0 Line 38  FIREFOX_DEPEND=">= x11-libs/libXrender-0
38  # >= x11-libs/startup-notification-0.12  # >= x11-libs/startup-notification-0.12
39  # >= app-text/hunspell-1.3  # >= app-text/hunspell-1.3
40    
41    ALX_DEV_DEPEND=">= dev-libs/nspr-dev-4.11
42     >= dev-libs/nss-dev-3.21
43     >= dev-libs/expat-dev-2
44     >= sys-libs/zlib-dev-1.2
45     >= sys-apps/dbus-dev-1.10
46     >= media-libs/fontconfig-dev-2.11
47     >= media-libs/libjpeg-dev-8
48     >= media-libs/libpng-dev-1.5
49     >= media-libs/alsa-lib-dev-1.1
50     >= media-libs/libogg-dev-1.3
51     >= dev-libs/glib2-dev-2.46
52     >= dev-libs/libidl-dev-0.8.14
53     >= app-arch/unzip-dev-6
54     >= x11-libs/pango-dev-1.38
55     >= x11-libs/cairo-dev-1.14
56     >= x11-libs/gtk2+-dev-2.24
57     >= x11-libs/libnotify-dev-0.7
58     >= dev-db/sqlite-dev-3.10
59     >= dev-libs/libffi-dev-3.2
60     >= x11-libs/pixman-dev-0.32"
61    
62  SDEPEND="${FIREFOX_DEPEND}  SDEPEND="${FIREFOX_DEPEND}
63   >= x11-proto/xineramaproto-1   >= x11-proto/xineramaproto-1
64   >= x11-proto/compositeproto-0.4   >= x11-proto/compositeproto-0.4
# Line 46  SDEPEND="${FIREFOX_DEPEND} Line 67  SDEPEND="${FIREFOX_DEPEND}
67   >= sys-dev/automake-4   >= sys-dev/automake-4
68   >= virtual/sed   >= virtual/sed
69   >= app-arch/zip-3   >= app-arch/zip-3
70   >= dev-lang/yasm-1.2"   >= dev-lang/yasm-1.3
71     ${ALX_DEV_DEPEND}"
72    
73  SRCFILE="${PNAME}-${PVER}.source.tar.xz"  SRCFILE="${PNAME}-${PVER}.source.tar.xz"
74  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
75    
76  sminclude mozilla mtools cleanutils python  sminclude mozilla mtools cleanutils python gtk2
77    
78  SRC_URI=(  SRC_URI=(
79   http://ftp.mozilla.org/pub/mozilla.org/${PNAME}/releases/${PVER}/source/${SRCFILE}   http://ftp.mozilla.org/pub/mozilla.org/${PNAME}/releases/${PVER}/source/${SRCFILE}
# Line 93  export CXXFLAGS="${CFLAGS}" Line 115  export CXXFLAGS="${CFLAGS}"
115  # needed to build without warnings on gcc-3  # needed to build without warnings on gcc-3
116  export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"  export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
117    
118    # enforce pic and pie
119    export CFLAGS="${CFLAGS} -fPIC -pie"
120    export CXXFLAGS="${CXXFLAGS} -fPIC -pie"
121    
122  # setup branding  # setup branding
123  # nightly, aurora, official, unofficial, magellan  # nightly, aurora, official, unofficial, magellan
124  __MOZ_BRANDING="magellan"  __MOZ_BRANDING="magellan"
# Line 126  src_prepare() Line 152  src_prepare()
152   install -d obj-${_mychost}/_virtualenv/bin || die   install -d obj-${_mychost}/_virtualenv/bin || die
153   cp -a /usr/bin/python-m32 obj-${_mychost}/_virtualenv/bin || die   cp -a /usr/bin/python-m32 obj-${_mychost}/_virtualenv/bin || die
154   cp -a /usr/bin/python-m64 obj-${_mychost}/_virtualenv/bin || die   cp -a /usr/bin/python-m64 obj-${_mychost}/_virtualenv/bin || die
155   cp -a /usr/bin/python$(get_python_version)-m32 obj-${_mychost}/_virtualenv/bin || die   cp -a /usr/bin/python$(mget-python-version)-m32 obj-${_mychost}/_virtualenv/bin || die
156   cp -a /usr/bin/python$(get_python_version)-m64 obj-${_mychost}/_virtualenv/bin || die   cp -a /usr/bin/python$(mget-python-version)-m64 obj-${_mychost}/_virtualenv/bin || die
157   fi   fi
158    
159   if [[ ${__MOZ_BRANDING} = magellan ]]   if [[ ${__MOZ_BRANDING} = magellan ]]
# Line 252  src_compile() Line 278  src_compile()
278   # enable default extensions   # enable default extensions
279   mozconf_add --enable-extensions=default   mozconf_add --enable-extensions=default
280    
281     # disable gconf
282     mozconf_add --disable-gconf
283   # gnome support (needs gnome-vfs)   # gnome support (needs gnome-vfs)
284   mozconf_add --disable-gnomevfs   mozconf_add --disable-gnomevfs
285   mozconf_add --enable-extension=-gnomevfs   mozconf_add --enable-extension=-gnomevfs
# Line 280  src_compile() Line 308  src_compile()
308   # resolve multiple --enable-extensions down to one   # resolve multiple --enable-extensions down to one
309   rebuild_extension_list   rebuild_extension_list
310    
311   MOZ_MAKE_FLAGS="${MAKEOPTS}" mmake -f client.mk || die   # shell export fixes some bugs in a chroot environment
312     # see: http://comments.gmane.org/gmane.linux.lfs.beyond.support/47450
313     MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" mmake -f client.mk || die
314  }  }
315    
316  src_install_firefox()  src_install_firefox()
# Line 288  src_install_firefox() Line 318  src_install_firefox()
318   cd ${SRCDIR}   cd ${SRCDIR}
319    
320   # install   # install
321   mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die   SHELL="${SHELL}" mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die
322    
323   # fix permissions   # fix permissions
324   mchown -R root:root /usr/$(mlibdir)/firefox || die   mchown -R root:root /usr/$(mlibdir)/firefox || die
# Line 327  src_install_firefox() Line 357  src_install_firefox()
357   # and symlink them (we need a defined location for the plugins of all browsers)   # and symlink them (we need a defined location for the plugins of all browsers)
358   mlink /usr/$(mlibdir)/nsbrowser/plugins /usr/$(mlibdir)/firefox/plugins || die   mlink /usr/$(mlibdir)/nsbrowser/plugins /usr/$(mlibdir)/firefox/plugins || die
359    
360   # fix missing binary   # fix duplicate binary
361   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
362   mlink firefox /usr/$(mlibdir)/firefox/firefox-bin || die   mlink firefox /usr/$(mlibdir)/firefox/firefox-bin || die
363    
# Line 347  src_install_firefox-sdk() Line 377  src_install_firefox-sdk()
377  {  {
378   cd ${SRCDIR}   cd ${SRCDIR}
379    
380   mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die   SHELL="${SHELL}" mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die
381   mchown -R root:root /usr/$(mlibdir)/firefox || die   mchown -R root:root /usr/$(mlibdir)/firefox || die
382    
383   # environment   # environment

Legend:
Removed from v.8410  
changed lines
  Added in v.8419