Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16492
Modified Files:
libplist.info
Added Files:
libplist.patch
Log Message:
libplist: fix the install-name issue and some minor polish.
Index: libplist.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libplist.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libplist.info 12 Jan 2011 23:00:03 -0000 1.4
+++ libplist.info 13 Jan 2011 22:05:08 -0000 1.5
@@ -1,18 +1,19 @@
Package: libplist
Version: 1.3
-Revision: 1
+Revision: 2
Description: Library for handling apple .plist files
License: GPL/LGPL
# Dependencies:
BuildDependsOnly: true
BuildDepends: <<
+ fink (>= 0.24.12),
cmake,
pkgconfig (>= 0.9.0-1),
glib2-dev (>= 2.20.5-1),
- libxml2 (>= 2.6.32-1),
- swig,
- python25 | python26 | python27 | python31
+ libxml2 (>= 2.6.32-1),
+ swig,
+ python25 | python26 | python27 | python31
<<
Depends: %N-shlibs (= %v-%r)
@@ -20,70 +21,58 @@
Source: http://github.com/downloads/JonathanBeck/%n/%n-%v.tar.bz2
Source-MD5: 0f48f4da8ddba5d7e186307622bf2c62
+PatchFile: libplist.patch
+PatchFile-MD5: ca57c2e09f87f7786187e39dff8ca72a
+
# Compile Phase:
CompileScript: <<
#!/bin/sh -ev
mkdir build
cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=%p
+ cmake .. -DCMAKE_INSTALL_PREFIX=%p -DLIB_DESTINATION=%p/lib
make
<<
# Install Phase:
-DocFiles: AUTHORS COPYING* README
InstallScript: <<
#!/bin/sh -ev
cd build
- make install DESTDIR=%i/..
- install_name_tool -id %p/lib/libplist.dylib %i/lib/libplist.1.1.3.dylib
- install_name_tool -id %p/lib/libplist++.dylib %i/lib/libplist++.1.1.3.dylib
+ make install DESTDIR=%d
<<
+DocFiles: AUTHORS COPYING* README
SplitOff: <<
- Package: %N-shlibs
- Depends: glib2-shlibs (>= 2.20.5-1), libxml2-shlibs (>= 2.6.32-1)
-
- Files: <<
- lib/libplist.1.1.3.dylib
- lib/libplist.1.dylib
- lib/libplist.dylib
- lib/libplist++.1.1.3.dylib
- lib/libplist++.1.dylib
- lib/libplist++.dylib
- <<
- Shlibs: <<
- %p/lib/libplist.dylib 1.0.0 %n (>= 1.3-1)
- %p/lib/libplist++.dylib 1.0.0 %n (>= 1.3-1)
- <<
+ Package: %N-shlibs
+ Depends: glib2-shlibs (>= 2.20.5-1), libxml2-shlibs (>= 2.6.32-1)
+ Files: <<
+ lib/libplist.1.1.3.dylib
+ lib/libplist.1.dylib
+ lib/libplist++.1.1.3.dylib
+ lib/libplist++.1.dylib
+ <<
+ Shlibs: <<
+ %p/lib/libplist.1.dylib 1.0.0 %n (>= 1.3-1)
+ %p/lib/libplist++.1.dylib 1.0.0 %n (>= 1.3-1)
+ <<
+ DocFiles: AUTHORS COPYING* README
<<
Splitoff2: <<
Package: %N-bin
Depends: %N-shlibs (= %v-%r)
Files: bin
+ DocFiles: AUTHORS COPYING* README
<<
# Additional Info
DescDetail: <<
-libplist is a library which eases dealing with Apple's property list files.
+libplist eases dealing with Apple's property list files.
<<
-DescPort: <<
-The file should be modified so that setting the install_name is not necessary
-any longer.
-suggestion from a fink guru:
-# Set up RPATH handling, so the libs are found if they are installed to a
non-standard location.
-# By default cmake builds the targets with full RPATH to everything in the
build directory,
-# but then removes the RPATH when installing.
-# These two options below make it set the RPATH of the installed targets to all
-# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
-# install directory.
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION} )
-
-if(APPLE)
- set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
-endif(APPLE)
+DescPort: <<
+CMakeLists.txt is patched and cmake is called with -DLIB_DESTINATION=%p/lib,
+which fixes the truncated path of the install_name of the dylibs, where
+"%p/lib/" was missing.
<<
Homepage: http://www.libimobiledevice.org/
--- NEW FILE: libplist.patch ---
--- libplist-1.3/CMakeLists.orig.txt 2011-01-13 22:02:54.000000000 +0100
+++ libplist-1.3/CMakeLists.txt 2011-01-13 21:57:30.000000000 +0100
@@ -15,6 +15,19 @@
SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+# Set up RPATH handling, so the libs are found if they are installed to a
non-standard location.
+# By default cmake builds the targets with full RPATH to everything in the
build directory,
+# but then removes the RPATH when installing.
+# These two options below make it set the RPATH of the installed targets to all
+# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+# install directory.
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION} )
+
+if(APPLE)
+ set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
+endif(APPLE)
+
FIND_PACKAGE( LibXml2 REQUIRED )
FIND_PACKAGE( GLIB2 REQUIRED )
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
