Skip to Content.
Sympa Menu

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

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 (11da146ae318d40d02c463911e0899a18b73fca1)
  • Date: Thu, 12 Feb 2009 14:28:21 -0600

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

ChangeLog | 5 +++++
FUNCTIONS | 4 ++--
devel/propertyeditor/BUILD | 1 +
devel/propertyeditor/DEPENDS | 3 +++
devel/propertyeditor/DETAILS | 15 +++++++++++++++
devel/propertyeditor/HISTORY | 4 ++++
devel/quazip/BUILD | 3 +++
devel/quazip/DEPENDS | 2 ++
devel/quazip/DETAILS | 15 +++++++++++++++
devel/quazip/HISTORY | 4 ++++
graphics/fontforge/DETAILS | 4 ++--
graphics/fontforge/HISTORY | 3 +++
printer/exaro-lib/BUILD | 1 +
printer/exaro-lib/DETAILS | 8 ++++++++
printer/exaro-lib/DOWNLOAD | 1 +
printer/exaro-lib/HISTORY | 4 ++++
printer/exaro-lib/INSTALL | 1 +
printer/exaro-lib/PRE_BUILD | 1 +
printer/exaro-lib/TRIGGERS | 1 +
printer/exaro-libs/BUILD | 20 +-------------------
printer/exaro-libs/DEPENDS | 5 ++++-
printer/exaro-libs/DETAILS | 19 +++++--------------
printer/exaro-libs/DOWNLOAD | 1 +
printer/exaro-libs/EXPORTS | 1 +
printer/exaro-libs/HISTORY | 8 ++++----
printer/exaro-libs/INSTALL | 1 +
printer/exaro-libs/PREPARE | 1 +
printer/exaro-libs/PRE_BUILD | 7 +------
printer/exaro-libs/TRIGGERS | 1 +
printer/exaro/BUILD | 5 ++++-
printer/exaro/CONFLICTS | 1 +
printer/exaro/DEPENDS | 7 +++++--
printer/exaro/DETAILS | 5 +++++
printer/exaro/HISTORY | 10 ++++++++++
printer/exaro/PREPARE | 1 +
printer/exaro/PRE_BUILD | 2 ++
36 files changed, 124 insertions(+), 51 deletions(-)

New commits:
commit 11da146ae318d40d02c463911e0899a18b73fca1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate printer/exaro-libs [replaced by ]

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

deprecate printer/exaro-lib [replaced by ]

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

propertyeditor-1.0

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

quazip-0.2.3

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

FUNCTIONS - add PREFIX to qt4_build

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

exaro-1.60.0

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

fontforge-20081224

diff --git a/ChangeLog b/ChangeLog
index c3ddbc5..2243162 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: add PREFIX in qt4_build
+ * devel/quazip/: new spell. qt4 wrapper for zip
+ * devel/propertyeditor: new spell, property editor for qt4
+
2009-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/supybot: new spell, cross-platform IRC bot written in
Python

diff --git a/FUNCTIONS b/FUNCTIONS
index e9a9307..4fc5b65 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -510,10 +510,10 @@ qt4_cmake_build() {
}

