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

t compiles

Browse Source
This commit is contained in:
espie 2010-06-19 18:43:38 +00:00
parent a733b272d8
commit d4917e72d9
16 changed files with 1173 additions and 561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
x11/kde4/edu/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2008/09/11 19:51:27 martynas Exp $
# $OpenBSD: Makefile,v 1.10 2010/06/19 18:43:38 espie Exp $
COMMENT = K Desktop Environment, edu
DISTNAME = kdeedu-${VERSION}
PKGNAME = ${DISTNAME}p2
PKGNAME = ${DISTNAME}
SHARED_LIBS += compoundviewer 0.0 # .4.0
SHARED_LIBS += extdate 5.0 # .4.0
@ -17,22 +17,28 @@ SHARED_LIBS += sbigudrv 0.0 # .1.0
SHARED_LIBS += keduvocdocument 0.0 # .4.0
SHARED_LIBS += marblewidget 0.0 # .4.0
SHARED_LIBS += avogadro-kalzium 0.0 # .0.0
SHARED_LIBS += analitza 0.0 # .4.4
SHARED_LIBS += analitzagui 0.0 # .4.4
SHARED_LIBS += cantorlibs 0.0 # .0.0
# ocaml is not a real dependency, as it's only needed in relation to libfacile
BUILD_DEPENDS += ::math/eigen
LIB_DEPENDS += kdecore.>=8,kde3support,kdeui,khtml,kio,kjs,knotifyconfig,kparts,ktexteditor,kutils,kfile,knewstuff2,kpty,phonon,solid::x11/kde4/libs \
LIB_DEPENDS += kdecore.>=8,kde3support,kdeui,khtml,kio,kjs,knotifyconfig,kparts,ktexteditor,kutils,knewstuff2,knewstuff3,krosscore,krossui,kunitconversion,kpty,plasma::x11/kde4/libs \
cfitsio::math/cfitsio \
openbabel::misc/openbabel \
nova::astro/libnova
phonon::multimedia/phonon \
gps::misc/gpsd \
spectre::print/libspectre
WANTLIB += GL GLU ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xi Xinerama
WANTLIB += Xpm Xrandr Xrender Xtst c fontconfig freetype jpeg
WANTLIB += m png pthread stdc++ util z
WANTLIB += Qt3Support QtGui QtOpenGL QtSvg QtXml QtDBus QtNetwork QtDesigner
WANTLIB += bz2 gif pcre pcreposix
WANTLIB += Xfixes dbus-1 fam glib-2.0 gthread-2.0 iconv intl ncurses
WANTLIB += readline streamanalyzer streams
WANTLIB += GL GLU
WANTLIB += c
WANTLIB += m pthread stdc++ z
WANTLIB += Qt3Support QtGui QtOpenGL QtSvg QtXml QtDBus QtNetwork
WANTLIB += QtScript QtScriptTools QtWebKit
WANTLIB += ncurses
WANTLIB += readline
WANTLIB += xml2 xslt
# broken libgps

10
x11/kde4/edu/distinfo
View File

@ -1,5 +1,5 @@
MD5 (kde/kdeedu-4.0.1.tar.bz2) = aWHs3sadhsmCV6VvbjuM9A==
RMD160 (kde/kdeedu-4.0.1.tar.bz2) = 7yz8rWKAp0jdHm5clT+UCaOUzmM=
SHA1 (kde/kdeedu-4.0.1.tar.bz2) = 0ZK9RX7KwoGlmbCraGLiWKnVdOI=
SHA256 (kde/kdeedu-4.0.1.tar.bz2) = c9SKTJ0usiyd9SBlVm+Yqrfi4qGk2ybqV6A3jIbkGsg=
SIZE (kde/kdeedu-4.0.1.tar.bz2) = 42162898
MD5 (kde/kdeedu-4.4.4.tar.bz2) = 5RHWMoLy7p/0agu7fpW5ug==
RMD160 (kde/kdeedu-4.4.4.tar.bz2) = cZ9DA2sugWb48lPGNKjvUUcjCy8=
SHA1 (kde/kdeedu-4.4.4.tar.bz2) = kXpumYsuujHiQdII33xXrPHGhVA=
SHA256 (kde/kdeedu-4.4.4.tar.bz2) = 4G/re9jcZCF+V6icmeTPpxdNE6rdlypymUAW3YFXt2U=
SIZE (kde/kdeedu-4.4.4.tar.bz2) = 59804210

