Control: severity -1 serious Control: tags -1 patch Please find attached a patch that achieves the following:
* Non-maintainer upload.
* Drop use_system_libbox2d.patch and remove build-dependency on
libbox2d-dev.
- Numptyphysics FTBFS with the latest version of Box2D 2.3.0. Fall
back to the embedded copy of Box2D. (Closes: #735879)
* Rebase use_fontconfig.patch.
* Drop autotools-dev and automake build-dependencies. Use dh-autoreconf
instead.
Regards,
Markus
diff -Nru numptyphysics-0.2+svn157/debian/changelog
numptyphysics-0.2+svn157/debian/changelog
--- numptyphysics-0.2+svn157/debian/changelog 2014-01-11 17:57:44.000000000
+0100
+++ numptyphysics-0.2+svn157/debian/changelog 2014-02-15 19:08:31.000000000
+0100
@@ -1,3 +1,15 @@
+numptyphysics (0.2+svn157-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop use_system_libbox2d.patch and remove build-dependency on libbox2d-dev.
+ - Numptyphysics FTBFS with the latest version of Box2D 2.3.0. Fall back to
+ the embedded copy of Box2D. (Closes: #735879)
+ * Rebase use_fontconfig.patch.
+ * Drop autotools-dev and automake build-dependencies. Use dh-autoreconf
+ instead.
+
+ -- Markus Koschany <a...@gambaru.de> Sat, 15 Feb 2014 19:02:50 +0100
+
numptyphysics (0.2+svn157-0.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru numptyphysics-0.2+svn157/debian/control
numptyphysics-0.2+svn157/debian/control
--- numptyphysics-0.2+svn157/debian/control 2014-01-11 17:57:44.000000000
+0100
+++ numptyphysics-0.2+svn157/debian/control 2014-02-15 19:08:31.000000000
+0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Leo Costela <cost...@debian.org>
Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-image1.2-dev,
- libsdl-ttf2.0-dev, libbox2d-dev, autotools-dev, pkg-config, automake,
+ libsdl-ttf2.0-dev, pkg-config, dh-autoreconf,
libfontconfig1-dev,
# libhildon-1-dev,
# libosso-dev, libdbus-1-dev, mce-dev, osso-af-settings
diff -Nru numptyphysics-0.2+svn157/debian/patches/series
numptyphysics-0.2+svn157/debian/patches/series
--- numptyphysics-0.2+svn157/debian/patches/series 2012-05-11
00:14:45.000000000 +0200
+++ numptyphysics-0.2+svn157/debian/patches/series 2014-02-15
19:08:31.000000000 +0100
@@ -1,5 +1,4 @@
-use_system_libbox2d.patch
desktop_file.diff
-use_fontconfig.patch
fix_icons_installation.patch
gcc-4.7.patch
+use_fontconfig.patch
diff -Nru numptyphysics-0.2+svn157/debian/patches/use_fontconfig.patch
numptyphysics-0.2+svn157/debian/patches/use_fontconfig.patch
--- numptyphysics-0.2+svn157/debian/patches/use_fontconfig.patch
2010-06-20 15:10:35.000000000 +0200
+++ numptyphysics-0.2+svn157/debian/patches/use_fontconfig.patch
2014-02-15 19:08:31.000000000 +0100
@@ -1,13 +1,21 @@
-Description: use fontconfig if available, instead of a hardcoded font
- file. Paves way for splitting the font file into a separate package.
+From: Leo Costela <cost...@debian.org>
+Date: Sat, 15 Feb 2014 14:34:56 +0100
+Subject: use_fontconfig
+
+Use fontconfig if available, instead of a hardcoded font
+file. Paves way for splitting the font file into a separate package.
Forwarded: no
-Author: Leo 'costela' Antunes <cost...@debian.org>
+---
+ Font.cpp | 40 ++++++++++++++++++++++++++++++++++++----
+ Makefile.am | 6 +++---
+ configure.in | 7 +++++++
+ 3 files changed, 46 insertions(+), 7 deletions(-)
-Index: numptyphysics-0.2+svn156/Font.cpp
-===================================================================
---- numptyphysics-0.2+svn156.orig/Font.cpp 2010-02-22 22:51:55.000000000
+0100
-+++ numptyphysics-0.2+svn156/Font.cpp 2010-06-20 15:10:31.000000000 +0200
+diff --git a/Font.cpp b/Font.cpp
+index 3630fd2..fce37ce 100644
+--- a/Font.cpp
++++ b/Font.cpp
@@ -18,6 +18,10 @@
#include "Config.h"
#include <SDL/SDL_ttf.h>
@@ -19,7 +27,7 @@
#define FONT(fONTpTR) ((TTF_Font*)((fONTpTR)->m_state))
struct FontCanvas : public Canvas
-@@ -31,7 +35,33 @@
+@@ -31,7 +35,34 @@ struct FontCanvas : public Canvas
Font::Font( const std::string& file, int ptsize )
{
TTF_Init();
@@ -51,14 +59,16 @@
+#else
+ std::string fname = Config::findFile(file+".ttf");
+#endif
++
m_state = TTF_OpenFont( fname.c_str(), ptsize );
m_height = metrics("M").y;
}
-@@ -93,19 +123,18 @@
+@@ -93,19 +124,20 @@ void Font::drawWrap( Canvas* canvas, Rect area,
const Font* Font::titleFont()
{
- static Font* f = new Font("femkeklaver.ttf",48);
++
+ static Font* f = new Font("femkeklaver",48);
return f;
}
@@ -76,43 +86,23 @@
+ static Font* f = new Font("femkeklaver",24);
return f;
}
--
-Index: numptyphysics-0.2+svn156/configure.in
-===================================================================
---- numptyphysics-0.2+svn156.orig/configure.in 2010-06-20 15:04:59.000000000
+0200
-+++ numptyphysics-0.2+svn156/configure.in 2010-06-20 15:10:31.000000000
+0200
-@@ -76,6 +76,13 @@
- AC_SUBST(icon_scalabledir)
-
- PKG_CHECK_MODULES(BOX2D, box2d >= 2.0.0)
-+PKG_CHECK_MODULES(FONTCONFIG, fontconfig,
-+ [
-+ AC_DEFINE([HAVE_FONTCONFIG], 1)
-+ ],
-+ [
-+ AC_MSG_WARN([no fontconfig, using builtin font])
-+ ])
- AC_CHECK_LIB(stdc++, main)
- AC_CHECK_LIB(X11, main)
-Index: numptyphysics-0.2+svn156/Makefile.am
-===================================================================
---- numptyphysics-0.2+svn156.orig/Makefile.am 2010-06-20 15:04:59.000000000
+0200
-+++ numptyphysics-0.2+svn156/Makefile.am 2010-06-20 15:10:31.000000000
+0200
-@@ -30,8 +30,10 @@
+diff --git a/Makefile.am b/Makefile.am
+index 3135fd2..258dbcb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -32,8 +32,8 @@ numptyphysics_SOURCES = \
OsFreeDesktop.cpp \
OsWin32.cpp
--numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS) $(BOX2D_CFLAGS)
--numptyphysics_LDADD = $(SDL_LIBS) $(HILDON_LIBS) $(BOX2D_LIBS)
-+numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS) $(BOX2D_CFLAGS) \
-+ $(FONTCONFIG_CFLAGS)
-+numptyphysics_LDADD = $(SDL_LIBS) $(HILDON_LIBS) $(BOX2D_LIBS) \
-+ $(FONTCONFIG_LIBS)
+-numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS)
+-numptyphysics_LDADD = libbox2d.a $(SDL_LIBS) $(HILDON_LIBS)
++numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS)
$(FONTCONFIG_CFLAGS)
++numptyphysics_LDADD = libbox2d.a $(SDL_LIBS) $(HILDON_LIBS) $(FONTCONFIG_LIBS)
numptyphysics_DATA = \
data/C00_Title.npz \
-@@ -56,6 +58,6 @@
+@@ -58,7 +58,7 @@ numptyphysics_DATA = \
data/close.png \
data/record.png \
data/theend.png \
@@ -120,3 +110,22 @@
+ #data/femkeklaver.ttf
+ libbox2d_a_SOURCES = \
+diff --git a/configure.in b/configure.in
+index f24740b..da4b50a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -73,6 +73,13 @@ AC_SUBST(icon_50x50dir)
+ AC_SUBST(icon_64x64dir)
+ AC_SUBST(icon_scalabledir)
+
++PKG_CHECK_MODULES(FONTCONFIG, fontconfig,
++ [
++ AC_DEFINE([HAVE_FONTCONFIG], 1)
++ ],
++ [
++ AC_MSG_WARN([no fontconfig, using builtin font])
++ ])
+
+ AC_CHECK_LIB(stdc++, main)
+ AC_CHECK_LIB(X11, main)
diff -Nru numptyphysics-0.2+svn157/debian/patches/use_system_libbox2d.patch
numptyphysics-0.2+svn157/debian/patches/use_system_libbox2d.patch
--- numptyphysics-0.2+svn157/debian/patches/use_system_libbox2d.patch
2010-06-20 15:05:10.000000000 +0200
+++ numptyphysics-0.2+svn157/debian/patches/use_system_libbox2d.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,87 +0,0 @@
-Description: Use system version of libbox2d-dev to build.
- Should be reworked to detect libbox2d dinamically, this way it could
- be incorporated upstream.
-
-Forwarded: no
-Author: Leo 'costela' Antunes <cost...@debian.org>
-
-Index: numptyphysics-0.2+svn156/Makefile.am
-===================================================================
---- numptyphysics-0.2+svn156.orig/Makefile.am 2010-04-08 11:45:23.000000000
+0200
-+++ numptyphysics-0.2+svn156/Makefile.am 2010-06-20 15:04:59.000000000
+0200
-@@ -1,6 +1,4 @@
- bin_PROGRAMS = numptyphysics
--noinst_LIBRARIES = libbox2d.a
--INCLUDES = -IBox2D/Include
-
- desktopentry_DATA = data/numptyphysics.desktop
- serviceentry_DATA = data/numptyphysics.service
-@@ -32,8 +30,8 @@
- OsFreeDesktop.cpp \
- OsWin32.cpp
-
--numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS)
--numptyphysics_LDADD = libbox2d.a $(SDL_LIBS) $(HILDON_LIBS)
-+numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS) $(BOX2D_CFLAGS)
-+numptyphysics_LDADD = $(SDL_LIBS) $(HILDON_LIBS) $(BOX2D_LIBS)
-
- numptyphysics_DATA = \
- data/C00_Title.npz \
-@@ -61,36 +59,3 @@
- data/femkeklaver.ttf
-
-
--libbox2d_a_SOURCES = \
-- Box2D/Source/Collision/b2Distance.cpp \
-- Box2D/Source/Collision/b2TimeOfImpact.cpp \
-- Box2D/Source/Collision/b2CollideCircle.cpp \
-- Box2D/Source/Collision/b2CollidePoly.cpp \
-- Box2D/Source/Collision/Shapes/b2PolygonShape.cpp \
-- Box2D/Source/Collision/Shapes/b2CircleShape.cpp \
-- Box2D/Source/Collision/Shapes/b2Shape.cpp \
-- Box2D/Source/Collision/b2PairManager.cpp \
-- Box2D/Source/Collision/b2Collision.cpp \
-- Box2D/Source/Collision/b2BroadPhase.cpp \
-- Box2D/Source/Dynamics/b2WorldCallbacks.cpp \
-- Box2D/Source/Dynamics/Joints/b2PrismaticJoint.cpp \
-- Box2D/Source/Dynamics/Joints/b2MouseJoint.cpp \
-- Box2D/Source/Dynamics/Joints/b2GearJoint.cpp \
-- Box2D/Source/Dynamics/Joints/b2Joint.cpp \
-- Box2D/Source/Dynamics/Joints/b2PulleyJoint.cpp \
-- Box2D/Source/Dynamics/Joints/b2DistanceJoint.cpp \
-- Box2D/Source/Dynamics/Joints/b2RevoluteJoint.cpp \
-- Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp \
-- Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp \
-- Box2D/Source/Dynamics/Contacts/b2Contact.cpp \
-- Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp \
-- Box2D/Source/Dynamics/Contacts/b2ContactSolver.cpp \
-- Box2D/Source/Dynamics/b2Island.cpp \
-- Box2D/Source/Dynamics/b2Body.cpp \
-- Box2D/Source/Dynamics/b2ContactManager.cpp \
-- Box2D/Source/Dynamics/b2World.cpp \
-- Box2D/Source/Common/b2BlockAllocator.cpp \
-- Box2D/Source/Common/b2StackAllocator.cpp \
-- Box2D/Source/Common/b2Settings.cpp \
-- Box2D/Source/Common/b2Math.cpp
--
-Index: numptyphysics-0.2+svn156/configure.in
-===================================================================
---- numptyphysics-0.2+svn156.orig/configure.in 2010-02-22 22:51:55.000000000
+0100
-+++ numptyphysics-0.2+svn156/configure.in 2010-06-20 15:04:59.000000000
+0200
-@@ -9,6 +9,8 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-
-+PKG_PROG_PKG_CONFIG
-+
- # Check for SDL
- AC_CHECK_HEADER(
- SDL/SDL.h,
-@@ -73,6 +75,7 @@
- AC_SUBST(icon_64x64dir)
- AC_SUBST(icon_scalabledir)
-
-+PKG_CHECK_MODULES(BOX2D, box2d >= 2.0.0)
-
- AC_CHECK_LIB(stdc++, main)
- AC_CHECK_LIB(X11, main)
diff -Nru numptyphysics-0.2+svn157/debian/rules
numptyphysics-0.2+svn157/debian/rules
--- numptyphysics-0.2+svn157/debian/rules 2013-12-17 10:45:03.000000000
+0100
+++ numptyphysics-0.2+svn157/debian/rules 2014-02-15 19:08:31.000000000
+0100
@@ -11,10 +11,9 @@
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
- autoreconf -fi
dh_auto_configure -- --bindir=\$${prefix}/games
#override_dh_installchangelogs:
signature.asc
Description: OpenPGP digital signature
