Hello community,
here is the log from the commit of package unity-gtk-module for
openSUSE:Factory checked in at 2017-11-30 12:44:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unity-gtk-module (Old)
and /work/SRC/openSUSE:Factory/.unity-gtk-module.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unity-gtk-module"
Thu Nov 30 12:44:32 2017 rev:3 rq:545342 version:0.0.0+bzr20170817
Changes:
--------
--- /work/SRC/openSUSE:Factory/unity-gtk-module/unity-gtk-module.changes
2017-10-19 19:32:36.411556733 +0200
+++ /work/SRC/openSUSE:Factory/.unity-gtk-module.new/unity-gtk-module.changes
2017-11-30 12:44:33.259744601 +0100
@@ -1,0 +2,10 @@
+Fri Nov 24 20:58:01 UTC 2017 - sor.ale...@meowr.ru
+
+- Fix unity-gtk-module-gsettings.patch: disable
+ gtk2-shell-shows-menubar by default, as it forcefully changes
+ system's behaviour after a mere package installation
+ (boo#1044790).
+- Use GTK2_MODULES and GTK3_MODULES instead of GTK_MODULES
+ (boo#1048184).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unity-gtk-module.spec ++++++
--- /var/tmp/diff_new_pack.ZkDRnX/_old 2017-11-30 12:44:33.851723080 +0100
+++ /var/tmp/diff_new_pack.ZkDRnX/_new 2017-11-30 12:44:33.855722935 +0100
@@ -122,20 +122,26 @@
%patch0
cat > %{name}.sh << EOF
-if [ -z "\$%{nil}GTK_MODULES" ]; then
- export GTK_MODULES="unity-gtk-module"
-else
- export GTK_MODULES="\$%{nil}GTK_MODULES:%{name}"
+if [ -f "%{_libdir}/gtk-2.0/modules/lib%{name}.so" ]; then
+ export
GTK2_MODULES="\$%{nil}{GTK2_MODULES:+\$%{nil}GTK2_MODULES:}unity-gtk-module"
+fi
+if [ -f "%{_libdir}/gtk-3.0/modules/lib%{name}.so" ]; then
+ export
GTK3_MODULES="\$%{nil}{GTK3_MODULES:+\$%{nil}GTK3_MODULES:}unity-gtk-module"
fi
if [ -z "\$%{nil}UBUNTU_MENUPROXY" ]; then
export UBUNTU_MENUPROXY=1
fi
EOF
cat > %{name}.csh << EOF
-if ( ! \$%{nil}?GTK_MODULES ) then
- setenv GTK_MODULES "unity-gtk-module"
-else
- setenv GTK_MODULES "\$%{nil}{GTK_MODULES}:%{name}"
+if ( -f "%{_libdir}/gtk-2.0/modules/lib%{name}.so" ) then
+ if ( ! \$%{nil}?GTK2_MODULES ) set GTK2_MODULES=""
+ if ( \$%{nil}?GTK2_MODULES ) setenv GTK2_MODULES "\$%{nil}GTK2_MODULES\:"
+ setenv GTK2_MODULES "\$%{nil}{GTK2_MODULES}unity-gtk-module"
+endif
+if ( -f "%{_libdir}/gtk-3.0/modules/lib%{name}.so" ) then
+ if ( ! \$%{nil}?GTK3_MODULES ) set GTK3_MODULES=""
+ if ( \$%{nil}?GTK3_MODULES ) setenv GTK3_MODULES "\$%{nil}GTK3_MODULES\:"
+ setenv GTK3_MODULES "\$%{nil}{GTK3_MODULES}unity-gtk-module"
endif
if ( ! \$%{nil}?UBUNTU_MENUPROXY ) then
setenv UBUNTU_MENUPROXY 1
++++++ unity-gtk-module-gsettings.patch ++++++
--- /var/tmp/diff_new_pack.ZkDRnX/_old 2017-11-30 12:44:33.887721772 +0100
+++ /var/tmp/diff_new_pack.ZkDRnX/_new 2017-11-30 12:44:33.891721626 +0100
@@ -1,21 +1,19 @@
-=== modified file 'data/com.canonical.unity-gtk-module.gschema.xml'
---- data/com.canonical.unity-gtk-module.gschema.xml 2013-11-14 18:51:01
+0000
-+++ data/com.canonical.unity-gtk-module.gschema.xml 2015-04-03 16:28:11
+0000
+--- data/com.canonical.unity-gtk-module.gschema.xml
++++ data/com.canonical.unity-gtk-module.gschema.xml
@@ -11,5 +11,10 @@
<description>List of applications where unity-gtk-module should be
enabled.</description>
<default>[]</default>
</key>
+ <key name="gtk2-shell-shows-menubar" type="b">
+ <summary>Determines GTK2 menus behaviour</summary>
-+ <description>This key is ubuntu gtk patch replacement.</description>
-+ <default>true</default>
++ <description>This key is the ubuntu gtk patch replacement.</description>
++ <default>false</default>
+ </key>
</schema>
</schemalist>
-=== modified file 'src/main.c'
---- src/main.c 2014-06-09 03:50:16 +0000
-+++ src/main.c 2015-04-03 16:46:46 +0000
+--- src/main.c
++++ src/main.c
@@ -43,6 +43,7 @@
#define UNITY_GTK_MODULE_SCHEMA "com.canonical.unity-gtk-module"
#define BLACKLIST_KEY "blacklist"
@@ -28,7 +26,7 @@
}
}
-+#if GTK_MAJOR_VERSION == 3
++#if GTK_CHECK_VERSION (3, 0, 0)
static gboolean
gtk_widget_shell_shows_menubar (GtkWidget *widget)
{
@@ -38,9 +36,9 @@
}
+#else
+static void
-+g_settings_handle_gtk_shell_shows_menubar (GSettings *settings,
-+ gchar *key,
-+ gpointer user_data)
++g_settings_handle_gtk_shell_shows_menubar (GSettings *settings,
++ gchar *key,
++ gpointer user_data)
+{
+ gtk_widget_queue_resize (user_data);
+}
@@ -48,11 +46,11 @@
+static gboolean
+gtk_widget_shell_shows_menubar (GtkWidget *widget)
+{
-+ GSettings* settings =
G_SETTINGS(g_object_get_data(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA));
++ GSettings *settings = G_SETTINGS (g_object_get_data (G_OBJECT (widget),
UNITY_GTK_MODULE_SCHEMA));
+ if (settings == NULL)
+ {
-+ settings = g_settings_new(UNITY_GTK_MODULE_SCHEMA);
-+
g_object_set_data_full(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA,(gpointer)settings,(GDestroyNotify)g_object_unref);
++ settings = g_settings_new (UNITY_GTK_MODULE_SCHEMA);
++ g_object_set_data_full (G_OBJECT(widget), UNITY_GTK_MODULE_SCHEMA,
(gpointer) settings, (GDestroyNotify) g_object_unref);
+ g_signal_connect (settings, "changed::"SHELL_SHOWS_MENUBAR_KEY,
G_CALLBACK (g_settings_handle_gtk_shell_shows_menubar), widget);
+ }
+ return g_settings_get_boolean (settings,SHELL_SHOWS_MENUBAR_KEY);
@@ -78,15 +76,15 @@
+hijacked_menu_bar_realize (GtkWidget *widget)
+{
+ GtkWidget *window;
-+ GSettings* settings;
++ GSettings *settings;
+
+ g_return_if_fail (GTK_IS_MENU_BAR (widget));
+
-+ settings =
G_SETTINGS(g_object_get_data(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA));
++ settings = G_SETTINGS (g_object_get_data (G_OBJECT(widget),
UNITY_GTK_MODULE_SCHEMA));
+ if (settings == NULL)
+ {
-+ settings = g_settings_new(UNITY_GTK_MODULE_SCHEMA);
-+
g_object_set_data_full(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA,(gpointer)settings,(GDestroyNotify)g_object_unref);
++ settings = g_settings_new (UNITY_GTK_MODULE_SCHEMA);
++ g_object_set_data_full (G_OBJECT(widget), UNITY_GTK_MODULE_SCHEMA,
(gpointer) settings, (GDestroyNotify) g_object_unref);
+ g_signal_connect (settings, "changed::"SHELL_SHOWS_MENUBAR_KEY,
G_CALLBACK (g_settings_handle_gtk_shell_shows_menubar), widget);
+ }
+
@@ -107,13 +105,13 @@
+
+ g_return_if_fail (GTK_IS_MENU_BAR (widget));
+
-+ settings = G_SETTINGS(g_object_get_data
(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA));
++ settings = G_SETTINGS (g_object_get_data
(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA));
+ menu_shell_data = gtk_menu_shell_get_menu_shell_data (GTK_MENU_SHELL
(widget));
+
+ if (settings != NULL)
+ {
+ g_signal_handlers_disconnect_by_data (settings, widget);
-+ g_object_set_data(G_OBJECT(widget),UNITY_GTK_MODULE_SCHEMA,NULL);
++ g_object_set_data (G_OBJECT (widget), UNITY_GTK_MODULE_SCHEMA, NULL);
+ }
+
+ if (menu_shell_data->window != NULL)
