Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a8a3e98bb58083d9658432d97aa634bf6c14758f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a8a3e98bb58083d9658432d97aa634bf6c14758f)
  • Date: Sun, 5 Nov 2006 09:07:15 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

disk/grub/BUILD | 4 ++--
disk/grub/DEPENDS | 2 +-
disk/grub/HISTORY | 3 +++
kde-apps/ksquirrel-libs/DEPENDS | 2 +-
kde-apps/ksquirrel-libs/HISTORY | 3 +++
x11-libs/cairo/DEPENDS | 5 +++++
x11-libs/cairo/HISTORY | 3 +++
7 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit a8a3e98bb58083d9658432d97aa634bf6c14758f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ksquirrel-libs depend on tiff for tiff, not lesstif

commit 4e0cab117169ce78d7683245afdc826d2568a8ec
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

cairo needs libxrender in modular case

commit 5dec90bfe72273cbe88a6316ac2ec83eea211367
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

grub fails with automake-1.10, giving it 1.9

diff --git a/disk/grub/BUILD b/disk/grub/BUILD
index 6c0738d..bd6e126 100755
--- a/disk/grub/BUILD
+++ b/disk/grub/BUILD
@@ -313,8 +313,8 @@ fi &&
# End setting up OPTS

# Launch automake tools to get the patchs options integrated
-aclocal &&
-automake &&
+aclocal-1.9 &&
+automake-1.9 &&
autoconf &&

./configure --build=$BUILD \
diff --git a/disk/grub/DEPENDS b/disk/grub/DEPENDS
index 8e7d610..91315f2 100755
--- a/disk/grub/DEPENDS
+++ b/disk/grub/DEPENDS
@@ -1,4 +1,4 @@
-depends automake &&
+depends automake-1.9 &&
depends gcc34 &&
depends gnupg &&
depends smgl-fhs &&
diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index 61daea0..47c5754 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,6 @@
+2006-11-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, BUILD: using automake-1.9
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.

diff --git a/kde-apps/ksquirrel-libs/DEPENDS b/kde-apps/ksquirrel-libs/DEPENDS
index 6248389..da0b4ce 100755
--- a/kde-apps/ksquirrel-libs/DEPENDS
+++ b/kde-apps/ksquirrel-libs/DEPENDS
@@ -3,7 +3,7 @@ optional_depends libpng "" "" "to vie
optional_depends libmng "" "" "to view MNG/JNG images" &&
optional_depends jpeg "" "" "to view JPEG images" &&
optional_depends libungif "" "" "to view GIF images" &&
-optional_depends lesstif "" "" "to view TIFF images" &&
+optional_depends tiff "" "" "to view TIFF images" &&
optional_depends freetype2 "" "" "to view TTF images" &&
optional_depends libsvg "" "" "to view SVG images" &&
optional_depends cairo "" "" "to view SVG images" &&
diff --git a/kde-apps/ksquirrel-libs/HISTORY b/kde-apps/ksquirrel-libs/HISTORY
index c448a16..94c8665 100644
--- a/kde-apps/ksquirrel-libs/HISTORY
+++ b/kde-apps/ksquirrel-libs/HISTORY
@@ -1,3 +1,6 @@
+2006-11-05 Thomas Orgis ?<sobukus AT sourcemage.org>
+ * DEPENDS: lesstif doesn?'t do tiff, tiff does tiff
+
2006-06-20 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.6.3

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 22114d4..3333bcb 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,4 +1,9 @@
+. $GRIMOIRE/FUNCTIONS &&
depends X11-LIBS &&
+if check_if_xorg_modular_libs
+then
+ depends libxrender
+fi &&

optional_depends "libpng" \
"--enable-png" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 7f37dec..dd18ca3 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2006-11-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: for modular X, we need libxrender
+
2006-11-04 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 1.2.6




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a8a3e98bb58083d9658432d97aa634bf6c14758f), Thomas Orgis, 11/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page