sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2fdf6053b6ae47c4fb6d5f47e3a6d26520b82d23)
Date: Tue, 2 Apr 2013 06:06:43 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

x11-toolkits/wxgtk-new/BUILD | 1 -
x11-toolkits/wxgtk-new/CONFIGURE | 2 ++
x11-toolkits/wxgtk-new/DEPENDS | 2 +-
x11-toolkits/wxgtk-new/HISTORY | 4 ++++
4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 2fdf6053b6ae47c4fb6d5f47e3a6d26520b82d23
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wxgtk-new - allow build with gtk+{3,2}

diff --git a/x11-toolkits/wxgtk-new/BUILD b/x11-toolkits/wxgtk-new/BUILD
index 9fd93f4..e78af14 100755
--- a/x11-toolkits/wxgtk-new/BUILD
+++ b/x11-toolkits/wxgtk-new/BUILD
@@ -7,7 +7,6 @@ OPTS="$OPTS
--enable-geometry
--enable-unicode
--enable-graphics_ctx
- --with-gtk=2
" &&
# wx project recommends building in a separate directory
cd $SOURCE_DIRECTORY &&
diff --git a/x11-toolkits/wxgtk-new/CONFIGURE
b/x11-toolkits/wxgtk-new/CONFIGURE
new file mode 100755
index 0000000..d4b76e3
--- /dev/null
+++ b/x11-toolkits/wxgtk-new/CONFIGURE
@@ -0,0 +1,2 @@
+source $GRIMOIRE/FUNCTIONS &&
+config_query_multi WX_GTK "which gtk+ version?" 3 2
diff --git a/x11-toolkits/wxgtk-new/DEPENDS b/x11-toolkits/wxgtk-new/DEPENDS
index 46600b0..25c97f4 100755
--- a/x11-toolkits/wxgtk-new/DEPENDS
+++ b/x11-toolkits/wxgtk-new/DEPENDS
@@ -1,5 +1,5 @@
depends -sub CXX gcc &&
-depends gtk+2 &&
+depends gtk+${WX_GTK} "--with-gtk=$WX_GTK" &&
depends libx11 '--with-x' &&

# all of the "depends" below strictly speaking are not required, e.g. we can
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index 85d5081..c2420f6 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,7 @@
+2013-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE: added
+ * BUILD, DEPENDS: allow use of gtk+{3,2}
+
2012-07-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.9.4
* DEPENDS: libxpm is optional

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2fdf6053b6ae47c4fb6d5f47e3a6d26520b82d23), Treeve Jelbert, 04/02/2013