Skip to Content.
Sympa Menu

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

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 (3069659c647d3df6172659fe8914de2885da21c9)
  • Date: Mon, 21 Jul 2008 11:39:20 -0500

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

devel/fpc/BUILD | 15 +++++++--------
devel/fpc/DETAILS | 25 +++++++++++++++----------
devel/fpc/HISTORY | 9 +++++++++
devel/fpc/INSTALL | 7 ++++---
devel/fpc/PRE_BUILD | 12 +++++++-----
devel/fpcsrc/BUILD | 3 ---
devel/fpcsrc/DETAILS | 8 +++++---
devel/fpcsrc/HISTORY | 8 ++++++++
devel/fpcsrc/PRE_BUILD | 33 +++++++++++++++------------------
devel/lazarus/CONFIGURE | 2 +-
devel/lazarus/DEPENDS | 2 +-
devel/lazarus/HISTORY | 5 +++++
devel/lazarus/PRE_BUILD | 8 --------
disk/ntfs-3g/HISTORY | 3 +++
disk/ntfs-3g/TRIGGERS | 1 +
kde4/kdeaccessibility4/DETAILS | 4 ++--
kde4/kdeaccessibility4/HISTORY | 3 +++
utils/strigi/DETAILS | 7 ++++---
utils/strigi/HISTORY | 4 ++++
19 files changed, 94 insertions(+), 65 deletions(-)

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

fpcsrc-2.2.2.rc2

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

fpc-2.2.2.rc2

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

"strigi-0.5.11"

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

ntfs-3g - add TRIGGERS

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

lazarus - now builds with qt4

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

lazarus - remove PRE_BUILD

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

"kdeaccessibility4-4.0.99"

diff --git a/devel/fpc/BUILD b/devel/fpc/BUILD
index 1c7f840..9402bfc 100755
--- a/devel/fpc/BUILD
+++ b/devel/fpc/BUILD
@@ -6,8 +6,7 @@ else
ARCH=386
fi &&

-make_single &&
-
+if ! spell_ok fpc ; then
#
# First compile a local version with the bootstrap
#
@@ -20,12 +19,12 @@ cp $SOURCE_DIRECTORY/compiler/ppc$ARCH \
#
make PP=$SOURCE_DIRECTORY/bootstrap/ppc$ARCH.local compiler_cycle &&
rm -f $SOURCE_DIRECTORY/bootstrap/ppc$ARCH.local &&
-
#
# Build all with our newly forged local FPC
#
-make PP=$SOURCE_DIRECTORY/compiler/ppc$ARCH rtl_clean
&&
-make PP=$SOURCE_DIRECTORY/compiler/ppc$ARCH rtl packages_base_all
packages_fcl_all \
- fv_all packages_extra_all utils
&&
-
-make_normal
+ PP=$SOURCE_DIRECTORY/compiler/ppc$ARCH
+else
+# use installed fpc
+ PP=$INSTALL_ROOT/usr/bin/fpc
+fi &&
+make PP=$PP build
diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 0ace23c..674667f 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,19 +1,24 @@
- SPELL=fpc
- VERSION=2.2.0
-
SOURCE_HASH=sha512:c6873e373fe24e850f20744826ce02af2cc04007359f82a28c3dc48b61a513807965630c61bae623197647c1d16aae1cb43faa313305acd2da46de882a91ca81
+ SPELL=fpc
+ VERSION=2.2.2.rc2
+ VX=beta
+
SOURCE_HASH=sha512:de974cb6fa146a5dc9b4a73b73d1fc6d941227c4c625bc8b1b4085d353b008b29a24efa83952c1802fce4242b428b54e9d69f3504eb4c3aa94f3d838919cd029
SOURCE=$SPELL-$VERSION.source.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
+
SOURCE_URL[0]=ftp://ftp.freepascal.org/fpc/$VX/${VERSION/\.r/r}/source/$SOURCE
WEB_SITE=http://www.freepascal.org
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- SOURCE2=$SPELL-$VERSION.i386-linux.tar
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- SOURCE2=$SPELL-$VERSION.x86_64-linux.tar
-else
- SOURCE2=$SPELL-$VERSION.i386-linux.tar
-fi
+if ! spell_ok fpc ; then
+ VERSIONB=2.2.0
+ if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
+ SOURCE2=$SPELL-$VERSIONB.i386-linux.tar
+ elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ SOURCE2=$SPELL-$VERSIONB.x86_64-linux.tar
+ else
+ SOURCE2=$SPELL-$VERSIONB.i386-linux.tar
+ fi
SOURCE2_URL[0]=$SOURCEFORGE_URL/freepascal/$SOURCE2
SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
+fi
LICENSE[0]=GPL
KEYWORDS="pascal compiler devel"
ENTERED=20050521
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index d694f07..e879dbc 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,12 @@
+2008-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.2.rc2
+ leave bootstrap version as 2.2.0, as not always needed
+ * DETAILS, PRE_BUILD, BUILD: don't bootstrap if fpc already installed
+ * INSTALL: 'make distinstall'
+ fix symlink for ppc386
+ * BUILD: remove make_single
+ just do 'make build'
+
2008-07-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: removed STAGED_INSTALL=off; works fine

