[Sugar-devel] Bug tracking Vs Patch review

[Bert Freudenberg]

On 02.09.2010, at 23:28, Bert Freudenberg wrote:

> 
> On 02.09.2010, at 22:46, Sascha Silbe wrote:
> 
>> Excerpts from Bernie Innocenti's message of Thu Sep 02 22:02:29 +0200 2010:
>> 
>>> 1) On the submitter end:
>>> 
>>>   git commit -s
>>>   git format-patch -1
>>>   git send-email --to maintainer --cc list foo.patch
>> 
>> Just one amendment: 
>> 
>> In case the patch closes a bug in Trac, submitter includes the ticket
>> reference in the subject. E.g.
>> 
>> keyboard cpsection: don't choke on option group (SL#2022)
>> 
>> 
>> Otherwise +1.
> 
> On Fedora 13, git-send-email is not requires by sugar-jhbuild. If this is the official way to submit patches, then "git-email" should be added to sysdeps.
> 
> - Bert -

Also, mail sent this way gets blocked, see below. I'll send it again using my regular mailer.

- Bert -

From MAILER-DAEMON at fedora13.localdomain  Thu Sep  2 23:37:17 2010
Return-Path: <MAILER-DAEMON at fedora13.localdomain>
Received: from localhost (localhost)
	by fedora13.localdomain (8.14.4/8.14.4) id o82LbHmW020736;
	Thu, 2 Sep 2010 23:37:17 +0200
Date: Thu, 2 Sep 2010 23:37:17 +0200
From: Mail Delivery Subsystem <MAILER-DAEMON at fedora13.localdomain>
Message-Id: <201009022137.o82LbHmW020736 at fedora13.localdomain>
To: <bert at fedora13.localdomain>
MIME-Version: 1.0
Content-Type: multipart/report; report-type=delivery-status;
	boundary="o82LbHmW020736.1283463437/fedora13.localdomain"
Subject: Returned mail: see transcript for details
Auto-Submitted: auto-generated (failure)

This is a MIME-encapsulated message

--o82LbHmW020736.1283463437/fedora13.localdomain

The original message was received at Thu, 2 Sep 2010 23:37:04 +0200
from fedora13.localdomain [127.0.0.1]

   ----- The following addresses had permanent fatal errors -----
<bert at freudenbergs.de>
    (reason: 550 Dial-Up IP address rejected)
