Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9ddc0407652e0384662f6eefd057a88fd0c50cb1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (9ddc0407652e0384662f6eefd057a88fd0c50cb1)
  • Date: Mon, 20 Jul 2009 03:11:19 -0500

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

ChangeLog | 3 +++
kde-apps/kchmviewer/BUILD | 22 +++-------------------
kde-apps/kchmviewer/CONFIGURE | 10 ----------
kde-apps/kchmviewer/DEPENDS | 25 +++----------------------
kde-apps/kchmviewer/DETAILS | 7 -------
kde-apps/kchmviewer/HISTORY | 5 +++++
kde-apps/kchmviewer/PREPARE | 1 -
kde4-apps/kchmviewer4/BUILD | 5 +++++
kde4-apps/kchmviewer4/CONFIGURE | 1 +
kde4-apps/kchmviewer4/DEPENDS | 10 ++++++++++
kde4-apps/kchmviewer4/DETAILS | 17 +++++++++++++++++
kde4-apps/kchmviewer4/HISTORY | 12 ++++++++++++
kde4-apps/kphotoalbum4/DEPENDS | 1 +
kde4-apps/kphotoalbum4/DETAILS | 7 +++----
kde4-apps/kphotoalbum4/HISTORY | 5 +++++
libs/raptor/DETAILS | 2 +-
libs/raptor/HISTORY | 3 +++
ruby-raa/rubygems/DETAILS | 6 +++---
ruby-raa/rubygems/HISTORY | 3 +++
19 files changed, 78 insertions(+), 67 deletions(-)

New commits:
commit 9ddc0407652e0384662f6eefd057a88fd0c50cb1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kchmviewer - remove qt4 support. use kchmviewer4 if you want that

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

kchmviewer4-4.1

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

raptor: => 1.4.19

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

rubygems: => 1.3.4

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

kphotoalbum4: => 4.0.1

diff --git a/ChangeLog b/ChangeLog
index 1b885fb..26fdd52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde4-apps/kchmviewer4: new spell, based on kchmviewer
+
2009-07-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* perl-cpan/module-build: deprecated [was merged into perl] #15248

diff --git a/kde-apps/kchmviewer/BUILD b/kde-apps/kchmviewer/BUILD
index b1d3d2c..cf8cc17 100755
--- a/kde-apps/kchmviewer/BUILD
+++ b/kde-apps/kchmviewer/BUILD
@@ -1,22 +1,6 @@
if list_find "$KCHMVIEW_OPTS" "--with-kde" ; then
-
- if [[ $QT3 == y ]]; then
-
- OPTS="$KCHMVIEW_OPTS $OPTS" &&
- default_kde3_build
-
- fi
-
+ OPTS="$KCHMVIEW_OPTS $OPTS" &&
+ default_kde3_build
else
-
- if [[ $QT3 == y ]]; then
-
- default_build
-
- else
-
- build_qt3_or_4
-
- fi
-
+ default_build
fi
diff --git a/kde-apps/kchmviewer/CONFIGURE b/kde-apps/kchmviewer/CONFIGURE
index 98477fe..e2606e2 100755
--- a/kde-apps/kchmviewer/CONFIGURE
+++ b/kde-apps/kchmviewer/CONFIGURE
@@ -2,16 +2,6 @@ config_query_option KCHMVIEW_OPTS "Build KDE version?" y \
"--with-kde" \
"" &&

-config_query_option KCHMVIEW_OPTS "Link with built-in chmlib?" y \
- "--with-builtin-chmlib" \
- "" &&
-
if list_find "$KCHMVIEW_OPTS" "--with-kde" ; then
-
- if [[ $QT3 == y ]]; then
-
. "$SECTION_DIRECTORY/KDE_CONFIGURE"
-
- fi
-
fi
diff --git a/kde-apps/kchmviewer/DEPENDS b/kde-apps/kchmviewer/DEPENDS
index 7c5acae..bd358a9 100755
--- a/kde-apps/kchmviewer/DEPENDS
+++ b/kde-apps/kchmviewer/DEPENDS
@@ -2,27 +2,8 @@ depends jpeg &&
depends libpng &&
depends zlib &&
depends chmlib &&
-
+depends qt-x11 &&
if list_find "$KCHMVIEW_OPTS" "--with-kde" ; then
-
- if [[ $QT3 == y ]]; then
-
- depends kdebase &&
-
- . "$SECTION_DIRECTORY/KDE_DEPENDS"
-
- fi
-
-else
-
- if [[ $QT3 == y ]]; then
-
- depends qt-x11
-
- else
-
- depends qt4
-
- fi
-
+ depends kdebase &&
+ . "$SECTION_DIRECTORY/KDE_DEPENDS"
fi
diff --git a/kde-apps/kchmviewer/DETAILS b/kde-apps/kchmviewer/DETAILS
index 1f1e8cb..9ef44de 100755
--- a/kde-apps/kchmviewer/DETAILS
+++ b/kde-apps/kchmviewer/DETAILS
@@ -1,15 +1,8 @@
SPELL=kchmviewer
- if [[ $QT3 == y ]]; then
VERSION=3.1-2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-3.1

