diff --git a/download.lst b/download.lst index da5edd07439e..56dad95b1e3f 100644 --- a/download.lst +++ b/download.lst @@ -57,7 +57,7 @@ export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1. export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 -export GLM_TARBALL := f070164b78c643431abbc1a97a6d0211-glm-0.9.4.6.zip +export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz diff --git a/glm/UnpackedTarball_glm.mk b/glm/UnpackedTarball_glm.mk index 99c5776767b4..e115bff8f168 100644 --- a/glm/UnpackedTarball_glm.mk +++ b/glm/UnpackedTarball_glm.mk @@ -13,14 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) -ifeq ($(OS),WNT) -$(eval $(call gb_UnpackedTarball_add_patches,glm,\ - glm/Wshadow-windows.patch \ -)) -else -$(eval $(call gb_UnpackedTarball_add_patches,glm,\ - glm/Wshadow-unix.patch \ -)) -endif - # vim: set noet sw=4 ts=4: