This is an automated email from the git hooks/post-receive script. vcheng pushed a commit to branch master in repository irrlicht.
commit 48893f2250c6bdab6825142e7c0bdbc50846ec8d Author: Vincent Cheng <vch...@debian.org> Date: Tue Sep 20 23:04:50 2016 -0700 remove obsolete patch --- debian/changelog | 3 +- debian/patches/gcc6.patch | 201 ---------------------------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 203 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52265af..71d5968 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -irrlicht (1.8.4+dfsg1-1) UNRELEASED; urgency=medium +irrlicht (1.8.4+dfsg1-1) unstable; urgency=medium * New upstream release. + - Remove gcc6.patch; applied upstream. -- Vincent Cheng <vch...@debian.org> Tue, 20 Sep 2016 22:54:13 -0700 diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch deleted file mode 100644 index 373ccaf..0000000 --- a/debian/patches/gcc6.patch +++ /dev/null @@ -1,201 +0,0 @@ -Author: cutealien -Description: fix warnings and errors with gcc 6 -Forwarded-upstream: comes from upstream's svn r5253 - ---- a/source/Irrlicht/CIrrDeviceStub.cpp (révision 5252) -+++ b/source/Irrlicht/CIrrDeviceStub.cpp (révision 5253) -@@ -333,8 +333,8 @@ - //! Sets the input receiving scene manager. - void CIrrDeviceStub::setInputReceivingSceneManager(scene::ISceneManager* sceneManager) - { -- if (sceneManager) -- sceneManager->grab(); -+ if (sceneManager) -+ sceneManager->grab(); - if (InputReceivingSceneManager) - InputReceivingSceneManager->drop(); - ---- a/source/Irrlicht/CNullDriver.h (révision 5252) -+++ b/source/Irrlicht/CNullDriver.h (révision 5253) -@@ -705,8 +705,14 @@ - //! normal map lookup 32 bit version - inline f32 nml32(int x, int y, int pitch, int height, s32 *p) const - { -- if (x < 0) x = pitch-1; if (x >= pitch) x = 0; -- if (y < 0) y = height-1; if (y >= height) y = 0; -+ if (x < 0) -+ x = pitch-1; -+ if (x >= pitch) -+ x = 0; -+ if (y < 0) -+ y = height-1; -+ if (y >= height) -+ y = 0; - return (f32)(((p[(y * pitch) + x])>>16) & 0xff); - } - -@@ -713,8 +719,14 @@ - //! normal map lookup 16 bit version - inline f32 nml16(int x, int y, int pitch, int height, s16 *p) const - { -- if (x < 0) x = pitch-1; if (x >= pitch) x = 0; -- if (y < 0) y = height-1; if (y >= height) y = 0; -+ if (x < 0) -+ x = pitch-1; -+ if (x >= pitch) -+ x = 0; -+ if (y < 0) -+ y = height-1; -+ if (y >= height) -+ y = 0; - - return (f32) getAverage ( p[(y * pitch) + x] ); - } ---- a/source/Irrlicht/CGUIMeshViewer.cpp (révision 5252) -+++ b/source/Irrlicht/CGUIMeshViewer.cpp (révision 5253) -@@ -40,8 +40,8 @@ - //! sets the mesh to be shown - void CGUIMeshViewer::setMesh(scene::IAnimatedMesh* mesh) - { -- if (mesh) -- mesh->grab(); -+ if (mesh) -+ mesh->grab(); - if (Mesh) - Mesh->drop(); - ---- a/source/Irrlicht/CGUIListBox.cpp (révision 5252) -+++ b/source/Irrlicht/CGUIListBox.cpp (révision 5253) -@@ -611,8 +611,8 @@ - - void CGUIListBox::setSpriteBank(IGUISpriteBank* bank) - { -- if ( bank == IconBank ) -- return; -+ if ( bank == IconBank ) -+ return; - if (IconBank) - IconBank->drop(); - ---- a/source/Irrlicht/CGUITreeView.cpp (révision 5252) -+++ b/source/Irrlicht/CGUITreeView.cpp (révision 5253) -@@ -1083,8 +1083,8 @@ - { - s32 height; - -- if ( font ) -- font->grab(); -+ if ( font ) -+ font->grab(); - if ( IconFont ) - { - IconFont->drop(); -@@ -1105,8 +1105,8 @@ - //! The default is 0 (no images). - void CGUITreeView::setImageList( IGUIImageList* imageList ) - { -- if (imageList ) -- imageList->grab(); -+ if (imageList ) -+ imageList->grab(); - if( ImageList ) - { - ImageList->drop(); ---- a/source/Irrlicht/aesGladman/sha2.h (révision 5252) -+++ b/source/Irrlicht/aesGladman/sha2.h (révision 5253) -@@ -76,7 +76,7 @@ - #else - #include <stdint.h> - #endif -- typedef int64_t sha2_64t; -+ typedef uint64_t sha2_64t; - #if __WORDSIZE==64 - #define s_u64 ul - #else -@@ -139,22 +139,22 @@ - sha2_void sha256_begin(sha256_ctx ctx[1]); - sha2_void sha256_hash(const unsigned char data[], unsigned long len, sha256_ctx ctx[1]); - sha2_void sha256_end(unsigned char hval[], sha256_ctx ctx[1]); --sha2_void sha256(unsigned char hval[], const unsigned char data[], unsigned long len); -+sha2_void sha256(unsigned char hval[], const unsigned char data[], unsigned long len); - - sha2_void sha384_begin(sha384_ctx ctx[1]); - #define sha384_hash sha512_hash - sha2_void sha384_end(unsigned char hval[], sha384_ctx ctx[1]); --sha2_void sha384(unsigned char hval[], const unsigned char data[], unsigned long len); -+sha2_void sha384(unsigned char hval[], const unsigned char data[], unsigned long len); - - sha2_void sha512_begin(sha512_ctx ctx[1]); - sha2_void sha512_hash(const unsigned char data[], unsigned long len, sha512_ctx ctx[1]); - sha2_void sha512_end(unsigned char hval[], sha512_ctx ctx[1]); --sha2_void sha512(unsigned char hval[], const unsigned char data[], unsigned long len); -+sha2_void sha512(unsigned char hval[], const unsigned char data[], unsigned long len); - - sha2_int sha2_begin(unsigned long size, sha2_ctx ctx[1]); - sha2_void sha2_hash(const unsigned char data[], unsigned long len, sha2_ctx ctx[1]); - sha2_void sha2_end(unsigned char hval[], sha2_ctx ctx[1]); --sha2_int sha2(unsigned char hval[], unsigned long size, const unsigned char data[], unsigned long len); -+sha2_int sha2(unsigned char hval[], unsigned long size, const unsigned char data[], unsigned long len); - - #endif - ---- a/source/Irrlicht/aesGladman/aeskey.cpp (révision 5252) -+++ b/source/Irrlicht/aesGladman/aeskey.cpp (révision 5253) -@@ -368,8 +368,10 @@ - #endif - } - #else -- cx->ks[4] = ff(ss[4] = word_in(in_key, 4)); -- cx->ks[5] = ff(ss[5] = word_in(in_key, 5)); -+ ss[4] = word_in(in_key, 4); -+ cx->ks[4] = ff(ss[4]); -+ ss[5] = word_in(in_key, 5); -+ cx->ks[5] = ff(ss[5]); - kdf6(cx->ks, 0); kd6(cx->ks, 1); - kd6(cx->ks, 2); kd6(cx->ks, 3); - kd6(cx->ks, 4); kd6(cx->ks, 5); -@@ -414,10 +416,14 @@ - #endif - } - #else -- cx->ks[4] = ff(ss[4] = word_in(in_key, 4)); -- cx->ks[5] = ff(ss[5] = word_in(in_key, 5)); -- cx->ks[6] = ff(ss[6] = word_in(in_key, 6)); -- cx->ks[7] = ff(ss[7] = word_in(in_key, 7)); -+ ss[4] = word_in(in_key, 4); -+ cx->ks[4] = ff(ss[4]); -+ ss[5] = word_in(in_key, 5); -+ cx->ks[5] = ff(ss[5]); -+ ss[6] = word_in(in_key, 6); -+ cx->ks[6] = ff(ss[6]); -+ ss[7] = word_in(in_key, 7); -+ cx->ks[7] = ff(ss[7]); - kdf8(cx->ks, 0); kd8(cx->ks, 1); - kd8(cx->ks, 2); kd8(cx->ks, 3); - kd8(cx->ks, 4); kd8(cx->ks, 5); ---- a/source/Irrlicht/CGUIContextMenu.cpp (révision 5252) -+++ b/source/Irrlicht/CGUIContextMenu.cpp (révision 5253) -@@ -129,8 +129,8 @@ - if (index >= Items.size()) - return; - -- if (menu) -- menu->grab(); -+ if (menu) -+ menu->grab(); - if (Items[index].SubMenu) - Items[index].SubMenu->drop(); - ---- a/source/Irrlicht/CParticleSystemSceneNode.cpp (révision 5252) -+++ b/source/Irrlicht/CParticleSystemSceneNode.cpp (révision 5253) -@@ -72,8 +72,8 @@ - //! Sets the particle emitter, which creates the particles. - void CParticleSystemSceneNode::setEmitter(IParticleEmitter* emitter) - { -- if (emitter == Emitter) -- return; -+ if (emitter == Emitter) -+ return; - if (Emitter) - Emitter->drop(); - diff --git a/debian/patches/series b/debian/patches/series index ee360bd..1d3ee5d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -gcc6.patch debian/arch-support.diff debian/use-system-libs.diff debian/link-against-needed-libs.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/irrlicht.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits