download.lst | 2 +- glm/UnpackedTarball_glm.mk | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-)
New commits: commit 37fddafcd0aa8ac221dbffdba9a06636ad6486f3 Author: Markus Mohrhard <[email protected]> Date: Tue Dec 10 11:29:59 2013 +0100 I give up on patching glm I integrated the patches into the zip file and provide a patched version on the TDF servers. Change-Id: I54a042cb75ba729a379e0c841404465a695fb75d diff --git a/download.lst b/download.lst index 94232ae..53c55f2 100644 --- a/download.lst +++ b/download.lst @@ -44,7 +44,7 @@ export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-f export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 export GRAPHITE_TARBALL := 7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz -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 99c5776..e115bff 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: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
