City officially adopts definition that is source of debate, with some activists saying it stifles free speech