Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (fdd4fe0a70975e3d7eccdf00c11b27b3258b73a1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (fdd4fe0a70975e3d7eccdf00c11b27b3258b73a1)
  • Date: Wed, 5 Sep 2007 15:24:01 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

database/pgadmin3/DEPENDS | 4 +++-
database/pgadmin3/HISTORY | 8 +++++++-
x11-toolkits/wxgtk/BUILD | 9 ++++++---
x11-toolkits/wxgtk/CONFIGURE | 4 ++--
x11-toolkits/wxgtk/DEPENDS | 2 +-
x11-toolkits/wxgtk/HISTORY | 11 +++++++++++
x11-toolkits/wxgtk/INSTALL | 3 ++-
x11-toolkits/wxgtk/PRE_SUB_DEPENDS | 15 +++++++++++++++
x11-toolkits/wxgtk/SUB_DEPENDS | 16 ++++++++++++++++
9 files changed, 63 insertions(+), 9 deletions(-)

New commits:
commit e23fd44746d4f999ee6217cae9c33011813c019c
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

x11-toolkits/wxgtk:

BUILD, PRE_SUB_DEPENDS: fixed bad list_find usage

commit 375bb860a3b51069624248f1530d65e0696b3bac
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

database/pgadmin3:

DEPENDS: added sub_dependencies for wxgtk

commit a29fc46211f756d6c79310dc0d2e4bec3cbbcd36
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

x11-toolkits/wxgtk:

BUILD: moved opengl flag to DEPENDS, changed options handling,
made xrc optional
CONFIGURE: added xrc to WX_CONTRIB
DEPENDS: added flag to OPENGL
INSTALL: fixed xrc handling an added $WXGTK_OPTS to loop
SUB_DEPENDS, PRE_SUB_DEPENDS: added for sub_depending ;)

commit b16d16d92cd8b5add79b2fa416d2026d51cb4fbd
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

database/pgadmin3:

DEPENDS: added libxml2 and libxslt

diff --git a/database/pgadmin3/DEPENDS b/database/pgadmin3/DEPENDS
index e31fb1c..ba46c59 100755
--- a/database/pgadmin3/DEPENDS
+++ b/database/pgadmin3/DEPENDS
@@ -1,4 +1,6 @@
depends g++ &&
+depends libxml2 &&
+depends libxslt &&
depends postgresql &&
depends openssl &&
-depends wxgtk
+depends -sub "STC XRC" wxgtk
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index b5e33bb..67fcbcc 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,10 +1,16 @@
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added sub_dependencies for wxgtk
+
+2007-09-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DEPENDS: added libxml2 and libxslt
+
2007-05-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3

2007-01-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.2

-2006-11-16 Treeve Jelbert <>treeve AT sourcemage.org
+2006-11-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.0

2006-07-22 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/x11-toolkits/wxgtk/BUILD b/x11-toolkits/wxgtk/BUILD
index c412f33..dacb127 100755
--- a/x11-toolkits/wxgtk/BUILD
+++ b/x11-toolkits/wxgtk/BUILD
@@ -3,14 +3,17 @@ OPTS="$OPTS
--disable-debug
--disable-monolithic
--enable-shared
- --with-opengl
--with-libiconv-prefix=$INSTALL_ROOT/usr
--enable-geometry
- --enable-xrc
--enable-unicode
--with-gtk=2
" &&
+if list_find "$WX_CONTRIB" "xrc" || list_find "$WXGTK_OPTS" "xrc"
+then
+ OPTS="--enable-xrc $OPTS"
+fi &&
default_build &&
-for COMPONENT in $WX_CONTRIB; do
+for COMPONENT in $WX_CONTRIB $WXGTK_OPTS; do
+ if [ $COMPONENT=="xrc" ]; then continue; fi &&
make -C contrib/src/$COMPONENT
done
diff --git a/x11-toolkits/wxgtk/CONFIGURE b/x11-toolkits/wxgtk/CONFIGURE
index 8e68c67..d9f5262 100755
--- a/x11-toolkits/wxgtk/CONFIGURE
+++ b/x11-toolkits/wxgtk/CONFIGURE
@@ -3,9 +3,9 @@ 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
+ fl gizmos mmedia net ogl stc xrc

