Author: ranger
Date: Thu Mar 12 14:44:23 2009
New Revision: 1409
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1409&repname=user%3a+ranger>
Log:
fix koffice generation
Modified:
trunk/experimental/10.4/crypto/finkinfo/koffice2.info
trunk/experimental/10.4/crypto/finkinfo/koffice2.patch
trunk/experimental/generate-infofiles.pl
Modified: trunk/experimental/10.4/crypto/finkinfo/koffice2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/koffice2.info&rev=1409&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/koffice2.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/koffice2.info Thu Mar 12 14:44:23
2009
@@ -40,6 +40,7 @@
pkgconfig (>= 0.22-3),
poppler2,
poppler2-qt4-%type_pkg[kde],
+ qca2-%type_pkg[kde],
qt4-%type_pkg[kde] (>= 4.5.0-1),
soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
strigi-dev (>= 0.6.3-1),
@@ -51,7 +52,7 @@
Source: mirror:kde:unstable/koffice-%v/src/koffice-%v.tar.bz2
Source-MD5: 1b44eb284f35d148ea6aacb0f2408277
PatchFile: koffice2.patch
-PatchFile-MD5: 48a61ecc1eb85de9cd0715138842d164
+PatchFile-MD5: ec4c1039cc6c1061af8925e885fa3a69
CompileScript: <<
#!/bin/sh -ev
@@ -590,7 +591,7 @@
lcms-shlibs,
libxml2-shlibs (>= 2.6.1-1),
libxslt-shlibs (>= 1.1.0-1),
- qca2-mac-shlibs
+ qca2-%type_pkg[kde]-shlibs
<<
Files: <<
lib/%type_pkg[kde]/lib/kde4
Modified: trunk/experimental/10.4/crypto/finkinfo/koffice2.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/koffice2.patch&rev=1409&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/koffice2.patch (original)
+++ trunk/experimental/10.4/crypto/finkinfo/koffice2.patch Thu Mar 12 14:44:23
2009
@@ -1,6 +1,6 @@
diff -Nurd koffice-1.9.98.7/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h
koffice-1.9.98.7-new/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h
--- koffice-1.9.98.7/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h
2009-02-25 16:50:21.000000000 -0500
-+++ koffice-1.9.98.7-new/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h
2009-03-07 10:09:07.000000000 -0500
++++ koffice-1.9.98.7-new/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h
2009-03-12 00:00:53.000000000 -0400
@@ -43,7 +43,7 @@
#ifndef KDAB_LIB_FAKES_H
#define KDAB_LIB_FAKES_H
@@ -19,3 +19,12 @@
#define ISNAN(x) std::isnan(x)
#define ISINF(x) std::isinf(x)
#else
+diff -Nurd koffice-1.9.98.7/libs/flake/CMakeLists.txt
koffice-1.9.98.7-new/libs/flake/CMakeLists.txt
+--- koffice-1.9.98.7/libs/flake/CMakeLists.txt 2009-02-25 17:25:53.000000000
-0500
++++ koffice-1.9.98.7-new/libs/flake/CMakeLists.txt 2009-03-12
00:03:00.000000000 -0400
+@@ -1,4 +1,4 @@
+-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${KOMAIN_INCLUDES}
${PIGMENT_INCLUDES})
++include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${KOMAIN_INCLUDES}
${PIGMENT_INCLUDES} ${OPENGL_INCLUDE_DIR})
+
+ if(KDE4_BUILD_TESTS)
+ # only with this definition will the FLAKE_TEST_EXPORT macro do something
Modified: trunk/experimental/generate-infofiles.pl
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1409&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/generate-infofiles.pl (original)
+++ trunk/experimental/generate-infofiles.pl Thu Mar 12 14:44:23 2009
@@ -61,6 +61,7 @@
'icecream',
'kde',
'kgpg',
+ 'koffice',
'libcapsi',
'libmal',
'libmath',
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
