The patch for src/unity-quicklist-handler.c at the bottom is like this:

+UnityQuicklistHandler *
+unity_quicklist_handler_get_singleton (void)
+{
+    if (!unity_quicklist_handler_singleton)
+    {
+        unity_quicklist_handler_singleton = unity_quicklist_handler_new ();

It seems it has been cut off from the end.


It should be :

+UnityQuicklistHandler *
+unity_quicklist_handler_get_singleton (void)
+{
+    if (!unity_quicklist_handler_singleton)
+    {
+        unity_quicklist_handler_singleton = unity_quicklist_handler_new ();
+    }
+    return unity_quicklist_handler_singleton;
+}
+
+
+UnityQuicklistHandler *
+unity_quicklist_handler_new (void)
+{
+    return g_object_new (UNITY_TYPE_QUICKLIST_HANDLER, NULL);
+}

-- 
You received this bug notification because you are a member of Desktop
Packages, which is subscribed to nautilus in Ubuntu.
https://bugs.launchpad.net/bugs/1711241

Title:
  Unity support patch doesn't build with nautilus 3.25.90

Status in nautilus package in Ubuntu:
  New

Bug description:
  I have prepared nautilus 3.25.90 in the GNOME3 Staging PPA for Ubuntu
  17.10 "artful".

  The 12_unity_launcher_support.patch has a problem that fails the build
  and I don't know how to fix it so I disabled the patch for now.

  Nautilus 3.25 introduces meson support and drops autotools support so
  that's one factor when I updated the patch.

  But when I disable the patch, nautilus crashes on start in Unity.

  Build log attached.

  Build Log Excerpt
  ==================

  [164/222] cc  -Isrc/nautilus@sta -Isrc -Isubprojects/libgd/libgd -I../src -I. 
-I../ -Isubprojects/libgd -I../subprojects/libgd -I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/at-spi2-atk/2.0 
-I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 
-I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 
-I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircore 
-I/usr/include/mircookie -I/usr/include/harfbuzz -I/usr/include/pango-1.0 
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 
-I/usr/include/freetype2 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 
-I/usr/include/gnome-autoar-0 -I/usr/include/libxml2 
-I/usr/include/zeitgeist-2.0 -I/usr/include/gsettings-desktop-schemas 
-I/usr/include/gail-3.0 -I/usr/include/gnome-desktop-3.0 
-I/usr/include/tracker-2.0 -I/usr/include/tracker-2.0/libtracker-sparql 
-I/usr/include/libexif -I/usr/include/unity/unity -I/usr/include/dee-1.0 
-I/usr/include/libdbusmenu-glib-0.4 -I/usr/include/exempi-2.0 
-fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 
-Wno-deprecated-declarations -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. 
-fstack-protector-strong -Wformat -Werror=format-security -Wdate-time 
-D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_GTK_HACKS=1 -DLIBGD__VIEW_COMMON=1 
-DLIBGD_MAIN_ICON_VIEW=1 -DLIBGD_MAIN_LIST_VIEW=1 -DLIBGD_MAIN_VIEW=1 
-DLIBGD_TAGGED_ENTRY=1 -MMD -MQ 'src/nautilus@sta/unity-quicklist-handler.c.o' 
-MF 'src/nautilus@sta/unity-quicklist-handler.c.o.d' -o 
'src/nautilus@sta/unity-quicklist-handler.c.o' -c 
../src/unity-quicklist-handler.c
  FAILED: src/nautilus@sta/unity-quicklist-handler.c.o
  cc  -Isrc/nautilus@sta -Isrc -Isubprojects/libgd/libgd -I../src -I. -I../ 
-Isubprojects/libgd -I../subprojects/libgd -I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/at-spi2-atk/2.0 
-I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 
-I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 
-I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircore 
-I/usr/include/mircookie -I/usr/include/harfbuzz -I/usr/include/pango-1.0 
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 
-I/usr/include/freetype2 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 
-I/usr/include/gnome-autoar-0 -I/usr/include/libxml2 
-I/usr/include/zeitgeist-2.0 -I/usr/include/gsettings-desktop-schemas 
-I/usr/include/gail-3.0 -I/usr/include/gnome-desktop-3.0 
-I/usr/include/tracker-2.0 -I/usr/include/tracker-2.0/libtracker-sparql 
-I/usr/include/libexif -I/usr/include/unity/unity -I/usr/include/dee-1.0 
-I/usr/include/libdbusmenu-glib-0.4 -I/usr/include/exempi-2.0 
-fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 
-Wno-deprecated-declarations -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. 
-fstack-protector-strong -Wformat -Werror=format-security -Wdate-time 
-D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_GTK_HACKS=1 -DLIBGD__VIEW_COMMON=1 
-DLIBGD_MAIN_ICON_VIEW=1 -DLIBGD_MAIN_LIST_VIEW=1 -DLIBGD_MAIN_VIEW=1 
-DLIBGD_TAGGED_ENTRY=1 -MMD -MQ 'src/nautilus@sta/unity-quicklist-handler.c.o' 
-MF 'src/nautilus@sta/unity-quicklist-handler.c.o.d' -o 
'src/nautilus@sta/unity-quicklist-handler.c.o' -c 
../src/unity-quicklist-handler.c
  ../src/unity-quicklist-handler.c: In function 
‘unity_quicklist_handler_get_singleton’:
  ../src/unity-quicklist-handler.c:154:9: error: expected declaration or 
statement at end of input
           unity_quicklist_handler_singleton = unity_quicklist_handler_new ();
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../src/unity-quicklist-handler.c:154:9: error: expected declaration or 
statement at end of input

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1711241/+subscriptions

-- 
Mailing list: https://launchpad.net/~desktop-packages
Post to     : desktop-packages@lists.launchpad.net
Unsubscribe : https://launchpad.net/~desktop-packages
More help   : https://help.launchpad.net/ListHelp

Reply via email to