Browse Source

Reconfigure Trinity options, paths, and other adjustments

Signed-off-by: Matías Fonzo <selk@dragora.org>
master
Matías Fonzo 4 months ago
parent
commit
ebd4f2a3f2
No known key found for this signature in database GPG Key ID: 3AAF1CEC203A99D5
  1. 4
      archive/etc/profile
  2. 2
      archive/pkgconf/etc/profile.d/pkgconf.sh
  3. 26
      archive/tdebase/etc/profile.d/trinity.sh
  4. 1
      enter-chroot
  5. 2
      recipes/data/etc/recipe
  6. 4
      recipes/devel/pkgconf/recipe
  7. 3
      recipes/libs/musl/recipe
  8. 20
      recipes/tde/dbus-1-tqt/recipe
  9. 19
      recipes/tde/dbus-tqt/recipe
  10. 20
      recipes/tde/libart/recipe
  11. 10
      recipes/tde/tdebase/post-install
  12. 99
      recipes/tde/tdebase/recipe
  13. 67
      recipes/tde/tdelibs/recipe
  14. 50
      recipes/tde/tqca-tls/recipe
  15. 4
      recipes/tde/tqt3/post-install
  16. 104
      recipes/tde/tqt3/recipe
  17. 27
      recipes/tde/tqtinterface/recipe

4
archive/etc/profile

@ -5,7 +5,7 @@
# Compose system path resetting the Input Field Separator
IFS='
'
PATH="${PATH}:/usr/local/games:/usr/games:/opt/trinity/bin"
PATH="${PATH}:/usr/local/games:/usr/games"
# Default mask: remove write permission for group and other
umask 022
@ -29,5 +29,5 @@ do
. "$script"
fi
done
unset script
unset -v script

2
archive/pkgconf/etc/profile.d/pkgconf.sh

@ -5,7 +5,7 @@ test -n "${PKG_CONFIG+$PKG_CONFIG}" || \
PKG_CONFIG=/usr/bin/pkgconf
test -n "${PKG_CONFIG_PATH+$PKG_CONFIG_PATH}" || \
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/opt/trinity/lib/pkgconfig
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG PKG_CONFIG_PATH

26
archive/tdebase/etc/profile.d/trinity.sh

@ -0,0 +1,26 @@
# Expand Trinity's path, if needed
# Set path for Trinity binaries
case $PATH in
*/opt/trinity/bin*)
true
;;
*)
# Set path for Tqt3 and Trinity binaries
PATH="${PATH}:/opt/trinity/bin"
export PATH
;;
esac
# Set path for search pkg-config files
case $PKG_CONFIG_PATH in
*/opt/trinity/lib*)
true
;;
*)
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/trinity/lib/pkgconfig"
export PKG_CONFIG_PATH
;;
esac

1
enter-chroot

@ -123,6 +123,5 @@ $_machine_type chroot "$rootdir" /tools/bin/env -i \
LC_ALL=C \
PKG_CONFIG=/usr/bin/pkgconf \
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/opt/trinity/lib/pkgconfig \
QTDIR=/opt/trinity/lib/tqt3 \
/bin/sh -

2
recipes/data/etc/recipe

@ -19,7 +19,7 @@ set -e
program=etc
version=dragora
pkgversion=20210304
pkgversion=20210307
arch=noarch
release=1

4
recipes/devel/pkgconf/recipe

@ -19,7 +19,7 @@ set -e
program=pkgconf
version=1.7.3
release=1
release=2
# Define a category for the output of the package name
pkgcategory=devel
@ -64,7 +64,7 @@ build()
--docdir=$docsdir \
--enable-static=yes \
--enable-shared=yes \
--with-pkg-config-dir=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/opt/trinity/lib/pkgconfig \
--with-pkg-config-dir="/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig" \
--build="$(gcc -dumpmachine)"
make -j${jobs} V=1

3
recipes/libs/musl/recipe