SOURCE_HASH=sha512:06a7fa64398b8c238cfbed66eff4e104ba89ebe03f4cf36aefb05ec3cdaca6478d61dc8aabb89ea40dee448c2b347b0562d29e98b3bbce7fa311de9e09996cd5
- else
- VERSION=4.0beta2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_HASH=sha512:666d0f01eec09c4e5767c1a47c90d79ce549be007860ad0d71e330812651a9f0e29b149f9e0f8e98277e577a716af298c9f9a175fcb2671a3c439e38eb2f36b9
- fi
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://sourceforge.net/projects/kchmviewer/
ENTERED=20080323
diff --git a/kde-apps/kchmviewer/HISTORY b/kde-apps/kchmviewer/HISTORY
index 3dd481d..498a862 100644
--- a/kde-apps/kchmviewer/HISTORY
+++ b/kde-apps/kchmviewer/HISTORY
@@ -1,3 +1,8 @@
+2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD:
+ remove qt4 support; use kchmviewer4 if you wnat that
+ * PREPARE: deleted
+
2008-03-22 Ivan Lezhnjov Jr. <ivan.lezhnjov.jr AT gmail.com>
* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY, PREPARE: created this
spell.

diff --git a/kde-apps/kchmviewer/PREPARE b/kde-apps/kchmviewer/PREPARE
deleted file mode 100755
index be04cc3..0000000
--- a/kde-apps/kchmviewer/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query QT3 "Use QT 3 compatible source code? (if 'n' QT 4 version will
be used)" y
diff --git a/kde4-apps/kchmviewer4/BUILD b/kde4-apps/kchmviewer4/BUILD
new file mode 100755
index 0000000..10a0f8a
--- /dev/null
+++ b/kde4-apps/kchmviewer4/BUILD
@@ -0,0 +1,5 @@
+if [[ $KCHM_KDE == n ]];then
+ qt4_cmake_build
+else
+ default_build
+fi
diff --git a/kde4-apps/kchmviewer4/CONFIGURE b/kde4-apps/kchmviewer4/CONFIGURE
new file mode 100755
index 0000000..31c2f66
--- /dev/null
+++ b/kde4-apps/kchmviewer4/CONFIGURE
@@ -0,0 +1 @@
+config_query KCHM_KDE 'Build kde4 support?' n
diff --git a/kde4-apps/kchmviewer4/DEPENDS b/kde4-apps/kchmviewer4/DEPENDS
new file mode 100755
index 0000000..a828e3b
--- /dev/null
+++ b/kde4-apps/kchmviewer4/DEPENDS
@@ -0,0 +1,10 @@
+depends jpeg &&
+depends libpng &&
+depends zlib &&
+depends chmlib &&
+if [[ $KCHM_KDE == n ]];then
+ depends cmake &&
+ depends -sub WEBKIT qt4
+else
+ source $SECTION_DIRECTORY/KDE_DEPENDS
+fi
diff --git a/kde4-apps/kchmviewer4/DETAILS b/kde4-apps/kchmviewer4/DETAILS
new file mode 100755
index 0000000..afd718c
--- /dev/null
+++ b/kde4-apps/kchmviewer4/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=kchmviewer4
+ SPELLX=${SPELL//4}
+ VERSION=4.1
+
SOURCE_HASH=sha512:f5f117a2465e0c30d14dcc8b6d0605ef32959caf0f6f5287d786c692eb7815b0e761118bf9d1618eeb454e9df431ceb11499534300c60d6852d426ebdafbd4aa
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
+ WEB_SITE=http://sourceforge.net/projects/kchmviewer/
+ ENTERED=20080323
+ LICENSE[0]=GPL
+ SHORT="QT/KDE based *.chm viewer"
+cat << EOF
+kchmviewer is a CHM (Winhelp) file viewer written in Qt/KDE.
+It can be built as a standalone Qt-based application or a
+KDE application. The main point of kchmviewer is compatibility
+with non-English chm files including most international charsets.
+EOF
diff --git a/kde4-apps/kchmviewer4/HISTORY b/kde4-apps/kchmviewer4/HISTORY
new file mode 100644
index 0000000..cf6fc8f
--- /dev/null
+++ b/kde4-apps/kchmviewer4/HISTORY
@@ -0,0 +1,12 @@
+2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.1
+ * DEPENDS: add cmake, explicit qt4
+ * BUILD: use qt4_cmake_build
+ * CONFIGURE: change query
+ * PREPARE: deleted
+ spell is now qt4/kde4 only
+ renamed as kchmviewer4
+
+2008-03-22 Ivan Lezhnjov Jr. <ivan.lezhnjov.jr AT gmail.com>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY, PREPARE: created this
spell.
+
diff --git a/kde4-apps/kphotoalbum4/DEPENDS b/kde4-apps/kphotoalbum4/DEPENDS
index 058f13b..c8cfcdc 100755
--- a/kde4-apps/kphotoalbum4/DEPENDS
+++ b/kde4-apps/kphotoalbum4/DEPENDS
@@ -1,4 +1,5 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends -sub SQL qt4 &&
optional_depends exiv2 "" "" "to decode exif data"
#optional_depends libkdcraw4 "" "" "to process raw data" &&
#optional_depends kipi-plugins4 "" "" "to support for Kipi plugins"
diff --git a/kde4-apps/kphotoalbum4/DETAILS b/kde4-apps/kphotoalbum4/DETAILS
index eaca6a7..c01b5f8 100755
--- a/kde4-apps/kphotoalbum4/DETAILS
+++ b/kde4-apps/kphotoalbum4/DETAILS
@@ -1,12 +1,11 @@
SPELL=kphotoalbum4
- VERSION=4.0.0
-
SOURCE_HASH=sha512:22c4801f8de46e40467fb98b0775a2eb21efc753d4754105b954b44521a0d51eac548c184dd452515ebed96d99bcf573e0111975c2ac3d1b53bb01945bc423ec
+ VERSION=4.0.1
+
SOURCE_HASH=sha512:dfecf2c0291eb61e452b8c92a994cb4aceb5c05ca65ed24a1baaa0801747970d968c3f269180c36de2e7b3b7d907bc1a8fb3ac78d1dbab1b5339ec6c6b3a44ef
SOURCE=${SPELL//4}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
# SOURCE2=$SOURCE.asc
WEB_SITE=http://www.kphotoalbum.org/
- SOURCE_URL[0]=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
-# SOURCE_URL[0]=$WEB_SITE/download/$SOURCE
+ SOURCE_URL[0]=$WEB_SITE/data/download/$SOURCE
# SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
# SOURCE_GPG=kphoto.gpg:$SOURCE.asc:UPSTREAM_KEY
# SOURCE2_IGNORE=signature
diff --git a/kde4-apps/kphotoalbum4/HISTORY b/kde4-apps/kphotoalbum4/HISTORY
index 586c0a7..d93bcb3 100644
--- a/kde4-apps/kphotoalbum4/HISTORY
+++ b/kde4-apps/kphotoalbum4/HISTORY
@@ -1,3 +1,8 @@
+2009-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0.1
+ use website for download
+ * DEPENDS: needs SQL in qt4
+
2008-02-21 Treeve Jelbert <treeve AT sourcemage.org>
* CONFIGURE: added

diff --git a/libs/raptor/DETAILS b/libs/raptor/DETAILS
index 2f5363f..d5fb195 100755
--- a/libs/raptor/DETAILS
+++ b/libs/raptor/DETAILS
@@ -1,5 +1,5 @@
SPELL=raptor
- VERSION=1.4.18
+ VERSION=1.4.19
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/raptor/HISTORY b/libs/raptor/HISTORY
index 92bbf83..5641686 100644
--- a/libs/raptor/HISTORY
+++ b/libs/raptor/HISTORY
@@ -1,3 +1,6 @@
+2009-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.19
+
2008-06-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.18, swapped sf and origin mirrors

diff --git a/ruby-raa/rubygems/DETAILS b/ruby-raa/rubygems/DETAILS
index 5c3cde8..8058e13 100755
--- a/ruby-raa/rubygems/DETAILS
+++ b/ruby-raa/rubygems/DETAILS
@@ -1,8 +1,8 @@
SPELL=rubygems
- VERSION=1.3.1
-
SOURCE_HASH=sha512:fdbdef7d21eeb391433e495f736a092341e0308d9930c51c2f692cc232f0ddc2a27d43a9811db466f7ae39e3816c9f90c3264a991fbc1b9224dc08a342f284de
+ VERSION=1.3.4
+
SOURCE_HASH=sha512:898b1048e6ea0cd716c2cf9c8599408db9cd4fa0c0a099e121bf25024b24bc4d69abbe04d4752b4fa9723991776c418daae9f86e68d888167375cb3590f7c7e1
SOURCE=${SPELL}-${VERSION}.tgz
- SOURCE_URL[0]=http://rubyforge.org/frs/download.php/45905/$SOURCE
+ SOURCE_URL[0]=http://rubyforge.org/frs/download.php/57643/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://docs.$SPELL.org
ENTERED=20051216
diff --git a/ruby-raa/rubygems/HISTORY b/ruby-raa/rubygems/HISTORY
index f2568fb..5b77d57 100644
--- a/ruby-raa/rubygems/HISTORY
+++ b/ruby-raa/rubygems/HISTORY
@@ -1,3 +1,6 @@
+2009-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.4
+
2009-02-08 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 1.3.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9ddc0407652e0384662f6eefd057a88fd0c50cb1), Treeve Jelbert, 07/20/2009

Archive powered by MHonArc 2.6.24.

Top of Page