diff --git a/devel/fpc/INSTALL b/devel/fpc/INSTALL
index cc3dc8b..f76f49e 100755
--- a/devel/fpc/INSTALL
+++ b/devel/fpc/INSTALL
@@ -8,12 +8,13 @@ fi &&

local FPCDEST FPCDIR FPC_COMP FPC_MAKE
&&
FPCDEST=${INSTALL_ROOT}/usr
&&
-FPCDIR=$FPCDEST/lib/fpc/${VERSION}
&&
+FPCDIR=$FPCDEST/lib/fpc/${VERSION//\.rc?}
&&
FPC_COMP=$SOURCE_DIRECTORY/compiler/ppc$ARCH
&&
FPC_MAKE=$SOURCE_DIRECTORY/utils/fpcm/fpcmake
&&
mkdir -p $FPCDIR
&&
-make PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE compiler_install
\
- rtl_install packages_install fv_install utils_install
&&
+#make PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE
compiler_install \
+# rtl_install packages_install fv_install utils_install
&&
+make PP=$FPC_COMP INSTALL_PREFIX=$FPCDEST FPCMAKE=$FPC_MAKE distinstall &&
ln -sf $FPCDIR/ppc$ARCH $FPCDEST/bin &&

#
diff --git a/devel/fpc/PRE_BUILD b/devel/fpc/PRE_BUILD
index ce46de0..84cccd3 100755
--- a/devel/fpc/PRE_BUILD
+++ b/devel/fpc/PRE_BUILD
@@ -8,22 +8,24 @@ else
ARCH=i386
fi &&

+cd $SOURCE_DIRECTORY &&
#
-# Setup bootstrapping
+# Setup bootstrapping, only if we don't have fpc already
#
-cd $SOURCE_DIRECTORY &&
+if ! spell_ok fpc ; then
mkdir bootstrap &&
cd bootstrap &&
unpack_file 2 &&
tar -xf binary.$ARCH-linux.tar &&
-tar -xzf base.$ARCH-linux.tar.gz &&
+tar -xzf base.$ARCH-linux.tar.gz
+fi &&

+cd $SOURCE_DIRECTORY &&
# we need libgdb.a in our tree
-cd $SOURCE_DIRECTORY &&
local GDB WHERE &&
GDB=$INSTALL_ROOT/usr/lib/libgdb.a &&

-if [ -e $GDB ];then
+if [[ -e $GDB ]];then
WHERE=packages/base/gdbint/libgdb/units/$ARCH-linux/ &&
mkdir -p $WHERE &&
cp $GDB $WHERE
diff --git a/devel/fpcsrc/BUILD b/devel/fpcsrc/BUILD
index b29a308..27ba77d 100755
--- a/devel/fpcsrc/BUILD
+++ b/devel/fpcsrc/BUILD
@@ -1,4 +1 @@
true
-#cd $SOURCE_DIRECTORY/source &&
-#FPCDIR=/usr/lib/fpc/$VERSION make packages_base_smart &&
-#zzzcrash
diff --git a/devel/fpcsrc/DETAILS b/devel/fpcsrc/DETAILS
index 13ceac0..788584b 100755
--- a/devel/fpcsrc/DETAILS
+++ b/devel/fpcsrc/DETAILS
@@ -1,8 +1,10 @@
SPELL=fpcsrc
- VERSION=2.2.0
-
SOURCE_HASH=sha512:c6873e373fe24e850f20744826ce02af2cc04007359f82a28c3dc48b61a513807965630c61bae623197647c1d16aae1cb43faa313305acd2da46de882a91ca81
+ VERSION=2.2.2.rc2
+ VX=beta
+
SOURCE_HASH=sha512:de974cb6fa146a5dc9b4a73b73d1fc6d941227c4c625bc8b1b4085d353b008b29a24efa83952c1802fce4242b428b54e9d69f3504eb4c3aa94f3d838919cd029
SOURCE=fpc-$VERSION.source.tar.gz
- SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
+ #SOURCE_URL[0]=${SOURCEFORGE_URL}/freepascal/$SOURCE
+
SOURCE_URL[0]=ftp://ftp.freepascal.org/fpc/$VX/${VERSION/\.r/r}/source/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/fpc-$VERSION
WEB_SITE=http://www.freepascal.org
LICENSE[0]=GPL
diff --git a/devel/fpcsrc/HISTORY b/devel/fpcsrc/HISTORY
index 0ce1bbb..05305ba 100644
--- a/devel/fpcsrc/HISTORY
+++ b/devel/fpcsrc/HISTORY
@@ -1,3 +1,11 @@
+2008-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.2.rc2
+ * PRE_BUILD: fix usage of VERSION
+ note: the tree ahs been restructured in this release
+ some subdirs are no longer present
+ remove a lot more subdirs
+ * BUILD: remove junk
+
2007-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.0

diff --git a/devel/fpcsrc/PRE_BUILD b/devel/fpcsrc/PRE_BUILD
index ef41d8c..b7293ad 100755
--- a/devel/fpcsrc/PRE_BUILD
+++ b/devel/fpcsrc/PRE_BUILD
@@ -1,29 +1,26 @@
#some directories are not needed now
local FDIRS FARCH FF DD &&
default_pre_build &&
-FDIRS="compiler installer tests ide fv utils"
-FARCH="packages/base/winunits \
- packages/base/graph/amiga \
- packages/base/graph/go32v2 \
- packages/base/graph/win32 \
- packages/extra/amunits \
- packages/extra/gbaunits \
- packages/extra/os2units \
- packages/extra/palmunits \
- packages/extra/ptc/dos \
- packages/extra/ptc/win32 \
- packages/fcl-*/tests" &&
+FDIRS="compiler installer tests ide utils" &&
cd $SOURCE_DIRECTORY &&
rm -r $FDIRS $FARCH &&
+cd packages &&
+rm -r fcl-*/tests \
+ amunits gnome1 gtk1 libndsfpc os2units palmunits univint winceunits
winunits* &&
+cd ptc/src &&
+rm -r dos win32 wince &&
+cd $SOURCE_DIRECTORY &&
mkdir $FDIRS &&
# link to existing units
-ln -s ${INSTALL_ROOT}/usr/lib/fpc/$VERSION/units &&
-for DD in rtl packages/fcl-base/src rtl/linux; do
+ln -s ${INSTALL_ROOT}/usr/lib/fpc/${VERSION//\.rc?}/units &&
+for DD in packages/fcl-base/src rtl rtl/linux; do
cd $SOURCE_DIRECTORY/$DD &&
for FF in `ls`;do
- case $FF in
- linux|unix|i386|x86_64|inc);;
- *) rm -r $FF;;
- esac
+ if [[ -d $FF ]];then
+ case $FF in
+ common|linux|unix|i386|x86_64|inc);;
+ *) rm -r $FF;;
+ esac
+ fi
done
done
diff --git a/devel/lazarus/CONFIGURE b/devel/lazarus/CONFIGURE
index 0c07b01..1b541c8 100755
--- a/devel/lazarus/CONFIGURE
+++ b/devel/lazarus/CONFIGURE
@@ -1 +1 @@
-config_query_list LAZ_GUI "which gui?(qt4 is still experimental)" gtk2 gtk
qt4
+config_query_list LAZ_GUI "which gui?" qt gtk2 gtk
diff --git a/devel/lazarus/DEPENDS b/devel/lazarus/DEPENDS
index c443165..d1f9d05 100755
--- a/devel/lazarus/DEPENDS
+++ b/devel/lazarus/DEPENDS
@@ -6,7 +6,7 @@ case $LAZ_GUI in
;;
gtk2) depends gtk+2
;;
- qt4) depends qt4 &&
+ qt) depends qt4 &&
depends g++ &&
depends qt4pas
;;
diff --git a/devel/lazarus/HISTORY b/devel/lazarus/HISTORY
index 612d439..d35d33a 100644
--- a/devel/lazarus/HISTORY
+++ b/devel/lazarus/HISTORY
@@ -1,3 +1,8 @@
+2008-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: deleted, not needed, even by devel version
+ * CONFIGURE, DEPENDS: change qt4 -> qt.
+ no longer experimental, builds ok
+
2007-12-24 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD, INSTALL: set FPC, for use on x86_64

