Skip to Content.
Sympa Menu

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

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 (c28490d99367bc1465895a172216ec8be1bbbb96)
  • Date: Tue, 24 Jul 2007 10:26:13 -0500

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

graphics/ploticus/DETAILS | 10 ++++-----
graphics/ploticus/HISTORY | 7 ++++++
graphics/ploticus/INSTALL | 3 +-
graphics/ploticus/PRE_BUILD | 11 +++++++---
graphics/tesseract/DETAILS | 45
++++++++++++++++++++++++++++++++++++++++---
graphics/tesseract/HISTORY | 5 ++++
graphics/tesseract/PREPARE | 3 ++
graphics/tesseract/PRE_BUILD | 12 +++++++++++
kde-apps/digikam/CONFLICTS | 1
kde-apps/digikam/HISTORY | 3 ++
10 files changed, 87 insertions(+), 13 deletions(-)

New commits:
commit 151fe00e673f15c168f260af7c2cb1b3f85d16eb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tesseract-2.00

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

ploticus-233-3

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

digikam - remove conflicts

diff --git a/graphics/ploticus/DETAILS b/graphics/ploticus/DETAILS
index a68dedb..bd6cbe3 100755
--- a/graphics/ploticus/DETAILS
+++ b/graphics/ploticus/DETAILS
@@ -1,10 +1,10 @@
SPELL=ploticus
- VERSION=233
-
SOURCE_HASH=sha512:ecc20fd7893f6fd0981bc9b6fb0d302908be80b4319aa2e648793ba45a8c14e5d4f9e0dbe73714a1d94d11cea632e81244fe447ecb513bbcbd35ba2cef1f6181
- SOURCE=pl${VERSION}src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/pl${VERSION}src
+ VERSION=233-3
+
SOURCE_HASH=sha512:9355092ddf4ab2ef8dda2573e72fb75fb377cdcda3145b94a8c53c45036796587a9e3d78751af837c3ca2c4fa5ad2945dd810d2f91aab030f3ef330b27265733
+ SOURCE=${SPELL}${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/new${SPELL}
WEB_SITE=http://$SPELL.SourceForge.net
- SOURCE_URL[0]=$SOURCEFORGE_URL/ploticus/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE=GPL
DOCS="README pltestsuite"
ENTERED=20040605
diff --git a/graphics/ploticus/HISTORY b/graphics/ploticus/HISTORY
index e67f7fc..f0bb0bd 100644
--- a/graphics/ploticus/HISTORY
+++ b/graphics/ploticus/HISTORY
@@ -1,3 +1,10 @@
+2006-06-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 233-3
+ * PRE_BUILD: use INSTALL_ROOT,
+ fix finding libX11
+ adapt to xorg-modular
+ * INSTALL: program name has changed
+
2006-06-03Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 233
now download from sourceforge
diff --git a/graphics/ploticus/INSTALL b/graphics/ploticus/INSTALL
index dfe4fd8..14d7dee 100755
--- a/graphics/ploticus/INSTALL
+++ b/graphics/ploticus/INSTALL
@@ -1,4 +1,5 @@
-cp pl $INSTALL_ROOT/usr/bin &&
+cd $SOURCE_DIRECTORY/src &&
+cp plgd18 $INSTALL_ROOT/usr/bin &&
PL_PREFAB=$INSTALL_ROOT/usr/lib/ploticus &&
mkdir -p $PL_PREFAB &&
cp ../prefabs/* $PL_PREFAB
diff --git a/graphics/ploticus/PRE_BUILD b/graphics/ploticus/PRE_BUILD
index 4f6d001..5762699 100755
--- a/graphics/ploticus/PRE_BUILD
+++ b/graphics/ploticus/PRE_BUILD
@@ -3,19 +3,24 @@ mk ()
cat << EOF
ZLIB = -lz
ZFLAG = -DWZ
-BIN = /usr/bin
+BIN = $INSTALL_ROOT/usr/bin
ploticus: plgd18
GD18LIBS = -lgd -lpng -lz -ljpeg ${LDFLAGS}
GD18H =
GDFREETYPE = -DGDFREETYPE ${CFLAGS}
-PREFABS_DIR = "/usr/lib/ploticus"
+PREFABS_DIR = "$INSTALL_ROOT/usr/lib/ploticus"
+XLIBS = -L$INSTALL_ROOT/usr/X11/lib -lX11
EOF
- sed "s|/local||;s/CFLAGS = /CFLAGS+=/;/^BIN/d" src/Makefile
+ sed "s|/local||;s/CFLAGS = /CFLAGS+=/;/^BIN/d;/^XLIBS/D" src/Makefile
}
+ source $GRIMOIRE/FUNCTIONS &&
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# recreate makefile
mk > MK &&
+ if check_if_xorg_modular_libs $SPELL ; then
+ sed -i "s|/X11||" MK
+ fi &&
cp MK src/Makefile


diff --git a/graphics/tesseract/DETAILS b/graphics/tesseract/DETAILS
index b2e1822..46b6f0f 100755
--- a/graphics/tesseract/DETAILS
+++ b/graphics/tesseract/DETAILS
@@ -1,9 +1,48 @@
SPELL=tesseract
- VERSION=1.03
-
SOURCE_HASH=sha512:f308e432f126d56cd2096ff23bcc579ce8d1bf537e33f68f8e02cedd9ae930b43dd288ce5d7b3d3b144fe859653e528aaf278cad28bdac6e5c911ed054c12901
+ VERSION=2.00
+
SOURCE_HASH=sha512:95862bba97d696fc277dc5b19bb7d1ec3716d8db9675696fc9233e6080b76ca83c1deb8a26ecb00bc5e23de5850c0a4eb007dc608df0e1f44fe30a1cac377878
+ URI=http://tesseract-ocr.googlecode.com/files
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=$URI/$SOURCE
+
+for LL in $TESS_LANG; do
+ case $LL in
+ eng)
+ SOURCE2=$SPELL-$VERSION.eng.tar.gz
+ SOURCE2_URL[0]=$URI/$SOURCE2
+
SOURCE2_HASH=sha512:f2aa2e1aa8f20c59faa664675f85ca8c1dcc922803f17cc00519f84a01c0c98ba431915ba5765d5de75200d828687507846af7e9e0096f3a4fdf1163e54cb83d
+ ;;
+ fra)
+ SOURCE3=$SPELL-$VERSION.fra.tar.gz
+ SOURCE3_URL[0]=$URI/$SOURCE3
+
SOURCE3_HASH=sha512:46686d6296446c59d020731e2d36e015717a750f6a41401c38794e7e8067dbd0299b838260a9ea9d5da3ddc289e0320ed71437f67ea99f93e79895e4aaf9cdc8
+ ;;
+ ita)
+ SOURCE4=$SPELL-$VERSION.ita.tar.gz
+ SOURCE4_URL[0]=$URI/$SOURCE4
+
SOURCE4_HASH=sha512:75cb670c1fe202878c220029d113e0795844f94901a6a0e31201c43d5694e1995c11760229ef6dc5222ff1fe49ee87ee1cdf073e80347e2862e71f045ce4a2db
+ ;;
+ nld)
+ SOURCE5=$SPELL-$VERSION.nld.tar.gz
+ SOURCE5_URL[0]=$URI/$SOURCE5
+
SOURCE5_HASH=sha512:0a2b7f13d784d210f5284de1a02c9b3849c4b36a27cf6276b5d9d444607bf52b909f8edfa07b5b1e0ee6bf59504bb9c92a47297ce31efa351aaa6b81c038b0ef
+ ;;
+ spa)
+ SOURCE6=$SPELL-$VERSION.spa.tar.gz
+ SOURCE6_URL[0]=$URI/$SOURCE6
+
SOURCE6_HASH=sha512:a7efb46c5cc3812789f3dacf151e547007c3de1eed3d4a6a5c55cc18d4e1794377f34b55fd9e6a416f91a0ff62a66c0825a1993029ce4656ea64fcc18b9fa3fe
+ ;;
+ deu)
+ SOURCE7=$SPELL-$VERSION.deu.tar.gz
+ SOURCE7_URL[0]=$URI/$SOURCE6
+
SOURCE7_HASH=sha512:e1792055d666c6090c4094b032d0143fd6bd5545c2d2e926f71bb360c6628ae5550f158df8efe47b69c987ac9cef8bd914fedcad2bd5b79901a41506ad8a60f2
+ ;;
+ *)
+ message language $LL not yet supported
+ ;;
+ esac
+done
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://tesseract-ocr.googlecode.com/$SOURCE
WEB_SITE=http://code.google.com/p/tesseract-ocr/
LICENSE[0]=APACHE
ENTERED=20060509
diff --git a/graphics/tesseract/HISTORY b/graphics/tesseract/HISTORY
index 74fa291..93dac6f 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,8 @@
+2007-07-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.00
+ * PREPARE: add support for language pack
+ * PRE_BUILD: added
+
2007-03-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new WEBSITE & URL
project has moved to code.google.com
diff --git a/graphics/tesseract/PREPARE b/graphics/tesseract/PREPARE
new file mode 100755
index 0000000..c0bafc4
--- /dev/null
+++ b/graphics/tesseract/PREPARE
@@ -0,0 +1,3 @@
+source $GRIMOIRE/FUNCTIONS &&
+config_query_multi TESS_LANG "which languages to support?" \
+ eng deu fra ita nld spa
diff --git a/graphics/tesseract/PRE_BUILD b/graphics/tesseract/PRE_BUILD
new file mode 100755
index 0000000..80f882f
--- /dev/null
+++ b/graphics/tesseract/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+for LL in $TESS_LANG; do
+ case $LL in
+ eng) unpack_file 2 ;;
+ fra) unpack_file 3 ;;
+ ita) unpack_file 4 ;;
+ nld) unpack_file 5 ;;
+ spa) unpack_file 6 ;;
+ deu) unpack_file 7 ;;
+ esac
+done
diff --git a/kde-apps/digikam/CONFLICTS b/kde-apps/digikam/CONFLICTS
deleted file mode 100755
index ae81dd1..0000000
--- a/kde-apps/digikam/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts digikamplugins y
diff --git a/kde-apps/digikam/HISTORY b/kde-apps/digikam/HISTORY
index ebee369..143b8b8 100644
--- a/kde-apps/digikam/HISTORY
+++ b/kde-apps/digikam/HISTORY
@@ -1,3 +1,6 @@
+2007-07-24 Treeve Jelbert <treevesourcemage.org>
+ * CONFLICTS: removed, digikamplugins is gone
+
2007-06-13 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.2-final (devel & stable)
* DEPENDS: both versions have same dependencies



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c28490d99367bc1465895a172216ec8be1bbbb96), Treeve Jelbert, 07/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page