Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22320/10.3/unstable/main/finkinfo/libs
Modified Files:
libhowl.info
Added Files:
libhowl.patch
Log Message:
New version needed by some other pkgs (dmalloc is AWOL).
Tried to fix the splitoff mess.
--- NEW FILE: libhowl.patch ---
diff -Nurd -x'*~' howl-1.0.0.orig/configure howl-1.0.0/configure
--- howl-1.0.0.orig/configure 2005-05-19 18:29:51.000000000 -0400
+++ howl-1.0.0/configure 2005-09-07 14:46:05.000000000 -0400
@@ -8513,7 +8513,7 @@
LIB_SUBDIRS="howl"
HOWL_LIB_SUBDIRS=MacOSX
HOWL_LIB_OBJECTS='macosx_salt.lo macosx_socket.lo
macosx_time.lo macosx_mdns_stub.lo'
- PLATFORM_LIBS="-framework CoreFoundation"
+ PLATFORM_LIBS="-Wl,-framework,CoreFoundation"
HOWL_MAN_PAGES=
;;
*-*-linux*)
diff -aur howl-1.0.0/src/lib/howl/MacOSX/macosx_salt.c
howl-1.0.0.patched/src/lib/howl/MacOSX/macosx_salt.c
--- howl-1.0.0/src/lib/howl/MacOSX/macosx_salt.c 2004-07-29
08:18:36.000000000 +0200
+++ howl-1.0.0.patched/src/lib/howl/MacOSX/macosx_salt.c 2005-06-11
20:10:56.000000000 +0200
@@ -66,6 +66,7 @@
char ** argv)
{
sw_result err = SW_OKAY;
+ pthread_mutexattr_t attrs;
*salt = (sw_salt) sw_malloc(sizeof(struct _sw_salt));
err = sw_translate_error(*salt, SW_E_MEM);
@@ -76,6 +77,8 @@
(*salt)->m_sockets.m_prev = NULL;
(*salt)->m_step = SW_FALSE;
+ pthread_mutexattr_settype(&attrs, PTHREAD_MUTEX_RECURSIVE);
+ pthread_mutex_init(&(*salt)->m_mutex, &attrs);
signal(SIGPIPE, SIG_IGN);
exit:
@@ -180,6 +183,22 @@
return SW_OKAY;
}
+sw_result
+sw_salt_lock(
+ sw_salt self)
+{
+ sw_assert(self);
+ pthread_mutex_lock(&self->m_mutex);
+}
+
+sw_result
+sw_salt_unlock(
+ sw_salt self)
+{
+ sw_assert(self);
+ pthread_mutex_unlock(&self->m_mutex);
+}
+
sw_result
sw_salt_step(
diff -aur howl-1.0.0/src/lib/howl/MacOSX/macosx_salt.h
howl-1.0.0.patched/src/lib/howl/MacOSX/macosx_salt.h
--- howl-1.0.0/src/lib/howl/MacOSX/macosx_salt.h 2004-02-11
02:38:52.000000000 +0100
+++ howl-1.0.0.patched/src/lib/howl/MacOSX/macosx_salt.h 2005-06-11
20:13:21.000000000 +0200
@@ -33,7 +33,7 @@
#include "macosx_socket.h"
#include "macosx_time.h"
#include <sys/errno.h>
-
+#include <pthread.h>
#ifdef __cplusplus
extern "C"
@@ -46,6 +46,7 @@
CFRunLoopRef m_cf_run_loop;
struct _sw_macosx_socket m_sockets;
struct _sw_macosx_timer m_timers;
+ pthread_mutex_t m_mutex;
sw_bool m_step;
};
Index: libhowl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/libhowl.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libhowl.info 7 Sep 2005 17:39:59 -0000 1.4
+++ libhowl.info 7 Sep 2005 19:05:36 -0000 1.5
@@ -1,18 +1,19 @@
Package: libhowl
-Version: 0.9.8
-Revision: 12
+Version: 1.0.0
+Revision: 11
###
Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r), %N-dev (= %v-%r)
###
Source: http://www.porchdogsoft.com/download/howl-%v.tar.gz
-Source-MD5: 92a1c18bf9b6817ec47fc7565166eb03
+Source-MD5: c389d3ffba0e69a179de2ec650f1fdcc
SourceDirectory: howl-%v
+Patch: %n.patch
###
SetCPPFLAGS: -no-cpp-precomp
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
###
-DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
+DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
###
ConfigureParams: --with-pic --mandir=%i/share/man --infodir=%p/share/info
--libexecdir=%p/lib
###
@@ -20,11 +21,12 @@
Package: %N-shlibs
Provides: libhowl-shlibs
Files: <<
- lib/libhowl*.dylib
+ lib/libhowl.0*.dylib
<<
Shlibs: <<
- %p/lib/libhowl-0.9.8.0.dylib 1.0.0 %n (>= 0.9.8-11)
+ %p/lib/libhowl-0.dylib 1.0.0 %n (>= 1.0.0-11)
<<
+ DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
<<
SplitOff2: <<
Package: %N-bin
@@ -33,16 +35,19 @@
bin
share/man
<<
+ DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
<<
Splitoff3: <<
Package: %N-dev
Depends: pkgconfig, %N-shlibs
+ Replaces: %N (<< 1.0.0-11), %N-shlibs (<< 1.0.0-11)
BuildDependsOnly: true
Files: <<
include
- share/doc
+ lib
share/howl
<<
+ DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
<<
###
Description: Cross-platform implementation of Zeroconf
@@ -62,6 +67,24 @@
the most stable, best-quality cross-platform software for
Zeroconf/Rendezvous networking.
<<
+DescPort: <<
+ jfm added a patch (from darwinports) to ensure that esp.
+ _sw_salt_lock and _sw_salt_unlock are well defined, else eg the
+ build of gnome-vfs2 in exp/gnome2.8 goes wrong (same with current
+ version) in 1.0.0-11.
+
+ dmacks patched how configure defines PLATFORM_LIBS so we don't get a
+ .pc file that confuses pkg-config.
+<<
+DescPackaging: <<
+ dmacks moved the dev files from %N and %N-shlibs to %N-dev and added
+ DocFiles to all pkgs in the family in 1.0.0-11.
+<<
+DescUsage: <<
+ None of the components that have manpages are installed, so there
+ are no manpages at all. The API has docs in %p/share/doc/howl (part
+ of the %N-dev package).
+<<
###
License: GPL
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
