Merge lp:~midori/midori/snapcraft into lp:midori

[Cris Dywan]

Snap packaging

Adds a snapcraft.yaml to build a Midori snap, built with WebKit2 and GTK+3.

This also includes a CMake build fix, a missing icon info NULL-check and uses a simpler hash for the GApplication.name exposed over DBus so that it works with confinement.

[axlrose112 (axlrose112)]

I got Segmentation fault and after ran it with gb I got:

Program received signal SIGSEGV, Segmentation fault.
0x00000008008c18de in midori_view_apply_icon (view=0x856444200, icon=0x856451790, icon_name=0x0)
at /home/jamesaxl/Hacking/LaunchPad/snapcraft/midori/midori-view.c:449
449 g_warning ("Could not load pixbuf for icon '%s': %s\n", icon_name, error->message);

[RabbitBot (rabbitbot-a)]

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'config/CMakeLists.txt'
--- config/CMakeLists.txt	2013-10-11 21:08:57 +0000
+++ config/CMakeLists.txt	2017-10-05 23:14:53 +0000
@@ -6,7 +6,7 @@
 file (GLOB_RECURSE CONFIG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
 list (REMOVE_ITEM CONFIG_FILES "CMakeLists.txt")
 
-if (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
     set(CMAKE_INSTALL_SYSCONFDIR "/etc")
 endif()
 
 
=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2016-01-15 19:18:17 +0000
+++ midori/midori-app.c	2017-10-05 23:14:53 +0000
@@ -593,26 +593,14 @@
         return;
 
     const gchar* config = midori_paths_get_config_dir_for_reading ();
-    gchar* config_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, config, -1);
-    gchar* name_hash = g_compute_checksum_for_string (G_CHECKSUM_MD5, app_name, -1);
-    katze_assign (app_name, g_strconcat (PACKAGE_NAME,
-        "_", config_hash, "_", name_hash, NULL));
+    gchar* config_hash = g_strdup_printf ("%u", g_str_hash (config));
+    gchar* config_hash_truncated = g_strndup (config_hash, 5);
+    katze_assign (app_name, g_strdup_printf (
+        "de.twotoasts.%s-%s", PACKAGE_NAME, config_hash_truncated));
     g_free (config_hash);
-    g_free (name_hash);
+    g_free (config_hash_truncated);
     g_object_notify (G_OBJECT (app), "name");
 
-    GdkDisplay* display = gdk_display_get_default ();
-    #ifdef GDK_WINDOWING_X11
-    /* On X11: :0 or :0.0 which is equivalent */
-    gchar* display_name = g_strndup (gdk_display_get_name (display), 2);
-    #else
-    gchar* display_name = g_strdup (gdk_display_get_name (display));
-    #endif
-    g_strdelimit (display_name, ":.\\/", '_');
-    gchar* instance_name = g_strdup_printf ("de.twotoasts.%s_%s", app_name, display_name);
-    g_free (display_name);
-    katze_assign (app_name, instance_name);
-
     if (midori_debug ("app"))
         g_print ("app registering %s\n", app_name);
     g_object_set (app,
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2016-02-28 00:07:54 +0000
+++ midori/midori-view.c	2017-10-05 23:14:53 +0000
@@ -442,11 +442,14 @@
 #endif
             0);
 
-        pixbuf = gtk_icon_info_load_icon (icon_info, &error);
+        if (icon_info)
+            pixbuf = gtk_icon_info_load_icon (icon_info, &error);
         g_strfreev (icon_names);
         if (pixbuf == NULL) {
-            g_warning ("Could not load pixbuf for icon '%s': %s\n", icon_name, error->message);
-            g_clear_error (&error);
+            if (error != NULL) {
+                g_warning ("Could not load pixbuf for icon '%s': %s\n", icon_name, error->message);
+                g_clear_error (&error);
+            }
 
             /* view->icon cannot be set to NULL, so we simply leave it as-is */
             return;
 
=== added directory 'snap'
=== added file 'snap/snapcraft.yaml'
--- snap/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snap/snapcraft.yaml	2017-10-05 23:14:53 +0000
@@ -0,0 +1,109 @@
+name: midori
+version: bzr
+version-script: |
+  set -x
+  VERSION=$(grep -r "^set(VERSION" CMakeLists.txt | sed -r "s@.+ ([0-9.]+)\)@\1@")
+  REVISION=$(bzr revno)
+  echo $VERSION~r$REVISION
+summary: a lightweight, fast, and free web browser
+description: |
+  Midori is a fast little WebKit browser with support for HTML5. It can manage
+  many open tabs and windows. The URL bar completes history, bookmarks, search
+  engines and open tabs out of the box. Web developers can use the powerful
+  web inspector that is a part of WebKit. Individual pages can easily be turned
+  into web apps and new profiles can be created on demand.
+
+  A number of extensions are included by default:
+
+  * Adblock with support for ABP filter lists and custom rules is built-in.
+  * You can download files with Aria2 or SteadyFlow.
+  * User scripts and styles support a la Greasemonkey.
+  * Managing cookies and scripts via NoJS and Cookie Security Manager.
+  * Switching open tabs in a vertical panel or a popup window.
+
+grade: stable
+confinement: strict
+icon: icons/scalable/apps/midori.svg
+
+apps:
+  midori:
+    command: desktop-launch snapcraft-preload midori
+    plugs:
+      - home
+      - pulseaudio
+      - network
+      - camera
+      - removable-media
+      - unity7
+      - wayland
+      - mir
+      - screen-inhibit-control
+      - password-manager-service
+      - gsettings
+      - network-bind
+      - location-observe
+      - network-status
+    desktop: share/applications/midori.desktop
+    environment:
+      LD_LIBRARY_PATH: $SNAP/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/:$LD_LIBRARY_PATH
+      # Work-around GPU crash https://bugs.webkit.org/show_bug.cgi?id=126122
+      WEBKIT_DISABLE_COMPOSITING_MODE: 1
+      GTK_CSD: 1
+      # No Netscape plugins
+      MOZ_PLUGIN_PATH: /
+
+slots:
+  dbus:
+    name: de.twotoasts.midori
+    bus: session
+
+parts:
+  midori:
+    plugin: cmake
+    configflags:
+      - -DCMAKE_INSTALL_DATADIR=/usr/share
+      - -DHALF_BRO_INCOM_WEBKIT2=1
+      - -DUSE_ZEITGEIST=0
+    build-packages:
+      - bzr
+      - valac
+      - libwebkit2gtk-4.0-dev
+      - libsoup-gnome2.4-dev
+      - libgcr-3-dev
+      - libsqlite3-dev
+      - librsvg2-bin
+      - intltool
+    install: |
+      echo "[settings]\n" \
+      "toolbar-items=" \
+      "TabNew,Back,NextForward,ReloadStop,BookmarkAdd,Location,Trash,CompactMenu\n" \
+      "show-statusbar=false\n" \
+      > $SNAPCRAFT_PART_INSTALL/etc/xdg/midori/config
+    stage-packages:
+      - libwebkit2gtk-4.0-37
+      - libcanberra-gtk3-module
+      - myspell-en-us
+      - gnome-icon-theme-symbolic
+      - gstreamer1.0-x
+      - gstreamer1.0-plugins-base
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-plugins-bad
+      - gstreamer1.0-plugins-ugly
+      - gstreamer1.0-pulseaudio
+      - pulseaudio-module-x11
+      - libmirclient9
+    stage:
+      - -share/applications/midori-private.desktop
+      - -usr/lib/x86_64-linux-gnu/libcups.so.2
+      - -usr/share/doc/libcups2/changelog.Debian.gz
+      - -usr/share/doc
+    after:
+      - desktop-gtk3
+      - snapcraft-preload
+  snapcraft-preload:
+    source: https://github.com/kalikiana/snapcraft-preload.git
+    source-branch: webkitgtk2
+    plugin: cmake
+    build-packages:
+      - gcc-multilib
+      - g++-multilib