[arch-commits] Commit in fam/repos (7 files)

Allan McRae allan at archlinux.org
Sun Jun 14 07:43:52 EDT 2009


    Date: Sunday, June 14, 2009 @ 07:43:52
  Author: allan
Revision: 42428

Merged revisions 39062,42427 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/fam/trunk

........
  r39062 | pierre | 2009-05-12 04:29:49 +1000 (Tue, 12 May 2009) | 1 line
  
  thats missleading; e.g. KDE does not use FAM
........
  r42427 | allan | 2009-06-14 21:42:37 +1000 (Sun, 14 Jun 2009) | 2 lines
  
  upgpkg: fam 2.7.0-12
      adjust patches to be more similar to gentoo patchset - Fixes FS#14988 and hopefully FS#14623
........

Added:
  fam/repos/extra-i686/fam-2.7.0-buildfixes.patch
    (from rev 42427, fam/trunk/fam-2.7.0-buildfixes.patch)
  fam/repos/extra-i686/fam-2.7.0-limits.patch
    (from rev 42427, fam/trunk/fam-2.7.0-limits.patch)
Modified:
  fam/repos/extra-i686/	(properties)
  fam/repos/extra-i686/PKGBUILD
Deleted:
  fam/repos/extra-i686/fam-2.7.0-gcc43.patch
  fam/repos/extra-i686/fam-2.7.0-noc++.patch
  fam/repos/extra-i686/include_fam_h.patch

----------------------------+
 PKGBUILD                   |   18 ++++-----
 fam-2.7.0-buildfixes.patch |   69 +++++++++++++++++++++++++++++++++++
 fam-2.7.0-gcc43.patch      |   46 -----------------------
 fam-2.7.0-limits.patch     |   11 +++++
 fam-2.7.0-noc++.patch      |   83 -------------------------------------------
 include_fam_h.patch        |   11 -----
 6 files changed, 88 insertions(+), 150 deletions(-)


Property changes on: fam/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /fam/trunk:1-15740
   + /fam/trunk:1-42427

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-14 11:42:37 UTC (rev 42427)
+++ extra-i686/PKGBUILD	2009-06-14 11:43:52 UTC (rev 42428)
@@ -1,10 +1,11 @@
 # $Id$
 # Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
 pkgname=fam
 pkgver=2.7.0
-pkgrel=11
-pkgdesc="File Alteration Monitor - used by KDE, GNOME and others"
+pkgrel=12
+pkgdesc="File Alteration Monitor"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 depends=('portmap')
@@ -14,25 +15,22 @@
 source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz
 	fam-2.7.0-dnotify.patch
 	fam-2.7.0-largefiles.patch
-	fam-2.7.0-noc++.patch
-	fam-2.7.0-gcc43.patch
-	include_fam_h.patch
+	fam-2.7.0-limits.patch
+	fam-2.7.0-buildfixes.patch
 	fam)
 md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39'
          '073d1763318344635ea316293390205c'
          '47b41e0b0498793af004696a096d7da1'
-         '0274cd113d3dcb015653b5606c7714ac'
-         '13c14778038aa9601a27498448e855e0'
          '2638b8ffacb9f03b6e438e08ea7b290a'
+         'fc0cabc0ac4f819680401eb3090c29c9'
          '45b648907ba1c7edec17fb544f1f4a13')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/fam-2.7.0-dnotify.patch || return 1
   patch -Np1 -i ${srcdir}/fam-2.7.0-largefiles.patch || return 1
-  patch -Np0 -i ${srcdir}/include_fam_h.patch || return 1
-  patch -Np1 -i ${srcdir}/fam-2.7.0-noc++.patch || return 1
-  patch -Np1 -i ${srcdir}/fam-2.7.0-gcc43.patch || return 1
+  patch -Np0 -i ${srcdir}/fam-2.7.0-limits.patch || return 1
+  patch -Np1 -i ${srcdir}/fam-2.7.0-buildfixes.patch || return 1
 
   chmod 755 configure || return 1
 

