Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c25b8707f23b95e9f2e363892f15a8556eed7e5b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c25b8707f23b95e9f2e363892f15a8556eed7e5b)
  • Date: Sun, 12 Nov 2006 14:36:07 -0600

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

x11-toolkits/wxgtk/CONFIGURE | 9 +++------
x11-toolkits/wxgtk/DETAILS | 3 ++-
x11-toolkits/wxgtk/HISTORY | 4 ++++
x11-toolkits/wxgtk/PREPARE | 2 +-
x11-toolkits/wxgtk/PRE_BUILD | 2 +-
x11-toolkits/wxpython/BUILD | 20 +++++++++++++++++---
x11-toolkits/wxpython/DETAILS | 6 ++++++
x11-toolkits/wxpython/HISTORY | 14 ++++++++++++++
x11-toolkits/wxpython/INSTALL | 1 +
x11-toolkits/wxpython/PREPARE | 4 ++++
x11-toolkits/wxpython/TRIGGERS | 1 +
11 files changed, 54 insertions(+), 12 deletions(-)

New commits:
commit 6f8757662a7eee274d0e328ff0695b8133bb2adb
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

wxpython fix build

commit 6f135bc618e911648222f4a1febd5e87f35e6490
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

wxgtk - fix typo

diff --git a/x11-toolkits/wxgtk/CONFIGURE b/x11-toolkits/wxgtk/CONFIGURE
index 7981895..3d124dc 100755
--- a/x11-toolkits/wxgtk/CONFIGURE
+++ b/x11-toolkits/wxgtk/CONFIGURE
@@ -1,10 +1,7 @@

-# 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
-source $GRIMOIRE/config_query_multi.function &&
-if [[ "$GTK_DEV" == "y" ]];then
+message "previous defaults were: animate gizmos ogl stc" &&
+source $GRIMOIRE/FUNCTIONS &&
+if [[ "$WX_DEV" == "y" ]];then
config_query_multi WX_CONTRIB "which add-ons to build?" animate applet
canvas foldbar \
fl gizmos mmedia net ogl stc

diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index dbe3e43..072180e 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,9 +1,10 @@
SPELL=wxgtk
# SPELLX=wxWidgets
SPELLX=wxGTK
-if [[ "$GTK_DEV" == "y" ]];then
+if [[ "$WX_DEV" == "y" ]];then
VERSION=2.7.2

SOURCE_HASH=sha512:085f8491c45ae2f5bbb6477ea6ed5100dd04c27ae21cddb8e6788c1c7c7909c03b085caba60307996a1ecf19a40e6d19a31061e09e0c18fafcc7f1d3c4c985e4
+ PATCHLEVEL=1
else
VERSION=2.6.3

SOURCE_HASH=sha512:5cce47f22685e5ffea132a501a4570b5cbc4416ce78c3370f898894cb4771c631b67e1d42697cca4722940504451c2a218c4d33dd5fbb8c4fa2619e7fb4e72cd
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 53c7b97..a1e4064 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,7 @@
+2006-11-12 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: PATCHLEVEL++
+ * CONFIGURE, DETAILS, PREPARE: fix typo in variable name
+
2006-11-08 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 2.7.2 (devel)

diff --git a/x11-toolkits/wxgtk/PREPARE b/x11-toolkits/wxgtk/PREPARE
index 81e2106..ac28d58 100755
--- a/x11-toolkits/wxgtk/PREPARE
+++ b/x11-toolkits/wxgtk/PREPARE
@@ -1,2 +1,2 @@
-config_query GTK_DEV "do you want to build the devel version (2.7.x)?" n
+config_query WX_DEV "do you want to build the devel version (2.7.x)?" n

diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
index 9b48f9a..64a333f 100755
--- a/x11-toolkits/wxgtk/PRE_BUILD
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-if [[ "$GTK_DEV" == "n" ]];then
+if [[ "$WX_DEV" == "n" ]];then
cd $SOURCE_DIRECTORY &&
unpack_file 2
fi
diff --git a/x11-toolkits/wxpython/BUILD b/x11-toolkits/wxpython/BUILD
index 81cc3db..54efd4f 100755
--- a/x11-toolkits/wxpython/BUILD
+++ b/x11-toolkits/wxpython/BUILD
@@ -1,10 +1,24 @@
+local contrib &&
persistent_read wxgtk WX_CONTRIB WX_CONTRIB &&
-
+message gtk=$WX_DEV &&
+message contrib=$WX_CONTRIB &&
PYOPTS='MONOLITHIC=0 UNICODE=1' &&
for COMPONENT in $WX_CONTRIB; do
PYOPTS="$PYOPTS BUILD_$(echo $COMPONENT | tr '[:lower:]' '[:upper:]')=1"
-done &&
+done &&
#if echo $OPTS | grep -q with-swig; then PYOPTS="$PYOPTS USE_SWIG=1"; fi &&
-
+if [[ $WX_DEV == y ]];then
+ PYOPTS=${PYOPTS//BUILD_ANIMATE=1/}
+else
+ PYOPTS=${PYOPTS//BUILD_FOLDBAR=1/}
+fi &&
+PYOPTS=${PYOPTS//BUILD_FL=1/} &&
+# suppress undesired options
+for contrib in ANIMATE GIZMOS STC;do
+ if [[ $PYOPTS != "*$contrib*" ]];then
+ PYOPTS="$PYOPTS BUILD_$contrib=0"
+ fi
+done &&
+persistent_add PYOPTS &&
cd wxPython &&
python setup.py $PYOPTS build
diff --git a/x11-toolkits/wxpython/DETAILS b/x11-toolkits/wxpython/DETAILS
index d23f80d..53b27b2 100755
--- a/x11-toolkits/wxpython/DETAILS
+++ b/x11-toolkits/wxpython/DETAILS
@@ -1,6 +1,12 @@
SPELL=wxpython
+#persistent_read WXP_DEV
+if [[ "$WX_DEV" == "y" ]];then
+ VERSION=2.7.2.0
+
SOURCE_HASH=sha512:bd10756acf8f0bc8a53492c8d0440c5cf1ee0873806a465f9400fe4b497e25e93729c542e5a99f47b32bfd8fe80c1cd1079e3459b2f9e41bc6468cec212b0191
+else
VERSION=2.6.3.3

SOURCE_HASH=sha512:9e02d1a93a4fc8280a39e704cb042bc2946b1178bf362f47f4c5076567c351e1c84b36df68a545b563dc1ac3b2a721cbe6a6cae16a4877aeb80c4cf22cb9c365
+fi
SOURCE=${SPELL//p/P}-src-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//p/P}-src-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/wxpython/$SOURCE
diff --git a/x11-toolkits/wxpython/HISTORY b/x11-toolkits/wxpython/HISTORY
index 680a002..4273d20 100644
--- a/x11-toolkits/wxpython/HISTORY
+++ b/x11-toolkits/wxpython/HISTORY
@@ -1,3 +1,17 @@
+2006-11-12 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 2.7.2.0 (devel)
+ * BUILD: only build relevent components
+ * INSTALL: set correct directory
+
+2006-10-26 Treeve Jelbert <treeve AT pi.be>
+ * PREPARE: add
+ allow devel or stable version (in sync with wxgtk)
+ * DETAILS: version 2.7.1.3 (devel)
+ * BUILD: use persistent_add for variables
+ fixes bug #13109
+ strip 'animate' from WX_CONTRIB ( does not exist in 2.7.1.3)
+ * TRIGGERS: add, force rebuild when wxgtk changes
+
2006-07-16 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 2.6.3.3

diff --git a/x11-toolkits/wxpython/INSTALL b/x11-toolkits/wxpython/INSTALL
index 905ce9c..dc8b954 100755
--- a/x11-toolkits/wxpython/INSTALL
+++ b/x11-toolkits/wxpython/INSTALL
@@ -1 +1,2 @@
+cd wxPython &&
python setup.py $PYOPTS install
diff --git a/x11-toolkits/wxpython/PREPARE b/x11-toolkits/wxpython/PREPARE
new file mode 100755
index 0000000..680b61b
--- /dev/null
+++ b/x11-toolkits/wxpython/PREPARE
@@ -0,0 +1,4 @@
+persistent_read wxgtk WX_DEV WX_DEV
+#source /etc/sorcery/local/depends/wxgtk.p &&
+#WXP_DEV=$GTK_DEV &&
+#persistent_add WXP_DEV
diff --git a/x11-toolkits/wxpython/TRIGGERS b/x11-toolkits/wxpython/TRIGGERS
new file mode 100755
index 0000000..a378a6a
--- /dev/null
+++ b/x11-toolkits/wxpython/TRIGGERS
@@ -0,0 +1 @@
+on_cast wxgtk cast_self



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c25b8707f23b95e9f2e363892f15a8556eed7e5b), Treeve Jelbert, 11/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page