[Libreoffice-commits] core.git: external/glew

[Tor Lillqvist]

 external/glew/UnpackedTarball_glew.mk |    6 ------
 external/glew/glew-ios.patch.1        |   19 -------------------
 2 files changed, 25 deletions(-)

New commits:
commit 158dca0e47d533ea0a532596061f794a4c24be91
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 17 18:40:22 2015 +0300

    This patch is upstream, too
    
    Change-Id: I8a8d78b291c4b1fb6f0ef5d97cfae7c6a6ceaf64

diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk
index 0c86057..3b1a5a1 100644
--- a/external/glew/UnpackedTarball_glew.mk
+++ b/external/glew/UnpackedTarball_glew.mk
@@ -35,12 +35,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,glew,\
 ))
 endif
 
-ifeq ($(OS),IOS)
-$(eval $(call gb_UnpackedTarball_add_patches,glew,\
-	external/glew/glew-ios.patch.1 \
-))
-endif
-
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,glew,\
 	external/glew/glew-static-only.patch.1 \
diff --git a/external/glew/glew-ios.patch.1 b/external/glew/glew-ios.patch.1
deleted file mode 100644
index b29f75b..0000000
--- a/external/glew/glew-ios.patch.1
+++ /dev/null
@@ -1,19 +0,0 @@
--*- Mode:Diff -*-
---- glew/include/GL/glew.h
-+++ glew/include/GL/glew.h
-@@ -1180,6 +1180,15 @@
- 
- /* ---------------------------------- GLU ---------------------------------- */
- 
-+#ifndef GLEW_NO_GLU
-+#  ifdef __APPLE__
-+#    include <Availability.h>
-+#    if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
-+#      define GLEW_NO_GLU
-+#    endif
-+#  endif
-+#endif
-+
- #ifndef GLEW_NO_GLU
- /* this is where we can safely include GLU */
- #  if defined(__APPLE__) && defined(__MACH__)