Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Flavien Bridault (5647b59a5c9dd165b2d08c02e90fa3f294b39b76)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Flavien Bridault <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (5647b59a5c9dd165b2d08c02e90fa3f294b39b76)
  • Date: Thu, 6 Jul 2006 17:52:17 -0500

GIT changes to master grimoire by Flavien Bridault <vlaaad AT sourcemage.org>:

disk/udev/DETAILS | 2 -
disk/udev/HISTORY | 5 ++
disk/udev/PRE_BUILD | 3 -
disk/udev/ifrename_wait_retry.patch | 58
----------------------------------
graphics/gimp/BUILD | 5 --
graphics/gimp/DETAILS | 4 +-
graphics/gimp/HISTORY | 6 +++
graphics/gimp/PRE_BUILD | 6 ---
graphics/gimp/gimp-2.2.12.tar.bz2.sig |binary
graphics/gimp/gimp-png.patch | 20 -----------
10 files changed, 15 insertions(+), 94 deletions(-)

New commits:
commit 5647b59a5c9dd165b2d08c02e90fa3f294b39b76
Merge: 73083376be294587caacb9aa215f6620e987b6fc
3660a78543dcbe76a695f5c23791df3e8203c46c
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Merge branch 'master' of ssh://fbridault AT scm.sourcemage.org/smgl/grimoire

Conflicts:

graphics/gimp/DETAILS
graphics/gimp/HISTORY

commit 73083376be294587caacb9aa215f6620e987b6fc
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

gimp updated to 2.2.12

commit 9f12953b60026992e39091236530ed93a59b7490
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Missing entries

commit ca45f16ad7d2ce0ccc08d838fafcde118573d8ed
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

udev updated to 095

diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index fb34889..f74fa25 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -2,7 +2,7 @@
if [ "$RECENT_KERNEL" == "n" ]; then
VERSION=092
else
- VERSION=094
+ VERSION=095
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index db612b1..c828865 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,8 @@
+2006-07-05 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 095
+ * ifrename_wait_retry.patch: removed, has been integrated in release
+ * PRE_BUILD: removed patch above
+
2006-06-25 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Added patch to allow network interface renaming
with existing names. Added comments about patches, tidied
diff --git a/disk/udev/PRE_BUILD b/disk/udev/PRE_BUILD
index c0c1f0e..5a3ef7c 100755
--- a/disk/udev/PRE_BUILD
+++ b/disk/udev/PRE_BUILD
@@ -3,8 +3,7 @@ cd $SOURCE_DIRECTORY &&

# Prevent udev restart on 'make install',
# allow network interface renaming with existing name.
-patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/ifrename_wait_retry.patch
+patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch

#if [[ "$UDEV_STATIC" == 'y' ]]; then
# message "${MESSAGE_COLOR}Setting up static build
directory...${DEFAULT_COLOR}" &&
diff --git a/disk/udev/ifrename_wait_retry.patch
b/disk/udev/ifrename_wait_retry.patch
deleted file mode 100644
index ecc57e8..0000000
--- a/disk/udev/ifrename_wait_retry.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- udev_device.c 2006-06-25 15:56:38.000000000 +0300
-+++ udev_device.c.new 2006-06-25 15:52:20.000000000 +0300
-@@ -86,6 +86,7 @@
- int sk;
- struct ifreq ifr;
- int retval;
-+ int timeout = (1000000 / 50000) * 30; /* 30 seconds */
-
- info("changing net interface name from '%s' to '%s'",
udev->dev->kernel_name, udev->name);
- if (udev->test_run)
-@@ -102,10 +103,44 @@
- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
-
- retval = ioctl(sk, SIOCSIFNAME, &ifr);
-- if (retval != 0)
-- err("error changing net interface name: %s", strerror(errno));
-- close(sk);
-+ if (retval != 0) {
-+ if (errno != EEXIST) {
-+ err("error changing net interface name %s to %s: %s",
ifr.ifr_name, ifr.ifr_newname, strerror(errno));
-+ goto error;
-+ }
-+
-+ /* Destination interface already exits.
-+ * First rename our interface to something temporary in case
-+ * we're trying to swap with that one. */
-+ strlcpy(ifr.ifr_newname, udev->dev->kernel_name, IFNAMSIZ);
-+ strlcat(ifr.ifr_newname, "_temp", IFNAMSIZ);
-+
-+ retval = ioctl(sk, SIOCSIFNAME, &ifr);
-+ if (retval != 0) {
-+ err("error changing net interface name %s to %s: %s",
ifr.ifr_name, ifr.ifr_newname, strerror(errno));
-+ goto error;
-+ }
-+
-+ /* Now we loop until our target interface goes away. */
-+ strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
-+ strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
-+ while ((retval = ioctl(sk, SIOCSIFNAME, &ifr)) != 0) {
-+ if (errno != EEXIST) {
-+ err("error changing net interface name %s to
%s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
-+ break;
-+ }
-+
-+ if (timeout-- <= 0) {
-+ err("error changing net interface name %s to
%s: timeout", ifr.ifr_name, ifr.ifr_newname);
-+ break;
-+ }
-
-+ usleep(50000);
-+ }
-+ }
-+
-+error:
-+ close(sk);
- return retval;
- }
-
diff --git a/graphics/gimp/BUILD b/graphics/gimp/BUILD
deleted file mode 100755
index 48aed1f..0000000
--- a/graphics/gimp/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ "$GIMP_DEVEL" = "n" ];then
- # Temporary workaround, check on future updates if still necessary
- CFLAGS="-fomit-frame-pointer $CFLAGS"
-fi &&
-default_build
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index 91b7db0..8d899b8 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -6,10 +6,10 @@ if [ "$GIMP_DEVEL" == "y" ];then

SOURCE_HASH=sha512:f028070b344debb58cc81885d2e4a589e091653c3de45c8d7ed1fb2fefab1059969b06cd30ce47a7ef6f2163d33b867153a97b4d1faaa5d420fce8cb9534efe0
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
else
- VERSION=2.2.11
+ VERSION=2.2.12
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:3185f69758ca494ebc587fd61c20bcb4ea2c3ba42867032257e676cce282188a4ea70124ee53601363dbe0731201d8522688ea86b2c6ddaa1526d832417fdcfc
SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
fi

SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 60bf681..f71ec38 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,9 @@
+2006-07-07 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.2.12
+ * BUILD: deleted, removed -fomit-frame-pointer from CFLAGS
+ * gimp-png.patch: removed
+ * PRE_BUILD: removed, patch above no longer needed
+
2006-07-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3.10 (devel), removed UPDATED

diff --git a/graphics/gimp/PRE_BUILD b/graphics/gimp/PRE_BUILD
deleted file mode 100755
index 1f76a75..0000000
--- a/graphics/gimp/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-if [ "$GIMP_DEVEL" = "n" ]; then
-patch -p0 < $SCRIPT_DIRECTORY/gimp-png.patch
-fi
diff --git a/graphics/gimp/gimp-2.2.12.tar.bz2.sig
b/graphics/gimp/gimp-2.2.12.tar.bz2.sig
new file mode 100644
index 0000000..2498143
Binary files /dev/null and b/graphics/gimp/gimp-2.2.12.tar.bz2.sig differ
diff --git a/graphics/gimp/gimp-png.patch b/graphics/gimp/gimp-png.patch
deleted file mode 100644
index 92fddcf..0000000
--- a/graphics/gimp/gimp-png.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plug-ins/common/png.c.orig 2006-06-15 19:45:07.000000000 +0200
-+++ plug-ins/common/png.c 2006-06-15 19:45:51.000000000 +0200
-@@ -1012,7 +1012,7 @@
- * Done with the file...
- */
-
-- png_read_destroy (pp, info, NULL);
-+ png_destroy_read_struct(&pp, &info, NULL);
-
- g_free (pixel);
- g_free (pixels);
-@@ -1441,7 +1441,7 @@
- };
-
- png_write_end (pp, info);
-- png_write_destroy (pp);
-+ png_destroy_write_struct(&pp, &info);
-
- g_free (pixel);
- g_free (pixels);



  • [SM-Commit] GIT changes to master grimoire by Flavien Bridault (5647b59a5c9dd165b2d08c02e90fa3f294b39b76), Flavien Bridault, 07/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page