Package: mmpong Version: 0.9.1-1 Followup-For: Bug #642144 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * d/patches/02_cegui-mk2-0.7.5.dpatch: - client_gl/gui.h: Update for new header file name and location. - client_gl/gui.cpp: Port API usage from 0.6.x -> 0.7.x Debian unstable now has cegui-mk2 0.7.5; this patch ports mmpong to use the new header locations and API changes in this library. Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-3-generic (SMP w/8 CPU cores) Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJO31ueAAoJEL/srsug59jDbiUP/izvFk28BuUS/N1HMSN0LK1T yahTeCrL3m48i3YtyEAq71Eb9EkLhNy42rQTruMtsJhC5GyEkmPqTrHQo+MX9CRs QRe3eu0m7FSbx37qeNLSZ58hKqXM0W8R2cythiuICwQ7yg7WEAd7aWVG94zzff6/ UDyvmdukl4vaDpsbgK3vcfgKNJZvVjQyZ2ZzAa98/X+yp6lU4IYKx1jhgKD/qzNm CxJC2JdgpEMAgX3matKCpq137Wz69exqfxpT4U6RHawg57VO4AP8IiQDulKjXWjh nkO2d/xZD7hndHQHxSbw2mY/tNBLyFJi6Vq5C2hXrYoe+b5jme+UVVDPr/jQ7uFV TQV9j39T2ywJhUlRFIPF5OKu48stK5jrh6Ab3UILhpeunAYCL8B4xUaxEEhV92Bl YAxJd036QBKgj59pWplMsv898qFSwguMUkNB3S45BApL06jaNT6qFUfRt7fh0CaD yl6JA9CEVnK0sx8XGs5j7lR0FGwPGa4SmnI+1R84i2kPmdrrP4kG2/nNWcrnvjHO 6MC845NVbsO3tURGc3FULt0VGNe2POzpt/6LG/m9twDjGf+3Qu5jCb1ROKuMttQM HabflSpHnlgk7ZvQs8YsV3ounC7ruQ4g/BhszZGgtWJASlmtEmhVZC/UvXIrOIU7 Kh2PSe15fRLQelxsfFaB =kfT7 -----END PGP SIGNATURE-----
=== modified file 'debian/patches/00list' --- debian/patches/00list 2009-01-09 16:39:01 +0000 +++ debian/patches/00list 2011-12-07 09:54:29 +0000 @@ -1 +1,2 @@ 01_share.dpatch +02_cegui-mk2-0.7.5.dpatch === added file 'debian/patches/02_cegui-mk2-0.7.5.dpatch' --- debian/patches/02_cegui-mk2-0.7.5.dpatch 1970-01-01 00:00:00 +0000 +++ debian/patches/02_cegui-mk2-0.7.5.dpatch 2011-12-07 10:43:14 +0000 @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_cegui-mk2-0.7.5.dpatch by James Page <james.p...@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mmpong~/client_gl/gui.cpp mmpong/client_gl/gui.cpp +--- mmpong~/client_gl/gui.cpp 2011-12-07 09:45:09.000000000 +0000 ++++ mmpong/client_gl/gui.cpp 2011-12-07 10:43:13.727551992 +0000 +@@ -148,9 +148,9 @@ + + + GUI::GUI(std::string resbase, int w, int h, bool _visible, ClientState *_state) { +- renderer = new OpenGLRenderer(0, w, h); ++ renderer = &OpenGLRenderer::create(Size(w,h)); + log = new dummyLogger(); +- sys = new System(renderer); ++ sys = &System::create(*renderer); + visible = _visible; + state = _state; + try { +@@ -176,7 +176,7 @@ + // ATTENTION (by andré): + // the next line segfaults with CEGUI 0.5.0-4.1 in Debian/Ubuntu + // this is fixed in 0.6 (sorry, found no workaround atm) +- SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" ); ++ SchemeManager::getSingleton().create( "TaharezLook.scheme" ); + sys->setDefaultMouseCursor( "TaharezLook", "MouseArrow" ); + sys->setDefaultTooltip("TaharezLook/Tooltip"); + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mmpong~/client_gl/gui.h mmpong/client_gl/gui.h +--- mmpong~/client_gl/gui.h 2011-12-07 09:45:09.000000000 +0000 ++++ mmpong/client_gl/gui.h 2011-12-07 10:30:03.000000000 +0000 +@@ -22,7 +22,7 @@ + #define __GUI_H__ + + #include <CEGUI.h> +-#include <RendererModules/OpenGLGUIRenderer/openglrenderer.h> ++#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h> + #include <CEGUILogger.h> + #include "clientstate.h" +