--- a/mozilla-shared-nss-db.patch	Wed Jan 18 22:06:23 2017 +0100
+++ b/mozilla-shared-nss-db.patch	Fri Jan 20 23:56:59 2017 +0100
@@ -7,13 +7,13 @@
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -6495,16 +6495,31 @@ if test "$MOZ_ENABLE_SKIA"; then
-     AC_DEFINE(USE_SKIA_GPU)
-     AC_SUBST(MOZ_ENABLE_SKIA_GPU)
-   fi
- fi
- AC_SUBST(MOZ_ENABLE_SKIA)
- AC_SUBST_LIST(SKIA_INCLUDES)
+@@ -5358,16 +5358,31 @@ esac
+ 
+ AC_SUBST(MOZ_TREE_CAIRO)
+ AC_SUBST_LIST(MOZ_CAIRO_CFLAGS)
+ AC_SUBST_LIST(MOZ_CAIRO_LIBS)
+ AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
+ AC_SUBST(MOZ_TREE_PIXMAN)
  
  dnl ========================================================
 +dnl Check for nss-shared-helper
@@ -42,7 +42,7 @@
 diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build
 --- a/security/manager/ssl/moz.build
 +++ b/security/manager/ssl/moz.build
-@@ -159,16 +159,19 @@ if CONFIG['MOZ_XUL']:
+@@ -160,16 +160,19 @@ if CONFIG['MOZ_XUL']:
      ]
  
  UNIFIED_SOURCES += [
@@ -87,7 +87,7 @@
  #include "SharedSSLState.h"
  #include "cert.h"
  #include "certdb.h"
-@@ -1491,17 +1498,31 @@ nsNSSComponent::InitializeNSS()
+@@ -1702,17 +1709,31 @@ nsNSSComponent::InitializeNSS()
        return rv;
      }
    }
@@ -122,14 +122,14 @@
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -209,16 +209,18 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
-     OS_LIBS += [
-         'rt',
-     ]
+@@ -220,16 +220,18 @@ OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
  
- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- OS_LIBS += CONFIG['MOZ_SERVO_LIBS']
+ if CONFIG['SERVO_TARGET_DIR']:
+     if CONFIG['_MSC_VER']:
+         OS_LIBS += ['%s/geckoservo' % CONFIG['SERVO_TARGET_DIR']]
+     else:
+         OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']
  
 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
 +