sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (9ee95622d4ef8bcbafad0866fa163edda2de7dd3)

From: Remko van der Vossen <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (9ee95622d4ef8bcbafad0866fa163edda2de7dd3)
Date: Sun, 24 May 2015 04:20:09 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

disk/reiserfsprogs/BUILD | 1
disk/reiserfsprogs/DETAILS | 7 -
disk/reiserfsprogs/HISTORY | 4
xorg-lib/libice/HISTORY | 4
xorg-lib/libice/PRE_BUILD | 4
xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch | 80
+++++++++++++++++
6 files changed, 96 insertions(+), 4 deletions(-)

New commits:
commit bf181ab842972625f0dbc635ea34cbd82ee243ef
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

reiserfsprogs: 3.6.24, fix build with gcc 5

commit 292aa792aa78a20da5ec32d15ec91af5ecb53815
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

libice: apply patch to fix build with gcc 5

diff --git a/disk/reiserfsprogs/BUILD b/disk/reiserfsprogs/BUILD
index 7051162..bcadd76 100755
--- a/disk/reiserfsprogs/BUILD
+++ b/disk/reiserfsprogs/BUILD
@@ -1,3 +1,4 @@
# Fixes Bug #1108
OPTS="$OPTS --sbindir=${INSTALL_ROOT}/sbin" &&
+CFLAGS+=" -std=gnu90"
default_build
diff --git a/disk/reiserfsprogs/DETAILS b/disk/reiserfsprogs/DETAILS
index e041ae2..745e179 100755
--- a/disk/reiserfsprogs/DETAILS
+++ b/disk/reiserfsprogs/DETAILS
@@ -1,10 +1,9 @@
SPELL=reiserfsprogs
- VERSION=3.6.21
+ VERSION=3.6.24
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/fs/reiserfs/$SOURCE
-#
SOURCE_HASH=sha512:d7a98e2fd029c0a9f764a635bdad84fc6acaeae2353c17c4a9a38aee39cc84c9e98c3680e511f1efa2092af652f9a517375fe7d973e91a7d2e8b9df403894494
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+
SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/people/jeffm/$SPELL/v$VERSION/$SOURCE
+ SOURCE_HASH=sha512:
LICENSE[0]=GPL
KEYWORDS="disk"
WEB_SITE=http://www.namesys.com/
diff --git a/disk/reiserfsprogs/HISTORY b/disk/reiserfsprogs/HISTORY
index cf1d8fe..12a1ab4 100644
--- a/disk/reiserfsprogs/HISTORY
+++ b/disk/reiserfsprogs/HISTORY
@@ -1,3 +1,7 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: 3.6.24
+ * BUILD: C standard == gnu90 to build with gcc 5+
+
2009-01-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.21, new SOURCE_URL[0], gz -> bz2
* INSTALL: added to create symlinks fsck.resierfs and mkfs.reiserfs
diff --git a/xorg-lib/libice/HISTORY b/xorg-lib/libice/HISTORY
index 0d2232e..bb7fc19 100644
--- a/xorg-lib/libice/HISTORY
+++ b/xorg-lib/libice/HISTORY
@@ -1,3 +1,7 @@
+2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
+ * libICE-1.0.9-gcc-array-bound-fix.patch, PRE_BUILD:
+ apply patch to fix building with gcc 5
+
2015-03-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Added proper description

diff --git a/xorg-lib/libice/PRE_BUILD b/xorg-lib/libice/PRE_BUILD
new file mode 100755
index 0000000..68258a0
--- /dev/null
+++ b/xorg-lib/libice/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY"/libICE-1.0.9-gcc-array-bound-fix.patch
diff --git a/xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch
b/xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch
new file mode 100644
index 0000000..718822b
--- /dev/null
+++ b/xorg-lib/libice/libICE-1.0.9-gcc-array-bound-fix.patch
@@ -0,0 +1,80 @@
+diff -Naur libICE-1.0.9.orig/src/ICElibint.h libICE-1.0.9/src/ICElibint.h
+--- libICE-1.0.9.orig/src/ICElibint.h 2014-06-07 10:28:43.000000000 +0900
++++ libICE-1.0.9/src/ICElibint.h 2015-05-24 18:18:02.000000000 +0900
+@@ -334,28 +334,28 @@
+ * Extern declarations
+ */
+
+-extern IceConn _IceConnectionObjs[];
+-extern char *_IceConnectionStrings[];
+-extern int _IceConnectionCount;
++extern IceConn _IceConnectionObjs[];
++extern char *_IceConnectionStrings[];
++extern int _IceConnectionCount;
+
+-extern _IceProtocol _IceProtocols[];
+-extern int _IceLastMajorOpcode;
++extern _IceProtocol _IceProtocols[];
++extern int _IceLastMajorOpcode;
+
+-extern int _IceAuthCount;
+-extern const char *_IceAuthNames[];
+-extern IcePoAuthProc _IcePoAuthProcs[];
+-extern IcePaAuthProc _IcePaAuthProcs[];
++extern int _IceAuthCount;
++extern const char *_IceAuthNames[];
++extern IcePoAuthProc _IcePoAuthProcs[];
++extern IcePaAuthProc _IcePaAuthProcs[];
+
+-extern int _IceVersionCount;
+-extern _IceVersion _IceVersions[];
++extern const int _IceVersionCount;
++extern const _IceVersion _IceVersions[];
+
+-extern _IceWatchProc *_IceWatchProcs;
++extern _IceWatchProc *_IceWatchProcs;
+
+-extern IceErrorHandler _IceErrorHandler;
+-extern IceIOErrorHandler _IceIOErrorHandler;
++extern IceErrorHandler _IceErrorHandler;
++extern IceIOErrorHandler _IceIOErrorHandler;
+
+-extern IceAuthDataEntry _IcePaAuthDataEntries[];
+-extern int _IcePaAuthDataEntryCount;
++extern IceAuthDataEntry _IcePaAuthDataEntries[];
++extern int _IcePaAuthDataEntryCount;
+
+ extern void _IceErrorBadMajor (
+ IceConn /* iceConn */,
+diff -Naur libICE-1.0.9.orig/src/process.c libICE-1.0.9/src/process.c
+--- libICE-1.0.9.orig/src/process.c 2014-06-07 10:28:43.000000000 +0900
++++ libICE-1.0.9/src/process.c 2015-05-24 18:20:23.000000000 +0900
+@@ -856,7 +856,8 @@
+ )
+ {
+ iceConnectionSetupMsg *message;
+- int myVersionCount, hisVersionCount;
++ const int myVersionCount = _IceVersionCount;
++ int hisVersionCount;
+ int myVersionIndex, hisVersionIndex;
+ int hisMajorVersion, hisMinorVersion;
+ int myAuthCount, hisAuthCount;
+@@ -926,7 +927,6 @@
+ }
+
+ hisVersionCount = message->versionCount;
+- myVersionCount = _IceVersionCount;
+
+ hisVersionIndex = myVersionIndex = found = 0;
+
+@@ -2551,7 +2551,7 @@
+ *replyReadyRet = replyReady;
+ }
+
+-int _IceVersionCount = 1;
+-_IceVersion _IceVersions[] = {
+- {IceProtoMajor, IceProtoMinor, _IceProcessCoreMessage}};
++const int _IceVersionCount = 1;
++const _IceVersion _IceVersions[] = {
++ {IceProtoMajor, IceProtoMinor,
_IceProcessCoreMessage}};
+

[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (9ee95622d4ef8bcbafad0866fa163edda2de7dd3), Remko van der Vossen, 05/24/2015