Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77191 by George J. Sherwood for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77191 by George J. Sherwood for review
  • Date: Tue, 4 Apr 2006 00:50:01 +0100 (BST)

Change 77191 by george_sherwood@georges on 2006/04/04 00:49:23

Updated so current version will build with gcc34. Added newest
devel version.

Affected files ...

... //sgl/grimoires/test/gnome2-apps/pan2/DEPENDS#3 integrate
... //sgl/grimoires/test/gnome2-apps/pan2/DETAILS#6 integrate
... //sgl/grimoires/test/gnome2-apps/pan2/HISTORY#7 integrate
... //sgl/grimoires/test/gnome2-apps/pan2/PREPARE#2 integrate
... //sgl/grimoires/test/gnome2-apps/pan2/PRE_BUILD#2 integrate
... //sgl/grimoires/test/gnome2-apps/pan2/pan.patch#1 branch

Differences ...

==== //sgl/grimoires/test/gnome2-apps/pan2/DEPENDS#3 (xtext) ====

@@ -1,10 +1,17 @@
-if [ "$PAN2_CVS" == "y" ]; then
+if [ "$REL" == "cvs" ]; then
depends CVS &&
depends automake
fi &&
-depends libxml2 &&
+if [ "$REL" == "devel" ]; then
+ depends gmime
+else
+ depends libxml2 &&
+ depends gnet
+fi &&
+if [ "$REL" == "current" ]; then
+ depends gcc34
+fi &&
depends gtk+2 &&
-depends gnet &&
depends pcre &&
depends g++ &&


==== //sgl/grimoires/test/gnome2-apps/pan2/DETAILS#6 (xtext) ====

@@ -1,5 +1,5 @@
SPELL=pan2
-if [ "$PAN2_CVS" == "y" ]; then
+if [ "$REL" == "cvs" ]; then
if [ "$PAN2_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
@@ -10,12 +10,19 @@
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan2-$VERSION
+elif [ "$REL" == "devel" ]; then
+ VERSION=0.90
+ SOURCE=pan-$VERSION.tar.bz2
+
SOURCE_URL[0]=http://pan.rebelbase.com/download/releases/$VERSION/SOURCE/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION
+
SOURCE_HASH=sha512:e67b11bef469c4ecfe266a4990517044d9113d2b283697917ca431060d4e0bded1080274eba94962ce1d0335032e8a59076733aa723b625e5d25f85dab8e05d7
else
VERSION=0.14.2.91
SOURCE=pan-$VERSION.tar.bz2

SOURCE_URL[0]=http://pan.rebelbase.com/download/releases/$VERSION/SOURCE/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pan-$VERSION

SOURCE_HASH=sha512:295fb5e9157768c65957e691d775f7c152f4354ce87db227ce1b5a7c91c3c45346863a26310012eb5ad3a0d75245eba093b98e3406941e18d18a65d5d02bac62
+ GCC_VERSION=3.4
fi
LICENSE[0]=GPL
WEB_SITE=http://pan.rebelbase.com

==== //sgl/grimoires/test/gnome2-apps/pan2/HISTORY#7 (text) ====

@@ -1,3 +1,11 @@
+2006-04-03 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated for devel version 0.90. Current version
+ requires gcc34.
+ * DEPENDS: Adjusted depends for different versions
+ * PREPARE: Added config_query_list for cvs, devel, current
+ * PRE_BUILD: Added patch
+ * pan.patch: Added to fix segfault in devel version
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnome2-apps/pan2/PREPARE#2 (xtext) ====

@@ -1,5 +1,5 @@
-config_query PAN2_CVS "Build the cvs version?" n
-if [ "$PAN2_CVS" == "y" ]; then
+config_query_list REL "Which release?" current devel cvs
+if [ "$REL" == "cvs" ]; then
config_query PAN2_CVS_AUTOUPDATE \
"Update to the latest CVS automatically on every cast?" n
fi

==== //sgl/grimoires/test/gnome2-apps/pan2/PRE_BUILD#2 (xtext) ====

@@ -1,5 +1,9 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [ "$PAN2_CVS" == "y" ]; then
+if [ "$REL" == "devel" ]; then
+cd pan/data-impl &&
+patch -p0 < $SCRIPT_DIRECTORY/pan.patch
+fi &&
+if [ "$REL" == "cvs" ]; then
NOCONFIGURE=Y ./autogen.sh
fi



  • [SM-Commit] PERFORCE change 77191 by George J. Sherwood for review, Perforce Review Daemon, 04/03/2006

Archive powered by MHonArc 2.6.24.

Top of Page