diff --git a/common/shlibs b/common/shlibs index 70596feb769..fda9284996c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2654,69 +2654,6 @@ libspnav.so.0 libspnav-0.2.3_1 libsimage.so.20 simage-1.7.0_1 libCoin.so.80 coin3-4.0.0_1 libgl2ps.so.1 gl2ps-1.3.9_1 -libFWOSPlugin.so.11 oce-0.18_1 -libPTKernel.so.11 oce-0.18_1 -libTKBO.so.11 oce-0.18_1 -libTKBRep.so.11 oce-0.18_1 -libTKBin.so.11 oce-0.18_1 -libTKBinL.so.11 oce-0.18_1 -libTKBinTObj.so.11 oce-0.18_1 -libTKBinXCAF.so.11 oce-0.18_1 -libTKBool.so.11 oce-0.18_1 -libTKCAF.so.11 oce-0.18_1 -libTKCDF.so.11 oce-0.18_1 -libTKDCAF.so.11 oce-0.18_1 -libTKDraw.so.11 oce-0.18_1 -libTKFeat.so.11 oce-0.18_1 -libTKFillet.so.11 oce-0.18_1 -libTKG2d.so.11 oce-0.18_1 -libTKG3d.so.11 oce-0.18_1 -libTKGeomAlgo.so.11 oce-0.18_1 -libTKGeomBase.so.11 oce-0.18_1 -libTKHLR.so.11 oce-0.18_1 -libTKIGES.so.11 oce-0.18_1 -libTKLCAF.so.11 oce-0.18_1 -libTKMath.so.11 oce-0.18_1 -libTKMesh.so.11 oce-0.18_1 -libTKMeshVS.so.11 oce-0.18_1 -libTKNIS.so.11 oce-0.18_1 -libTKOffset.so.11 oce-0.18_1 -libTKOpenGl.so.11 oce-0.18_1 -libTKPCAF.so.11 oce-0.18_1 -libTKPLCAF.so.11 oce-0.18_1 -libTKPShape.so.11 oce-0.18_1 -libTKPrim.so.11 oce-0.18_1 -libTKSTEP.so.11 oce-0.18_1 -libTKSTEP209.so.11 oce-0.18_1 -libTKSTEPAttr.so.11 oce-0.18_1 -libTKSTEPBase.so.11 oce-0.18_1 -libTKSTL.so.11 oce-0.18_1 -libTKService.so.11 oce-0.18_1 -libTKShHealing.so.11 oce-0.18_1 -libTKShapeSchema.so.11 oce-0.18_1 -libTKStdLSchema.so.11 oce-0.18_1 -libTKStdSchema.so.11 oce-0.18_1 -libTKTObj.so.11 oce-0.18_1 -libTKTObjDRAW.so.11 oce-0.18_1 -libTKTopAlgo.so.11 oce-0.18_1 -libTKTopTest.so.11 oce-0.18_1 -libTKV3d.so.11 oce-0.18_1 -libTKVRML.so.11 oce-0.18_1 -libTKViewerTest.so.11 oce-0.18_1 -libTKVoxel.so.11 oce-0.18_1 -libTKXCAF.so.11 oce-0.18_1 -libTKXCAFSchema.so.11 oce-0.18_1 -libTKXDEDRAW.so.11 oce-0.18_1 -libTKXDEIGES.so.11 oce-0.18_1 -libTKXDESTEP.so.11 oce-0.18_1 -libTKXMesh.so.11 oce-0.18_1 -libTKXSBase.so.11 oce-0.18_1 -libTKXSDRAW.so.11 oce-0.18_1 -libTKXml.so.11 oce-0.18_1 -libTKXmlL.so.11 oce-0.18_1 -libTKXmlTObj.so.11 oce-0.18_1 -libTKXmlXCAF.so.11 oce-0.18_1 -libTKernel.so.11 oce-0.18_1 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1 librpmatch.so.0 musl-rpmatch-1.0_1 libmilter.so.1.0.2 libmilter-1.0.2_1 diff --git a/srcpkgs/oce-devel b/srcpkgs/oce-devel deleted file mode 120000 index cf92f4baef1..00000000000 --- a/srcpkgs/oce-devel +++ /dev/null @@ -1 +0,0 @@ -oce \ No newline at end of file diff --git a/srcpkgs/oce/patches/musl-fenv.patch b/srcpkgs/oce/patches/musl-fenv.patch deleted file mode 100644 index 217e3b12b50..00000000000 --- a/srcpkgs/oce/patches/musl-fenv.patch +++ /dev/null @@ -1,36 +0,0 @@ -Following srcpkgs/flightgear/patches/musl-fenv.patch: -""" -Simply disabling the code which enables floating point exceptions -is probably wrong, but I don't have a replacement for the -non-posix functions fegetexcept(3) and feenableexcept(3). -""" - ---- src/OSD/OSD_signal.cxx.orig 2016-01-02 06:11:52.000000000 +0100 -+++ src/OSD/OSD_signal.cxx 2016-06-03 13:12:26.271621527 +0200 -@@ -216,7 +216,7 @@ - // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ; - if ( ADR_ACT_SIGIO_HANDLER != NULL ) - (*ADR_ACT_SIGIO_HANDLER)() ; --#ifdef linux -+#if defined(linux) && defined(__GLIBC__) - if (fFltExceptions) - feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); - //feenableexcept (FE_INVALID | FE_DIVBYZERO); -@@ -337,7 +337,7 @@ - return; - } - #endif --#ifdef linux -+#if defined(linux) && defined(__GLIBC__) - if (fFltExceptions) - feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); - //feenableexcept (FE_INVALID | FE_DIVBYZERO); -@@ -393,7 +393,7 @@ - cerr << "ieee_handler does not work !!! KO " << endl; - #endif - } --#elif defined (linux) -+#elif defined(linux) && defined(__GLIBC__) - feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); - //feenableexcept (FE_INVALID | FE_DIVBYZERO); - fFltExceptions = Standard_True; diff --git a/srcpkgs/oce/patches/musl-mallinfo.patch b/srcpkgs/oce/patches/musl-mallinfo.patch deleted file mode 100644 index bb904217de8..00000000000 --- a/srcpkgs/oce/patches/musl-mallinfo.patch +++ /dev/null @@ -1,17 +0,0 @@ -In musl libc there is no struct mallinfo and no function mallinf() - ---- src/OSD/OSD_MemInfo.cxx.orig 2016-01-02 06:11:52.000000000 +0100 -+++ src/OSD/OSD_MemInfo.cxx 2016-06-03 13:55:56.613147425 +0200 -@@ -144,8 +144,12 @@ - } - aFile.close(); - -+ #if defined(__GLIBC__) - struct mallinfo aMI = mallinfo(); - myCounters[MemHeapUsage] = aMI.uordblks; -+ #else /* XXX not yet coded */ -+ myCounters[MemHeapUsage] = 0; -+ #endif - - #elif (defined(__APPLE__)) - struct task_basic_info aTaskInfo; diff --git a/srcpkgs/oce/template b/srcpkgs/oce/template deleted file mode 100644 index 6c27108769a..00000000000 --- a/srcpkgs/oce/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'oce' -pkgname=oce -_majorver=0.18 -version=${_majorver}.3 -revision=1 -wrksrc="${pkgname}-OCE-${version}" -build_style=cmake -configure_args="-DOCE_INSTALL_PREFIX=/usr -DOCE_WITH_FREEIMAGE=ON - -DOCE_WITH_GL2PS=ON -DOCE_MULTITHREAD_LIBRARY=TBB -DOCE_DRAW=ON" -makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel tcl-devel tk-devel" -short_desc="OpenCASCADE Community Edition" -maintainer="yopito " -license="LGPL-2.1, OCCT" -homepage="https://github.com/tpaviot/oce" -distfiles="https://github.com/tpaviot/oce/archive/OCE-${version}.tar.gz" -checksum=c553d6a7bf52f790abc3b6bb7a1e91a65947e92a426bb1a88a11960c31f0966c - -post_install() { - vlicense OCCT_LGPL_EXCEPTION.txt -} - -oce-devel_package() { - short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove "usr/lib/oce-${_majorver}/*.cmake" - mkdir -p ${PKGDESTDIR}/usr/share/${pkgname} - vcopy samples usr/share/${pkgname} - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6b46ebfdb11..533fae40e00 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=24 +revision=25 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -173,6 +173,8 @@ replaces=" mozjs60<=60.8.0_5 mozjs68<=68.11.0_1 orage<=4.12.1_7 + oce<=0.18.3_1 + oce-devel<=0.18.3_1 phonon-backend-gstreamer<=4.9.0_2 phonon-backend-vlc<=0.9.1_3 polkit-qt<=0.112.0_5