Skip to Content.
Sympa Menu

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

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 (a7e8770c00c860516dd12aeac007106e529e1268)
  • Date: Fri, 7 Sep 2007 15:13:30 -0500

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

database/pgadmin3/DEPENDS | 2 +-
database/pgadmin3/DETAILS | 1 +
database/pgadmin3/HISTORY | 6 +++++-
x11-toolkits/wxgtk/BUILD | 6 +++---
x11-toolkits/wxgtk/DETAILS | 1 +
x11-toolkits/wxgtk/HISTORY | 7 +++++++
x11-toolkits/wxgtk/INSTALL | 4 ++--
x11-toolkits/wxgtk/PRE_SUB_DEPENDS | 24 +++++++++++++-----------
x11-toolkits/wxgtk/SUB_DEPENDS | 25 +++++++++++++------------
9 files changed, 46 insertions(+), 30 deletions(-)

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

x11-toolkits/wxgtk/SUB_DEPENDS: quick fix of needless spaces

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

database/pgadmin3:

DETAILS: added SOURCE2_IGNORE
DEPENDS: needs DEV branch of wxgtk

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

x11-toolkits/wxgtk:

DETAILS: PATCLEVEL++
BUILD, INSTALL: fixed if statements in xrc skipping,
removed WXGTK_OPTS usage
SUB_DEPENDS, PRE_SUB_DEPENDS: switched to WX_CONTRIB,
added DEV sub_dependency

diff --git a/database/pgadmin3/DEPENDS b/database/pgadmin3/DEPENDS
index 0828deb..df764f0 100755
--- a/database/pgadmin3/DEPENDS
+++ b/database/pgadmin3/DEPENDS
@@ -3,4 +3,4 @@ depends libxml2 &&
depends libxslt &&
depends postgresql &&
depends openssl &&
-depends -sub "OGL STC XRC" wxgtk
+depends -sub "DEV OGL STC XRC" wxgtk
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index 7eac3bc..1d75f33 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/pgadmin3/release/v$VERSION/src/$SOURCE

SOURCE2_URL[0]=ftp://ftp.postgresql.org/pub/pgadmin3/release/v$VERSION/src/$SOURCE2
SOURCE_GPG="pgadmin3.gpg:${SOURCE}.sig:UPSTREAM_KEY"
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.pgadmin.org/
ENTERED=20030704
LICENSE[0]=ART
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index 6b274ad..4ada0de 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,4 +1,8 @@
-1;1608;0c2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
+2007-09-07 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: added SOURCE2_IGNORE
+ * DEPENDS: needs DEV branch of wxgtk
+
+2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 1.8.0-beta4, switched to
upstream key
* DEPENDS: needs ogl too for wxgtk
diff --git a/x11-toolkits/wxgtk/BUILD b/x11-toolkits/wxgtk/BUILD
index dacb127..9ef7477 100755
--- a/x11-toolkits/wxgtk/BUILD
+++ b/x11-toolkits/wxgtk/BUILD
@@ -8,12 +8,12 @@ OPTS="$OPTS
--enable-unicode
--with-gtk=2
" &&
-if list_find "$WX_CONTRIB" "xrc" || list_find "$WXGTK_OPTS" "xrc"
+if list_find "$WX_CONTRIB" "xrc"
then
OPTS="--enable-xrc $OPTS"
fi &&
default_build &&
-for COMPONENT in $WX_CONTRIB $WXGTK_OPTS; do
- if [ $COMPONENT=="xrc" ]; then continue; fi &&
+for COMPONENT in $WX_CONTRIB; do
+ if [[ "$COMPONENT" == "xrc" ]]; then continue; fi &&
make -C contrib/src/$COMPONENT
done
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index 8b847ff..c58ac8d 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -14,6 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
LICENSE[0]=http://www.wxwidgets.org/licence3.txt
WEB_SITE=http://www.wxwidgets.org/
ENTERED=20011217
+ PATCHLEVEL=1
TMPFS=off
KEYWORDS="x11 libs"
SHORT='GTK+ verion of wxWidgets API'
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 50dbac9..1e1551e 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,10 @@
+2007-09-07 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: PATCLEVEL++
+ * BUILD, INSTALL: fixed if statements in xrc skipping,
+ removed WXGTK_OPTS usage
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: switched to WX_CONTRIB,
+ added DEV sub_dependency
+
2007-09-06 Pol Vinogradov <vin.public AT gmail.com>
* BUILD, PRE_SUB_DEPENDS: fixed bad list_find usage

diff --git a/x11-toolkits/wxgtk/INSTALL b/x11-toolkits/wxgtk/INSTALL
index 8c90245..23ee151 100755
--- a/x11-toolkits/wxgtk/INSTALL
+++ b/x11-toolkits/wxgtk/INSTALL
@@ -1,5 +1,5 @@
default_install &&
-for COMPONENT in $WX_CONTRIB $WXGTK_OPTS; do
- if [ $COMPONENT=="xrc" ]; then continue; fi &&
+for COMPONENT in $WX_CONTRIB; 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
index 4dd12ef..ada7e7f 100755
--- a/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
+++ b/x11-toolkits/wxgtk/PRE_SUB_DEPENDS
@@ -1,15 +1,17 @@
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" ;;
+ ANIMATE) list_find "$WXGTK_CONTRIB" "animate" ;;
+ APPLET) list_find "$WXGTK_CONTRIB" "applet" ;;
+ CANVAS) list_find "$WXGTK_CONTRIB" "canvas" ;;
+ DEV) if [[ "$WX_DEV" == "y" ]]; then
+ return 0; fi ;;
+ FOLDBAR) list_find "$WXGTK_CONTRIB" "foldbar" ;;
+ FL) list_find "$WXGTK_CONTRIB" "fl" ;;
+ GIZMOS) list_find "$WXGTK_CONTRIB" "gizmos" ;;
+ MMEDIA) list_find "$WXGTK_CONTRIB" "mmedia" ;;
+ NET) list_find "$WXGTK_CONTRIB" "net" ;;
+ OGL) list_find "$WXGTK_CONTRIB" "ogl" ;;
+ STC) list_find "$WXGTK_CONTRIB" "stc" ;;
+ XRC) list_find "$WXGTK_CONTRIB" "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
index 37b8ea3..83b31b8 100755
--- a/x11-toolkits/wxgtk/SUB_DEPENDS
+++ b/x11-toolkits/wxgtk/SUB_DEPENDS
@@ -1,16 +1,17 @@
-persistent_add WXGTK_OPTS
+persistent_remove 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 ;;
+ ANIMATE) list_add WXGTK_CONTRIB animate ;;
+ APPLET) list_add WXGTK_CONTRIB applet ;;
+ CANVAS) list_add WXGTK_CONTRIB canvas ;;
+ DEV) WX_DEV="y" ;;
+ FOLDBAR) list_add WXGTK_CONTRIB foldbar ;;
+ FL) list_add WXGTK_CONTRIB fl ;;
+ GIZMOS) list_add WXGTK_CONTRIB gizmos ;;
+ MMEDIA) list_add WXGTK_CONTRIB mmedia ;;
+ NET) list_add WXGTK_CONTRIB net ;;
+ OGL) list_add WXGTK_CONTRIB ogl ;;
+ STC) list_add WXGTK_CONTRIB stc ;;
+ XRC) list_add WXGTK_CONTRIB 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 (a7e8770c00c860516dd12aeac007106e529e1268), Pol Vinogradov, 09/07/2007

Archive powered by MHonArc 2.6.24.

Top of Page