Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5897/main/finkinfo/kde
Modified Files:
kdeutils4-mac.info kdeutils4-x11.info kdeutils4.patch
kdewebdev4-mac.info kdewebdev4-x11.info
Log Message:
dep updates and fix build with libarchive/libzip1
Index: kdeutils4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdeutils4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdeutils4.patch 3 Apr 2009 21:33:18 -0000 1.1
+++ kdeutils4.patch 6 Apr 2009 14:34:07 -0000 1.2
@@ -1,6 +1,6 @@
diff -Nurd kdeutils-4.2.2/CMakeLists.txt kdeutils-4.2.2-new/CMakeLists.txt
--- kdeutils-4.2.2/CMakeLists.txt 2008-12-21 15:18:58.000000000 -0500
-+++ kdeutils-4.2.2-new/CMakeLists.txt 2009-03-30 15:53:50.000000000 -0400
++++ kdeutils-4.2.2-new/CMakeLists.txt 2009-04-06 10:17:35.000000000 -0400
@@ -22,10 +22,8 @@
add_subdirectory( cmake )
@@ -32,3 +32,22 @@
# --- show log ---
macro_display_feature_log()
+diff -Nurd kdeutils-4.2.2/ark/plugins/libzipplugin/CMakeLists.txt
kdeutils-4.2.2-new/ark/plugins/libzipplugin/CMakeLists.txt
+--- kdeutils-4.2.2/ark/plugins/libzipplugin/CMakeLists.txt 2008-10-22
19:03:27.000000000 -0400
++++ kdeutils-4.2.2-new/ark/plugins/libzipplugin/CMakeLists.txt 2009-04-06
10:18:22.000000000 -0400
+@@ -4,11 +4,12 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/../..
+ )
+
+-if(WIN32)
++# this should be fixed to detect it :P
++if(WIN32 OR APPLE)
+ set (LIBZIP_COMPILED_WITH_32BIT_OFF_T OFF CACHE BOOL "Whether the system
libzip library is compiled with 32bits off_t" )
+-else(WIN32)
++else(WIN32 OR APPLE)
+ set (LIBZIP_COMPILED_WITH_32BIT_OFF_T ON CACHE BOOL "Whether the system
libzip library is compiled with 32bits off_t" )
+-endif(WIN32)
++endif(WIN32 OR APPLE)
+
+ if (LIBZIP_COMPILED_WITH_32BIT_OFF_T)
+
Index: kdeutils4-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdeutils4-mac.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdeutils4-mac.info 3 Apr 2009 21:33:18 -0000 1.1
+++ kdeutils4-mac.info 6 Apr 2009 14:34:07 -0000 1.2
@@ -1,7 +1,7 @@
Info4: <<
Package: kdeutils4-mac
Version: 4.2.2
-Revision: 1
+Revision: 2
Description: KDE4 - Utilities
Type: kde (mac)
License: GPL/LGPL
@@ -31,7 +31,9 @@
kde4-buildenv (>= 4.2.2-3),
kdebase4-%type_pkg[kde]-dev (>= 4.2.2-1),
kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
+ libarchive,
libgettext3-dev,
+ libzip1,
pkgconfig (>= 0.22-3),
qt4-%type_pkg[kde] (>= 4.5.0-4),
soprano-%type_pkg[kde]-dev (>= 2.2.3-2),
@@ -44,7 +46,7 @@
Source: mirror:kde:stable/%v/src/kdeutils-%v.tar.bz2
Source-MD5: 3df5186f9dacddbce48a1c7eb35515cd
PatchFile: kdeutils4.patch
-PatchFile-MD5: a1aca581411ac016bf1da41381b9ef89
+PatchFile-MD5: 6f12a4c78db1c3b32e0b577f2fe1e6a5
CompileScript: <<
#!/bin/sh -ev
@@ -80,7 +82,11 @@
SplitOff: <<
Package: ark4-%type_pkg[kde]
Description: KDE4 - archive utility
- Depends: %N-base (>= %v-%r)
+ Depends: <<
+ %N-base (>= %v-%r),
+ libarchive-shlibs,
+ libzip1-shlibs
+ <<
Files: <<
lib/%type_pkg[kde]/bin/ark*
lib/%type_pkg[kde]/lib/kde4/kerfuffle*
Index: kdewebdev4-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdewebdev4-x11.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdewebdev4-x11.info 3 Apr 2009 21:33:18 -0000 1.1
+++ kdewebdev4-x11.info 6 Apr 2009 14:34:07 -0000 1.2
@@ -37,7 +37,7 @@
(%type_pkg[kde] = x11) x11-dev,
system-openssl-dev
<<
-BuildConflicts: libtidy-dev (>= 2:0.99)
+BuildConflicts: libtidy-dev
GCC: 4.0
Source: mirror:kde:stable/%v/src/kdewebdev-%v.tar.bz2
Index: kdeutils4-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdeutils4-x11.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdeutils4-x11.info 3 Apr 2009 21:33:18 -0000 1.1
+++ kdeutils4-x11.info 6 Apr 2009 14:34:07 -0000 1.2
@@ -1,7 +1,7 @@
Info4: <<
Package: kdeutils4-x11
Version: 4.2.2
-Revision: 1
+Revision: 2
Description: KDE4 - Utilities
Type: kde (x11)
License: GPL/LGPL
@@ -33,7 +33,9 @@
kde4-buildenv (>= 4.2.2-3),
kdebase4-%type_pkg[kde]-dev (>= 4.2.2-1),
kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
+ libarchive,
libgettext3-dev,
+ libzip1,
pkgconfig (>= 0.22-3),
qt4-%type_pkg[kde] (>= 4.5.0-4),
soprano-%type_pkg[kde]-dev (>= 2.2.3-2),
@@ -46,7 +48,7 @@
Source: mirror:kde:stable/%v/src/kdeutils-%v.tar.bz2
Source-MD5: 3df5186f9dacddbce48a1c7eb35515cd
PatchFile: kdeutils4.patch
-PatchFile-MD5: a1aca581411ac016bf1da41381b9ef89
+PatchFile-MD5: 6f12a4c78db1c3b32e0b577f2fe1e6a5
CompileScript: <<
#!/bin/sh -ev
@@ -82,7 +84,11 @@
SplitOff: <<
Package: ark4-%type_pkg[kde]
Description: KDE4 - archive utility
- Depends: %N-base (>= %v-%r)
+ Depends: <<
+ %N-base (>= %v-%r),
+ libarchive-shlibs,
+ libzip1-shlibs
+ <<
Files: <<
lib/%type_pkg[kde]/bin/ark*
lib/%type_pkg[kde]/lib/kde4/kerfuffle*
Index: kdewebdev4-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdewebdev4-mac.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdewebdev4-mac.info 3 Apr 2009 21:33:18 -0000 1.1
+++ kdewebdev4-mac.info 6 Apr 2009 14:34:07 -0000 1.2
@@ -37,7 +37,7 @@
(%type_pkg[kde] = x11) x11-dev,
system-openssl-dev
<<
-BuildConflicts: libtidy-dev (>= 2:0.99)
+BuildConflicts: libtidy-dev
GCC: 4.0
Source: mirror:kde:stable/%v/src/kdewebdev-%v.tar.bz2
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
