Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (d35a3b983e9a56bfb6fbff46590af91d328f8749)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (d35a3b983e9a56bfb6fbff46590af91d328f8749)
  • Date: Wed, 17 Aug 2011 01:15:35 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

dev/null |binary
editors/zim/DETAILS | 2 +-
editors/zim/HISTORY | 3 +++
editors/zim/zim-0.46.tar.gz.sig | 0
editors/zim/zim-0.52.tar.gz.sig |binary
ftp/wget/BUILD | 2 ++
ftp/wget/CONFIGURE | 2 ++
ftp/wget/DEPENDS | 12 ++++++++----
ftp/wget/DETAILS | 2 +-
ftp/wget/HISTORY | 5 +++++
ftp/wget/PRE_SUB_DEPENDS | 5 ++++-
ftp/wget/SUB_DEPENDS | 11 ++++++++++-
gurus.gpg |binary
libs/pcre/DETAILS | 2 +-
libs/pcre/HISTORY | 3 +++
15 files changed, 40 insertions(+), 9 deletions(-)

New commits:
commit 714e7b5f2d71a47f3f43f24e90e278b2a404d839
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wget can use none, openssl and gnutls as ssl backend now

commit f33c81e502572dea467464db71003a5e8276102a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

zim 0.52

commit d0da881ef861a983ff350d9a9e86f2e670d90d4d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gurus.gpg: add my new key

commit 8a28cb77a18010058c4fcd48840a9597ca3241bd
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wget 1.13.1

commit 1d0fe18bc6c5eee6e9f95804fec515c9138c1d45
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

pcre 8.13

commit 30830ae0232242c666127d3b5fb67d7a20d15f98
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

kdebindings4: cmake flag to disable Ruby binding has changed from
ENABLE_KROSSRUBY=0 to BUILD_ruby=0

diff --git a/editors/zim/DETAILS b/editors/zim/DETAILS
index 03d6c6f..2ac687b 100755
--- a/editors/zim/DETAILS
+++ b/editors/zim/DETAILS
@@ -1,5 +1,5 @@
SPELL=zim
- VERSION=0.46
+ VERSION=0.52
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.zim-wiki.org/downloads/$SOURCE
diff --git a/editors/zim/HISTORY b/editors/zim/HISTORY
index 5477533..a88bddc 100644
--- a/editors/zim/HISTORY
+++ b/editors/zim/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.52
+
2010-03-25 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.46
fixed long description wrap
diff --git a/editors/zim/zim-0.46.tar.gz.sig b/editors/zim/zim-0.46.tar.gz.sig
deleted file mode 100644
index 6b23851..0000000
Binary files a/editors/zim/zim-0.46.tar.gz.sig and /dev/null differ
diff --git a/editors/zim/zim-0.52.tar.gz.sig b/editors/zim/zim-0.52.tar.gz.sig
new file mode 100644
index 0000000..f64aea9
Binary files /dev/null and b/editors/zim/zim-0.52.tar.gz.sig differ
diff --git a/ftp/wget/BUILD b/ftp/wget/BUILD
index 4d779db..480741f 100755
--- a/ftp/wget/BUILD
+++ b/ftp/wget/BUILD
@@ -1,3 +1,5 @@
+[[ $WGET_SSL == "none" ]] && OPTS="--without-ssl $OPTS"
+
OPTS="$WGET_OPTS $OPTS --build=${BUILD}"
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"

diff --git a/ftp/wget/CONFIGURE b/ftp/wget/CONFIGURE
index dfa83ef..98c06e0 100755
--- a/ftp/wget/CONFIGURE
+++ b/ftp/wget/CONFIGURE
@@ -1,2 +1,4 @@
+config_query_list WGET_SSL "Which SSL backend do you want for https and
ftps?" none gnutls openssl &&
+
config_query_option WGET_OPTS "Enable IPv6 support?" y \
"--enable-ipv6" "--disable-ipv6"
diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index 88eeb81..fefc43b 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -16,10 +16,14 @@ optional_depends "texinfo" \
"" \
"to build info files" &&

-optional_depends "openssl" \
- "--with-ssl=openssl" \
- "--without-ssl" \
- "for https and ftps" &&
+case $WGET_SSL in
+ none)
+ ;;
+ gnutls) depends gnutls "--with-ssl=gnutls"
+ ;;
+ openssl) depends openssl "--with-ssl=openssl"
+ ;;
+esac

if is_depends_enabled $SPELL openssl ; then
optional_depends ca-certificates \
diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index 81d1ea6..4f12b38 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,5 +1,5 @@
SPELL=wget
- VERSION=1.13
+ VERSION=1.13.1
SECURITY_PATCH=1
PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 6e525f3..2a92a64 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,8 @@
+2011-08-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.13.1
+ * CONFIGURE, DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS, BUILD:
+ none, openssl and gnutls can be used for wget ssl backend now
+
2011-08-16 Vlad Glagolev <stealth AT sourcemage.org>
* SUB_DEPENDS: subdeps are used in configure stage; allow to build
without gnutls
diff --git a/ftp/wget/PRE_SUB_DEPENDS b/ftp/wget/PRE_SUB_DEPENDS
index fe1f8b9..be2be9d 100755
--- a/ftp/wget/PRE_SUB_DEPENDS
+++ b/ftp/wget/PRE_SUB_DEPENDS
@@ -1,5 +1,8 @@
case $THIS_SUB_DEPENDS in
- SSL) is_depends_enabled $SPELL openssl && return 0 ;;
+ SSL) if is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL
gnutls; then
+ return 0
+ fi
+ ;;
*) echo "unknown sub_depends!" ;;
esac
return 1
diff --git a/ftp/wget/SUB_DEPENDS b/ftp/wget/SUB_DEPENDS
index 058a7f3..0c45289 100755
--- a/ftp/wget/SUB_DEPENDS
+++ b/ftp/wget/SUB_DEPENDS
@@ -1,4 +1,13 @@
case $THIS_SUB_DEPENDS in
- SSL) depends openssl '--with-ssl=openssl';;
+ SSL) message "wget with SSL backend is requested, forcing it" &&
+ persistent_remove WGET_SSL &&
+ config_query_list WGET_SSL "Which SSL backend do you want for https
and ftps?" gnutls openssl &&
+ case $WGET_SSL in
+ gnutls) depends gnutls "--with-ssl=gnutls"
+ ;;
+ openssl) depends openssl "--with-ssl=openssl"
+ ;;
+ esac
+ ;;
*) echo "unknown sub_depends $THIS_SUB_DEPENDS"; false ;;
esac
diff --git a/gurus.gpg b/gurus.gpg
index 58cce0b..3c94c8b 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 6b04849..249aa45 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcre
- VERSION=8.12
+ VERSION=8.13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index ef167ed..0d55bca 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 8.13
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)



  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (d35a3b983e9a56bfb6fbff46590af91d328f8749), Bor Kraljič, 08/17/2011

Archive powered by MHonArc 2.6.24.

Top of Page