Commit 6a31a4e2 authored by Dmitry Blinov's avatar Dmitry Blinov

make proview-R build its qt interface

gtk interface building resulted in no gtk interface being built for some
reason, and reference working set ups all used qt, so this commit
switches interface to qt and fights with bugs that come from this
change.
parent 26b5433b
......@@ -356,6 +356,7 @@ configure-command =
set -e
sed -i "s#aroot=/usr/local/adm#aroot=${:aroot}#" ${:compile-dir}/build.sh
sed -i "s#cflags\s*:= -c#cflags := ${:incdir} -c#" ${:compile-dir}/src/tools/bld/src/variables.mk
sed -i "s#cxxflags := \$(cflags)#cxxflags := -std=gnu++11 \$(cflags)#" ${:compile-dir}/src/tools/bld/src/variables.mk
sed -i "s#\$(\$(pred))#\$(shell expr \$(word) - 1)#" ${:compile-dir}/src/tools/pwre/src/dir_symbols.mk
sed -i "s#typedef char cnv_tName\[200\]#typedef char cnv_tName\[300\]#" ${:compile-dir}/src/exe/co_convert/src/co_convert.cpp
sed -i "s#efine pwr_cSizCmd 399#efine pwr_cSizCmd 799#" ${:compile-dir}/src/exp/inc/src/pwr.h
......@@ -375,7 +376,8 @@ configure-command =
sed -i "s#char directory\[80\]#char directory\[400\]#" ${:compile-dir}/src/exe/co_convert/src/*
sed -i "s#char filename\[120\]#char filename\[400\]#" ${:compile-dir}/src/exe/co_convert/src/*
sed -i 's#@_") \&\&#@_ --trace -w") \&\&#' ${:compile-dir}/src/tools/pwre/src/pwre.pl
sed -i "s#pwre build_all_modules \$gui#pwre build -v all \$gui#" ${:compile-dir}/build.sh
#sed -i "s#pwre build_all_modules \$gui#pwre build -v all \$gui#" ${:compile-dir}/build.sh
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/qt4#${qt4-qmake:location}/include#" ${:compile-dir}/src/tools/pwre/src/pwre_configure.sh
......@@ -403,8 +405,19 @@ depends =
#PID=`pgrep -u "$(whoami)" -f ${xserver:location}/bin/Xorg`
# ${xserver:location}/bin/Xorg -noreset +extension GLX +extension RANDR +extension RENDER -config ${:compile-dir}/pwr/src/tools/dummy_display/xorg.conf :99 &
#pre-build =
# PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xvfb.*'`
# echo 'I GOT THROUGH PID'
# echo " PID is $PID "
# echo "other possibly different PID is `pgrep -f vfb` "
# echo "my own process is $$"
# echo "my command name is `ps -ly $$`"
# if [ ! -z "$PID" ]; then kill -TERM $PID; fi
# echo 'I GOT THROUGH IF'
# ${xserver:location}/bin/Xvfb -noreset +extension GLX +extension RANDR +extension RENDER :99 &
pre-build =
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xvfb.*'`
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xorg.*'`
echo 'I GOT THROUGH PID'
echo " PID is $PID "
echo "other possibly different PID is `pgrep -f vfb` "
......@@ -412,10 +425,10 @@ pre-build =
echo "my command name is `ps -ly $$`"
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
echo 'I GOT THROUGH IF'
${xserver:location}/bin/Xvfb -noreset +extension GLX +extension RANDR +extension RENDER :99 &
${xserver:location}/bin/Xorg -noreset +extension GLX +extension RANDR +extension RENDER -config ${:compile-dir}/src/tools/dummy_display/xorg.conf :99 &
post-install =
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xvfb.*'`
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xorg.*'`
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
make-targets =
......@@ -426,7 +439,7 @@ environment =
SHELL=/bin/bash
PKG_CONFIG_PATH=${qt4-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:${phonon-qt4:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
LD_LIBRARY_PATH=${:ld-library-path}
CXXFLAGS=-I${alsa:location}/include -I${fontconfig:location}/include -I${libdb:location}/include -I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui
CXXFLAGS= -std=c++11 -I${alsa:location}/include -I${fontconfig:location}/include -I${libdb:location}/include -I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui
CFLAGS=-I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui -I${libdb:location}/include
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -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 -Wl,-v
DISPLAY=:99
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment