summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2009-09-28 19:30:24 -0500
committerGeorge Sherwood2009-09-28 19:30:24 -0500
commit1f5c4a37f49abe3be98bf2e00f67bf338aa9bcc5 (patch)
tree4f27ecbfa778f0b0e3c72539d4a4d83b302fac03
parentbbbe3c86d23f3c134fe252be6d3063ded28b6985 (diff)
xfce4-settings: Updated to version 4.6.3. Never fails as soon as
I added the patch. Upstream released a new version.
-rwxr-xr-xxfce/xfce4-settings/DETAILS6
-rw-r--r--xfce/xfce4-settings/HISTORY5
-rwxr-xr-xxfce/xfce4-settings/PRE_BUILD3
-rw-r--r--xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch12
4 files changed, 8 insertions, 18 deletions
diff --git a/xfce/xfce4-settings/DETAILS b/xfce/xfce4-settings/DETAILS
index 7542991881..cec00f7605 100755
--- a/xfce/xfce4-settings/DETAILS
+++ b/xfce/xfce4-settings/DETAILS
@@ -1,13 +1,13 @@
SPELL=xfce4-settings
RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
- VERSION=$RELEASE_VERSION
+ VERSION=4.6.3
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+ SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/4.6/$SOURCE
# SOURCE2_URL[0]=$SOURCE_URL.asc
WEB_SITE=http://www.xfce.org/
- SOURCE_HASH=sha512:c7790ce3bb36b5a39d5581f76e72905f878c0c83797134a777ef9d9b960905461a8d03621a6052fd167a16a0751ff8716da68833a2d888a27efd3b7b6840795e
+ SOURCE_HASH=sha512:02b396aee234c3cb5e1f29f7647afe5b77d80cd819edc85c094342e66a8c96f30923761bd2ed8f3b956d30d097df5fa471e55445195a070ec1b09f6598defc59
# SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
# SOURCE2_IGNORE=signature
LICENSE[0]=GPL
diff --git a/xfce/xfce4-settings/HISTORY b/xfce/xfce4-settings/HISTORY
index 835d823fca..2d8cae1de6 100644
--- a/xfce/xfce4-settings/HISTORY
+++ b/xfce/xfce4-settings/HISTORY
@@ -1,3 +1,8 @@
+2009-09-28 George Sherwood <gsherwood@sourcemage.org>
+ * DETAILS: Updated to 4.6.3. Updated SOURCE_URL
+ * PRE_BUILD: Removed. Fixed Upstream
+ * xfce4-settings-4.6.1-libxklavier.patch: Removed. Fixed Upstream.
+
2009-09-27 George Sherwood <gsherwood@sourcemage.org>
* PRE_BUILD: Added to apply Gentoo patch
* xfce4-settings-4.6.1-libxklavier.patch: Gentoo patch to
diff --git a/xfce/xfce4-settings/PRE_BUILD b/xfce/xfce4-settings/PRE_BUILD
deleted file mode 100755
index 8d24c8302e..0000000000
--- a/xfce/xfce4-settings/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a0e0376eb8..0000000000
--- a/xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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");