From fedora-extras-commits at redhat.com Mon Jan 1 01:03:30 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 31 Dec 2006 20:03:30 -0500
Subject: owners owners.list,1.2181,1.2182
Message-ID: <200701010103.l0113UAq019071@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19046
Modified Files:
owners.list
Log Message:
fix librfid entry
Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2181
retrieving revision 1.2182
diff -u -r1.2181 -r1.2182
--- owners.list 31 Dec 2006 15:40:56 -0000 1.2181
+++ owners.list 1 Jan 2007 01:03:00 -0000 1.2182
@@ -1027,7 +1027,7 @@
Fedora Extras|libqalculate|Multi-purpose calculator library|dakingun at gmail.com|extras-qa at fedoraproject.org|
Fedora Extras|libreadline-java|A Java wrapper around EditLine|ifoox at redhat.com|extras-qa at fedoraproject.org|
Fedora Extras|libresample|A real-time library for audio sampling rate conversion|jeff at ocjtech.us|extras-qa at fedoraproject.org|
-Fedora Extras|librfid|Free Software RFID library|kushaldas at gmail.com|extras-qa at fedoraproject.org
+Fedora Extras|librfid|Free Software RFID library|kushaldas at gmail.com|extras-qa at fedoraproject.org|
Fedora Extras|librsync|Rsync libraries|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
Fedora Extras|librx|POSIX regexp functions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
Fedora Extras|libsafe|For bugs related to the libsafe component|sgrubb at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
From fedora-extras-commits at redhat.com Mon Jan 1 01:05:39 2007
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 31 Dec 2006 20:05:39 -0500
Subject: upgradecheck upgradecheck.py,1.29,1.30
Message-ID: <200701010105.l0115dIM019119@cvs-int.fedora.redhat.com>
Author: mschwendt
Update of /cvs/fedora/upgradecheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19104
Modified Files:
upgradecheck.py
Log Message:
PackageOwners.get(..) -> PackageOwners.GetOwner(..)
Index: upgradecheck.py
===================================================================
RCS file: /cvs/fedora/upgradecheck/upgradecheck.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- upgradecheck.py 27 Dec 2006 20:29:43 -0000 1.29
+++ upgradecheck.py 1 Jan 2007 01:05:39 -0000 1.30
@@ -204,7 +204,7 @@
if broken_paths:
if owners:
- owner = owners.get(name) or \
+ owner = owners.GetOwner(name) or \
'UNKNOWN OWNER (possibly Core package)'
else:
owner = ''
From fedora-extras-commits at redhat.com Mon Jan 1 01:06:20 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 31 Dec 2006 20:06:20 -0500
Subject: owners owners.list,1.2182,1.2183
Message-ID: <200701010106.l0116Kft019144@cvs-int.fedora.redhat.com>
Author: c4chris
Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19125
Modified Files:
owners.list
Log Message:
Remove duplicate. Fix sorting order.
Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2182
retrieving revision 1.2183
diff -u -r1.2182 -r1.2183
--- owners.list 1 Jan 2007 01:03:00 -0000 1.2182
+++ owners.list 1 Jan 2007 01:05:49 -0000 1.2183
@@ -304,11 +304,11 @@
Fedora Extras|dbus-qt|Qt-based library for using D-BUS|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
Fedora Extras|dclib|Direct Connect file sharing library|lmacken at redhat.com|extras-qa at fedoraproject.org|
Fedora Extras|dd2|Dodgin' Diamond 2 - Shoot'em up arcade game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
Fedora Extras|ddclient|A client to update dynamic DNS host entries|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|thomas at apestaart.org
Fedora Extras|ddd|GUI for several command-line debuggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
Fedora Extras|ddskk|Daredevil SKK - Simple Kana to Kanji conversion program for Emacs|petersen at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
Fedora Extras|deltarpm|Create deltas between rpms|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
@@ -1325,7 +1325,6 @@
Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
Fedora Extras|pachi|Pachi El Marciano - Platform Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
Fedora Extras|padevchooser|Control applet for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
-Fedora Extras|paman|Management tool for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|alex at dalloz.de|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
Fedora Extras|pam_keyring|A PAM module that executes gnome-keyring-daemon and unlocks the default keyring|denis at poolshark.org|extras-qa at fedoraproject.org|redhat at flyn.org
Fedora Extras|pam_mount|A PAM module that can mount volumes for a user session|opensource at till.name|extras-qa at fedoraproject.org|
@@ -1334,6 +1333,7 @@
Fedora Extras|pam_script|Allows executing scripts after opening and/or closing a session using PAM|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
Fedora Extras|pam_ssh|PAM module for use with SSH keys and ssh-agent|pertusus at free.fr|extras-qa at fedoraproject.org|dmitry at butskoy.name
Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org|
+Fedora Extras|paman|Management tool for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
Fedora Extras|pan|A GNOME/GTK+ news reader for X|alex at dalloz.de|extras-qa at fedoraproject.org|mpeters at mac.com
Fedora Extras|panelfm|Quick File Manager Applet|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
@@ -2132,7 +2132,6 @@
Fedora Extras|python-twisted-web|Twisted web server, programmable in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
Fedora Extras|python-twisted-words|Twisted Words contains Instant Messaging implementations|thomas at apestaart.org|extras-qa at fedoraproject.org|
Fedora Extras|python-urljr|A common interface to urllib2 and curl for making HTTP requests|jeff at ocjtech.us|extras-qa at fedoraproject.org|
-Fedora Extras|python-urljr|A common interface to urllib2 and curl for making HTTP requests|jeff at ocjtech.us|extras-qa at fedoraproject.org|
Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|
From fedora-extras-commits at redhat.com Mon Jan 1 01:52:11 2007
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sun, 31 Dec 2006 20:52:11 -0500
Subject: comps comps-fe5.xml.in, 1.217, 1.218 comps-fe6.xml.in, 1.253,
1.254 comps-fe7.xml.in, 1.58, 1.59
Message-ID: <200701010152.l011qBXi019262@cvs-int.fedora.redhat.com>
Author: steve
Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243
Modified Files:
comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in
Log Message:
Add sqlgrey.
Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- comps-fe5.xml.in 31 Dec 2006 09:11:04 -0000 1.217
+++ comps-fe5.xml.in 1 Jan 2007 01:51:41 -0000 1.218
@@ -730,6 +730,7 @@
perl-Cyrus
pyzor
spamass-milter
+ sqlgrey
Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- comps-fe6.xml.in 31 Dec 2006 09:11:04 -0000 1.253
+++ comps-fe6.xml.in 1 Jan 2007 01:51:41 -0000 1.254
@@ -783,6 +783,7 @@
mlmmj
pyzor
spamass-milter
+ sqlgrey
Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- comps-fe7.xml.in 31 Dec 2006 09:11:04 -0000 1.58
+++ comps-fe7.xml.in 1 Jan 2007 01:51:41 -0000 1.59
@@ -783,6 +783,7 @@
mlmmj
pyzor
spamass-milter
+ sqlgrey
From fedora-extras-commits at redhat.com Mon Jan 1 01:58:13 2007
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 31 Dec 2006 20:58:13 -0500
Subject: status-report-scripts parseBZbugList,1.61,1.62
Message-ID: <200701010158.l011wD4c019314@cvs-int.fedora.redhat.com>
Author: c4chris
Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19299
Modified Files:
parseBZbugList
Log Message:
Special handling of -kmod package.
Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- parseBZbugList 21 Dec 2006 16:42:50 -0000 1.61
+++ parseBZbugList 1 Jan 2007 01:58:13 -0000 1.62
@@ -353,6 +353,14 @@
next;
}
if ($block == 1) {
+ if ($F[8] eq "Package Review"
+ && $F[10] =~ /^([^(]+)\(-kmod\)$/) {
+ my $pkgName = $1;
+ my @F1 = @F;
+ $F[10] = $pkgName;
+ $F1[10] = "$pkgName-kmod";
+ $bzb->{$F[0]} = \@F1;
+ }
$bzb->{$F[0]} = \@F;
if ($sponsor == 1 && $bzb == \%BZN) {
$BZS{$F[0]} = \@F;
From fedora-extras-commits at redhat.com Mon Jan 1 02:10:52 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun, 31 Dec 2006 21:10:52 -0500
Subject: rpms/gcin/devel gcin_gtab.patch, NONE, 1.1 .cvsignore, 1.11,
1.12 gcin.spec, 1.17, 1.18 sources, 1.11, 1.12
Message-ID: <200701010210.l012Aqh5022551@cvs-int.fedora.redhat.com>
Author: candyz
Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22529
Modified Files:
.cvsignore gcin.spec sources
Added Files:
gcin_gtab.patch
Log Message:
update to 1.3.2
gcin_gtab.patch:
--- NEW FILE gcin_gtab.patch ---
diff -urN gcin-1.3.2.orig/gtab.c gcin-1.3.2/gtab.c
--- gcin-1.3.2.orig/gtab.c 2006-12-29 23:51:37.000000000 +0800
+++ gcin-1.3.2/gtab.c 2007-01-01 08:59:01.000000000 +0800
@@ -190,9 +190,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
+ strcat(out, "[");
strcat(out, tbuf[i]);
if (i < tbufN-1)
- strcat(out, " |");
+ strcat(out, "] ");
+ else
+ strcat(out, "]");
}
free(tbuf[i]);
@@ -814,6 +817,7 @@
static void disp_selection(gboolean phrase_selected)
{
char pgstr[32];
+ ClrSelArea();
page_no_str(pgstr);
if (!gtab_vertical_select && more_pg)
@@ -838,7 +842,14 @@
int i;
for(i=ofs; i< cur_inmd->M_DUP_SEL + ofs; i++) {
if (seltab[i][0]) {
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
b1_cat(tt, cur_inmd->selkey[i - ofs]);
+
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
if (gtab_vertical_select)
strcat(tt, ". ");
@@ -850,7 +861,7 @@
char uu[512];
if (gtab_vertical_select) {
- utf8cpy_bytes(uu, seltab[i], 60);
+ utf8cpy_bytes(uu, seltab[i], 120);
strcat(tt, uu);
} else {
char *p = seltab[i];
@@ -1167,6 +1178,8 @@
return 0;
}
case XK_Prior:
+ case XK_Left:
+ case XK_Up:
case XK_KP_Subtract:
if (wild_mode) {
if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
@@ -1182,6 +1195,8 @@
}
return 0;
case XK_Next:
+ case XK_Right:
+ case XK_Down:
case XK_KP_Add:
if (more_pg) {
next_page:
diff -urN gcin-1.3.2.orig/gtab.h gcin-1.3.2/gtab.h
--- gcin-1.3.2.orig/gtab.h 2006-12-18 11:15:18.000000000 +0800
+++ gcin-1.3.2/gtab.h 2007-01-01 08:59:01.000000000 +0800
@@ -1,4 +1,4 @@
-#define MAX_CIN_PHR (100*CH_SZ + 1)
+#define MAX_CIN_PHR (200*CH_SZ + 1)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 3 Dec 2006 07:24:32 -0000 1.11
+++ .cvsignore 1 Jan 2007 02:10:22 -0000 1.12
@@ -1 +1 @@
-gcin-1.3.1.tar.bz2
+gcin-1.3.2.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gcin.spec 3 Dec 2006 07:24:33 -0000 1.17
+++ gcin.spec 1 Jan 2007 02:10:22 -0000 1.18
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -14,7 +14,7 @@
Patch2: qt.patch
Patch3: configure.patch
Patch4: newcj3.patch
-Patch5: gcin_update.patch
+Patch5: gcin_gtab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +34,7 @@
%patch2 -p1 -b .qt
%patch3 -p1 -b .configure
%patch4 -p1 -b .newcj3
-%patch5 -p1 -b .up
+%patch5 -p1 -b .gtab
#cp -f gcinicon/gtab.list data/
#cp -f gcinicon/*.png icons/
find . -name \*.h -o -name \*.c | xargs chmod ugo-x
@@ -93,6 +93,7 @@
%doc AUTHORS COPYING Changelog README
%config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
%{_bindir}/gcin*
+%{_bindir}/gtab*
%{_bindir}/juyin-learn
%{_bindir}/pho*
%{_bindir}/sim2trad
@@ -109,6 +110,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Mon Jan 01 2007 Chung-Yen Chang - 1.3.2-1
+- update to 1.3.2
+
* Sun Dec 03 2006 Chung-Yen Chang - 1.3.1-1
- update to 1.3.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 3 Dec 2006 07:24:33 -0000 1.11
+++ sources 1 Jan 2007 02:10:22 -0000 1.12
@@ -1 +1 @@
-3b6fb7483bc894af3ba787268584b3c2 gcin-1.3.1.tar.bz2
+340a2d470be29fff64f455400e2886c5 gcin-1.3.2.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 02:13:09 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun, 31 Dec 2006 21:13:09 -0500
Subject: rpms/gcin/FC-6 gcin_gtab.patch, NONE, 1.1 .cvsignore, 1.11,
1.12 gcin.spec, 1.16, 1.17 sources, 1.11, 1.12
Message-ID: <200701010213.l012D9VX022622@cvs-int.fedora.redhat.com>
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22600
Modified Files:
.cvsignore gcin.spec sources
Added Files:
gcin_gtab.patch
Log Message:
update to 1.3.2
gcin_gtab.patch:
--- NEW FILE gcin_gtab.patch ---
diff -urN gcin-1.3.2.orig/gtab.c gcin-1.3.2/gtab.c
--- gcin-1.3.2.orig/gtab.c 2006-12-29 23:51:37.000000000 +0800
+++ gcin-1.3.2/gtab.c 2007-01-01 08:59:01.000000000 +0800
@@ -190,9 +190,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
+ strcat(out, "[");
strcat(out, tbuf[i]);
if (i < tbufN-1)
- strcat(out, " |");
+ strcat(out, "] ");
+ else
+ strcat(out, "]");
}
free(tbuf[i]);
@@ -814,6 +817,7 @@
static void disp_selection(gboolean phrase_selected)
{
char pgstr[32];
+ ClrSelArea();
page_no_str(pgstr);
if (!gtab_vertical_select && more_pg)
@@ -838,7 +842,14 @@
int i;
for(i=ofs; i< cur_inmd->M_DUP_SEL + ofs; i++) {
if (seltab[i][0]) {
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
b1_cat(tt, cur_inmd->selkey[i - ofs]);
+
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
if (gtab_vertical_select)
strcat(tt, ". ");
@@ -850,7 +861,7 @@
char uu[512];
if (gtab_vertical_select) {
- utf8cpy_bytes(uu, seltab[i], 60);
+ utf8cpy_bytes(uu, seltab[i], 120);
strcat(tt, uu);
} else {
char *p = seltab[i];
@@ -1167,6 +1178,8 @@
return 0;
}
case XK_Prior:
+ case XK_Left:
+ case XK_Up:
case XK_KP_Subtract:
if (wild_mode) {
if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
@@ -1182,6 +1195,8 @@
}
return 0;
case XK_Next:
+ case XK_Right:
+ case XK_Down:
case XK_KP_Add:
if (more_pg) {
next_page:
diff -urN gcin-1.3.2.orig/gtab.h gcin-1.3.2/gtab.h
--- gcin-1.3.2.orig/gtab.h 2006-12-18 11:15:18.000000000 +0800
+++ gcin-1.3.2/gtab.h 2007-01-01 08:59:01.000000000 +0800
@@ -1,4 +1,4 @@
-#define MAX_CIN_PHR (100*CH_SZ + 1)
+#define MAX_CIN_PHR (200*CH_SZ + 1)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 3 Dec 2006 07:27:37 -0000 1.11
+++ .cvsignore 1 Jan 2007 02:12:39 -0000 1.12
@@ -1 +1 @@
-gcin-1.3.1.tar.bz2
+gcin-1.3.2.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gcin.spec 3 Dec 2006 07:27:38 -0000 1.16
+++ gcin.spec 1 Jan 2007 02:12:39 -0000 1.17
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -14,7 +14,7 @@
Patch2: qt.patch
Patch3: configure.patch
Patch4: newcj3.patch
-Patch5: gcin_update.patch
+Patch5: gcin_gtab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +34,7 @@
%patch2 -p1 -b .qt
%patch3 -p1 -b .configure
%patch4 -p1 -b .newcj3
-%patch5 -p1 -b .up
+%patch5 -p1 -b .gtab
#cp -f gcinicon/gtab.list data/
#cp -f gcinicon/*.png icons/
find . -name \*.h -o -name \*.c | xargs chmod ugo-x
@@ -93,6 +93,7 @@
%doc AUTHORS COPYING Changelog README
%config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
%{_bindir}/gcin*
+%{_bindir}/gtab*
%{_bindir}/juyin-learn
%{_bindir}/pho*
%{_bindir}/sim2trad
@@ -109,6 +110,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Mon Jan 01 2007 Chung-Yen Chang - 1.3.2-1
+- update to 1.3.2
+
* Sun Dec 03 2006 Chung-Yen Chang - 1.3.1-1
- update to 1.3.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 3 Dec 2006 07:27:38 -0000 1.11
+++ sources 1 Jan 2007 02:12:39 -0000 1.12
@@ -1 +1 @@
-3b6fb7483bc894af3ba787268584b3c2 gcin-1.3.1.tar.bz2
+340a2d470be29fff64f455400e2886c5 gcin-1.3.2.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 02:15:44 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun, 31 Dec 2006 21:15:44 -0500
Subject: rpms/gcin/FC-5 gcin_gtab.patch, NONE, 1.1 .cvsignore, 1.11,
1.12 gcin.spec, 1.15, 1.16 sources, 1.11, 1.12
Message-ID: <200701010215.l012FiYB022661@cvs-int.fedora.redhat.com>
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22639
Modified Files:
.cvsignore gcin.spec sources
Added Files:
gcin_gtab.patch
Log Message:
update to 1.3.2
gcin_gtab.patch:
--- NEW FILE gcin_gtab.patch ---
diff -urN gcin-1.3.2.orig/gtab.c gcin-1.3.2/gtab.c
--- gcin-1.3.2.orig/gtab.c 2006-12-29 23:51:37.000000000 +0800
+++ gcin-1.3.2/gtab.c 2007-01-01 08:59:01.000000000 +0800
@@ -190,9 +190,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
+ strcat(out, "[");
strcat(out, tbuf[i]);
if (i < tbufN-1)
- strcat(out, " |");
+ strcat(out, "] ");
+ else
+ strcat(out, "]");
}
free(tbuf[i]);
@@ -814,6 +817,7 @@
static void disp_selection(gboolean phrase_selected)
{
char pgstr[32];
+ ClrSelArea();
page_no_str(pgstr);
if (!gtab_vertical_select && more_pg)
@@ -838,7 +842,14 @@
int i;
for(i=ofs; i< cur_inmd->M_DUP_SEL + ofs; i++) {
if (seltab[i][0]) {
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
b1_cat(tt, cur_inmd->selkey[i - ofs]);
+
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
if (gtab_vertical_select)
strcat(tt, ". ");
@@ -850,7 +861,7 @@
char uu[512];
if (gtab_vertical_select) {
- utf8cpy_bytes(uu, seltab[i], 60);
+ utf8cpy_bytes(uu, seltab[i], 120);
strcat(tt, uu);
} else {
char *p = seltab[i];
@@ -1167,6 +1178,8 @@
return 0;
}
case XK_Prior:
+ case XK_Left:
+ case XK_Up:
case XK_KP_Subtract:
if (wild_mode) {
if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
@@ -1182,6 +1195,8 @@
}
return 0;
case XK_Next:
+ case XK_Right:
+ case XK_Down:
case XK_KP_Add:
if (more_pg) {
next_page:
diff -urN gcin-1.3.2.orig/gtab.h gcin-1.3.2/gtab.h
--- gcin-1.3.2.orig/gtab.h 2006-12-18 11:15:18.000000000 +0800
+++ gcin-1.3.2/gtab.h 2007-01-01 08:59:01.000000000 +0800
@@ -1,4 +1,4 @@
-#define MAX_CIN_PHR (100*CH_SZ + 1)
+#define MAX_CIN_PHR (200*CH_SZ + 1)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 3 Dec 2006 07:30:30 -0000 1.11
+++ .cvsignore 1 Jan 2007 02:15:14 -0000 1.12
@@ -1 +1 @@
-gcin-1.3.1.tar.bz2
+gcin-1.3.2.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcin.spec 3 Dec 2006 07:30:30 -0000 1.15
+++ gcin.spec 1 Jan 2007 02:15:14 -0000 1.16
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -14,7 +14,7 @@
Patch2: qt.patch
Patch3: configure.patch
Patch4: newcj3.patch
-Patch5: gcin_update.patch
+Patch5: gcin_gtab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +34,7 @@
%patch2 -p1 -b .qt
%patch3 -p1 -b .configure
%patch4 -p1 -b .newcj3
-%patch5 -p1 -b .up
+%patch5 -p1 -b .gtab
#cp -f gcinicon/gtab.list data/
#cp -f gcinicon/*.png icons/
find . -name \*.h -o -name \*.c | xargs chmod ugo-x
@@ -93,6 +93,7 @@
%doc AUTHORS COPYING Changelog README
%config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin
%{_bindir}/gcin*
+%{_bindir}/gtab*
%{_bindir}/juyin-learn
%{_bindir}/pho*
%{_bindir}/sim2trad
@@ -109,6 +110,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Mon Jan 02 2007 Chung-Yen Chang - 1.3.2-1
+- update to 1.3.2
+
* Sun Dec 03 2006 Chung-Yen Chang - 1.3.1-1
- update to 1.3.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 3 Dec 2006 07:30:30 -0000 1.11
+++ sources 1 Jan 2007 02:15:14 -0000 1.12
@@ -1 +1 @@
-3b6fb7483bc894af3ba787268584b3c2 gcin-1.3.1.tar.bz2
+340a2d470be29fff64f455400e2886c5 gcin-1.3.2.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 02:21:35 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun, 31 Dec 2006 21:21:35 -0500
Subject: rpms/gcin/FC-4 gcin_gtab.patch, NONE, 1.1 .cvsignore, 1.11,
1.12 gcin.spec, 1.16, 1.17 sources, 1.11, 1.12
Message-ID: <200701010221.l012LZnI022781@cvs-int.fedora.redhat.com>
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22752
Modified Files:
.cvsignore gcin.spec sources
Added Files:
gcin_gtab.patch
Log Message:
update to 1.3.2
gcin_gtab.patch:
--- NEW FILE gcin_gtab.patch ---
diff -urN gcin-1.3.2.orig/gtab.c gcin-1.3.2/gtab.c
--- gcin-1.3.2.orig/gtab.c 2006-12-29 23:51:37.000000000 +0800
+++ gcin-1.3.2/gtab.c 2007-01-01 08:59:01.000000000 +0800
@@ -190,9 +190,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
+ strcat(out, "[");
strcat(out, tbuf[i]);
if (i < tbufN-1)
- strcat(out, " |");
+ strcat(out, "] ");
+ else
+ strcat(out, "]");
}
free(tbuf[i]);
@@ -814,6 +817,7 @@
static void disp_selection(gboolean phrase_selected)
{
char pgstr[32];
+ ClrSelArea();
page_no_str(pgstr);
if (!gtab_vertical_select && more_pg)
@@ -838,7 +842,14 @@
int i;
for(i=ofs; i< cur_inmd->M_DUP_SEL + ofs; i++) {
if (seltab[i][0]) {
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
b1_cat(tt, cur_inmd->selkey[i - ofs]);
+
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
if (gtab_vertical_select)
strcat(tt, ". ");
@@ -850,7 +861,7 @@
char uu[512];
if (gtab_vertical_select) {
- utf8cpy_bytes(uu, seltab[i], 60);
+ utf8cpy_bytes(uu, seltab[i], 120);
strcat(tt, uu);
} else {
char *p = seltab[i];
@@ -1167,6 +1178,8 @@
return 0;
}
case XK_Prior:
+ case XK_Left:
+ case XK_Up:
case XK_KP_Subtract:
if (wild_mode) {
if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
@@ -1182,6 +1195,8 @@
}
return 0;
case XK_Next:
+ case XK_Right:
+ case XK_Down:
case XK_KP_Add:
if (more_pg) {
next_page:
diff -urN gcin-1.3.2.orig/gtab.h gcin-1.3.2/gtab.h
--- gcin-1.3.2.orig/gtab.h 2006-12-18 11:15:18.000000000 +0800
+++ gcin-1.3.2/gtab.h 2007-01-01 08:59:01.000000000 +0800
@@ -1,4 +1,4 @@
-#define MAX_CIN_PHR (100*CH_SZ + 1)
+#define MAX_CIN_PHR (200*CH_SZ + 1)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 3 Dec 2006 07:36:27 -0000 1.11
+++ .cvsignore 1 Jan 2007 02:21:05 -0000 1.12
@@ -1 +1 @@
-gcin-1.3.1.tar.bz2
+gcin-1.3.2.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gcin.spec 3 Dec 2006 07:36:27 -0000 1.16
+++ gcin.spec 1 Jan 2007 02:21:05 -0000 1.17
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -14,7 +14,7 @@
Patch2: qt.patch
Patch3: configure.patch
Patch4: newcj3.patch
-Patch5: gcin_update.patch
+Patch5: gcin_gtab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel, gtk2-devel, desktop-file-utils
@@ -32,7 +32,7 @@
%patch2 -p1 -b .qt
%patch3 -p1 -b .configure
%patch4 -p1 -b .newcj3
-%patch5 -p1 -b .up
+%patch5 -p1 -b .gtab
#cp -f gcinicon/gtab.list data/
#cp -f gcinicon/*.png icons/
find . -name \*.h -o -name \*.c | xargs chmod ugo-x
@@ -91,6 +91,7 @@
%doc AUTHORS COPYING Changelog README
%config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin
%{_bindir}/gcin*
+%{_bindir}/gtab*
%{_bindir}/juyin-learn
%{_bindir}/pho*
%{_bindir}/sim2trad
@@ -107,6 +108,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Mon Jan 01 2007 Chung-Yen Chang - 1.3.2-1
+- update to 1.3.2
+
* Sun Dec 03 2006 Chung-Yen Chang - 1.3.1-1
- update to 1.3.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 3 Dec 2006 07:36:27 -0000 1.11
+++ sources 1 Jan 2007 02:21:05 -0000 1.12
@@ -1 +1 @@
-3b6fb7483bc894af3ba787268584b3c2 gcin-1.3.1.tar.bz2
+340a2d470be29fff64f455400e2886c5 gcin-1.3.2.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 02:23:47 2007
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Sun, 31 Dec 2006 21:23:47 -0500
Subject: rpms/gcin/FC-3 gcin_gtab.patch, NONE, 1.1 .cvsignore, 1.11,
1.12 gcin.spec, 1.15, 1.16 sources, 1.11, 1.12
Message-ID: <200701010223.l012Nl1a022853@cvs-int.fedora.redhat.com>
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22831
Modified Files:
.cvsignore gcin.spec sources
Added Files:
gcin_gtab.patch
Log Message:
update to 1.3.2
gcin_gtab.patch:
--- NEW FILE gcin_gtab.patch ---
diff -urN gcin-1.3.2.orig/gtab.c gcin-1.3.2/gtab.c
--- gcin-1.3.2.orig/gtab.c 2006-12-29 23:51:37.000000000 +0800
+++ gcin-1.3.2/gtab.c 2007-01-01 08:59:01.000000000 +0800
@@ -190,9 +190,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
+ strcat(out, "[");
strcat(out, tbuf[i]);
if (i < tbufN-1)
- strcat(out, " |");
+ strcat(out, "] ");
+ else
+ strcat(out, "]");
}
free(tbuf[i]);
@@ -814,6 +817,7 @@
static void disp_selection(gboolean phrase_selected)
{
char pgstr[32];
+ ClrSelArea();
page_no_str(pgstr);
if (!gtab_vertical_select && more_pg)
@@ -838,7 +842,14 @@
int i;
for(i=ofs; i< cur_inmd->M_DUP_SEL + ofs; i++) {
if (seltab[i][0]) {
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
b1_cat(tt, cur_inmd->selkey[i - ofs]);
+
+ if (!gtab_vertical_select)
+ strcat(tt, "");
+
if (gtab_vertical_select)
strcat(tt, ". ");
@@ -850,7 +861,7 @@
char uu[512];
if (gtab_vertical_select) {
- utf8cpy_bytes(uu, seltab[i], 60);
+ utf8cpy_bytes(uu, seltab[i], 120);
strcat(tt, uu);
} else {
char *p = seltab[i];
@@ -1167,6 +1178,8 @@
return 0;
}
case XK_Prior:
+ case XK_Left:
+ case XK_Up:
case XK_KP_Subtract:
if (wild_mode) {
if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
@@ -1182,6 +1195,8 @@
}
return 0;
case XK_Next:
+ case XK_Right:
+ case XK_Down:
case XK_KP_Add:
if (more_pg) {
next_page:
diff -urN gcin-1.3.2.orig/gtab.h gcin-1.3.2/gtab.h
--- gcin-1.3.2.orig/gtab.h 2006-12-18 11:15:18.000000000 +0800
+++ gcin-1.3.2/gtab.h 2007-01-01 08:59:01.000000000 +0800
@@ -1,4 +1,4 @@
-#define MAX_CIN_PHR (100*CH_SZ + 1)
+#define MAX_CIN_PHR (200*CH_SZ + 1)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 3 Dec 2006 07:38:44 -0000 1.11
+++ .cvsignore 1 Jan 2007 02:23:17 -0000 1.12
@@ -1 +1 @@
-gcin-1.3.1.tar.bz2
+gcin-1.3.2.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcin.spec 3 Dec 2006 07:38:44 -0000 1.15
+++ gcin.spec 1 Jan 2007 02:23:17 -0000 1.16
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -15,7 +15,7 @@
Patch3: configure.patch
Patch4: newcj3.patch
Patch5: tray.patch
-Patch6: gcin_update.patch
+Patch6: gcin_gtab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel, gtk2-devel, desktop-file-utils
@@ -34,7 +34,7 @@
%patch3 -p1 -b .configure
%patch4 -p1 -b .newcj3
%patch5 -p1 -b .tray
-%patch6 -p1 -b .up
+%patch6 -p1 -b .gtab
#cp -f gcinicon/gtab.list data/
#cp -f gcinicon/*.png icons/
find . -name \*.h -o -name \*.c | xargs chmod ugo-x
@@ -93,6 +93,7 @@
%doc AUTHORS COPYING Changelog README
%config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin
%{_bindir}/gcin*
+%{_bindir}/gtab*
%{_bindir}/juyin-learn
%{_bindir}/pho*
%{_bindir}/sim2trad
@@ -109,6 +110,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Mon Jan 01 2007 Chung-Yen Chang - 1.3.2-1
+- update to 1.3.2
+
* Sun Dec 03 2006 Chung-Yen Chang - 1.3.1-1
- update to 1.3.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 3 Dec 2006 07:38:44 -0000 1.11
+++ sources 1 Jan 2007 02:23:17 -0000 1.12
@@ -1 +1 @@
-3b6fb7483bc894af3ba787268584b3c2 gcin-1.3.1.tar.bz2
+340a2d470be29fff64f455400e2886c5 gcin-1.3.2.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 02:27:07 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 31 Dec 2006 21:27:07 -0500
Subject: rpms/sbcl/devel sbcl-1.0.1-bz220053.patch, NONE, 1.1 .cvsignore,
1.20, 1.21 sbcl.spec, 1.63, 1.64 sources, 1.22, 1.23
Message-ID: <200701010227.l012R70x022925@cvs-int.fedora.redhat.com>
Author: rdieter
Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22903
Modified Files:
.cvsignore sbcl.spec sources
Added Files:
sbcl-1.0.1-bz220053.patch
Log Message:
* Sun Dec 31 2006 Rex Dieter 1.0.1-4
- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
sbcl-1.0.1-bz220053.patch:
--- NEW FILE sbcl-1.0.1-bz220053.patch ---
Index: src/runtime/linux-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/linux-os.c,v
retrieving revision 1.67
diff -u -r1.67 linux-os.c
--- src/runtime/linux-os.c 15 Dec 2006 01:48:59 -0000 1.67
+++ src/runtime/linux-os.c 30 Dec 2006 16:39:49 -0000
@@ -185,7 +185,12 @@
"LD_ASSUME_KERNEL\n");
}
#endif
+#ifdef LISP_FEATURE_PPC
+ /* Assume 64KiB pages on PowerPC, since that's what the ABI says */
+ os_vm_page_size = 65536;
+#else
os_vm_page_size = getpagesize();
+#endif
/* KLUDGE: Disable memory randomization on new Linux kernels
* by setting a personality flag and re-executing. (We need
Index: src/runtime/gencgc-internal.h
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/gencgc-internal.h,v
retrieving revision 1.17
diff -u -r1.17 gencgc-internal.h
--- src/runtime/gencgc-internal.h 2 Nov 2006 17:18:37 -0000 1.17
+++ src/runtime/gencgc-internal.h 30 Dec 2006 16:39:49 -0000
@@ -29,6 +29,15 @@
inline void *page_address(page_index_t);
int gencgc_handle_wp_violation(void *);
+
+/* Note that this structure is also used from Lisp-side in
+ * src/code/room.lisp, and the Lisp-side structure layout is currently
+ * not groveled from C code but hardcoded. Any changes to the
+ * structure layout need to be also made there.
+ *
+ * FIXME: We should probably just define this structure in Lisp, and
+ * output the C version in genesis. -- JES, 2006-12-30.
+ */
struct page {
/* The name of this field is not well-chosen for its actual use.
* This is the offset from the start of the page to the start
@@ -40,15 +49,11 @@
* than the actual bytes used for pages within the current
* allocation regions. It should be 0 for all unallocated pages (not
* hard to achieve).
- *
- * Currently declared as an unsigned short to make the struct size
- * smaller. This means that GENCGC-PAGE-SIZE is constrained to fit
- * inside a short.
*/
+#if PAGE_BYTES > USHRT_MAX
+ unsigned int bytes_used;
+#else
unsigned short bytes_used;
-
-#if USHRT_MAX < PAGE_BYTES
-#error "PAGE_BYTES too large"
#endif
unsigned
Index: src/runtime/coreparse.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/coreparse.c,v
retrieving revision 1.36
diff -u -r1.36 coreparse.c
--- src/runtime/coreparse.c 15 Dec 2006 02:57:53 -0000 1.36
+++ src/runtime/coreparse.c 30 Dec 2006 16:39:49 -0000
@@ -349,7 +349,16 @@
size -= bytes_read;
while (bytes_read) {
bytes_read -= sizeof(long);
- page_table[offset++].first_object_offset = data[i++];
+ /* Ignore all zeroes. The size of the page table
+ * core entry was rounded up to os_vm_page_size
+ * during the save, and might now have more
+ * elements than the page table.
+ */
+ if (data[i]) {
+ page_table[offset].first_object_offset = data[i];
+ }
+ i++;
+ offset++;
}
}
Index: src/compiler/ppc/backend-parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/backend-parms.lisp,v
retrieving revision 1.3
diff -u -r1.3 backend-parms.lisp
--- src/compiler/ppc/backend-parms.lisp 19 May 2002 13:55:32 -0000 1.3
+++ src/compiler/ppc/backend-parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -3,5 +3,10 @@
(def!constant +backend-fasl-file-implementation+ :ppc)
(setf *backend-register-save-penalty* 3)
(setf *backend-byte-order* :big-endian)
-(setf *backend-page-size* 4096)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (setf *backend-page-size* #!+linux 65536 #!-linux 4096))
+
+;;; The size in bytes of the GENCGC pages. Should be a multiple of the
+;;; architecture page size.
+(def!constant gencgc-page-size *backend-page-size*)
Index: src/compiler/ppc/parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/parms.lisp,v
retrieving revision 1.31
diff -u -r1.31 parms.lisp
--- src/compiler/ppc/parms.lisp 2 Nov 2006 15:35:13 -0000 1.31
+++ src/compiler/ppc/parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -24,11 +24,6 @@
;;; object
(def!constant n-byte-bits 8)
-
-;;; The size in bytes of the GENCGC pages. Should be a multiple of the
-;;; architecture code size.
-(def!constant gencgc-page-size 4096)
-
;;; flags for the generational garbage collector
(def!constant pseudo-atomic-interrupted-flag 1)
(def!constant pseudo-atomic-flag 4)
Index: src/code/linux-os.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/linux-os.lisp,v
retrieving revision 1.13
diff -u -r1.13 linux-os.lisp
--- src/code/linux-os.lisp 18 Jun 2006 19:11:31 -0000 1.13
+++ src/code/linux-os.lisp 30 Dec 2006 16:39:49 -0000
@@ -43,9 +43,8 @@
(error "Unix system call getrusage failed: ~A." (strerror utime)))
(values utime stime majflt)))
+(sb!alien:define-alien-variable "os_vm_page_size" sb!unix:size-t)
+
;;; Return the system page size.
(defun get-page-size ()
- ;; probably should call getpagesize()
- ;; FIXME: Or we could just get rid of this, since the uses of it look
- ;; disposable.
- 4096)
+ os-vm-page-size)
\ No newline at end of file
Index: src/code/room.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/room.lisp,v
retrieving revision 1.38
diff -u -r1.38 room.lisp
--- src/code/room.lisp 3 Nov 2006 19:54:00 -0000 1.38
+++ src/code/room.lisp 30 Dec 2006 16:39:49 -0000
@@ -207,7 +207,14 @@
(define-alien-type (struct page)
(struct page
(start long)
- (bytes-used (unsigned 16))
+ ;; On platforms with small enough GC pages, this field
+ ;; will be a short. On platforms with larger ones, it'll
+ ;; be an int.
+ (bytes-used (unsigned
+ #.(if (typep sb!vm:gencgc-page-size
+ '(unsigned-byte 16))
+ 16
+ 32)))
(flags (unsigned 8))
(gen (signed 8))))
(declaim (inline find-page-index))
Index: src/compiler/generic/genesis.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/genesis.lisp,v
retrieving revision 1.127
diff -u -r1.127 genesis.lisp
--- src/compiler/generic/genesis.lisp 5 Dec 2006 15:46:15 -0000 1.127
+++ src/compiler/generic/genesis.lisp 30 Dec 2006 16:39:50 -0000
@@ -2728,22 +2728,17 @@
(setf prev-priority priority))
(format t "#define ~A " name)
(format t
- ;; KLUDGE: As of sbcl-0.6.7.14, we're dumping two
- ;; different kinds of values here, (1) small codes
- ;; and (2) machine addresses. The small codes can be
- ;; dumped as bare integer values. The large machine
- ;; addresses might cause problems if they're large
- ;; and represented as (signed) C integers, so we
- ;; want to force them to be unsigned. We do that by
- ;; wrapping them in the LISPOBJ macro. (We could do
- ;; it with a bare "(unsigned)" cast, except that
- ;; this header file is used not only in C files, but
- ;; also in assembly files, which don't understand
- ;; the cast syntax. The LISPOBJ macro goes away in
- ;; assembly files, but that shouldn't matter because
- ;; we don't do arithmetic on address constants in
- ;; assembly files. See? It really is a kludge..) --
- ;; WHN 2000-10-18
+ ;; KLUDGE: We're dumping two different kinds of
+ ;; values here, (1) small codes and (2) machine
+ ;; addresses. The small codes can be dumped as bare
+ ;; integer values. The large machine addresses might
+ ;; cause problems if they're large and represented
+ ;; as (signed) C integers, so we want to force them
+ ;; to be unsigned by appending an U to the
+ ;; literal. We can't dump all the values using the
+ ;; literal-U syntax, since the assembler doesn't
+ ;; support that syntax and some of the small
+ ;; constants can be used in assembler files.
(let (;; cutoff for treatment as a small code
(cutoff (expt 2 16)))
(cond ((minusp value)
@@ -2751,7 +2746,7 @@
((< value cutoff)
"~D")
(t
- "LISPOBJ(~DU)")))
+ "~DU")))
value)
(format t " /* 0x~X */~@[ /* ~A */~]~%" value doc))))
(terpri))
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 27 Dec 2006 20:21:25 -0000 1.20
+++ .cvsignore 1 Jan 2007 02:26:37 -0000 1.21
@@ -3,3 +3,4 @@
sbcl-1.0.1-source.tar.bz2
sbcl-1.0.1-x86-linux-binary.tar.bz2
sbcl-1.0.1-x86-64-linux-binary.tar.bz2
+sbcl-1.0.1-patched-powerpc-linux.tar.bz2
Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sbcl.spec 27 Dec 2006 20:21:25 -0000 1.63
+++ sbcl.spec 1 Jan 2007 02:26:37 -0000 1.64
@@ -10,16 +10,14 @@
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD/MIT
Group: Development/Languages
URL: http://sbcl.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 sparc
-# ppc borked, http://bugzilla.redhat.com/220053
-ExcludeArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc sparc
# Pre-generated html docs (not used)
#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,7 +42,8 @@
%endif
## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-1.0-powerpc-linux-binary.tar.bz2
+# Thanks David!
+Source30: sbcl-1.0.1-patched-powerpc-linux.tar.bz2
%ifarch ppc
%define sbcl_arch ppc
#BuildRequires: sbcl
@@ -73,6 +72,7 @@
# Allow override of contrib test failure(s)
Patch7: sbcl-0.9.9-permissive.patch
Patch8: sbcl-1.0-gcc4_sparc.patch
+Patch220053: sbcl-1.0.1-bz220053.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -104,6 +104,7 @@
%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
%patch7 -p1 -b .permissive
%patch8 -p1 -b .gcc4_sparc
+%patch220053 -p0 -b .bz220053
## Enable sb-thread
%ifarch %{ix86} x86_64
@@ -235,6 +236,9 @@
%changelog
+* Sun Dec 31 2006 Rex Dieter 1.0.1-4
+- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
+
* Wed Dec 27 2006 Rex Dieter 1.0.1-3
- native bootstrap
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 27 Dec 2006 20:21:25 -0000 1.22
+++ sources 1 Jan 2007 02:26:37 -0000 1.23
@@ -1 +1,2 @@
fe02f498620bce61a8688d4557a405b0 sbcl-1.0.1-source.tar.bz2
+ad95d94825e14a10cab35f2d10cd8bac sbcl-1.0.1-patched-powerpc-linux.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 03:24:00 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 31 Dec 2006 22:24:00 -0500
Subject: rpms/sbcl/EL-4 .cvsignore, 1.14, 1.15 sbcl.spec, 1.38, 1.39 sources,
1.16, 1.17
Message-ID: <200701010324.l013O0ha026344@cvs-int.fedora.redhat.com>
Author: rdieter
Update of /cvs/extras/rpms/sbcl/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26324
Modified Files:
.cvsignore sbcl.spec sources
Log Message:
* Sun Dec 31 2006 Rex Dieter 1.0.1-4
- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/EL-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 27 Dec 2006 23:21:05 -0000 1.14
+++ .cvsignore 1 Jan 2007 03:23:30 -0000 1.15
@@ -3,3 +3,4 @@
sbcl-1.0.1-source.tar.bz2
sbcl-1.0.1-x86-linux-binary.tar.bz2
sbcl-1.0.1-x86-64-linux-binary.tar.bz2
+sbcl-1.0.1-patched-powerpc-linux.tar.bz2
Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/EL-4/sbcl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sbcl.spec 27 Dec 2006 23:21:05 -0000 1.38
+++ sbcl.spec 1 Jan 2007 03:23:30 -0000 1.39
@@ -10,16 +10,14 @@
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD/MIT
Group: Development/Languages
URL: http://sbcl.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 sparc
-# ppc borked, http://bugzilla.redhat.com/220053
-ExcludeArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc sparc
# Pre-generated html docs (not used)
#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,7 +42,8 @@
%endif
## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-1.0-powerpc-linux-binary.tar.bz2
+# Thanks David!
+Source30: sbcl-1.0.1-patched-powerpc-linux.tar.bz2
%ifarch ppc
%define sbcl_arch ppc
#BuildRequires: sbcl
@@ -73,6 +72,7 @@
# Allow override of contrib test failure(s)
Patch7: sbcl-0.9.9-permissive.patch
Patch8: sbcl-1.0-gcc4_sparc.patch
+Patch220053: sbcl-1.0.1-bz220053.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -104,6 +104,7 @@
%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
%patch7 -p1 -b .permissive
%patch8 -p1 -b .gcc4_sparc
+%patch220053 -p0 -b .bz220053
## Enable sb-thread
%ifarch %{ix86} x86_64
@@ -235,6 +236,9 @@
%changelog
+* Sun Dec 31 2006 Rex Dieter 1.0.1-4
+- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
+
* Wed Dec 27 2006 Rex Dieter 1.0.1-3
- native bootstrap
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/EL-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 27 Dec 2006 23:21:05 -0000 1.16
+++ sources 1 Jan 2007 03:23:30 -0000 1.17
@@ -1 +1,2 @@
fe02f498620bce61a8688d4557a405b0 sbcl-1.0.1-source.tar.bz2
+ad95d94825e14a10cab35f2d10cd8bac sbcl-1.0.1-patched-powerpc-linux.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 03:34:41 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 31 Dec 2006 22:34:41 -0500
Subject: rpms/sbcl/EL-4 sbcl-1.0.1-bz220053.patch, NONE, 1.1 sbcl.spec, 1.39,
1.40
Message-ID: <200701010334.l013YfdK026425@cvs-int.fedora.redhat.com>
Author: rdieter
Update of /cvs/extras/rpms/sbcl/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26405
Modified Files:
sbcl.spec
Added Files:
sbcl-1.0.1-bz220053.patch
Log Message:
awol patch
sbcl-1.0.1-bz220053.patch:
--- NEW FILE sbcl-1.0.1-bz220053.patch ---
Index: src/runtime/linux-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/linux-os.c,v
retrieving revision 1.67
diff -u -r1.67 linux-os.c
--- src/runtime/linux-os.c 15 Dec 2006 01:48:59 -0000 1.67
+++ src/runtime/linux-os.c 30 Dec 2006 16:39:49 -0000
@@ -185,7 +185,12 @@
"LD_ASSUME_KERNEL\n");
}
#endif
+#ifdef LISP_FEATURE_PPC
+ /* Assume 64KiB pages on PowerPC, since that's what the ABI says */
+ os_vm_page_size = 65536;
+#else
os_vm_page_size = getpagesize();
+#endif
/* KLUDGE: Disable memory randomization on new Linux kernels
* by setting a personality flag and re-executing. (We need
Index: src/runtime/gencgc-internal.h
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/gencgc-internal.h,v
retrieving revision 1.17
diff -u -r1.17 gencgc-internal.h
--- src/runtime/gencgc-internal.h 2 Nov 2006 17:18:37 -0000 1.17
+++ src/runtime/gencgc-internal.h 30 Dec 2006 16:39:49 -0000
@@ -29,6 +29,15 @@
inline void *page_address(page_index_t);
int gencgc_handle_wp_violation(void *);
+
+/* Note that this structure is also used from Lisp-side in
+ * src/code/room.lisp, and the Lisp-side structure layout is currently
+ * not groveled from C code but hardcoded. Any changes to the
+ * structure layout need to be also made there.
+ *
+ * FIXME: We should probably just define this structure in Lisp, and
+ * output the C version in genesis. -- JES, 2006-12-30.
+ */
struct page {
/* The name of this field is not well-chosen for its actual use.
* This is the offset from the start of the page to the start
@@ -40,15 +49,11 @@
* than the actual bytes used for pages within the current
* allocation regions. It should be 0 for all unallocated pages (not
* hard to achieve).
- *
- * Currently declared as an unsigned short to make the struct size
- * smaller. This means that GENCGC-PAGE-SIZE is constrained to fit
- * inside a short.
*/
+#if PAGE_BYTES > USHRT_MAX
+ unsigned int bytes_used;
+#else
unsigned short bytes_used;
-
-#if USHRT_MAX < PAGE_BYTES
-#error "PAGE_BYTES too large"
#endif
unsigned
Index: src/runtime/coreparse.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/coreparse.c,v
retrieving revision 1.36
diff -u -r1.36 coreparse.c
--- src/runtime/coreparse.c 15 Dec 2006 02:57:53 -0000 1.36
+++ src/runtime/coreparse.c 30 Dec 2006 16:39:49 -0000
@@ -349,7 +349,16 @@
size -= bytes_read;
while (bytes_read) {
bytes_read -= sizeof(long);
- page_table[offset++].first_object_offset = data[i++];
+ /* Ignore all zeroes. The size of the page table
+ * core entry was rounded up to os_vm_page_size
+ * during the save, and might now have more
+ * elements than the page table.
+ */
+ if (data[i]) {
+ page_table[offset].first_object_offset = data[i];
+ }
+ i++;
+ offset++;
}
}
Index: src/compiler/ppc/backend-parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/backend-parms.lisp,v
retrieving revision 1.3
diff -u -r1.3 backend-parms.lisp
--- src/compiler/ppc/backend-parms.lisp 19 May 2002 13:55:32 -0000 1.3
+++ src/compiler/ppc/backend-parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -3,5 +3,10 @@
(def!constant +backend-fasl-file-implementation+ :ppc)
(setf *backend-register-save-penalty* 3)
(setf *backend-byte-order* :big-endian)
-(setf *backend-page-size* 4096)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (setf *backend-page-size* #!+linux 65536 #!-linux 4096))
+
+;;; The size in bytes of the GENCGC pages. Should be a multiple of the
+;;; architecture page size.
+(def!constant gencgc-page-size *backend-page-size*)
Index: src/compiler/ppc/parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/parms.lisp,v
retrieving revision 1.31
diff -u -r1.31 parms.lisp
--- src/compiler/ppc/parms.lisp 2 Nov 2006 15:35:13 -0000 1.31
+++ src/compiler/ppc/parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -24,11 +24,6 @@
;;; object
(def!constant n-byte-bits 8)
-
-;;; The size in bytes of the GENCGC pages. Should be a multiple of the
-;;; architecture code size.
-(def!constant gencgc-page-size 4096)
-
;;; flags for the generational garbage collector
(def!constant pseudo-atomic-interrupted-flag 1)
(def!constant pseudo-atomic-flag 4)
Index: src/code/linux-os.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/linux-os.lisp,v
retrieving revision 1.13
diff -u -r1.13 linux-os.lisp
--- src/code/linux-os.lisp 18 Jun 2006 19:11:31 -0000 1.13
+++ src/code/linux-os.lisp 30 Dec 2006 16:39:49 -0000
@@ -43,9 +43,8 @@
(error "Unix system call getrusage failed: ~A." (strerror utime)))
(values utime stime majflt)))
+(sb!alien:define-alien-variable "os_vm_page_size" sb!unix:size-t)
+
;;; Return the system page size.
(defun get-page-size ()
- ;; probably should call getpagesize()
- ;; FIXME: Or we could just get rid of this, since the uses of it look
- ;; disposable.
- 4096)
+ os-vm-page-size)
\ No newline at end of file
Index: src/code/room.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/room.lisp,v
retrieving revision 1.38
diff -u -r1.38 room.lisp
--- src/code/room.lisp 3 Nov 2006 19:54:00 -0000 1.38
+++ src/code/room.lisp 30 Dec 2006 16:39:49 -0000
@@ -207,7 +207,14 @@
(define-alien-type (struct page)
(struct page
(start long)
- (bytes-used (unsigned 16))
+ ;; On platforms with small enough GC pages, this field
+ ;; will be a short. On platforms with larger ones, it'll
+ ;; be an int.
+ (bytes-used (unsigned
+ #.(if (typep sb!vm:gencgc-page-size
+ '(unsigned-byte 16))
+ 16
+ 32)))
(flags (unsigned 8))
(gen (signed 8))))
(declaim (inline find-page-index))
Index: src/compiler/generic/genesis.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/genesis.lisp,v
retrieving revision 1.127
diff -u -r1.127 genesis.lisp
--- src/compiler/generic/genesis.lisp 5 Dec 2006 15:46:15 -0000 1.127
+++ src/compiler/generic/genesis.lisp 30 Dec 2006 16:39:50 -0000
@@ -2728,22 +2728,17 @@
(setf prev-priority priority))
(format t "#define ~A " name)
(format t
- ;; KLUDGE: As of sbcl-0.6.7.14, we're dumping two
- ;; different kinds of values here, (1) small codes
- ;; and (2) machine addresses. The small codes can be
- ;; dumped as bare integer values. The large machine
- ;; addresses might cause problems if they're large
- ;; and represented as (signed) C integers, so we
- ;; want to force them to be unsigned. We do that by
- ;; wrapping them in the LISPOBJ macro. (We could do
- ;; it with a bare "(unsigned)" cast, except that
- ;; this header file is used not only in C files, but
- ;; also in assembly files, which don't understand
- ;; the cast syntax. The LISPOBJ macro goes away in
- ;; assembly files, but that shouldn't matter because
- ;; we don't do arithmetic on address constants in
- ;; assembly files. See? It really is a kludge..) --
- ;; WHN 2000-10-18
+ ;; KLUDGE: We're dumping two different kinds of
+ ;; values here, (1) small codes and (2) machine
+ ;; addresses. The small codes can be dumped as bare
+ ;; integer values. The large machine addresses might
+ ;; cause problems if they're large and represented
+ ;; as (signed) C integers, so we want to force them
+ ;; to be unsigned by appending an U to the
+ ;; literal. We can't dump all the values using the
+ ;; literal-U syntax, since the assembler doesn't
+ ;; support that syntax and some of the small
+ ;; constants can be used in assembler files.
(let (;; cutoff for treatment as a small code
(cutoff (expt 2 16)))
(cond ((minusp value)
@@ -2751,7 +2746,7 @@
((< value cutoff)
"~D")
(t
- "LISPOBJ(~DU)")))
+ "~DU")))
value)
(format t " /* 0x~X */~@[ /* ~A */~]~%" value doc))))
(terpri))
Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/EL-4/sbcl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sbcl.spec 1 Jan 2007 03:23:30 -0000 1.39
+++ sbcl.spec 1 Jan 2007 03:34:11 -0000 1.40
@@ -10,7 +10,7 @@
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 1.0.1
-Release: 4%{?dist}
+Release: 4%{?dist}.1
License: BSD/MIT
Group: Development/Languages
From fedora-extras-commits at redhat.com Mon Jan 1 03:35:58 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 31 Dec 2006 22:35:58 -0500
Subject: rpms/sbcl/FC-5 sbcl-1.0.1-bz220053.patch, NONE, 1.1 .cvsignore, 1.19,
1.20 sbcl.spec, 1.53, 1.54 sources, 1.21, 1.22
Message-ID: <200701010335.l013Zwsn026496@cvs-int.fedora.redhat.com>
Author: rdieter
Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26474
Modified Files:
.cvsignore sbcl.spec sources
Added Files:
sbcl-1.0.1-bz220053.patch
Log Message:
* Sun Dec 31 2006 Rex Dieter 1.0.1-4
- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
sbcl-1.0.1-bz220053.patch:
--- NEW FILE sbcl-1.0.1-bz220053.patch ---
Index: src/runtime/linux-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/linux-os.c,v
retrieving revision 1.67
diff -u -r1.67 linux-os.c
--- src/runtime/linux-os.c 15 Dec 2006 01:48:59 -0000 1.67
+++ src/runtime/linux-os.c 30 Dec 2006 16:39:49 -0000
@@ -185,7 +185,12 @@
"LD_ASSUME_KERNEL\n");
}
#endif
+#ifdef LISP_FEATURE_PPC
+ /* Assume 64KiB pages on PowerPC, since that's what the ABI says */
+ os_vm_page_size = 65536;
+#else
os_vm_page_size = getpagesize();
+#endif
/* KLUDGE: Disable memory randomization on new Linux kernels
* by setting a personality flag and re-executing. (We need
Index: src/runtime/gencgc-internal.h
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/gencgc-internal.h,v
retrieving revision 1.17
diff -u -r1.17 gencgc-internal.h
--- src/runtime/gencgc-internal.h 2 Nov 2006 17:18:37 -0000 1.17
+++ src/runtime/gencgc-internal.h 30 Dec 2006 16:39:49 -0000
@@ -29,6 +29,15 @@
inline void *page_address(page_index_t);
int gencgc_handle_wp_violation(void *);
+
+/* Note that this structure is also used from Lisp-side in
+ * src/code/room.lisp, and the Lisp-side structure layout is currently
+ * not groveled from C code but hardcoded. Any changes to the
+ * structure layout need to be also made there.
+ *
+ * FIXME: We should probably just define this structure in Lisp, and
+ * output the C version in genesis. -- JES, 2006-12-30.
+ */
struct page {
/* The name of this field is not well-chosen for its actual use.
* This is the offset from the start of the page to the start
@@ -40,15 +49,11 @@
* than the actual bytes used for pages within the current
* allocation regions. It should be 0 for all unallocated pages (not
* hard to achieve).
- *
- * Currently declared as an unsigned short to make the struct size
- * smaller. This means that GENCGC-PAGE-SIZE is constrained to fit
- * inside a short.
*/
+#if PAGE_BYTES > USHRT_MAX
+ unsigned int bytes_used;
+#else
unsigned short bytes_used;
-
-#if USHRT_MAX < PAGE_BYTES
-#error "PAGE_BYTES too large"
#endif
unsigned
Index: src/runtime/coreparse.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/coreparse.c,v
retrieving revision 1.36
diff -u -r1.36 coreparse.c
--- src/runtime/coreparse.c 15 Dec 2006 02:57:53 -0000 1.36
+++ src/runtime/coreparse.c 30 Dec 2006 16:39:49 -0000
@@ -349,7 +349,16 @@
size -= bytes_read;
while (bytes_read) {
bytes_read -= sizeof(long);
- page_table[offset++].first_object_offset = data[i++];
+ /* Ignore all zeroes. The size of the page table
+ * core entry was rounded up to os_vm_page_size
+ * during the save, and might now have more
+ * elements than the page table.
+ */
+ if (data[i]) {
+ page_table[offset].first_object_offset = data[i];
+ }
+ i++;
+ offset++;
}
}
Index: src/compiler/ppc/backend-parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/backend-parms.lisp,v
retrieving revision 1.3
diff -u -r1.3 backend-parms.lisp
--- src/compiler/ppc/backend-parms.lisp 19 May 2002 13:55:32 -0000 1.3
+++ src/compiler/ppc/backend-parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -3,5 +3,10 @@
(def!constant +backend-fasl-file-implementation+ :ppc)
(setf *backend-register-save-penalty* 3)
(setf *backend-byte-order* :big-endian)
-(setf *backend-page-size* 4096)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (setf *backend-page-size* #!+linux 65536 #!-linux 4096))
+
+;;; The size in bytes of the GENCGC pages. Should be a multiple of the
+;;; architecture page size.
+(def!constant gencgc-page-size *backend-page-size*)
Index: src/compiler/ppc/parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/parms.lisp,v
retrieving revision 1.31
diff -u -r1.31 parms.lisp
--- src/compiler/ppc/parms.lisp 2 Nov 2006 15:35:13 -0000 1.31
+++ src/compiler/ppc/parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -24,11 +24,6 @@
;;; object
(def!constant n-byte-bits 8)
-
-;;; The size in bytes of the GENCGC pages. Should be a multiple of the
-;;; architecture code size.
-(def!constant gencgc-page-size 4096)
-
;;; flags for the generational garbage collector
(def!constant pseudo-atomic-interrupted-flag 1)
(def!constant pseudo-atomic-flag 4)
Index: src/code/linux-os.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/linux-os.lisp,v
retrieving revision 1.13
diff -u -r1.13 linux-os.lisp
--- src/code/linux-os.lisp 18 Jun 2006 19:11:31 -0000 1.13
+++ src/code/linux-os.lisp 30 Dec 2006 16:39:49 -0000
@@ -43,9 +43,8 @@
(error "Unix system call getrusage failed: ~A." (strerror utime)))
(values utime stime majflt)))
+(sb!alien:define-alien-variable "os_vm_page_size" sb!unix:size-t)
+
;;; Return the system page size.
(defun get-page-size ()
- ;; probably should call getpagesize()
- ;; FIXME: Or we could just get rid of this, since the uses of it look
- ;; disposable.
- 4096)
+ os-vm-page-size)
\ No newline at end of file
Index: src/code/room.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/room.lisp,v
retrieving revision 1.38
diff -u -r1.38 room.lisp
--- src/code/room.lisp 3 Nov 2006 19:54:00 -0000 1.38
+++ src/code/room.lisp 30 Dec 2006 16:39:49 -0000
@@ -207,7 +207,14 @@
(define-alien-type (struct page)
(struct page
(start long)
- (bytes-used (unsigned 16))
+ ;; On platforms with small enough GC pages, this field
+ ;; will be a short. On platforms with larger ones, it'll
+ ;; be an int.
+ (bytes-used (unsigned
+ #.(if (typep sb!vm:gencgc-page-size
+ '(unsigned-byte 16))
+ 16
+ 32)))
(flags (unsigned 8))
(gen (signed 8))))
(declaim (inline find-page-index))
Index: src/compiler/generic/genesis.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/genesis.lisp,v
retrieving revision 1.127
diff -u -r1.127 genesis.lisp
--- src/compiler/generic/genesis.lisp 5 Dec 2006 15:46:15 -0000 1.127
+++ src/compiler/generic/genesis.lisp 30 Dec 2006 16:39:50 -0000
@@ -2728,22 +2728,17 @@
(setf prev-priority priority))
(format t "#define ~A " name)
(format t
- ;; KLUDGE: As of sbcl-0.6.7.14, we're dumping two
- ;; different kinds of values here, (1) small codes
- ;; and (2) machine addresses. The small codes can be
- ;; dumped as bare integer values. The large machine
- ;; addresses might cause problems if they're large
- ;; and represented as (signed) C integers, so we
- ;; want to force them to be unsigned. We do that by
- ;; wrapping them in the LISPOBJ macro. (We could do
- ;; it with a bare "(unsigned)" cast, except that
- ;; this header file is used not only in C files, but
- ;; also in assembly files, which don't understand
- ;; the cast syntax. The LISPOBJ macro goes away in
- ;; assembly files, but that shouldn't matter because
- ;; we don't do arithmetic on address constants in
- ;; assembly files. See? It really is a kludge..) --
- ;; WHN 2000-10-18
+ ;; KLUDGE: We're dumping two different kinds of
+ ;; values here, (1) small codes and (2) machine
+ ;; addresses. The small codes can be dumped as bare
+ ;; integer values. The large machine addresses might
+ ;; cause problems if they're large and represented
+ ;; as (signed) C integers, so we want to force them
+ ;; to be unsigned by appending an U to the
+ ;; literal. We can't dump all the values using the
+ ;; literal-U syntax, since the assembler doesn't
+ ;; support that syntax and some of the small
+ ;; constants can be used in assembler files.
(let (;; cutoff for treatment as a small code
(cutoff (expt 2 16)))
(cond ((minusp value)
@@ -2751,7 +2746,7 @@
((< value cutoff)
"~D")
(t
- "LISPOBJ(~DU)")))
+ "~DU")))
value)
(format t " /* 0x~X */~@[ /* ~A */~]~%" value doc))))
(terpri))
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 27 Dec 2006 20:25:33 -0000 1.19
+++ .cvsignore 1 Jan 2007 03:35:28 -0000 1.20
@@ -3,3 +3,4 @@
sbcl-1.0.1-source.tar.bz2
sbcl-1.0.1-x86-linux-binary.tar.bz2
sbcl-1.0.1-x86-64-linux-binary.tar.bz2
+sbcl-1.0.1-patched-powerpc-linux.tar.bz2
Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sbcl.spec 27 Dec 2006 20:25:33 -0000 1.53
+++ sbcl.spec 1 Jan 2007 03:35:28 -0000 1.54
@@ -10,16 +10,14 @@
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD/MIT
Group: Development/Languages
URL: http://sbcl.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 sparc
-# ppc borked, http://bugzilla.redhat.com/220053
-ExcludeArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc sparc
# Pre-generated html docs (not used)
#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,7 +42,8 @@
%endif
## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-1.0-powerpc-linux-binary.tar.bz2
+# Thanks David!
+Source30: sbcl-1.0.1-patched-powerpc-linux.tar.bz2
%ifarch ppc
%define sbcl_arch ppc
#BuildRequires: sbcl
@@ -73,6 +72,7 @@
# Allow override of contrib test failure(s)
Patch7: sbcl-0.9.9-permissive.patch
Patch8: sbcl-1.0-gcc4_sparc.patch
+Patch220053: sbcl-1.0.1-bz220053.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -104,6 +104,7 @@
%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
%patch7 -p1 -b .permissive
%patch8 -p1 -b .gcc4_sparc
+%patch220053 -p0 -b .bz220053
## Enable sb-thread
%ifarch %{ix86} x86_64
@@ -235,6 +236,9 @@
%changelog
+* Sun Dec 31 2006 Rex Dieter 1.0.1-4
+- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
+
* Wed Dec 27 2006 Rex Dieter 1.0.1-3
- native bootstrap
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 27 Dec 2006 20:25:33 -0000 1.21
+++ sources 1 Jan 2007 03:35:28 -0000 1.22
@@ -1 +1,2 @@
fe02f498620bce61a8688d4557a405b0 sbcl-1.0.1-source.tar.bz2
+ad95d94825e14a10cab35f2d10cd8bac sbcl-1.0.1-patched-powerpc-linux.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 03:36:56 2007
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 31 Dec 2006 22:36:56 -0500
Subject: rpms/sbcl/FC-6 sbcl-1.0.1-bz220053.patch, NONE, 1.1 .cvsignore, 1.19,
1.20 sbcl.spec, 1.56, 1.57 sources, 1.21, 1.22
Message-ID: <200701010336.l013auZC026568@cvs-int.fedora.redhat.com>
Author: rdieter
Update of /cvs/extras/rpms/sbcl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26545
Modified Files:
.cvsignore sbcl.spec sources
Added Files:
sbcl-1.0.1-bz220053.patch
Log Message:
* Sun Dec 31 2006 Rex Dieter 1.0.1-4
- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
sbcl-1.0.1-bz220053.patch:
--- NEW FILE sbcl-1.0.1-bz220053.patch ---
Index: src/runtime/linux-os.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/linux-os.c,v
retrieving revision 1.67
diff -u -r1.67 linux-os.c
--- src/runtime/linux-os.c 15 Dec 2006 01:48:59 -0000 1.67
+++ src/runtime/linux-os.c 30 Dec 2006 16:39:49 -0000
@@ -185,7 +185,12 @@
"LD_ASSUME_KERNEL\n");
}
#endif
+#ifdef LISP_FEATURE_PPC
+ /* Assume 64KiB pages on PowerPC, since that's what the ABI says */
+ os_vm_page_size = 65536;
+#else
os_vm_page_size = getpagesize();
+#endif
/* KLUDGE: Disable memory randomization on new Linux kernels
* by setting a personality flag and re-executing. (We need
Index: src/runtime/gencgc-internal.h
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/gencgc-internal.h,v
retrieving revision 1.17
diff -u -r1.17 gencgc-internal.h
--- src/runtime/gencgc-internal.h 2 Nov 2006 17:18:37 -0000 1.17
+++ src/runtime/gencgc-internal.h 30 Dec 2006 16:39:49 -0000
@@ -29,6 +29,15 @@
inline void *page_address(page_index_t);
int gencgc_handle_wp_violation(void *);
+
+/* Note that this structure is also used from Lisp-side in
+ * src/code/room.lisp, and the Lisp-side structure layout is currently
+ * not groveled from C code but hardcoded. Any changes to the
+ * structure layout need to be also made there.
+ *
+ * FIXME: We should probably just define this structure in Lisp, and
+ * output the C version in genesis. -- JES, 2006-12-30.
+ */
struct page {
/* The name of this field is not well-chosen for its actual use.
* This is the offset from the start of the page to the start
@@ -40,15 +49,11 @@
* than the actual bytes used for pages within the current
* allocation regions. It should be 0 for all unallocated pages (not
* hard to achieve).
- *
- * Currently declared as an unsigned short to make the struct size
- * smaller. This means that GENCGC-PAGE-SIZE is constrained to fit
- * inside a short.
*/
+#if PAGE_BYTES > USHRT_MAX
+ unsigned int bytes_used;
+#else
unsigned short bytes_used;
-
-#if USHRT_MAX < PAGE_BYTES
-#error "PAGE_BYTES too large"
#endif
unsigned
Index: src/runtime/coreparse.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/coreparse.c,v
retrieving revision 1.36
diff -u -r1.36 coreparse.c
--- src/runtime/coreparse.c 15 Dec 2006 02:57:53 -0000 1.36
+++ src/runtime/coreparse.c 30 Dec 2006 16:39:49 -0000
@@ -349,7 +349,16 @@
size -= bytes_read;
while (bytes_read) {
bytes_read -= sizeof(long);
- page_table[offset++].first_object_offset = data[i++];
+ /* Ignore all zeroes. The size of the page table
+ * core entry was rounded up to os_vm_page_size
+ * during the save, and might now have more
+ * elements than the page table.
+ */
+ if (data[i]) {
+ page_table[offset].first_object_offset = data[i];
+ }
+ i++;
+ offset++;
}
}
Index: src/compiler/ppc/backend-parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/backend-parms.lisp,v
retrieving revision 1.3
diff -u -r1.3 backend-parms.lisp
--- src/compiler/ppc/backend-parms.lisp 19 May 2002 13:55:32 -0000 1.3
+++ src/compiler/ppc/backend-parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -3,5 +3,10 @@
(def!constant +backend-fasl-file-implementation+ :ppc)
(setf *backend-register-save-penalty* 3)
(setf *backend-byte-order* :big-endian)
-(setf *backend-page-size* 4096)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (setf *backend-page-size* #!+linux 65536 #!-linux 4096))
+
+;;; The size in bytes of the GENCGC pages. Should be a multiple of the
+;;; architecture page size.
+(def!constant gencgc-page-size *backend-page-size*)
Index: src/compiler/ppc/parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/parms.lisp,v
retrieving revision 1.31
diff -u -r1.31 parms.lisp
--- src/compiler/ppc/parms.lisp 2 Nov 2006 15:35:13 -0000 1.31
+++ src/compiler/ppc/parms.lisp 30 Dec 2006 16:39:49 -0000
@@ -24,11 +24,6 @@
;;; object
(def!constant n-byte-bits 8)
-
-;;; The size in bytes of the GENCGC pages. Should be a multiple of the
-;;; architecture code size.
-(def!constant gencgc-page-size 4096)
-
;;; flags for the generational garbage collector
(def!constant pseudo-atomic-interrupted-flag 1)
(def!constant pseudo-atomic-flag 4)
Index: src/code/linux-os.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/linux-os.lisp,v
retrieving revision 1.13
diff -u -r1.13 linux-os.lisp
--- src/code/linux-os.lisp 18 Jun 2006 19:11:31 -0000 1.13
+++ src/code/linux-os.lisp 30 Dec 2006 16:39:49 -0000
@@ -43,9 +43,8 @@
(error "Unix system call getrusage failed: ~A." (strerror utime)))
(values utime stime majflt)))
+(sb!alien:define-alien-variable "os_vm_page_size" sb!unix:size-t)
+
;;; Return the system page size.
(defun get-page-size ()
- ;; probably should call getpagesize()
- ;; FIXME: Or we could just get rid of this, since the uses of it look
- ;; disposable.
- 4096)
+ os-vm-page-size)
\ No newline at end of file
Index: src/code/room.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/room.lisp,v
retrieving revision 1.38
diff -u -r1.38 room.lisp
--- src/code/room.lisp 3 Nov 2006 19:54:00 -0000 1.38
+++ src/code/room.lisp 30 Dec 2006 16:39:49 -0000
@@ -207,7 +207,14 @@
(define-alien-type (struct page)
(struct page
(start long)
- (bytes-used (unsigned 16))
+ ;; On platforms with small enough GC pages, this field
+ ;; will be a short. On platforms with larger ones, it'll
+ ;; be an int.
+ (bytes-used (unsigned
+ #.(if (typep sb!vm:gencgc-page-size
+ '(unsigned-byte 16))
+ 16
+ 32)))
(flags (unsigned 8))
(gen (signed 8))))
(declaim (inline find-page-index))
Index: src/compiler/generic/genesis.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/genesis.lisp,v
retrieving revision 1.127
diff -u -r1.127 genesis.lisp
--- src/compiler/generic/genesis.lisp 5 Dec 2006 15:46:15 -0000 1.127
+++ src/compiler/generic/genesis.lisp 30 Dec 2006 16:39:50 -0000
@@ -2728,22 +2728,17 @@
(setf prev-priority priority))
(format t "#define ~A " name)
(format t
- ;; KLUDGE: As of sbcl-0.6.7.14, we're dumping two
- ;; different kinds of values here, (1) small codes
- ;; and (2) machine addresses. The small codes can be
- ;; dumped as bare integer values. The large machine
- ;; addresses might cause problems if they're large
- ;; and represented as (signed) C integers, so we
- ;; want to force them to be unsigned. We do that by
- ;; wrapping them in the LISPOBJ macro. (We could do
- ;; it with a bare "(unsigned)" cast, except that
- ;; this header file is used not only in C files, but
- ;; also in assembly files, which don't understand
- ;; the cast syntax. The LISPOBJ macro goes away in
- ;; assembly files, but that shouldn't matter because
- ;; we don't do arithmetic on address constants in
- ;; assembly files. See? It really is a kludge..) --
- ;; WHN 2000-10-18
+ ;; KLUDGE: We're dumping two different kinds of
+ ;; values here, (1) small codes and (2) machine
+ ;; addresses. The small codes can be dumped as bare
+ ;; integer values. The large machine addresses might
+ ;; cause problems if they're large and represented
+ ;; as (signed) C integers, so we want to force them
+ ;; to be unsigned by appending an U to the
+ ;; literal. We can't dump all the values using the
+ ;; literal-U syntax, since the assembler doesn't
+ ;; support that syntax and some of the small
+ ;; constants can be used in assembler files.
(let (;; cutoff for treatment as a small code
(cutoff (expt 2 16)))
(cond ((minusp value)
@@ -2751,7 +2746,7 @@
((< value cutoff)
"~D")
(t
- "LISPOBJ(~DU)")))
+ "~DU")))
value)
(format t " /* 0x~X */~@[ /* ~A */~]~%" value doc))))
(terpri))
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 27 Dec 2006 20:24:24 -0000 1.19
+++ .cvsignore 1 Jan 2007 03:36:26 -0000 1.20
@@ -3,3 +3,4 @@
sbcl-1.0.1-source.tar.bz2
sbcl-1.0.1-x86-linux-binary.tar.bz2
sbcl-1.0.1-x86-64-linux-binary.tar.bz2
+sbcl-1.0.1-patched-powerpc-linux.tar.bz2
Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/sbcl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sbcl.spec 27 Dec 2006 20:24:24 -0000 1.56
+++ sbcl.spec 1 Jan 2007 03:36:26 -0000 1.57
@@ -10,16 +10,14 @@
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD/MIT
Group: Development/Languages
URL: http://sbcl.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 sparc
-# ppc borked, http://bugzilla.redhat.com/220053
-ExcludeArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc sparc
# Pre-generated html docs (not used)
#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,7 +42,8 @@
%endif
## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-1.0-powerpc-linux-binary.tar.bz2
+# Thanks David!
+Source30: sbcl-1.0.1-patched-powerpc-linux.tar.bz2
%ifarch ppc
%define sbcl_arch ppc
#BuildRequires: sbcl
@@ -73,6 +72,7 @@
# Allow override of contrib test failure(s)
Patch7: sbcl-0.9.9-permissive.patch
Patch8: sbcl-1.0-gcc4_sparc.patch
+Patch220053: sbcl-1.0.1-bz220053.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -104,6 +104,7 @@
%{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
%patch7 -p1 -b .permissive
%patch8 -p1 -b .gcc4_sparc
+%patch220053 -p0 -b .bz220053
## Enable sb-thread
%ifarch %{ix86} x86_64
@@ -235,6 +236,9 @@
%changelog
+* Sun Dec 31 2006 Rex Dieter 1.0.1-4
+- ppc patch, pached ppc bootstrap (David Woodhouse, #220053)
+
* Wed Dec 27 2006 Rex Dieter 1.0.1-3
- native bootstrap
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 27 Dec 2006 20:24:24 -0000 1.21
+++ sources 1 Jan 2007 03:36:26 -0000 1.22
@@ -1 +1,2 @@
fe02f498620bce61a8688d4557a405b0 sbcl-1.0.1-source.tar.bz2
+ad95d94825e14a10cab35f2d10cd8bac sbcl-1.0.1-patched-powerpc-linux.tar.bz2
From fedora-extras-commits at redhat.com Mon Jan 1 05:59:18 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 1 Jan 2007 00:59:18 -0500
Subject: fedora-updates-system/updatessystem/identity - New directory
Message-ID: <200701010559.l015xInG000712@cvs-int.fedora.redhat.com>
Author: lmacken
Update of /cvs/fedora/fedora-updates-system/updatessystem/identity
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv700/identity
Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/identity added to the repository
From fedora-extras-commits at redhat.com Mon Jan 1 06:09:16 2007
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 1 Jan 2007 01:09:16 -0500
Subject: rpms/openvrml/devel openvrml.spec,1.7,1.8
Message-ID: <200701010609.l0169GeU003953@cvs-int.fedora.redhat.com>
Author: braden
Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3938
Modified Files:
openvrml.spec
Log Message:
Updated firefox dependency to 2.0.0.1.
Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openvrml.spec 31 Dec 2006 05:28:44 -0000 1.7
+++ openvrml.spec 1 Jan 2007 06:08:46 -0000 1.8
@@ -1,7 +1,7 @@
# -*- rpm-spec -*-
Name: openvrml
Version: 0.16.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: VRML/X3D runtime library
License: LGPL
Group: System Environment/Libraries
@@ -18,7 +18,7 @@
BuildRequires: libGLU-devel
BuildRequires: libXmu-devel
BuildRequires: gtk2-devel
-Requires: firefox = 2.0
+Requires: firefox = 2.0.0.1
%description
OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -35,7 +35,7 @@
Requires: libjpeg-devel
Requires: fontconfig-devel
Requires: freetype-devel
-Requires: firefox-devel = 2.0
+Requires: firefox-devel = 2.0.0.1
%description devel
Headers that programmers will need to develop C++ programs using
OpenVRML.
@@ -149,6 +149,9 @@
%changelog
+* Mon Jan 01 2007 Braden McDaniel - 0.16.3-2
+- Updated firefox dependency to 2.0.0.1.
+
* Sun Dec 31 2006 Braden McDaniel - 0.16.3-1
- Updated to 0.16.3.
From fedora-extras-commits at redhat.com Mon Jan 1 06:16:19 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 1 Jan 2007 01:16:19 -0500
Subject: fedora-updates-system/updatessystem/identity sobzprovider.py, NONE,
1.1
Message-ID: <200701010616.l016GJFO004058@cvs-int.fedora.redhat.com>
Author: lmacken
Update of /cvs/fedora/fedora-updates-system/updatessystem/identity
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4002/updatessystem/identity
Added Files:
sobzprovider.py
Log Message:
- Wrote a Bugzilla IdentityProvider and added identity support
***** Error reading new file: [Errno 2] No such file or directory: 'sobzprovider.py'
From fedora-extras-commits at redhat.com Mon Jan 1 06:16:24 2007
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 1 Jan 2007 01:16:24 -0500
Subject: fedora-updates-system/updatessystem/templates login.kid, 1.1,
1.2 master.kid, 1.4, 1.5
Message-ID: <200701010616.l016GOX7004075@cvs-int.fedora.redhat.com>
Author: lmacken
Update of /cvs/fedora/fedora-updates-system/updatessystem/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4002/updatessystem/templates
Modified Files:
login.kid master.kid
Log Message:
- Wrote a Bugzilla IdentityProvider and added identity support
Index: login.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/login.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- login.kid 12 Nov 2006 20:08:06 -0000 1.1
+++ login.kid 1 Jan 2007 06:16:19 -0000 1.2
@@ -8,106 +8,42 @@
Login
-
-
+ Login
+ ${message}
+