Added compat libs and added lib preload

3 files changed, 19 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db16ea7d61d3..dac00a417025 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = timedoctorpro
 	pkgdesc = App to track work time from timedoctor.com
 	pkgver = 1.4.75.14
-	pkgrel = 6
+	pkgrel = 7
 	url = https://www.timedoctor.com/download.html
 	arch = x86_64
 	license = proprietary
@@ -9,15 +9,11 @@ pkgbase = timedoctorpro
 	depends = libxcb
 	depends = zlib
 	depends = qt4
-	depends = opencv
+	depends = opencv2-opt
 	depends = jasper
-	conflicts = opencv2
+	depends = openssl-1.0
 	source = https://updates.timedoctor.com/download/_production/tdpro/linux-ubuntu-16.04/timedoctorpro_1.4.75-14ubuntu16.04_amd64.deb
-	source = https://archive.archlinux.org/packages/j/jasper/jasper-1.900.5-1-x86_64.pkg.tar.xz
-	source = https://archive.archlinux.org/packages/o/openssl/openssl-1.0.2.k-1-x86_64.pkg.tar.xz
 	md5sums = 0d50154852f5f10bd8e470066f61a523
-	md5sums = c8360ae58c424f1c1d4cff50d56e47ec
-	md5sums = SKIP
 
 pkgname = timedoctorpro
 
diff --git a/PKGBUILD b/PKGBUILD
index 9def5f278996..20167b1607ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,78 +7,28 @@
 pkgname=timedoctorpro
 pkgver=1.4.75.14
 urlver=$(echo $pkgver|sed 's/\.\([^.]*\)$/-\1/')
-pkgrel=6
+pkgrel=7
 arch=('x86_64')
 pkgdesc="App to track work time from timedoctor.com"
 url="https://www.timedoctor.com/download.html"
 license=('proprietary')
 
 #maybe also depends=('libxss')
