r12855 - in packages/trunk/jugglemaster/debian: . patches
Helmut Grohne
helmut-guest at alioth.debian.org
Fri Nov 25 10:19:36 UTC 2011
Author: helmut-guest
Date: 2011-11-25 10:19:36 +0000 (Fri, 25 Nov 2011)
New Revision: 12855
Modified:
packages/trunk/jugglemaster/debian/changelog
packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch
Log:
Partial fix for "Change Siteswap (simple)". Every siteswap is regarded as invalid. A likely cause is the new pattern being garbage collected before being used. Now we keep an extra reference.
Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog 2011-11-24 01:00:34 UTC (rev 12854)
+++ packages/trunk/jugglemaster/debian/changelog 2011-11-25 10:19:36 UTC (rev 12855)
@@ -9,8 +9,11 @@
Olly Betts (Closes: #645409)
* Fix "FTBFS with ld --as-needed" applied patch from Ilya Barygin
(Closes: #631700)
+ * Partial fix for "Change Siteswap (simple)".
+ Every siteswap is regarded as invalid. A likely cause is the new pattern
+ being garbage collected before being used. Now we keep an extra reference.
- -- Helmut Grohne <helmut at subdivi.de> Thu, 03 Nov 2011 19:42:20 +0100
+ -- Helmut Grohne <helmut at subdivi.de> Fri, 25 Nov 2011 11:17:05 +0100
jugglemaster (0.4-5) unstable; urgency=low
Modified: packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch 2011-11-24 01:00:34 UTC (rev 12854)
+++ packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch 2011-11-25 10:19:36 UTC (rev 12855)
@@ -1,8 +1,10 @@
Author: Barry deFreese <bddebian at comcast.net>
Description: Build with wx2.6
Forwarded: Chunky Kibbles <chunky at icculus.org>, Per Johan Groland <per at jugglemaster.net>
---- a/src/jmdlx/Makefile
-+++ b/src/jmdlx/Makefile
+Index: jugglemaster-0.4/src/jmdlx/Makefile
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/Makefile 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/Makefile 2011-11-03 20:11:30.000000000 +0100
@@ -2,7 +2,6 @@
CXXFLAGS+=-Wall -fsigned-char `wx-config --cppflags`
@@ -11,8 +13,10 @@
# STATICFLAGS=-Wl,-Bstatic
STATICFLAGS=-static
LIBS+=`wx-config --libs`
---- a/src/jmdlx/advsite.cpp
-+++ b/src/jmdlx/advsite.cpp
+Index: jugglemaster-0.4/src/jmdlx/advsite.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/advsite.cpp 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/advsite.cpp 2011-11-03 20:11:30.000000000 +0100
@@ -25,7 +25,7 @@
END_EVENT_TABLE()
@@ -97,8 +101,10 @@
ApplySettings();
}
}
---- a/src/jmdlx/choosepatt.cpp
-+++ b/src/jmdlx/choosepatt.cpp
+Index: jugglemaster-0.4/src/jmdlx/choosepatt.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/choosepatt.cpp 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/choosepatt.cpp 2011-11-03 20:11:30.000000000 +0100
@@ -25,7 +25,7 @@
END_EVENT_TABLE()
@@ -196,8 +202,10 @@
}
haschanged=1;
}
---- a/src/jmdlx/choosestyle.cpp
-+++ b/src/jmdlx/choosestyle.cpp
+Index: jugglemaster-0.4/src/jmdlx/choosestyle.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/choosestyle.cpp 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/choosestyle.cpp 2011-11-03 20:11:30.000000000 +0100
@@ -22,7 +22,7 @@
END_EVENT_TABLE()
@@ -237,8 +245,10 @@
jmlib->setStyle(newstyle);
}
---- a/src/jmdlx/choosestyle.h
-+++ b/src/jmdlx/choosestyle.h
+Index: jugglemaster-0.4/src/jmdlx/choosestyle.h
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/choosestyle.h 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/choosestyle.h 2011-11-03 20:11:30.000000000 +0100
@@ -21,12 +21,12 @@
#include "../jmlib/jmlib.h"
#include "jmdlx.h"
@@ -258,8 +268,10 @@
};
---- a/src/jmdlx/jmdlx.cpp
-+++ b/src/jmdlx/jmdlx.cpp
+Index: jugglemaster-0.4/src/jmdlx/jmdlx.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/jmdlx.cpp 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/jmdlx.cpp 2011-11-03 20:11:50.000000000 +0100
@@ -26,7 +26,7 @@
windowx = min(480,wxGetDisplaySize().x);
windowy = min(400,wxGetDisplaySize().y);
@@ -340,14 +352,15 @@
- optionsMenu->AppendCheckItem(OPTION_PAUSE, "&Pause");
- optionsMenu->AppendCheckItem(OPTION_COLORBALLS, "&Color Balls");
- optionsMenu->Append(OPTION_REDOWNLOAD, "Re&Download Patterns");
+-
+- speedMenu->Append(SPEED_UP,"&Up");
+- speedMenu->Append(SPEED_DOWN,"&Down");
+- speedMenu->Append(SPEED_RESET,"&Reset");
+ optionsMenu->AppendCheckItem(OPTION_MIRROR, wxT("&Mirror"));
+ optionsMenu->AppendCheckItem(OPTION_PAUSE, wxT("&Pause"));
+ optionsMenu->AppendCheckItem(OPTION_COLORBALLS, wxT("&Color Balls"));
+ optionsMenu->Append(OPTION_REDOWNLOAD, wxT("Re&Download Patterns"));
-
-- speedMenu->Append(SPEED_UP,"&Up");
-- speedMenu->Append(SPEED_DOWN,"&Down");
-- speedMenu->Append(SPEED_RESET,"&Reset");
++
+ speedMenu->Append(SPEED_UP,wxT("&Up"));
+ speedMenu->Append(SPEED_DOWN,wxT("&Down"));
+ speedMenu->Append(SPEED_RESET,wxT("&Reset"));
@@ -378,7 +391,7 @@
}
void JMFrame::changeMirror(wxCommandEvent& WXUNUSED(event)) {
-@@ -208,25 +208,25 @@
+@@ -208,25 +208,26 @@
}
void JMFrame::setSiteSwap(wxString *newsite) {
@@ -406,11 +419,12 @@
if (dialog.ShowModal() == wxID_OK)
{
- newpattern = (JML_CHAR *)(const char *)dialog.GetValue();
-+ newpattern = (JML_CHAR *)(const char *)dialog.GetValue().mb_str(wxConvUTF8);
++ wxString newpatternwx = dialog.GetValue();
++ newpattern = (JML_CHAR *)(const char*)newpatternwx.mb_str(wxConvUTF8);
jmlib->stopJuggle();
jmlib->setPattern("Something",newpattern,HR_DEF, DR_DEF);
jmlib->setStyleDefault();
-@@ -248,7 +248,7 @@
+@@ -248,7 +249,7 @@
return;
}
}
@@ -419,7 +433,7 @@
popup->ShowModal();
}
-@@ -260,7 +260,7 @@
+@@ -260,7 +261,7 @@
return;
}
}
@@ -428,7 +442,7 @@
popup->ShowModal();
}
-@@ -292,8 +292,8 @@
+@@ -292,8 +293,8 @@
void JMFrame::ErrorCallBack(void *aUData, JML_CHAR *aErrMsg) {
/* Massive thanks go to Colin Bayer for his teaching me how this works */
wxString error_message;
@@ -439,7 +453,7 @@
message->ShowModal();
}
-@@ -376,7 +376,9 @@
+@@ -376,7 +377,9 @@
dc.DrawEllipse(jmlib->b[i].gx, jmlib->b[i].gy, diam, diam);
}
wxString balltext;
@@ -450,8 +464,10 @@
dc.DrawText(balltext, 10, 10);
// flip
---- a/src/jmdlx/jmdlx.h
-+++ b/src/jmdlx/jmdlx.h
+Index: jugglemaster-0.4/src/jmdlx/jmdlx.h
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/jmdlx.h 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/jmdlx.h 2011-11-03 20:11:30.000000000 +0100
@@ -92,11 +92,11 @@
static const wxCmdLineEntryDesc cmdLineDesc[] =
@@ -469,8 +485,10 @@
{ wxCMD_LINE_NONE }
};
---- a/src/jmdlx/newsemaphore.cpp
-+++ b/src/jmdlx/newsemaphore.cpp
+Index: jugglemaster-0.4/src/jmdlx/newsemaphore.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/newsemaphore.cpp 2011-11-03 20:11:29.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/newsemaphore.cpp 2011-11-03 20:11:30.000000000 +0100
@@ -22,18 +22,18 @@
END_EVENT_TABLE()
@@ -579,8 +597,10 @@
jmlib->startJuggle();
}
free(current_style);
---- a/src/jmdlx/patt.cpp
-+++ b/src/jmdlx/patt.cpp
+Index: jugglemaster-0.4/src/jmdlx/patt.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/patt.cpp 2011-11-03 20:11:28.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/patt.cpp 2011-11-03 20:11:30.000000000 +0100
@@ -75,41 +75,41 @@
snprintf(usr_filename, 255, "/usr/share/jugglemaster/%s", filename);
@@ -659,8 +679,10 @@
return(patternfile != NULL);
}
}
---- a/src/jmdlx/print.cpp
-+++ b/src/jmdlx/print.cpp
+Index: jugglemaster-0.4/src/jmdlx/print.cpp
+===================================================================
+--- jugglemaster-0.4.orig/src/jmdlx/print.cpp 2011-11-03 20:08:55.000000000 +0100
++++ jugglemaster-0.4/src/jmdlx/print.cpp 2011-11-03 20:11:30.000000000 +0100
@@ -34,7 +34,7 @@
END_EVENT_TABLE()
More information about the Pkg-games-commits
mailing list