Merge lp:~midori/midori/ubuntults-buildfixes into lp:midori

[Paweł Forysiuk]

Fix building on Ubuntu 12.04

[Cody Garver (codygarver)]

Works on 14.04 and someone on bug report said it works on 12.04 as well. Still need to check the translation changes.

review: Approve

[Cris Dywan (kalikiana)]

There's two notable drawbacks to GETTEXT_CREATE_TRANSLATIONS, it doesn't handle LINGUAS which is more of a nicety than required for survival, and it forcibly updates all po files in the source tree which isn't harmful so much as annoying… having said that, it works and given that no dev hacks on such an old system I'd say it's acceptable - if there's more time one could write a GETTEXT_PROCESS_PO_FILES that works with the old cmake but I wouldn't expect it.

review: Approve

=== modified file 'extensions/adblock.c'
--- extensions/adblock.c	2013-11-04 20:55:58 +0000
+++ extensions/adblock.c	2013-11-10 09:56:20 +0000
@@ -1541,7 +1541,9 @@
 
         for (i = 0; i <= 15; i++)
         {
-            fgets (line, 2000, file);
+            if (!fgets (line, 2000, file))
+                break;
+
             if (strncmp ("! Expires", line, 9) == 0)
             {
                 gchar** parts = g_strsplit (line, " ", 4);

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-11-05 23:09:04 +0000
+++ midori/midori-view.c	2013-11-10 09:56:20 +0000
@@ -4942,7 +4942,7 @@
         #if WEBKIT_CHECK_VERSION (1, 9, 5)
         doc = webkit_web_frame_get_dom_document (frame);
         #else
-        doc = webkit_web_view_get_dom_document (view->web_view);
+        doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
         #endif
 
         WebKitDOMElement* root = webkit_dom_document_query_selector (doc, ":root", NULL);

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2013-09-28 23:06:00 +0000
+++ po/CMakeLists.txt	2013-11-10 09:56:20 +0000
@@ -9,12 +9,16 @@
     endif ()
     message(STATUS "gettext found: ${LANGUAGES}")
     string(REPLACE " " ";" LANGUAGES ${LANGUAGES})
-    foreach(LANG ${LANGUAGES})
-        GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
-                DESTINATION "${CMAKE_INSTALL_FULL_LOCALEDIR}/${LANG}/LC_MESSAGES"
-                RENAME "${GETTEXT_PACKAGE}.mo")
-    endforeach ()
+    if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8")
+        GETTEXT_CREATE_TRANSLATIONS("${CMAKE_CURRENT_SOURCE_DIR}/midori.pot" ALL ${POTFILES})
+    else()
+        foreach(LANG ${LANGUAGES})
+            GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
+            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
+                    DESTINATION "${CMAKE_INSTALL_FULL_LOCALEDIR}/${LANG}/LC_MESSAGES"
+                    RENAME "${GETTEXT_PACKAGE}.mo")
+            endforeach ()
+    endif()
 else ()
     message(STATUS "gettext not found")
 endif ()