File gtksurf-includes.diff of Package surf

Overview Repositories Revisions Requests Users Attributes Meta

File gtksurf-includes.diff of Package surf

--- configure.in
+++ configure.in
@@ -90,6 +90,7 @@
 dnl ==============================================
 
 AC_CHECK_FUNCS(gdk_draw_bitmap)
+AC_CHECK_FUNCS(gdk_draw_drawable)
 
 dnl check for libglade:
 dnl ===================
--- src/Kernel.cc
+++ src/Kernel.cc
@@ -26,6 +26,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <cstring>
 
 int Kernel::kernel_pid;
 int Kernel::kernel_input_fd;
@@ -92,7 +93,7 @@
 			Misc::syscall_failed("dup2()");
 		}
 
-		execl(kernel_path.c_str(), kernel_path.c_str(), 0);
+		execl(kernel_path.c_str(), kernel_path.c_str(), "--kernel", NULL);
 		std::cerr << "\nERROR: Did you install the surf kernel properly?\n\n";
 		std::string s = "execl(\"";
 		s += kernel_path.c_str();
--- src/Misc.cc
+++ src/Misc.cc
@@ -13,6 +13,8 @@
 
 #include <errno.h>
 #include<iostream>
+#include<cstring>
+#include<cstdlib>
 
 void Misc::syscall_failed(const std::string& txt, bool fatal)
 {
--- src/PrefsWindow.cc
+++ src/PrefsWindow.cc
@@ -18,6 +18,7 @@
 #include <Misc.h>
 
 #include<iostream>
+#include<cstdlib>
 
 #ifdef HAVE_STRINGSTREAM
 #  include<sstream>
--- src/ScriptWindow.cc
+++ src/ScriptWindow.cc
@@ -96,7 +96,7 @@
 {
 	GtkStyle* style = gtk_style_copy(gtk_widget_get_default_style());
 	if(font.length() > 0) {
-		style->font = gdk_font_load(font.c_str());
+		gtk_style_set_font(style, gdk_font_load(font.c_str()));
 	}
 	gtk_widget_set_style(Glade::get_widget("text_script"), style);
 }
--- src/gdk_draw_bitmap.cc
+++ src/gdk_draw_bitmap.cc
@@ -8,7 +8,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef HAVE_GDK_DRAW_BITMAP
+#ifndef HAVE_GDK_DRAW_DRAWABLE
 
 #include <gdk_draw_bitmap.h>
 
@@ -58,3 +63,4 @@
 }
 
 #endif
+#endif
--- src/gdk_draw_bitmap.h
+++ src/gdk_draw_bitmap.h
@@ -13,6 +13,7 @@
 #define GDK_DRAW_BITMAP_H
 
 #ifndef HAVE_GDK_DRAW_BITMAP
+#ifndef HAVE_GDK_DRAW_DRAWABLE
 
 #include <gdk/gdk.h>
 
@@ -29,5 +30,6 @@
 		     gint height);
 
 #endif
+#endif
 
 #endif //!GDK_DRAW_BITMAP_H

Places

File gtksurf-includes.diff of Package surf

Places