diff --git a/.gitignore b/.gitignore index 65cc08c..4ed383b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ AntTweakBar_113.zip +/AntTweakBar_114.zip diff --git a/AntTweakBar-fix-includes.patch b/AntTweakBar-fix-includes.patch deleted file mode 100644 index 8075c4d..0000000 --- a/AntTweakBar-fix-includes.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -uNr AntTweakBar/examples/TwAdvanced1.cpp AntTweakBar-Fedora/examples/TwAdvanced1.cpp ---- AntTweakBar/examples/TwAdvanced1.cpp 2009-04-23 13:03:08.000000000 -0700 -+++ AntTweakBar-Fedora/examples/TwAdvanced1.cpp 2009-10-21 13:32:07.142268590 -0700 -@@ -30,6 +30,10 @@ - #define GLFW_DLL // use GLFW as a dynamically linked library - #include "glfw.h" - -+// Fedora patch: missing includes -+#include -+#include -+ - #include - #include - #if !defined(_WIN32) && !defined(_WIN64) -diff -uNr AntTweakBar/examples/TwString.cpp AntTweakBar-Fedora/examples/TwString.cpp ---- AntTweakBar/examples/TwString.cpp 2009-04-23 13:03:08.000000000 -0700 -+++ AntTweakBar-Fedora/examples/TwString.cpp 2009-10-21 13:32:51.538505701 -0700 -@@ -27,6 +27,10 @@ - # define _snprintf snprintf - #endif - -+// Fedora patch: missing includes -+#include -+#include -+#include - - // --------------------------------------------------------------------------- - // 1) Callback functions for std::string variables -diff -uNr AntTweakBar/src/TwBar.cpp AntTweakBar-Fedora/src/TwBar.cpp ---- AntTweakBar/src/TwBar.cpp 2009-04-23 13:03:08.000000000 -0700 -+++ AntTweakBar-Fedora/src/TwBar.cpp 2009-10-21 11:11:14.164153448 -0700 -@@ -15,6 +15,10 @@ - #include "TwMgr.h" - #include "TwBar.h" - #include "TwColors.h" -+ -+// Fedora patch: memset(), free(), and friends -+#include -+#include - - using namespace std; - -diff -uNr AntTweakBar/src/TwFonts.cpp AntTweakBar-Fedora/src/TwFonts.cpp ---- AntTweakBar/src/TwFonts.cpp 2009-04-23 13:03:08.000000000 -0700 -+++ AntTweakBar-Fedora/src/TwFonts.cpp 2009-10-21 11:10:27.427520003 -0700 -@@ -14,6 +14,10 @@ - #include "TwMgr.h" - #include "TwFonts.h" - -+// Fedora patch: memset() -+#include -+using std::memset; -+ - - // --------------------------------------------------------------------------- - -diff -uNr AntTweakBar/src/TwMgr.cpp AntTweakBar-Fedora/src/TwMgr.cpp ---- AntTweakBar/src/TwMgr.cpp 2009-04-23 13:03:08.000000000 -0700 -+++ AntTweakBar-Fedora/src/TwMgr.cpp 2009-10-21 11:18:54.890146180 -0700 -@@ -28,6 +28,11 @@ - #if !defined(ANT_WINDOWS) - # define _snprintf snprintf - #endif // defined(ANT_WINDOWS) -+ -+// Fedora patch: include fix -+#include -+#include -+#include - - - using namespace std; -diff -uNr AntTweakBar/src/TwOpenGL.cpp AntTweakBar-Fedora/src/TwOpenGL.cpp ---- AntTweakBar/src/TwOpenGL.cpp 2009-04-23 13:03:08.000000000 -0700 -+++ AntTweakBar-Fedora/src/TwOpenGL.cpp 2009-10-21 11:10:07.041520158 -0700 -@@ -15,6 +15,9 @@ - #include "TwOpenGL.h" - #include "TwMgr.h" - -+// Fedora patch: memset() -+#include -+ - using namespace std; - - const char *g_ErrCantLoadOGL = "Cannot load OpenGL library dynamically"; diff --git a/AntTweakBar-makefile.patch b/AntTweakBar-makefile.patch deleted file mode 100644 index 84d6d7e..0000000 --- a/AntTweakBar-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- AntTweakBar/src/Makefile 2009-04-23 13:03:08.000000000 -0700 -+++ AntTweakBar-Fedora/src/Makefile 2009-10-21 13:13:35.007138035 -0700 -@@ -5,15 +5,20 @@ - #SO_EXT = .dll - #---- LINUX - SO_EXT = .so -+SO_VERSION = 0 - - #---- Release --CXXCFG = -O3 --LFLAGS = -Wl,-s --OUT_DIR = ../lib -+#CXXCFG = -O3 -+#LFLAGS = -Wl,-s -+#OUT_DIR = ../lib - #---- Debug - #CXXCFG = -g -D_DEBUG - #LFLAGS = - #OUT_DIR = ../lib/debug -+#---- Fedora Build -+CXXCFG = $(FEDORA_CXXFLAGS) -+LFLAGS = -+OUT_DIR = ../lib - - - CXX = gcc -@@ -67,7 +72,7 @@ - - $(TARGET): $(OBJS) - @echo "===== Link $@ =====" -- $(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT) -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS) -+ $(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT).$(SO_VERSION) -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS) - - .cpp.o: - @echo "===== Compile $< =====" diff --git a/AntTweakBar.spec b/AntTweakBar.spec index 7721b24..466f196 100644 --- a/AntTweakBar.spec +++ b/AntTweakBar.spec @@ -1,12 +1,12 @@ Name: AntTweakBar -Version: 1.13 -Release: 6%{?dist} +Version: 1.14 +Release: 1%{?dist} Summary: GUI library for videogame property editing UIs Group: Applications/Internet License: zlib URL: http://www.antisphere.com/Wiki/tools:anttweakbar -Source0: http://www.antisphere.com/Tools/AntTweakBar/AntTweakBar_113.zip +Source0: http://www.antisphere.com/Tools/AntTweakBar/AntTweakBar_114.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mesa-libGL-devel @@ -14,16 +14,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: libX11-devel BuildRequires: xorg-x11-proto-devel -# upstream has missing includes for standard libc functions -# patch sent to upstream author via email. -Patch0: AntTweakBar-fix-includes.patch - -# allow overriding CXXFLAGS with Fedora preferred build options, -# and attach a proper soname to the shared library generated. -# patch sent to upstream author via email. -Patch1: AntTweakBar-makefile.patch - -# DOS mode file in upstream source makes this necessary +# DOS mode file in upstream source makes this necessary for any patches %global _default_patch_fuzz 2 %description @@ -40,8 +31,6 @@ Header files for developing applications making use of AntTweakBar. %prep %setup -q -n AntTweakBar -%patch0 -p1 -%patch1 -p1 # fix encoding in license file iconv --from=iso-8859-1 --to=utf8 ./License.txt > ./License.txt.utf8 @@ -94,6 +83,10 @@ rm -rf "%{buildroot}" %postun -p /sbin/ldconfig %changelog +* Sun Jun 11 2011 Sean Middleditch - 1.14-1 +- Updated to upsteam 1.14 release. +- Dropped upstream patches. + * Mon Feb 07 2011 Fedora Release Engineering - 1.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 97854cf..783c167 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c02dd71d0f86c62f022eed7e0bcb5b8 AntTweakBar_113.zip +5aaee2ea2bca03a258f8dad494828d7e AntTweakBar_114.zip