diff --git a/devel/lazarus/PRE_BUILD b/devel/lazarus/PRE_BUILD
deleted file mode 100755
index db325cb..0000000
--- a/devel/lazarus/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ $LAZ_DEV = 'y' ];then
- mk_source_dir $SOURCE_DIRECTORY &&
- cd $SOURCE_DIRECTORY &&
- unpack_file
-else
- default_pre_build
-fi
-#patch -p0 < $SPELL_DIRECTORY/xxx.diff
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index fa91d79..8039d63 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,6 @@
+2008-07-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * TRIGGERS: added, as spell has an internal copy of fuse, which is
kernel dependent
+
2008-07-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2712

diff --git a/disk/ntfs-3g/TRIGGERS b/disk/ntfs-3g/TRIGGERS
new file mode 100755
index 0000000..bb1c400
--- /dev/null
+++ b/disk/ntfs-3g/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux cast_self
diff --git a/kde4/kdeaccessibility4/DETAILS b/kde4/kdeaccessibility4/DETAILS
index 772d20e..b6373fa 100755
--- a/kde4/kdeaccessibility4/DETAILS
+++ b/kde4/kdeaccessibility4/DETAILS
@@ -14,8 +14,8 @@ if [[ $KDE_VER == devel ]]; then
FORCE_DOWNLOAD=on
else
if [[ ${KDE_VER} == unstable ]];then
- VERSION=4.0.98
- SOURCE_HASH=sha512:
+ VERSION=4.0.99
+
SOURCE_HASH=sha512:68b388907000cace845f5e6ec4a5494eb8b5d14ed9dd13d114a0455401fb603f33599fbf00e079a70dcc299daa7d5485c818b6a62cd7a874af57863a31946a34
else
VERSION=4.0.3

