Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (bbbe3c86d23f3c134fe252be6d3063ded28b6985)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (bbbe3c86d23f3c134fe252be6d3063ded28b6985)
  • Date: Mon, 28 Sep 2009 17:16:52 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

xfce-plugins/xfce4-xkb-plugin/HISTORY |
5 ++
xfce-plugins/xfce4-xkb-plugin/PRE_BUILD |
3 +
xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch |
21 ++++++++++
xfce/xfce4-settings/HISTORY |
5 ++
xfce/xfce4-settings/PRE_BUILD |
3 +
xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch |
12 +++++
6 files changed, 49 insertions(+)

New commits:
commit bbbe3c86d23f3c134fe252be6d3063ded28b6985
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

xfce4-xkb-plugin: Added Gentoo patch to fix build problem with
libxklavier 4.0

commit 910e32ee8996e73b8f270d21a16b6d9ea93a2ba8
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

xfce4-settings: Added Gentoo patch to fix build issue with
libxklavier 4.0.

diff --git a/xfce-plugins/xfce4-xkb-plugin/HISTORY
b/xfce-plugins/xfce4-xkb-plugin/HISTORY
index 2f3f920..0fd5b86 100644
--- a/xfce-plugins/xfce4-xkb-plugin/HISTORY
+++ b/xfce-plugins/xfce4-xkb-plugin/HISTORY
@@ -1,3 +1,8 @@
+2009-09-27 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added to apply Gentoo patch
+ * xfce4-xkb-plugin-0.5.3.3-libxklavier.patch: Gentoo patch to
+ fix build issues with libxklavier 4.0
+
2009-03-06 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.5.3.3

diff --git a/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD
b/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD
new file mode 100755
index 0000000..0fec640
--- /dev/null
+++ b/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
diff --git
a/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
new file mode 100644
index 0000000..eb123f2
--- /dev/null
+++ b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
@@ -0,0 +1,21 @@
+diff -ur panel-plugin/xkb-config.c panel-plugin/xkb-config.c
+--- panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200
++++ panel-plugin/xkb-config.c 2009-07-20 18:40:34.000000000 +0300
+@@ -150,7 +150,7 @@
+ config->application_map = g_hash_table_new (g_direct_hash, NULL);
+
+ registry = xkl_config_registry_get_instance (config->engine);
+- xkl_config_registry_load (registry);
++ xkl_config_registry_load (registry, FALSE);
+
+ config_item = xkl_config_item_new ();
+
+@@ -547,7 +547,7 @@
+ if (!config) return NULL;
+
+ registry = xkl_config_registry_get_instance (config->engine);
+- xkl_config_registry_load (registry);
++ xkl_config_registry_load (registry, FALSE);
+
+ return registry;
+ }
diff --git a/xfce/xfce4-settings/HISTORY b/xfce/xfce4-settings/HISTORY
index d726742..835d823 100644
--- a/xfce/xfce4-settings/HISTORY
+++ b/xfce/xfce4-settings/HISTORY
@@ -1,3 +1,8 @@
+2009-09-27 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added to apply Gentoo patch
+ * xfce4-settings-4.6.1-libxklavier.patch: Gentoo patch to
+ fix build issues with libxklavier 4.0
+
2009-08-07 Donald Johnson <ltdonny AT gmail.com>
* DEPENDS: added libglade2 and libwnck deps

diff --git a/xfce/xfce4-settings/PRE_BUILD b/xfce/xfce4-settings/PRE_BUILD
new file mode 100755
index 0000000..8d24c83
--- /dev/null
+++ b/xfce/xfce4-settings/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/xfce4-settings-4.6.1-libxklavier.patch
diff --git a/xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch
b/xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch
new file mode 100644
index 0000000..a0e0376
--- /dev/null
+++ b/xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch
@@ -0,0 +1,12 @@
+diff -ur dialogs/keyboard-settings/xfce-keyboard-settings.c
dialogs/keyboard-settings/xfce-keyboard-settings.c
+--- dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-03-02
19:48:00.000000000 +0200
++++ dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-07-20
12:08:28.000000000 +0300
+@@ -378,7 +378,7 @@
+ xkl_config_rec_get_from_server (settings->priv->xkl_rec_config,
settings->priv->xkl_engine);
+
+ settings->priv->xkl_registry = xkl_config_registry_get_instance
(settings->priv->xkl_engine);
+- xkl_config_registry_load (settings->priv->xkl_registry);
++ xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
+
+ /* Tab */
+ xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml,
"xkb_tab_layout_vbox");



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (bbbe3c86d23f3c134fe252be6d3063ded28b6985), George Sherwood, 09/28/2009

Archive powered by MHonArc 2.6.24.

Top of Page