else
config_query_multi WX_CONTRIB "which add-ons to build?" applet foldbar \
- fl gizmos mmedia net ogl stc
+ fl gizmos mmedia net ogl stc xrc
fi
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 52cd1e5..25e0d06 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -4,7 +4,7 @@ depends gtk+2 &&

depends X11-LIBS '--with-x --with-libxpm' &&

-depends OPENGL &&
+depends OPENGL "--with-opengl" &&
# all of the "depends" below strictly speaking are not required, e.g. we can
# use included library by specifying --with-*=builtin, but we want to use the
# system libraries, so we're saying --with-*[=sys] here.
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index a6045a9..50dbac9 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,14 @@
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD, PRE_SUB_DEPENDS: fixed bad list_find usage
+
+2007-09-05 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: moved opengl flag to DEPENDS, changed options handling,
+ made xrc optional
+ * CONFIGURE: added xrc to WX_CONTRIB
+ * DEPENDS: added flag to OPENGL
+ * INSTALL: fixed xrc handling an added $WXGTK_OPTS to loop
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added for sub_depending ;)
+
2007-07-09 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: At least for stable, animate is an empty directory

diff --git a/x11-toolkits/wxgtk/INSTALL b/x11-toolkits/wxgtk/INSTALL
index c58df9c..8c90245 100755
--- a/x11-toolkits/wxgtk/INSTALL
+++ b/x11-toolkits/wxgtk/INSTALL
@@ -1,4 +1,5 @@
default_install &&
-for COMPONENT in $WX_CONTRIB; do
+for COMPONENT in $WX_CONTRIB $WXGTK_OPTS; do
+ if [ $COMPONENT=="xrc" ]; then continue; fi &&
make -C contrib/src/$COMPONENT install
done
diff --git a/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
b/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4dd12ef
--- /dev/null
+++ b/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
@@ -0,0 +1,15 @@
+case $THIS_SUB_DEPENDS in
+ ANIMATE) list_find "$WXGTK_OPTS" "animate" ;;
+ APPLET) list_find "$WXGTK_OPTS" "applet" ;;
+ CANVAS) list_find "$WXGTK_OPTS" "canvas" ;;
+ FOLDBAR) list_find "$WXGTK_OPTS" "foldbar" ;;
+ FL) list_find "$WXGTK_OPTS" "fl" ;;
+ GIZMOS) list_find "$WXGTK_OPTS" "gizmos" ;;
+ MMEDIA) list_find "$WXGTK_OPTS" "mmedia" ;;
+ NET) list_find "$WXGTK_OPTS" "net" ;;
+ OGL) list_find "$WXGTK_OPTS" "ogl" ;;
+ STC) list_find "$WXGTK_OPTS" "stc" ;;
+ XRC) list_find "$WXGTK_OPTS" "xrc" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/x11-toolkits/wxgtk/SUB_DEPENDS b/x11-toolkits/wxgtk/SUB_DEPENDS
new file mode 100755
index 0000000..37b8ea3
--- /dev/null
+++ b/x11-toolkits/wxgtk/SUB_DEPENDS
@@ -0,0 +1,16 @@
+persistent_add WXGTK_OPTS
+case $THIS_SUB_DEPENDS in
+ ANIMATE) list_add WXGTK_OPTS animate ;;
+ APPLET) list_add WXGTK_OPTS applet ;;
+ CANVAS) list_add WXGTK_OPTS canvas ;;
+ FOLDBAR) list_add WXGTK_OPTS foldbar ;;
+ FL) list_add WXGTK_OPTS fl ;;
+ GIZMOS) list_add WXGTK_OPTS gizmos ;;
+ MMEDIA) list_add WXGTK_OPTS mmedia ;;
+ NET) list_add WXGTK_OPTS net ;;
+ OGL) list_add WXGTK_OPTS ogl ;;
+ STC) list_add WXGTK_OPTS stc ;;
+ XRC) list_add WXGTK_OPTS xrc ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (fdd4fe0a70975e3d7eccdf00c11b27b3258b73a1), Pol Vinogradov, 09/05/2007

Archive powered by MHonArc 2.6.24.

Top of Page