Merge lp:~midori/midori/execinfo into lp:midori

[Cris Dywan]

Check if execinfo.h header exists on BSD

[lp:~midori/midori/execinfo]

6397. By André Stösel on 2013-09-17

fix backtrace check for bsd

[André Stösel (ivaldi)]

cmake didn't work for me - i changes some things, but i'm not a cmake expert :/

review: Approve

[Olivier Duchateau (duchateau-olivier)]

I'm sorry, but even patch is correct, I noticed in extensions box, this message:

/usr/local/lib/midori/libdevpet.so: Undefined symbol "backtrace_symbol"

So I think devpet need to be disable under BSD systems (we use same package).

Below new patch:

I don't know if libexecinfo.so is present in Window, perhaps we can make simpler test, like this

if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")

endif ()

--- ./extensions/CMakeLists.txt.orig 2013-09-17 10:59:53.000000000 +0000
+++ ./extensions/CMakeLists.txt 2013-09-17 14:46:05.000000000 +0000
@@ -24,6 +24,13 @@
          "nsplugin-manager.vala"
          )
 endif ()
+string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
+string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
+if (BSD)
+ list(REMOVE_ITEM EXTENSIONS
+ "devpet.vala"
+ )
+endif ()

 foreach(UNIT_SRC ${EXTENSIONS})
     string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)

review: Needs Fixing

[André Stösel (ivaldi)]

so "if (HAVE_EXECINFO_H)" is true for you?
maybe we need to link against some lib?

however, devpet works without backtrace support too -> we just need to remove "-D HAVE_EXECINFO_H"

[Olivier Duchateau (duchateau-olivier)]

> cmake didn't work for me - i changes some things, but i'm not a cmake expert
> :/

I tested your latest revision (r6397), but I get same behaviour "Undefined symbol"

If I add CFLAGS -lexecinfo, Midori crashes (at start time), when devpet is enabled (without error, or warning message).

Unfortunately I not able to analize coredump.

Here patches which prevent building this extension.

--- ./extensions/CMakeLists.txt.orig 2013-09-17 10:59:53.000000000 +0000
+++ ./extensions/CMakeLists.txt 2013-09-17 14:46:05.000000000 +0000
@@ -24,6 +24,13 @@
          "nsplugin-manager.vala"
          )
 endif ()
+string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
+string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
+if (BSD)
+ list(REMOVE_ITEM EXTENSIONS
+ "devpet.vala"
+ )
+endif ()

 foreach(UNIT_SRC ${EXTENSIONS})
     string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)

--- ./extensions/wscript_build.orig 2013-08-14 18:32:02.000000000 +0000
+++ ./extensions/wscript_build 2013-09-17 17:55:12.000000000 +0000
@@ -4,8 +4,12 @@

 import Options
 import os
+import sys

 extensions = os.listdir ('extensions')
+if 'bsd' in sys.platform:
+ if 'devpet.vala' in extensions:
+ extensions.remove('devpet.vala')
 for extension in extensions:
     # FIXME In the absense of a proper mechanism, transfers is a stock extension
     if not bld.env['addons'] and extension != 'transfers.vala':

[lp:~midori/midori/execinfo]

6398. By André Stösel on 2013-09-22

disable devpets backtrace support for freebsd

[André Stösel (ivaldi)]

should work now

[Cris Dywan (kalikiana)]

Looks like a sensible compromise.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-16 23:18:48 +0000
+++ CMakeLists.txt	2013-09-22 11:07:36 +0000
@@ -70,8 +70,7 @@
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_WIN32)
 endif ()
 
-string(FIND ${CMAKE_SYSTEM_NAME} "FreeBSD" FREEBSD)
-if (FREEBSD GREATER -1)
+if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_FREEBSD)
 endif ()
 
@@ -82,6 +81,17 @@
     add_definitions("-DHAVE_OSX=0")
 endif ()
 
+# Check if execinfo.h header exists
+string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
+if (${BEGIN} GREATER 0)
+    string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
+else()
+    set(BSD 0)
+endif()
+if (UNIX AND NOT BSD)
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_EXECINFO_H)
+endif ()
+
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED
                   libxml-2.0>=2.6
 
=== modified file 'extensions/devpet.vala'
--- extensions/devpet.vala	2013-09-17 22:12:02 +0000
+++ extensions/devpet.vala	2013-09-22 11:07:36 +0000
@@ -96,7 +96,7 @@
             Gtk.VBox vbox = new Gtk.VBox (false, 1);
             this.add (vbox);
 
-            #if !HAVE_WIN32
+            #if HAVE_EXECINFO_H
             Gtk.Label label = new Gtk.Label (_("Double click for more information"));
             vbox.pack_start (label, false, false, 0);
             #endif
@@ -123,7 +123,7 @@
                 -1, "Message",
                 new Gtk.CellRendererText (), "text", TreeCells.MESSAGE);
 
-            #if !HAVE_WIN32
+            #if HAVE_EXECINFO_H
             treeview.row_activated.connect (this.row_activated);
             #endif
 
@@ -174,7 +174,7 @@
                 this.trayicon.set_from_stock (stock);
             }
 
-            #if !HAVE_WIN32
+            #if HAVE_EXECINFO_H
                 string bt = "";
                 void* buffer[100];
                 int num = Linux.backtrace (buffer, 100);
@@ -191,7 +191,7 @@
             this.list_store.append (out iter);
             this.list_store.set (iter,
                 TreeCells.MESSAGE, message,
-                #if !HAVE_WIN32
+                #if HAVE_EXECINFO_H
                 TreeCells.BACKTRACE, bt,
                 #endif
                 TreeCells.STOCK, stock);
 
=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-09-03 14:45:17 +0000
+++ midori/midori.vapi	2013-09-22 11:07:36 +0000
@@ -263,7 +263,7 @@
     #endif
     }
 
-    #if !HAVE_WIN32
+    #if HAVE_EXECINFO_H
     [CCode (lower_case_cprefix = "")]
     namespace Linux {
         [CCode (cheader_filename = "execinfo.h", array_length = false)]
 
=== modified file 'wscript'
--- wscript	2013-08-21 23:24:00 +0000
+++ wscript	2013-09-22 11:07:36 +0000
@@ -228,6 +228,8 @@
     elif sys.platform != 'darwin':
         if sys.platform.startswith ('freebsd'):
             conf.env.append_value ('VALAFLAGS', '-D HAVE_FREEBSD')
+        else:
+            conf.env.append_value ('VALAFLAGS', '-D HAVE_EXECINFO_H')
 
         check_pkg ('x11')
         # Pass /usr/X11R6/include for OpenBSD