diff -Nru glew-2.0.0/debian/changelog glew-2.0.0/debian/changelog --- glew-2.0.0/debian/changelog 2017-08-24 19:30:01.000000000 +0000 +++ glew-2.0.0/debian/changelog 2019-03-20 13:24:28.000000000 +0000 @@ -1,3 +1,11 @@ +glew (2.0.0-5yavdr1~bionic) bionic; urgency=medium + + * add patch to fix header collisions in glew package + https://sources.debian.org/data/main/g/glew/2.1.0-4/debian/patches/0003-Fix_glex-moved-header.patch + + + -- Alexander Grothe Wed, 20 Mar 2019 14:24:28 +0100 + glew (2.0.0-5) unstable; urgency=medium * QA upload. diff -Nru glew-2.0.0/debian/patches/0003-Fix_glex-moved-header.patch glew-2.0.0/debian/patches/0003-Fix_glex-moved-header.patch --- glew-2.0.0/debian/patches/0003-Fix_glex-moved-header.patch 1970-01-01 00:00:00.000000000 +0000 +++ glew-2.0.0/debian/patches/0003-Fix_glex-moved-header.patch 2019-03-20 13:24:19.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Fix for glext.h colllision due to moved header +Author: Alastair McKinstry +Bug-Origin: https://github.com/nigels-com/glew/pull/198/commits/d6c2c3b9ca52af697088f280c30fe5b27f7a694f +Last-Updated: 2018-12-04 +Forwarded: not-needed + +Index: glew-2.1.0/auto/src/glew_head.h +=================================================================== +--- glew-2.1.0.orig/auto/src/glew_head.h ++++ glew-2.1.0/auto/src/glew_head.h +@@ -14,7 +14,7 @@ + #if defined(__REGAL_H__) + #error Regal.h included before glew.h + #endif +-#if defined(__glext_h_) || defined(__GLEXT_H_) ++#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) + #error glext.h included before glew.h + #endif + #if defined(__gl_ATI_h_) +@@ -30,6 +30,7 @@ + #define __X_GL_H + #define __glext_h_ + #define __GLEXT_H_ ++#define __gl_glext_h_ + #define __gl_ATI_h_ + + #if defined(_WIN32) +Index: glew-2.1.0/include/GL/glew.h +=================================================================== +--- glew-2.1.0.orig/include/GL/glew.h ++++ glew-2.1.0/include/GL/glew.h +@@ -72,7 +72,7 @@ + ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + ** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++,** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + ** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + */ +@@ -93,7 +93,7 @@ + #if defined(__REGAL_H__) + #error Regal.h included before glew.h + #endif +-#if defined(__glext_h_) || defined(__GLEXT_H_) ++#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) + #error glext.h included before glew.h + #endif + #if defined(__gl_ATI_h_) +@@ -108,6 +108,7 @@ + #define __REGAL_H__ + #define __X_GL_H + #define __glext_h_ ++#define __gl_glext_h_ + #define __GLEXT_H_ + #define __gl_ATI_h_ + diff -Nru glew-2.0.0/debian/patches/series glew-2.0.0/debian/patches/series --- glew-2.0.0/debian/patches/series 2017-08-24 18:45:32.000000000 +0000 +++ glew-2.0.0/debian/patches/series 2019-03-20 13:22:15.000000000 +0000 @@ -1,2 +1,3 @@ 0001-Fix_FTBFS_on_kFreeBSD.patch 0002-Fix_pkgconfig_path.patch +0003-Fix_glex-moved-header.patch