diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-23 18:13:56 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-23 18:13:56 +0000 |
commit | c8d1841ba7daf1709161636818a1b4a5b02da669 (patch) | |
tree | 7eefff7b282079ce1c767119918e931fd6c423d3 /science/kst2/files | |
parent | 5181706dacded77f4f89a3d98994f1dbdeb4750f (diff) |
Notes
Diffstat (limited to 'science/kst2/files')
-rw-r--r-- | science/kst2/files/patch-kst.pri | 10 | ||||
-rw-r--r-- | science/kst2/files/patch-kst__src__widgets__Makefile.am | 32 | ||||
-rw-r--r-- | science/kst2/files/patch-src__libkst__libkst.pro | 13 | ||||
-rw-r--r-- | science/kst2/files/patch-src__libkst__measuretime.cpp | 20 |
4 files changed, 43 insertions, 32 deletions
diff --git a/science/kst2/files/patch-kst.pri b/science/kst2/files/patch-kst.pri new file mode 100644 index 000000000000..14aa1232e08f --- /dev/null +++ b/science/kst2/files/patch-kst.pri @@ -0,0 +1,10 @@ +--- ./kst.pri.orig 2010-08-10 11:48:14.000000000 +0400 ++++ ./kst.pri 2010-08-23 20:35:48.741714646 +0400 +@@ -23,7 +23,6 @@ + QT += core xml + + CONFIG += warn_on +-!win32:CONFIG += silent + + DEBUG_MODE = $$(KST_DEBUG_MODE) + contains(DEBUG_MODE, 1) { diff --git a/science/kst2/files/patch-kst__src__widgets__Makefile.am b/science/kst2/files/patch-kst__src__widgets__Makefile.am deleted file mode 100644 index acc4f8bd50ea..000000000000 --- a/science/kst2/files/patch-kst__src__widgets__Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ ---- ./kst/src/widgets/Makefile.am.orig 2010-03-29 15:24:46.000000000 +0400 -+++ ./kst/src/widgets/Makefile.am 2010-04-24 00:28:43.386713647 +0400 -@@ -12,7 +12,7 @@ - # If you wish to have access to the widgets in the Qt designer uncomment - # the line below, and all other lines starting with ###, and rebuild. - # --# kde_widget_LTLIBRARIES = kstwidgets.la -+kde_widget_LTLIBRARIES = kstwidgets.la - - libkstwidgets_la_SOURCES = \ - kstbackbuffer.cpp \ -@@ -39,16 +39,16 @@ - libkstwidgets_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined - libkstwidgets_la_LIBADD = $(LIB_KIO) ../libkstmath/libkstmath.la - --### kstwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) --### kstwidgets_la_LIBADD = libkstwidgets.la --### kstwidgets_la_SOURCES = kstwidgets.cpp -+kstwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) -+kstwidgets_la_LIBADD = libkstwidgets.la -+kstwidgets_la_SOURCES = kstwidgets.cpp - - METASOURCES=AUTO - - # set the include path for X, qt and KDE - INCLUDES=-I$(top_srcdir)/kst/src/extdate -I$(top_srcdir)/kst/src/libkst -I../libkst -I$(top_srcdir)/kst/src/libkstmath -I$(top_srcdir) $(KMDI_INCLUDES) $(all_includes) - --### kstwidgets.lo: curveappearancewidget.h curveplacementwidget.h datarangewidget.h editmultiplewidget.h fftoptionswidget.h matrixselector.h scalarselector.h stringselector.h vectorselector.h comboboxselection.h -+kstwidgets.lo: curveappearancewidget.h curveplacementwidget.h datarangewidget.h editmultiplewidget.h fftoptionswidget.h matrixselector.h scalarselector.h stringselector.h vectorselector.h comboboxselection.h - scalarselector.lo: comboboxselection.h - vectorselector.lo: comboboxselection.h - matrixselector.lo: comboboxselection.h diff --git a/science/kst2/files/patch-src__libkst__libkst.pro b/science/kst2/files/patch-src__libkst__libkst.pro new file mode 100644 index 000000000000..bfcb831d2c03 --- /dev/null +++ b/science/kst2/files/patch-src__libkst__libkst.pro @@ -0,0 +1,13 @@ +--- ./src/libkst/libkst.pro.orig 2010-04-27 16:37:12.000000000 +0400 ++++ ./src/libkst/libkst.pro 2010-05-20 01:18:58.740810983 +0400 +@@ -61,8 +61,8 @@ + vscalar.cpp + + #!win32:SOURCES += stdinsource.cpp +-!macx:!win32:SOURCES += sysinfo.c \ +- psversion.c ++# !macx:!win32:SOURCES += sysinfo.c \ ++# psversion.c + + HEADERS += builtindatasources.h \ + builtinprimitives.h \ diff --git a/science/kst2/files/patch-src__libkst__measuretime.cpp b/science/kst2/files/patch-src__libkst__measuretime.cpp new file mode 100644 index 000000000000..8fa4d890e385 --- /dev/null +++ b/science/kst2/files/patch-src__libkst__measuretime.cpp @@ -0,0 +1,20 @@ +--- ./src/libkst/measuretime.cpp.orig 2009-12-01 10:15:36.000000000 +0300 ++++ ./src/libkst/measuretime.cpp 2010-02-19 00:41:22.998033638 +0300 +@@ -67,7 +67,7 @@ + started = st.QuadPart * frequency; + #else + timespec t; +- clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t); ++ clock_gettime(CLOCK_PROF, &t); + started = 1.0 * t.tv_sec + 1e-9 * t.tv_nsec; + #endif + interval = 0; +@@ -82,7 +82,7 @@ + double now = st.QuadPart * frequency; + #else + timespec t; +- clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t); ++ clock_gettime(CLOCK_PROF, &t); + double now = 1.0 * t.tv_sec + 1e-9 * t.tv_nsec; + #endif + interval += now - started; |