Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (14b64af6b026745d3c28463627311a9dfc8449d4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (14b64af6b026745d3c28463627311a9dfc8449d4)
  • Date: Tue, 24 Apr 2012 00:37:04 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

devel/python/BUILD | 7 ++++++-
devel/python/CONFIGURE | 2 ++
devel/python/HISTORY | 3 +++
devel/python3/BUILD | 15 +++------------
devel/python3/CONFIGURE | 4 ++--
devel/python3/DEPENDS | 5 ++++-
devel/python3/HISTORY | 7 +++++++
devel/python3/INSTALL | 4 ----
devel/qt-creator/DETAILS | 4 ++--
devel/qt-creator/HISTORY | 3 +++
devel/swig/DETAILS | 4 ++--
devel/swig/HISTORY | 3 +++
gnome2-libs/glib2/DEPENDS | 2 +-
gnome2-libs/glib2/HISTORY | 4 ++++
gnome2-libs/glib2/PRE_BUILD | 3 +++
gnome2-libs/glib2/py3.patch.xz |binary
mail/sylpheed/HISTORY | 4 ++++
mail/sylpheed/PRE_BUILD | 2 ++
mail/sylpheed/glib232.patch | 11 +++++++++++
printer/cups/DEPENDS | 2 +-
printer/cups/HISTORY | 3 +++
security-libs/cracklib/DEPENDS | 3 ++-
security-libs/cracklib/HISTORY | 5 +++++
security-libs/cracklib/PRE_BUILD | 13 +++++++++----
24 files changed, 82 insertions(+), 31 deletions(-)

New commits:
commit 6cb5ac04e2d9c616e63e7566246d736cc5aa2703
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sylpheed: fixed build with recent glib2

commit f81493a3e8451f39fa43ffa0f63d86af651c8b80
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

glib2 fix build with python3

commit 17921cb801b85b4fc762acc265e7bba1068417e4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

swig: => 2.0.5

commit f0fd9b36da1a745091ee6923382125fa929eb713
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cups - depends PYTHON

commit 5727ed6401d1f2acc4c51906ce267baa8c21c054
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cracklib - fix build with python3

commit 95bb0e300182eab250e46e07c36d3bfc41eecb1f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python - allow choice as primary python

commit 9313bd9d9924aafa01b74185c93618e36dba566d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python3: build fixes, extra depends

python3 - still needs PRE_BUILD

commit 4ebdc3b384172bad6db2c27c567a386120507b33
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/qt-creator: devel version 2.5.0-rc

diff --git a/devel/python/BUILD b/devel/python/BUILD
index 87f5f71..cc28ab8 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -12,6 +12,11 @@ fi &&
default_build &&

# python -c 'print "(c)", "lynx"*3'
-make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT" &&
+# can only have one primary python, the others must be alt
+if [[ $PY2K == y ]]; then
+ make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+else
+ make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+fi &&

message "Fake stage complete, installing to real path.."
diff --git a/devel/python/CONFIGURE b/devel/python/CONFIGURE
index a962b5a..3470655 100755
--- a/devel/python/CONFIGURE
+++ b/devel/python/CONFIGURE
@@ -1,3 +1,5 @@
+config_query PY2K "Use Python 2 as primary version on the system?" y &&
+
config_query_option PYTHON_OPTS \
"Enable IPv6?" y \
"--enable-ipv6" \
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index ba544a9..d2154f3 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,6 @@
+2012-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, BUILD: choose whether this primary pyhon
+
2012-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.7.3, SOURCE2_URL[0] updated, SECURITY_PATCH=2

diff --git a/devel/python3/BUILD b/devel/python3/BUILD
index 3d424c3..bfd0090 100755
--- a/devel/python3/BUILD
+++ b/devel/python3/BUILD
@@ -1,21 +1,12 @@
-OPTS="--enable-shared $PYTHON3_OPTS $OPTS" &&
-
-# The following file from kdebindings has a syntax error that
-# makes Python compilation fail
-local PYTHON_VERSION=`echo $VERSION|cut -d. -f1,2`
-if [[ -f $INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py ]]; then
- mkdir "$SOURCE_DIRECTORY/spell-tmp" &&
- mv "$INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py" \
- "$SOURCE_DIRECTORY/spell-tmp"
-fi &&
+OPTS="--enable-shared $PYTHON3_OPTS $OPTS" &&

EXTRA_CFLAGS="$CFLAGS" default_build &&

if [[ $PY3K == y ]]; then
# python3 -c 'print ("(c)", "lynx"*3)'
- make fullinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-else
make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+else
+ make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
fi &&

message "Fake stage complete, installing to real path.."
diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
index b990cdd..81a0a33 100755
--- a/devel/python3/CONFIGURE
+++ b/devel/python3/CONFIGURE
@@ -7,5 +7,5 @@ config_query_option PYTHON3_OPTS \

config_query_option PYTHON3_OPTS \
"Enable POSIX threads (pthreads) support?" y \
- "--with-pth" \
- "--without-pth"
+ "--with-threads" \
+ "--without-threads"
diff --git a/devel/python3/DEPENDS b/devel/python3/DEPENDS
index 559c166..2a5f8a2 100755
--- a/devel/python3/DEPENDS
+++ b/devel/python3/DEPENDS
@@ -1,9 +1,12 @@
+depends libffi '--with-system-ffi' &&
+#depends expat "--with-system-expat" &&
+optional_depends gdbm '' '' 'database support' &&
optional_depends db "" "" "for Sleepycat db support" &&
optional_depends sqlite "" "" "for SQLite db support" &&
optional_depends tk "" "" "for Tk support" &&
optional_depends ncurses "" "" "for Ncurses support" &&
optional_depends readline "" "" "for Readline support" &&
-optional_depends expat "" "" "for XML parser module" &&
+optional_depends expat "--with-system-expat" "" "for XML parser module" &&

optional_depends -sub CXX gcc \
"--with-cxx-main=g++" \
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 221b4d3..fddd5f6 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,10 @@
+2012-04-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: set flags for expat
+ * CONFIGURE: use correct flags for thread support
+ * BUILD, INSTALL: remove use of pydcop.py
+ this is obsolete, from kde3 days
+ use altinstall, not fullinstall
+
2012-04-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.3, SECURITY_PATCH=1

diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 82047e1..6031d78 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -1,9 +1,5 @@
cp -Rv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&

-if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then
- cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH"
-fi &&
-
# gettext
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index 57b264d..446cebc 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -1,7 +1,7 @@
SPELL=qt-creator
if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
- VERSION=2.4.1
-
SOURCE_HASH=sha512:ad49a5b7a25ea87433174f3d4dc46227229880ba09888b3cdfc28944be7d250f10ad142c67e6202f905ec092569fc967209ac721ad1b569a13ea50cb9447a2f1
+ VERSION=2.5.0-rc
+
SOURCE_HASH=sha512:89bc1d3ec1246933c90eb43d30be8f0af35fdec526144f2ad41d483a64cb71dfe322c12e829bd4183b551be81f3d0980d9c5740cc6708adcb5f28a313837c345
else
VERSION=2.4.1

SOURCE_HASH=sha512:ad49a5b7a25ea87433174f3d4dc46227229880ba09888b3cdfc28944be7d250f10ad142c67e6202f905ec092569fc967209ac721ad1b569a13ea50cb9447a2f1
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index dedeabb..b5f6d47 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2012-04-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel version 2.5.0-rc
+
2012-03-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.1

diff --git a/devel/swig/DETAILS b/devel/swig/DETAILS
index 5b27b90..ee1c1fb 100755
--- a/devel/swig/DETAILS
+++ b/devel/swig/DETAILS
@@ -1,6 +1,6 @@
SPELL=swig
- VERSION=2.0.4
-
SOURCE_HASH=sha512:f2918a35cd73ec7da5911803f44f81fc3a2b61ff13aa0e98b930ab54c64a21032c8b73cc4ca34b3b7c5f52d0106f04ae89f49db99f7749fbb056cd5e8070f968
+ VERSION=2.0.5
+
SOURCE_HASH=sha512:aca40ca3d05629584b3ceca355f38267274887503b6ce6697fd8b0e3d0347370be9db93510e1135eb201a181f21a8c0c4669f1763578f1d738c135d806cd707f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/swig/HISTORY b/devel/swig/HISTORY
index d6ada9a..0bfe09b 100644
--- a/devel/swig/HISTORY
+++ b/devel/swig/HISTORY
@@ -1,3 +1,6 @@
+2012-04-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.5
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index 9d55820..ff89d60 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -12,7 +12,7 @@ if ! spell_installed pkgconfig; then
fi &&

depends perl &&
-depends python &&
+depends PYTHON &&

optional_depends gettext \
"" \
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 8c27868..fa40486 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,7 @@
+2012-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: python => PYTHON
+ * PRE_BUILD ,py3.patch.xz: added, fix build with python3
+
2012-04-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.1

diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD
new file mode 100755
index 0000000..4e459ab
--- /dev/null
+++ b/gnome2-libs/glib2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+xzcat $SPELL_DIRECTORY/py3.patch.xz |patch -p1
diff --git a/gnome2-libs/glib2/py3.patch.xz b/gnome2-libs/glib2/py3.patch.xz
new file mode 100644
index 0000000..9e1fee1
Binary files /dev/null and b/gnome2-libs/glib2/py3.patch.xz differ
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 8603350..59c5b86 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,7 @@
+2012-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch
+ * glib232.patch: added, to fix compilation with glib2 >=2.32
+
2012-02-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.1.3

diff --git a/mail/sylpheed/PRE_BUILD b/mail/sylpheed/PRE_BUILD
index 6868556..2aaf735 100755
--- a/mail/sylpheed/PRE_BUILD
+++ b/mail/sylpheed/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/glib232.patch" &&
+
if [[ $SYLPHEED_IT == y ]]; then
unpack_file 3 &&
cp -av "$SOURCE3_DIRECTORY/src" "$SOURCE_DIRECTORY"
diff --git a/mail/sylpheed/glib232.patch b/mail/sylpheed/glib232.patch
new file mode 100644
index 0000000..64850f6
--- /dev/null
+++ b/mail/sylpheed/glib232.patch
@@ -0,0 +1,11 @@
+--- libsylph/defs.h.orig
++++ libsylph/defs.h
+@@ -24,7 +24,7 @@
+ # include "config.h"
+ #endif
+
+-#include <glibconfig.h>
++#include <glib.h>
+
+ #ifdef G_OS_WIN32
+ # include <glib/gwin32.h>
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index 3156326..eae5bb8 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -27,7 +27,7 @@ optional_depends perl \
'--with-perl' \
'--without-perl' \
'Enable perl support' &&
-optional_depends python \
+optional_depends PYTHON \
'--with-python' \
'--without-python' \
'Enable python support' &&
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 8e0995c..bc8aee3 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2012-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: python => PYTHON
+
2012-02-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.2

diff --git a/security-libs/cracklib/DEPENDS b/security-libs/cracklib/DEPENDS
index de562a5..29b928c 100755
--- a/security-libs/cracklib/DEPENDS
+++ b/security-libs/cracklib/DEPENDS
@@ -3,4 +3,5 @@ depends automake &&
depends gnupg &&
depends libtool &&
depends smgl-fhs &&
-optional_depends python '--with-python' '--without-python' 'Python support'
+depends zlib &&
+optional_depends PYTHON '--with-python' '--without-python' 'Python support'
diff --git a/security-libs/cracklib/HISTORY b/security-libs/cracklib/HISTORY
index ea5c697..6ae2221 100644
--- a/security-libs/cracklib/HISTORY
+++ b/security-libs/cracklib/HISTORY
@@ -1,3 +1,8 @@
+2012-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: python => PYTHON
+ add zlib
+ * PRE_BUILD: update config scripts, fix detection of python3
+
2010-10-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.18

diff --git a/security-libs/cracklib/PRE_BUILD
b/security-libs/cracklib/PRE_BUILD
index d5375cb..c4879f0 100755
--- a/security-libs/cracklib/PRE_BUILD
+++ b/security-libs/cracklib/PRE_BUILD
@@ -3,7 +3,12 @@ default_pre_build &&
unpack_file 2

# Doesn't really need C++...
-#cd $SOURCE_DIRECTORY &&
-#aclocal &&
-#autoconf &&
-#automake
+cd $SOURCE_DIRECTORY &&
+# update the config scripts
+sed -i "s/AM_GNU_GETTEXT_VERSION/&(0.18.1)/" configure.in &&
+# fix detection of python3
+if is_depends_enabled $SPELL python3;then
+ sed -i "s/}/}m/" configure.in &&
+ sed -i "s|@/|@m/|" python/Makefile.am
+fi &&
+autoreconf -f -i --symlink



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (14b64af6b026745d3c28463627311a9dfc8449d4), Vlad Glagolev, 04/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page