SOURCE_HASH=sha512:9f3f8bf9e01cf61a6b3ddcdd2a9be10e0a8baead7fcf66b3dab32570eca3a968361ada23e8cc193da167951be2c0eb1b5e9f6255fdfc92933bdc99c60dc471e8
diff --git a/kde4/kdeaccessibility4/HISTORY b/kde4/kdeaccessibility4/HISTORY
index 75ded95..5e00326 100644
--- a/kde4/kdeaccessibility4/HISTORY
+++ b/kde4/kdeaccessibility4/HISTORY
@@ -1,3 +1,6 @@
+2008-07-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0.99
+
2008-07-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.98

diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index ed1bd7b..6f6e389 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -12,11 +12,12 @@ fi

SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk//kdesupport/$SPELL:$SPELL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
else
- VERSION=0.5.10
-
SOURCE_HASH=sha512:19cfc58c49c5cc7cc93ebd266cf99d89958480380b9f1c54734bf9383ebf60633b46a0ed8c26435c0e2195860b4dab96d91899f1d9b2012772694900d248e738
+ VERSION=0.5.11
+
SOURCE_HASH=sha512:a0b9f8db1303c71b9bfb9a658b542ab31e9e68b2ec9bce4026325e8208ea1a8a87eafeadf84878ae33e37ca92406456e66eb06800d4c3e3326081393a8579258
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_URL[0]=$KDE_URL/unstable/${KDEVER//.0}/src/$SOURCE
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
WEB_SITE=http://strigi.sourceforge.net/
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index b526265..8fe3d96 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,7 @@
+2008-07-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.11
+ new url
+
2008-06-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.10




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3069659c647d3df6172659fe8914de2885da21c9), Treeve Jelbert, 07/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page