rebase
This commit is contained in:
parent
fe2da7be1c
commit
5073d49d9f
@ -1,9 +1,9 @@
|
||||
diff -up wrk/src/wxterminal/wxt_gui.h.wrk wrk/src/wxterminal/wxt_gui.h
|
||||
--- wrk/src/wxterminal/wxt_gui.h.wrk 2014-02-04 10:48:36.086237421 +0100
|
||||
+++ wrk/src/wxterminal/wxt_gui.h 2014-02-04 10:51:22.246931141 +0100
|
||||
@@ -154,8 +154,9 @@ extern "C" {
|
||||
/* depending on the platform, and mostly because of the Windows terminal which
|
||||
--- wrk/src/wxterminal/wxt_gui.h.wrk 2014-04-15 17:45:55.184153975 +0200
|
||||
+++ wrk/src/wxterminal/wxt_gui.h 2014-04-15 17:48:08.151643628 +0200
|
||||
@@ -155,8 +155,9 @@ extern "C" {
|
||||
* already has its event loop, we may or may not be multithreaded */
|
||||
#ifndef WXT_MONOTHREADED
|
||||
#if defined(__WXGTK__)
|
||||
-# define WXT_MULTITHREADED
|
||||
-#elif defined(__WXMSW__) || defined(__WXMAC__)
|
||||
@ -12,4 +12,4 @@ diff -up wrk/src/wxterminal/wxt_gui.h.wrk wrk/src/wxterminal/wxt_gui.h
|
||||
+//#elif defined(__WXMSW__) || defined(__WXMAC__)
|
||||
# define WXT_MONOTHREADED
|
||||
#else
|
||||
# error "wxt does not know if this platform has to be mono- or multi-threaded"
|
||||
# error "wxt does not know if this platform has to be single- or multi-threaded"
|
||||
|
@ -1,13 +1,13 @@
|
||||
%global major 4
|
||||
%global minor 6
|
||||
%global patchlevel 4
|
||||
%global patchlevel 5
|
||||
|
||||
%global x11_app_defaults_dir %{_datadir}/X11/app-defaults
|
||||
|
||||
Summary: A program for plotting mathematical expressions and data
|
||||
Name: gnuplot
|
||||
Version: %{major}.%{minor}.%{patchlevel}
|
||||
Release: 3%{?dist}
|
||||
Release: 1%{?dist}
|
||||
# MIT .. term/PostScript/aglfn.txt
|
||||
License: gnuplot and MIT
|
||||
Group: Applications/Engineering
|
||||
@ -319,6 +319,9 @@ fi
|
||||
%{_datadir}/texmf/tex/latex/gnuplot/
|
||||
|
||||
%changelog
|
||||
* Tue Apr 15 2014 Frantisek Kluknavsky <fkluknav@redhat.com> - 4.6.5-1
|
||||
- rebase
|
||||
|
||||
* Tue Feb 04 2014 Frantisek Kluknavsky <fkluknav@redhat.com> - 4.6.4-3
|
||||
- changed wxt terminal to monothreaded - avoid crash when unlocking a free mutex
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user