-depends=('libx11' 'libxcb' 'zlib' 'qt4' 'opencv' 'jasper')
-conflicts=('opencv2')
+depends=('libx11' 'libxcb' 'zlib' 'qt4' 'opencv2-opt' 'jasper' 'openssl-1.0')
 
 source=(
     "https://updates.timedoctor.com/download/_production/tdpro/linux-ubuntu-16.04/timedoctorpro_${urlver}ubuntu16.04_amd64.deb"
-    "https://archive.archlinux.org/packages/j/jasper/jasper-1.900.5-1-x86_64.pkg.tar.xz"
-    "https://archive.archlinux.org/packages/o/openssl/openssl-1.0.2.k-1-x86_64.pkg.tar.xz"
+#    "https://archive.archlinux.org/packages/j/jasper/jasper-1.900.5-1-x86_64.pkg.tar.xz"
 )
 md5sums=(
     "0d50154852f5f10bd8e470066f61a523"
-    "c8360ae58c424f1c1d4cff50d56e47ec"
-    "SKIP"
+#    "c8360ae58c424f1c1d4cff50d56e47ec"
 )
 
 package() {
         cd $pkgdir
         tar -xf $srcdir/data.tar.xz
-        cp $srcdir/usr/lib/libjasper.so.1.0.0 opt/timedoctorpro/libjasper.so.1
-        cp $srcdir/usr/lib/libcrypto.so.1.0.0 opt/timedoctorpro/libcrypto.so.1.0.0
-
-        #package opencv2 conflicts with opencv, timedoctor works with opencv v3.2 but needs symlinks
-        mkdir usr/lib
-        cd usr/lib
-        ln -s libopencv_aruco.so.3.2 libopencv_aruco.so.2.4
-        ln -s libopencv_bgsegm.so.3.2 libopencv_bgsegm.so.2.4
-        ln -s libopencv_bioinspired.so.3.2 libopencv_bioinspired.so.2.4
-        ln -s libopencv_calib3d.so.3.2 libopencv_calib3d.so.2.4
-        ln -s libopencv_ccalib.so.3.2 libopencv_ccalib.so.2.4
-        ln -s libopencv_core.so.3.2 libopencv_core.so.2.4
-        ln -s libopencv_datasets.so.3.2 libopencv_datasets.so.2.4
-        ln -s libopencv_dnn.so.3.2 libopencv_dnn.so.2.4
-        ln -s libopencv_dpm.so.3.2 libopencv_dpm.so.2.4
-        ln -s libopencv_face.so.3.2 libopencv_face.so.2.4
-        ln -s libopencv_features2d.so.3.2 libopencv_features2d.so.2.4
-        ln -s libopencv_flann.so.3.2 libopencv_flann.so.2.4
-        ln -s libopencv_freetype.so.3.2 libopencv_freetype.so.2.4
-        ln -s libopencv_fuzzy.so.3.2 libopencv_fuzzy.so.2.4
-        ln -s libopencv_hdf.so.3.2 libopencv_hdf.so.2.4
-        ln -s libopencv_highgui.so.3.2 libopencv_highgui.so.2.4
-        ln -s libopencv_imgcodecs.so.3.2 libopencv_imgcodecs.so.2.4
-        ln -s libopencv_imgproc.so.3.2 libopencv_imgproc.so.2.4
-        ln -s libopencv_line_descriptor.so.3.2 libopencv_line_descriptor.so.2.4
-        ln -s libopencv_ml.so.3.2 libopencv_ml.so.2.4
-        ln -s libopencv_objdetect.so.3.2 libopencv_objdetect.so.2.4
-        ln -s libopencv_optflow.so.3.2 libopencv_optflow.so.2.4
-        ln -s libopencv_phase_unwrapping.so.3.2 libopencv_phase_unwrapping.so.2.4
-        ln -s libopencv_photo.so.3.2 libopencv_photo.so.2.4
-        ln -s libopencv_plot.so.3.2 libopencv_plot.so.2.4
-        ln -s libopencv_reg.so.3.2 libopencv_reg.so.2.4
-        ln -s libopencv_rgbd.so.3.2 libopencv_rgbd.so.2.4
-        ln -s libopencv_saliency.so.3.2 libopencv_saliency.so.2.4
-        ln -s libopencv_shape.so.3.2 libopencv_shape.so.2.4
-        ln -s libopencv_stereo.so.3.2 libopencv_stereo.so.2.4
-        ln -s libopencv_stitching.so.3.2 libopencv_stitching.so.2.4
-        ln -s libopencv_structured_light.so.3.2 libopencv_structured_light.so.2.4
-        ln -s libopencv_superres.so.3.2 libopencv_superres.so.2.4
-        ln -s libopencv_surface_matching.so.3.2 libopencv_surface_matching.so.2.4
-        ln -s libopencv_text.so.3.2 libopencv_text.so.2.4
-        ln -s libopencv_tracking.so.3.2 libopencv_tracking.so.2.4
-        ln -s libopencv_videoio.so.3.2 libopencv_videoio.so.2.4
-        ln -s libopencv_video.so.3.2 libopencv_video.so.2.4
-        ln -s libopencv_videostab.so.3.2 libopencv_videostab.so.2.4
-        ln -s libopencv_xfeatures2d.so.3.2 libopencv_xfeatures2d.so.2.4
-        ln -s libopencv_ximgproc.so.3.2 libopencv_ximgproc.so.2.4
-        ln -s libopencv_xobjdetect.so.3.2 libopencv_xobjdetect.so.2.4
-        ln -s libopencv_xphoto.so.3.2 libopencv_xphoto.so.2.4
+        patch -p1 < ../../timedoctorpro.patch
+#        cp $srcdir/usr/lib/libjasper.so.1.0.0 opt/timedoctorpro/libjasper.so.1
 
 }
diff --git a/timedoctorpro.patch b/timedoctorpro.patch
new file mode 100644
index 000000000000..13c853481c3d
--- /dev/null
+++ b/timedoctorpro.patch
@@ -0,0 +1,10 @@
+--- ./opt/timedoctorpro/timedoctorpro	2016-11-23 06:32:18.000000000 +0100
++++ ./opt/timedoctorpro/timedoctorpro	2017-06-16 21:45:38.026766821 +0200
+@@ -11,4 +11,7 @@
+ export LD_LIBRARY_PATH
+ QT_PLUGIN_PATH=$TDDIR
+ export QT_PLUGIN_PATH
++
++export LD_PRELOAD="/opt/opencv2/lib/libopencv_calib3d.so /opt/opencv2/lib/libopencv_contrib.so /opt/opencv2/lib/libopencv_core.so /opt/opencv2/lib/libopencv_features2d.so /opt/opencv2/lib/libopencv_flann.so /opt/opencv2/lib/libopencv_gpu.so /opt/opencv2/lib/libopencv_highgui.so /opt/opencv2/lib/libopencv_imgproc.so /opt/opencv2/lib/libopencv_legacy.so /opt/opencv2/lib/libopencv_ml.so /opt/opencv2/lib/libopencv_nonfree.so /opt/opencv2/lib/libopencv_objdetect.so /opt/opencv2/lib/libopencv_ocl.so /opt/opencv2/lib/libopencv_photo.so /opt/opencv2/lib/libopencv_stitching.so /opt/opencv2/lib/libopencv_superres.so /opt/opencv2/lib/libopencv_video.so /opt/opencv2/lib/libopencv_videostab.so"
++
+ exec $TDDIR/timedoctorpro.run "$@"