Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (32c34711d4d665c81605ef122513611cb4ed5a6f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (32c34711d4d665c81605ef122513611cb4ed5a6f)
  • Date: Tue, 17 Jun 2008 09:45:54 -0500

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

graphics-libs/libpng/HISTORY | 4 ++++
graphics-libs/libpng/PRE_BUILD | 1 +
graphics-libs/libpng/PRE_SUB_DEPENDS | 4 ++++
graphics-libs/libpng/SUB_DEPENDS | 7 +++++++
http/firefox/DEPENDS | 5 +++--
http/firefox/HISTORY | 3 ++-
6 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 32c34711d4d665c81605ef122513611cb4ed5a6f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox: fixed deps

commit 80ad6be339ffe2ba4b0ccae4a15106156afda277
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libpng: added APNG (animated png's) subdep, required for firefox

diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index d95e04d..38a6d65 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,7 @@
+2008-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added APNG subdep
+ * PRE_BUILD: added warn-comment about apng-patch
+
2008-05-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.29
* DEPENDS: removed autoconf, automake and libtool
diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD
index 76aa0d3..9f5ff6a 100755
--- a/graphics-libs/libpng/PRE_BUILD
+++ b/graphics-libs/libpng/PRE_BUILD
@@ -2,5 +2,6 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&

if [[ $ANI_PNG == y ]]; then
+ # since 1.2.27 it's unmaintaned, be careful while updating the spell
patch -p0 < $SCRIPT_DIRECTORY/libpng-1.2.26-apng.patch
fi
diff --git a/graphics-libs/libpng/PRE_SUB_DEPENDS
b/graphics-libs/libpng/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c31b5c7
--- /dev/null
+++ b/graphics-libs/libpng/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ APNG) [[ $ANI_PNG == y ]];;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/graphics-libs/libpng/SUB_DEPENDS
b/graphics-libs/libpng/SUB_DEPENDS
new file mode 100755
index 0000000..694f76b
--- /dev/null
+++ b/graphics-libs/libpng/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ APNG) if [[ $ANI_PNG != y ]]; then
+ message "Requested $SPELL with animated png's support,
forcing option ANI_PNG=y" &&
+ ANI_PNG=y
+ fi;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index ef5e99d..18a1b6a 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -2,13 +2,14 @@ depends atk &&
depends g++ &&
depends glib2 &&
depends jpeg '--with-system-jpeg' &&
-depends libpng &&
depends pango &&
depends perl &&
depends zip &&
depends zlib '--with-system-zlib' &&
depends cairo &&
-depends python &&
+depends python &&
+
+depends -sub APNG libpng &&

# These were the GTK+2 option in the GTK version conditional, perhaps
# the flags need a closer look.
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 71b3479..e06898d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -3,7 +3,8 @@
* INSTALL: added bashism, removed useless brackets and spaces
* PRE_BUILD: removed useless patches cause we don't have 2.0 anymore,
SPELL > SCRIPT, `sed -i' > `sedit', cleaned up
- * DEPENDS: no 2.0 branch => no stupid depends
+ * DEPENDS: no 2.0 branch => no stupid depends, we _always_ need apng
+ support in libpng

2008-06-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated FIREFOX_CVS=y to 3.0rc3



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (32c34711d4d665c81605ef122513611cb4ed5a6f), Vlad Glagolev, 06/17/2008

Archive powered by MHonArc 2.6.24.

Top of Page