Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (bb66da9bd1f797c9f0b6b94be633e7c9815c0447)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (bb66da9bd1f797c9f0b6b94be633e7c9815c0447)
  • Date: Tue, 16 Sep 2008 17:55:20 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

dev/null |binary
gnome2-libs/gail/BUILD | 1 +
gnome2-libs/gail/DEPENDS | 8 +-------
gnome2-libs/gail/DETAILS | 4 +---
gnome2-libs/gail/HISTORY | 3 +++
gnome2-libs/gail/INSTALL | 1 +
gnome2-libs/gail/PRE_BUILD | 1 +
gnome2-libs/gail/TRIGGERS | 1 +
gnome2-libs/libgnomecanvas/DEPENDS | 1 -
gnome2-libs/libgnomecanvas/HISTORY | 3 +++
x11-toolkits/gtk+2/CONFLICTS | 1 +
x11-toolkits/gtk+2/DEPENDS | 5 +++++
x11-toolkits/gtk+2/DETAILS | 4 ++--
x11-toolkits/gtk+2/HISTORY | 9 +++++++--
x11-toolkits/gtk+2/PRE_BUILD | 4 ++--
x11-toolkits/gtk+2/gtk+-2.12.12.tar.bz2.sig | 0
x11-toolkits/gtk+2/gtk+-2.14.1.tar.bz2.sig |binary
17 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit bb66da9bd1f797c9f0b6b94be633e7c9815c0447
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

Revert "Revert "gtk+2: patchlevel++ to force gail conflict""

Revert the revert. Discussed in the ML and as-per bug #14726

This reverts commit d4ef553199c7f9b82237a0258213e666c0783c13.

commit 323bc46d14c51a3c0811b5bcca415dd4da56e828
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

Revert "Revert "gtk+2: missed y on gail conflict""

Revert the revert. Discussed in the ML and as-per bug #14726

This reverts commit 5861a630156b18bb984ad32375b27c5390f9e470.

commit d682f75a9ad919e0e32e896efc7195354c8fdd9d
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

Revert "Revert "gail: deprecating spell as now in gtk+2""

Revert the revert. Discussed in the ML and as-per bug #14726

This reverts commit 3ed4ba6bccebc3bc9667f1ff459707e6bab7be88.

commit 05af419f347008113c12c944e9068033c2f568be
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

Revert "Revert "gtk+2: added CONFLICTS as gail is now in gtk+""

Revert the revert. Discussed in the ML and as-per bug #14726

This reverts commit ccea59824b91e3fbabab98062786607e07909ed4.

commit 8294c947be337247e5750652ae1c954a15b9d699
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

Revert "Revert "gtk+2: Updated to version 2.14.1. Added
optional_depends""

Revert the revert. Discussed in the ML and as-per bug #14726

This reverts commit 65bd419a5d15c10faeb0b3606e50d034ee5c9045.

commit 1c76236dd112183fa988e8b384659d62cd0b25bb
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

Revert "Revert "libgnomecanvas: removed useless gail dep (included in
gtk+2 >=2.14)""

Revert the revert. Discussed in the ML and as-per bug #14726

This reverts commit 411f2a4107fb95b42f83c7556097f13f7a900f31.

commit 366f2cf223a36ba2c64bb85f9e071584dffda54a
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

Revert "gtk+2: => 2.12.12 (released today)"

This makes conflict with reverting the revert of the previous gtk+2 update

This reverts commit a9bd3bb7ff518140fb24a583cb9b1f6c97393a43.

diff --git a/gnome2-libs/gail/BUILD b/gnome2-libs/gail/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/gail/BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/gail/DEPENDS b/gnome2-libs/gail/DEPENDS
index eba33d0..a0e80ef 100755
--- a/gnome2-libs/gail/DEPENDS
+++ b/gnome2-libs/gail/DEPENDS
@@ -1,7 +1 @@
-depends atk &&
-depends gtk+2 &&
-
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "Build documentation with gtk-doc"
+depends gtk+2
diff --git a/gnome2-libs/gail/DETAILS b/gnome2-libs/gail/DETAILS
index b9255b3..67f68d8 100755
--- a/gnome2-libs/gail/DETAILS
+++ b/gnome2-libs/gail/DETAILS
@@ -1,11 +1,9 @@
SPELL=gail
VERSION=1.22.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=LGPL
+ PATCHLEVEL=1
WEB_SITE=http://www.gnome.org/
ENTERED=20020505
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/gail/HISTORY b/gnome2-libs/gail/HISTORY
index 1666353..b8f9bd8 100644
--- a/gnome2-libs/gail/HISTORY
+++ b/gnome2-libs/gail/HISTORY
@@ -1,3 +1,6 @@
+2008-09-07 Robin Cook <rcook AT lackland.af.mil>
+ * Deprecated spell as it is now in gtk+2
+
2008-07-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.22.3, added WEB_SITE

