[forge] 03/07: Rebase the patch queue

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Sat May 20 13:23:24 UTC 2017 

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch experimental
in repository forge.

commit a053db65fa785839ccf174ef70eff5952a422315
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sat May 20 13:57:32 2017 +0100

    Rebase the patch queue
    
    - Drop 0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch,
      applied upstream
    - Refresh 0004-Fix-spelling-errors.patch
    
    Gbp-Dch: full
---
 ...definition-of-USE_SYSTEM-flags-for-glbind.patch | 71 ----------------------
 debian/patches/0004-Fix-spelling-errors.patch      | 24 ++++----
 debian/patches/series                              |  1 -
 3 files changed, 12 insertions(+), 84 deletions(-)

diff --git a/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch b/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
deleted file mode 100644
index 74b4ba5..0000000
--- a/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 28 Dec 2016 17:06:02 +0000
-Subject: Consistent definition of USE_SYSTEM flags for glbinding,
- glm and freetype
-
----
- CMakeLists.txt                    |  5 -----
- src/backend/opengl/CMakeLists.txt | 25 ++++++++-----------------
- 2 files changed, 8 insertions(+), 22 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c3ef45f..1c0c591 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,11 +11,6 @@ SET_PROPERTY(CACHE USE_WINDOW_TOOLKIT PROPERTY STRINGS "glfw3" "sdl2")
- OPTION(BUILD_DOCUMENTATION "Build Documentation" OFF)
- OPTION(BUILD_EXAMPLES "Build Examples" ON)
- 
--OPTION(USE_LOCAL_GLM "Download and use local GLM" OFF)
--OPTION(USE_LOCAL_FREETYPE "Download and use local freetype" OFF)
--MARK_AS_ADVANCED(USE_LOCAL_GLM)
--MARK_AS_ADVANCED(USE_LOCAL_FREETYPE)
--
- # Set a default build type if none was specified
- IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-     SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
-diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
-index 1dd851d..fb570ba 100755
---- a/src/backend/opengl/CMakeLists.txt
-+++ b/src/backend/opengl/CMakeLists.txt
-@@ -1,9 +1,4 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
--# Prior to GLM 0.9.7.0, the package is found by the FindGLM.cmake module.
--# This was removed with GLM 0.9.7.0, instead a glm-config.cmake configuration
--# file is provided. Therefore, both FIND_PACKAGE calls are necessary.
--FIND_PACKAGE(GLM QUIET)
--FIND_PACKAGE(glm QUIET)
- 
- OPTION(USE_SYSTEM_GLBINDING "Use system glbinding" OFF)
- IF(USE_SYSTEM_GLBINDING)
-@@ -17,22 +12,18 @@ ENDIF(USE_SYSTEM_GLBINDING)
- 
- INCLUDE(GLSLtoH)
- 
--IF((NOT glm_FOUND AND NOT GLM_FOUND) OR (${USE_LOCAL_GLM}))
--  SET(USE_LOCAL_GLM ON)
--  MESSAGE(STATUS "Downloading GLM headers.")
--  INCLUDE(build_glm)
-+OPTION(USE_SYSTEM_GLM "Use the system GLM library" OFF)
-+IF(USE_SYSTEM_GLM)
-+  FIND_PACKAGE(glm REQUIRED)
- ELSE()
--  MESSAGE(STATUS "Using System GLM")
-+  INCLUDE(build_glm)
- ENDIF()
- 
--FIND_PACKAGE(Freetype QUIET)
--
--IF(NOT FREETYPE_FOUND OR ${USE_LOCAL_FREETYPE})
--  SET(USE_LOCAL_FREETYPE ON)
--  MESSAGE(STATUS "Downloading and building Freetype libraries.")
--  INCLUDE(build_freetype)
-+OPTION(USE_SYSTEM_FREETYPE "Use the system Freetype library" OFF)
-+IF(USE_SYSTEM_FREETYPE)
-+  FIND_PACKAGE(Freetype REQUIRED)
- ELSE()
--  MESSAGE(STATUS "Using System FreeType2")
-+  INCLUDE(build_freetype)
- ENDIF()
- 
- IF(UNIX)
diff --git a/debian/patches/0004-Fix-spelling-errors.patch b/debian/patches/0004-Fix-spelling-errors.patch
index 09101a6..7e9ba1e 100644
--- a/debian/patches/0004-Fix-spelling-errors.patch
+++ b/debian/patches/0004-Fix-spelling-errors.patch
@@ -9,10 +9,10 @@ Subject: Fix spelling errors
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/backend/opengl/font_impl.cpp b/src/backend/opengl/font_impl.cpp
-index a1be645..b88ab3f 100644
+index 4f74dbd..dc81b90 100644
 --- a/src/backend/opengl/font_impl.cpp
 +++ b/src/backend/opengl/font_impl.cpp
-@@ -87,7 +87,7 @@ void font_impl::loadAtlasWithGlyphs(const size_t pFontSize)
+@@ -93,7 +93,7 @@ void font_impl::loadAtlasWithGlyphs(const size_t pFontSize)
      bError = FT_New_Face(library, mTTFfile.c_str(), 0, &face);
      if (bError) {
          FT_Done_FreeType(library);
@@ -22,32 +22,32 @@ index a1be645..b88ab3f 100644
      /* Select charmap */
      bError = FT_Select_Charmap(face, FT_ENCODING_UNICODE);
 diff --git a/src/backend/opengl/glfw/window.cpp b/src/backend/opengl/glfw/window.cpp
-index d358291..216b9e1 100644
+index a079849..779f790 100644
 --- a/src/backend/opengl/glfw/window.cpp
 +++ b/src/backend/opengl/glfw/window.cpp
-@@ -46,8 +46,8 @@ Widget::Widget(int pWidth, int pHeight, const char* pTitle, const Widget* pWindo
-     mFramePBO   = 0;
- 
+@@ -34,8 +34,8 @@ namespace wtk
+ void initWindowToolkit()
+ {
      if (!glfwInit()) {
 -        std::cerr << "ERROR: GLFW wasn't able to initalize\n";
 -        GLFW_THROW_ERROR("GLFW initilization failed", FG_ERR_GL_ERROR);
 +        std::cerr << "ERROR: GLFW wasn't able to initialize\n";
 +        GLFW_THROW_ERROR("GLFW initialization failed", FG_ERR_GL_ERROR);
      }
+ }
  
-     auto wndErrCallback = [](int errCode, const char* pDescription)
 diff --git a/src/backend/opengl/sdl/window.cpp b/src/backend/opengl/sdl/window.cpp
-index d4f7b91..679cb77 100644
+index 8d1150d..36d9407 100644
 --- a/src/backend/opengl/sdl/window.cpp
 +++ b/src/backend/opengl/sdl/window.cpp
-@@ -43,8 +43,8 @@ Widget::Widget(int pWidth, int pHeight, const char* pTitle, const Widget* pWindo
-     mFramePBO   = 0;
- 
+@@ -31,8 +31,8 @@ namespace wtk
+ void initWindowToolkit()
+ {
      if (SDL_Init(SDL_INIT_VIDEO) < 0) {
 -        std::cerr << "ERROR: SDL wasn't able to initalize\n";
 -        SDL_THROW_ERROR("SDL initilization failed", FG_ERR_GL_ERROR);
 +        std::cerr << "ERROR: SDL wasn't able to initialize\n";
 +        SDL_THROW_ERROR("SDL initialization failed", FG_ERR_GL_ERROR);
      }
+ }
  
-     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
diff --git a/debian/patches/series b/debian/patches/series
index 968b130..1667a0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Use-system-MathJax.patch
 0002-No-version-queries-with-Git.patch
-0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
 0004-Fix-spelling-errors.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/forge.git

More information about the debian-science-commits mailing list