[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a4995871c263caf36810523c92ff96cf8b859f1f)

Treeve Jelbert scm at mail.sourcemage.org
Sun Nov 5 08:45:08 EST 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 doc/libharu2/DETAILS                   |    4 ++--
 doc/libharu2/HISTORY                   |    3 +++
 x11-libs/cairo/DETAILS                 |    5 +++--
 x11-libs/cairo/HISTORY                 |    3 +++
 x11-toolkits/wxgtk/CONFIGURE           |   13 +++++++++++--
 x11-toolkits/wxgtk/DETAILS             |   11 +++++++----
 x11-toolkits/wxgtk/EXPORTS             |    1 +
 x11-toolkits/wxgtk/HISTORY             |    8 ++++++++
 x11-toolkits/wxgtk/REPAIR^none^EXPORTS |    1 +
 9 files changed, 39 insertions(+), 10 deletions(-)

New commits:
commit 24c86cd333bb1300e80abac5263f207d6a39e197
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    cairo-1.2.6

commit e8a2b199ad7e42a225e56576b11710afa6088985
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    wxgtk -allow choice of add-ons

commit 97a132d2105dbe638823875385a430410d6d16a9
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    libharu2-2_0_7

diff --git a/doc/libharu2/DETAILS b/doc/libharu2/DETAILS
index a1040ae..8d6825d 100755
--- a/doc/libharu2/DETAILS
+++ b/doc/libharu2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libharu2
-         VERSION=2_0_5
-     SOURCE_HASH=sha512:8b9c5fad1daff95fff45262c0bdc7145dc4ff3b6dc271755445091125b08275b7f4cea42adf40c4c06da8fff53f461812615f38155f07c575449ad6be997c370
+         VERSION=2_0_7
+     SOURCE_HASH=sha512:69bbcc265c55e90761841cb944f7edf1455f1b921f5f8b99d84354837a87b4d25a8859ccaea677b4b1db08e7e02de9da48c73c7f177220a57ce06e3011d80791
           SOURCE=${SPELL//2}\_${VERSION}.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//2/}-${VERSION//_/.}
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL//2/}/$SOURCE
diff --git a/doc/libharu2/HISTORY b/doc/libharu2/HISTORY
index 1aaa532..d6fadad 100644
--- a/doc/libharu2/HISTORY
+++ b/doc/libharu2/HISTORY
@@ -1,3 +1,6 @@
+2006-11-05 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 2.0.7
+
 2006-09-16 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 2.0.5
 	  SOURCE_DIRECTORY use $VERSION
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index dd59259..9b3fc96 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,10 +1,11 @@
            SPELL=cairo
-         VERSION=1.2.4
+         VERSION=1.2.6
+     SOURCE_HASH=sha512:efcf02493aa59eb8ad235e599455214d8435147b051dbc9bdb4e8188f87b12d04435596c8d28c3e4fa4a889e69c1e692de2d0857eac081b7d6c6f6b2180ec811
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
         WEB_SITE=http://cairographics.org
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=MIT
          ENTERED=20040617
         KEYWORDS="x11 libs"
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 00ad871..7f37dec 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2006-11-04 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 1.2.6
+
 2006-08-27 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* BUILD, CONFIGURE: removed, the backends aren't experimental anymore
 	* DEPENDS: added optional_depends on libpng
diff --git a/x11-toolkits/wxgtk/CONFIGURE b/x11-toolkits/wxgtk/CONFIGURE
index 70976ff..7981895 100755
--- a/x11-toolkits/wxgtk/CONFIGURE
+++ b/x11-toolkits/wxgtk/CONFIGURE
@@ -1,5 +1,14 @@
 
 # may need to ask question about this
 # note: don't add `xrc' here, it's just a resource directory
-WX_CONTRIB='animate gizmos ogl stc' &&
-persistent_add WX_CONTRIB
+#WX_CONTRIB='animate gizmos ogl stc' &&
+#persistent_add WX_CONTRIB
+source $GRIMOIRE/config_query_multi.function  &&
+if [[ "$GTK_DEV" == "y" ]];then
+  config_query_multi WX_CONTRIB "which add-ons to build?" animate applet canvas foldbar \
+                                 fl gizmos mmedia net ogl stc
+
+else
+  config_query_multi WX_CONTRIB "which add-ons to build?" animate applet foldbar \
+                                 fl gizmos mmedia net ogl stc
+fi
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index f8caf7e..c27bc34 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,13 +1,15 @@
            SPELL=wxgtk
-          SPELLX=wxWidgets
+#          SPELLX=wxWidgets
+          SPELLX=wxGTK
 if [[ "$GTK_DEV" == "y" ]];then
          VERSION=2.7.1
-    SOURCE_HASH=sha512:2edd0e4ef69acd584e8a786231a9ab969c09ef586717b2e4d11396acb0ab5fe798d4df497ec1df61f1de33e4524528f61ec40c93445da763cd98bc40873615ba
+      PATCHLEVEL=1
+    SOURCE_HASH=sha512:5da105e70e0305f29f53243579815c094572e50b1ea66146f9eefe5703354bb6c14c486c21520c869ae916f4dc5ab22e5d7c9cf25e74d568438f16cfc952557f
 else
          VERSION=2.6.3
-    SOURCE_HASH=sha512:a24053bc28b90a7e55621cd68ee1a46f9630b8ad3d3a0ea20bfbf817eb731d6b9b9cbf764d4b89a746e25fa62c09767bbaf5c58be44386e7d6a083a577277c89
+    SOURCE_HASH=sha512:5cce47f22685e5ffea132a501a4570b5cbc4416ce78c3370f898894cb4771c631b67e1d42697cca4722940504451c2a218c4d33dd5fbb8c4fa2619e7fb4e72cd
 # patches
-    PATCHLEVEL=2
+    PATCHLEVEL=3
   SOURCE2_HASH=sha512:c79dd25cbc522818aa93dcd24f156d151349a3408f53194ac3d03de480bf97c55c014629e73ae5b0c9743bf2a97bfed0b0c379ee6ec25e7dca00e1492c963df8
           SOURCE2=$SPELLX-$VERSION-Patch-2.tar.gz
    SOURCE2_URL[0]=ftp://biolpc22.york.ac.uk/pub/$VERSION/$SOURCE2
@@ -15,6 +17,7 @@ fi
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION//-rc1}
    SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
+   SOURCE_URL[1]=ftp://biolpc22.york.ac.uk/pub/$VERSION/$SOURCE
       LICENSE[0]=http://www.wxwidgets.org/licence3.txt
         WEB_SITE=http://www.wxwidgets.org/
          ENTERED=20011217
diff --git a/x11-toolkits/wxgtk/EXPORTS b/x11-toolkits/wxgtk/EXPORTS
index 6f9ca23..1d68d25 100644
--- a/x11-toolkits/wxgtk/EXPORTS
+++ b/x11-toolkits/wxgtk/EXPORTS
@@ -1 +1,2 @@
 WX_CONTRIB
+WX_DEV
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index eb690e0..0fe83cd 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,11 @@
+2006-11-04 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: use different tarballs
+	  wxGTK instead of wxWidgets  (much smaller)
+	  add a second SOURCE_URL 
+	  PATCHLEVEL++
+	* EXPORTS, REPAIR^none^EXPORTS: export WX_DEV for wxpython
+	* CONFIGURE: allow choice of add-ons
+	
 2006-10-26 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 2.7.1 (devel)
 	
diff --git a/x11-toolkits/wxgtk/REPAIR^none^EXPORTS b/x11-toolkits/wxgtk/REPAIR^none^EXPORTS
index 6f9ca23..1d68d25 100644
--- a/x11-toolkits/wxgtk/REPAIR^none^EXPORTS
+++ b/x11-toolkits/wxgtk/REPAIR^none^EXPORTS
@@ -1 +1,2 @@
 WX_CONTRIB
+WX_DEV



More information about the SM-Commit mailing list