Copied: fam/repos/extra-i686/fam-2.7.0-buildfixes.patch (from rev 42427, fam/trunk/fam-2.7.0-buildfixes.patch)
===================================================================
--- extra-i686/fam-2.7.0-buildfixes.patch	                        (rev 0)
+++ extra-i686/fam-2.7.0-buildfixes.patch	2009-06-14 11:43:52 UTC (rev 42428)
@@ -0,0 +1,69 @@
+diff -Naur fam-2.7.0-old/include/BTree.h fam-2.7.0/include/BTree.h
+--- fam-2.7.0-old/include/BTree.h	2003-01-20 14:22:30.000000000 +1000
++++ fam-2.7.0/include/BTree.h	2009-06-14 21:21:41.000000000 +1000
+@@ -24,6 +24,7 @@
+ #define BTree_included
+ 
+ #include "Boolean.h"
++#include <cstdlib>
+ 
+ //  This is an in-core B-Tree implementation.
+ //
+diff -Naur fam-2.7.0-old/lib/Client.c++ fam-2.7.0/lib/Client.c++
+--- fam-2.7.0-old/lib/Client.c++	2003-01-19 00:18:12.000000000 +1000
++++ fam-2.7.0/lib/Client.c++	2009-06-14 21:22:33.000000000 +1000
+@@ -34,7 +34,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "fam.h"
+ #include "Client.h"
+diff -Naur fam-2.7.0-old/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
+--- fam-2.7.0-old/src/DNotify.c++	2009-06-14 21:14:34.000000000 +1000
++++ fam-2.7.0/src/DNotify.c++	2009-06-14 21:23:23.000000000 +1000
+@@ -31,6 +31,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <libgen.h>
++#include <cstdlib>
+ 
+ #include "DNotify.h"
+ 
+diff -Naur fam-2.7.0-old/src/IMon.c++ fam-2.7.0/src/IMon.c++
+--- fam-2.7.0-old/src/IMon.c++	2003-01-19 00:18:12.000000000 +1000
++++ fam-2.7.0/src/IMon.c++	2009-06-14 21:24:11.000000000 +1000
+@@ -40,7 +40,7 @@
+ #include "Interest.h"
+ #include "Log.h"
+ #include "Scheduler.h"
+-#include "alloc.h"
++#include <memory>
+ 
+ int		   IMon::imonfd = -2;
+ IMon::EventHandler IMon::ehandler = NULL;
+diff -Naur fam-2.7.0-old/src/Interest.h fam-2.7.0/src/Interest.h
+--- fam-2.7.0-old/src/Interest.h	2009-06-14 21:14:34.000000000 +1000
++++ fam-2.7.0/src/Interest.h	2009-06-14 21:25:25.000000000 +1000
+@@ -29,6 +29,7 @@
+ #include <netinet/in.h>  //  for in_addr
+ 
+ #include "Boolean.h"
++#include <cstdlib>
+ 
+ class Event;
+ class FileSystem;
+diff -Naur fam-2.7.0-old/src/NFSFileSystem.c++ fam-2.7.0/src/NFSFileSystem.c++
+--- fam-2.7.0-old/src/NFSFileSystem.c++	2003-01-19 00:18:12.000000000 +1000
++++ fam-2.7.0/src/NFSFileSystem.c++	2009-06-14 21:26:16.000000000 +1000
+@@ -97,7 +97,7 @@
+ 
+     attr_cache_timeout = ACREGMAX;
+ 
+-    char * p;
++    const char * p;
+         
+     if (strstr(opt, "noac")) {
+         f_noac = true;

Deleted: extra-i686/fam-2.7.0-gcc43.patch
===================================================================
--- extra-i686/fam-2.7.0-gcc43.patch	2009-06-14 11:42:37 UTC (rev 42427)
+++ extra-i686/fam-2.7.0-gcc43.patch	2009-06-14 11:43:52 UTC (rev 42428)
@@ -1,46 +0,0 @@
-diff -Naur fam-2.7.0-old/include/BTree.h fam-2.7.0/include/BTree.h
---- fam-2.7.0-old/include/BTree.h	2003-01-20 14:22:30.000000000 +1000
-+++ fam-2.7.0/include/BTree.h	2008-10-18 10:43:11.000000000 +1000
-@@ -23,6 +23,8 @@
- #ifndef BTree_included
- #define BTree_included
- 
-+#include <cstdlib>
-+
- #include "Boolean.h"
- 
- //  This is an in-core B-Tree implementation.
-diff -Naur fam-2.7.0-old/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
---- fam-2.7.0-old/src/DNotify.c++	2008-10-18 10:33:13.000000000 +1000
-+++ fam-2.7.0/src/DNotify.c++	2008-10-18 10:41:22.000000000 +1000
-@@ -31,6 +31,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <libgen.h>
-+#include <cstdlib>
- 
- #include "DNotify.h"
- 
-diff -Naur fam-2.7.0-old/src/IMon.c++ fam-2.7.0/src/IMon.c++
---- fam-2.7.0-old/src/IMon.c++	2003-01-19 00:18:12.000000000 +1000
-+++ fam-2.7.0/src/IMon.c++	2008-10-18 10:40:21.000000000 +1000
-@@ -40,7 +40,7 @@
- #include "Interest.h"
- #include "Log.h"
- #include "Scheduler.h"
--#include "alloc.h"
-+#include <memory>
- 
- int		   IMon::imonfd = -2;
- IMon::EventHandler IMon::ehandler = NULL;
-diff -Naur fam-2.7.0-old/src/Interest.h fam-2.7.0/src/Interest.h
---- fam-2.7.0-old/src/Interest.h	2008-10-18 10:33:13.000000000 +1000
-+++ fam-2.7.0/src/Interest.h	2008-10-18 10:40:44.000000000 +1000
-@@ -23,6 +23,7 @@
- #ifndef Interest_included
- #define Interest_included
- 
-+#include <cstdlib>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/time.h>

Copied: fam/repos/extra-i686/fam-2.7.0-limits.patch (from rev 42427, fam/trunk/fam-2.7.0-limits.patch)
===================================================================
--- extra-i686/fam-2.7.0-limits.patch	                        (rev 0)
+++ extra-i686/fam-2.7.0-limits.patch	2009-06-14 11:43:52 UTC (rev 42428)
@@ -0,0 +1,11 @@
+--- include/fam.h.orig	2005-05-25 09:26:38.000000000 +0000
++++ include/fam.h	2005-05-25 09:27:04.000000000 +0000
+@@ -41,7 +41,7 @@
+ *****************************************************************************/
+ 
+ /* For NAME_MAX - maximum # of chars in a filename */
+-#include "limits.h"
++#include <limits.h>
+ 
+ 
+ 

Deleted: extra-i686/fam-2.7.0-noc++.patch
===================================================================
--- extra-i686/fam-2.7.0-noc++.patch	2009-06-14 11:42:37 UTC (rev 42427)
+++ extra-i686/fam-2.7.0-noc++.patch	2009-06-14 11:43:52 UTC (rev 42428)
@@ -1,83 +0,0 @@
-diff -ruN fam-2.7.0/lib/Client.c++ fam-2.7.0.noc++/lib/Client.c++
---- fam-2.7.0/lib/Client.c++	2003-01-18 14:18:12.000000000 +0000
-+++ fam-2.7.0.noc++/lib/Client.c++	2006-03-02 22:47:50.000000000 +0000
-@@ -34,8 +34,6 @@
- #include <syslog.h>
- #include <errno.h>
- 
--#include <iostream.h>
--
- #include "fam.h"
- #include "Client.h"
- 
-@@ -440,3 +438,29 @@
-     memcpy(l, p, sizeof(u_int32_t));
-     *l = ntohl(*l);
- }
-+
-+/* Some C++ stuff needed when we not link to libstdc++ */
-+void *operator new (size_t sz)
-+{
-+	void *ret = malloc (sz);
-+	if (ret == NULL)
-+	{
-+		fputs ("libfam memory allocation failed\n", stderr);
-+	}
-+	return ret;
-+}
-+
-+void *operator new[] (size_t sz)
-+{
-+	return ::operator new(sz);
-+}
-+
-+void operator delete (void *ptr)
-+{
-+	free (ptr);
-+}
-+
-+void operator delete[] (void *ptr)
-+{
-+	free (ptr);
-+}
-diff -ruN fam-2.7.0/lib/Makefile.am fam-2.7.0.noc++/lib/Makefile.am
---- fam-2.7.0/lib/Makefile.am	2003-01-19 01:55:10.000000000 +0000
-+++ fam-2.7.0.noc++/lib/Makefile.am	2006-03-02 22:43:01.000000000 +0000
-@@ -7,8 +7,11 @@
- 	Client.h \
- 	fam.c++
- 
--libfam_la_LDFLAGS = -export-symbols fam.sym
--libfam_la_LIBADD = -lstdc++
-+libfam_la_LDFLAGS = -Wl,--version-script=fam.sym.version
-+libfam_la_LIBADD =
-+AM_CXXFLAGS = -fno-exceptions -fno-rtti
-+
-+CXXLD=--tag=CC $(CXX)
- 
- EXTRA_DIST = fam.sym
- 
-diff -ruN fam-2.7.0/lib/fam.sym.version fam-2.7.0.noc++/lib/fam.sym.version
---- fam-2.7.0/lib/fam.sym.version	1970-01-01 00:00:00.000000000 +0000
-+++ fam-2.7.0.noc++/lib/fam.sym.version	2006-03-02 22:49:31.000000000 +0000
-@@ -0,0 +1,20 @@
-+{
-+   global:
-+	FAMCancelMonitor;
-+	FAMClose;
-+	FAMDebugLevel;
-+	FamErrlist;
-+	FAMErrno;
-+	FAMMonitorCollection;
-+	FAMMonitorDirectory;
-+	FAMMonitorDirectory2;
-+	FAMMonitorFile;
-+	FAMMonitorFile2;
-+	FAMNextEvent;
-+	FAMOpen;
-+	FAMOpen2;
-+	FAMPending;
-+	FAMResumeMonitor;
-+	FAMSuspendMonitor;
-+   local: *;
-+};

Deleted: extra-i686/include_fam_h.patch
===================================================================
--- extra-i686/include_fam_h.patch	2009-06-14 11:42:37 UTC (rev 42427)
+++ extra-i686/include_fam_h.patch	2009-06-14 11:43:52 UTC (rev 42428)
@@ -1,11 +0,0 @@
---- include/fam.h.orig	2005-05-25 09:26:38.000000000 +0000
-+++ include/fam.h	2005-05-25 09:27:04.000000000 +0000
-@@ -41,7 +41,7 @@
- *****************************************************************************/
- 
- /* For NAME_MAX - maximum # of chars in a filename */
--#include "limits.h"
-+#include <limits.h>
- 
- 
- 



More information about the arch-commits mailing list