diff --git a/gnome2-libs/gail/INSTALL b/gnome2-libs/gail/INSTALL
new file mode 100755
index 0000000..f32a580
--- /dev/null
+++ b/gnome2-libs/gail/INSTALL
@@ -0,0 +1 @@
+true
\ No newline at end of file
diff --git a/gnome2-libs/gail/PRE_BUILD b/gnome2-libs/gail/PRE_BUILD
new file mode 100755
index 0000000..f32a580
--- /dev/null
+++ b/gnome2-libs/gail/PRE_BUILD
@@ -0,0 +1 @@
+true
\ No newline at end of file
diff --git a/gnome2-libs/gail/TRIGGERS b/gnome2-libs/gail/TRIGGERS
new file mode 100755
index 0000000..af87f47
--- /dev/null
+++ b/gnome2-libs/gail/TRIGGERS
@@ -0,0 +1 @@
+on_cast gail dispel_self
\ No newline at end of file
diff --git a/gnome2-libs/libgnomecanvas/DEPENDS
b/gnome2-libs/libgnomecanvas/DEPENDS
index e461e0c..731674c 100755
--- a/gnome2-libs/libgnomecanvas/DEPENDS
+++ b/gnome2-libs/libgnomecanvas/DEPENDS
@@ -2,7 +2,6 @@ depends gtk+2 &&
depends libart_lgpl &&
depends libglade2 &&
depends pango &&
-depends gail &&
depends gnome-common2 &&

optional_depends gtk-doc \
diff --git a/gnome2-libs/libgnomecanvas/HISTORY
b/gnome2-libs/libgnomecanvas/HISTORY
index 22c3912..06685be 100644
--- a/gnome2-libs/libgnomecanvas/HISTORY
+++ b/gnome2-libs/libgnomecanvas/HISTORY
@@ -1,3 +1,6 @@
+2008-09-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: removed useless gail dep (included in gtk+2 >=2.14)
+
2007-10-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.1.1

diff --git a/x11-toolkits/gtk+2/CONFLICTS b/x11-toolkits/gtk+2/CONFLICTS
new file mode 100755
index 0000000..6b3a6c8
--- /dev/null
+++ b/x11-toolkits/gtk+2/CONFLICTS
@@ -0,0 +1 @@
+conflicts gail y
\ No newline at end of file
diff --git a/x11-toolkits/gtk+2/DEPENDS b/x11-toolkits/gtk+2/DEPENDS
index 4a387ce..0d71c26 100755
--- a/x11-toolkits/gtk+2/DEPENDS
+++ b/x11-toolkits/gtk+2/DEPENDS
@@ -9,6 +9,11 @@ depends libxrender &&
depends pango &&
depends tiff &&

+optional_depends jasper \
+ "" \
+ "--without-libjasper" \
+ "for JPEG-2000 support" &&
+
optional_depends libxrandr \
"" \
"" \
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index 8f078e2..6ebcecb 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,12 +1,12 @@
SPELL=gtk+2
- VERSION=2.12.12
+ VERSION=2.14.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=gtk+-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk+-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/gtk+/$BRANCH/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=LGPL
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
KEYWORDS="x11 libs"
DOCS="ChangeLog COPYING NEW README* docs/*.txt docs/faq
docs/tutorial"
WEB_SITE=http://www.gtk.org/
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index e9a36c0..afd88ee 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,5 +1,10 @@
-2008-09-13 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 2.12.12
+2008-09-07 Robin Cook <rcook AT wyrms.net>
+ * CONFLICTS: added as gail is now in gtk+
+ * DEPENDS: patchlevel++ to force gail conflict
+
+2008-09-06 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.14.1
+ * DEPENDS: optional_depends jasper

2008-07-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.12.11
diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
index 4538091..833562f 100755
--- a/x11-toolkits/gtk+2/PRE_BUILD
+++ b/x11-toolkits/gtk+2/PRE_BUILD
@@ -1,3 +1,3 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
sed -i 's/CUPS_VERSION_MINOR > 1/\0 \&\& CUPS_VERSION_MINOR < 3/'
modules/printbackends/cups/gtkcupsutils.c
diff --git a/x11-toolkits/gtk+2/gtk+-2.12.12.tar.bz2.sig
b/x11-toolkits/gtk+2/gtk+-2.12.12.tar.bz2.sig
deleted file mode 100644
index cdf8125..0000000
Binary files a/x11-toolkits/gtk+2/gtk+-2.12.12.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/gtk+2/gtk+-2.14.1.tar.bz2.sig
b/x11-toolkits/gtk+2/gtk+-2.14.1.tar.bz2.sig
new file mode 100644
index 0000000..2328602
Binary files /dev/null and b/x11-toolkits/gtk+2/gtk+-2.14.1.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (bb66da9bd1f797c9f0b6b94be633e7c9815c0447), Elisamuel Resto, 09/16/2008

Archive powered by MHonArc 2.6.24.

Top of Page