Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert 
<treeve AT sourcemage.org>:

 utils/acpid2/DETAILS                                 |    4 +-
 utils/acpid2/HISTORY                                 |    3 +
 xorg-lib/libxft/0001-fix-freetype-include-path.patch |   30 
-------------------
 xorg-lib/libxft/DETAILS                              |    4 +-
 xorg-lib/libxft/HISTORY                              |    4 ++
 xorg-lib/libxft/PRE_BUILD                            |    4 --
 6 files changed, 11 insertions(+), 38 deletions(-)

New commits:
commit 0315da7a35eabb91687924ab2f6bc74bf59444a6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libxft: => 2.3.2

commit ce1357c85c9773ebc6885428d5623df326df4828
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    acpid2: => 2.0.22

diff --git a/utils/acpid2/DETAILS b/utils/acpid2/DETAILS
index 6cf9afc..91d265a 100755
--- a/utils/acpid2/DETAILS
+++ b/utils/acpid2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=acpid2
           SPELLX=acpid
-         VERSION=2.0.20
-     
SOURCE_HASH=sha512:f1c1a91cd5db45c1da6b3f698671bb55b629eb149e09a680cc061a7cf921499f8486ce471d4789dd98f548247ecf1afffc0127fdfb120b3d3adfe0cfa35d172b
+         VERSION=2.0.22
+     
SOURCE_HASH=sha512:ed52d80a17bca082cfe8d14acd4e9f736337f43c3c5c1e90b9fd5c4e8bfc2525dd0992d47230f0cae65e0eac1b2454adb350024f2955e82ffa7125e6eabf4f6a
           SOURCE=$SPELLX-$VERSION.tar.xz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/utils/acpid2/HISTORY b/utils/acpid2/HISTORY
index 4447590..340dadf 100644
--- a/utils/acpid2/HISTORY
+++ b/utils/acpid2/HISTORY
@@ -1,3 +1,6 @@
+2014-06-04 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.0.22
+
 2013-09-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.20
 
diff --git a/xorg-lib/libxft/0001-fix-freetype-include-path.patch 
b/xorg-lib/libxft/0001-fix-freetype-include-path.patch
deleted file mode 100644
index 78f6be8..0000000
--- a/xorg-lib/libxft/0001-fix-freetype-include-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 00be753f0b2b5f71293b1b01602e059fd03982c6 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sun, 6 Apr 2014 19:06:47 +0200
-Subject: [PATCH] fix freetype include path
-
----
- src/xftglyphs.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 2f3dc5a..602ef0f 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -21,10 +21,10 @@
-  */
- 
- #include "xftint.h"
--#include <freetype/ftoutln.h>
--#include <freetype/ftlcdfil.h>
-+#include <freetype2/ftoutln.h>
-+#include <freetype2/ftlcdfil.h>
- 
--#include <freetype/ftsynth.h>
-+#include <freetype2/ftsynth.h>
- 
- /*
-  * Validate the memory info for a font
--- 
-1.9.0
-
diff --git a/xorg-lib/libxft/DETAILS b/xorg-lib/libxft/DETAILS
index fb1d9e1..d9f4892 100755
--- a/xorg-lib/libxft/DETAILS
+++ b/xorg-lib/libxft/DETAILS
@@ -1,7 +1,7 @@
            SPELL=libxft
              PKG=libXft
-         VERSION=2.3.1
-     
SOURCE_HASH=sha512:737d6ab892daf829da8b2fed954b31b2657d29033f35e806599cd67c6e044ab94b0f035804a1c4c9e3e0cbdc74a117cd274128a57f4b2cf81383561d62eb9f1f
+         VERSION=2.3.2
+     
SOURCE_HASH=sha512:eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
           SOURCE=${PKG}-${VERSION}.tar.bz2
    
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
diff --git a/xorg-lib/libxft/HISTORY b/xorg-lib/libxft/HISTORY
index b1467d9..6431521 100644
--- a/xorg-lib/libxft/HISTORY
+++ b/xorg-lib/libxft/HISTORY
@@ -1,3 +1,7 @@
+2014-06-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.3.2
+       * PRE_BUILD, 0001-fix-freetype-include-path.patch: deleted
+
 2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * PRE_BUILD, 0001-fix-freetype-include-path.patch: fix include
          path for freetype headers
diff --git a/xorg-lib/libxft/PRE_BUILD b/xorg-lib/libxft/PRE_BUILD
deleted file mode 100755
index 48be04b..0000000
--- a/xorg-lib/libxft/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
-
-patch -p1 < $SPELL_DIRECTORY/0001-fix-freetype-include-path.patch