Skip to Content.
Sympa Menu

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

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 (36a0cd8f67eb42d9b02b7184cd2537a4b9139b36)
  • Date: Fri, 28 Aug 2015 06:21:49 +0000

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

http/palemoon/DEPENDS | 9 ++++++++-
http/palemoon/HISTORY | 3 ---
2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 36a0cd8f67eb42d9b02b7184cd2537a4b9139b36
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "http/palemoon: unconditionally depend on pixman"

It is possible to compile against bundled version of pixman
(gfx/cairo/libpixman/) when bundled version of cairo is used.
But cairo is still needed because GTK+2 libs depend on it, though
it's possible not to use system version of cairo just for rendering.

This reverts commit dab6f19efb835d1fd3f5d3bc614c4d6c36454c2e.

Conflicts:
http/palemoon/HISTORY

diff --git a/http/palemoon/DEPENDS b/http/palemoon/DEPENDS
index 8c6a445..a887325 100755
--- a/http/palemoon/DEPENDS
+++ b/http/palemoon/DEPENDS
@@ -29,7 +29,6 @@ depends libice &&
depends libsm &&
depends libxscrnsaver &&
depends libxrender &&
-depends pixman '--enable-system-pixman' &&

# misc
depends desktop-file-utils &&
@@ -44,6 +43,14 @@ optional_depends -sub "X TEE" cairo \
"--disable-system-cairo" \
"to use system version of cairo" &&

+if is_depends_enabled $SPELL cairo; then
+ message "${MESSAGE_COLOR}System cairo selected, forcing system version of
${SPELL_COLOR}pixman${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
+
+ depends pixman '--enable-system-pixman'
+else
+ list_add OPTS '--disable-system-pixman'
+fi &&
+
optional_depends pango \
"--enable-pango" \
"--disable-pango" \
diff --git a/http/palemoon/HISTORY b/http/palemoon/HISTORY
index a1079d0..7a02d55 100644
--- a/http/palemoon/HISTORY
+++ b/http/palemoon/HISTORY
@@ -5,9 +5,6 @@
2015-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, cairo-system.patch: remove obsolete patch

-2015-07-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: unconditionally depend on pixman
-
2015-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 25.6.0; SECURITY_PATCH=1; updated source
dir
* PRE_BUILD: corrected unpack handling



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (36a0cd8f67eb42d9b02b7184cd2537a4b9139b36), Vlad Glagolev, 08/28/2015

Archive powered by MHonArc 2.6.24.

Top of Page