qt4_build() {
- [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
+# [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
PATH="$QTDIR/bin/qt4:$PATH"
- qmake &&
+ qmake PREFIX=$INSTALL_ROOT/usr &&
make
}

diff --git a/devel/propertyeditor/BUILD b/devel/propertyeditor/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/devel/propertyeditor/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/devel/propertyeditor/DEPENDS b/devel/propertyeditor/DEPENDS
new file mode 100755
index 0000000..9fa6087
--- /dev/null
+++ b/devel/propertyeditor/DEPENDS
@@ -0,0 +1,3 @@
+depends g++ &&
+depends qt4 &&
+depends cmake
diff --git a/devel/propertyeditor/DETAILS b/devel/propertyeditor/DETAILS
new file mode 100755
index 0000000..03cf746
--- /dev/null
+++ b/devel/propertyeditor/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=propertyeditor
+ SPELLX=propertyEditor
+ VERSION=1.0
+
SOURCE_HASH=sha512:284e085157a12019ec16d59e2684a0ce56a806553ff8f2c117b81f643096297fc3f81d74fa74cb9d59564fedda252154281b70681cd4876bbbfb3c35d14c3a7b
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ WEB_SITE=http://code.google.com/p/propertyeditor/
+ SOURCE_URL[0]=http://propertyeditor.googlecode.com/files/$SOURCE
+ LICENSE[0]=GPL
+ ENTERED=20090212
+ KEYWORDS=""
+ SHORT=""
+cat << EOF
+A property editor for qt4
+EOF
diff --git a/devel/propertyeditor/HISTORY b/devel/propertyeditor/HISTORY
new file mode 100644
index 0000000..decca49
--- /dev/null
+++ b/devel/propertyeditor/HISTORY
@@ -0,0 +1,4 @@
+2009-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0
+ spell created
+
diff --git a/devel/quazip/BUILD b/devel/quazip/BUILD
new file mode 100755
index 0000000..348587b
--- /dev/null
+++ b/devel/quazip/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+qt4_build &&
+make_normal
diff --git a/devel/quazip/DEPENDS b/devel/quazip/DEPENDS
new file mode 100755
index 0000000..c65c94e
--- /dev/null
+++ b/devel/quazip/DEPENDS
@@ -0,0 +1,2 @@
+depends g++ &&
+depends qt4
diff --git a/devel/quazip/DETAILS b/devel/quazip/DETAILS
new file mode 100755
index 0000000..79bf63e
--- /dev/null
+++ b/devel/quazip/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=quazip
+ VERSION=0.2.3
+
SOURCE_HASH=sha512:d5cbff59f36b291f5d382329518e9a9623c0cc5a94654287290859b624436d8836a062a20dc4f6b3947a0a56da9caa25cb87431e69a57732ef9ec2cab4ad7351
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ WEB_SITE=http://$SPELL.SourceForge.net
+ LICENSE[0]=GPL
+ ENTERED=20090212
+ KEYWORDS="c++"
+ SHORT="C++ wrapper for ZIP/UNZIP"
+cat << EOF
+A C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package, using
Trolltech's Qt toolkit.
+Useful to access ZIP archives from the Qt programs.
+EOF
diff --git a/devel/quazip/HISTORY b/devel/quazip/HISTORY
new file mode 100644
index 0000000..f8a938c
--- /dev/null
+++ b/devel/quazip/HISTORY
@@ -0,0 +1,4 @@
+2009-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.3
+ spell created
+
diff --git a/graphics/fontforge/DETAILS b/graphics/fontforge/DETAILS
index be65111..0461c11 100755
--- a/graphics/fontforge/DETAILS
+++ b/graphics/fontforge/DETAILS
@@ -1,6 +1,6 @@
SPELL=fontforge
- VERSION=20080927
-
SOURCE_HASH=sha512:7e7062c7a705973b54c2bdaf86e12654772e073012c61ac560916413d6f562e5f80ffe55da65852021324412e1cd583fed30dc6b5145705687d0afa36955457e
+ VERSION=20081224
+
SOURCE_HASH=sha512:4cf6f76b90863ca672898ce1ca846685d6d665e73c6e62f7e392999b55b6f31b3826fdeff546baedf33dea19ff30dc80606ded97a3e3fdd1804fc859c0119fe7
SOURCE=${SPELL}_full-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/graphics/fontforge/HISTORY b/graphics/fontforge/HISTORY
index 9647d74..d8b9615 100644
--- a/graphics/fontforge/HISTORY
+++ b/graphics/fontforge/HISTORY
@@ -1,3 +1,6 @@
+2009-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20081224
+
2008-10-01 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 20080927

diff --git a/printer/exaro-lib/BUILD b/printer/exaro-lib/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/printer/exaro-lib/BUILD
@@ -0,0 +1 @@
+true
diff --git a/printer/exaro-lib/DETAILS b/printer/exaro-lib/DETAILS
new file mode 100755
index 0000000..b6ca5c3
--- /dev/null
+++ b/printer/exaro-lib/DETAILS
@@ -0,0 +1,8 @@
+ SPELL=exaro-lib
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+cat << EOF
+deprecated spell [replaced by ]
+EOF
+
diff --git a/printer/exaro-lib/DOWNLOAD b/printer/exaro-lib/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/printer/exaro-lib/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/printer/exaro-lib/HISTORY b/printer/exaro-lib/HISTORY
new file mode 100644
index 0000000..8d4b075
--- /dev/null
+++ b/printer/exaro-lib/HISTORY
@@ -0,0 +1,4 @@
+2009-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by ]
diff --git a/printer/exaro-lib/INSTALL b/printer/exaro-lib/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/printer/exaro-lib/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/printer/exaro-lib/PRE_BUILD b/printer/exaro-lib/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/printer/exaro-lib/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/printer/exaro-lib/TRIGGERS b/printer/exaro-lib/TRIGGERS
new file mode 100755
index 0000000..bbd77a5
--- /dev/null
+++ b/printer/exaro-lib/TRIGGERS
@@ -0,0 +1 @@
+on_cast exaro-lib dispel_self
diff --git a/printer/exaro-libs/BUILD b/printer/exaro-libs/BUILD
index a451d55..27ba77d 100755
--- a/printer/exaro-libs/BUILD
+++ b/printer/exaro-libs/BUILD
@@ -1,19 +1 @@
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
-PATH="$QTDIR/bin/qt4:$PATH" &&
-qmake -set QUAZIP_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib &&
-qmake -set QUAZIP_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include &&
-
-qmake -set EXARO_INSTALL_BINS ${INSTALL_ROOT}/usr/bin &&
-qmake -set EXARO_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib &&
-qmake -set EXARO_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include &&
-qmake -set EXARO_INSTALL_PLUGINS ${INSTALL_ROOT}/usr/lib &&
-
-qmake -set EXARO_INSTALL_MIMELNKS
${INSTALL_ROOT}/usr/share/mimelnk/application &&
-qmake -set EXARO_INSTALL_MIMES ${INSTALL_ROOT}/usr/share/mime &&
-qmake -set EXARO_INSTALL_MENUS ${INSTALL_ROOT}/usr/share/applications &&
-qmake -set EXARO_INSTALL_ICONS ${INSTALL_ROOT}/usr/share/icons &&
-
-qmake -set EXARO_INSTALL_TRANSLATIONS
${INSTALL_ROOT}/usr/share/eXaro/translations &&
-qmake &&
-make
-
+true
diff --git a/printer/exaro-libs/DEPENDS b/printer/exaro-libs/DEPENDS
index c39e130..007c341 100755
--- a/printer/exaro-libs/DEPENDS
+++ b/printer/exaro-libs/DEPENDS
@@ -1,2 +1,5 @@
depends g++ &&
-depends qt4
+depends qt4 &&
+if [[ $EX_VER == y ]];then
+ depends cmake
+fi
diff --git a/printer/exaro-libs/DETAILS b/printer/exaro-libs/DETAILS
index 0564912..983d077 100755
--- a/printer/exaro-libs/DETAILS
+++ b/printer/exaro-libs/DETAILS
@@ -1,17 +1,8 @@
SPELL=exaro-libs
- SPELLX=exaro
- VERSION=1.0.1
-
SOURCE_HASH=sha512:1af540db653712bf5ea634bae3630cdbec387e09edeb6003680143c28051801c2101a59548d3be5666fc354fa28563cc6d3a793d6e4ff953fe1fe3cf3a3243ab
- SOURCE=$SPELLX-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
- WEB_SITE=http://$SPELL.SourceForge.net
- LICENSE[0]=GPL
- ENTERED=20090129
- KEYWORDS="printer"
- SHORT="reporting engine and designer"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-eXaro it's a free report engine similar to Jasper or Crystal Reports. eXaro
can be embedded
-very easy in any Qt application. eXaro has an integrated preview with search
and export (in
-different formats) capabilities. eXaro came with a visual designer.
+deprecated spell [replaced by ]
EOF
+
diff --git a/printer/exaro-libs/DOWNLOAD b/printer/exaro-libs/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/printer/exaro-libs/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/printer/exaro-libs/EXPORTS b/printer/exaro-libs/EXPORTS
new file mode 100644
index 0000000..4e8a667
--- /dev/null
+++ b/printer/exaro-libs/EXPORTS
@@ -0,0 +1 @@
+EX_VER
diff --git a/printer/exaro-libs/HISTORY b/printer/exaro-libs/HISTORY
index e68d083..8d4b075 100644
--- a/printer/exaro-libs/HISTORY
+++ b/printer/exaro-libs/HISTORY
@@ -1,4 +1,4 @@
-2009-01-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.0.1
- spell created
-
+2009-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by ]
diff --git a/printer/exaro-libs/INSTALL b/printer/exaro-libs/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/printer/exaro-libs/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/printer/exaro-libs/PREPARE b/printer/exaro-libs/PREPARE
new file mode 100755
index 0000000..e37bbfa
--- /dev/null
+++ b/printer/exaro-libs/PREPARE
@@ -0,0 +1 @@
+config_query EX_VER 'build devel version?' n
diff --git a/printer/exaro-libs/PRE_BUILD b/printer/exaro-libs/PRE_BUILD
index 5077bd9..27ba77d 100755
--- a/printer/exaro-libs/PRE_BUILD
+++ b/printer/exaro-libs/PRE_BUILD
@@ -1,6 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# use system zint, if available
-rm -r libs/zint plugins apps &&
-sed -i '/zint/D' libs/libs.pro &&
-sed -i '/zint/D;/plugins/D;/apps/D' exaro.pro
+true
diff --git a/printer/exaro-libs/TRIGGERS b/printer/exaro-libs/TRIGGERS
new file mode 100755
index 0000000..8f3201b
--- /dev/null
+++ b/printer/exaro-libs/TRIGGERS
@@ -0,0 +1 @@
+on_cast exaro-libs dispel_self
diff --git a/printer/exaro/BUILD b/printer/exaro/BUILD
index 917f881..700e2aa 100755
--- a/printer/exaro/BUILD
+++ b/printer/exaro/BUILD
@@ -1,3 +1,6 @@
+if [[ $EX_VER == y ]];then
+qt4_cmake_build
+else
QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
PATH="$QTDIR/bin/qt4:$PATH" &&
qmake -set ZINT_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib
@@ -19,4 +22,4 @@ qmake -set EXARO_INSTALL_ICONS
${INSTALL_ROOT}/usr/share/icons &&
qmake -set EXARO_INSTALL_TRANSLATIONS
${INSTALL_ROOT}/usr/share/eXaro/translations &&
qmake &&
make
-
+fi
diff --git a/printer/exaro/CONFLICTS b/printer/exaro/CONFLICTS
new file mode 100755
index 0000000..f154edc
--- /dev/null
+++ b/printer/exaro/CONFLICTS
@@ -0,0 +1 @@
+conflicts exaro-libs y
diff --git a/printer/exaro/DEPENDS b/printer/exaro/DEPENDS
index 8532d26..7a5cc55 100755
--- a/printer/exaro/DEPENDS
+++ b/printer/exaro/DEPENDS
@@ -1,4 +1,7 @@
depends g++ &&
depends qt4 &&
-depends exaro-libs &&
-depends zint
+depends zint &&
+depends shared-mime-info &&
+optional_depends quazip '' '' 'ods export' &&
+optional_depends propertyeditor '' '' 'build eXaro designer'
+
diff --git a/printer/exaro/DETAILS b/printer/exaro/DETAILS
index a54fecc..b10c5b5 100755
--- a/printer/exaro/DETAILS
+++ b/printer/exaro/DETAILS
@@ -1,6 +1,11 @@
SPELL=exaro
+if [[ $EX_VER == y ]];then
+ VERSION=1.60.0
+
SOURCE_HASH=sha512:f408fd7ec1cf5e7bd14a4a3ecaac97eeb422f951127d9d46e36604cc76f56df03f3a2a10cb99734f4994a22432f1692377038591246f95c58845f025b4ad69c8
+else
VERSION=1.0.1

