[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7be56bbbf5bd404c04ea2bd1e49442ace47f64c1)

Vlad Glagolev scm at sourcemage.org
Sun Jul 31 13:55:40 EDT 2011


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 gnome2-libs/pango/DEPENDS     |   12 ++----------
 gnome2-libs/pango/HISTORY     |    3 +++
 gnome2-libs/pango/SUB_DEPENDS |    2 +-
 libs/fftw/BUILD               |    1 -
 libs/fftw/HISTORY             |    3 +++
 5 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 7be56bbbf5bd404c04ea2bd1e49442ace47f64c1
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    pango: backported X11 flags fix (cherry picked from commit d173f039fbf42a540763be62c45830cab93e6929)

commit 2949ae82689b1ff86e43937061004ec961e67805
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    fftw: removed deprecated option

diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 14e1387..80ccad1 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -6,8 +6,8 @@ depends fontconfig  &&
 depends glib2       &&
 
 optional_depends libx11 \
-                 "--with-x11" \
-                 "--without-x11" \
+                 "--with-x" \
+                 "--without-x" \
                  "for XFT and X11 support" &&
 
 if is_depends_enabled $SPELL libx11; then
@@ -29,11 +29,3 @@ optional_depends gobject-introspection        \
                  "--enable-introspection=yes" \
                  "--enable-introspection=no"  \
                  "to enable introspection"
-
-#
-# For DirectFB support with gtk+-directfb
-#
-#optional_depends xorg-libs \
-#                 "--with-x" \
-#                 "--without-x" \
-#                 "for X library support"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 5d25345..c781dcd 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -4,6 +4,9 @@
 2011-04-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.28.4
 
+2011-01-13 Vlad Glagolev <stealth at sourcemage.org>
+	* {PRE_,}DEPENDS: corrected X11 flags
+
 2010-09-30 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 1.28.3
 
diff --git a/gnome2-libs/pango/SUB_DEPENDS b/gnome2-libs/pango/SUB_DEPENDS
index 058ca27..d14bfb6 100755
--- a/gnome2-libs/pango/SUB_DEPENDS
+++ b/gnome2-libs/pango/SUB_DEPENDS
@@ -1,6 +1,6 @@
 case $THIS_SUB_DEPENDS in
   X) message "Pango with X11 support requested, forcing libx11 dependency" &&
-       depends libx11 "--with-x11" &&
+       depends libx11 "--with-x" &&
        depends libxau &&
        depends libxft &&
        depends libxdmcp &&
diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index 8e66b2b..a0bff89 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -5,7 +5,6 @@ CFLAGS="${CFLAGS/-Os/}" &&
 
 OPTS="$OPTS $FFTW_THREADS $FFTW_OPTS --disable-fma" &&
 OPTS="$OPTS --enable-shared"                        &&
-OPTS="$OPTS --enable-type-prefix"                   &&
 
 COMMON_OPTS="${OPTS}"                               &&
 
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index 0f2ca33..8288134 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: removed deprecated option
+
 2011-07-28 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.3
 


More information about the SM-Commit mailing list