@ -19,7 +19,7 @@ set -e
program=musl
version=1.2.2
release=4
release=5
# Define a category for the output of the package name
pkgcategory=libs
@ -112,7 +112,6 @@ build()
/usr/local/lib${libSuffix}
/usr/lib${libSuffix}
/usr/$(gcc -dumpmachine)/lib
/opt/trinity/lib${libSuffix}/tqt3/lib
/opt/trinity/lib${libSuffix}
/opt/trinity/lib${libSuffix}/trinity
EOF

20
recipes/tde/dbus-1-tqt/recipe

@ -18,8 +18,9 @@
set -e
program=dbus-1-tqt-trinity
pkgname=dbus-1-tqt
version=14.0.9
release=1
release=2
# Define a category for the output of the package name
pkgcategory=tde
@ -46,7 +47,7 @@ license="Academic Free License version 2.1 | MIT Expat Variant, GPLv2+"
# Source documentation
docs="AUTHORS COPYING* ChangeLog NEWS README TODO"
docsdir="${docdir}/${program}-${version}"
docsdir="${docdir}/${pkgname}-${version}"
build()
{
@ -61,14 +62,13 @@ build()
cd BUILD
cmake \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$QILDFLAGS" \
-DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_INSTALL_RPATH=YES \
-DWITH_ALL_OPTIONS=ON \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(echo $QILDFLAGS | sed 's/-s//')" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-G Ninja ..
ninja -j${jobs}

19
recipes/tde/dbus-tqt/recipe

@ -18,8 +18,9 @@
set -e
program=dbus-tqt-trinity
pkgname=dbus-tqt
version=14.0.9
release=1
release=2
# Define a category for the output of the package name
pkgcategory=tde
@ -40,7 +41,7 @@ license="Academic Free License version 2.1 | GPLv2+"
# Source documentation
docs="AUTHORS COPYING ChangeLog HACKING NEWS README"
docsdir="${docdir}/${program}-${version}"
docsdir="${docdir}/${pkgname}-${version}"
build()
{
@ -55,13 +56,13 @@ build()
cd BUILD
cmake \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$QILDFLAGS" \
-DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_INSTALL_RPATH=YES \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(echo $QILDFLAGS | sed 's/-s//')" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-G Ninja ..
ninja -j${jobs}

20
recipes/tde/libart/recipe

@ -18,6 +18,7 @@
set -e
program=libart-lgpl-trinity
pkgname=libart
version=14.0.9
release=1
@ -58,15 +59,16 @@ build()
cd BUILD
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$QICFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$QILDFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_INSTALL_RPATH=YES \
-DWITH_ALL_OPTIONS=ON \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$QICXXFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(echo $QILDFLAGS | sed 's/-s//')" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_SKIP_RPATH=OFF \
-DWITH_ALL_OPTIONS=ON \
-G Ninja ..
ninja -j${jobs}

10
recipes/tde/tdebase/post-install

@ -1,10 +0,0 @@
echo "Updating desktop database: update-desktop-database -q opt/trinity/share/applications/tde"
chroot "$rootdir" /usr/bin/update-desktop-database -q opt/trinity/share/applications/tde
echo "Updating ICON cache: gtk-update-icon-cache -q -f -i opt/trinity/share/icons/hicolor"
chroot "$rootdir" /usr/bin/gtk-update-icon-cache -q -f -i opt/trinity/share/icons/hicolor
echo "Updating ICON cache: gtk-update-icon-cache -q -f -i opt/trinity/share/icons/crystalsvg"
chroot "$rootdir" /usr/bin/gtk-update-icon-cache -q -f -i opt/trinity/share/icons/crystalsvg

99
recipes/tde/tdebase/recipe

@ -19,7 +19,7 @@ set -e
program=tdebase-trinity
version=14.0.9
release=1
release=2
# Define a category for the output of the package name
pkgcategory=tde
@ -57,50 +57,60 @@ build()
cd BUILD
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$QICFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$QILDFLAGS" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$QICFLAGS" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(echo $QILDFLAGS | sed 's/-s//')" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DCONFIG_INSTALL_DIR=/etc/trinity \
-DSYSCONF_INSTALL_DIR=/etc/trinity \
-DCMAKE_LIBRARY_PATH=/opt/trinity/lib${libSuffix} \
-DCMAKE_INCLUDE_PATH=/opt/trinity/include \
-DXDG_MENU_INSTALL_DIR=/etc/xdg/menus \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_INSTALL_RPATH=YES \
-DHTDIG_SEARCH_BINARY=/usr/bin/hlsearch \
-DWITH_GCC_VISIBILITY=ON \
-DBUILD_ALL=ON \
-DWITH_ALL_OPTIONS=ON \
-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \
-DBUILD_TDM_SYSTEMD_UNIT_FILE=OFF \
-DWITH_USBIDS=/usr/share/hwdata/usb.ids \
-DHTDIG_SEARCH_BINARY=/usr/bin/hlsearch \
-DWITH_TDEHWLIB=ON \
-DWITH_ARTS=OFF \
-DWITH_PAM=OFF \
-DWITH_LIBCONFIG=OFF \
-DWITH_XSCREENSAVER=OFF \
-DWITH_SASL=OFF \
-DWITH_ELFICON=OFF \
-DWITH_SUDO_TDESU_BACKEND=ON \
-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \
-DWITH_LDAP=OFF \
-DWITH_SAMBA=OFF \
-DWITH_LIBUSB=OFF \
-DWITH_LIBRAW1394=OFF \
-DWITH_SASL=OFF \
-DWITH_OPENEXR=OFF \
-DWITH_XCOMPOSITE=ON \
-DWITH_XCURSOR=ON \
-DWITH_XFIXES=ON \
-DWITH_XRANDR=ON \
-DWITH_XINERAMA=ON \
-DWITH_SENSORS=ON \
-DWITH_HAL=OFF \
-DWITH_TDEHWLIB=ON \
-DWITH_XDMCP=ON \
-DWITH_XRENDER=ON \
-DWITH_XTEST=ON \
-DWITH_OPENGL=ON \
-DWITH_XSCREENSAVER=OFF \
-DWITH_UPOWER=OFF \
-DWITH_OPENEXR=OFF \
-DWITH_LDAP=OFF \
-DWITH_SAMBA=OFF \
-DWITH_LIBART=ON \
-DWITH_LIBCONFIG=OFF \
-DWITH_PCRE=ON \
-DWITH_KRB5=OFF \
..
make -j${jobs}
make -j${jobs} DESTDIR="$destdir" install
# Strip remaining binaries and libraries
find "$destdir" -type f -print0 | xargs -0 file | \
awk '/ELF/ && /executable/ || /shared object/' | \
cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find "$destdir" -type f -print0 | xargs -0 file | \
awk '/current ar archive/' | \
cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null || true
# To handle (dot) .new files via graft(1)
find "${destdir}/etc" -type d -print | while read -r directory
@ -115,7 +125,40 @@ build()
"${destdir}/etc/X11/xinit/"
chmod 644 "${destdir}/etc/X11/xinit/xinitrc-tde"
touch "${destdir}/etc/X11/xinit/.graft-config"
# Include profile file
mkdir -p "${destdir}/etc/profile.d"
cp -p "${worktree}/archive/tdebase/etc/profile.d/trinity.sh" \
"${destdir}/etc/profile.d/"
chmod 644 "${destdir}/etc/profile.d/trinity.sh"
# To handle .new config file(s)
touch "${destdir}/etc/profile.d/.graft-config" \
"${destdir}/etc/X11/xinit/.graft-config"
# Create post-install script
mkdir -p "${destdir}/var/lib/qi"
cat << EOF > "${destdir}/var/lib/qi/${full_pkgname}.sh"
# Make symlink for canonical path at /opt/trinity/lib
#
# Link using \$libSuffix
if test -n "$libSuffix" && test ! -e "\${rootdir}/opt/trinity/lib"
then
( cd -- "\${rootdir}/opt/trinity" && ln -sf lib${libSuffix} lib )
fi
echo "Updating desktop database: update-desktop-database -q opt/trinity/share/applications/tde"
chroot "\$rootdir" /usr/bin/update-desktop-database -q opt/trinity/share/applications/tde
echo "Updating ICON cache: gtk-update-icon-cache -q -f -i opt/trinity/share/icons/hicolor"
chroot "\$rootdir" /usr/bin/gtk-update-icon-cache -q -f -i opt/trinity/share/icons/hicolor
echo "Updating ICON cache: gtk-update-icon-cache -q -f -i opt/trinity/share/icons/crystalsvg"
chroot "\$rootdir" /usr/bin/gtk-update-icon-cache -q -f -i opt/trinity/share/icons/crystalsvg
EOF
# Compress and link man pages (if needed)
if test -d "${destdir}/$mandir"

67
recipes/tde/tdelibs/recipe

@ -19,7 +19,7 @@ set -e
program=tdelibs-trinity
version=14.0.9
release=1
release=2
# Define a category for the output of the package name
pkgcategory=tde
@ -60,51 +60,56 @@ build()
cd BUILD
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$QICFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$QILDFLAGS" \
-DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$QICFLAGS" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(echo $QILDFLAGS | sed 's/-s//')" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DCONFIG_INSTALL_DIR=/etc/trinity \
-DSYSCONF_INSTALL_DIR=/etc/trinity \
-DXDG_MENU_INSTALL_DIR=/etc/xdg/menus \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_INSTALL_RPATH=YES \
-DWITH_ALL_OPTIONS=ON \
-DWITH_SUDO_TDESU_BACKEND=ON \
-DWITH_TDEHWLIB=ON \
-DWITH_TDEHWLIB_DAEMONS=ON \
-DWITH_ALSA=ON \
-DWITH_ARTS=OFF \
-DWITH_AVAHI=OFF \
-DWITH_OPENEXR=OFF \
-DCMAKE_LIBRARY_PATH=/opt/trinity/lib${libSuffix} \
-DCMAKE_INCLUDE_PATH=/opt/trinity/include \
-DWITH_GCC_VISIBILITY=ON \
-DWITH_CUPS=OFF \
-DWITH_UTEMPTER=OFF \
-DWITH_ARTS=OFF \
-DWITH_LIBART=ON \
-DWITH_LIBIDN=OFF \
-DWITH_LUA=OFF \
-DWITH_ELFICON=OFF \
-DWITH_GAMIN=OFF \
-DWITH_TIFF=ON \
-DWITH_JASPER=ON \
-DWITH_OPENEXR=OFF \
-DWITH_AVAHI=OFF \
-DWITH_ISPELL=OFF \
-DWITH_ASPELL=ON \
-DWITH_HSPELL=OFF \
-DWITH_HAL=OFF \
-DDEFAULT_SPELL_CHECKER=ASPELL \
-DWITH_ELFICON=OFF \
-DWITH_TDEHWLIB=ON \
-DWITH_TDEHWLIB_DAEMONS=ON \
-DWITH_LOGINDPOWER=ON \
-DWITH_UPOWER=OFF \
-DWITH_UDISKS=OFF \
-DWITH_UDISKS2=OFF \
-DWITH_UDEVIL=ON \
-DWITH_CONSOLEKIT=OFF \
-DWITH_NETWORK_MANAGER_BACKEND=OFF \
-DWITH_LZMA=ON \
-DWITH_XRANDR=ON \
-DWITH_XCOMPOSITE=ON \
-DWITH_MITSHM=ON \
-DWITH_PCSC=ON \
-DWITH_PKCS=ON \
-DWITH_CRYPTSETUP=ON \
-DWITH_IMAGETOPS_BINARY=ON \
-G Ninja ..
ninja -j${jobs}
DESTDIR="$destdir" ninja -j${jobs} install
# Strip remaining binaries and libraries
find "$destdir" -type f -print0 | xargs -0 file | \
awk '/ELF/ && /executable/ || /shared object/' | \
cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find "$destdir" -type f -print0 | xargs -0 file | \
awk '/current ar archive/' | \
cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null || true
# To handle (dot) .new files via graft(1)
find "${destdir}/etc" -type d -print | while read -r directory

50
recipes/tde/tqca-tls/recipe

@ -18,8 +18,9 @@
set -e
program=tqca-tls-trinity
pkgname=tqca-tls
version=14.0.9
release=1
release=2
# Define a category for the output of the package name
pkgcategory=tde
@ -41,16 +42,10 @@ license=LGPLv2.1
# Source documentation
docs="COPYING README"
docsdir="${docdir}/${program}-${version}"
docsdir="${docdir}/${pkgname}-${version}"
build()
{
if test -z "$QTDIR"
then
echo "WARNING: Required QTDIR variable is empty." 1>&2
exit 1;
fi
unpack "${tardir}/$tarname"
cd "$srcdir"
@ -58,22 +53,27 @@ build()
# Set sane permissions
chmod -R u+w,go-w,a+rX-s .
# Hard-code path to look for headers
if test ! -d /usr/include/tqt
then
sed -e 's#/usr/include/tqt#/opt/trinity/include/tqt#g' \
-i configure
fi
./configure --tqtdir=$QTDIR
make -j${jobs}
#make -j${jobs} DESTDIR="$destdir" install -- not supported!
# Install "tqca-tls" manually
install -m 755 libtqca-tls.so \
-D "${destdir}${QTDIR}/plugins/crypto/libtqca-tls.so"
mkdir BUILD
cd BUILD
cmake \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$QICFLAGS" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(echo $QILDFLAGS | sed 's/-s//')" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCONFIG_INSTALL_DIR=/etc/trinity \
-DSYSCONF_INSTALL_DIR=/etc/trinity \
-DXDG_MENU_INSTALL_DIR=/etc/xdg/menus \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_SKIP_RPATH=OFF \
-DWITH_ALL_OPTIONS=ON \
-G Ninja ..
ninja -j${jobs}
DESTDIR="$destdir" ninja -j${jobs} install
# Compress and link man pages (if needed)
if test -d "${destdir}/$mandir"
@ -89,6 +89,8 @@ build()
)
fi
cd ..
# Copy documentation
mkdir -p "${destdir}${docsdir}"
cp -p $docs "${destdir}${docsdir}"

4
recipes/tde/tqt3/post-install

@ -0,0 +1,4 @@
echo "Updating desktop database: update-desktop-database -q usr/share/applications"
chroot "$rootdir" /usr/bin/update-desktop-database -q usr/share/applications

104
recipes/tde/tqt3/recipe

@ -20,7 +20,7 @@ set -e
program=tqt3-trinity
pkgname=tqt3
version=14.0.9
release=1
release=2
# Define a category for the output of the package name
pkgcategory=tde
@ -69,9 +69,9 @@ build()
SAVED_QTDIR="$QTDIR"
QTDIR="$PWD"
LD_LIBRARY_PATH="${PWD}/lib:${LD_LIBRARY_PATH}"
LD_LIBRARY_PATH="${QTDIR}/lib:${LD_LIBRARY_PATH}"
SAVED_PATH="$PATH"
PATH="${PWD}/bin:${PATH}"
PATH="${QTDIR}/bin:${PATH}"
echo ""
echo "New QTDIR: $QTDIR"
@ -81,38 +81,35 @@ build()
export QTDIR LD_LIBRARY_PATH PATH
echo yes | ./configure -L/usr/lib${libSuffix} -I/usr/include/tirpc \
-prefix /opt/trinity/lib${libSuffix}/${pkgname}-${version} \
-plugindir /opt/trinity/lib${libSuffix}/${pkgname}-${version}/plugins \
-sysconfdir /opt/etc \
-sysshare /usr/share \
-docdir $docsdir \
echo yes | ./configure \
-L/usr/lib${libSuffix} \
-I/usr/include/freetype2 \
-I/usr/include/tirpc \
-prefix "/usr" \
-libdir "/usr/lib${libSuffix}" \
-sysconfdir "/etc/tqt3" \
-headerdir "/usr/include/tqt3" \
-plugindir "/usr/lib${libSuffix}/tqt3/plugins" \
-datadir "/usr/share/tqt3" \
-translationdir "/usr/share/tqt3/translations" \
-docdir "$docsdir" \
-no-exceptions \
-stl \
-largefile \
-qt-gif \
-system-zlib \
-system-libpng \
-system-libjpeg \
-system-libmng \
-plugin-imgfmt-png \
-plugin-imgfmt-jpeg \
-qt-imgfmt-mng \
-qt-imgfmt-png \
-qt-imgfmt-jpeg \
-plugin-imgfmt-mng \
-thread \
-xinerama \
-xcursor \
-xrandr \
-xrender \
-xft \
-shared \
-fast \
-glibmainloop \
-tablet \
-xkb \
-plugin-style-cde \
-plugin-style-compact \
-plugin-style-motif \
-plugin-style-motifplus \
-plugin-style-platinum \
-plugin-style-sgi \
-plugin-style-windows \
-enable-opengl \
-dlopen-opengl \
-release
make -i -j${jobs} sub-tools
@ -128,61 +125,6 @@ build()
awk '/ELF/ && /executable/ || /shared object/' | \
cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
# Make symlinks in order to have canonical path(s)
mkdir -p "${destdir}/var/lib/qi"
cat << EOF > "${destdir}/var/lib/qi/${full_pkgname}.sh"
# Make symlink for canonical path at /opt/trinity/lib
# Link using \$libSuffix if it was present (recipe)
test -n "$libSuffix" && ( cd opt/trinity && ln -sf lib${libSuffix} lib );
# Link package name
cd opt/trinity/lib && ln -sf ${pkgname}-${version} $pkgname
echo "Updating desktop database: update-desktop-database -q usr/share/applications"
update-desktop-database -q usr/share/applications
EOF
cd "${destdir}/opt/trinity" || exit 1
# Link tqt3's pkg-config files at /opt/trinity/lib/pkgconfig
mkdir -p "${destdir}/opt/trinity/lib${libSuffix}/pkgconfig"
cd "${destdir}/opt/trinity/lib${libSuffix}/${pkgname}-${version}"/lib/pkgconfig/
for file in *.pc
do
ln -sf \
"/opt/trinity/lib${libSuffix}/${pkgname}-${version}/lib/pkgconfig/${file}" \
"${destdir}/opt/trinity/lib${libSuffix}/pkgconfig/${file}"
done
# Link tqt3's programs at /opt/trinity/bin
mkdir -p "${destdir}/opt/trinity/bin"
cd "${destdir}/opt/trinity/lib${libSuffix}/${pkgname}-${version}"/bin/
for file in *
do
test -x "$file" || continue;
ln -sf \
"/opt/trinity/lib${libSuffix}/${pkgname}-${version}/bin/${file}" \
"${destdir}/opt/trinity/bin/${file}"
done
cd -- "${TMPDIR}/$srcdir"
# Include profile file
mkdir -p "${destdir}/etc/profile.d"
cp -p "${worktree}/archive/tqt3/etc/profile.d/tqt3.sh" \
"${destdir}/etc/profile.d/"
chmod 644 "${destdir}/etc/profile.d/tqt3.sh"
# To handle config file(s)
touch "${destdir}/etc/profile.d/.graft-config"
# Compress and link man pages (if needed)
if test -d "${destdir}/$mandir"
then

27
recipes/tde/tqtinterface/recipe

@ -19,7 +19,7 @@ set -e
program=tqtinterface-trinity
version=14.0.9
release=1
release=2
# Define a category for the output of the package name
pkgcategory=tde
@ -63,21 +63,16 @@ build()
cd BUILD
cmake \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$QILDFLAGS" \
-DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_INSTALL_RPATH=YES \
-DWITH_ALL_OPTIONS=ON \
-DQT_PREFIX_DIR=/opt/trinity \
-DQT_INCLUDE_DIR=${QTDIR}/include \
-DQT_LIBRARY_DIR=${QTDIR}/lib \
-DQT_BINARY_DIR=${QTDIR}/bin \
-DQT_VERSION=3 \
-DWITH_QT3=ON \
-DWITH_QT4=OFF \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$QICXXFLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(echo $QILDFLAGS | sed 's/-s//')" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${libSuffix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DWITH_QT3=ON \
-DWITH_QT4=OFF \
-G Ninja ..
ninja -j${jobs}

Loading…
Cancel
Save