Attachment 2017 Details for Bug 11780 – Рабочий вариант патча (лечит только клавиатурный плагин)

[patch] Рабочий вариант патча (лечит только клавиатурный плагин)

01keyboard_makefile.patch (text/plain), 1.68 KB, created by Vitaly A. Ostanin on 2007-06-13 19:34:08 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Vitaly A. Ostanin

Created: 2007-06-13 19:34:08 MSD

Size: 1.68 KB

patch

obsolete

>diff -ru xfce-mcs-plugins-4.4.1.orig/configure.in xfce-mcs-plugins-4.4.1/configure.in
>--- xfce-mcs-plugins-4.4.1.orig/configure.in	2007-04-09 19:52:57 +0400
>+++ xfce-mcs-plugins-4.4.1/configure.in	2007-06-13 19:02:43 +0400
>@@ -225,6 +225,7 @@
> dnl ***********************************
> XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
> XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
>+XDT_CHECK_PACKAGE([LIBXKLAVIER],[libxklavier],[3.2])
> 
> dnl **********************************
> dnl *** Check for xfce-mcs-manager ***
>diff -ru xfce-mcs-plugins-4.4.1.orig/plugins/keyboard_plugin/Makefile.am xfce-mcs-plugins-4.4.1/plugins/keyboard_plugin/Makefile.am
>--- xfce-mcs-plugins-4.4.1.orig/plugins/keyboard_plugin/Makefile.am	2007-01-25 23:50:36 +0300
>+++ xfce-mcs-plugins-4.4.1/plugins/keyboard_plugin/Makefile.am	2007-06-13 19:08:52 +0400
>@@ -18,7 +18,9 @@
> 	shortcuts_plugin.c						\
> 	shortcuts_plugin.h						\
> 	keys_management.c						\
>-	keys_management.h
>+	keys_management.h						\
>+	layouts_settings.c						\
>+	layouts_settings.h
> 
> keyboard_plugin_la_CFLAGS =						\
> 	$(LIBX11_CFLAGS)						\
>@@ -26,7 +28,8 @@
> 	$(LIBXFCEGUI4_CFLAGS)						\
> 	$(XFCE_MCS_MANAGER_CFLAGS)					\
> 	$(XKB_CFLAGS)							\
>-	$(PLATFORM_CFLAGS)
>+	$(PLATFORM_CFLAGS)						\
>+	$(LIBXKLAVIER_CFLAGS)
> 
> keyboard_plugin_la_LDFLAGS =						\
> 	-avoid-version							\
>@@ -36,9 +39,12 @@
> 
> keyboard_plugin_la_LIBADD =						\
> 	$(top_builddir)/plugins/gtk_common/libgtkcommon.la		\
>-	$(LIBX11_LDFLAGS)						\
>+	$(LIBX11_LIBS)						\
>+	$(XFCE_MCS_MANAGER_LIBS)					\
>+	$(LIBXFCEGUI4_LIBS)						\
> 	$(XF86MISC_LIBS)						\
>-	$(XKB_LIBS)
>+	$(XKB_LIBS)							\
>+	$(LIBXKLAVIER_LIBS)
> 
> if HAVE_CYGWIN
> keyboard_plugin_la_LDFLAGS +=						\

Actions: View | Diff

Attachments on bug 11780: 2017