Jeff Garzik
14 years ago
14 changed files with 242 additions and 229 deletions
@ -0,0 +1,38 @@
@@ -0,0 +1,38 @@
|
||||
--- |
||||
name: "boost" |
||||
suites: |
||||
- "lucid" |
||||
architectures: |
||||
- "i386" |
||||
packages: |
||||
- "mingw32" |
||||
- "faketime" |
||||
- "zip" |
||||
reference_datetime: "2011-01-30 00:00:00" |
||||
remotes: [] |
||||
files: |
||||
- "boost_1_47_0.tar.bz2" |
||||
script: | |
||||
TMPDIR="$HOME/tmpdir" |
||||
mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include |
||||
tar xjf boost_1_47_0.tar.bz2 |
||||
cd boost_1_47_0 |
||||
echo "using gcc : 4.4 : i586-mingw32msvc-g++ |
||||
: |
||||
<rc>i586-mingw32msvc-windres |
||||
<archiver>i586-mingw32msvc-ar |
||||
<cxxflags>-frandom-seed=boost1 |
||||
;" > user-config.jam |
||||
./bootstrap.sh --without-icu |
||||
./bjam toolset=gcc target-os=windows threadapi=win32 threading=multi variant=release link=static --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 -sNO_ZLIB=1 --layout=tagged --build-type=complete $MAKEOPTS stage |
||||
for lib in chrono date_time exception filesystem graph iostreams math_c99f math_c99l math_c99 math_tr1f math_tr1l math_tr1 prg_exec_monitor program_options random regex serialization signals system test_exec_monitor thread_win32 unit_test_framework wave wserialization; do |
||||
mkdir $lib |
||||
(cd $lib ; ar xf ../stage/lib/libboost_${lib}-mt-s.a) |
||||
mv $lib $TMPDIR/bin/$GBUILD_BITS |
||||
done |
||||
cp -a boost $TMPDIR/include |
||||
cd $TMPDIR |
||||
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 |
||||
export FAKETIME=$REFERENCE_DATETIME |
||||
zip -r boost-win32-1.47.0-gitian.zip * |
||||
cp boost-win32-1.47.0-gitian.zip $OUTDIR |
||||
@ -1,4 +0,0 @@
@@ -1,4 +0,0 @@
|
||||
This folder contains two patches which are applied to wxWidgets |
||||
2.9.1 before building the wxWidgets which is used for release |
||||
versions of bitcoin. They make the GUI show up on newer OSs |
||||
with new libgtks, such as Ubuntu 11.04. |
||||
@ -1,86 +0,0 @@
@@ -1,86 +0,0 @@
|
||||
--- /wxWidgets/trunk/src/gtk/toplevel.cpp (revision 67326)
|
||||
+++ /wxWidgets/trunk/src/gtk/toplevel.cpp (revision 67496)
|
||||
@@ -72,4 +72,8 @@
|
||||
// send any activate events at all |
||||
static int g_sendActivateEvent = -1; |
||||
+
|
||||
+// Whether _NET_REQUEST_FRAME_EXTENTS support is working
|
||||
+// 0 == not tested yet, 1 == working, 2 == broken
|
||||
+static int gs_requestFrameExtentsStatus;
|
||||
|
||||
//----------------------------------------------------------------------------- |
||||
@@ -432,4 +436,12 @@
|
||||
if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property) |
||||
{ |
||||
+ if (win->m_netFrameExtentsTimerId)
|
||||
+ {
|
||||
+ // WM support for _NET_REQUEST_FRAME_EXTENTS is working
|
||||
+ gs_requestFrameExtentsStatus = 1;
|
||||
+ g_source_remove(win->m_netFrameExtentsTimerId);
|
||||
+ win->m_netFrameExtentsTimerId = 0;
|
||||
+ }
|
||||
+
|
||||
wxSize decorSize = win->m_decorSize; |
||||
int left, right, top, bottom; |
||||
@@ -439,4 +451,22 @@
|
||||
win->GTKUpdateDecorSize(decorSize); |
||||
} |
||||
+ return false;
|
||||
+}
|
||||
+}
|
||||
+
|
||||
+extern "C" {
|
||||
+static gboolean request_frame_extents_timeout(void* data)
|
||||
+{
|
||||
+ // WM support for _NET_REQUEST_FRAME_EXTENTS is broken
|
||||
+ gs_requestFrameExtentsStatus = 2;
|
||||
+ gdk_threads_enter();
|
||||
+ wxTopLevelWindowGTK* win = static_cast<wxTopLevelWindowGTK*>(data);
|
||||
+ win->m_netFrameExtentsTimerId = 0;
|
||||
+ wxSize decorSize = win->m_decorSize;
|
||||
+ int left, right, top, bottom;
|
||||
+ if (wxGetFrameExtents(gtk_widget_get_window(win->m_widget), &left, &right, &top, &bottom))
|
||||
+ decorSize.Set(left + right, top + bottom);
|
||||
+ win->GTKUpdateDecorSize(decorSize);
|
||||
+ gdk_threads_leave();
|
||||
return false; |
||||
} |
||||
@@ -459,4 +489,5 @@
|
||||
m_deferShowAllowed = true; |
||||
m_updateDecorSize = true; |
||||
+ m_netFrameExtentsTimerId = 0;
|
||||
|
||||
m_urgency_hint = -2; |
||||
@@ -811,5 +842,6 @@
|
||||
if (deferShow) |
||||
{ |
||||
- deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
|
||||
+ deferShow = gs_requestFrameExtentsStatus != 2 &&
|
||||
+ m_deferShowAllowed && !gtk_widget_get_realized(m_widget);
|
||||
if (deferShow) |
||||
{ |
||||
@@ -829,11 +861,4 @@
|
||||
// GetSize()/SetSize() because it makes window bigger between each |
||||
// restore and save. |
||||
- m_updateDecorSize = deferShow;
|
||||
- }
|
||||
- if (deferShow)
|
||||
- {
|
||||
- // Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken
|
||||
- const char* name = gdk_x11_screen_get_window_manager_name(screen);
|
||||
- deferShow = strcmp(name, "Fluxbox") != 0;
|
||||
m_updateDecorSize = deferShow; |
||||
} |
||||
@@ -875,4 +900,12 @@
|
||||
(XEvent*)&xevent); |
||||
|
||||
+ if (gs_requestFrameExtentsStatus == 0)
|
||||
+ {
|
||||
+ // if WM does not respond to request within 1 second,
|
||||
+ // we assume support for _NET_REQUEST_FRAME_EXTENTS is not working
|
||||
+ m_netFrameExtentsTimerId =
|
||||
+ g_timeout_add(1000, request_frame_extents_timeout, this);
|
||||
+ }
|
||||
+
|
||||
// defer calling gtk_widget_show() |
||||
m_isShown = true; |
||||
@ -1,9 +0,0 @@
@@ -1,9 +0,0 @@
|
||||
--- /wxWidgets/trunk/include/wx/gtk/toplevel.h (revision 65373)
|
||||
+++ /wxWidgets/trunk/include/wx/gtk/toplevel.h (revision 67496)
|
||||
@@ -114,4 +114,6 @@
|
||||
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. |
||||
int m_urgency_hint; |
||||
+ // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling
|
||||
+ unsigned m_netFrameExtentsTimerId;
|
||||
|
||||
// return the size of the window without WM decorations |
||||
@ -0,0 +1,40 @@
@@ -0,0 +1,40 @@
|
||||
--- |
||||
name: "wxwidgets" |
||||
suites: |
||||
- "lucid" |
||||
architectures: |
||||
- "i386" |
||||
packages: |
||||
- "mingw32" |
||||
- "faketime" |
||||
- "zip" |
||||
reference_datetime: "2011-01-30 00:00:00" |
||||
remotes: [] |
||||
files: |
||||
- "wxWidgets-2.9.2.tar.bz2" |
||||
script: | |
||||
INSTDIR="$HOME/install" |
||||
TMPDIR="$HOME/tmpdir" |
||||
export LIBRARY_PATH="$INSTDIR/lib" |
||||
# |
||||
tar xjf wxWidgets-2.9.2.tar.bz2 |
||||
cd wxWidgets-2.9.2 |
||||
CXXFLAGS=-frandom-seed=wx1 ./configure --host=i586-mingw32msvc --build=i686-linux --prefix=$INSTDIR --disable-shared --enable-monolithic --without-libpng --disable-svg |
||||
perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h |
||||
make $MAKEOPTS install |
||||
mkdir $TMPDIR |
||||
cd $TMPDIR |
||||
cp -af $INSTDIR/include . |
||||
mkdir -p $TMPDIR/bin/$GBUILD_BITS |
||||
cd $TMPDIR/bin/$GBUILD_BITS |
||||
cp -af $INSTDIR/lib/wx . |
||||
for lib in wx_mswu; do |
||||
mkdir $lib |
||||
(cd $lib ; ar xf $INSTDIR/lib/lib${lib}-2.9-i586-mingw32msvc.a) |
||||
done |
||||
chmod -R +w $TMPDIR |
||||
cd $TMPDIR |
||||
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 |
||||
export FAKETIME=$REFERENCE_DATETIME |
||||
zip -r wxwidgets-win32-2.9.2-gitian.zip * |
||||
cp wxwidgets-win32-2.9.2-gitian.zip $OUTDIR |
||||
@ -0,0 +1,42 @@
@@ -0,0 +1,42 @@
|
||||
--- |
||||
name: "wxwidgets" |
||||
suites: |
||||
- "lucid" |
||||
architectures: |
||||
- "i386" |
||||
- "amd64" |
||||
packages: |
||||
- "libxxf86vm-dev" |
||||
- "libgtk2.0-dev" |
||||
- "faketime" |
||||
- "zip" |
||||
reference_datetime: "2011-01-30 00:00:00" |
||||
remotes: [] |
||||
files: |
||||
- "wxWidgets-2.9.2.tar.bz2" |
||||
script: | |
||||
INSTDIR="$HOME/install" |
||||
TMPDIR="$HOME/tmpdir" |
||||
export LIBRARY_PATH="$INSTDIR/lib" |
||||
# |
||||
tar xjf wxWidgets-2.9.2.tar.bz2 |
||||
cd wxWidgets-2.9.2 |
||||
./configure --prefix=$INSTDIR --enable-monolithic --disable-shared |
||||
perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h |
||||
make $MAKEOPTS install |
||||
mkdir $TMPDIR |
||||
cd $TMPDIR |
||||
cp -af $INSTDIR/include . |
||||
mkdir -p $TMPDIR/bin/$GBUILD_BITS |
||||
cd $TMPDIR/bin/$GBUILD_BITS |
||||
cp -af $INSTDIR/lib/wx . |
||||
for lib in wxtiff wxregexu wx_gtk2u; do |
||||
mkdir $lib |
||||
(cd $lib ; ar xf $INSTDIR/lib/lib${lib}-2.9.a) |
||||
done |
||||
chmod -R +w $TMPDIR |
||||
cd $TMPDIR |
||||
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 |
||||
export FAKETIME=$REFERENCE_DATETIME |
||||
zip -r wxWidgets-2.9.2-gitian.zip * |
||||
cp wxWidgets-2.9.2-gitian.zip $OUTDIR |
||||
Loading…
Reference in new issue