Commit b9d13f63 authored by Chaoting Liu's avatar Chaoting Liu

firefox: update to 65.0

parent e354c98a
Pipeline #2363 failed with stages
in 45 minutes and 10 seconds
......@@ -4,15 +4,9 @@ Add ability to use system-harfbuzz instead of bundled.
https://bugzilla.mozilla.org/show_bug.cgi?id=847568
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
@@ -1228,16 +1228,23 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
'utils/TypeHelpers.h',
'utils/Unicode.h',
'utils/Vector.h',
'utils/VectorImpl.h',
'vr/gvr/capi/include/gvr_controller.h',
@@ -1234,6 +1234,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
'vr/gvr/capi/include/gvr.h',
]
......@@ -26,20 +20,9 @@ diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
if CONFIG['MOZ_JACK']:
system_headers += [
'jack/jack.h',
'jack/statistics.h',
]
if CONFIG['MOZ_SYSTEM_JPEG']:
system_headers += [
diff --git a/dom/base/moz.build b/dom/base/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -477,16 +477,19 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
DEFINES['HAVE_SIDEBAR'] = True
@@ -506,6 +506,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
if CONFIG['MOZ_X11']:
CXXFLAGS += CONFIG['TK_CFLAGS']
......@@ -49,20 +32,9 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build
GENERATED_FILES += [
'PropertyUseCounterMap.inc',
'UseCounterList.h',
]
countermap = GENERATED_FILES['PropertyUseCounterMap.inc']
countermap.script = 'gen-usecounters.py:property_map'
countermap.inputs = ['UseCounters.conf']
diff --git a/gfx/moz.build b/gfx/moz.build
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -5,26 +5,28 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
with Files('**'):
BUG_COMPONENT = ('Core', 'Graphics')
@@ -10,6 +10,9 @@ with Files('**'):
if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo']
......@@ -72,9 +44,7 @@ diff --git a/gfx/moz.build b/gfx/moz.build
DIRS += [
'2d',
'ycbcr',
'angle',
'src',
'qcms',
@@ -19,7 +22,6 @@ DIRS += [
'gl',
'layers',
'graphite2/src',
......@@ -82,20 +52,9 @@ diff --git a/gfx/moz.build b/gfx/moz.build
'ots/src',
'thebes',
'ipc',
'vr',
'config',
'webrender_bindings',
]
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -143,16 +143,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
CXXFLAGS += [
'-Wno-implicit-fallthrough',
'-Wno-inconsistent-missing-override',
'-Wno-macro-redefined',
@@ -138,6 +138,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
'-Wno-unused-private-field',
]
......@@ -105,20 +64,9 @@ diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -817,16 +817,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
CXXFLAGS += [
'-Wno-implicit-fallthrough',
'-Wno-inconsistent-missing-override',
'-Wno-macro-redefined',
@@ -818,6 +818,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
'-Wno-unused-private-field',
]
......@@ -128,20 +76,9 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -285,14 +285,17 @@
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
@@ -278,6 +278,9 @@ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
DEFINES['GRAPHITE2_STATIC'] = True
......@@ -151,18 +88,9 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
if CONFIG['CC_TYPE'] == 'clang':
# Suppress warnings from Skia header files.
SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
if CONFIG['CC_TYPE'] == 'clang-cl':
AllowCompilerWarnings() # workaround for bug 1090497
diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -20,9 +20,12 @@ UNIFIED_SOURCES += [
'ICUUtils.cpp',
'IrishCasing.cpp',
'nsBidiUtils.cpp',
'nsSpecialCasingData.cpp',
'nsUnicharUtils.cpp',
@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
'nsUnicodeProperties.cpp',
]
......@@ -170,15 +98,9 @@ diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
FINAL_LIBRARY = 'xul'
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -67,12 +67,15 @@ etld_data = GENERATED_FILES['etld_data.i
etld_data.script = 'prepare_tlds.py'
etld_data.inputs = ['effective_tld_names.dat']
# need to include etld_data.inc
LOCAL_INCLUDES += [
@@ -75,6 +75,9 @@ LOCAL_INCLUDES += [
'/netwerk/base',
]
......@@ -188,39 +110,21 @@ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
USE_LIBS += ['icu']
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -233,16 +233,19 @@ if CONFIG['SERVO_TARGET_DIR']:
OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']
if CONFIG['MOZ_SYSTEM_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
if CONFIG['MOZ_SYSTEM_PNG']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS']
@@ -217,6 +217,9 @@ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
if CONFIG['MOZ_LIB_SECRET']:
OS_LIBS += CONFIG['MOZ_LIB_SECRET_LIBS']
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
+
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
if CONFIG['MOZ_SYSTEM_LIBVPX']:
OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
if CONFIG['MOZ_SYSTEM_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
if not CONFIG['MOZ_TREE_PIXMAN']:
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -331,16 +331,26 @@ def freetype2_combined_info(fontconfig_i
return namespace(
cflags=freetype2_info.cflags + fontconfig_info.cflags,
libs=freetype2_info.libs + fontconfig_info.libs,
)
@@ -340,6 +340,16 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
add_old_configure_assignment('_HAVE_FREETYPE2',
depends_if(freetype2_info)(lambda _: True))
......@@ -237,8 +141,3 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
# Apple platform decoder support
# ==============================================================
@depends(toolkit)
def applemedia(toolkit):
if toolkit in ('cocoa', 'uikit'):
return True
set_config('MOZ_APPLEMEDIA', applemedia)
......@@ -4,15 +4,9 @@ Allow building against system-wide graphite2.
https://bugzilla.mozilla.org/show_bug.cgi?id=847568
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
@@ -1235,16 +1235,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
system_headers += [
'harfbuzz/hb-glib.h',
'harfbuzz/hb-ot.h',
@@ -1241,6 +1241,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
'harfbuzz/hb.h',
]
......@@ -25,15 +19,9 @@ diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
if CONFIG['MOZ_JACK']:
system_headers += [
'jack/jack.h',
'jack/statistics.h',
]
if CONFIG['MOZ_SYSTEM_JPEG']:
system_headers += [
diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
--- a/gfx/graphite2/moz-gr-update.sh
+++ b/gfx/graphite2/moz-gr-update.sh
@@ -1,11 +1,12 @@
@@ -1,6 +1,7 @@
#!/bin/bash
# Script used to update the Graphite2 library in the mozilla source tree
......@@ -41,17 +29,7 @@ diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
# This script lives in gfx/graphite2, along with the library source,
# but must be run from the top level of the mozilla-central tree.
# Run as
#
# ./gfx/graphite2/moz-gr-update.sh RELEASE
#
@@ -32,22 +33,26 @@ echo "This directory contains the Graphi
echo "$TARBALL" >> gfx/graphite2/README.mozilla
echo ""
echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
# fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h)
@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
......@@ -69,20 +47,9 @@ diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
echo
echo If gfx/graphite2/src/files.mk has changed, please make corresponding
echo changes to gfx/graphite2/src/moz.build
echo
echo
echo Now use hg commands to create a patch for the mozilla tree.
diff --git a/gfx/moz.build b/gfx/moz.build
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -5,28 +5,30 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
with Files('**'):
BUG_COMPONENT = ('Core', 'Graphics')
@@ -10,6 +10,9 @@ with Files('**'):
if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo']
......@@ -92,11 +59,7 @@ diff --git a/gfx/moz.build b/gfx/moz.build
if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
DIRS += ['harfbuzz/src']
DIRS += [
'2d',
'ycbcr',
'angle',
'src',
@@ -21,7 +24,6 @@ DIRS += [
'qcms',
'gl',
'layers',
......@@ -104,20 +67,9 @@ diff --git a/gfx/moz.build b/gfx/moz.build
'ots/src',
'thebes',
'ipc',
'vr',
'config',
'webrender_bindings',
]
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -279,16 +279,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
@@ -276,7 +276,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
......@@ -129,22 +81,13 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
if CONFIG['CC_TYPE'] == 'clang':
# Suppress warnings from Skia header files.
SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
diff --git a/old-configure.in b/old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -3857,16 +3857,37 @@ if test "$USE_FC_FREETYPE"; then
CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
[AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include <fontconfig/fontconfig.h>])
CPPFLAGS="$_SAVE_CPPFLAGS"
@@ -3645,6 +3645,27 @@ if test "$USE_FC_FREETYPE"; then
fi
fi
dnl ========================================================
+dnl ========================================================
+dnl Check for graphite2
+dnl ========================================================
+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
......@@ -165,47 +108,24 @@ diff --git a/old-configure.in b/old-configure.in
+ CFLAGS=$_SAVE_CFLAGS
+fi
+
+dnl ========================================================
dnl Check if we need the 32-bit Linux SSE2 error dialog
dnl ========================================================
AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
dnl ========================================================
dnl Check for pixman and cairo
dnl Check if we need the 32-bit Linux SSE2 error dialog
dnl ========================================================
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -236,16 +236,19 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
if CONFIG['MOZ_SYSTEM_PNG']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS']
if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
@@ -217,6 +217,9 @@ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
if CONFIG['MOZ_LIB_SECRET']:
OS_LIBS += CONFIG['MOZ_LIB_SECRET_LIBS']
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
+
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
if CONFIG['MOZ_SYSTEM_LIBVPX']:
OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
if not CONFIG['MOZ_TREE_PIXMAN']:
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -331,16 +331,30 @@ def freetype2_combined_info(fontconfig_i
return namespace(
cflags=freetype2_info.cflags + fontconfig_info.cflags,
libs=freetype2_info.libs + fontconfig_info.libs,
)
@@ -340,6 +340,20 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
add_old_configure_assignment('_HAVE_FREETYPE2',
depends_if(freetype2_info)(lambda _: True))
......@@ -226,8 +146,3 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
# HarfBuzz
# ==============================================================
option('--with-system-harfbuzz',
help="Use system harfbuzz (located with pkgconfig)")
system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.2',
when='--with-system-harfbuzz')
pkgname=firefox-kde
pkgver=64.0.2
pkgver=65.0
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('x86_64')
......@@ -10,7 +10,7 @@ depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib als
kio knotifications kwindowsystem ki18n)
makedepends=(unzip zip diffutils python2 yasm mesa imake libpulse inetutils xorg-server-xvfb
autoconf2.13 gtk2 gobject-introspection jack rust gconf
cmake extra-cmake-modules llvm clang lld cbindgen nodejs)
cmake extra-cmake-modules llvm clang lld cbindgen nodejs nasm)
optdepends=('networkmanager: Location detection via available WiFi networks'
'libnotify: Notification integration'
'upower: Battery API'
......@@ -34,22 +34,27 @@ replaces=('kmozillahelper')
#
# Usually, we also port non-openSUSE specific patch together.
#
_patchrev=821cfbe8efcc
_kmozillahelper_commit=2ca28e0 #v5.0.2
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
_kdepatchrev=87f893cf45b9
_kdepatchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_kdepatchrev
_ubuntuver=build2-0ubuntu0.14.04.1
#_ubuntupatchurl=http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_${pkgver}+${_ubuntuver}.debian.tar.xz # no TLS @2019, really?
#_gentoopatch=https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz
source=("https://releases.mozilla.org/pub/firefox/releases/${pkgver}/source/${pkgname%%-kde}-${pkgver}.source.tar.xz"
"git://github.com/openSUSE/kmozillahelper#commit=${_kmozillahelper_commit}"
'firefox.desktop' 'ddg.xml'
'pgo-fix-missing-kdejs.patch'
# Firefox patchset
"$_patchurl/firefox-kde.patch"
"$_patchurl/firefox-branded-icons.patch"
"$_kdepatchurl/firefox-kde.patch"
"$_kdepatchurl/firefox-branded-icons.patch"
# Gecko/toolkit patchset
"$_patchurl/mozilla-nongnome-proxies.patch"
"$_patchurl/mozilla-kde.patch"
"$_patchurl/mozilla-openaes-decl.patch"
"$_kdepatchurl/mozilla-nongnome-proxies.patch"
"$_kdepatchurl/mozilla-kde.patch"
"$_kdepatchurl/mozilla-openaes-decl.patch"
# Gentoo patch
1003_foritify_sources_properly.patch
......@@ -57,7 +62,7 @@ source=("https://releases.mozilla.org/pub/firefox/releases/${pkgver}/source/${pk
2001_system_graphite2_support.patch
# Ubuntu patch
unity-menubar.patch
"http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_${pkgver}+${_ubuntuver}.debian.tar.xz"
# Unused patchset
#"$_patchurl/gecko-lockdown.patch"
......@@ -71,20 +76,20 @@ source=("https://releases.mozilla.org/pub/firefox/releases/${pkgver}/source/${pk
# mozilla-ntlm-full-path.patch: not affected it seems
# mozilla-reduce-files-per-UnifiedBindings.patch
)
sha256sums=('34cf115a4eeb4d73f7199396bb3a5d5843c8c455eae4213bf451c4db88768f1f'
sha256sums=('75b1b14605d63e8c83b60e0a4020cdb75b8671fb646959da865cbead0c2b466d'
'SKIP'
'6c2ea431c36afef67710547ae67e81975254309e9e1c82d8312f765caa950fe5'
'1190f251471305f4c96a313b32aa66ee1549125300d7ce385356f45bd8ebcb3d'
'7c3b3079e587fb5c7fd8725b4677efb270355c03c8d16513bbe619903038381e'
'933fbd3e32b68d5096a2b516f190eba7ec718bb57a089ef8b057404369efba63'
'eefe8c6d061cce4ea6e357d01f9f764aff198ddd06ff47991e10d1e8ddfc59a3'
'29acfc63f366510f471e395cc7a3815108072abda5851c48b64fdb894550408c'
'ef0f90c9134ef05b950f06a3ffbd699c2e5a5f99a4cdf9868e799534d68c204f'
'52e6ad9d35efb3a1487f511bfe69dc0a60edc682bd5aeb1e74ee615270670273'
'fa3222d3bc8b14b82b58a8ac2b252fdbd41768a5234d334538a1a3c703a3a73d'
'4fc2ff5a197781aff9733f6fe99c99c529eae4eb1ec5a95ef1db0a3d5529b88e'
'be7aa94f682dcb0feec3dd7c277d5d19e3c56fe3d4940203c942bbbefad6ed70'
'e5d8f0410ecd05119119e2d44a88fb5f1eb67a5b1035fd0a66b8cf167fb81c5d'
'e72782d0fc5a4b1ef5d9bdaaad4631b686e4b6a89f6b511327c48cb4096d1e08'
'4c75f71ba636934ded24eecb3a81f5ba6583e88db2dd9025c842aefc9c8ef216'
'18d37f79d6919d26c7f581f4c0025b556ced05362749be29af118da05f3cfb51')
'21949f918907e16919820784bfb51540714c7bb256e219a3d965387b14b18886'
'8afb2dbc729487aaf6e43e0ce0e86fb51c6f0bd27c3b6580dbb0c431c1cf9aa0'
'b8e97e3d2d5044f1c32eed9e7f61427693ac2142dbe4570fa017d7f66add04b9')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
......@@ -165,7 +170,7 @@ ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
ac_add_options --with-system-nss
ac_add_options --with-system-nspr
ac_add_options --with-system-icu
#ac_add_options --with-system-icu
ac_add_options --with-system-png
ac_add_options --enable-system-pixman
ac_add_options --enable-system-sqlite
......@@ -201,7 +206,7 @@ END
patch -Np1 -i $srcdir/2001_system_graphite2_support.patch
msg "Ubuntu Patchset"
patch -Np1 -i $srcdir/unity-menubar.patch
patch -Np1 -i $srcdir/debian/patches/unity-menubar.patch
}
build() {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment