[forge] 07/08: merge patched into master

[Ghislain Vaillant]

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

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

commit a5f5cd7da958d1d7327c95cd530aab6b0a9af89b
Merge: 6fe76ae 60e7d97
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 4 20:36:47 2017 +0000

    merge patched into master

 debian/.git-dpm                               |  4 +-
 debian/patches/0004-Fix-spelling-errors.patch | 54 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 src/backend/opengl/font_impl.cpp              |  2 +-
 src/backend/opengl/glfw/window.cpp            |  4 +-
 src/backend/opengl/sdl/window.cpp             |  4 +-
 6 files changed, 62 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index fb3b5e2,0000000..db223a3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- b8e7216e694ee86983f6a8760b7fffa592aed4c0
- b8e7216e694ee86983f6a8760b7fffa592aed4c0
++60e7d97b365789f40cb22734e212ed745c0fd0c9
++60e7d97b365789f40cb22734e212ed745c0fd0c9
 +d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
 +d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
 +forge_0.9.2.orig.tar.gz
 +dfea07522a1c8fb622b83fd2bcfe5924f73bd90c
 +735452
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Fix-spelling-errors.patch
index 0000000,0000000..50dad23
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Fix-spelling-errors.patch
@@@ -1,0 -1,0 +1,54 @@@
++From 60e7d97b365789f40cb22734e212ed745c0fd0c9 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Wed, 4 Jan 2017 20:35:07 +0000
++Subject: Fix spelling errors
++
++---
++ src/backend/opengl/font_impl.cpp   | 2 +-
++ src/backend/opengl/glfw/window.cpp | 4 ++--
++ src/backend/opengl/sdl/window.cpp  | 4 ++--
++ 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
++--- 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)
++     bError = FT_New_Face(library, mTTFfile.c_str(), 0, &face);
++     if (bError) {
++         FT_Done_FreeType(library);
++-        FT_THROW_ERROR("Freetype face initilization", FG_ERR_FREETYPE_ERROR);
+++        FT_THROW_ERROR("Freetype face initialization", FG_ERR_FREETYPE_ERROR);
++     }
++     /* 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
++--- 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;
++ 
++     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
++--- 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;
++ 
++     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 --cc debian/patches/series
index 59bad9e,0000000..968b130
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +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