|
From: sfeam <sf...@us...> - 2017-08-14 16:26:21
|
On Monday, 14 August 2017 19:22:44 Tatsuro MATSUOKA wrote:
> I note that I can build gnuplot 5.3 on cygwin 32 and 64 bit.
The patch below was applied to 5.2/5.3 in January 2016 to address this issue.
It seemed at the time that this was not needed for 5.0 and indeed
there have been 4 releases 5.0.3 5.0.4 5.0.5 and 5.0.6 since then without it.
Do you advise using the current code to release 5.0.7 mingw 32/64 bit builds
as we did for previous 5.0 versions?
Or would you prefer to apply the patch before releasing 5.0.7?
Does the patched version interfere with the raise console operation in your tests?
Ethan
--- wxt_gui.cpp 2015/09/01 00:02:44 1.151
+++ wxt_gui.cpp 2016/01/04 22:47:18 1.152
@@ -1,5 +1,5 @@
/*
- * $Id: wxt_gui.cpp,v 1.151 2015/09/01 00:02:44 sfeam Exp $
+ * $Id: wxt_gui.cpp,v 1.152 2016/01/04 22:47:18 sfeam Exp $
*/
/* GNUPLOT - wxt_gui.cpp */
@@ -1466,7 +1466,7 @@
* to prevent focus stealing) and is inconsistent with global bindings mechanism ) */
void wxtPanel::RaiseConsoleWindow()
{
-#ifdef USE_GTK
+#if defined(USE_GTK) && (GTK_MAJOR_VERSION == 2)
char *window_env;
unsigned long windowid = 0;
/* retrieve XID of gnuplot window */
@@ -3167,7 +3167,7 @@
* Refresh() also must be called, otherwise
* the raise won't happen immediately */
window->frame->panel->Refresh(false);
- gdk_window_raise(window->frame->GetHandle()->window);
+ gdk_window_raise(gtk_widget_get_window(window->frame->GetHandle()));
#else
window->frame->Restore();
window->frame->Raise();
@@ -3180,7 +3180,7 @@
{
#ifdef USE_GTK
window->frame->panel->Refresh(false);
- gdk_window_lower(window->frame->GetHandle()->window);
+ gdk_window_lower(gtk_widget_get_window(window->frame->GetHandle()));
#else
window->frame->Lower();
#endif /* USE_GTK */
>
> Tatsuro
>
>
>
> ----- Original Message -----
> >From: Tatsuro MATSUOKA <tma...@ya...>
> >To: Merritt Ethan <sf...@us...>; gnu...@li...; tma...@ya...
> >Date: 2017/8/14, Mon 19:07
> >Subject: Re: test-build tarball for gnuplot 5.0.7
> >
> >
> >I tried to build 5.0.7 on the Cygwin 32 and 64 bits.
> >For 32 bit, build was in successful.
> >For 64 bit, build was in failure.
> >
> >
> >gcc -g -O2 -L/usr/local/lib -lcerf -o gnuplot_x11.exe gnuplot_x11-gplt_x11.o gnuplot_x11-gpexecute.o gnuplot_x11-getcolor.o gnuplot_x11-version.o -lX11 -lcaca -lcerf -lz -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lcairo -lglib-2.0 -lintl
> >../../gnuplot-5.0.7/src/wxterminal/wxt_gui.cpp: In member function 'void wxtPanel::RaiseConsoleWindow()':
> >../../gnuplot-5.0.7/src/wxterminal/wxt_gui.cpp:1552:51: error: 'gdk_window_foreign_new' was not declared in this scope
> >
> gdk_window_raise(gdk_window_foreign_new(windowid));
> > ^
> >../../gnuplot-5.0.7/src/wxterminal/wxt_gui.cpp: In function 'void wxt_raise_window(wxt_window_t*, bool)':
> >../../gnuplot-5.0.7/src/wxterminal/wxt_gui.cpp:3123:48: error: 'GtkWidget {aka struct _GtkWidget}' has no member named 'window'
> > gdk_window_raise(window->frame->GetHandle()->window);
> >
> ^
> >../../gnuplot-5.0.7/src/wxterminal/wxt_gui.cpp: In function 'void wxt_lower_window(wxt_window_t*)':
> >../../gnuplot-5.0.7/src/wxterminal/wxt_gui.cpp:3141:47: error: 'GtkWidget {aka struct _GtkWidget}' has no member named 'window'
> > gdk_window_lower(window->frame->GetHandle()->window);
> > ^
> >make[4]: *** [Makefile:984: wxterminal/wxt_gui.o] Error 1
> >make[4]: Leaving directory '/cygdrive/d/usr/Tatsu/cyg64work/gnuplot/5.0.7-test/build-release/src'
> >make[3]: *** [Makefile:1027: all-recursive] Error 1
> >make[3]: Leaving directory '/cygdrive/d/usr/Tatsu/cyg64work/gnuplot/5.0.7-test/build-release/src'
> >make[2]: *** [Makefile:644: all] Error 2
> >make[2]:
> Leaving directory '/cygdrive/d/usr/Tatsu/cyg64work/gnuplot/5.0.7-test/build-release/src'
> >make[1]: *** [Makefile:419: all-recursive] Error 1
> >make[1]: Leaving directory '/cygdrive/d/usr/Tatsu/cyg64work/gnuplot/5.0.7-test/build-release'
> >make: *** [Makefile:357: all] Error 2
> >
> >
> >gnuplot.exe was not built.
> >
> >
> >
> >Tatsuro
> >
> >
> >----- Original Message -----
> >>From: sfeam via gnuplot-beta <gnu...@li...>
> >>To: gnuplot-beta <gnu...@li...>
> >>Date: 2017/8/14, Mon 07:25
> >>Subject: test-build tarball for gnuplot 5.0.7
> >>
> >>I have uploaded a tarball for 5.0.7 to the "5.0 Release Candidates"
> >>area on SourceForge.
> >>
> >>https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0%20release%20candidates/
> >> gp507-buildtestonly.tar.gz
> >>
> >>Please use this only to test building and packaging on Windows
> >>or other platforms. I will wait for reports of success or problems
> >>before uploading an official release of the 5.0.7 source tarball to
> >>its own separate release directory on
> SourceForge.
> >>
> >>gnuplot 5.0.7 will probably be the last release in the 5.0 series.
> >>After this we can concentrate attention on releasing 5.2 and
> >>continued development in 5.3.
> >>
> >> thanks for testing when you have time (there is no hurry)
> >>
> >> Ethan
> >>
> >>
> >>------------------------------------------------------------------------------
> >>Check out the vibrant tech community on one of the world's most
> >>engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> >>_______________________________________________
> >>gnuplot-beta mailing list
> >>gnu...@li...
> >>Membership management via: https://lists.sourceforge.net/lists/listinfo/gnuplot-beta
> >>
> >>
> >>
> >
> >
|