<sugar-devel at lists.sugarlabs.org>
    (reason: 554 5.7.1 Service unavailable; Client host [77.184.213.183] blocked using zen.spamhaus.org; http://www.spamhaus.org/query/bl?ip=77.184.213.183)
<sascha at silbe.org>
    (reason: 517-Domain does not exist: fedora13.localdomain.)

   ----- Transcript of session follows -----
... while talking to mailin.rzone.de.:
>>> DATA
<<< 550 Dial-Up IP address rejected
550 5.1.1 <bert at freudenbergs.de>... User unknown
<<< 554 5.0.0 no valid recipients given
... while talking to solarsail.sugarlabs.org.:
>>> DATA
<<< 554 5.7.1 Service unavailable; Client host [77.184.213.183] blocked using zen.spamhaus.org; http://www.spamhaus.org/query/bl?ip=77.184.213.183
554 5.0.0 Service unavailable
<<< 554 5.5.1 Error: no valid recipients
... while talking to b.mx.chost.de.:
>>> MAIL From:<bert at fedora13.localdomain> SIZE=5977
<<< 517-Domain does not exist: fedora13.localdomain.
<<< 517 Invalid domain, see <URL:ftp://ftp.isi.edu/in-notes/rfc1035.txt>
554 5.0.0 Service unavailable

--o82LbHmW020736.1283463437/fedora13.localdomain
Content-Type: message/delivery-status

Reporting-MTA: dns; fedora13.localdomain
Received-From-MTA: DNS; fedora13.localdomain
Arrival-Date: Thu, 2 Sep 2010 23:37:04 +0200

Final-Recipient: RFC822; bert at freudenbergs.de
Action: failed
Status: 5.1.1
Remote-MTA: DNS; mailin.rzone.de
Diagnostic-Code: SMTP; 550 Dial-Up IP address rejected
Last-Attempt-Date: Thu, 2 Sep 2010 23:37:05 +0200

Final-Recipient: RFC822; sugar-devel at lists.sugarlabs.org
Action: failed
Status: 5.7.1
Remote-MTA: DNS; solarsail.sugarlabs.org
Diagnostic-Code: SMTP; 554 5.7.1 Service unavailable; Client host [77.184.213.183] blocked using zen.spamhaus.org; http://www.spamhaus.org/query/bl?ip=77.184.213.183
Last-Attempt-Date: Thu, 2 Sep 2010 23:37:08 +0200

Final-Recipient: RFC822; sascha at silbe.org
Action: failed
Status: 5.0.0
Diagnostic-Code: SMTP; 517-Domain does not exist: fedora13.localdomain.
Last-Attempt-Date: Thu, 2 Sep 2010 23:37:17 +0200

--o82LbHmW020736.1283463437/fedora13.localdomain
Content-Type: message/rfc822

Return-Path: <bert at fedora13.localdomain>
Received: from fedora13.localdomain (fedora13.localdomain [127.0.0.1])
	by fedora13.localdomain (8.14.4/8.14.4) with ESMTP id o82Lb3mW020734;
	Thu, 2 Sep 2010 23:37:04 +0200
Received: (from bert at localhost)
	by fedora13.localdomain (8.14.4/8.14.4/Submit) id o82Lb1DR020733;
	Thu, 2 Sep 2010 23:37:01 +0200
From: Bert Freudenberg <bert at freudenbergs.de>
To: sascha at silbe.org
Cc: sugar-devel at lists.sugarlabs.org, Bert Freudenberg <bert at freudenbergs.de>
Subject: [PATCH] Build Squeak VM 4.0.3 from tarfile
Date: Thu,  2 Sep 2010 23:36:17 +0200
Message-Id: <1283463377-20677-1-git-send-email-bert at freudenbergs.de>
X-Mailer: git-send-email 1.7.2.2

This is almost the same as my patch from April, which never made it in.
Instead of building from the outdated "olpc" subversion branch, the Squeak VM is build from a release tarball.
It adds a cmake dependency, and gives an error if make is run without running autogen.sh first.
Also adds a "clean" make target to please jhbuild.

Signed-off-by: Bert Freudenberg <bert at freudenbergs.de>
---
 config/modulesets/glucose-external.modules      |   15 +++++++-----
 config/modulesets/patches/squeak-autogen.patch  |   28 +++++++++++++++++++++++
 config/modulesets/patches/squeak-makefile.patch |   11 +++++++++
 config/sysdeps/debian-family.xml                |    1 +
 config/sysdeps/fedora-family.xml                |    1 +
 config/sysdeps/mandrivalinux-2009.1.xml         |    1 +
 6 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 config/modulesets/patches/squeak-autogen.patch
 create mode 100644 config/modulesets/patches/squeak-makefile.patch

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index d76b1f0..0577963 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -5,8 +5,8 @@
       href="git://dev.laptop.org/projects/" />
   <repository type="git" name="git.gnome.org"
       href="git://git.gnome.org"/>
-  <repository type="svn" name="squeakvm.org"
-        href="http://squeakvm.org/svn/squeak/branches/" trunk-template="olpc"/>
+  <repository type="tarball" name="squeakvm.org"
+      href="http://squeakvm.org/unix/release/"/>
   <repository type="git" name="git.imendio.com"
       href="git://git.imendio.com/projects/"/>
   <repository type="tarball" name="telepathy"
@@ -61,10 +61,13 @@
       <dep package="abiword"/>
     </dependencies>
   </tarball>
-  <autotools id="squeak">
-    <branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
-    <dependencies>
-    </dependencies>
+  <autotools id="squeak" autogen-template="/bin/sh autogen.sh --prefix=%(prefix)s">
+    <branch module="Squeak-4.0.3.2200-src.tar.gz" version="4.0.3.2200"
+      repo="squeakvm.org"
+      hash="sha256:87cd3f708cb3d330f6d74931fd7488784f45b0f467f14e2dc6fbdc9d3df97189" size="3623094">
+      <patch file="squeak-autogen.patch" strip="0" />
+      <patch file="squeak-makefile.patch" strip="0" />
+    </branch>
   </autotools>
   <autotools id="hulahop">
     <branch module="hulahop/mainline.git" checkoutdir="hulahop"/>
diff --git a/config/modulesets/patches/squeak-autogen.patch b/config/modulesets/patches/squeak-autogen.patch
new file mode 100644
index 0000000..ff9274d
--- /dev/null
+++ b/config/modulesets/patches/squeak-autogen.patch
@@ -0,0 +1,28 @@
+--- /dev/null	2010-09-02 18:58:30.359785873 +0200
++++ autogen.sh	2010-09-02 22:07:35.577316348 +0200
+@@ -0,0 +1,25 @@
++#!/bin/sh
++EXCLUDE="gl FileCopyPlugin SqueakFFIPrims B3DAcceleratorPlugin PseudoTTYPlugin UnixOSProcessPlugin XDisplayControlPlugin"
++
++test -d bld || mkdir bld
++
++OPTIONS=""
++for p in $EXCLUDE ; do
++	OPTIONS="$OPTIONS --without-${p}"
++done
++
++(cd bld && ../unix/cmake/configure $OPTIONS "$@")
++
++cat > Makefile <<__EOF__
++default:
++	make -C bld
++
++install:
++	make -C bld install
++
++check:
++	@echo SKIPPED: No tests defined for Squeak VM
++
++clean:
++	rm -rf bld Makefile
++__EOF__
diff --git a/config/modulesets/patches/squeak-makefile.patch b/config/modulesets/patches/squeak-makefile.patch
new file mode 100644
index 0000000..043dc7d
--- /dev/null
+++ b/config/modulesets/patches/squeak-makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2010-09-02 22:11:03.702191222 +0200
++++ Makefile	2010-09-02 22:21:14.580177789 +0200
+@@ -1,7 +1,5 @@
+ all : .force
+-	test -d bld || mkdir bld
+-	(cd bld; ../unix/cmake/configure)
+-	(cd bld; make)
++	@test -d bld || (echo ERROR: run autogen.sh first; exit 1)
+ 
+ install : all
+ 	(cd bld; make install)
diff --git a/config/sysdeps/debian-family.xml b/config/sysdeps/debian-family.xml
index ce11329..9870451 100644
--- a/config/sysdeps/debian-family.xml
+++ b/config/sysdeps/debian-family.xml
@@ -3,6 +3,7 @@
   <package name="automake1.9"/>
   <package name="avahi-daemon"/>
   <package name="avahi-autoipd"/><!-- for ad-hoc network support -->
+  <package name="cmake"/>
   <package name="evince"/>
   <package name="g++"/>
   <package name="gcc"/>
diff --git a/config/sysdeps/fedora-family.xml b/config/sysdeps/fedora-family.xml
index 83ec629..f97efb4 100644
--- a/config/sysdeps/fedora-family.xml
+++ b/config/sysdeps/fedora-family.xml
@@ -7,6 +7,7 @@
   <package name="avahi-tools" source="avahi"/>
   <package name="avahi-autoipd"/><!-- for ad-hoc network support -->
   <package name="boost-devel"/>
+  <package name="cmake"/>
   <package name="csound"/>
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
diff --git a/config/sysdeps/mandrivalinux-2009.1.xml b/config/sysdeps/mandrivalinux-2009.1.xml
index 0acac46..7fa1131 100644
--- a/config/sysdeps/mandrivalinux-2009.1.xml
+++ b/config/sysdeps/mandrivalinux-2009.1.xml
@@ -9,6 +9,7 @@
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
   <package name="dbus-python"/>
+  <package name="cmake"/>
   <package name="enchant-devel"/>
   <package name="expat-devel"/>
   <package name="fonts-ttf-dejavu"/>
-- 
1.7.2.2


--o82LbHmW020736.1283463437/fedora13.localdomain--