diff --git a/amanith-0.3-gcc-constructor-fix.patch b/amanith-0.3-gcc-constructor-fix.patch deleted file mode 100644 index def3d1e..0000000 --- a/amanith-0.3-gcc-constructor-fix.patch +++ /dev/null @@ -1,379 +0,0 @@ -diff -up amanith/include/amanith/1d/gbeziercurve1d.h.constructor amanith/include/amanith/1d/gbeziercurve1d.h ---- amanith/include/amanith/1d/gbeziercurve1d.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/1d/gbeziercurve1d.h 2011-06-29 13:52:39.913715303 -0400 -@@ -287,6 +287,7 @@ namespace Amanith { - */ - class G_EXPORT GBezierCurve1DProxy : public GElementProxy { - public: -+ GBezierCurve1DProxy() {} - //! Creates a new GBezierCurve1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GBezierCurve1D(Owner); -diff -up amanith/include/amanith/1d/gbsplinecurve1d.h.constructor amanith/include/amanith/1d/gbsplinecurve1d.h ---- amanith/include/amanith/1d/gbsplinecurve1d.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/1d/gbsplinecurve1d.h 2011-06-29 13:52:39.913715303 -0400 -@@ -524,6 +524,7 @@ N_{i,p}(u) = \frac{u - u_i}{u_{i+p} - u_ - */ - class G_EXPORT GBSplineCurve1DProxy : public GElementProxy { - public: -+ GBSplineCurve1DProxy() {} - //! Creates a new GBSplineCurve1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GBSplineCurve1D(Owner); -diff -up amanith/include/amanith/1d/gcurve1d.h.constructor amanith/include/amanith/1d/gcurve1d.h ---- amanith/include/amanith/1d/gcurve1d.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/1d/gcurve1d.h 2011-06-29 13:52:39.914715290 -0400 -@@ -307,6 +307,7 @@ namespace Amanith { - */ - class G_EXPORT GCurve1DProxy : public GElementProxy { - public: -+ GCurve1DProxy() {} - //! Get class descriptor of elements type "provided" by this proxy. - const GClassID& ClassID() const { - return G_CURVE1D_CLASSID; -diff -up amanith/include/amanith/1d/ghermitecurve1d.h.constructor amanith/include/amanith/1d/ghermitecurve1d.h ---- amanith/include/amanith/1d/ghermitecurve1d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/1d/ghermitecurve1d.h 2011-06-29 13:52:39.914715290 -0400 -@@ -404,6 +404,7 @@ namespace Amanith { - */ - class G_EXPORT GHermiteCurve1DProxy : public GElementProxy { - public: -+ GHermiteCurve1DProxy() {} - //! Creates a new GHermiteCurve1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GHermiteCurve1D(Owner); -diff -up amanith/include/amanith/1d/gmulticurve1d.h.constructor amanith/include/amanith/1d/gmulticurve1d.h ---- amanith/include/amanith/1d/gmulticurve1d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/1d/gmulticurve1d.h 2011-06-29 13:52:39.915715277 -0400 -@@ -251,6 +251,7 @@ namespace Amanith { - */ - class G_EXPORT GMultiCurve1DProxy : public GElementProxy { - public: -+ GMultiCurve1DProxy() {} - //! Get class descriptor of elements type "provided" by this proxy. - const GClassID& ClassID() const { - return G_MULTICURVE1D_CLASSID; -diff -up amanith/include/amanith/1d/gpolylinecurve1d.h.constructor amanith/include/amanith/1d/gpolylinecurve1d.h ---- amanith/include/amanith/1d/gpolylinecurve1d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/1d/gpolylinecurve1d.h 2011-06-29 13:52:39.916715264 -0400 -@@ -304,6 +304,7 @@ namespace Amanith { - */ - class G_EXPORT GPolyLineCurve1DProxy : public GElementProxy { - public: -+ GPolyLineCurve1DProxy() {} - //! Creates a new GPolyLineCurve1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GPolyLineCurve1D(Owner); -diff -up amanith/include/amanith/2d/ganimtrsnode2d.h.constructor amanith/include/amanith/2d/ganimtrsnode2d.h ---- amanith/include/amanith/2d/ganimtrsnode2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/ganimtrsnode2d.h 2011-06-29 13:52:39.916715264 -0400 -@@ -238,6 +238,7 @@ namespace Amanith { - */ - class G_EXPORT GAnimTRSNode2DProxy : public GElementProxy { - public: -+ GAnimTRSNode2DProxy() {} - //! Creates a new GAnimTRSNode2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GAnimTRSNode2D(Owner); -diff -up amanith/include/amanith/2d/gbeziercurve2d.h.constructor amanith/include/amanith/2d/gbeziercurve2d.h ---- amanith/include/amanith/2d/gbeziercurve2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gbeziercurve2d.h 2011-06-29 13:52:39.917715251 -0400 -@@ -465,6 +465,7 @@ namespace Amanith { - */ - class G_EXPORT GBezierCurve2DProxy : public GElementProxy { - public: -+ GBezierCurve2DProxy() {} - //! Creates a new GBezierCurve2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GBezierCurve2D(Owner); -diff -up amanith/include/amanith/2d/gbsplinecurve2d.h.constructor amanith/include/amanith/2d/gbsplinecurve2d.h ---- amanith/include/amanith/2d/gbsplinecurve2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gbsplinecurve2d.h 2011-06-29 13:52:39.917715251 -0400 -@@ -617,6 +617,7 @@ namespace Amanith { - */ - class G_EXPORT GBSplineCurve2DProxy : public GElementProxy { - public: -+ GBSplineCurve2DProxy() {} - //! Creates a new GBSplineCurve2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GBSplineCurve2D(Owner); -diff -up amanith/include/amanith/2d/gcurve2d.h.constructor amanith/include/amanith/2d/gcurve2d.h ---- amanith/include/amanith/2d/gcurve2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gcurve2d.h 2011-06-29 13:52:39.918715238 -0400 -@@ -414,6 +414,7 @@ namespace Amanith { - */ - class G_EXPORT GCurve2DProxy : public GElementProxy { - public: -+ GCurve2DProxy() {} - //! Get class descriptor of elements type "provided" by this proxy. - const GClassID& ClassID() const { - return G_CURVE2D_CLASSID; -diff -up amanith/include/amanith/2d/gellipsecurve2d.h.constructor amanith/include/amanith/2d/gellipsecurve2d.h ---- amanith/include/amanith/2d/gellipsecurve2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gellipsecurve2d.h 2011-06-29 13:52:39.918715238 -0400 -@@ -346,6 +346,7 @@ namespace Amanith { - */ - class G_EXPORT GEllipseCurve2DProxy : public GElementProxy { - public: -+ GEllipseCurve2DProxy() {} - //! Creates a new GEllipseCurve2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GEllipseCurve2D(Owner); -diff -up amanith/include/amanith/2d/gfont2d.h.constructor amanith/include/amanith/2d/gfont2d.h ---- amanith/include/amanith/2d/gfont2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gfont2d.h 2011-06-29 13:52:39.919715225 -0400 -@@ -807,6 +807,7 @@ Legend: O on curve + off curve - - class G_EXPORT GFont2DProxy : public GElementProxy { - public: -+ GFont2DProxy() {} - //! Creates a new GFont2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GFont2D(Owner); -diff -up amanith/include/amanith/2d/ghermitecurve2d.h.constructor amanith/include/amanith/2d/ghermitecurve2d.h ---- amanith/include/amanith/2d/ghermitecurve2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/ghermitecurve2d.h 2011-06-29 13:52:39.919715225 -0400 -@@ -510,6 +510,7 @@ namespace Amanith { - */ - class G_EXPORT GHermiteCurve2DProxy : public GElementProxy { - public: -+ GHermiteCurve2DProxy() {} - //! Creates a new GHermiteCurve2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GHermiteCurve2D(Owner); -diff -up amanith/include/amanith/2d/gmulticurve2d.h.constructor amanith/include/amanith/2d/gmulticurve2d.h ---- amanith/include/amanith/2d/gmulticurve2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gmulticurve2d.h 2011-06-29 13:52:39.919715225 -0400 -@@ -273,6 +273,7 @@ namespace Amanith { - */ - class G_EXPORT GMultiCurve2DProxy : public GElementProxy { - public: -+ GMultiCurve2DProxy() {} - //! Get class descriptor of elements type "provided" by this proxy. - const GClassID& ClassID() const { - return G_MULTICURVE2D_CLASSID; -diff -up amanith/include/amanith/2d/gpath2d.h.constructor amanith/include/amanith/2d/gpath2d.h ---- amanith/include/amanith/2d/gpath2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gpath2d.h 2011-06-29 13:52:39.920715212 -0400 -@@ -581,6 +581,7 @@ namespace Amanith { - */ - class G_EXPORT GPath2DProxy : public GElementProxy { - public: -+ GPath2DProxy() {} - //! Creates a new GPath2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GPath2D(Owner); -diff -up amanith/include/amanith/2d/gpixelmap.h.constructor amanith/include/amanith/2d/gpixelmap.h ---- amanith/include/amanith/2d/gpixelmap.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gpixelmap.h 2011-06-29 13:52:39.921715199 -0400 -@@ -821,6 +821,7 @@ namespace Amanith { - */ - class G_EXPORT GPixelMapProxy : public GElementProxy { - public: -+ GPixelMapProxy() {} - //! Creates a new GPixelMap instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GPixelMap(Owner); -diff -up amanith/include/amanith/2d/gpolylinecurve2d.h.constructor amanith/include/amanith/2d/gpolylinecurve2d.h ---- amanith/include/amanith/2d/gpolylinecurve2d.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/include/amanith/2d/gpolylinecurve2d.h 2011-06-29 13:52:39.921715199 -0400 -@@ -347,6 +347,7 @@ namespace Amanith { - */ - class G_EXPORT GPolyLineCurve2DProxy : public GElementProxy { - public: -+ GPolyLineCurve2DProxy() {} - //! Creates a new GPolyLineCurve2D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GPolyLineCurve2D(Owner); -diff -up amanith/include/amanith/gelement.h.constructor amanith/include/amanith/gelement.h ---- amanith/include/amanith/gelement.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/gelement.h 2011-06-29 13:52:39.922715186 -0400 -@@ -191,6 +191,7 @@ namespace Amanith { - */ - class G_EXPORT GElementProxy { - public: -+ GElementProxy() {} - //! Create a new element. Every derived class must implements this method. - virtual GElement* CreateNew(const GElement* Owner = NULL) const { - if (!Owner) -@@ -480,6 +481,7 @@ namespace Amanith { - */ - class G_EXPORT GAnimElementProxy : public GElementProxy { - public: -+ GAnimElementProxy() {} - //! Get class descriptor of elements type "provided" by this proxy. - const GClassID& ClassID() const { - return G_ANIMELEMENT_CLASSID; -@@ -884,6 +886,7 @@ namespace Amanith { - */ - class G_EXPORT GPropertyProxy : public GElementProxy { - public: -+ GPropertyProxy() {} - //! Creates a new GProperty instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GProperty(Owner); -diff -up amanith/include/amanith/gimpexp.h.constructor amanith/include/amanith/gimpexp.h ---- amanith/include/amanith/gimpexp.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/gimpexp.h 2011-06-29 13:52:39.922715186 -0400 -@@ -218,6 +218,7 @@ namespace Amanith { - */ - class G_EXPORT GImpExpProxy : public GElementProxy { - public: -+ GImpExpProxy() {} - //! Get class descriptor of elements type "provided" by this proxy. - const GClassID& ClassID() const { - return G_IMPEXP_CLASSID; -diff -up amanith/include/amanith/gkernel.h.constructor amanith/include/amanith/gkernel.h ---- amanith/include/amanith/gkernel.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/gkernel.h 2011-06-29 13:52:39.922715186 -0400 -@@ -193,6 +193,7 @@ namespace Amanith { - */ - class G_EXPORT GKernelProxy : public GElementProxy { - public: -+ GKernelProxy() {} - //! Create a new GKernel class - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GKernel(Owner); -diff -up amanith/include/amanith/gmultiproperty.h.constructor amanith/include/amanith/gmultiproperty.h ---- amanith/include/amanith/gmultiproperty.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/gmultiproperty.h 2011-06-29 13:52:39.923715173 -0400 -@@ -108,6 +108,7 @@ namespace Amanith { - */ - class G_EXPORT GMultiProperty1DProxy : public GElementProxy { - public: -+ GMultiProperty1DProxy() {} - //! Get class descriptor of elements type "provided" by this proxy. - const GClassID& ClassID() const { - return G_MULTIPROPERTY1D_CLASSID; -@@ -164,6 +165,7 @@ namespace Amanith { - */ - class G_EXPORT GTwoHermiteProperty1DProxy : public GElementProxy { - public: -+ GTwoHermiteProperty1DProxy() {} - //! Creates a new GTwoHermiteProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GTwoHermiteProperty1D(Owner); -@@ -223,6 +225,7 @@ namespace Amanith { - */ - class G_EXPORT GThreeHermiteProperty1DProxy : public GElementProxy { - public: -+ GThreeHermiteProperty1DProxy() {} - //! Creates a new GThreeHermiteProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GThreeHermiteProperty1D(Owner); -@@ -282,6 +285,7 @@ namespace Amanith { - */ - class G_EXPORT GFourHermiteProperty1DProxy : public GElementProxy { - public: -+ GFourHermiteProperty1DProxy() {} - //! Creates a new GFourHermiteProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GFourHermiteProperty1D(Owner); -@@ -342,6 +346,7 @@ namespace Amanith { - */ - class G_EXPORT GTwoLinearProperty1DProxy : public GElementProxy { - public: -+ GTwoLinearProperty1DProxy() {} - //! Creates a new GTwoLinearProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GTwoLinearProperty1D(Owner); -@@ -401,6 +406,7 @@ namespace Amanith { - */ - class G_EXPORT GThreeLinearProperty1DProxy : public GElementProxy { - public: -+ GThreeLinearProperty1DProxy() {} - //! Creates a new GThreeLinearProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GThreeLinearProperty1D(Owner); -@@ -461,6 +467,7 @@ namespace Amanith { - */ - class G_EXPORT GFourLinearProperty1DProxy : public GElementProxy { - public: -+ GFourLinearProperty1DProxy() {} - //! Creates a new GFourLinearProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GFourLinearProperty1D(Owner); -@@ -520,6 +527,7 @@ namespace Amanith { - */ - class G_EXPORT GTwoConstantProperty1DProxy : public GElementProxy { - public: -+ GTwoConstantProperty1DProxy() {} - //! Creates a new GTwoConstantProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GTwoConstantProperty1D(Owner); -@@ -579,6 +587,7 @@ namespace Amanith { - */ - class G_EXPORT GThreeConstantProperty1DProxy : public GElementProxy { - public: -+ GThreeConstantProperty1DProxy() {} - //! Creates a new GThreeConstantProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GThreeConstantProperty1D(Owner); -@@ -638,6 +647,7 @@ namespace Amanith { - */ - class G_EXPORT GFourConstantProperty1DProxy : public GElementProxy { - public: -+ GFourConstantProperty1DProxy() {} - //! Creates a new GFourConstantProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GFourConstantProperty1D(Owner); -diff -up amanith/include/amanith/gproperty.h.constructor amanith/include/amanith/gproperty.h ---- amanith/include/amanith/gproperty.h.constructor 2006-01-26 04:18:44.000000000 -0500 -+++ amanith/include/amanith/gproperty.h 2011-06-29 13:52:39.924715160 -0400 -@@ -174,6 +174,7 @@ namespace Amanith { - */ - class G_EXPORT GHermiteProperty1DProxy : public GElementProxy { - public: -+ GHermiteProperty1DProxy() {} - //! Creates a new GHermiteProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GHermiteProperty1D(Owner); -@@ -310,6 +311,7 @@ namespace Amanith { - */ - class G_EXPORT GLinearProperty1DProxy : public GElementProxy { - public: -+ GLinearProperty1DProxy() {} - //! Creates a new GLinearProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GLinearProperty1D(Owner); -@@ -445,6 +447,7 @@ namespace Amanith { - */ - class G_EXPORT GConstantProperty1DProxy : public GElementProxy { - public: -+ GConstantProperty1DProxy() {} - //! Creates a new GLinearProperty1D instance - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GConstantProperty1D(Owner); -diff -up amanith/plugins/fonts/gfontsimpexp.h.constructor amanith/plugins/fonts/gfontsimpexp.h ---- amanith/plugins/fonts/gfontsimpexp.h.constructor 2011-06-29 13:53:00.686446700 -0400 -+++ amanith/plugins/fonts/gfontsimpexp.h 2011-06-29 13:53:15.252258394 -0400 -@@ -80,6 +80,7 @@ namespace Amanith { - // ********************************************************************* - class G_PLUGIN_EXPORT GFontsImpExpProxy : public GElementProxy { - public: -+ GFontsImpExpProxy() {} - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GFontsImpExp(Owner); - } -diff -up amanith/plugins/jpeg/gjpegimpexp.h.constructor amanith/plugins/jpeg/gjpegimpexp.h ---- amanith/plugins/jpeg/gjpegimpexp.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/plugins/jpeg/gjpegimpexp.h 2011-06-29 13:52:39.924715160 -0400 -@@ -81,6 +81,7 @@ namespace Amanith { - // ********************************************************************* - class G_PLUGIN_EXPORT GJpegImpExpProxy : public GElementProxy { - public: -+ GJpegImpExpProxy() {} - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GJpegImpExp(Owner); - } -diff -up amanith/plugins/png/gpngimpexp.h.constructor amanith/plugins/png/gpngimpexp.h ---- amanith/plugins/png/gpngimpexp.h.constructor 2006-01-26 04:18:45.000000000 -0500 -+++ amanith/plugins/png/gpngimpexp.h 2011-06-29 13:52:39.924715160 -0400 -@@ -84,6 +84,7 @@ namespace Amanith { - // ********************************************************************* - class G_PLUGIN_EXPORT GPngImpExpProxy : public GElementProxy { - public: -+ GPngImpExpProxy() {} - GElement* CreateNew(const GElement* Owner = NULL) const { - return new GPngImpExp(Owner); - } diff --git a/amanith-0.3-libpng15-fix.patch b/amanith-0.3-libpng15-fix.patch deleted file mode 100644 index 7ff23f4..0000000 --- a/amanith-0.3-libpng15-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up amanith/plugins/png/gpngimpexp.cpp.pngfix amanith/plugins/png/gpngimpexp.cpp ---- amanith/plugins/png/gpngimpexp.cpp.pngfix 2011-12-06 13:08:47.321866882 -0500 -+++ amanith/plugins/png/gpngimpexp.cpp 2011-12-06 13:09:30.297453723 -0500 -@@ -366,7 +366,11 @@ GError GPngImpExp::RawPngSave(const GCha - /* Set error handling. REQUIRED if you aren't supplying your own - * error handling functions in the png_create_write_struct() call. - */ -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf(png_ptr))) { -+#else - if (setjmp(png_ptr->jmpbuf)) { -+#endif - /* If we get here, we had a problem reading the file */ - std::fclose(fp); - png_destroy_write_struct(&png_ptr, (png_infopp)info_ptr); diff --git a/amanith-0.3-nothirdpartystatic.patch b/amanith-0.3-nothirdpartystatic.patch index f25c294..09a9c98 100644 --- a/amanith-0.3-nothirdpartystatic.patch +++ b/amanith-0.3-nothirdpartystatic.patch @@ -1,15 +1,38 @@ -diff -up amanith/amanith.pro.system amanith/amanith.pro ---- amanith/amanith.pro.system 2005-12-06 05:43:12.000000000 -0500 -+++ amanith/amanith.pro 2011-12-06 13:13:16.310280875 -0500 +--- amanith/amanith.pro.BAD 2007-05-26 18:03:40.000000000 -0500 ++++ amanith/amanith.pro 2007-05-26 18:03:48.000000000 -0500 @@ -1,4 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += 3rdpart build plugins examples +SUBDIRS += build plugins examples -diff -up amanith/plugins/fonts/build.conf.system amanith/plugins/fonts/build.conf ---- amanith/plugins/fonts/build.conf.system 2005-09-26 04:18:52.000000000 -0400 -+++ amanith/plugins/fonts/build.conf 2011-12-06 13:13:16.314280835 -0500 +--- amanith/plugins/jpeg/build.conf.BAD 2007-05-26 18:03:57.000000000 -0500 ++++ amanith/plugins/jpeg/build.conf 2007-05-26 18:04:09.000000000 -0500 +@@ -25,7 +25,7 @@ contains(DEFINES, _JPEG_PLUGIN) { + } + } + +-unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a ++unix: LIBS += -ljpeg + win32: { + + !contains(DEFINES, WIN32_MINGW) { +--- amanith/plugins/png/build.conf.BAD 2007-05-26 18:04:21.000000000 -0500 ++++ amanith/plugins/png/build.conf 2007-05-26 18:04:33.000000000 -0500 +@@ -25,9 +25,7 @@ contains(DEFINES, _PNG_PLUGIN) { + } + } + +-INCLUDEPATH += $$(AMANITHDIR)/3rdpart/zlib +- +-unix: LIBS += $$(AMANITHDIR)/lib/libpng.a $$(AMANITHDIR)/lib/libzlib.a ++unix: LIBS += -lpng -lz + win32: { + + !contains(DEFINES, WIN32_MINGW) { +diff -up amanith/plugins/fonts/build.conf.orig amanith/plugins/fonts/build.conf +--- amanith/plugins/fonts/build.conf.orig 2005-09-26 04:18:52.000000000 -0400 ++++ amanith/plugins/fonts/build.conf 2008-09-26 15:52:14.000000000 -0400 @@ -40,7 +40,7 @@ DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include @@ -19,39 +42,10 @@ diff -up amanith/plugins/fonts/build.conf.system amanith/plugins/fonts/build.con win32: { !contains(DEFINES, WIN32_MINGW) { -@@ -51,4 +51,4 @@ win32: { +@@ -51,4 +51,4 @@ win32: { contains(DEFINES, WIN32_MINGW) { LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a } -} \ No newline at end of file +} -diff -up amanith/plugins/jpeg/build.conf.system amanith/plugins/jpeg/build.conf ---- amanith/plugins/jpeg/build.conf.system 2005-09-26 04:19:04.000000000 -0400 -+++ amanith/plugins/jpeg/build.conf 2011-12-06 13:13:16.311280865 -0500 -@@ -25,7 +25,7 @@ contains(DEFINES, _JPEG_PLUGIN) { - } - } - --unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a -+unix: LIBS += -ljpeg - win32: { - - !contains(DEFINES, WIN32_MINGW) { -diff -up amanith/plugins/png/build.conf.system amanith/plugins/png/build.conf ---- amanith/plugins/png/build.conf.system 2005-09-26 04:19:14.000000000 -0400 -+++ amanith/plugins/png/build.conf 2011-12-06 13:14:28.079590898 -0500 -@@ -25,9 +25,10 @@ contains(DEFINES, _PNG_PLUGIN) { - } - } - --INCLUDEPATH += $$(AMANITHDIR)/3rdpart/zlib -- --unix: LIBS += $$(AMANITHDIR)/lib/libpng.a $$(AMANITHDIR)/lib/libzlib.a -+unix: { -+ LIBS += `libpng-config --libs` -+ LIBS += -lz -+} - win32: { - - !contains(DEFINES, WIN32_MINGW) { diff --git a/amanith.spec b/amanith.spec index 6045700..577a171 100644 --- a/amanith.spec +++ b/amanith.spec @@ -1,18 +1,17 @@ Name: amanith Version: 0.3 -Release: 59%{?dist} +Release: 14%{?dist} Summary: Crossplatform framework for 2d/3d vector graphics -# Automatically converted from old format: QPL - review is highly recommended. -License: QPL-1.0 +Group: Development/Libraries +License: QPL URL: http://www.amanith.org # Upstream no longer offers this code # It originally came from: http://www.amanith.org/download/files/amanith_03.tar.gz Source0: amanith_03.tar.gz -BuildRequires: gcc-c++ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt3-devel, freetype-devel, libjpeg-devel, libpng-devel, zlib-devel BuildRequires: libXmu-devel, glew-devel, mesa-libGLU-devel BuildRequires: mesa-libGL-devel, pkgconfig -BuildRequires: make Patch0: amanith-0.3-nothirdpartystatic.patch Patch1: amanith-0.3-system-glew.patch Patch3: amanith-0.3-gcc-C++fix.patch @@ -23,8 +22,6 @@ Patch7: amanith-0.3-system-freetype.patch Patch8: amanith-0.3-gcc43.patch Patch9: amanith-0.3-gcc44.patch Patch10: amanith-0.3-fix-DSO.patch -Patch11: amanith-0.3-gcc-constructor-fix.patch -Patch12: amanith-0.3-libpng15-fix.patch %description Amanith is an OpenSource C++ CrossPlatform framework designed for 2d & 3d @@ -33,6 +30,7 @@ system. %package devel Summary: Development files for amanith +Group: Development/Libraries Requires: glew-devel Requires: %{name} = %{version}-%{release} @@ -41,18 +39,16 @@ Development libraries and headers for developing programs that use amanith. %prep %setup -q -n %{name} -%patch -P0 -p1 -b .system -%patch -P1 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%patch -P5 -p1 -%patch -P6 -p1 -%patch -P7 -p1 -%patch -P8 -p1 -%patch -P9 -p1 -%patch -P10 -p1 -b .DSO -%patch -P11 -p1 -b .constructor -%patch -P12 -p1 -b .pngfix +%patch0 -p1 +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 -b .DSO # Boo. Hiss. SGI Free B and GLX files. rm -rf include/GL/ # Don't need the 3rdpart stuff either. @@ -91,153 +87,24 @@ cp -a lib/*.so* $RPM_BUILD_ROOT%{_libdir} cp -a plugins/*.so* $RPM_BUILD_ROOT%{_libdir} cp -a include/amanith $RPM_BUILD_ROOT%{_includedir} -%ldconfig_scriptlets +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files +%defattr(-,root,root,-) %doc CHANGELOG FAQ LICENSE.QPL README doc/* %{_libdir}/*.so.* %files devel +%defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/amanith/ %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 0.3-59 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 0.3-58 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.3-57 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 07 2024 Miroslav Suchý - 0.3-56 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 0.3-55 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 0.3-54 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.3-53 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.3-52 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 0.3-51 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 0.3-50 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Feb 10 2022 Orion Poplawski - 0.3-49 -- Rebuild for glew 2.2 - -* Wed Jan 19 2022 Fedora Release Engineering - 0.3-48 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.3-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.3-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Fedora Release Engineering - 0.3-45 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.3-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 0.3-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 0.3-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.3-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Aug 23 2018 Nicolas Chauvet - 0.3-40 -- Rebuilt for glew 2.1.0 - -* Thu Jul 12 2018 Fedora Release Engineering - 0.3-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.3-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 0.3-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.3-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.3-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 10 2017 Tom Callaway - 0.3-34 -- rebuild for new GLEW - -* Wed Feb 03 2016 Fedora Release Engineering - 0.3-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 14 2016 Adam Jackson - 0.3-32 -- Rebuild for glew 1.13 - -* Tue Jun 16 2015 Fedora Release Engineering - 0.3-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.3-30 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Aug 15 2014 Fedora Release Engineering - 0.3-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.3-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Nov 18 2013 Dave Airlie - 0.3-27 -- rebuilt for GLEW 1.10 - -* Sat Aug 03 2013 Fedora Release Engineering - 0.3-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.3-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jan 18 2013 Adam Tkac - 0.3-24 -- rebuild due to "jpeg8-ABI" feature drop - -* Thu Dec 13 2012 Adam Jackson - 0.3-23 -- Rebuild for glew 1.9.0 - -* Wed Aug 01 2012 Adam Jackson - 0.3-22 -- -Rebuild for new glew - -* Wed Jul 18 2012 Fedora Release Engineering - 0.3-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 0.3-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Tom Callaway - 0.3-19 -- fix code to use modern libpng - -* Tue Dec 06 2011 Adam Jackson - 0.3-18 -- Rebuild for new libpng - -* Wed Jun 29 2011 Tom Callaway - 0.3-17 -- add missing default constructors - -* Mon Jun 20 2011 ajax@redhat.com - 0.3-16 -- Rebuild for new glew soname - -* Mon Feb 07 2011 Fedora Release Engineering - 0.3-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - * Wed Feb 10 2010 Tom "spot" Callaway - 0.3-14 - fix implicit DSO linking