cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.5.0 release candidate 1

Browse Source
This commit is contained in:
espie 2006-04-02 09:44:31 +00:00
parent 691dc1f26a
commit 789c256a78
8 changed files with 1319 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
x11/kde/office3/Makefile
View File

@ -1,14 +1,41 @@
# $OpenBSD: Makefile,v 1.29 2006/02/14 23:35:15 espie Exp $
# $OpenBSD: Makefile,v 1.30 2006/04/02 09:44:31 espie Exp $
COMMENT= "office suite for KDE"
CATEGORIES= x11 x11/kde productivity
VMEM_WARNING= Yes
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/koffice-1.4.2/src/@}
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@unstable/koffice-1.5-rc1/src/@}
DISTNAME= koffice-1.4.2
PKGNAME= ${DISTNAME}p2
SHARED_LIBS= karbonbase 3.0 \
DISTNAME= koffice-1.5.0-rc1
PKGNAME= koffice-1.5.0rc1
#SHARED_LIBS= karbonbase 3.0 \
# kexipropertyeditor 1.0 \
# koscript 3.0 \
SHARED_LIBS= kchartimageexport 4.0 \
kexiutils 1.0 \
kopalette 1.0 \
koproperty 0.0 \
kpresenterimageexport 4.0 \
kpresenterprivate 4.0 \
krita_cmyk_u16 0.0 \
krita_gray_u16 0.0 \
krita_lms_f32 0.0 \
krita_rgb_f16half 0.0 \
krita_rgb_f32 0.0 \
krita_rgb_u16 0.0 \
kritacolor 1.0 \
kritagrayscale 0.0 \
kritaimage 1.0 \
kritargb 0.0 \
kritascripting 0.0 \
kritaui 1.0 \
krossapi 1.0 \
krossmain 1.0 \
kwordprivate 4.0
# need to check version of these
SHARED_LIBS+= \
karboncommon 1.0 \
kchartcommon 3.0 \
kdchart 1.0 \
@ -21,7 +48,6 @@ SHARED_LIBS= karbonbase 3.0 \
kexiguiutils 1.0 \
keximain 1.0 \
keximigrate 1.0 \
kexipropertyeditor 1.0 \
kexirelationsview 1.0 \
kexisql2 3.0 \
kexisql3 4.0 \
@ -32,7 +58,6 @@ SHARED_LIBS= karbonbase 3.0 \
kofficecore 3.0 \
kofficeui 3.0 \
kopainter 2.0 \
koscript 3.0 \
kotext 3.0 \
kowmf 2.0 \
kritacommon 2.0 \
@ -47,18 +72,20 @@ FLAVORS=debug
FAKE_FLAGS= ${MAKE_FLAGS} TAR=tar DESTDIR=${WRKINST}
SEPARATE_BUILD= flavored
BUILD_DEPENDS+= ::devel/pkgconfig
MODKDE_VERSION= 3.4
MODKDE_VERSION= 3.5.2
AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure
AUTOCONF_VERSION=2.59
LIB_DEPENDS= kdecore.4,DCOP,artskde,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kparts,kspell,kabc,kjs,kresources,ktexteditor,kutils,kwalletclient,vcard,kspell2,knewstuff,kmdi::x11/kde/libs3 \
python2.3.0.0:python-2.3.*:lang/python/2.3 \
python2.4.0.0:python-2.4.*:lang/python/2.4 \
art_lgpl_2.5::graphics/libart \
wv2::converters/wv2 \
Magick::graphics/ImageMagick \
jbig::graphics/jbigkit \
mysqlclient::databases/mysql
mysqlclient::databases/mysql \
ruby::lang/ruby
WANTLIB= ICE SM X11 Xext Xrender artsflow artsflow_idl audiofile bz2 c \
@ -66,7 +93,9 @@ WANTLIB= ICE SM X11 Xext Xrender artsflow artsflow_idl audiofile bz2 c \
gsf-1 gthread-2.0.0.0 iconv intl jasper jpeg kmedia2_idl lcms \
m mad mcop ogg ossaudio pcre pcreposix png pthread qtmcop \
soundserver_idl stdc++ tiff util vorbis vorbisenc vorbisfile \
xml2 xslt z Xt termcap Xi fontconfig crypto readline ssl
xml2 xslt z Xt termcap Xi fontconfig crypto readline ssl \
IlmImf Half Imath GLU GL Iex
CONFIGURE_ARGS+= --with-pgsqlincdir=${LOCALBASE}/include/postgresql
LIB_DEPENDS+= pqxx::databases/libpqxx \

8
x11/kde/office3/distinfo
View File

