aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwspeedy <ns@bigbear.dk>2024-03-21 17:47:57 +0100
committerhwspeedy <ns@bigbear.dk>2024-03-21 17:48:32 +0100
commit2baec87e48944cdf77099299af0f656ca49aed9d (patch)
treed193343c00cea70ca1862c5e3c234915d1b9f147
parent8629e9a2e9c1a88007bed7a6e79ebacd7a750d10 (diff)
FIX for very old distros for new guibench
-rw-r--r--CMakeLists.txt6
-rw-r--r--modules/benchmark/guibench.c5
2 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f243d31a..82987c1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,20 +131,16 @@ if(${disversion} LESS 6.99)
if((${distro} MATCHES "Red*" OR ${distro} MATCHES "CentOS*" OR ${distro} MATCHES "Oracle*" OR ${distro} MATCHES "openSUSE*" OR ${distro} MATCHES "SUSE*"))
message("RPM EL6 - GTK2 - deprecated - support will end at any time")
message("RPM EL6 - LS24 - deprecated version 2.34.3 - but ok")
- #old deprecated GTK2 - support will end at any time
set(HARDINFO2_GTK3 0)
- #old deprecated version - but ok
set(PACKAGE_LIBSOUP2_MINVERSION 2.34.3)
endif()
endif()
#debian 7
if(${distro}${disversion} MATCHES "DebianGNULinux7")
- message("DEB 7 - GTK2 - deprecated - support will end at any time")
+ message("DEB 7 - GTK2 to avoid c11 for ubergraph - deprecated - support will end at any time")
message("DEB 7 - LS24 - deprecated version 2.34.3 - but ok")
- #old deprecated GTK2 - support will end at any time
set(HARDINFO2_GTK3 0)
- #old deprecated version - but ok
set(PACKAGE_LIBSOUP2_MINVERSION 2.34.3)
endif()
diff --git a/modules/benchmark/guibench.c b/modules/benchmark/guibench.c
index 8d8aaff3..dac75ead 100644
--- a/modules/benchmark/guibench.c
+++ b/modules/benchmark/guibench.c
@@ -43,10 +43,10 @@ gboolean on_draw (GtkWidget *widget, GdkEventExpose *event, gpointer data) {
int i;
cairo_t * cr;
GdkWindow* window = gtk_widget_get_window(widget);
- cairo_region_t * cairoRegion = cairo_region_create();
#if GTK_CHECK_VERSION(3,0,0)
+ cairo_region_t * cairoRegion = cairo_region_create();
GdkDrawingContext * drawingContext;
drawingContext = gdk_window_begin_draw_frame (window,cairoRegion);
@@ -113,7 +113,9 @@ gboolean on_draw (GtkWidget *widget, GdkEventExpose *event, gpointer data) {
}
// cleanup
+#if GTK_CHECK_VERSION(3,0,0)
cairo_region_destroy(cairoRegion);
+#endif
return FALSE;
}
@@ -122,7 +124,6 @@ gboolean on_draw (GtkWidget *widget, GdkEventExpose *event, gpointer data) {
double guibench(double *frameTime, int *frameCount)
{
GtkWindow * window;
- cairo_region_t *region;
cairo_t *cr;
frametime=frameTime;