ProviewR QT5 build working

0071e502 · Esteban Blanc · 9fed6f4d · 0071e502 · 0071e502 · 0071e502
Commit 0071e502 authored Dec 28, 2020 by Esteban Blanc
Showing with 50 additions and 38 deletions

component/freetype/buildout.cfg component/freetype/buildout.cfg +4 -2

component/proviewR/buildout.cfg component/proviewR/buildout.cfg +43 -32

component/qt/buildout.cfg component/qt/buildout.cfg +3 -4

No files found.
--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
@@ -14,8 +14,10 @@ parts =
 [freetype]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2
-md5sum = b3230110e0cab777e0df7631837ac36e
+#url = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2
+#md5sum = b3230110e0cab777e0df7631837ac36e
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.gz
+md5sum = 4934a8b61b636920bcce58e7c7f3e1a2
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
 location = @@LOCATION@@
 configure-options =

--- a/component/proviewR/buildout.cfg
+++ b/component/proviewR/buildout.cfg
@@ -3,18 +3,18 @@
 extends = 
  ../../component/flex/buildout.cfg
  ../../component/bison/buildout.cfg
-  ../../component/qt/buildout.cfg
+#  ../../component/qt/buildout.cfg
 #  ../../component/gtk-2/buildout.cfg
+  ../libjpeg/buildout.cfg
  ../../component/alsa/buildout.cfg
  ../../component/java/buildout.cfg
  ../../component/java-jdk/buildout.cfg
-  ../../component/qt/buildout.cfg
  ../../component/gcc/buildout.cfg
  ../../component/git/buildout.cfg
  ../../component/fontconfig/buildout.cfg
  ../../component/libepoxy/buildout.cfg
  
-  ../glib/buildout.cfg
+#  ../glib/buildout.cfg
  ../xorg/buildout.cfg

  ../../component/cmake/buildout.cfg
@@ -59,19 +59,19 @@ environment =
  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  LDFLAGS=-L${gettext:location}/lib

-[extra-cmake-modules]
-recipe = slapos.recipe.cmmi
-url = https://github.com/KDE/extra-cmake-modules/archive/v5.62.0.zip
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command =
-  mkdir build && cd build && \
-  ${cmake:location}/bin/cmake \
-    -DCMAKE_INSTALL_PREFIX=${:location} \
-    -DQt5LinguistTools_DIR=${qt5-qmake:location}/lib/cmake/Qt5LinguistTools \
-   ..
-make-binary = cd build && make
-environment = 
-  PATH=${qt5-qmake:location}/bin:${qt5-tools:location}/bin:%(PATH)s
+#[extra-cmake-modules]
+#recipe = slapos.recipe.cmmi
+#url = https://github.com/KDE/extra-cmake-modules/archive/v5.62.0.zip
+#location = ${buildout:parts-directory}/${:_buildout_section_name_}
+#configure-command =
+#  mkdir build && cd build && \
+#  ${cmake:location}/bin/cmake \
+#    -DCMAKE_INSTALL_PREFIX=${:location} \
+#    -DQt5LinguistTools_DIR=${qt5-qmake:location}/lib/cmake/Qt5LinguistTools \
+#   ..
+#make-binary = cd build && make
+#environment = 
+#  PATH=${qt5-qmake:location}/bin:${qt5-tools:location}/bin:%(PATH)s

 #[phonon]
 #recipe = slapos.recipe.cmmi
@@ -287,16 +287,21 @@ recipe = slapos.recipe.cmmi
 #md5sum = bec4f4be74c0c914b19c597aafb94fb1
 #url = https://lab.nexedi.com/esteban.blanc/proview/-/archive/e326b090705897b54ef38bf3a095a62618fda59f/proview-e326b090705897b54ef38bf3a095a62618fda59f.tar.gz
 #md5sum = 440875b9a0b7ef90de480645c3c30a75
-url = https://lab.nexedi.com/esteban.blanc/proview/-/archive/167e3ce3e1970d16782b7ad389e15bc5acb1f7ec/proview-167e3ce3e1970d16782b7ad389e15bc5acb1f7ec.tar.gz
-md5sum = 132f5a26fa02e991341c05aeb867b49d
+#url = https://lab.nexedi.com/esteban.blanc/proview/-/archive/167e3ce3e1970d16782b7ad389e15bc5acb1f7ec/proview-167e3ce3e1970d16782b7ad389e15bc5acb1f7ec.tar.gz
+#md5sum = 132f5a26fa02e991341c05aeb867b49d
+url = https://lab.nexedi.com/esteban.blanc/proview/-/archive/2e6a2037ac9f8486f35d0cf7197bd60140af6c33/proview-2e6a2037ac9f8486f35d0cf7197bd60140af6c33.tar.gz
+md5sum = 642d26a5a7f98a04ca53cfa8a9afa9a2
 version = bec4f4be74c0c914b19c597aafb94fb1
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 aroot=${:location}/local/adm
 keep-compile-dir = true
 strip-top-level-dir = true
 make-binary = bash -c 'export XORG_LOCK_DIR=`cat ./xorg-dirname` && stdbuf -o L ${:compile-dir}/build.sh'