@ -1,4 +1,4 @@
MD5 (kde/koffice-1.4.2.tar.bz2) = 6b456fb7d54c84b11396b27a96ae0cf8
RMD160 (kde/koffice-1.4.2.tar.bz2) = 117d5c50aa81d669002005f39fc03bc3f999b62c
SHA1 (kde/koffice-1.4.2.tar.bz2) = 474ab6d289ff1330c200768b30a3dbe271cd26c5
SIZE (kde/koffice-1.4.2.tar.bz2) = 19486852
MD5 (kde/koffice-1.5.0-rc1.tar.bz2) = e9346977d18c67185d5b50f49ee8225b
RMD160 (kde/koffice-1.5.0-rc1.tar.bz2) = 6553df43f5a8b8261943a06d9bd9801b1d02f66c
SHA1 (kde/koffice-1.5.0-rc1.tar.bz2) = 1891e50207bd8cdb4e2e63873450f11ffbe4bcf6
SIZE (kde/koffice-1.5.0-rc1.tar.bz2) = 35965316

67
x11/kde/office3/patches/patch-configure_in
View File

@ -1,29 +1,29 @@
$OpenBSD: patch-configure_in,v 1.4 2006/01/17 15:08:08 naddy Exp $
--- configure.in.orig Tue Jul 19 21:55:34 2005
+++ configure.in Tue Sep 20 23:07:48 2005
@@ -845,8 +845,8 @@ dnl ====================================
$OpenBSD: patch-configure_in,v 1.5 2006/04/02 09:44:31 espie Exp $
--- configure.in.orig Thu Mar 23 21:13:59 2006
+++ configure.in Sat Apr 1 15:12:43 2006
@@ -935,8 +935,8 @@ dnl *** Check that the paths given to co
AC_MSG_CHECKING([for PostgreSQL C API libraries])
pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
- AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
- if test -r $pgsql_libdir/libpq.so; then
+ AC_FIND_FILE(libpq.a, $pgsql_libdirs, pgsql_libdir)
+ if test -r $pgsql_libdir/libpq.a; then
PG_LIBDIR=$pgsql_libdir
AC_MSG_RESULT([$PG_LIBDIR])
AC_SUBST(PG_LIBDIR)
@@ -1015,8 +1015,8 @@ dnl ====================================
if test "$compile_pgsql_plugin" = "yes"; then
AC_MSG_CHECKING([for PostgreSQL... Step 2 of 4])
pgsql_libdirs="$ac_pgsql_libdir /usr/lib /usr/local/lib /usr/local/pgsql/lib /opt/postgres/lib"
- AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir)
- if test ! -r $pgsql_libdir/libpq.so; then
+ AC_FIND_FILE(libpq.a, $pgsql_libdirs, pgsql_libdir)
+ if test ! -r $pgsql_libdir/libpq.a; then
compile_pgsql_plugin="no"
AC_MSG_RESULT([not found])
else
@@ -880,8 +880,8 @@ dnl ====================================
if test "$compile_pgsql_plugin" = "yes"; then
AC_MSG_CHECKING([for PostgreSQL... Step 4 of 4])
pqxx_libdirs="$ac_pqxx_libdir /usr/lib /usr/local/lib /usr/local/pqxx/lib"
AC_MSG_CHECKING([for PostgreSQL C++ libraries])
pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
- AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir)
- if test ! -r $pqxx_libdir/libpqxx.so; then
+ AC_FIND_FILE(libpqxx.so.1.0, $pqxx_libdirs, pqxx_libdir)
+ if test ! -r $pqxx_libdir/libpqxx.so.1.0; then
compile_pgsql_plugin="no"
AC_MSG_RESULT([not found])
else
@@ -918,7 +918,7 @@ AC_CACHE_VAL(ac_cv_have_knewstuff,
- if test -r $pqxx_libdir/libpqxx.so; then
+ AC_FIND_FILE(libpqxx.a, $pqxx_libdirs, pqxx_libdir)
+ if test -r $pqxx_libdir/libpqxx.a; then
PQXX_LIBDIR=$pqxx_libdir
AC_MSG_RESULT([$PQXX_LIBDIR])
AC_SUBST(PQXX_LIBDIR)
@@ -1053,7 +1053,7 @@ AC_CACHE_VAL(ac_cv_have_knewstuff,
AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)
ac_knewstuff_includes="$knewstuff_incdir"
@ -32,7 +32,24 @@ $OpenBSD: patch-configure_in,v 1.4 2006/01/17 15:08:08 naddy Exp $
ac_knewstuff_libraries="$knewstuff_libdir"
if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
@@ -1245,7 +1245,7 @@ dnl FILE: ./lib/kotext/configure.in.in
@@ -1220,6 +1220,8 @@ AC_SUBST(LCMS_LIBS)
# Check if the 1.14 version of lcms is detected
if test ! "$LCMS_LIBS" = ""
then
+kde_safe_cppflags=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $all_includes"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(
@@ -1228,6 +1230,7 @@ AC_TRY_COMPILE(
#error lcms 1.14 detected
#endif ] , [ ], lcms_version_114='no', lcms_version_114='yes' )
AC_LANG_RESTORE
+CPPFLAGS=$kde_safe_cppflags
fi
# IM 6.1.3 changed the number of arguments to GetMagickInfoList
@@ -1412,7 +1415,7 @@ dnl FILE: ./lib/kotext/configure.in.in
dnl =======================================================
AC_LANG_SAVE

12
x11/kde/office3/patches/patch-karbon_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-karbon_Makefile_in,v 1.1 2006/02/14 23:35:15 espie Exp $
--- karbon/Makefile.in.orig Tue Feb 14 19:33:00 2006
+++ karbon/Makefile.in Tue Feb 14 19:33:53 2006
@@ -352,7 +352,7 @@ SUBDIRS = commands visitors core shapes
# -> I think the whole 'base' stuff can be removed (DF)
#>- lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la
#>+ 1
-lib_LTLIBRARIES = libkarboncommon.la libkarbonbase.la libkdeinit_karbon.la
+lib_LTLIBRARIES = libkarbonbase.la libkarboncommon.la libkdeinit_karbon.la
kde_module_LTLIBRARIES = libkarbonpart.la
#>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp

17
x11/kde/office3/patches/patch-karbon_core_vtext_cc Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-karbon_core_vtext_cc,v 1.1 2006/04/02 09:44:31 espie Exp $
--- karbon/core/vtext.cc.orig Sat Apr 1 14:49:46 2006
+++ karbon/core/vtext.cc Sat Apr 1 14:49:54 2006
@@ -732,6 +732,8 @@ VText::buildRequest( QString family, int
return fileName;
}
+#endif // HAVE_KARBONTEXT
+
void VText::setOffset( double offset )
{
if( offset < 0.0 )
@@ -742,4 +744,3 @@ void VText::setOffset( double offset )
m_offset = offset;
}
-#endif // HAVE_KARBONTEXT

14
x11/kde/office3/patches/patch-karbon_dockers_vdocumentdocker_cc
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-karbon_dockers_vdocumentdocker_cc,v 1.2 2005/10/17 15:15:40 espie Exp $
--- karbon/dockers/vdocumentdocker.cc.orig Wed Sep 21 14:27:52 2005
+++ karbon/dockers/vdocumentdocker.cc Fri Sep 23 01:29:44 2005
@@ -1147,8 +1147,8 @@ void
VHistoryItem::init()
{
kdDebug(38000) << "In VHistoryItem::init() : " << m_command->name() << endl;
- char buffer[64];
- sprintf( buffer, "%064ld", ++g_lastKey );
+ char buffer[70];
+ snprintf( buffer, 70, "%064ld", ++g_lastKey );
m_key = buffer;
setPixmap( 0, QPixmap( KGlobal::iconLoader()->iconPath( m_command->icon(), KIcon::Small ) ) );
setText( 0, m_command->name() );

10
x11/kde/office3/patches/patch-kspread_plugins_calculator_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.4 2005/10/17 15:15:40 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Wed Sep 21 17:28:31 2005
+++ kspread/plugins/calculator/Makefile.in Fri Sep 23 01:30:21 2005
@@ -468,7 +468,7 @@ clean-kde_moduleLTLIBRARIES:
$OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.5 2006/04/02 09:44:31 espie Exp $
--- kspread/plugins/calculator/Makefile.in.orig Fri Mar 3 22:13:23 2006
+++ kspread/plugins/calculator/Makefile.in Sun Mar 5 23:57:33 2006
@@ -670,7 +670,7 @@ clean-kde_moduleLTLIBRARIES:
#>+ 2
@KDE_USE_CLOSURE_TRUE@libkspreadcalc.la: libkspreadcalc.la.closure $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@libkspreadcalc.la: $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_DEPENDENCIES)
@ -9,4 +9,4 @@ $OpenBSD: patch-kspread_plugins_calculator_Makefile_in,v 1.4 2005/10/17 15:15:40
+ $(CXXLINK) -Wl,-rpath,$(kde_moduledir) -rpath $(kde_moduledir) $(libkspreadcalc_la_LDFLAGS) $(libkspreadcalc_la_OBJECTS) $(libkspreadcalc_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
-rm -f *.$(OBJEXT)

1462
x11/kde/office3/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff