Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.17 grimoire by Jaka Kranjc (b5b56b5ad459d19085ccb5fab44673a6b015e6a6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.17 grimoire by Jaka Kranjc (b5b56b5ad459d19085ccb5fab44673a6b015e6a6)
  • Date: Mon, 7 Jan 2008 03:05:29 -0600

GIT changes to stable-rc-0.17 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

devel/flex/DETAILS | 6 +++---
devel/flex/FlexLexer.h.diff.128 | 13 +++++++++++++
devel/flex/HISTORY | 4 ----
devel/flex/PRE_BUILD | 3 +++
graphics-libs/devil/DETAILS | 5 +++--
graphics-libs/devil/HISTORY | 5 +++++
graphics-libs/devil/PRE_BUILD | 2 ++
graphics-libs/freetype2/DETAILS | 2 +-
graphics-libs/freetype2/HISTORY | 3 ---
php-pear/php4/DETAILS | 6 +++---
php-pear/php4/HISTORY | 3 +++
11 files changed, 36 insertions(+), 16 deletions(-)

New commits:
commit b5b56b5ad459d19085ccb5fab44673a6b015e6a6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

devil: Fix header inclusion with gcc 4.2 (devil bug #1651292)
(cherry picked from commit 41643d5b9974caca65a2b1e4bf60981d55278038)

commit c5f417c610eb7feb2071a73fbdb7ef8a8f6f585b
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

php-pear/php4: updated VERSION to 4.4.8; SECURITY_PATCH++
(cherry picked from commit 96b9d090605fe7f810b9bc0702ceb04d93628b29)

commit 6a9aa11361b176ffd800651e57bf37275671f766
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "flex 2.5.34"
this version is too upstream-buggy, see our #14177

This reverts commit 9b91fa4f433b02075f2fd42f9b9900d72529fbdf.

commit 37e2b6b574162ca40603f8412db8db131a60bf7f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "reetype2-2.3.5"
for xorg, albeit it fails even without this for some

This reverts commit 772a6e815bdf4b53f49e3930a4b30bbe8e1ed5c4.

diff --git a/devel/flex/DETAILS b/devel/flex/DETAILS
index d0c2492..5061ded 100755
--- a/devel/flex/DETAILS
+++ b/devel/flex/DETAILS
@@ -1,7 +1,7 @@
SPELL=flex
- VERSION=2.5.34
- PATCHLEVEL=0
-
SOURCE_HASH=sha512:a1c277e2d589223e45dee8c0ca3f72a6642639ac5204103ea34024b3957507556ccd23f3ecd86970103dd5dbec7b47267785885bd749faca6aed91645798ed9e
+ VERSION=2.5.33
+ PATCHLEVEL=1
+
SOURCE_HASH=sha512:84c12f9d3e43285f2a5c9572c343f6fed49626be756ba1181e52f5a80df4b96cb28e90d3c8f66d737adc5fe3058a9e1abce67f09e1d1e24535f09971bfe6e0e7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/flex/$SOURCE
diff --git a/devel/flex/FlexLexer.h.diff.128 b/devel/flex/FlexLexer.h.diff.128
new file mode 100644
index 0000000..91cc7bd
--- /dev/null
+++ b/devel/flex/FlexLexer.h.diff.128
@@ -0,0 +1,13 @@
+--- FlexLexer.h 2006/10/22 22:17:38 1.27
++++ FlexLexer.h 2007/04/12 19:12:56 1.28
+@@ -62,8 +62,8 @@
+ public:
+ virtual ~FlexLexer() { }
+
+- const char* YYText() { return yytext; }
+- int YYLeng() { return yyleng; }
++ const char* YYText() const { return yytext; }
++ int YYLeng() const { return yyleng; }
+
+ virtual void
+ yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
diff --git a/devel/flex/HISTORY b/devel/flex/HISTORY
index b82bfba..4bcc8fe 100644
--- a/devel/flex/HISTORY
+++ b/devel/flex/HISTORY
@@ -1,7 +1,3 @@
-2007-12-13 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 2.5.34
- * PRE_BUILD, FlexLexer.h.diff.128: removed patch
-
2007-08-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD, FlexLexer.h.diff.128: added
diff --git a/devel/flex/PRE_BUILD b/devel/flex/PRE_BUILD
new file mode 100755
index 0000000..616f969
--- /dev/null
+++ b/devel/flex/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/FlexLexer.h.diff.128
diff --git a/graphics-libs/devil/DETAILS b/graphics-libs/devil/DETAILS
index 3c8ac46..fced657 100755
--- a/graphics-libs/devil/DETAILS
+++ b/graphics-libs/devil/DETAILS
@@ -5,10 +5,11 @@
SOURCE=$SNAME-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-${VERSION//-rc?}
SOURCE_URL[0]=${SOURCEFORGE_URL}/openil/${SOURCE}
- WEB_SITE=http://openil.sourceforge.net/
- ENTERED=20031008
+ PATCHLEVEL=1
LICENSE[0]=LGPL
+ WEB_SITE=http://openil.sourceforge.net/
KEYWORDS="graphics libs"
+ ENTERED=20031008
SHORT="Developer's Image Library"
cat << EOF
Developer's Image Library (DevIL) is a programmer's library to develop
applications with very powerful image loading capabilities, yet is easy for a
developer to learn and use. Ultimate control of images is left to the
developer, so unnecessary conversions, etc. are not performed. DevIL utilizes
a simple, yet powerful, syntax. DevIL can load, save, convert, manipulate,
filter and display a wide variety of image formats.
diff --git a/graphics-libs/devil/HISTORY b/graphics-libs/devil/HISTORY
index 8b4d79b..a1494be 100644
--- a/graphics-libs/devil/HISTORY
+++ b/graphics-libs/devil/HISTORY
@@ -1,3 +1,8 @@
+2008-01-05 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: Fix upstream bug #1651292 (header inclusion fails with
gcc
+ 4.2) with fix from Debian Bug #376620
+
2007-07-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.8-rc2
* DEPENDS: libungif -> LIBGIF
diff --git a/graphics-libs/devil/PRE_BUILD b/graphics-libs/devil/PRE_BUILD
new file mode 100755
index 0000000..ccecc1b
--- /dev/null
+++ b/graphics-libs/devil/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+sed -i 's:(ILvoid):(void):g' $SOURCE_DIRECTORY/include/IL/*.h
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 41c6288..4b1b7fe 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,5 +1,5 @@
SPELL=freetype2
- VERSION=2.3.5
+ VERSION=2.3.4
SECURITY_PATCH=1
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 006bfb0..967f1fb 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,6 +1,3 @@
-2007-07-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.3.5
-
2007-04-10 Elisamuel Resto <ryuji AT mages.ath.cx>
* DETAILS: version 2.3.4

diff --git a/php-pear/php4/DETAILS b/php-pear/php4/DETAILS
index f9d1cd2..5057b0d 100755
--- a/php-pear/php4/DETAILS
+++ b/php-pear/php4/DETAILS
@@ -1,6 +1,6 @@
SPELL=php4
- VERSION=4.4.7
-
SOURCE_HASH=sha512:0702884fd398dbbcef466fe4cdf83b0c63356c45403e410570bc3a748cdd900141087dc318e958dbf5982d72e80b8a3f6570a462b96883b37873cc2cea066e88
+ VERSION=4.4.8
+
SOURCE_HASH=sha512:eaace9328f0309e6d947fa8416d4733b1bf4649b69832b64e5b3e61b685bd2f66387f248fed2b26aa64b979493378aa65c0b07a4450ab9b574f1c15aba071370
SOURCE=php-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-$VERSION
if [ "${VERSION//RC/}" == "$VERSION" ]; then
@@ -10,7 +10,7 @@ else
fi
WEB_SITE=http://www.php.net/
ENTERED=20011024
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
LICENSE[0]=http://www.php.net/license/3_0.txt
KEYWORDS="php"
SHORT="Hypertext Preprocessor (PHP) scripting language"
diff --git a/php-pear/php4/HISTORY b/php-pear/php4/HISTORY
index a45a460..311fc4a 100644
--- a/php-pear/php4/HISTORY
+++ b/php-pear/php4/HISTORY
@@ -1,3 +1,6 @@
+2008-01-05 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated VERSION to 4.4.8; SECURITY_PATCH++
+
2007-05-05 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.7
SECURITY_PATCH++. Bug #13758



  • [SM-Commit] GIT changes to stable-rc-0.17 grimoire by Jaka Kranjc (b5b56b5ad459d19085ccb5fab44673a6b015e6a6), Jaka Kranjc, 01/07/2008

Archive powered by MHonArc 2.6.24.

Top of Page