SOURCE_HASH=sha512:1af540db653712bf5ea634bae3630cdbec387e09edeb6003680143c28051801c2101a59548d3be5666fc354fa28563cc6d3a793d6e4ff953fe1fe3cf3a3243ab
+fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/printer/exaro/HISTORY b/printer/exaro/HISTORY
index e68d083..40440f6 100644
--- a/printer/exaro/HISTORY
+++ b/printer/exaro/HISTORY
@@ -1,3 +1,13 @@
+2009-2-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.60.0 (devel)
+ * PREPARE: added, support devel version
+ * DEPENDS: add cmake, for devel version
+ add optional quazip, propertyeditor
+ remove exaro-libs
+ add shared-mime-info
+ * CONFLICTS: added
+ * BUILD: adapt to cmake
+
2009-01-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1
spell created
diff --git a/printer/exaro/PREPARE b/printer/exaro/PREPARE
new file mode 100755
index 0000000..e37bbfa
--- /dev/null
+++ b/printer/exaro/PREPARE
@@ -0,0 +1 @@
+config_query EX_VER 'build devel version?' n
diff --git a/printer/exaro/PRE_BUILD b/printer/exaro/PRE_BUILD
index ca4ee89..4648ef1 100755
--- a/printer/exaro/PRE_BUILD
+++ b/printer/exaro/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if [[ $EX_VER == n ]];then
sed -i 's/libs//' exaro.pro &&
# adapt to zint-2.0
sed -i
's/barcoderender/qzint/;s/BareCode/QZint/;s/setBorder(/setBorderType(/' \
plugins/report/items/barcode/barcode.cpp &&
sed -i 's/QtZ/QZ/' plugins/report/items/barcode/barcode.pro
+fi




Archive powered by MHonArc 2.6.24.

Top of Page