summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Stoddard <deltacow@gentoo.org>2006-03-11 15:25:25 +0000
committerScott Stoddard <deltacow@gentoo.org>2006-03-11 15:25:25 +0000
commitfcf6d8b0216fe818517c4481a3848a3aaa64f999 (patch)
tree8b1a4449aced0add4577ccec01b9777e3743f6cb /app-admin/watchfolder
parentFix for Bug #103071 (breaks with LC_ALL/LANG set). (diff)
downloadgentoo-2-fcf6d8b0216fe818517c4481a3848a3aaa64f999.tar.gz
gentoo-2-fcf6d8b0216fe818517c4481a3848a3aaa64f999.tar.bz2
gentoo-2-fcf6d8b0216fe818517c4481a3848a3aaa64f999.zip
patch to fix 64bit arch warnings.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'app-admin/watchfolder')
-rw-r--r--app-admin/watchfolder/ChangeLog7
-rw-r--r--app-admin/watchfolder/files/0.3.3-64bit.patch11
-rw-r--r--app-admin/watchfolder/metadata.xml5
-rw-r--r--app-admin/watchfolder/watchfolder-0.3.3.ebuild7
4 files changed, 27 insertions, 3 deletions
diff --git a/app-admin/watchfolder/ChangeLog b/app-admin/watchfolder/ChangeLog
index 10fb63f29031..68e7b1b8f830 100644
--- a/app-admin/watchfolder/ChangeLog
+++ b/app-admin/watchfolder/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/watchfolder
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/ChangeLog,v 1.7 2006/02/15 21:36:50 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/ChangeLog,v 1.8 2006/03/11 15:25:25 deltacow Exp $
+
+ 11 Mar 2006; Scott Stoddard <deltacow@gentoo.org>
+ +files/0.3.3-64bit.patch, metadata.xml, watchfolder-0.3.3.ebuild:
+ Patch added to remove warnings on 64 bit architectures. Contributed by
+ Tom Cort <linuxgeek@gmail.com> and addressing bug #123840.
*watchfolder-0.3.3 (15 Feb 2006)
diff --git a/app-admin/watchfolder/files/0.3.3-64bit.patch b/app-admin/watchfolder/files/0.3.3-64bit.patch
new file mode 100644
index 000000000000..ea78be4fe295
--- /dev/null
+++ b/app-admin/watchfolder/files/0.3.3-64bit.patch
@@ -0,0 +1,11 @@
+--- watchd-0.3.3/watchd.c.orig 2006-02-23 12:33:32.000000000 -0500
++++ watchd-0.3.3/watchd.c 2006-02-23 12:45:30.000000000 -0500
+@@ -176,7 +176,7 @@
+ // free(p2tmp);
+
+ p2tmp=strchr(p2,0xa); // Not very nice,
+- p2[(int)p2tmp-(int)p2]=0x00; // but in fact: It works ;)
++ *(p2+(p2tmp-p2))=0x00; // but in fact: It works ;)
+
+ while (p2[0]==' ') {p2++;} // Again, quick and dirty..
+ while (p1[strlen(p1)-1]==' ') {p1[strlen(p1)-1]=0;} // Need to say anything?;)
diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
index a8d898b3c5ee..0194d9cb9884 100644
--- a/app-admin/watchfolder/metadata.xml
+++ b/app-admin/watchfolder/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>no-herd</herd>
-<maintainer><email>deltacow@gentoo.org</email></maintainer>
+<maintainer>
+ <email>deltacow@gentoo.org</email>
+ <name>Scott Stoddard</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/watchfolder/watchfolder-0.3.3.ebuild b/app-admin/watchfolder/watchfolder-0.3.3.ebuild
index 1cfe84327ab9..04896aab9f97 100644
--- a/app-admin/watchfolder/watchfolder-0.3.3.ebuild
+++ b/app-admin/watchfolder/watchfolder-0.3.3.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/watchfolder-0.3.3.ebuild,v 1.2 2006/02/15 21:43:32 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/watchfolder-0.3.3.ebuild,v 1.3 2006/03/11 15:25:25 deltacow Exp $
+
+inherit eutils
DESCRIPTION="Watches directories and processes files, similar to the watchfolder option of Acrobat Distiller."
HOMEPAGE="http://freshmeat.net/projects/watchd/"
@@ -18,6 +20,9 @@ src_unpack() {
unpack ${A}
cd ${S}
+ # patch to remove warnings on 64 bit systems
+ epatch ${FILESDIR}/${PV}-64bit.patch || die
+
sed -i "3s/OPT=/OPT=${CFLAGS} /" Makefile
}