23
x11/kde4/edu/patches/patch-cmake_modules_FindNova_cmake
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-cmake_modules_FindNova_cmake,v 1.1 2008/02/09 13:18:16 espie Exp $
--- cmake/modules/FindNova.cmake.orig Mon Feb 4 15:27:06 2008
+++ cmake/modules/FindNova.cmake Mon Feb 4 15:27:20 2008
@@ -19,8 +19,8 @@ if (NOVA_INCLUDE_DIR AND NOVA_LIBRARIES AND NOVA_FUNCT
else (NOVA_INCLUDE_DIR AND NOVA_LIBRARIES)
- find_path(NOVA_INCLUDE_DIR libnova.h
- PATH_SUFFIXES libnova
+ find_path(NOVA_INCLUDE_DIR libnova/libnova.h
+ PATH_SUFFIXES
${_obIncDir}
${GNUWIN32_DIR}/include
)
@@ -33,7 +33,7 @@ else (NOVA_INCLUDE_DIR AND NOVA_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES ${NOVA_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${NOVA_LIBRARIES})
- check_cxx_source_compiles("#include <libnova.h>
+ check_cxx_source_compiles("#include <libnova/libnova.h>
int main() { ln_get_date_from_tm(NULL, NULL); return 0; }" NOVA_FUNCTION_COMPILE)
include(FindPackageHandleStandardArgs)

18
x11/kde4/edu/patches/patch-kalgebra_calgebra_main_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-kalgebra_calgebra_main_cpp,v 1.1 2010/06/19 18:43:38 espie Exp $
--- kalgebra/calgebra/main.cpp.orig Sat Jun 19 15:05:33 2010
+++ kalgebra/calgebra/main.cpp Sat Jun 19 15:06:13 2010
@@ -100,8 +100,13 @@ int main(int argc, char *argv[])
for(int i=0; i<history_get_history_state()->length; i++) {
HIST_ENTRY *he = remove_history(i);
-// free(he->line);
+#if defined(__OpenBSD__)
+ /* very old lib ! */
+ free(he->line);
+ free(he);
+#else
free_history_entry(he);
+#endif
}
qDebug("\nExit.");
return 0;

16
x11/kde4/edu/patches/patch-kalgebra_src_calgebra_main_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-kalgebra_src_calgebra_main_cpp,v 1.1 2008/01/22 19:59:28 espie Exp $
--- kalgebra/src/calgebra/main.cpp.orig Tue Jan 22 13:28:26 2008
+++ kalgebra/src/calgebra/main.cpp Tue Jan 22 19:13:32 2008
@@ -107,8 +107,11 @@ int main(int argc, char *argv[])
for(int i=0; i<history_get_history_state()->length; i++) {
HIST_ENTRY *he = remove_history(i);
-// free(he->line);
+ free(he->line);
+ free(he);
+#if 0
free_history_entry(he);
+#endif
}
return 0;
}

30
x11/kde4/edu/patches/patch-kalzium_libavogadro-kalzium_src_primitive_cpp
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-kalzium_libavogadro-kalzium_src_primitive_cpp,v 1.1 2008/02/09 13:18:16 espie Exp $
--- kalzium/libavogadro-kalzium/src/primitive.cpp.orig Mon Feb 4 14:40:55 2008
+++ kalzium/libavogadro-kalzium/src/primitive.cpp Mon Feb 4 14:42:27 2008
@@ -115,7 +115,7 @@ namespace Avogadro {
{
}
- Atom * Molecule::CreateAtom()
+ OpenBabel::OBAtom * Molecule::CreateAtom()
{
Atom *atom = new Atom(this);
connect(atom, SIGNAL(updated()), this, SLOT(updatePrimitive()));
@@ -123,7 +123,7 @@ namespace Avogadro {
return(atom);
}
- Bond * Molecule::CreateBond()
+ OpenBabel::OBBond * Molecule::CreateBond()
{
Bond *bond = new Bond(this);
connect(bond, SIGNAL(updated()), this, SLOT(updatePrimitive()));
@@ -131,7 +131,7 @@ namespace Avogadro {
return(bond);
}
- Residue * Molecule::CreateResidue()
+ OpenBabel::OBResidue * Molecule::CreateResidue()
{
Residue *residue = new Residue(this);
connect(residue, SIGNAL(updated()), this, SLOT(updatePrimitive()));

30
x11/kde4/edu/patches/patch-kalzium_libavogadro-kalzium_src_primitive_h
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-kalzium_libavogadro-kalzium_src_primitive_h,v 1.1 2008/02/09 13:18:16 espie Exp $
--- kalzium/libavogadro-kalzium/src/primitive.h.orig Mon Feb 4 14:32:23 2008
+++ kalzium/libavogadro-kalzium/src/primitive.h Mon Feb 4 14:42:18 2008
@@ -289,7 +289,7 @@ namespace Avogadro {
*
* @return pointer to a newly allocated Atom object
*/
- Atom *CreateAtom(void);
+ OpenBabel::OBAtom *CreateAtom(void);
/**
* Virtual function inherited from OpenBabel::OBMol.
@@ -297,15 +297,14 @@ namespace Avogadro {
*
* @return pointer to a newly allocated Bond object
*/
- Bond * CreateBond(void);
-
+ OpenBabel::OBBond * CreateBond(void);
/**
* Virtual function inherited from OpenBabel::OBMol.
* Creates a new Residue object.
*
* @return pointer to a newly allocated Residue object
*/
- Residue * CreateResidue(void);
+ OpenBabel::OBResidue * CreateResidue(void);
/**
* Virtual function inherited from OpenBabel::OBMol.

12
x11/kde4/edu/patches/patch-kmplot_kmplot_kmplot_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kmplot_kmplot_kmplot_cpp,v 1.2 2008/01/22 19:59:28 espie Exp $
--- kmplot/kmplot/kmplot.cpp.orig Sat Jan 5 00:56:47 2008
+++ kmplot/kmplot/kmplot.cpp Tue Jan 22 01:12:02 2008
@@ -284,7 +284,7 @@ void KmPlot::setDrawProgress( double progress )
void KmPlot::cancelDraw()
{
- QDBusInterface( QDBusConnection::sessionBus().baseService(), "/kmplot", "org.kde.kmplot.KmPlot" ).call( QDBus::NoBlock, "stopDrawing" );
+ QDBusReply<bool> reply = QDBusInterface( QDBusConnection::sessionBus().baseService(), "/kmplot", "org.kde.kmplot.KmPlot" ).call( QDBus::NoBlock, "stopDrawing" );
}

15
x11/kde4/edu/patches/patch-kmplot_kmplot_view_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-kmplot_kmplot_view_cpp,v 1.1 2010/06/19 18:43:38 espie Exp $
--- kmplot/kmplot/view.cpp.orig Sat Jun 19 19:29:25 2010
+++ kmplot/kmplot/view.cpp Sat Jun 19 19:29:49 2010
@@ -79,6 +79,11 @@ using namespace std;
//BEGIN nan & inf
+#if defined(__OpenBSD__)
+using std::isnan;
+using std::isinf;
+#endif
+
#if defined(__APPLE__) || defined(_MSC_VER)
// work around an OSX <cmath> bug; is there a proper way to fix this?
#ifndef isnan

12
x11/kde4/edu/patches/patch-kstars_kstars_htmesh_SkipListElement_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kstars_kstars_htmesh_SkipListElement_h,v 1.1 2008/01/22 19:59:28 espie Exp $
--- kstars/kstars/htmesh/SkipListElement.h.orig Tue Jan 22 11:58:07 2008
+++ kstars/kstars/htmesh/SkipListElement.h Tue Jan 22 12:00:31 2008
@@ -24,7 +24,7 @@
#ifdef _WIN32
#define KEY_MAX _I64_MAX
#else
-# if defined(__FreeBSD__) || defined(__NetBSD__)
+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
# define KEY_MAX LLONG_MAX
# else
# define KEY_MAX LONG_LONG_MAX

12
x11/kde4/edu/patches/patch-kstars_kstars_htmesh_SpatialGeneral_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kstars_kstars_htmesh_SpatialGeneral_h,v 1.1 2008/01/22 19:59:28 espie Exp $
--- kstars/kstars/htmesh/SpatialGeneral.h.orig Tue Jan 22 11:58:23 2008
+++ kstars/kstars/htmesh/SpatialGeneral.h Tue Jan 22 11:58:39 2008
@@ -80,7 +80,7 @@ typedef unsigned long long uint64;
// emulate the standard bool type where not supported by compiler
-# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux__) && !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+# if !defined(SXGENERAL_H) && !defined(__sgi) && !defined(__linux__) && !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
# ifdef __unix__
/*
* The following ifndef must ALWAYS be present since C++ may use

12
x11/kde4/edu/patches/patch-kstars_kstars_indi_drivers_telescope_lx200generic_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kstars_kstars_indi_drivers_telescope_lx200generic_cpp,v 1.1 2008/02/09 13:18:16 espie Exp $
--- kstars/kstars/indi/drivers/telescope/lx200generic.cpp.orig Mon Feb 4 15:46:18 2008
+++ kstars/kstars/indi/drivers/telescope/lx200generic.cpp Mon Feb 4 15:46:23 2008
@@ -35,7 +35,7 @@
#include <config.h>
#ifdef HAVE_NOVA_H
-#include <libnova.h>
+#include <libnova/libnova.h>
#endif
LX200Generic *telescope = NULL;

12
x11/kde4/edu/patches/patch-kstars_kstars_indi_drivers_telescope_temmadriver_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kstars_kstars_indi_drivers_telescope_temmadriver_c,v 1.1 2008/02/09 13:18:16 espie Exp $
--- kstars/kstars/indi/drivers/telescope/temmadriver.c.orig Mon Feb 4 15:46:18 2008
+++ kstars/kstars/indi/drivers/telescope/temmadriver.c Mon Feb 4 15:46:27 2008
@@ -33,7 +33,7 @@
#include <config.h>
-#include <libnova.h>
+#include <libnova/libnova.h>
#include "indicom.h"
#include "indidevapi.h"

12
x11/kde4/edu/patches/patch-kstars_kstars_indi_libs_indicom_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kstars_kstars_indi_libs_indicom_h,v 1.1 2008/02/09 13:18:16 espie Exp $
--- kstars/kstars/indi/libs/indicom.h.orig Mon Feb 4 15:38:12 2008
+++ kstars/kstars/indi/libs/indicom.h Mon Feb 4 15:38:19 2008
@@ -46,7 +46,7 @@
#include <config.h>
#ifdef HAVE_NOVA_H
-#include <libnova.h>
+#include <libnova/libnova.h>
#endif
#define J2000 2451545.0

12
x11/kde4/edu/patches/patch-libkdeedu_keduvocdocument_keduvocgrammar_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libkdeedu_keduvocdocument_keduvocgrammar_h,v 1.1 2008/01/22 19:59:28 espie Exp $
--- libkdeedu/keduvocdocument/keduvocgrammar.h.orig Tue Jan 22 11:51:27 2008
+++ libkdeedu/keduvocdocument/keduvocgrammar.h Tue Jan 22 11:51:40 2008
@@ -80,7 +80,7 @@ class KEDUVOCDOCUMENT_EXPORT KEduVocArticle (public)
* @param nat_def reference to a QString with the definite neutral article
* @param nat_indef reference to a QString with the indefinite neutral article
*/
- KDE_DEPRECATED KEduVocArticle( const QString &fem_def, const QString &fem_indef, const QString &mal_def, const QString &mal_indef, const QString &nat_def, const QString &nat_indef );
+ KEduVocArticle( const QString &fem_def, const QString &fem_indef, const QString &mal_def, const QString &mal_indef, const QString &nat_def, const QString &nat_indef );
/**
* default destructor, deletes the d pointer

1480
x11/kde4/edu/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff