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 8435 by niro, Wed Jan 27 10:24:35 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     >= dev-libs/icu-56.1
21   >= media-libs/fontconfig-2.11   >= media-libs/fontconfig-2.11
22   >= media-libs/libjpeg-8   >= media-libs/libjpeg-8
23   >= media-libs/libpng-1.5   >= media-libs/libpng-1.5
# Line 34  FIREFOX_DEPEND=">= x11-libs/libXrender-0 Line 35  FIREFOX_DEPEND=">= x11-libs/libXrender-0
35   >= media-fonts/corefonts-2   >= media-fonts/corefonts-2
36   >= dev-db/sqlite-3.10   >= dev-db/sqlite-3.10
37   >= dev-libs/libffi-3.2   >= dev-libs/libffi-3.2
38   >= x11-libs/pixman-0.32"   >= x11-libs/pixman-0.32
39     >= sys-libs/libatomic-5.3
40     >= sys-libs/libgcc-5.3
41     >= sys-libs/libstdc++-5.3"
42  # >= x11-libs/startup-notification-0.12  # >= x11-libs/startup-notification-0.12
43  # >= app-text/hunspell-1.3  # >= app-text/hunspell-1.3
44    
45    ALX_DEV_DEPEND=">= dev-libs/nspr-dev-4.11
46     >= dev-libs/nss-dev-3.21
47     >= dev-libs/expat-dev-2
48     >= sys-libs/zlib-dev-1.2
49     >= sys-apps/dbus-dev-1.10
50     >= dev-libs/icu-dev-56.1
51     >= media-libs/fontconfig-dev-2.11
52     >= media-libs/libjpeg-dev-8
53     >= media-libs/libpng-dev-1.5
54     >= media-libs/alsa-lib-dev-1.1
55     >= media-libs/libogg-dev-1.3
56     >= dev-libs/glib2-dev-2.46
57     >= dev-libs/libidl-dev-0.8.14
58     >= app-arch/unzip-dev-6
59     >= x11-libs/pango-dev-1.38
60     >= x11-libs/cairo-dev-1.14
61     >= x11-libs/gtk2+-dev-2.24
62     >= x11-libs/libnotify-dev-0.7
63     >= dev-db/sqlite-dev-3.10
64     >= dev-libs/libffi-dev-3.2
65     >= x11-libs/pixman-dev-0.32
66     >= sys-libs/libatomic-dev-5.3
67     >= sys-libs/libgcc-dev-5.3
68     >= sys-libs/libstdc++-dev-5.3"
69    
70  SDEPEND="${FIREFOX_DEPEND}  SDEPEND="${FIREFOX_DEPEND}
71   >= x11-proto/xineramaproto-1   >= x11-proto/xineramaproto-1
72   >= x11-proto/compositeproto-0.4   >= x11-proto/compositeproto-0.4
# Line 46  SDEPEND="${FIREFOX_DEPEND} Line 75  SDEPEND="${FIREFOX_DEPEND}
75   >= sys-dev/automake-4   >= sys-dev/automake-4
76   >= virtual/sed   >= virtual/sed
77   >= app-arch/zip-3   >= app-arch/zip-3
78   >= dev-lang/yasm-1.2"   >= dev-lang/yasm-1.3
79     ${ALX_DEV_DEPEND}"
80    
81  SRCFILE="${PNAME}-${PVER}.source.tar.xz"  SRCFILE="${PNAME}-${PVER}.source.tar.xz"
82  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
83    
84  sminclude mozilla mtools cleanutils python  sminclude mozilla mtools cleanutils python gtk2
85    
86  SRC_URI=(  SRC_URI=(
87   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 123  export CXXFLAGS="${CFLAGS}"
123  # needed to build without warnings on gcc-3  # needed to build without warnings on gcc-3
124  export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"  export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
125    
126    # enforce pic and pie
127    export CFLAGS="${CFLAGS} -fPIC -pie"
128    export CXXFLAGS="${CXXFLAGS} -fPIC -pie"
129    
130  # setup branding  # setup branding
131  # nightly, aurora, official, unofficial, magellan  # nightly, aurora, official, unofficial, magellan
132  __MOZ_BRANDING="magellan"  __MOZ_BRANDING="magellan"
# Line 126  src_prepare() Line 160  src_prepare()
160   install -d obj-${_mychost}/_virtualenv/bin || die   install -d obj-${_mychost}/_virtualenv/bin || die
161   cp -a /usr/bin/python-m32 obj-${_mychost}/_virtualenv/bin || die   cp -a /usr/bin/python-m32 obj-${_mychost}/_virtualenv/bin || die
162   cp -a /usr/bin/python-m64 obj-${_mychost}/_virtualenv/bin || die   cp -a /usr/bin/python-m64 obj-${_mychost}/_virtualenv/bin || die
163   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
164   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
165   fi   fi
166    
167   if [[ ${__MOZ_BRANDING} = magellan ]]   if [[ ${__MOZ_BRANDING} = magellan ]]
# Line 147  src_compile() Line 181  src_compile()
181  {  {
182   cd ${SRCDIR}   cd ${SRCDIR}
183    
184     # fix issues with --as-needed enabled
185     #export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
186    
187     # fix issues with missing -latomic
188     export LDFLAGS+=" -latomic"
189    
190   # setup .mozconfig   # setup .mozconfig
191   cp browser/config/mozconfig .mozconfig || die   cp browser/config/mozconfig .mozconfig || die
192    
# Line 203  src_compile() Line 243  src_compile()
243   mozconf_add --enable-system-sqlite   mozconf_add --enable-system-sqlite
244   mozconf_add --enable-system-ffi   mozconf_add --enable-system-ffi
245   mozconf_add --enable-system-pixman   mozconf_add --enable-system-pixman
246     mozconf_add --with-system-icu
247     mozconf_add --enable-intl-api
248    
249   # enable cairo-gtk2 as default   # enable cairo-gtk2 as default
250   mozconf_add --enable-default-toolkit=cairo-gtk2   mozconf_add --enable-default-toolkit=cairo-gtk2
# Line 223  src_compile() Line 265  src_compile()
265   #mozconf_add --enable-system-cairo # cairo-1.12 fails atm   #mozconf_add --enable-system-cairo # cairo-1.12 fails atm
266   mozconf_add --enable-svg   mozconf_add --enable-svg
267   mozconf_add --enable-canvas   mozconf_add --enable-canvas
268    
269   # enable all image encoders   # enable all image encoders
270   mozconf_add --enable-image-encoder=all   mozconf_add --enable-image-encoder=all
271    
# Line 252  src_compile() Line 294  src_compile()
294   # enable default extensions   # enable default extensions
295   mozconf_add --enable-extensions=default   mozconf_add --enable-extensions=default
296    
297     # disable gconf
298     mozconf_add --disable-gconf
299     # disable gnome
300     mozconf_add --disable-gnomeui
301   # gnome support (needs gnome-vfs)   # gnome support (needs gnome-vfs)
302   mozconf_add --disable-gnomevfs   mozconf_add --disable-gnomevfs
303   mozconf_add --enable-extension=-gnomevfs   mozconf_add --enable-extension=-gnomevfs
# Line 275  src_compile() Line 321  src_compile()
321   # enable libalsa and ogg   # enable libalsa and ogg
322   mozconf_add --enable-ogg   mozconf_add --enable-ogg
323   mozconf_add --enable-wave   mozconf_add --enable-wave
324     mozconf_add --disable-pulseaudio
325   mozconf_add --disable-gstreamer   mozconf_add --disable-gstreamer
326    
327   # resolve multiple --enable-extensions down to one   # resolve multiple --enable-extensions down to one
328   rebuild_extension_list   rebuild_extension_list
329    
330   MOZ_MAKE_FLAGS="${MAKEOPTS}" mmake -f client.mk || die   # shell export fixes some bugs in a chroot environment
331     # see: http://comments.gmane.org/gmane.linux.lfs.beyond.support/47450
332     MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" mmake -f client.mk || die
333  }  }
334    
335  src_install_firefox()  src_install_firefox()
# Line 288  src_install_firefox() Line 337  src_install_firefox()
337   cd ${SRCDIR}   cd ${SRCDIR}
338    
339   # install   # install
340   mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die   SHELL="${SHELL}" mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die
341    
342   # fix permissions   # fix permissions
343   mchown -R root:root /usr/$(mlibdir)/firefox || die   mchown -R root:root /usr/$(mlibdir)/firefox || die
# Line 327  src_install_firefox() Line 376  src_install_firefox()
376   # 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)
377   mlink /usr/$(mlibdir)/nsbrowser/plugins /usr/$(mlibdir)/firefox/plugins || die   mlink /usr/$(mlibdir)/nsbrowser/plugins /usr/$(mlibdir)/firefox/plugins || die
378    
379   # fix missing binary   # fix duplicate binary
380   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
381   mlink firefox /usr/$(mlibdir)/firefox/firefox-bin || die   mlink firefox /usr/$(mlibdir)/firefox/firefox-bin || die
382    
# Line 347  src_install_firefox-sdk() Line 396  src_install_firefox-sdk()
396  {  {
397   cd ${SRCDIR}   cd ${SRCDIR}
398    
399   mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die   SHELL="${SHELL}" mmake -j1 -f client.mk DESTDIR=${BINDIR} install || die
400   mchown -R root:root /usr/$(mlibdir)/firefox || die   mchown -R root:root /usr/$(mlibdir)/firefox || die
401    
402   # environment   # environment

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