[SM-Commit] GIT changes to master grimoire by George Sherwood (be192130a350e2f9e8eeaf452c9b2040d05d3a2e)

George Sherwood scm at sourcemage.org
Sat Sep 6 22:43:44 EDT 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 dev/null                                      |binary
 gnome2-libs/glib2/DETAILS                     |    4 +-
 gnome2-libs/glib2/HISTORY                     |    5 ++
 gnome2-libs/glib2/PRE_BUILD                   |    2 -
 gnome2-libs/glib2/glib-2.16.5-docsbuild.patch |   44 --------------------------
 x11-toolkits/gtk+2/DEPENDS                    |    5 ++
 x11-toolkits/gtk+2/DETAILS                    |    2 -
 x11-toolkits/gtk+2/HISTORY                    |    4 ++
 x11-toolkits/gtk+2/gtk+-2.12.11.tar.bz2.sig   |    0 
 x11-toolkits/gtk+2/gtk+-2.14.1.tar.bz2.sig    |binary
 10 files changed, 17 insertions(+), 49 deletions(-)

New commits:
commit be192130a350e2f9e8eeaf452c9b2040d05d3a2e
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gtk+2: Updated to version 2.14.1.  Added optional_depends
    jasper

commit 3cd7ba4058984b06359cb6f1b951fef1d8df7b19
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    glib2: Updated to version 2.18.0

diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 73ee4a2..93df5f2 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=glib2
-         VERSION=2.16.5
-SOURCE_HASH=sha512:29f28156861499e3938717cbc3be2d19c3d18aba395c69c97a8ff91398bb3abc05cd30441765982642237d94544a35b9f635cc0e5b911a94380e79a6209085c7
+         VERSION=2.18.0
+     SOURCE_HASH=sha512:992c8910f10d88cc356361ccc71fe658a7f6361376065e86519baf4f1d6468d7d29b8af9f53e6e397835916ddb75a31eb0a83bb89c67cd7483bfef2783e2841e
   SECURITY_PATCH=1
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=glib-$VERSION.tar.bz2
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 0fdc1c8..3e6139d 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,8 @@
+2008-09-06 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 2.18.0
+	* PRE_BUILD: Removed applicaton of patch
+	* glib-2.16.5-docsbuild.patch: removed. docs build fine
+
 2008-07-24 Ladislav Hagara <hgr at vabo.cz>
 	* PRE_BUILD, glib-2.16.5-docsbuild.patch: added patch from Gentoo
 	  http://bugs.gentoo.org/show_bug.cgi?id=232417
diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD
index 199036a..4dd9bcf 100755
--- a/gnome2-libs/glib2/PRE_BUILD
+++ b/gnome2-libs/glib2/PRE_BUILD
@@ -1,8 +1,6 @@
 default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
 
-patch -p0 < $SPELL_DIRECTORY/glib-2.16.5-docsbuild.patch &&
-
 #if [ "$GLIB_GETTEXT" == "y" ]; then
 #   OPTS="$OPTS --with-libiconv=no"
 
diff --git a/gnome2-libs/glib2/glib-2.16.5-docsbuild.patch b/gnome2-libs/glib2/glib-2.16.5-docsbuild.patch
deleted file mode 100644
index 6431f87..0000000
--- a/gnome2-libs/glib2/glib-2.16.5-docsbuild.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gtk-doc.make.orig	2008-07-20 07:23:05.000000000 +0400
-+++ gtk-doc.make	2008-07-20 14:08:00.000000000 +0400
-@@ -107,7 +107,7 @@
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
- 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
---- docs/reference/gobject/Makefile.in.orig	2008-07-20 07:01:57.000000000 +0400
-+++ docs/reference/gobject/Makefile.in	2008-07-20 14:11:53.000000000 +0400
-@@ -697,7 +697,7 @@
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
- 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
---- docs/reference/glib/Makefile.in.orig	2008-07-20 07:01:57.000000000 +0400
-+++ docs/reference/glib/Makefile.in	2008-07-20 14:11:30.000000000 +0400
-@@ -713,7 +713,7 @@
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
- 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
---- docs/reference/gio/Makefile.in.orig	2008-07-20 07:01:57.000000000 +0400
-+++ docs/reference/gio/Makefile.in	2008-07-20 14:11:11.000000000 +0400
-@@ -687,7 +687,7 @@
- 	@-chmod -R u+w $(srcdir)
- 	rm -rf $(srcdir)/html
- 	mkdir $(srcdir)/html
--	cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
- 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
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 99d8fa6..fb6a127 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gtk+2
-         VERSION=2.12.11
+         VERSION=2.14.1
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=gtk+-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk+-$VERSION
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index b966e08..62da1a4 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,7 @@
+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/gtk+-2.12.11.tar.bz2.sig b/x11-toolkits/gtk+2/gtk+-2.12.11.tar.bz2.sig
deleted file mode 100644
index 5074a7b..0000000
Binary files a/x11-toolkits/gtk+2/gtk+-2.12.11.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



More information about the SM-Commit mailing list