Merge lp:~muktupavels/compiz/gnome into lp:compiz/0.9.13

[Alberts Muktupāvels]

Fix GNOME building.

This change gives nice green Yes in cmake configure output.

[Dmitry Shachnev (mitya57)]

LGTM, let’s include this in the next upload.

review: Approve

=== modified file 'debian/compiz-gnome.install'
--- debian/compiz-gnome.install	2016-07-04 10:12:34 +0000
+++ debian/compiz-gnome.install	2019-02-05 01:42:37 +0000
@@ -5,6 +5,5 @@
 usr/bin/gtk-window-decorator
 usr/lib/*/compizconfig/backends/libgsettings.so
 usr/lib/*/libcompizconfig_gsettings_backend.so
-usr/share/applications/compiz.desktop usr/share/gnome/wm-properties/
 usr/share/glib-2.0/schemas/*.xml
 usr/share/gnome-control-center

=== modified file 'debian/rules'
--- debian/rules	2019-01-03 18:56:07 +0000
+++ debian/rules	2019-02-05 01:42:37 +0000
@@ -51,10 +51,6 @@
         # remove acceptance test binary
 	rm -f debian/tmp/usr/bin/compiz_autopilot_acceptance_tests
 
-	# ugly hack to install xml files
-	mkdir -p debian/tmp/usr/share/gnome-control-center/keybindings
-	find */gtk/gnome -name *.xml | xargs cp -at debian/tmp/usr/share/gnome-control-center/keybindings/
-
 	# work around having a file with a conflicted special name (#1156294)
 	cp debian/compizconfig debian/tmp/config
 

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2017-04-25 08:13:36 +0000
+++ gtk/CMakeLists.txt	2019-02-05 01:42:37 +0000
@@ -37,27 +37,6 @@
             endif (LIBMETACITY_FOUND)
         endif (USE_METACITY)
 
-	if (USE_GNOME)
-	    compiz_pkg_check_modules (GNOME_WINDOW_SETTINGS
-		gnome-window-settings-2.0
-		gnome-desktop-2.0
-	    )
-
-	    if (GNOME_WINDOW_SETTINGS_FOUND)
-	        exec_program (${PKG_CONFIG_EXECUTABLE} 
-		  ARGS "--variable=prefix gnome-window-settings-2.0" 
-		  OUTPUT_VARIABLE windowsettingsdatadir
-		)
-		set (windowsettingsdatadir ${windowsettingsdatadir}/share)
-		exec_program (${PKG_CONFIG_EXECUTABLE} 
-		  ARGS "--variable=libdir gnome-window-settings-2.0"
-		  OUTPUT_VARIABLE windowsettingslibdir
-		)
-	    else (GNOME_WINDOW_SETTINGS_FOUND)
-		compiz_set (USE_GNOME 0)
-	    endif (GNOME_WINDOW_SETTINGS_FOUND)
-	endif (USE_GNOME)
-
     else (GTK_WINDOW_DECORATOR_FOUND)
 	compiz_set (USE_GTK 0)
     endif (GTK_WINDOW_DECORATOR_FOUND)

=== modified file 'gtk/gnome/CMakeLists.txt'
--- gtk/gnome/CMakeLists.txt	2012-12-05 13:26:30 +0000
+++ gtk/gnome/CMakeLists.txt	2019-02-05 01:42:37 +0000
@@ -10,27 +10,23 @@
     )
 
     set (_keybindings_files
-	 50-compiz-navigation.xml.in
-	 50-compiz-windows.xml.in)
+	 50-compiz-navigation.xml
+	 50-compiz-windows.xml)
 
     set (_keybindings_files_translated "")
 
     foreach (_keybinding_file ${_keybindings_files})
-	string (LENGTH ${_keybinding_file} _str_len)
-	math (EXPR _str_len_no_in "${_str_len} - 3")
-	string (SUBSTRING ${_keybinding_file} 0 ${_str_len_no_in} _keybinding_file_no_in)
-
-	compiz_translate_xml (${CMAKE_CURRENT_SOURCE_DIR}/${_keybinding_file}
-			      ${CMAKE_CURRENT_BINARY_DIR}/${_keybinding_file_no_in} NOTRANSLATIONS)
-
-	list (APPEND _keybindings_files_translated ${CMAKE_CURRENT_BINARY_DIR}/${_keybinding_file_no_in})
+	compiz_translate_xml (${CMAKE_CURRENT_SOURCE_DIR}/${_keybinding_file}.in
+			      ${CMAKE_CURRENT_BINARY_DIR}/${_keybinding_file} NOTRANSLATIONS)
+
+	list (APPEND _keybindings_files_translated ${CMAKE_CURRENT_BINARY_DIR}/${_keybinding_file})
     endforeach (_keybinding_file ${keybinding_files})
 
     add_custom_target (compiz-gnome-keybindings ALL DEPENDS
 		       ${_keybindings_files_translated})
 
     install (
-	FILES ${_keybinding_files_translated}
+	FILES ${_keybindings_files_translated}
 	DESTINATION ${datadir}/gnome-control-center/keybindings
     )