-incdir = -I${libdb:location}/include -I${qt5-qmake:location}/include -I${qt5-qmake:location}/include/QtGui -I${qt5-qmake:location}/include/QtWidgets -I${qt5-qmake:location}/include/Qt -I${qt5-qmake:location}/include/QtCore -I${qt5-qmake:location}/include/QtPrintSupport -I${qt5-qmake:location}/include/QtMultimedia -I${qt5-qmake:location}/include/QtMultimediaWidgets -I${qt5-qmake:location}/include/QtNetwork -I${alsa:location}/include -I${fontconfig:location}/include
-libs = -L${libdb:location}/lib -ldb_cxx-5 -L${gettext:location}/lib -L${alsa:location}/lib -L${zlib:location}/lib -L ${qt5-qmake:location}/lib -L${fontconfig:location}/lib
+
+incdir = -I${libdb:location}/include  -I${alsa:location}/include -I${fontconfig:location}/include
+#-I${qt5-qmake:location}/include -I${qt5-qmake:location}/include/QtGui -I${qt5-qmake:location}/include/QtWidgets -I${qt5-qmake:location}/include/Qt -I${qt5-qmake:location}/include/QtCore -I${qt5-qmake:location}/include/QtPrintSupport -I${qt5-qmake:location}/include/QtMultimedia -I${qt5-qmake:location}/include/QtMultimediaWidgets -I${qt5-qmake:location}/include/QtNetwork
+libs = -L${libdb:location}/lib -ldb_cxx-5 -L${gettext:location}/lib -L${alsa:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib
+#-L ${qt5-qmake:location}/lib 
 compile-dir = ${:location}__compile__
 #compile-dir = ${:location}__compile__/pwr
 #sanitizer-flags = -fsanitize=address
@@ -314,10 +319,10 @@ configure-command =
  sed -i "s#gui=\"gtk\"#gui=\"qt\"#" ${:compile-dir}/build.sh
 #  sed -i 's#Compiling $<"#Compiling $< XXX=$(cxxflags)"#g' ${:compile-dir}/src/tools/bld/src/variables.mk
  sed -i "s#(lib_dir)#(lib_dir) ${:libs}#" ${:compile-dir}/src/tools/bld/src/variables.mk
-  sed -i "s#/usr/include/qt5#${qt5-qmake:location}/include#" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
-  sed -i "s#/usr/lib/libQtGui.so#${qt5-qmake:location}/lib/libQtGui.so#" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
-  sed -i "s#/usr/local/include/gtk-2.0#${gtk-2:location}/include/gtk-2.0#g" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
-  sed -i "s#/usr/lib/libgtk-x11-2.0.so#${gtk-2:location}/lib/libgtk-x11-2.0.so#g" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
+#  sed -i "s#/usr/include/qt5#${qt5-qmake:location}/include#" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
+#  sed -i "s#/usr/lib/libQtGui.so#${qt5-qmake:location}/lib/libQtGui.so#" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
+#  sed -i "s#/usr/local/include/gtk-2.0#${gtk-2:location}/include/gtk-2.0#g" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
+#  sed -i "s#/usr/lib/libgtk-x11-2.0.so#${gtk-2:location}/lib/libgtk-x11-2.0.so#g" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
  sed -i "s#/usr/lib/libfl#${flex:location}/lib/libfl#" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
  sed -i "s#/usr/lib/libasound#${alsa:location}/lib/libasound#g" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
  sed -i "s#/usr/lib/libdb#${libdb:location}/lib/libdb#" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
@@ -377,21 +382,27 @@ make-targets =
 make-options =
  -j1
 environment =
-  PATH=${qt5-qmake:location}/bin:${make-4:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:location}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${make-4:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:location}/bin:${bison:location}/bin:%(PATH)s
+#${qt5-qmake:location}/bin
  SHELL=/bin/bash
-  PKG_CONFIG_PATH=${qt5-qmake:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
+#${qt5-qmake:location}/lib/pkgconfig:
  LD_LIBRARY_PATH=${:ld-library-path}
-  CXXFLAGS= -std=c++11 -I${alsa:location}/include -I${fontconfig:location}/include -I${libdb:location}/include -I${qt5-qmake:location}/include -I${qt5-qmake:location}/include/QtGui -I${qt5-qmake:location}/include/QtWidgets -I${qt5-qmake:location}/include/QtCore -I${qt5-qmake:location}/include/QtPrintSupport -I${qt5-qmake:location}/include/QtNetwork -I${qt5-qmake:location}/include/QtMultimedia -I${qt5-qmake:location}/include/QtMultimediaWidgets
-  CFLAGS=-I${qt5-qmake:location}/include -I${qt5-qmake:location}/include/QtGui -I${qt5-qmake:location}/include/QtWidgets -I${qt5-qmake:location}/include/QtCore -I${qt5-qmake:location}/include/QtPrintSupport -I${qt5-qmake:location}/include/QtNetwork -I${qt5-qmake:location}/include/QtMultimedia -I${qt5-qmake:location}/include/QtMultimediaWidgets -I${libdb:location}/include
-  LDFLAGS=-L${gettext:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${bison:location}/lib -L${libdb:location}/lib -L${gtk-2:location}/lib -L${zlib:location}/lib -L${qt5-qmake:location}/lib -Wl,-v
+  CXXFLAGS= -std=c++11 -I${alsa:location}/include -I${fontconfig:location}/include -I${libdb:location}/include 
+#-I${qt5-qmake:location}/include -I${qt5-qmake:location}/include/QtGui -I${qt5-qmake:location}/include/QtWidgets -I${qt5-qmake:location}/include/QtCore -I${qt5-qmake:location}/include/QtPrintSupport -I${qt5-qmake:location}/include/QtNetwork -I${qt5-qmake:location}/include/QtMultimedia -I${qt5-qmake:location}/include/QtMultimediaWidgets -ldl
+  CFLAGS= -I${libdb:location}/include
+#-I${qt5-qmake:location}/include -I${qt5-qmake:location}/include/QtGui -I${qt5-qmake:location}/include/QtWidgets -I${qt5-qmake:location}/include/QtCore -I${qt5-qmake:location}/include/QtPrintSupport -I${qt5-qmake:location}/include/QtNetwork -I${qt5-qmake:location}/include/QtMultimedia -I${qt5-qmake:location}/include/QtMultimediaWidgets
+  LDFLAGS=-L${gettext:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${bison:location}/lib -L${libdb:location}/lib -L${zlib:location}/lib -Wl,-v -ldl
+#-L${qt5-qmake:location}/lib 
  DISPLAY=:99
  MAKEFLAGS=-j1
  ASAN_OPTIONS=detect_leaks=0

-ld-library-path = ${alsa:location}/lib:${qt5-qmake:location}/lib:${libdb:location}/lib:${openssl:location}/lib:${gtk-2:location}/lib:${pango:location}/lib:${cairo:location}/lib:${atk:location}/lib:${harfbuzz:location}/lib:${libXext:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${pixman:location}/lib:${zlib:location}/lib:${libpng:location}/lib:${fontconfig:location}/lib:${libX11:location}/lib:${freetype:location}/lib
-
+ld-library-path = ${alsa:location}/lib:${libdb:location}/lib:${openssl:location}/lib:${libXext:location}/lib:${gettext:location}/lib:${pixman:location}/lib:${zlib:location}/lib:${libpng:location}/lib:${fontconfig:location}/lib:${libX11:location}/lib:${freetype:location}/lib
+#${qt5-qmake:location}/lib:

-rpaths = -Wl,-rpath=${alsa:location}/lib -Wl,-rpath=${qt5-qmake:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${gtk-2:location}/lib -Wl,-rpath=${pango:location}/lib -Wl,-rpath=${cairo:location}/lib -Wl,-rpath=${atk:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${libXext:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${fontconfig:location}/lib  -Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${freetype:location}/lib
+rpaths = -Wl,-rpath=${alsa:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${libXext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${fontconfig:location}/lib  -Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${freetype:location}/lib
+#-Wl,-rpath=${qt5-qmake:location}/lib 




--- a/component/qt/buildout.cfg
+++ b/component/qt/buildout.cfg
@@ -31,7 +31,7 @@ location = @@LOCATION@@
 #md5sum = 7aa5841b50c411e23e31e8a6cc1c6981

 pre-configure = 
-  ${git:location}/bin/git checkout 5.15.1
+  ${git:location}/bin/git checkout 5.12.8
  ${git:location}/bin/git submodule update --init
  sed 's,QT_SKIP_MODULES =,QT_SKIP_MODULES = qtactiveqt qtdeclarative qtlocation qtpurchasing qtscxml qttools qtandroidextras qtdoc qtlottie qtqa qtsensors qttranslations qtwebview qtdocgallery qtmacextras qtquickcontrols qtserialbus qtvirtualkeyboard qtwinextras qtcanvas3d qtfeedback qtquickcontrols2 qtserialport qtwayland qtx11extras qtcharts qtgamepad qtnetworkauth qtremoteobjects qtspeech qtwebchannel qtxmlpatterns qtconnectivity qtgraphicaleffects qtpim qtrepotools qtsvg qtwebengine qt3d qtdatavis3d qtimageformats qtscript qtsystems qtwebglplugin,g' -i qt.pro
 configure-command = ./configure
@@ -53,12 +53,11 @@ configure-options =
 #  -no-pulseaudio
 #  -no-gtkstyle
  -no-pch
-  -skip wayland
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
-  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXext:location}/include -I${zlib:location}/include -I${pcre:location}/include -I${openssl:location}/include
-  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath=${pcre:location}/lib -L${openssl:location}/lib
+  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXext:location}/include -I${zlib:location}/include -I${pcre:location}/include -I${openssl:location}/include -ldl
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath=${pcre:location}/lib -L${openssl:location}/lib -ldl
 #make-binary = true
 make-binary= make -j8
 #make-targets = install