François Andriot 10 years ago
commit b4b507c636

@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/usr/local/lib
cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
rm -rf debian/fusion-icon-trinity/usr/local
mkdir -p debian/fusion-icon-trinity/temp
mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
mkdir -p debian/fusion-icon-trinity/opt/trinity
cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
rm -rf debian/fusion-icon-trinity/usr
dh_pysupport -pfusion-icon-trinity
###
# Must be done after invoking dh_pysupport, otherwise python scripts will
# end up in /usr/share/pyshare instead of dist-packages
mkdir -p debian/fusion-icon-trinity/usr
mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
rm -rf debian/fusion-icon-trinity/temp
###
dh_icons

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends: libdvdread4, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://www.k3b.org

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org

@ -7,10 +7,10 @@
-# Make sure a default wallpaper is set.
-if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
- # With Trinity this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
- if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
-cat >"$tdehome/share/config/kdesktoprc" <<EOF
-[Desktop0]
-Wallpaper=isadora.png
-Wallpaper=Trinity-lineart.svg
-WallpaperMode=Scaled
-EOF
- fi
@ -18,10 +18,10 @@
+## Make sure a default wallpaper is set.
+#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
+# # With Trinity this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+# if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
+#cat >"$tdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0]
+#Wallpaper=isadora.png
+#Wallpaper=Trinity-lineart.svg
+#WallpaperMode=Scaled
+#EOF
+# fi

@ -1,14 +0,0 @@
#!/bin/bash
DESKTOP_SESSION="$DESKTOP_SESSION"
echo "You are running $DESKTOP_SESSION"
if [[ "$DESKTOP_SESSION" == "trinity" ]]
then
# Do nothing, this is Trinity
echo "I detected Trinity"
else
# This is KDE4, start plasma-desktop
echo "I detected KDE4"
/usr/bin/plasma-desktop.kde4
fi

@ -1,14 +0,0 @@
#!/bin/bash
DESKTOP_SESSION="$DESKTOP_SESSION"
echo "You are running $DESKTOP_SESSION"
if [[ "$DESKTOP_SESSION" == "trinity" ]]
then
# Do nothing, this is Trinity
echo "I detected Trinity"
else
# This is KDE4, start plasma
echo "I detected KDE4"
/usr/bin/plasma.kde4
fi

@ -291,5 +291,3 @@ binary-install/tdebase-trinity-bin::
binary-install/ksmserver-trinity::
install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma
install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop

@ -1165,14 +1165,18 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg
debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav
debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg
debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/airplane.jpg
debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg
debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz
debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/another-view.jpg
debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/aurora.svgz
debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg
debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/celtic.svgz
@ -1195,14 +1199,14 @@ debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
debian/tmp/opt/trinity/share/wallpapers/isadora.png
debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/moon.svgz
debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg
debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg
debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg
@ -1219,6 +1223,10 @@ debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg
debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg
debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg
debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg

@ -33,3 +33,6 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook

@ -44,6 +44,7 @@ debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png
debian/tmp/opt/trinity/share/apps/tdm/themes/minimalist
debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2

@ -105,9 +105,9 @@ common-install-prehook-impl::
# sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
# done
# msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged
# msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
# mv -f tdelibs.pot-merged po/tdelibs.pot
cp -Rp kde.pot po/tdelibs.pot
cp -Rp tde.pot po/tdelibs.pot
# generate .po files for .desktop etc files
if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \

@ -160,29 +160,20 @@ debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps
debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png
debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png
debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/back.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-center.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
debian/tmp/opt/trinity/share/apps/tdeui/pics/abouttde.png
debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png

@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
debian/tmp/opt/trinity/include/tdestoragedevice.h
debian/tmp/opt/trinity/include/tdelibs_export.h
debian/tmp/opt/trinity/include/kdemacros.h
debian/tmp/opt/trinity/include/kde.pot
debian/tmp/opt/trinity/include/tde.pot
debian/tmp/opt/trinity/include/tdeprint/driver.h
debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
debian/tmp/opt/trinity/include/tdeprint/kmjob.h

@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SNMP="ON" \
-DWITH_SENSORS="ON" \
-DWITH_XMMS="ON" \
-DWITH_KNEWSTUFF="ON"
-DWITH_TDENEWSTUFF="ON"
DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity

@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/usr/local/lib
cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
rm -rf debian/fusion-icon-trinity/usr/local
mkdir -p debian/fusion-icon-trinity/temp
mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
mkdir -p debian/fusion-icon-trinity/opt/trinity
cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
rm -rf debian/fusion-icon-trinity/usr
dh_pysupport -pfusion-icon-trinity
###
# Must be done after invoking dh_pysupport, otherwise python scripts will
# end up in /usr/share/pyshare instead of dist-packages
mkdir -p debian/fusion-icon-trinity/usr
mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
rm -rf debian/fusion-icon-trinity/temp
###
dh_icons

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends: libdvdread4, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://www.k3b.org

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org

@ -3,9 +3,8 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://kopete-otr.follefuder.org/
Package: kopete-otr-trinity
Architecture: any

@ -1,6 +1,9 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/python-distutils.mk
@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS_APPEND := -L/opt/trinity/lib
@ -43,11 +46,11 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
# move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@ -87,51 +90,6 @@ install/guidance-backends-trinity::
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
install/tde-guidance-powermanager-trinity::
# install icon to right place
install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
install -D -p -m0644 kde/powermanager/pics/*.png \
$(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/
# install desktop file
install -D -p -m0644 powermanager/guidance-power-manager.desktop \
$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
# copy python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py
: # Replace all '#!' calls to python with /usr/bin/python
: # and make them executable
for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \
sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
$$i > $$i.temp; \
if cmp --quiet $$i $$i.temp; then \
rm -f $$i.temp; \
else \
mv -f $$i.temp $$i; \
chmod 755 $$i; \
echo "fixed interpreter: $$i"; \
fi; \
done
clean::
rm -rf build
@ -155,9 +113,6 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list
@ -190,4 +145,3 @@ common-install-prehook-impl::
fi
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version

@ -1,7 +1,7 @@
opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_serviceconfig.la
opt/trinity/lib/trinity/kcm_userconfig.la
opt/trinity/lib/trinity/kcm_mountconfig.la
opt/trinity/lib/trinity/kcm_wineconfig.la
opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
@ -57,8 +57,8 @@ opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_serviceconfig.so
opt/trinity/lib/trinity/kcm_userconfig.so
opt/trinity/lib/trinity/kcm_mountconfig.so
opt/trinity/lib/trinity/kcm_wineconfig.so
usr/share/lintian/overrides/tde-guidance-trinity

@ -52,6 +52,7 @@ build-%/configure-stamp:
cd build-$* && echo yes \
| python$* ../configure.py \
-c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \
@ -66,6 +67,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
-c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \

@ -41,6 +41,7 @@ build-%/configure-stamp:
cd build-$* \
&& python$* ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
touch $@
@ -50,6 +51,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* \
&& python$*-dbg ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
touch $@

@ -48,6 +48,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && python$* ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@
@ -56,6 +57,7 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && python$*-dbg ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@

@ -7,10 +7,10 @@
-# Make sure a default wallpaper is set.
-if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
- # With Trinity this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
- if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
-cat >"$tdehome/share/config/kdesktoprc" <<EOF
-[Desktop0]
-Wallpaper=isadora.png
-Wallpaper=Trinity-lineart.svg
-WallpaperMode=Scaled
-EOF
- fi
@ -18,10 +18,10 @@
+## Make sure a default wallpaper is set.
+#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
+# # With Trinity this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+# if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
+#cat >"$tdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0]
+#Wallpaper=isadora.png
+#Wallpaper=Trinity-lineart.svg
+#WallpaperMode=Scaled
+#EOF
+# fi

@ -1,14 +0,0 @@
#!/bin/bash
DESKTOP_SESSION="$DESKTOP_SESSION"
echo "You are running $DESKTOP_SESSION"
if [[ "$DESKTOP_SESSION" == "trinity" ]]
then
# Do nothing, this is Trinity
echo "I detected Trinity"
else
# This is KDE4, start plasma-desktop
echo "I detected KDE4"
/usr/bin/plasma-desktop.kde4
fi

@ -1,14 +0,0 @@
#!/bin/bash
DESKTOP_SESSION="$DESKTOP_SESSION"
echo "You are running $DESKTOP_SESSION"
if [[ "$DESKTOP_SESSION" == "trinity" ]]
then
# Do nothing, this is Trinity
echo "I detected Trinity"
else
# This is KDE4, start plasma
echo "I detected KDE4"
/usr/bin/plasma.kde4
fi

@ -291,5 +291,3 @@ binary-install/tdebase-trinity-bin::
binary-install/ksmserver-trinity::
install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma
install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop

@ -1165,14 +1165,18 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg
debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav
debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg
debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/airplane.jpg
debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg
debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz
debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/another-view.jpg
debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/aurora.svgz
debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg
debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/celtic.svgz
@ -1195,14 +1199,14 @@ debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
debian/tmp/opt/trinity/share/wallpapers/isadora.png
debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/moon.svgz
debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg
debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg
debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg
@ -1219,6 +1223,10 @@ debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg
debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg
debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg
debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg

@ -33,3 +33,6 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook

@ -44,6 +44,7 @@ debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png
debian/tmp/opt/trinity/share/apps/tdm/themes/minimalist
debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2

@ -105,9 +105,9 @@ common-install-prehook-impl::
# sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
# done
# msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged
# msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
# mv -f tdelibs.pot-merged po/tdelibs.pot
cp -Rp kde.pot po/tdelibs.pot
cp -Rp tde.pot po/tdelibs.pot
# generate .po files for .desktop etc files
if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \

@ -160,29 +160,20 @@ debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps
debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png
debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png
debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/back.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-center.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
debian/tmp/opt/trinity/share/apps/tdeui/pics/abouttde.png
debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
@ -250,7 +241,7 @@ debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo
debian/tmp/opt/trinity/share/apps/knewstuff/types
debian/tmp/opt/trinity/share/apps/tdenewstuff/types
debian/tmp/opt/trinity/share/apps/knotify/eventsrc
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml

@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
debian/tmp/opt/trinity/include/tdestoragedevice.h
debian/tmp/opt/trinity/include/tdelibs_export.h
debian/tmp/opt/trinity/include/kdemacros.h
debian/tmp/opt/trinity/include/kde.pot
debian/tmp/opt/trinity/include/tde.pot
debian/tmp/opt/trinity/include/tdeprint/driver.h
debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
debian/tmp/opt/trinity/include/tdeprint/kmjob.h
@ -433,16 +433,16 @@ debian/tmp/opt/trinity/include/tdemulticastsocket.h
debian/tmp/opt/trinity/include/tdemultipledrag.h
debian/tmp/opt/trinity/include/tdemultitabbar.h
debian/tmp/opt/trinity/include/knetworkinterface.h
debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h
debian/tmp/opt/trinity/include/knewstuff/engine.h
debian/tmp/opt/trinity/include/knewstuff/entry.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffbutton.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffgeneric.h
debian/tmp/opt/trinity/include/knewstuff/knewstuff.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffsecure.h
debian/tmp/opt/trinity/include/knewstuff/providerdialog.h
debian/tmp/opt/trinity/include/knewstuff/provider.h
debian/tmp/opt/trinity/include/knewstuff/uploaddialog.h
debian/tmp/opt/trinity/include/tdenewstuff/downloaddialog.h
debian/tmp/opt/trinity/include/tdenewstuff/engine.h
debian/tmp/opt/trinity/include/tdenewstuff/entry.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuffbutton.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuffgeneric.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuff.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuffsecure.h
debian/tmp/opt/trinity/include/tdenewstuff/providerdialog.h
debian/tmp/opt/trinity/include/tdenewstuff/provider.h
debian/tmp/opt/trinity/include/tdenewstuff/uploaddialog.h
debian/tmp/opt/trinity/include/knfsshare.h
debian/tmp/opt/trinity/include/knotifyclient.h
debian/tmp/opt/trinity/include/knotifydialog.h
@ -808,8 +808,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.la
debian/tmp/opt/trinity/lib/libtdemediaplayer.so
debian/tmp/opt/trinity/lib/libtdemid.la
debian/tmp/opt/trinity/lib/libtdemid.so
debian/tmp/opt/trinity/lib/libknewstuff.la
debian/tmp/opt/trinity/lib/libknewstuff.so
debian/tmp/opt/trinity/lib/libtdenewstuff.la
debian/tmp/opt/trinity/lib/libtdenewstuff.so
debian/tmp/opt/trinity/lib/libtdentlm.la
debian/tmp/opt/trinity/lib/libtdentlm.so
debian/tmp/opt/trinity/lib/libtdeparts.la

@ -287,8 +287,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
debian/tmp/opt/trinity/lib/libtdemid.so.0
debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
debian/tmp/opt/trinity/lib/libknewstuff.so.1
debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0
debian/tmp/opt/trinity/lib/libtdenewstuff.so.1
debian/tmp/opt/trinity/lib/libtdenewstuff.so.1.0.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
debian/tmp/opt/trinity/lib/libtdeparts.so.2

@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SNMP="ON" \
-DWITH_SENSORS="ON" \
-DWITH_XMMS="ON" \
-DWITH_KNEWSTUFF="ON"
-DWITH_TDENEWSTUFF="ON"
DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity

@ -0,0 +1,6 @@
SUBDIR =
SUBDIR += htdig
.include <bsd.port.subdir.mk>

@ -0,0 +1,40 @@
# Created by: Bill Fumerola <billf@chc-chimes.com>
# $FreeBSD$
PORTNAME= htdig
PORTVERSION= 3.2.0.b6
PORTREVISION= 5
CATEGORIES= textproc www x11/trinity
MASTER_SITES= http://downloads.sourceforge.net/project/htdig/htdig/3.2.0b6/
DISTNAME= htdig-3.2.0b6
MAINTAINER= ports@FreeBSD.org
COMMENT= WWW indexing and searching system
PERMIT_PACKAGE_CDROM= Yes
CONFIGURE_STYLE=gnu
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-config-dir=${PREFIX}/etc/htdig \
--with-default-config-file=${PREFIX}/etc/htdig/htdig.conf \
--with-common-dir=${PREFIX}/share/htdig/common \
--with-database-dir=${PREFIX}/share/htdig/database \
--with-cgi-bin-dir=${PREFIX}/www/cgi-bin \
--with-search-dir=${PREFIX}/www/data \
--with-image-dir=${PREFIX}/www/icons/htdig \
--with-image-url-prefix=/icons/htdig \
--with-ssl
USES= libtool
USE_LDCONFIG= yes
OPTIONS_DEFINE= APACHE DOCS
OPTIONS_DEFAULT= APACHE
APACHE_USE= APACHE=22+
APACHE_CONFIGURE_ON= --with-apache=${LOCALBASE}/sbin
APACHE_PLIST_DIRSTRY= www/cgi-bin www/data www/icons
PORTDOCS= *
.include <bsd.port.mk>

@ -0,0 +1,2 @@
SHA256 (htdig-3.2.0b6.tar.gz) = bang7oYn1TAvVoWhs+XeXx5ujfTAqSwMoAeWvKnlRsg=
SIZE (htdig-3.2.0b6.tar.gz) = 3104936

@ -0,0 +1,24 @@
--- htsearch/htsearch.cc.orig Fri May 28 06:15:24 2004
+++ htsearch/htsearch.cc Mon Sep 12 23:16:06 2005
@@ -211,8 +211,7 @@
}
if (access((char*)configFile, R_OK) < 0)
{
- reportError(form("Unable to read configuration file '%s'",
- configFile.get()));
+ reportError("Unable to read configuration file");
}
config->Read(configFile);
--- htsearch/qtest.cc.orig Fri May 28 06:15:25 2004
+++ htsearch/qtest.cc Mon Sep 12 23:19:49 2005
@@ -132,8 +132,7 @@
if (access((char*)configFile, R_OK) < 0)
{
- reportError(form("Unable to find configuration file '%s'",
- configFile.get()));
+ reportError("Unable to find configuration file");
}
config->Read(configFile);

@ -0,0 +1,14 @@
--- htsearch/Collection.h.orig Fri May 28 06:15:24 2004
+++ htsearch/Collection.h Mon Dec 18 00:17:56 2006
@@ -36,9 +36,9 @@
const char *docExcerpt);
~Collection();
- void Collection::Open();
+ void Open();
- void Collection::Close();
+ void Close();
char *getWordFile() { return wordFile.get(); }
DocumentRef *getDocumentRef(int id);

@ -0,0 +1,11 @@
The ht://Dig system is a complete world wide web indexing and
searching system for a domain or intranet. This system is not meant
to replace the need for powerful internet-wide search systems like
Yahoo! or Google. Instead it is meant to cover the needs for a
single company, campus, or even a sub section of a web site.
As opposed to some WAIS-based or web-server based search engines,
ht://Dig can span many web servers as long as they all understand
the HTTP 1.0 protocol.
WWW: http://www.htdig.org/

@ -0,0 +1,13 @@
@comment $OpenBSD$
lib/htdig/libcommon-3.2.0.so
lib/htdig/libcommon.so
lib/htdig/libfuzzy-3.2.0.so
lib/htdig/libfuzzy.so
lib/htdig/libht-3.2.0.so
lib/htdig/libht.so
lib/htdig/libhtnet-3.2.0.so
lib/htdig/libhtnet.so
lib/htdig/libhtword-3.2.0.so
lib/htdig/libhtword.so
lib/htdig_db/libhtdb-3.2.0.so
lib/htdig_db/libhtdb.so

@ -0,0 +1,217 @@
@comment $OpenBSD$
%%SHARED%%
bin/HtFileType
@bin bin/htdb_dump
@bin bin/htdb_load
@bin bin/htdb_stat
@bin bin/htdig
@bin bin/htdump
@bin bin/htfuzzy
@bin bin/htload
@bin bin/htmerge
@bin bin/htnotify
@bin bin/htpurge
@bin bin/htstat
bin/rundig
etc/
etc/htdig/
etc/htdig/HtFileType-magic.mime
etc/htdig/cookies.txt
etc/htdig/htdig.conf
etc/htdig/mime.types
include/htdig/
include/htdig/Configuration.h
include/htdig/Connection.h
include/htdig/DB2_db.h
include/htdig/Database.h
include/htdig/Dictionary.h
include/htdig/HtCodec.h
include/htdig/HtCookie.h
include/htdig/HtCookieInFileJar.h
include/htdig/HtCookieJar.h
include/htdig/HtCookieMemJar.h
include/htdig/HtDateTime.h
include/htdig/HtFTP.h
include/htdig/HtFile.h
include/htdig/HtHTTP.h
include/htdig/HtHTTPBasic.h
include/htdig/HtHTTPSecure.h
include/htdig/HtHeap.h
include/htdig/HtMaxMin.h
include/htdig/HtNNTP.h
include/htdig/HtPack.h
include/htdig/HtRandom.h
include/htdig/HtRegex.h
include/htdig/HtRegexList.h
include/htdig/HtRegexReplace.h
include/htdig/HtRegexReplaceList.h
include/htdig/HtTime.h
include/htdig/HtVector.h
include/htdig/HtVectorGeneric.h
include/htdig/HtVectorGenericCode.h
include/htdig/HtVector_String.h
include/htdig/HtVector_int.h
include/htdig/HtWordCodec.h
include/htdig/HtWordType.h
include/htdig/IntObject.h
include/htdig/List.h
include/htdig/Object.h
include/htdig/ParsedString.h
include/htdig/Queue.h
include/htdig/QuotedStringList.h
include/htdig/SSLConnection.h
include/htdig/Stack.h
include/htdig/StringList.h
include/htdig/StringMatch.h
include/htdig/Transport.h
include/htdig/WordBitCompress.h
include/htdig/WordCaseIsAStatements.h
include/htdig/WordContext.h
include/htdig/WordCursor.h
include/htdig/WordDB.h
include/htdig/WordDBCompress.h
include/htdig/WordDBInfo.h
include/htdig/WordDBPage.h
include/htdig/WordKey.h
include/htdig/WordKeyInfo.h
include/htdig/WordList.h
include/htdig/WordMonitor.h
include/htdig/WordRecord.h
include/htdig/WordRecordInfo.h
include/htdig/WordReference.h
include/htdig/WordStat.h
include/htdig/WordType.h
include/htdig/ber.h
include/htdig/clib.h
include/htdig/good_strtok.h
include/htdig/gregex.h
include/htdig/htString.h
include/htdig/htconfig.h
include/htdig/lib.h
include/htdig/libdefs.h
include/htdig/md5.h
include/htdig/mhash_md5.h
include/htdig/myqsort.h
include/htdig_db/
include/htdig_db/btree.h
include/htdig_db/btree_auto.h
include/htdig_db/btree_ext.h
include/htdig_db/common_ext.h
include/htdig_db/crdel_auto.h
include/htdig_db/db.h
include/htdig_db/db_am.h
include/htdig_db/db_auto.h
include/htdig_db/db_config.h
include/htdig_db/db_dispatch.h
include/htdig_db/db_ext.h
include/htdig_db/db_int.h
include/htdig_db/db_join.h
include/htdig_db/db_page.h
include/htdig_db/db_shash.h
include/htdig_db/db_swap.h
include/htdig_db/debug.h
include/htdig_db/env_ext.h
include/htdig_db/hash.h
include/htdig_db/hash_auto.h
include/htdig_db/hash_ext.h
include/htdig_db/lock.h
include/htdig_db/lock_ext.h
include/htdig_db/log.h
include/htdig_db/log_auto.h
include/htdig_db/log_ext.h
include/htdig_db/mp.h
include/htdig_db/mp_ext.h
include/htdig_db/mutex.h
include/htdig_db/mutex_ext.h
include/htdig_db/os.h
include/htdig_db/os_ext.h
include/htdig_db/os_jump.h
include/htdig_db/qam.h
include/htdig_db/qam_auto.h
include/htdig_db/qam_ext.h
include/htdig_db/queue.h
include/htdig_db/region.h
include/htdig_db/shqueue.h
include/htdig_db/txn.h
include/htdig_db/txn_auto.h
include/htdig_db/txn_ext.h
include/htdig_db/xa.h
include/htdig_db/xa_ext.h
lib/htdig/
lib/htdig/libcommon.a
lib/htdig/libcommon.la
lib/htdig/libfuzzy.a
lib/htdig/libfuzzy.la
lib/htdig/libht.a
lib/htdig/libht.la
lib/htdig/libhtnet.a
lib/htdig/libhtnet.la
lib/htdig/libhtword.a
lib/htdig/libhtword.la
lib/htdig_db/
lib/htdig_db/libhtdb.a
lib/htdig_db/libhtdb.la
@man man/man1/htdig-pdfparser.1
@man man/man1/htdig.1
@man man/man1/htdump.1
@man man/man1/htfuzzy.1
@man man/man1/htload.1
@man man/man1/htmerge.1
@man man/man1/htnotify.1
@man man/man1/htpurge.1
@man man/man1/htsearch.1
@man man/man1/htstat.1
@man man/man1/rundig.1
@man man/man8/htdigconfig.8
share/htdig/
share/htdig/common/
share/htdig/common/bad_words
share/htdig/common/english.0
share/htdig/common/english.aff
share/htdig/common/footer.html
share/htdig/common/header.html
share/htdig/common/long.html
share/htdig/common/nomatch.html
share/htdig/common/short.html
share/htdig/common/synonyms
share/htdig/common/syntax.html
share/htdig/common/wrapper.html
share/htdig/database/
www/
www/cgi-bin/
@bin www/cgi-bin/htsearch
@bin www/cgi-bin/qtest
www/data/
www/data/search.html
www/icons/
www/icons/htdig/
www/icons/htdig/button1.gif
www/icons/htdig/button1.png
www/icons/htdig/button10.gif
www/icons/htdig/button10.png
www/icons/htdig/button2.gif
www/icons/htdig/button2.png
www/icons/htdig/button3.gif
www/icons/htdig/button3.png
www/icons/htdig/button4.gif
www/icons/htdig/button4.png
www/icons/htdig/button5.gif
www/icons/htdig/button5.png
www/icons/htdig/button6.gif
www/icons/htdig/button6.png
www/icons/htdig/button7.gif
www/icons/htdig/button7.png
www/icons/htdig/button8.gif
www/icons/htdig/button8.png
www/icons/htdig/button9.gif
www/icons/htdig/button9.png
www/icons/htdig/buttonl.gif
www/icons/htdig/buttonl.png
www/icons/htdig/buttonr.gif
www/icons/htdig/buttonr.png
www/icons/htdig/htdig.gif
www/icons/htdig/htdig.png
www/icons/htdig/star.gif
www/icons/htdig/star.png
www/icons/htdig/star_blank.gif
www/icons/htdig/star_blank.png

@ -0,0 +1,9 @@
SUBDIR =
SUBDIR += 3rdparty
SUBDIR += dependencies
SUBDIR += tdelibs
SUBDIR += tdebase
.include <bsd.port.subdir.mk>

@ -0,0 +1,10 @@
SUBDIR =
SUBDIR += tqt3
SUBDIR += tqtinterface
SUBDIR += arts
SUBDIR += dbus-tqt
SUBDIR += dbus-1-tqt
.include <bsd.port.subdir.mk>

@ -0,0 +1,62 @@
VERSION= 1.5.10
REVISION= 1
PKGNAME= trinity-arts-${VERSION}
PREFIX= ${TDE_PREFIX}
CATEGORIES= x11/trinity
COMMENT= aRts (analog realtime synthesizer) - the TDE sound system
MASTER_SITES= http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
DISTNAME= trinity-arts-14.0.0~pre128+e39b3d2d
EXTRACT_SUFX= .tar.gz
BUILD_DEPENDS= devel/gmake \
devel/cmake \
x11/trinity/dependencies/tqtinterface,-devel
LIB_DEPENDS= devel/libaudiofile \
devel/glib2 \
audio/libvorbis \
audio/libogg \
audio/libmad \
x11/trinity/dependencies/tqtinterface,-main \
x11/trinity/dependencies/tqtinterface,-devel
WANTLIB = glib-2.0 audiofile mad ogg vorbis
SHARED_LIBS += artsc 0.0
SHARED_LIBS += artscbackend 0.0
SHARED_LIBS += artsdsp 0.0
SHARED_LIBS += artsdsp_st 0.0
SHARED_LIBS += artsflow 1.0
SHARED_LIBS += artsflow_idl 1.0
SHARED_LIBS += artsgslplayobject 0.0
SHARED_LIBS += artswavplayobject 0.0
SHARED_LIBS += gmcop 1.0
SHARED_LIBS += kmedia2 1.0
SHARED_LIBS += kmedia2_idl 1.0
SHARED_LIBS += mcop 1.0
SHARED_LIBS += mcop_mt 1.0
SHARED_LIBS += qtmcop 1.0
SHARED_LIBS += soundserver_idl 1.0
.include </usr/ports/x11/trinity/trinity.port.mk>
do-configure: tde-cmake-rmbuild
${TDE_CMAKE_CONFIGURE} \
-DINCLUDE_INSTALL_DIR="${TDE_PREFIX}/include/tde/arts" \
\
-DWITH_ALSA=OFF \
-DWITH_AUDIOFILE=ON \
-DWITH_VORBIS=ON \
-DWITH_MAD=ON \
-DWITH_ESOUND=OFF \
-DWITH_JACK=OFF \
-DWITH_SNDIO=ON
do-build: tde-cmake-build
do-install: tde-cmake-install
.include <bsd.port.mk>

@ -0,0 +1,2 @@
SHA256 (trinity-arts-14.0.0~pre128+e39b3d2d.tar.gz) = +F6KrdH1OgPIJVnVo6dT1KR9QVYUx5aE5Tu6CDVzbBM=
SIZE (trinity-arts-14.0.0~pre128+e39b3d2d.tar.gz) = 953382

@ -0,0 +1,11 @@
arts (analog real-time synthesizer) is the sound system of TDE.
The principle of arts is to create/process sound using small modules which do
certain tasks. These may be create a waveform (oscillators), play samples,
filter data, add signals, perform effects like delay/flanger/chorus, or
output the data to the soundcard.
By connecting all those small modules together, you can perform complex
tasks like simulating a mixer, generating an instrument or things like
playing a wave file with some effects.

@ -0,0 +1,158 @@
@comment $OpenBSD$
bin/
bin/artsc-config
@bin bin/artscat
@bin bin/artsd
bin/artsdsp
@bin bin/artsplay
@bin bin/artsrec
@bin bin/artsshell
@bin bin/artswrapper
@bin bin/mcopidl
include/
include/artsc/
include/artsc/artsc.h
include/artsc/artsc_export.h
include/tde/
include/tde/arts/
include/tde/arts/anyref.h
include/tde/arts/arts_export.h
include/tde/arts/artsflow.h
include/tde/arts/artsflow.idl
include/tde/arts/artsversion.h
include/tde/arts/asyncstream.h
include/tde/arts/audioio.h
include/tde/arts/audiosubsys.h
include/tde/arts/buffer.h
include/tde/arts/bufferqueue.h
include/tde/arts/cache.h
include/tde/arts/cachedwav.h
include/tde/arts/common.h
include/tde/arts/connect.h
include/tde/arts/connection.h
include/tde/arts/convert.h
include/tde/arts/core.h
include/tde/arts/core.idl
include/tde/arts/cpuinfo.h
include/tde/arts/datapacket.h
include/tde/arts/debug.h
include/tde/arts/delayedreturn.h
include/tde/arts/dispatcher.h
include/tde/arts/dynamicrequest.h
include/tde/arts/dynamicskeleton.h
include/tde/arts/extensionloader.h
include/tde/arts/factory.h
include/tde/arts/fft.h
include/tde/arts/flowsystem.h
include/tde/arts/giomanager.h
include/tde/arts/gsl/
include/tde/arts/gsl/gslcommon.h
include/tde/arts/gsl/gslconfig.h
include/tde/arts/gsl/gslconvert.h
include/tde/arts/gsl/gsldatacache.h
include/tde/arts/gsl/gsldatahandle-mad.h
include/tde/arts/gsl/gsldatahandle-vorbis.h
include/tde/arts/gsl/gsldatahandle.h
include/tde/arts/gsl/gsldatautils.h
include/tde/arts/gsl/gsldefs.h
include/tde/arts/gsl/gslengine.h
include/tde/arts/gsl/gslfft.h
include/tde/arts/gsl/gslfilter.h
include/tde/arts/gsl/gslieee754.h
include/tde/arts/gsl/gslloader.h
include/tde/arts/gsl/gslmagic.h
include/tde/arts/gsl/gslmath.h
include/tde/arts/gsl/gsloscillator.h
include/tde/arts/gsl/gslosctable.h
include/tde/arts/gsl/gslsignal.h
include/tde/arts/gsl/gslwavechunk.h
include/tde/arts/gsl/gslwaveosc.h
include/tde/arts/gslschedule.h
include/tde/arts/idlfilereg.h
include/tde/arts/ifacerepo_impl.h
include/tde/arts/iomanager.h
include/tde/arts/kmedia2.h
include/tde/arts/kmedia2.idl
include/tde/arts/mcopconfig.h
include/tde/arts/mcoputils.h
include/tde/arts/notification.h
include/tde/arts/object.h
include/tde/arts/objectmanager.h
include/tde/arts/pipebuffer.h
include/tde/arts/pool.h
include/tde/arts/qiomanager.h
include/tde/arts/reference.h
include/tde/arts/referenceclean.h
include/tde/arts/resample.h
include/tde/arts/socketconnection.h
include/tde/arts/soundserver.h
include/tde/arts/soundserver.idl
include/tde/arts/startupmanager.h
include/tde/arts/stdsynthmodule.h
include/tde/arts/synthschedule.h
include/tde/arts/tcpconnection.h
include/tde/arts/tcpserver.h
include/tde/arts/thread.h
include/tde/arts/type.h
include/tde/arts/unixconnection.h
include/tde/arts/unixserver.h
include/tde/arts/weakreference.h
lib/
lib/libartsc.la
@lib lib/libartsc.so.${LIBartsc_VERSION}
lib/libartscbackend.la
@lib lib/libartscbackend.so.${LIBartscbackend_VERSION}
lib/libartsdsp.la
@lib lib/libartsdsp.so.${LIBartsdsp_VERSION}
lib/libartsdsp_st.la
@lib lib/libartsdsp_st.so.${LIBartsdsp_st_VERSION}
lib/libartsflow.la
@lib lib/libartsflow.so.${LIBartsflow_VERSION}
lib/libartsflow_idl.la
@lib lib/libartsflow_idl.so.${LIBartsflow_idl_VERSION}
lib/libartsgsl.a
lib/libartsgslplayobject.la
@lib lib/libartsgslplayobject.so.${LIBartsgslplayobject_VERSION}
lib/libartswavplayobject.la
@lib lib/libartswavplayobject.so.${LIBartswavplayobject_VERSION}
lib/libgmcop.la
@lib lib/libgmcop.so.${LIBgmcop_VERSION}
lib/libkmedia2.la
@lib lib/libkmedia2.so.${LIBkmedia2_VERSION}
lib/libkmedia2_idl.la
@lib lib/libkmedia2_idl.so.${LIBkmedia2_idl_VERSION}
lib/libmcop.la
@lib lib/libmcop.so.${LIBmcop_VERSION}
lib/libmcop_mt.la
@lib lib/libmcop_mt.so.${LIBmcop_mt_VERSION}
lib/libqtmcop.la
@lib lib/libqtmcop.so.${LIBqtmcop_VERSION}
lib/libsoundserver_idl.la
@lib lib/libsoundserver_idl.so.${LIBsoundserver_idl_VERSION}
lib/mcop/
lib/mcop/Arts/
lib/mcop/Arts/DataHandlePlay.mcopclass
lib/mcop/Arts/FileInputStream.mcopclass
lib/mcop/Arts/GSLPlayObject.mcopclass
lib/mcop/Arts/Synth_ADD.mcopclass
lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
lib/mcop/Arts/Synth_FREQUENCY.mcopclass
lib/mcop/Arts/Synth_MUL.mcopclass
lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
lib/mcop/Arts/Synth_PLAY.mcopclass
lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
lib/mcop/Arts/Synth_RECORD.mcopclass
lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
lib/mcop/Arts/WavPlayObject.mcopclass
lib/mcop/Arts/WaveDataHandle.mcopclass
lib/mcop/artsflow.mcopclass
lib/mcop/artsflow.mcoptype
lib/mcop/kmedia2.mcopclass
lib/mcop/kmedia2.mcoptype
lib/mcop/soundserver.mcopclass
lib/mcop/soundserver.mcoptype
lib/pkgconfig/
lib/pkgconfig/arts.pc

@ -0,0 +1,32 @@
.include </usr/ports/x11/trinity/trinity.port.mk>
VERSION= 0.9
REVISION= 1
PKGNAME= trinity-dbus_1_tqt-${VERSION}
PREFIX= ${TDE_PREFIX}
CATEGORIES= x11/trinity
COMMENT= dbus TQT Interface
MASTER_SITES= http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
DISTNAME= trinity-dbus-1-tqt-14.0.0~pre114+faf70d2c
EXTRACT_SUFX= .tar.gz
BUILD_DEPENDS= devel/gmake \
devel/cmake \
x11/dbus \
x11/trinity/dependencies/tqtinterface
LIB_DEPENDS= x11/dbus
SHARED_LIBS += dbus-1-tqt 0.0
do-configure: tde-cmake-rmbuild
${TDE_CMAKE_CONFIGURE}
do-build: tde-cmake-build
do-install: tde-cmake-install
.include <bsd.port.mk>

@ -0,0 +1,23 @@
@comment $OpenBSD$
bin/
@bin bin/dbusxml2qt3
include/
include/tde/
include/tde/tqdbusconnection.h
include/tde/tqdbusdata.h
include/tde/tqdbusdataconverter.h
include/tde/tqdbusdatalist.h
include/tde/tqdbusdatamap.h
include/tde/tqdbuserror.h
include/tde/tqdbusmacros.h
include/tde/tqdbusmessage.h
include/tde/tqdbusobject.h
include/tde/tqdbusobjectpath.h
include/tde/tqdbusproxy.h
include/tde/tqdbusunixfd.h
include/tde/tqdbusvariant.h
lib/
lib/libdbus-1-tqt.la
@lib lib/libdbus-1-tqt.so.${LIBdbus-1-tqt_VERSION}
lib/pkgconfig/
lib/pkgconfig/dbus-1-tqt.pc

@ -0,0 +1,32 @@
.include </usr/ports/x11/trinity/trinity.port.mk>
VERSION= 0.63
REVISION= 1
PKGNAME= trinity-dbus-tqt-${VERSION}
PREFIX= ${TDE_PREFIX}
CATEGORIES= x11/trinity
COMMENT= Dbus TQT Interface
MASTER_SITES= http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
DISTNAME= trinity-dbus-tqt-14.0.0~pre100+bc50efff
EXTRACT_SUFX= .tar.gz
BUILD_DEPENDS= devel/gmake \
devel/cmake \
x11/dbus \
x11/trinity/dependencies/tqtinterface,-main \
x11/trinity/dependencies/tqtinterface,-devel
LIB_DEPENDS= x11/dbus
SHARED_LIBS += dbus-tqt-1 0.0
do-configure: tde-cmake-rmbuild
${TDE_CMAKE_CONFIGURE}
do-build: tde-cmake-build
do-install: tde-cmake-install
.include <bsd.port.mk>

@ -0,0 +1,14 @@
@comment $OpenBSD$
include/
include/tde/
include/tde/dbus-1.0/
include/tde/dbus-1.0/dbus/
include/tde/dbus-1.0/dbus/connection.h
include/tde/dbus-1.0/dbus/dbus-qt.h
include/tde/dbus-1.0/dbus/message.h
include/tde/dbus-1.0/dbus/server.h
lib/
lib/libdbus-tqt-1.la
@lib lib/libdbus-tqt-1.so.${LIBdbus-tqt-1_VERSION}
lib/pkgconfig/
lib/pkgconfig/dbus-tqt.pc

@ -0,0 +1,273 @@
PKGNAME= trinity-tqt3-${VERSION}
VERSION= 3.5.0
DISTNAME= trinity-tqt3-14.0.0~pre216+d9d3dd45
EXTRACT_SUFX= .tar.gz
CATEGORIES= x11/trinity/dependencies
MASTER_SITES= http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
HOMEPAGE= http://www.trinitydesktop.org/
MAINTAINER= François Andriot <francois.andriot@free.fr>
SHARED_LIBS =
SHARED_LIBS += tqtdesignercore 1.0
SHARED_LIBS += tqteditor 1.0
SHARED_LIBS += tqassistantclient 1.0
SHARED_LIBS += tqt-mt 35.0
SHARED_LIBS += tqui 1.0
PROGRAMS3=designer findtr moc qt20fix qtrename140 uic
PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig
# XXX be sure to update the yqt3.port.mk version after a qt bump.
QT_PLUGINS= plugins-${LIBtqt-mt_VERSION:R}
FLAVORS=debug
FLAVOR?=
# GPL/QPL
PERMIT_PACKAGE_CDROM= Yes
# For qsettings to write its setup
PORTHOME= ${WRKDIST}
LIB_DEPENDS= graphics/png \
graphics/libmng
WANTLIB= GL GLU ICE SM X11>=10 Xcursor Xext Xft Xi Xinerama \
Xmu png mng \
Xrandr Xrender fontconfig freetype jpeg lcms m stdc++ z
BUILD_DEPENDS= print/cups,-libs \
devel/gmake
MULTI_PACKAGES+=-main -html -mysql -postgresql -sqlite2
# DEBUG flavor
.if ${FLAVOR:Mdebug}
CONFIGURE_ARGS+=-debug
PKGDEBUG=-debug
.else
PKGDEBUG=
.endif
.include <bsd.port.arch.mk>
# MAIN package
PKGNAME-main= trinity-tqt3-mt-${VERSION}
REVISION-main= 1
COMMENT-main= C++ X11 GUI toolkit
WANTLIB-main= ${WANTLIB} pthread c
# MYSQL package
PKGNAME-mysql= trinity-tqt3-mysql-${VERSION}
REVISION-mysql= 1
COMMENT-mysql= MySQL plugin for tqt3
.if ${BUILD_PACKAGES:M-mysql}
CONFIGURE_ARGS+= -I${LOCALBASE}/include/mysql -L${LOCALBASE}/lib/mysql -plugin-sql-mysql
.else
CONFIGURE_ARGS+=-no-sql-mysql
.endif
LIB_DEPENDS-mysql= ${LIB_DEPENDS} ${BUILD_PKGPATH} databases/mysql
WANTLIB-mysql= ${WANTLIB} mysqlclient tqt-mt
# POSTGRESQL package
PKGNAME-postgresql= trinity-tqt3-postgresql-${VERSION}
REVISION-postgresql= 1
COMMENT-postgresql= PostgresSQL plugin for tqt3
.if ${BUILD_PACKAGES:M-postgresql}
BUILD_DEPENDS+=databases/postgresql,-server
CONFIGURE_ARGS+= -I${LOCALBASE}/include/postgresql \
-I${LOCALBASE}/include/postgresql/server \
-L${LOCALBASE}/lib \
-I${LOCALBASE}/include -plugin-sql-psql
.else
CONFIGURE_ARGS+=-no-sql-psql
.endif
LIB_DEPENDS-postgresql= ${LIB_DEPENDS} ${BUILD_PKGPATH} databases/postgresql
WANTLIB-postgresql= ${WANTLIB} pq
# SQLITE2 package
PKGNAME-sqlite2= trinity-tqt3-sqlite2-${VERSION}
REVISION-sqlite2= 1
COMMENT-sqlite2= sqlite2 plugin for tqt3
.if ${BUILD_PACKAGES:M-sqlite2}
CONFIGURE_ARGS+= -plugin-sql-sqlite
.else
CONFIGURE_ARGS+=-no-sql-sqlite
.endif
LIB_DEPENDS-sqlite2= ${LIB_DEPENDS} ${BUILD_PKGPATH} databases/sqlite
WANTLIB-sqlite2= ${WANTLIB} sqlite
# HTML package
COMMENT-html= off-line html documentation for tqt3
FULLPKGNAME-html= trinity-tqt3-html-${VERSION}
FULLPKGPATH-html= x11/trinity/tqt3,-html
REVISION-html= 1
LIB_DEPENDS-html=
WANTLIB-html=
PKG_ARCH-html= *
# for manpages in MESSAGE
SUBST_VARS= QT_PLUGINS
DOCS= FAQ LICENSE.GPL2 LICENSE.GPL3 README README-QT.TXT \
changes-3* \
README.immodule changes.immodule
NO_TEST= Yes
# Build options.
USE_GROFF = Yes
MAKE_ENV= QTDIR="${WRKDIST}" \
PATH="${WRKDIST}/bin:${PATH}" \
EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
SYS_CXX="${CXX}" \
SYS_CXXFLAGS="${CXXFLAGS}" \
LD_LIBRARY_PATH="${WRKDIST}/lib"
MAKE_FLAGS= DESIGNER_SUBDIR=dummy \
LIBtqt-mt_VERSION=$(LIBtqt-mt_VERSION) \
LIBtqui_VERSION=$(LIBtqui_VERSION) \
LIBtqteditor_VERSION=$(LIBtqteditor_VERSION) \
LIBtqassistantclient_VERSION=$(LIBtqassistantclient_VERSION) \
LIBtqtdesignercore_VERSION=$(LIBtqtdesignercore_VERSION)
GMAKE= cd ${WRKDIST} && gmake ${MAKE_ENV} ${MAKE_FLAGS}
# Configuration step.
CONFIGURE_ENV= QTDIR="${WRKSRC}" \
PATH=${WRKDIST}/bin:${PATH}; \
LD_LIBRARY_PATH="${WRKDIST}/lib"
post-patch:
# fix variables in 'qmake.conf'
gsed -i ${WRKDIST}/mkspecs/*/qmake.conf \
-e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/local/include/tqt3|" \
-e "s|\$\(QTDIR\)|${LOCALBASE}|g" \
-e "s|-lqt|-ltqt|g" \
-e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = ${CXXFLAGS}|" \
-e "s|^QMAKE_INCDIR =.*|QMAKE_INCDIR = ${LOCALBASE}/include|" \
-e "s|^QMAKE_LIBDIR =.*|QMAKE_LIBDIR = ${LOCALBASE}/lib|" \
-e "s|^QMAKE_RPATH = .*|QMAKE_RPATH =|" \
-e "s|^QMAKE_STRIP =.*|QMAKE_STRIP =|" \
-e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" \
-e "s|^QMAKE_MOC =.*|QMAKE_MOC = ${LOCALBASE}/bin/tqmoc|" \
-e "s|^QMAKE_UIC =.*|QMAKE_UIC = ${LOCALBASE}/bin/tquic|" \
-e "s|^QMAKE_INCDIR_QT =.*|QMAKE_INCDIR_QT = ${LOCALBASE}/include/tqt3|" \
-e "s|^QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = ${LOCALBASE}/lib|"
gsed -i ${WRKDIST}/mkspecs/openbsd-g++/qmake.conf \
-e "s|^QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME =|" \
-e "s|^CONFIG += qt warn_on release link_prl|CONFIG += qt warn_on release link_prl thread|"
echo "QMAKE_OPENBSD_SHLIBS = 1" >>"${WRKDIST}/mkspecs/openbsd-g++/qmake.conf"
do-configure:
cd ${WRKDIST} && echo yes | ./configure \
${CONFIGURE_ARGS} \
-I${X11BASE}/include/freetype2 \
-I${LOCALBASE}/include \
-L${WRKSRC}/lib \
-L${LOCALBASE}/lib \
\
-prefix "${LOCALBASE}" \
-headerdir "${LOCALBASE}/include/tqt3" \
-libdir "${LOCALBASE}/lib" \
-plugindir "${LOCALBASE}/lib/tqt3/plugins" \
-datadir "${LOCALBASE}/share/tqt3" \
-docdir "${LOCALBASE}/share/doc/tqt3" \
-translationdir "${LOCALBASE}/share/tqt3/translations" \
-sysconfdir "/etc/tqt3" \
\
-thread \
-shared \
-fast \
-no-exceptions \
-platform openbsd-g++ \
\
-no-pch \
-cups \
-stl \
-ipv6 \
\
-sm \
-xshape \
-xinerama \
-xcursor \
-xrandr \
-xrender \
-xft \
-tablet \
-xkb \
\
-system-zlib \
-system-libpng \
-system-libmng \
-system-libjpeg \
-no-nas-sound \
\
-enable-opengl \
-dlopen-opengl \
\
-qt-gif \
-qt-imgfmt-mng \
-qt-imgfmt-png \
-qt-imgfmt-jpeg \
-plugin-imgfmt-mng \
\
-no-sql-odbc \
-no-sql-ibase \
-no-sql-sqlite3 \
\
-lfontconfig \
-inputmethod \
-glibmainloop \
-v
# Build step.
do-build:
# proceed
${GMAKE} sub-src sub-plugins sub-tools
# build tqtconv2ui
${GMAKE} -C tools/designer/tools/tqtconv2ui
# build tqvfb
${GMAKE} -C tools/tqvfb
# fix .prl files
gsed -i ${WRKDIST}/lib/*.prl -e "s|${WRKDIST}|${LOCALBASE}/share/tqt3|g"
# Installation step.
pre-install:
# Clean up patch residual files
find ${WRKDIST} -name "*.orig" | xargs rm -f
do-install:
# Installs 'libtqt-mt.so.3' library
${GMAKE} -C src INSTALL_ROOT=${WRKINST} install_target
# Installs all the remaining
${GMAKE} INSTALL_ROOT=${WRKINST} install
${GMAKE} INSTALL_ROOT=${WRKINST} plugins-install
install -m755 ${WRKDIST}/bin/tqtrename140 ${WRKINST}${LOCALBASE}/bin
install -m755 ${WRKDIST}/bin/tqt20fix ${WRKINST}${LOCALBASE}/bin
install -m755 ${WRKDIST}/bin/tqtfindtr ${WRKINST}${LOCALBASE}/bin
# install tqtconv2ui
install -m755 ${WRKDIST}/bin/tqtconv2ui ${WRKINST}${LOCALBASE}/bin/tqtconv2ui
# install tqvfb
install -m755 ${WRKDIST}/tools/tqvfb/tqvfb ${WRKINST}${LOCALBASE}/bin/tqvfb
.include <bsd.port.mk>

@ -0,0 +1,2 @@
SHA256 (trinity-tqt3-14.0.0~pre216+d9d3dd45.tar.gz) = Y3PmJ+rkyyXKkydrfIKJqPeQraG8WBBDFEFAf64OzXI=
SIZE (trinity-tqt3-14.0.0~pre216+d9d3dd45.tar.gz) = 17536857

@ -0,0 +1,17 @@
--- src/kernel/ntqstyle.h.orgi Wed Aug 20 19:21:35 2014
+++ src/kernel/ntqstyle.h Wed Aug 20 19:23:23 2014
@@ -287,14 +287,8 @@
TQ_UINT32 topLevelWidgetFlags;
TQPixmap paletteBgPixmap;
-#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
public:
TQStyleControlElementData(const TQStyleControlElementData&);
-#else // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
- private:
- // Disable copy constructor
- TQStyleControlElementData(const TQStyleControlElementData&);
-#endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
};

@ -0,0 +1,68 @@
--- src/tools/qfile.cpp.orig Fri Sep 5 20:07:14 2014
+++ src/tools/qfile.cpp Fri Sep 5 20:11:15 2014
@@ -73,8 +73,13 @@
{
public:
TQString errorString;
+ int lastAccess;
};
+#define ACCESS_NONE -1
+#define ACCESS_READ 0
+#define ACCESS_WRITE 1
+
extern bool qt_file_access( const TQString& fn, int t );
/*!
@@ -199,6 +204,7 @@
{
delete d;
d = new TQFilePrivate;
+ d->lastAccess = ACCESS_NONE;
setFlags( IO_Direct );
setStatus( IO_Ok );
setErrorString( qt_fileerr_unknown );
@@ -385,6 +391,10 @@
if ( isRaw() ) { // raw file
nread = TQIODevice::readLine( p, maxlen );
} else { // buffered file
+ if (d->lastAccess == ACCESS_WRITE) {
+ ::fseek(fh, 0, SEEK_CUR);
+ d->lastAccess = ACCESS_READ;
+ }
p = fgets( p, maxlen, fh );
if ( p ) {
nread = tqstrlen( p );
@@ -466,6 +476,10 @@
char buf[1];
ch = readBlock( buf, 1 ) == 1 ? buf[0] : EOF;
} else { // buffered file
+ if (d->lastAccess == ACCESS_WRITE) {
+ ::fseek(fh, 0, SEEK_CUR);
+ d->lastAccess = ACCESS_READ;
+ }
if ( (ch = getc( fh )) != EOF ) {
if ( !isSequentialAccess() )
ioIndex++;
@@ -502,6 +516,10 @@
buf[0] = ch;
ch = writeBlock( buf, 1 ) == 1 ? ch : EOF;
} else { // buffered file
+ if (d->lastAccess == ACCESS_READ) {
+ ::fseek(fh, 0, SEEK_CUR);
+ d->lastAccess = ACCESS_WRITE;
+ }
if ( (ch = putc( ch, fh )) != EOF ) {
if ( !isSequentialAccess() )
ioIndex++;
@@ -556,6 +574,10 @@
else
ch = EOF;
} else { // buffered file
+ if (d->lastAccess == ACCESS_WRITE) {
+ ::fseek(fh, 0, SEEK_CUR);
+ d->lastAccess = ACCESS_READ;
+ }
if ( (ch = ungetc(ch, fh)) != EOF ) {
if ( !isSequentialAccess() )
ioIndex--;

@ -0,0 +1,54 @@
--- src/tools/qfile_unix.cpp.orig Fri Sep 5 20:17:49 2014
+++ src/tools/qfile_unix.cpp Fri Sep 5 20:20:59 2014
@@ -56,6 +56,17 @@
#include <errno.h>
#include <limits.h>
+class TQFilePrivate
+{
+public:
+ TQString errorString;
+ int lastAccess;
+};
+
+#define ACCESS_NONE -1
+#define ACCESS_READ 0
+#define ACCESS_WRITE 1
+
extern const char* qt_fileerr_read;
bool qt_file_access( const TQString& fn, int t )
@@ -525,6 +536,7 @@
#else
ok = ( ::fseek(fh, pos, SEEK_SET) == 0 );
#endif
+ d->lastAccess = ACCESS_NONE;
}
if ( ok )
#if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
@@ -593,6 +605,10 @@
setErrorStringErrno( errno );
}
} else { // buffered file
+ if (d->lastAccess == ACCESS_WRITE) {
+ ::fseek(fh, 0, SEEK_CUR);
+ d->lastAccess = ACCESS_READ;
+ }
nread += fread( p, 1, len-nread, fh );
if ( (uint)nread != len ) {
if ( ferror( fh ) || nread==0 ) {
@@ -644,8 +660,13 @@
TQ_ULONG nwritten; // number of bytes written
if ( isRaw() ) // raw file
nwritten = ::write( fd, (void *)p, len );
- else // buffered file
+ else { // buffered file
+ if (d->lastAccess == ACCESS_READ) {
+ ::fseek(fh, 0, SEEK_CUR);
+ d->lastAccess = ACCESS_WRITE;
+ }
nwritten = fwrite( p, 1, len, fh );
+ }
if ( nwritten != len ) { // write error
if ( errno == ENOSPC ) // disk is full
setStatus( IO_ResourceError );

@ -0,0 +1 @@
This is an off-line copy of the tqt3 documentation

@ -0,0 +1,29 @@
TQt is a toolkit for building a GUI for X in C++.
There are some user documentation files in ${TQT_DOC}, but
the main documentation is in the qt3-html package,
or on the web.
There are database plugins: tqt3-mysql and tqt3-postgresql.
People who want to use tqt3 to compile applications outside the ports tree
should note that tqt3's installation conforms to OpenBSD habits, not
TrollTech's recommendations.
Accordingly:
- libs are separated from includes.
- moc is installed as ${PREFIX}/bin/moc3, in order not to conflict
with other qt versions.
- uic is installed as ${PREFIX}/bin/uic3
Generally, it's just a question of invoking
env MOC=moc3 UIC=uic3 configure --with-qt-includes=${PREFIX}/include/X11/qt3
--with-qt-libraries=${PREFIX}/lib/tqt3
Or to force MOC/UIC in your make/gmake invocation:
make MOC=moc3 UIC=uic3
will override the Makefile contents.
Warning: the tqt3 library also appears under ${PREFIX}/lib, but you
*must* make sure your application sees ${PREFIX}/lib/tqt3 *first*, because
${PREFIX}/lib may also contain a later incarnation of Qt, in which case
the linker will pick up the most recent library.

@ -0,0 +1 @@
database plugin (MySQL) for tqt3.

@ -0,0 +1 @@
database plugin (PostgreSQL) for tqt3

@ -0,0 +1,3 @@
database plugin (sqlite2) for tqt3.
There is no sqlite3 plugin for tqt3.
The sqlite2 plugin can be used by kphotoalbum.

@ -0,0 +1,20 @@
@comment $OpenBSD$
@lib lib/libtqassistantclient.so.${LIBtqassistantclient_VERSION}
@lib lib/libtqt-mt.so.${LIBtqt-mt_VERSION}
@lib lib/libtqtdesignercore.so.${LIBtqtdesignercore_VERSION}
@lib lib/libtqteditor.so.${LIBtqteditor_VERSION}
@lib lib/libtqui.so.${LIBtqui_VERSION}
lib/tqt3/plugins/designer/libcppeditor.so
lib/tqt3/plugins/designer/libdlgplugin.so
lib/tqt3/plugins/designer/libgladeplugin.so
lib/tqt3/plugins/designer/libkdevdlgplugin.so
lib/tqt3/plugins/designer/librcplugin.so
lib/tqt3/plugins/designer/libwizards.so
lib/tqt3/plugins/imageformats/libqmng.so
lib/tqt3/plugins/inputmethods/libqimsw-multi.so
lib/tqt3/plugins/inputmethods/libqimsw-none.so
lib/tqt3/plugins/inputmethods/libqsimple.so
lib/tqt3/plugins/inputmethods/libqxim.so
lib/tqt3/plugins/sqldrivers/libqsqlite.so
lib/tqt3/plugins/sqldrivers/libqsqlmysql.so
lib/tqt3/plugins/sqldrivers/libqsqlpsql.so

File diff suppressed because it is too large Load Diff

@ -0,0 +1,673 @@
@comment $OpenBSD$
%%SHARED%%
@bin bin/maketqpf
@bin bin/msg2tqm
@bin bin/tqassistant
@bin bin/tqdesigner
@bin bin/tqembed
@bin bin/tqlinguist
@bin bin/tqlrelease
@bin bin/tqlupdate
@bin bin/tqm2ts
@bin bin/tqmake
@bin bin/tqmoc
bin/tqt20fix
@bin bin/tqtconfig
@bin bin/tqtconv2ui
@bin bin/tqtcreatecw
bin/tqtfindtr
@bin bin/tqtmergetr
bin/tqtrename140
@bin bin/tquic
@bin bin/tqvfb
include/tqt3/
include/tqt3/ntq1xcompatibility.h
include/tqt3/ntqabstractlayout.h
include/tqt3/ntqaccel.h
include/tqt3/ntqaccessible.h
include/tqt3/ntqaction.h
include/tqt3/ntqapp.h
include/tqt3/ntqapplication.h
include/tqt3/ntqarray.h
include/tqt3/ntqasciicache.h
include/tqt3/ntqasciidict.h
include/tqt3/ntqassistantclient.h
include/tqt3/ntqasyncimageio.h
include/tqt3/ntqasyncio.h
include/tqt3/ntqbig5codec.h
include/tqt3/ntqbitarray.h
include/tqt3/ntqbitarry.h
include/tqt3/ntqbitmap.h
include/tqt3/ntqbrush.h
include/tqt3/ntqbttngrp.h
include/tqt3/ntqbuffer.h
include/tqt3/ntqbutton.h
include/tqt3/ntqbuttongroup.h
include/tqt3/ntqcache.h
include/tqt3/ntqcanvas.h
include/tqt3/ntqcdestyle.h
include/tqt3/ntqcheckbox.h
include/tqt3/ntqchkbox.h
include/tqt3/ntqcleanuphandler.h
include/tqt3/ntqclipboard.h
include/tqt3/ntqclipbrd.h
include/tqt3/ntqcollect.h
include/tqt3/ntqcollection.h
include/tqt3/ntqcolor.h
include/tqt3/ntqcolordialog.h
include/tqt3/ntqcombo.h
include/tqt3/ntqcombobox.h
include/tqt3/ntqcommonstyle.h
include/tqt3/ntqcompactstyle.h
include/tqt3/ntqconfig.h
include/tqt3/ntqconnect.h
include/tqt3/ntqconnection.h
include/tqt3/ntqcstring.h
include/tqt3/ntqcursor.h
include/tqt3/ntqdatabrowser.h
include/tqt3/ntqdatastream.h
include/tqt3/ntqdatatable.h
include/tqt3/ntqdataview.h
include/tqt3/ntqdatetime.h
include/tqt3/ntqdatetimeedit.h
include/tqt3/ntqdatetm.h
include/tqt3/ntqdeepcopy.h
include/tqt3/ntqdesktopwidget.h
include/tqt3/ntqdial.h
include/tqt3/ntqdialog.h
include/tqt3/ntqdict.h
include/tqt3/ntqdir.h
include/tqt3/ntqdns.h
include/tqt3/ntqdockarea.h
include/tqt3/ntqdockwindow.h
include/tqt3/ntqdom.h
include/tqt3/ntqdragobject.h
include/tqt3/ntqdrawutil.h
include/tqt3/ntqdrawutl.h
include/tqt3/ntqdropsite.h
include/tqt3/ntqdstream.h
include/tqt3/ntqeditorfactory.h
include/tqt3/ntqerrormessage.h
include/tqt3/ntqeucjpcodec.h
include/tqt3/ntqeuckrcodec.h
include/tqt3/ntqevent.h
include/tqt3/ntqeventloop.h
include/tqt3/ntqfeatures.h
include/tqt3/ntqfile.h
include/tqt3/ntqfiledef.h
include/tqt3/ntqfiledialog.h
include/tqt3/ntqfiledlg.h
include/tqt3/ntqfileinf.h
include/tqt3/ntqfileinfo.h
include/tqt3/ntqfocusdata.h
include/tqt3/ntqfont.h
include/tqt3/ntqfontdatabase.h
include/tqt3/ntqfontdialog.h
include/tqt3/ntqfontinf.h
include/tqt3/ntqfontinfo.h
include/tqt3/ntqfontmet.h
include/tqt3/ntqfontmetrics.h
include/tqt3/ntqframe.h
include/tqt3/ntqftp.h
include/tqt3/ntqgarray.h
include/tqt3/ntqgb18030codec.h
include/tqt3/ntqgbkcodec.h
include/tqt3/ntqgcache.h
include/tqt3/ntqgdict.h
include/tqt3/ntqgeneric.h
include/tqt3/ntqgif.h
include/tqt3/ntqgl.h
include/tqt3/ntqglcolormap.h
include/tqt3/ntqglist.h
include/tqt3/ntqglobal.h
include/tqt3/ntqgplugin.h
include/tqt3/ntqgrid.h
include/tqt3/ntqgridview.h
include/tqt3/ntqgroupbox.h
include/tqt3/ntqgrpbox.h
include/tqt3/ntqguardedptr.h
include/tqt3/ntqgvector.h
include/tqt3/ntqhbox.h
include/tqt3/ntqhbuttongroup.h
include/tqt3/ntqheader.h
include/tqt3/ntqhgroupbox.h
include/tqt3/ntqhostaddress.h
include/tqt3/ntqhttp.h
include/tqt3/ntqiconset.h
include/tqt3/ntqiconview.h
include/tqt3/ntqimage.h
include/tqt3/ntqimageformatplugin.h
include/tqt3/ntqinputcontext.h
include/tqt3/ntqinputcontextfactory.h
include/tqt3/ntqinputcontextplugin.h
include/tqt3/ntqinputdialog.h
include/tqt3/ntqintcach.h
include/tqt3/ntqintcache.h
include/tqt3/ntqintdict.h
include/tqt3/ntqinterlacestyle.h
include/tqt3/ntqiodev.h
include/tqt3/ntqiodevice.h
include/tqt3/ntqjiscodec.h
include/tqt3/ntqjpegio.h
include/tqt3/ntqjpunicode.h
include/tqt3/ntqkeycode.h
include/tqt3/ntqkeysequence.h
include/tqt3/ntqlabel.h
include/tqt3/ntqlayout.h
include/tqt3/ntqlcdnum.h
include/tqt3/ntqlcdnumber.h
include/tqt3/ntqlibrary.h
include/tqt3/ntqlined.h
include/tqt3/ntqlineedit.h
include/tqt3/ntqlist.h
include/tqt3/ntqlistbox.h
include/tqt3/ntqlistview.h
include/tqt3/ntqlocale.h
include/tqt3/ntqlocalfs.h
include/tqt3/ntqmainwindow.h
include/tqt3/ntqmap.h
include/tqt3/ntqmemarray.h
include/tqt3/ntqmenubar.h
include/tqt3/ntqmenudata.h
include/tqt3/ntqmenudta.h
include/tqt3/ntqmessagebox.h
include/tqt3/ntqmetaobj.h
include/tqt3/ntqmetaobject.h
include/tqt3/ntqmime.h
include/tqt3/ntqmlined.h
include/tqt3/ntqmngio.h
include/tqt3/ntqmodules.h
include/tqt3/ntqmotifplusstyle.h
include/tqt3/ntqmotifstyle.h
include/tqt3/ntqmovie.h
include/tqt3/ntqmsgbox.h
include/tqt3/ntqmultilinedit.h
include/tqt3/ntqmultilineedit.h
include/tqt3/ntqmutex.h
include/tqt3/ntqnamespace.h
include/tqt3/ntqnetwork.h
include/tqt3/ntqnetworkprotocol.h
include/tqt3/ntqnp.h
include/tqt3/ntqobjcoll.h
include/tqt3/ntqobjdefs.h
include/tqt3/ntqobject.h
include/tqt3/ntqobjectcleanuphandler.h
include/tqt3/ntqobjectdefs.h
include/tqt3/ntqobjectdict.h
include/tqt3/ntqobjectlist.h
include/tqt3/ntqpaintd.h
include/tqt3/ntqpaintdc.h
include/tqt3/ntqpaintdevice.h
include/tqt3/ntqpaintdevicedefs.h
include/tqt3/ntqpaintdevicemetrics.h
include/tqt3/ntqpainter.h
include/tqt3/ntqpair.h
include/tqt3/ntqpalette.h
include/tqt3/ntqpdevmet.h
include/tqt3/ntqpen.h
include/tqt3/ntqpicture.h
include/tqt3/ntqpixmap.h
include/tqt3/ntqpixmapcache.h
include/tqt3/ntqplatinumstyle.h
include/tqt3/ntqpmcache.h
include/tqt3/ntqpngio.h
include/tqt3/ntqpntarry.h
include/tqt3/ntqpoint.h
include/tqt3/ntqpointarray.h
include/tqt3/ntqpolygonscanner.h
include/tqt3/ntqpopmenu.h
include/tqt3/ntqpopupmenu.h
include/tqt3/ntqprintdialog.h
include/tqt3/ntqprinter.h
include/tqt3/ntqprndlg.h
include/tqt3/ntqprocess.h
include/tqt3/ntqprogbar.h
include/tqt3/ntqprogdlg.h
include/tqt3/ntqprogressbar.h
include/tqt3/ntqprogressdialog.h
include/tqt3/ntqpsprn.h
include/tqt3/ntqptrcollection.h
include/tqt3/ntqptrdict.h
include/tqt3/ntqptrlist.h
include/tqt3/ntqptrqueue.h
include/tqt3/ntqptrstack.h
include/tqt3/ntqptrvector.h
include/tqt3/ntqpushbt.h
include/tqt3/ntqpushbutton.h
include/tqt3/ntqqueue.h
include/tqt3/ntqradiobt.h
include/tqt3/ntqradiobutton.h
include/tqt3/ntqrangecontrol.h
include/tqt3/ntqrangect.h
include/tqt3/ntqrect.h
include/tqt3/ntqregexp.h
include/tqt3/ntqregion.h
include/tqt3/ntqrtlcodec.h
include/tqt3/ntqscrbar.h
include/tqt3/ntqscrollbar.h
include/tqt3/ntqscrollview.h
include/tqt3/ntqsemaphore.h
include/tqt3/ntqsemimodal.h
include/tqt3/ntqserversocket.h
include/tqt3/ntqsession.h
include/tqt3/ntqsessionmanager.h
include/tqt3/ntqsettings.h
include/tqt3/ntqsgistyle.h
include/tqt3/ntqshared.h
include/tqt3/ntqsignal.h
include/tqt3/ntqsignalmapper.h
include/tqt3/ntqsignalslotimp.h
include/tqt3/ntqsimplerichtext.h
include/tqt3/ntqsize.h
include/tqt3/ntqsizegrip.h
include/tqt3/ntqsizepolicy.h
include/tqt3/ntqsjiscodec.h
include/tqt3/ntqslider.h
include/tqt3/ntqsocket.h
include/tqt3/ntqsocketdevice.h
include/tqt3/ntqsocketnotifier.h
include/tqt3/ntqsocknot.h
include/tqt3/ntqsortedlist.h
include/tqt3/ntqsound.h
include/tqt3/ntqspinbox.h
include/tqt3/ntqsplashscreen.h
include/tqt3/ntqsplitter.h
include/tqt3/ntqsql.h
include/tqt3/ntqsqlcursor.h
include/tqt3/ntqsqldatabase.h
include/tqt3/ntqsqldriver.h
include/tqt3/ntqsqldriverplugin.h
include/tqt3/ntqsqleditorfactory.h
include/tqt3/ntqsqlerror.h
include/tqt3/ntqsqlfield.h
include/tqt3/ntqsqlform.h
include/tqt3/ntqsqlindex.h
include/tqt3/ntqsqlpropertymap.h
include/tqt3/ntqsqlquery.h
include/tqt3/ntqsqlrecord.h
include/tqt3/ntqsqlresult.h
include/tqt3/ntqsqlselectcursor.h
include/tqt3/ntqstack.h
include/tqt3/ntqstatusbar.h
include/tqt3/ntqstring.h
include/tqt3/ntqstringlist.h
include/tqt3/ntqstrlist.h
include/tqt3/ntqstrvec.h
include/tqt3/ntqstyle.h
include/tqt3/ntqstylefactory.h
include/tqt3/ntqstyleplugin.h
include/tqt3/ntqstylesheet.h
include/tqt3/ntqsyntaxhighlighter.h
include/tqt3/ntqt.h
include/tqt3/ntqtabbar.h
include/tqt3/ntqtabdialog.h
include/tqt3/ntqtabdlg.h
include/tqt3/ntqtable.h
include/tqt3/ntqtabwidget.h
include/tqt3/ntqtextbrowser.h
include/tqt3/ntqtextcodec.h
include/tqt3/ntqtextcodecfactory.h
include/tqt3/ntqtextcodecplugin.h
include/tqt3/ntqtextedit.h
include/tqt3/ntqtextstream.h
include/tqt3/ntqtextview.h
include/tqt3/ntqthread.h
include/tqt3/ntqthreadstorage.h
include/tqt3/ntqtimer.h
include/tqt3/ntqtl.h
include/tqt3/ntqtoolbar.h
include/tqt3/ntqtoolbox.h
include/tqt3/ntqtoolbutton.h
include/tqt3/ntqtooltip.h
include/tqt3/ntqtranslator.h
include/tqt3/ntqtsciicodec.h
include/tqt3/ntqtstream.h
include/tqt3/ntqurl.h
include/tqt3/ntqurlinfo.h
include/tqt3/ntqurloperator.h
include/tqt3/ntqutfcodec.h
include/tqt3/ntquuid.h
include/tqt3/ntqvalidator.h
include/tqt3/ntqvaluelist.h
include/tqt3/ntqvaluestack.h
include/tqt3/ntqvaluevector.h
include/tqt3/ntqvariant.h
include/tqt3/ntqvbox.h
include/tqt3/ntqvbuttongroup.h
include/tqt3/ntqvector.h
include/tqt3/ntqvfbhdr.h
include/tqt3/ntqvgroupbox.h
include/tqt3/ntqwaitcondition.h
include/tqt3/ntqwhatsthis.h
include/tqt3/ntqwidcoll.h
include/tqt3/ntqwidget.h
include/tqt3/ntqwidgetfactory.h
include/tqt3/ntqwidgetintdict.h
include/tqt3/ntqwidgetlist.h
include/tqt3/ntqwidgetplugin.h
include/tqt3/ntqwidgetstack.h
include/tqt3/ntqwindefs.h
include/tqt3/ntqwindowdefs.h
include/tqt3/ntqwindowsstyle.h
include/tqt3/ntqwinexport.h
include/tqt3/ntqwizard.h
include/tqt3/ntqwmatrix.h
include/tqt3/ntqworkspace.h
include/tqt3/ntqxml.h
include/tqt3/private/
include/tqt3/private/qapplication_p.h
include/tqt3/private/qcolor_p.h
include/tqt3/private/qcom_p.h
include/tqt3/private/qcomlibrary_p.h
include/tqt3/private/qcomponentfactory_p.h
include/tqt3/private/qcriticalsection_p.h
include/tqt3/private/qdialogbuttons_p.h
include/tqt3/private/qdir_p.h
include/tqt3/private/qeffects_p.h
include/tqt3/private/qeventloop_glib_p.h
include/tqt3/private/qeventloop_p.h
include/tqt3/private/qfiledefs_p.h
include/tqt3/private/qfontcodecs_p.h
include/tqt3/private/qfontdata_p.h
include/tqt3/private/qfontengine_p.h
include/tqt3/private/qgfxdriverinterface_p.h
include/tqt3/private/qgl_x11_p.h
include/tqt3/private/qgpluginmanager_p.h
include/tqt3/private/qimageformatinterface_p.h
include/tqt3/private/qinputcontext_p.h
include/tqt3/private/qinputcontextinterface_p.h
include/tqt3/private/qinternal_p.h
include/tqt3/private/qisciicodec_p.h
include/tqt3/private/qkbddriverinterface_p.h
include/tqt3/private/qlayoutengine_p.h
include/tqt3/private/qlibrary_p.h
include/tqt3/private/qlocale_p.h
include/tqt3/private/qlock_p.h
include/tqt3/private/qmousedriverinterface_p.h
include/tqt3/private/qmutex_p.h
include/tqt3/private/qmutexpool_p.h
include/tqt3/private/qpainter_p.h
include/tqt3/private/qpluginmanager_p.h
include/tqt3/private/qprinter_p.h
include/tqt3/private/qpsprinter_p.h
include/tqt3/private/qrichtext_p.h
include/tqt3/private/qscriptengine_p.h
include/tqt3/private/qsettings_p.h
include/tqt3/private/qsharedmemory_p.h
include/tqt3/private/qsqldriverinterface_p.h
include/tqt3/private/qsqlextension_p.h
include/tqt3/private/qsqlmanager_p.h
include/tqt3/private/qstyleinterface_p.h
include/tqt3/private/qsvgdevice_p.h
include/tqt3/private/qsyntaxhighlighter_p.h
include/tqt3/private/qt_x11_p.h
include/tqt3/private/qtextcodecinterface_p.h
include/tqt3/private/qtextengine_p.h
include/tqt3/private/qtextlayout_p.h
include/tqt3/private/qthreadinstance_p.h
include/tqt3/private/qtitlebar_p.h
include/tqt3/private/qtkdeintegration_x11_p.h
include/tqt3/private/qucom_p.h
include/tqt3/private/qucomextra_p.h
include/tqt3/private/qunicodetables_p.h
include/tqt3/private/qwidget_p.h
include/tqt3/private/qwidgetinterface_p.h
include/tqt3/private/qwidgetresizehandler_p.h
include/tqt3/qconfig-dist.h
include/tqt3/qconfig-large.h
include/tqt3/qconfig-medium.h
include/tqt3/qconfig-minimal.h
include/tqt3/qconfig-small.h
include/tqt3/qsql_ibase.h
include/tqt3/qsql_mysql.h
include/tqt3/qsql_odbc.h
include/tqt3/qsql_psql.h
include/tqt3/qsql_sqlite.h
include/tqt3/qsqlcachedresult.h
include/tqt3/qt_pch.h
include/tqt3/qtmultilineedit.h
include/tqt3/qttableview.h
include/tqt3/qwindow.h
lib/libtqassistantclient.prl
lib/libtqt-mt.la
lib/libtqt-mt.prl
lib/libtqtdesignercore.prl
lib/libtqteditor.prl
lib/libtqui.prl
lib/pkgconfig/
lib/pkgconfig/tqt-mt.pc
lib/tqt3/
lib/tqt3/plugins/
lib/tqt3/plugins/designer/
lib/tqt3/plugins/imageformats/
lib/tqt3/plugins/inputmethods/
lib/tqt3/plugins/sqldrivers/
share/tqt3/
share/tqt3/mkspecs/
share/tqt3/mkspecs/aix-g++/
share/tqt3/mkspecs/aix-g++-64/
share/tqt3/mkspecs/aix-g++-64/qmake.conf
share/tqt3/mkspecs/aix-g++-64/qplatformdefs.h
share/tqt3/mkspecs/aix-g++/qmake.conf
share/tqt3/mkspecs/aix-g++/qplatformdefs.h
share/tqt3/mkspecs/aix-xlc/
share/tqt3/mkspecs/aix-xlc-64/
share/tqt3/mkspecs/aix-xlc-64/qmake.conf
share/tqt3/mkspecs/aix-xlc-64/qplatformdefs.h
share/tqt3/mkspecs/aix-xlc/qmake.conf
share/tqt3/mkspecs/aix-xlc/qplatformdefs.h
share/tqt3/mkspecs/bsdi-g++/
share/tqt3/mkspecs/bsdi-g++/qmake.conf
share/tqt3/mkspecs/bsdi-g++/qplatformdefs.h
share/tqt3/mkspecs/cygwin-g++/
share/tqt3/mkspecs/cygwin-g++/qmake.conf
share/tqt3/mkspecs/cygwin-g++/qplatformdefs.h
share/tqt3/mkspecs/darwin-g++/
share/tqt3/mkspecs/darwin-g++/qmake.conf
share/tqt3/mkspecs/darwin-g++/qplatformdefs.h
share/tqt3/mkspecs/default
share/tqt3/mkspecs/dgux-g++/
share/tqt3/mkspecs/dgux-g++/qmake.conf
share/tqt3/mkspecs/dgux-g++/qplatformdefs.h
share/tqt3/mkspecs/freebsd-g++/
share/tqt3/mkspecs/freebsd-g++/qmake.conf
share/tqt3/mkspecs/freebsd-g++/qplatformdefs.h
share/tqt3/mkspecs/freebsd-g++34/
share/tqt3/mkspecs/freebsd-g++34/qmake.conf
share/tqt3/mkspecs/freebsd-g++34/qplatformdefs.h
share/tqt3/mkspecs/freebsd-icc/
share/tqt3/mkspecs/freebsd-icc/qmake.conf
share/tqt3/mkspecs/freebsd-icc/qplatformdefs.h
share/tqt3/mkspecs/hpux-acc/
share/tqt3/mkspecs/hpux-acc-64/
share/tqt3/mkspecs/hpux-acc-64/qmake.conf
share/tqt3/mkspecs/hpux-acc-64/qplatformdefs.h
share/tqt3/mkspecs/hpux-acc-o64/
share/tqt3/mkspecs/hpux-acc-o64/qmake.conf
share/tqt3/mkspecs/hpux-acc-o64/qplatformdefs.h
share/tqt3/mkspecs/hpux-acc/qmake.conf
share/tqt3/mkspecs/hpux-acc/qplatformdefs.h
share/tqt3/mkspecs/hpux-cc/
share/tqt3/mkspecs/hpux-cc/qmake.conf
share/tqt3/mkspecs/hpux-cc/qplatformdefs.h
share/tqt3/mkspecs/hpux-g++/
share/tqt3/mkspecs/hpux-g++-64/
share/tqt3/mkspecs/hpux-g++-64/qmake.conf
share/tqt3/mkspecs/hpux-g++-64/qplatformdefs.h
share/tqt3/mkspecs/hpux-g++/qmake.conf
share/tqt3/mkspecs/hpux-g++/qplatformdefs.h
share/tqt3/mkspecs/hpuxi-acc-32/
share/tqt3/mkspecs/hpuxi-acc-32/qmake.conf
share/tqt3/mkspecs/hpuxi-acc-32/qplatformdefs.h
share/tqt3/mkspecs/hpuxi-acc-64/
share/tqt3/mkspecs/hpuxi-acc-64/qmake.conf
share/tqt3/mkspecs/hpuxi-acc-64/qplatformdefs.h
share/tqt3/mkspecs/hurd-g++/
share/tqt3/mkspecs/hurd-g++/qmake.conf
share/tqt3/mkspecs/hurd-g++/qplatformdefs.h
share/tqt3/mkspecs/irix-cc/
share/tqt3/mkspecs/irix-cc-64/
share/tqt3/mkspecs/irix-cc-64/qmake.conf
share/tqt3/mkspecs/irix-cc-64/qplatformdefs.h
share/tqt3/mkspecs/irix-cc-o32/
share/tqt3/mkspecs/irix-cc-o32/qmake.conf
share/tqt3/mkspecs/irix-cc-o32/qplatformdefs.h
share/tqt3/mkspecs/irix-cc/qmake.conf
share/tqt3/mkspecs/irix-cc/qplatformdefs.h
share/tqt3/mkspecs/irix-g++/
share/tqt3/mkspecs/irix-g++/qmake.conf
share/tqt3/mkspecs/irix-g++/qplatformdefs.h
share/tqt3/mkspecs/linux-cxx/
share/tqt3/mkspecs/linux-cxx/qmake.conf
share/tqt3/mkspecs/linux-cxx/qplatformdefs.h
share/tqt3/mkspecs/linux-ecc-64/
share/tqt3/mkspecs/linux-ecc-64/qmake.conf
share/tqt3/mkspecs/linux-ecc-64/qplatformdefs.h
share/tqt3/mkspecs/linux-g++/
share/tqt3/mkspecs/linux-g++-32/
share/tqt3/mkspecs/linux-g++-32/qmake.conf
share/tqt3/mkspecs/linux-g++-32/qplatformdefs.h
share/tqt3/mkspecs/linux-g++-64/
share/tqt3/mkspecs/linux-g++-64/qmake.conf
share/tqt3/mkspecs/linux-g++-64/qplatformdefs.h
share/tqt3/mkspecs/linux-g++-sparc/
share/tqt3/mkspecs/linux-g++-sparc/qmake.conf
share/tqt3/mkspecs/linux-g++-sparc/qplatformdefs.h
share/tqt3/mkspecs/linux-g++/qmake.conf
share/tqt3/mkspecs/linux-g++/qplatformdefs.h
share/tqt3/mkspecs/linux-icc/
share/tqt3/mkspecs/linux-icc/qmake.conf
share/tqt3/mkspecs/linux-icc/qplatformdefs.h
share/tqt3/mkspecs/linux-kcc/
share/tqt3/mkspecs/linux-kcc/qmake.conf
share/tqt3/mkspecs/linux-kcc/qplatformdefs.h
share/tqt3/mkspecs/linux-kylix/
share/tqt3/mkspecs/linux-kylix/qmake.conf
share/tqt3/mkspecs/linux-kylix/qplatformdefs.h
share/tqt3/mkspecs/linux-pgcc/
share/tqt3/mkspecs/linux-pgcc/qmake.conf
share/tqt3/mkspecs/linux-pgcc/qplatformdefs.h
share/tqt3/mkspecs/lynxos-g++/
share/tqt3/mkspecs/lynxos-g++/qmake.conf
share/tqt3/mkspecs/lynxos-g++/qplatformdefs.h
share/tqt3/mkspecs/macx-g++/
share/tqt3/mkspecs/macx-g++/Info.plist.app
share/tqt3/mkspecs/macx-g++/qmake.conf
share/tqt3/mkspecs/macx-g++/qplatformdefs.h
share/tqt3/mkspecs/macx-mwerks/
share/tqt3/mkspecs/macx-mwerks/README
share/tqt3/mkspecs/macx-mwerks/mwerkstmpl.xml
share/tqt3/mkspecs/macx-mwerks/qmake.conf
share/tqt3/mkspecs/macx-mwerks/qplatformdefs.h
share/tqt3/mkspecs/macx-pbuilder/
share/tqt3/mkspecs/macx-pbuilder/Info.plist.app
share/tqt3/mkspecs/macx-pbuilder/qmake.conf
share/tqt3/mkspecs/macx-pbuilder/qplatformdefs.h
share/tqt3/mkspecs/macx-xlc/
share/tqt3/mkspecs/macx-xlc/qmake.conf
share/tqt3/mkspecs/macx-xlc/qplatformdefs.h
share/tqt3/mkspecs/netbsd-g++/
share/tqt3/mkspecs/netbsd-g++/qmake.conf
share/tqt3/mkspecs/netbsd-g++/qplatformdefs.h
share/tqt3/mkspecs/openbsd-g++/
share/tqt3/mkspecs/openbsd-g++/qmake.conf
share/tqt3/mkspecs/openbsd-g++/qplatformdefs.h
share/tqt3/mkspecs/qnx-g++/
share/tqt3/mkspecs/qnx-g++/qmake.conf
share/tqt3/mkspecs/qnx-g++/qplatformdefs.h
share/tqt3/mkspecs/reliant-cds/
share/tqt3/mkspecs/reliant-cds-64/
share/tqt3/mkspecs/reliant-cds-64/qmake.conf
share/tqt3/mkspecs/reliant-cds-64/qplatformdefs.h
share/tqt3/mkspecs/reliant-cds/qmake.conf
share/tqt3/mkspecs/reliant-cds/qplatformdefs.h
share/tqt3/mkspecs/sco-cc/
share/tqt3/mkspecs/sco-cc/qmake.conf
share/tqt3/mkspecs/sco-cc/qplatformdefs.h
share/tqt3/mkspecs/sco-g++/
share/tqt3/mkspecs/sco-g++/qmake.conf
share/tqt3/mkspecs/sco-g++/qplatformdefs.h
share/tqt3/mkspecs/solaris-cc/
share/tqt3/mkspecs/solaris-cc-64/
share/tqt3/mkspecs/solaris-cc-64/qmake.conf
share/tqt3/mkspecs/solaris-cc-64/qplatformdefs.h
share/tqt3/mkspecs/solaris-cc/qmake.conf
share/tqt3/mkspecs/solaris-cc/qplatformdefs.h
share/tqt3/mkspecs/solaris-g++/
share/tqt3/mkspecs/solaris-g++-64/
share/tqt3/mkspecs/solaris-g++-64/qmake.conf
share/tqt3/mkspecs/solaris-g++-64/qplatformdefs.h
share/tqt3/mkspecs/solaris-g++/qmake.conf
share/tqt3/mkspecs/solaris-g++/qplatformdefs.h
share/tqt3/mkspecs/tru64-cxx/
share/tqt3/mkspecs/tru64-cxx/qmake.conf
share/tqt3/mkspecs/tru64-cxx/qplatformdefs.h
share/tqt3/mkspecs/tru64-g++/
share/tqt3/mkspecs/tru64-g++/qmake.conf
share/tqt3/mkspecs/tru64-g++/qplatformdefs.h
share/tqt3/mkspecs/unixware-cc/
share/tqt3/mkspecs/unixware-cc/qmake.conf
share/tqt3/mkspecs/unixware-cc/qplatformdefs.h
share/tqt3/mkspecs/unixware-g++/
share/tqt3/mkspecs/unixware-g++/qmake.conf
share/tqt3/mkspecs/unixware-g++/qplatformdefs.h
share/tqt3/mkspecs/win32-borland/
share/tqt3/mkspecs/win32-borland/qmake.conf
share/tqt3/mkspecs/win32-borland/qplatformdefs.h
share/tqt3/mkspecs/win32-g++/
share/tqt3/mkspecs/win32-g++/qmake.conf
share/tqt3/mkspecs/win32-g++/qplatformdefs.h
share/tqt3/mkspecs/win32-g++/qtcrtentrypoint.cpp
share/tqt3/mkspecs/win32-icc/
share/tqt3/mkspecs/win32-icc/qmake.conf
share/tqt3/mkspecs/win32-icc/qplatformdefs.h
share/tqt3/mkspecs/win32-icc/win32app.dsp
share/tqt3/mkspecs/win32-icc/win32dll.dsp
share/tqt3/mkspecs/win32-icc/win32lib.dsp
share/tqt3/mkspecs/win32-msvc/
share/tqt3/mkspecs/win32-msvc.net/
share/tqt3/mkspecs/win32-msvc.net/qmake.conf
share/tqt3/mkspecs/win32-msvc.net/qplatformdefs.h
share/tqt3/mkspecs/win32-msvc/qmake.conf
share/tqt3/mkspecs/win32-msvc/qplatformdefs.h
share/tqt3/mkspecs/win32-msvc/win32app.dsp
share/tqt3/mkspecs/win32-msvc/win32dll.dsp
share/tqt3/mkspecs/win32-msvc/win32lib.dsp
share/tqt3/mkspecs/win32-msvc2005/
share/tqt3/mkspecs/win32-msvc2005/qmake.conf
share/tqt3/mkspecs/win32-msvc2005/qplatformdefs.h
share/tqt3/mkspecs/win32-watcom/
share/tqt3/mkspecs/win32-watcom/qmake.conf
share/tqt3/phrasebooks/
share/tqt3/phrasebooks/danish.qph
share/tqt3/phrasebooks/dutch.qph
share/tqt3/phrasebooks/finnish.qph
share/tqt3/phrasebooks/french.qph
share/tqt3/phrasebooks/german.qph
share/tqt3/phrasebooks/italian.qph
share/tqt3/phrasebooks/norwegian.qph
share/tqt3/phrasebooks/russian.qph
share/tqt3/phrasebooks/spanish.qph
share/tqt3/phrasebooks/swedish.qph
share/tqt3/templates/
share/tqt3/templates/Configuration_Dialog.ui
share/tqt3/templates/Dialog_with_Buttons_(Bottom).ui
share/tqt3/templates/Dialog_with_Buttons_(Right).ui
share/tqt3/templates/Tab_Dialog.ui
share/tqt3/translations/
share/tqt3/translations/assistant_de.qm
share/tqt3/translations/qt_ar.qm
share/tqt3/translations/qt_ca.qm
share/tqt3/translations/qt_cs.qm
share/tqt3/translations/qt_de.qm
share/tqt3/translations/qt_es.qm
share/tqt3/translations/qt_fr.qm
share/tqt3/translations/qt_he.qm
share/tqt3/translations/qt_it.qm
share/tqt3/translations/qt_ja.qm
share/tqt3/translations/qt_nb.qm
share/tqt3/translations/qt_pt-br.qm
share/tqt3/translations/qt_ru.qm
share/tqt3/translations/qt_sk.qm
share/tqt3/translations/qt_zh-cn.qm
share/tqt3/translations/qt_zh-tw.qm

File diff suppressed because it is too large Load Diff

@ -0,0 +1 @@
lib/tqt3/plugins/sqldrivers/libqsqlmysql.so

@ -0,0 +1 @@
lib/tqt3/plugins/sqldrivers/libqsqlpsql.so

@ -0,0 +1 @@
lib/tqt3/plugins/sqldrivers/libqsqlite.so

@ -0,0 +1,73 @@
.include </usr/ports/x11/trinity/trinity.port.mk>
VERSION= ${TDE_VERSION}
REVISION= 1
PKGNAME= trinity-tqtinterface-${VERSION}
PREFIX= ${LOCALBASE}
CATEGORIES= x11/trinity
MASTER_SITES= http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
DISTNAME= trinity-tqtinterface-14.0.0~pre181+d144d721
EXTRACT_SUFX= .tar.gz
BUILD_DEPENDS= devel/gmake \
devel/cmake \
x11/trinity/dependencies/tqt3,-main
SHARED_LIBS= tqt 4.2
MULTI_PACKAGES= -main -devel
# Main package
PKGNAME-main= trinity-tqtinterface-${VERSION}
COMMENT-main= Trinity QT intefarce
RUN_DEPENDS-main= textproc/gsed \
shells/bash \
x11/trinity/dependencies/tqt3,-main
LIB_DEPENDS-main= x11/trinity/dependencies/tqt3,-main
# Development package
PKGNAME-devel= trinity-tqtinterface-devel-${VERSION}
COMMENT-devel= development files for Trinity QT interface
LIB_DEPENDS-devel= ${BUILD_PKGPATH},-main
RUN_DEPENDS-devel= x11/trinity/dependencies/tqt3,-main
# Build
do-configure: tde-cmake-rmbuild
${TDE_CMAKE_CONFIGURE} \
-DQTDIR="${LOCALBASE}/share/tqt3" \
-DQT_INCLUDE_DIR="${LOCALBASE}/include/tqt3" \
-DQT_LIBRARY_DIR="${LOCALBASE}/lib" \
\
-DCMAKE_INSTALL_PREFIX="${LOCALBASE}" \
-DPKGCONFIG_INSTALL_DIR="${LOCALBASE}/lib/pkgconfig" \
-DINCLUDE_INSTALL_DIR="${LOCALBASE}/include/tqt" \
-DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
-DBIN_INSTALL_DIR="${LOCALBASE}/bin" \
\
-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib" \
-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
\
-DWITH_QT3="ON" \
-DBUILD_ALL="ON" \
-DUSE_QT3="ON" \
..
do-build: tde-cmake-build
do-install: tde-cmake-install
post-install:
# Install 'cmake' modules for development use
mkdir -p "${WRKINST}${LOCALBASE}/share/cmake/Modules"
for i in ${WRKDIST}/cmake/modules/*.cmake; do \
install -m 644 "$$i" "${WRKINST}${LOCALBASE}/share/cmake/Modules"; \
done
# Fix path to 'bash'
gsed -i ${WRKINST}/usr/local/bin/* \
-e "s|/bin/bash|/usr/local/bin/bash|" \
-e "s|sed |gsed |g"
.include <bsd.port.mk>

@ -0,0 +1,2 @@
SHA256 (trinity-tqtinterface-14.0.0~pre181+d144d721.tar.gz) = Dn91RI4/Cx3x+gFBezz+k/wU3lWruNDXz8IxlW1bZGo=
SIZE (trinity-tqtinterface-14.0.0~pre181+d144d721.tar.gz) = 1432052

@ -0,0 +1 @@
Development files for Trinity QT Interface

@ -0,0 +1,392 @@
@comment $OpenBSD$
include/tqt/
include/tqt/Qt/
include/tqt/Qt/q3cstring.h
include/tqt/Qt/q3painter.h
include/tqt/Qt/q3pointarray.h
include/tqt/Qt/q3popupmenu.h
include/tqt/Qt/q3whatsthis.h
include/tqt/Qt/qapplication.h
include/tqt/Qt/qbytearray.h
include/tqt/Qt/qchar.h
include/tqt/Qt/qcommonstyle.h
include/tqt/Qt/qdatastream.h
include/tqt/Qt/qdir.h
include/tqt/Qt/qfileinfo.h
include/tqt/Qt/qglobal.h
include/tqt/Qt/qicon.h
include/tqt/Qt/qimage.h
include/tqt/Qt/qiodevice.h
include/tqt/Qt/qlist.h
include/tqt/Qt/qmenu.h
include/tqt/Qt/qmenudata.h
include/tqt/Qt/qmetaobject.h
include/tqt/Qt/qmovie.h
include/tqt/Qt/qnamespace.h
include/tqt/Qt/qobject.h
include/tqt/Qt/qobjectdefs.h
include/tqt/Qt/qpaintdevice.h
include/tqt/Qt/qpixmap.h
include/tqt/Qt/qscrollbar.h
include/tqt/Qt/qslider.h
include/tqt/Qt/qstring.h
include/tqt/Qt/qstyle.h
include/tqt/Qt/qstyleoption.h
include/tqt/Qt/qtabbar.h
include/tqt/Qt/qtextcodec.h
include/tqt/Qt/qtooltip.h
include/tqt/Qt/qvariant.h
include/tqt/Qt/qvector.h
include/tqt/Qt/qwidget.h
include/tqt/tq1xcompatibility.h
include/tqt/tqabstractlayout.h
include/tqt/tqaccel.h
include/tqt/tqaccessible.h
include/tqt/tqaction.h
include/tqt/tqapp.h
include/tqt/tqapplication.h
include/tqt/tqarray.h
include/tqt/tqasciicache.h
include/tqt/tqasciidict.h
include/tqt/tqassistantclient.h
include/tqt/tqasyncimageio.h
include/tqt/tqasyncio.h
include/tqt/tqbig5codec.h
include/tqt/tqbitarray.h
include/tqt/tqbitarry.h
include/tqt/tqbitmap.h
include/tqt/tqbrush.h
include/tqt/tqbttngrp.h
include/tqt/tqbuffer.h
include/tqt/tqbutton.h
include/tqt/tqbuttongroup.h
include/tqt/tqcache.h
include/tqt/tqcanvas.h
include/tqt/tqcdestyle.h
include/tqt/tqcheckbox.h
include/tqt/tqchkbox.h
include/tqt/tqcleanuphandler.h
include/tqt/tqclipboard.h
include/tqt/tqclipbrd.h
include/tqt/tqcollect.h
include/tqt/tqcollection.h
include/tqt/tqcolor.h
include/tqt/tqcolordialog.h
include/tqt/tqcom_p.h
include/tqt/tqcombo.h
include/tqt/tqcombobox.h
include/tqt/tqcommonstyle.h
include/tqt/tqcompactstyle.h
include/tqt/tqconfig.h
include/tqt/tqconnect.h
include/tqt/tqconnection.h
include/tqt/tqcstring.h
include/tqt/tqcursor.h
include/tqt/tqdatabrowser.h
include/tqt/tqdatastream.h
include/tqt/tqdatatable.h
include/tqt/tqdataview.h
include/tqt/tqdatetime.h
include/tqt/tqdatetimeedit.h
include/tqt/tqdatetm.h
include/tqt/tqdeepcopy.h
include/tqt/tqdesktopwidget.h
include/tqt/tqdial.h
include/tqt/tqdialog.h
include/tqt/tqdict.h
include/tqt/tqdir.h
include/tqt/tqdns.h
include/tqt/tqdockarea.h
include/tqt/tqdockwindow.h
include/tqt/tqdom.h
include/tqt/tqdragobject.h
include/tqt/tqdrawutil.h
include/tqt/tqdrawutl.h
include/tqt/tqdropsite.h
include/tqt/tqdstream.h
include/tqt/tqeditorfactory.h
include/tqt/tqeffects_p.h
include/tqt/tqerrormessage.h
include/tqt/tqeucjpcodec.h
include/tqt/tqeuckrcodec.h
include/tqt/tqevent.h
include/tqt/tqeventloop.h
include/tqt/tqfeatures.h
include/tqt/tqfile.h
include/tqt/tqfiledef.h
include/tqt/tqfiledialog.h
include/tqt/tqfiledlg.h
include/tqt/tqfileinf.h
include/tqt/tqfileinfo.h
include/tqt/tqfocusdata.h
include/tqt/tqfont.h
include/tqt/tqfontdatabase.h
include/tqt/tqfontdialog.h
include/tqt/tqfontinf.h
include/tqt/tqfontinfo.h
include/tqt/tqfontmet.h
include/tqt/tqfontmetrics.h
include/tqt/tqframe.h
include/tqt/tqftp.h
include/tqt/tqgarray.h
include/tqt/tqgb18030codec.h
include/tqt/tqgbkcodec.h
include/tqt/tqgcache.h
include/tqt/tqgdict.h
include/tqt/tqgeneric.h
include/tqt/tqgif.h
include/tqt/tqgl.h
include/tqt/tqglcolormap.h
include/tqt/tqglist.h
include/tqt/tqglobal.h
include/tqt/tqgplugin.h
include/tqt/tqgrid.h
include/tqt/tqgridview.h
include/tqt/tqgroupbox.h
include/tqt/tqgrpbox.h
include/tqt/tqguardedptr.h
include/tqt/tqgvector.h
include/tqt/tqhbox.h
include/tqt/tqhbuttongroup.h
include/tqt/tqheader.h
include/tqt/tqhgroupbox.h
include/tqt/tqhostaddress.h
include/tqt/tqhttp.h
include/tqt/tqiconset.h
include/tqt/tqiconview.h
include/tqt/tqimage.h
include/tqt/tqimageformatplugin.h
include/tqt/tqinputdialog.h
include/tqt/tqintcach.h
include/tqt/tqintcache.h
include/tqt/tqintdict.h
include/tqt/tqinterlacestyle.h
include/tqt/tqinternal_p.h
include/tqt/tqiodev.h
include/tqt/tqiodevice.h
include/tqt/tqjiscodec.h
include/tqt/tqjpegio.h
include/tqt/tqjpunicode.h
include/tqt/tqkeycode.h
include/tqt/tqkeysequence.h
include/tqt/tqlabel.h
include/tqt/tqlayout.h
include/tqt/tqlayoutengine_p.h
include/tqt/tqlcdnumber.h
include/tqt/tqlibrary.h
include/tqt/tqlined.h
include/tqt/tqlineedit.h
include/tqt/tqlist.h
include/tqt/tqlistbox.h
include/tqt/tqlistiterator.h
include/tqt/tqlistview.h
include/tqt/tqlocale.h
include/tqt/tqlocalfs.h
include/tqt/tqmainwindow.h
include/tqt/tqmap.h
include/tqt/tqmemarray.h
include/tqt/tqmenubar.h
include/tqt/tqmenudata.h
include/tqt/tqmenudta.h
include/tqt/tqmessagebox.h
include/tqt/tqmetaobj.h
include/tqt/tqmetaobject.h
include/tqt/tqmime.h
include/tqt/tqmlined.h
include/tqt/tqmngio.h
include/tqt/tqmodules.h
include/tqt/tqmotifplusstyle.h
include/tqt/tqmotifstyle.h
include/tqt/tqmovie.h
include/tqt/tqmsgbox.h
include/tqt/tqmultilinedit.h
include/tqt/tqmultilineedit.h
include/tqt/tqmutex.h
include/tqt/tqnamespace.h
include/tqt/tqnetwork.h
include/tqt/tqnetworkprotocol.h
include/tqt/tqnp.h
include/tqt/tqobjcoll.h
include/tqt/tqobjdefs.h
include/tqt/tqobject.h
include/tqt/tqobjectcleanuphandler.h
include/tqt/tqobjectdict.h
include/tqt/tqobjectlist.h
include/tqt/tqpaintd.h
include/tqt/tqpaintdc.h
include/tqt/tqpaintdevice.h
include/tqt/tqpaintdevicemetrics.h
include/tqt/tqpainter.h
include/tqt/tqpair.h
include/tqt/tqpalette.h
include/tqt/tqpdevmet.h
include/tqt/tqpen.h
include/tqt/tqpicture.h
include/tqt/tqpixmap.h
include/tqt/tqpixmapcache.h
include/tqt/tqplatinumstyle.h
include/tqt/tqpluginmanager_p.h
include/tqt/tqpmcache.h
include/tqt/tqpngio.h
include/tqt/tqpntarry.h
include/tqt/tqpoint.h
include/tqt/tqpointarray.h
include/tqt/tqpolygonscanner.h
include/tqt/tqpopmenu.h
include/tqt/tqpopupmenu.h
include/tqt/tqprintdialog.h
include/tqt/tqprinter.h
include/tqt/tqprndlg.h
include/tqt/tqprocess.h
include/tqt/tqprogbar.h
include/tqt/tqprogdlg.h
include/tqt/tqprogressbar.h
include/tqt/tqprogressdialog.h
include/tqt/tqptrcollection.h
include/tqt/tqptrdict.h
include/tqt/tqptrlist.h
include/tqt/tqptrqueue.h
include/tqt/tqptrstack.h
include/tqt/tqptrvector.h
include/tqt/tqpushbt.h
include/tqt/tqpushbutton.h
include/tqt/tqqueue.h
include/tqt/tqradiobt.h
include/tqt/tqradiobutton.h
include/tqt/tqrangecontrol.h
include/tqt/tqrangect.h
include/tqt/tqrect.h
include/tqt/tqregexp.h
include/tqt/tqregion.h
include/tqt/tqrichtext_p.h
include/tqt/tqrtlcodec.h
include/tqt/tqscrbar.h
include/tqt/tqscrollbar.h
include/tqt/tqscrollview.h
include/tqt/tqsemaphore.h
include/tqt/tqsemimodal.h
include/tqt/tqserversocket.h
include/tqt/tqsession.h
include/tqt/tqsessionmanager.h
include/tqt/tqsettings.h
include/tqt/tqsgistyle.h
include/tqt/tqshared.h
include/tqt/tqsignal.h
include/tqt/tqsignalmapper.h
include/tqt/tqsignalslotimp.h
include/tqt/tqsimplerichtext.h
include/tqt/tqsize.h
include/tqt/tqsizegrip.h
include/tqt/tqsizepolicy.h
include/tqt/tqsjiscodec.h
include/tqt/tqslider.h
include/tqt/tqsocket.h
include/tqt/tqsocketdevice.h
include/tqt/tqsocketnotifier.h
include/tqt/tqsocknot.h
include/tqt/tqsortedlist.h
include/tqt/tqsound.h
include/tqt/tqspinbox.h
include/tqt/tqsplashscreen.h
include/tqt/tqsplitter.h
include/tqt/tqsql.h
include/tqt/tqsqlcursor.h
include/tqt/tqsqldatabase.h
include/tqt/tqsqldriver.h
include/tqt/tqsqldriverplugin.h
include/tqt/tqsqleditorfactory.h
include/tqt/tqsqlerror.h
include/tqt/tqsqlfield.h
include/tqt/tqsqlform.h
include/tqt/tqsqlindex.h
include/tqt/tqsqlpropertymap.h
include/tqt/tqsqlquery.h
include/tqt/tqsqlrecord.h
include/tqt/tqsqlresult.h
include/tqt/tqsqlselectcursor.h
include/tqt/tqstack.h
include/tqt/tqstatusbar.h
include/tqt/tqstring.h
include/tqt/tqstringlist.h
include/tqt/tqstrlist.h
include/tqt/tqstrvec.h
include/tqt/tqstyle.h
include/tqt/tqstylefactory.h
include/tqt/tqstyleplugin.h
include/tqt/tqstylesheet.h
include/tqt/tqsyntaxhighlighter.h
include/tqt/tqt.h
include/tqt/tqtabbar.h
include/tqt/tqtabdialog.h
include/tqt/tqtabdlg.h
include/tqt/tqtable.h
include/tqt/tqtabwidget.h
include/tqt/tqtextbrowser.h
include/tqt/tqtextcodec.h
include/tqt/tqtextcodecfactory.h
include/tqt/tqtextcodecplugin.h
include/tqt/tqtextedit.h
include/tqt/tqtextengine_p.h
include/tqt/tqtextstream.h
include/tqt/tqtextview.h
include/tqt/tqtglobaldefines.h
include/tqt/tqthread.h
include/tqt/tqthreadstorage.h
include/tqt/tqtimer.h
include/tqt/tqtl.h
include/tqt/tqtoolbar.h
include/tqt/tqtoolbox.h
include/tqt/tqtoolbutton.h
include/tqt/tqtooltip.h
include/tqt/tqtranslator.h
include/tqt/tqtsciicodec.h
include/tqt/tqtstream.h
include/tqt/tqucom_p.h
include/tqt/tqucomextra_p.h
include/tqt/tqurl.h
include/tqt/tqurlinfo.h
include/tqt/tqurloperator.h
include/tqt/tqutfcodec.h
include/tqt/tquuid.h
include/tqt/tqvalidator.h
include/tqt/tqvaluelist.h
include/tqt/tqvaluestack.h
include/tqt/tqvaluevector.h
include/tqt/tqvariant.h
include/tqt/tqvbox.h
include/tqt/tqvbuttongroup.h
include/tqt/tqvector.h
include/tqt/tqvfbhdr.h
include/tqt/tqvgroupbox.h
include/tqt/tqwaitcondition.h
include/tqt/tqwhatsthis.h
include/tqt/tqwidcoll.h
include/tqt/tqwidget.h
include/tqt/tqwidgetfactory.h
include/tqt/tqwidgetintdict.h
include/tqt/tqwidgetinterface_p.h
include/tqt/tqwidgetlist.h
include/tqt/tqwidgetplugin.h
include/tqt/tqwidgetstack.h
include/tqt/tqwindefs.h
include/tqt/tqwindowdefs.h
include/tqt/tqwindowsstyle.h
include/tqt/tqwinexport.h
include/tqt/tqwizard.h
include/tqt/tqwmatrix.h
include/tqt/tqworkspace.h
include/tqt/tqxml.h
lib/libtqt.la
lib/pkgconfig/tqt.pc
lib/pkgconfig/tqtqui.pc
share/cmake/Modules/FindTDE.cmake
share/cmake/Modules/FindTQt.cmake
share/cmake/Modules/FindTQtQUI.cmake
share/cmake/Modules/TDEMacros.cmake
share/cmake/Modules/TDESetupPaths.cmake
share/cmake/Modules/tde_uic.cmake
share/cmake/Modules/template_dummy_cpp.cmake
share/cmake/Modules/template_export_library.cmake
share/cmake/Modules/template_libtool_file.cmake
share/cmake/Modules/template_tdeinit_executable.cmake
share/cmake/Modules/template_tdeinit_module.cmake

@ -0,0 +1,14 @@
@comment $OpenBSD$
bin/convert_qt_tqt1
bin/convert_qt_tqt2
bin/convert_qt_tqt3
bin/dcopidl-tqt
bin/dcopidl2cpp-tqt
bin/dcopidlng-tqt
bin/mcopidl-tqt
bin/moc-tqt
bin/tmoc
bin/tqt-replace
bin/tqt-replace-stream
bin/uic-tqt
@lib lib/libtqt.so.${LIBtqt_VERSION}

@ -0,0 +1,79 @@
### General information
TDE_VERSION= 14.0.0
TDE_PREFIX= /opt/trinity
HOMEPAGE= http://www.trinitydesktop.org/
MAINTAINER= François Andriot <francois.andriot@free.fr>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
FLAVORS=debug
FLAVOR?=
### General build options
PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:/usr/X11R6/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
BUILD_DEPENDS= devel/gmake \
devel/cmake \
textproc/gsed \
shells/bash
### CMAKE related build options
CMAKE_INCLUDE_PATH=/usr/include:/usr/local/include:/usr/X11R6/include
CMAKE_LIBRARY_PATH=/usr/lib:/usr/local/lib:/usr/X11R6/lib
# Build Flags
TDE_FLAGS=${CXXFLAGS} \
-I${WRKDIST}/libltdl -I/usr/X11R6/include -I/usr/local/include \
-L/usr/X11R6/lib -L/usr/local/lib \
-Wl,-lc
.if ${FLAVOR:Mdebug}
CMAKE_BUILD_TYPE=Debug
TDE_FLAGS+= -g
.else
CMAKE_BUILD_TYPE=RelWithDebInfo
TDE_FLAGS+= -DNDEBUG
.endif
# Custom configure commands
TDE_CMAKE_CONFIGURE=\
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}"; \
export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}"; \
export PATH="${TDE_PREFIX}/bin:${PATH}"; \
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"; \
cd ${WRKDIST} && mkdir build && cd build && cmake .. \
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
-DCMAKE_C_FLAGS="${TDE_FLAGS}" \
-DCMAKE_CXX_FLAGS="${TDE_FLAGS} -Wl,-lstdc++" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="${TDE_PREFIX}/lib" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_EXTRA_INCLUDE_FILES="pthread.h" \
\
-DTDEDIR="${TDE_PREFIX}" \
-DCMAKE_INSTALL_PREFIX="${TDE_PREFIX}" \
-DBIN_INSTALL_DIR="${TDE_PREFIX}/bin" \
-DSHARE_INSTALL_PREFIX="${TDE_PREFIX}/share" \
-DDOC_INSTALL_DIR="${TDE_PREFIX}/share/doc" \
-DINCLUDE_INSTALL_DIR="${TDE_PREFIX}/include/tde" \
-DLIB_INSTALL_DIR="${TDE_PREFIX}/lib" \
-DPLUGIN_INSTALL_DIR="${TDE_PREFIX}/lib/trinity" \
-DPKGCONFIG_INSTALL_DIR="${TDE_PREFIX}/lib/pkgconfig"
### Custom build targets
tde-cmake-rmbuild:
rm -rf "${WRKDIST}/build"
tde-cmake-build:
export TDEDIR="${TDE_PREFIX}"; \
cd "${WRKDIST}/build" && gmake ${MAKE_FLAGS} || gmake
tde-cmake-install:
export TDEDIR="${TDE_PREFIX}"; \
cd "${WRKDIST}/build" && gmake install

@ -85,7 +85,7 @@ tdegames: tdebase tdemultimedia
tdegraphics: tdebase poppler cmake
$(call buildpkg,tdegraphics)
tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake
tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake
$(call buildpkg,tdelibs)
tdemultimedia: tdebase akode

@ -168,7 +168,7 @@ export PATH="%{tde_bindir}:${PATH}"
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
\
--disable-rpath \
--enable-rpath \
--enable-closure \
\
--with-extra-includes=%{_includedir}/tqt3 \

@ -0,0 +1,109 @@
# Default version for this component
%define tde_pkg fusion-icon
%define tde_version 14.0.0
%if "%{?python2_sitelib}" == ""
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define _docdir %{tde_docdir}
Name: trinity-%{tde_pkg}
Summary: tray icon to launch and manage Compiz Fusion [Trinity]
Version: 0.0.0+git20071028
Release: 2%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: python
Requires: python
Requires: trinity-compizconfig-backend-kconfig
%description
The OpenCompositing Project brings 3D desktop visual effects that
improve the usability and eye candy of the X Window System and provide
increased productivity.
This package contains a tray icon that can launch Compiz and its
decorators.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install \
DESTDIR=%{buildroot} \
PREFIX=%{tde_prefix}
# Removes 'egg-info'
find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
%clean
%__rm -rf %{buildroot}
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%{tde_bindir}/fusion-icon
%{python2_sitelib}/FusionIcon/
%{tde_datadir}/applications/fusion-icon.desktop
%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png
%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
%Changelog
* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-2
- Fix python module installation
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,5 +1,6 @@
# Default version for this component
%define kdecomp fusion-icon
%define tde_pkg fusion-icon
%define tde_version 14.0.0
%if "%{?python2_sitelib}" == ""
%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
@ -11,7 +12,7 @@
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
@ -27,7 +28,7 @@
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Name: trinity-%{tde_pkg}
Summary: tray icon to launch and manage Compiz Fusion [Trinity]
Version: 0.0.0+git20071028
Release: 2%{?dist}%{?_variant}
@ -42,7 +43,7 @@ URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [fusion-icon] Allow python installation under /usr instead of tde_prefix
Patch1: fusion-icon-3.5.13-fix_python_sitelib.patch
@ -65,12 +66,12 @@ decorators.
%prep
%setup -q -n applications/%{kdecomp}
%patch1 -p1
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
unset QTDIR QTINC QTLIB
. /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"

@ -23,11 +23,12 @@
%define _docdir %{tde_docdir}
##########
Name: trinity-%{tde_pkg}
Summary: barcode and label printing application for Trinity
Version: 2.0.6
Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
Version: 2.0.7
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@ -50,6 +51,8 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
Requires: %{name}-tdefile-plugin = %{version}-%{release}
%description
KBarcode is a barcode and label printing application for Trinity. It can be used
@ -70,11 +73,57 @@ supported. Even complex 2D barcodes are supported using third party tools. The
generated barcodes can be directly printed or you can export them into images
to use them in another application.
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_bindir}/kbarcode
%{tde_tdeappdir}/kbarcode-batch.desktop
%{tde_tdeappdir}/kbarcode-editor.desktop
%{tde_tdeappdir}/kbarcode-single.desktop
%{tde_tdeappdir}/kbarcode.desktop
%{tde_datadir}/mimelnk/application/kbarcode-label.desktop
%{tde_datadir}/apps/kbarcode/
%{tde_datadir}/icons/hicolor/*/actions/barcode.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
%{tde_tdedocdir}/HTML/en/kbarcode/
##########
%package tdefile-plugin
Summary: tdefile-plugin for %{name}
Group: Applications/Utilities
#Requires: %{name} = %{version}-%{release}
%description tdefile-plugin
%{summary}.
%files tdefile-plugin
%defattr(-,root,root,-)
%{tde_tdelibdir}/tdefile_kbarcode.la
%{tde_tdelibdir}/tdefile_kbarcode.so
%{tde_datadir}/services/tdefile_kbarcode.desktop
##########
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -87,7 +136,6 @@ to use them in another application.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
@ -125,39 +173,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_bindir}/kbarcode
%{tde_tdelibdir}/tdefile_kbarcode.la
%{tde_tdelibdir}/tdefile_kbarcode.so
%{tde_tdeappdir}/kbarcode-batch.desktop
%{tde_tdeappdir}/kbarcode-editor.desktop
%{tde_tdeappdir}/kbarcode-single.desktop
%{tde_tdeappdir}/kbarcode.desktop
%{tde_datadir}/mimelnk/application/kbarcode-label.desktop
%{tde_datadir}/apps/kbarcode/
%{tde_datadir}/icons/hicolor/*/actions/barcode.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
%{tde_datadir}/services/tdefile_kbarcode.desktop
%{tde_tdedocdir}/HTML/en/kbarcode/
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-5
- Initial release for TDE 14.0.0

@ -553,7 +553,6 @@ Provides: %{name}-tz_TW = %{version}-%{release}
%build
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export kde_htmldir="%{tde_tdedocdir}/HTML"

@ -176,7 +176,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/services/tdenetman_pptp.desktop
%{tde_datadir}/services/tdenetman_strongswan.desktop
%{tde_datadir}/services/tdenetman_vpnc.desktop
%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
%files devel
%defattr(-,root,root,-)

@ -1,10 +0,0 @@
--- ./qca-tls.pro.mach 2004-06-10 11:55:22.411187448 +0200
+++ ./qca-tls.pro 2004-06-10 11:55:43.460987392 +0200
@@ -2,6 +2,7 @@
TEMPLATE = lib
CONFIG += qt thread release plugin
+CONFIG += no_fixpath
TARGET = qca-tls
!exists(qcaprovider.h) {

@ -1,26 +0,0 @@
--- ./qca-tls.cpp.ossl098 2003-12-10 17:53:57.000000000 +0100
+++ ./qca-tls.cpp 2005-11-13 22:21:50.000000000 +0100
@@ -454,7 +454,11 @@
if(!r) {
// try this other public function, for whatever reason
p = (void *)in;
+#ifdef OSSL_097
+ r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len);
+#else
r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len);
+#endif
}
if(r) {
if(pub) {
@@ -798,7 +802,11 @@
bool createFromDER(const char *in, unsigned int len)
{
+#ifdef OSSL_097
+ const unsigned char *p = (const unsigned char *)in;
+#else
unsigned char *p = (unsigned char *)in;
+#endif
X509 *t = d2i_X509(NULL, &p, len);
if(!t)
return false;

@ -1,15 +0,0 @@
diff -up qca-tls-1.0/qca-tls.cpp.ossl10 qca-tls-1.0/qca-tls.cpp
--- qca-tls-1.0/qca-tls.cpp.ossl10 2009-08-26 10:08:36.000000000 +0200
+++ qca-tls-1.0/qca-tls.cpp 2009-08-26 10:11:57.000000000 +0200
@@ -953,7 +953,11 @@ public:
RSAKeyContext *key;
SSL *ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_METHOD *method;
+#else
SSL_METHOD *method;
+#endif
SSL_CTX *context;
BIO *rbio, *wbio;
CertContext cc;

@ -28,14 +28,7 @@ Packager: Francois Andriot <francois.andriot@free.fr>
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: tqca-tls-master.tar.gz
# Fix build in mach for QT apps
Patch0: qca-tls-1.0-mach.patch
# Build with openssl 1.0.0
Patch2: qca-tls-1.0-ossl10.patch
# Allows building with TQT3 from TDE
Patch10: tqca-tls-qt3.patch
Source0: tqca-tls-3.5.13.2.tar.gz
BuildRequires: qt3-devel >= 3.3.8.d
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -58,17 +51,12 @@ contains the TLS plugin.
##########
%prep
%setup -q -n tqca-tls-master
%patch0 -p0 -b .mach
%patch2 -p1 -b .ossl10
%patch10 -p1 -b .qt
# Revert TQCA to QCA
%__sed -i * -e "s|TQCA|QCA|g"
%setup -q -n tqca-tls-3.5.13.2
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"

@ -1,105 +0,0 @@
--- tqca-tls-master/configure.qt 2012-06-20 03:30:48.000000000 +0200
+++ tqca-tls-master/configure 2013-05-28 20:30:52.827808679 +0200
@@ -60,7 +60,7 @@
if [ "$QC_DEBUG" = "Y" ]; then
echo \$QTDIR not set... trying to find Qt manually
fi
- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
+ for p in /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
if [ -d "$p/mkspecs" ]; then
QTDIR=$p
break;
@@ -79,15 +79,15 @@
fi
fi
-if [ ! -x "$QTDIR/bin/tqmake" ]; then
+if [ ! -x "$QTDIR/bin/qmake" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
- echo Warning: tqmake not in \$QTDIR/bin/tqmake
+ echo Warning: qmake not in \$QTDIR/bin/qmake
echo trying to find it in \$PATH
fi
- qm=`type -p tqmake`
+ qm=`type -p qmake`
if [ -x "$qm" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
- echo tqmake found in $qm
+ echo qmake found in $qm
fi
else
echo fail
@@ -96,12 +96,12 @@
echo or I missdetected \$QTDIR=$QTDIR
echo
echo Please set \$QTDIR manually and make sure that
- echo \$QTDIR/bin/tqmake exists.
+ echo \$QTDIR/bin/qmake exists.
echo
exit 1;
fi
else
- qm=$QTDIR/bin/tqmake
+ qm=$QTDIR/bin/qmake
fi
gen_files() {
@@ -184,7 +184,9 @@
conf->addLib("-lssl -lcrypto");
// Make sure tqtinterface can be found
- conf->addIncludePath("/usr/include/tqt");
+ conf->addIncludePath("/usr/include/tqt");
+ // Make sure tqt3 can be found
+ conf->addIncludePath("${QTINC:-${QTDIR}/include}");
return true;
}
@@ -476,7 +478,7 @@
TQString str;
str += "# qconf\n";
- str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n';
+ str += "QT_PATH_PLUGINS = " + TQString(qInstallPathPlugins()) + '\n';
if(!conf->DEFINES.isEmpty())
str += "DEFINES += " + conf->DEFINES + '\n';
if(!conf->INCLUDEPATH.isEmpty())
@@ -511,7 +513,7 @@
TEMPLATE = app
CONFIG += qt x11 thread console
TARGET = conf
-INCLUDEPATH += '/usr/include/tqt'
+INCLUDEPATH += '/usr/include/tqt' '${QTINC:-${QTDIR}/include}'
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
@@ -537,16 +539,16 @@
)
if [ "$?" != "0" ]; then
- rm -rf .qconftemp
+# rm -rf .qconftemp
echo fail
echo
echo "There was an error compiling 'conf'. Be sure you have a proper"
echo "TQt 3.x Multithreaded (MT) build environment set up."
- if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then
- if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then
+ if [ ! -f "${QTLIB:-${QTDIR}/lib}/libqt-mt.so.3" ]; then
+ if [ ! -f "${QTLIB:-${QTDIR}/lib64}/libqt-mt.so.3" ]; then
echo
echo "One possible reason is that you don't have"
- echo "libtqt-mt.so.3 installed in $QTDIR/lib/"
+ echo "libqt-mt.so.3 installed in $QTDIR/lib/"
echo "or $QTDIR/lib64/."
fi
fi
@@ -575,7 +577,7 @@
if [ -x "./qcextra" ]; then
./qcextra
fi
-# run tqmake
+# run qmake
if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then
$qm QMAKE_STRIP=true qca-tls.pro
else

@ -1,10 +0,0 @@
--- ./qca.pro.mach 2004-11-22 11:15:24.061984966 +0100
+++ ./qca.pro 2004-11-22 11:15:31.483010203 +0100
@@ -2,6 +2,7 @@
TEMPLATE = lib
CONFIG += qt thread release
+CONFIG += no_fixpath
TARGET = qca
MOC_DIR = .moc

@ -1,132 +0,0 @@
--- tqca.ORI/qca.pro 2012-04-24 17:24:02.760426575 -0400
+++ tqca.P/qca.pro 2012-04-24 17:39:36.323825994 -0400
@@ -21,6 +21,7 @@
QCA_CPP = src
INCLUDEPATH += $$QCA_CPP
INCLUDEPATH += /usr/include/tqt
+INCLUDEPATH += /opt/trinity/include/tqt
HEADERS += \
$$QCA_CPP/qca.h \
--- tqca-master/configure.qt 2012-06-20 03:30:19.000000000 +0200
+++ tqca-master/configure 2013-05-28 19:44:10.821100155 +0200
@@ -8,7 +8,7 @@
Main options:
--prefix=[path] Base path for build/install. Default: /usr/local
- --qtdir=[path] Directory where Qt is installed.
+ --qtdir=[path] Directory where [T]Qt is installed.
--help This help text.
EOT
@@ -37,7 +37,7 @@
PREFIX=${PREFIX:-/usr/local}
-echo "Configuring TQt Cryptographic Architecture (QCA) ..."
+echo "Configuring TQt Cryptographic Architecture (TQCA) ..."
if [ "$QC_DEBUG" = "Y" ]; then
echo
@@ -52,7 +52,7 @@
if [ "$QC_DEBUG" = "Y" ]; then
echo \$QTDIR not set... trying to find Qt manually
fi
- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
+ for p in /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
if [ -d "$p/mkspecs" ]; then
QTDIR=$p
break;
@@ -62,7 +62,7 @@
echo fail
echo
echo Unable to find Qt 'mkspecs'. Please set QTDIR
- echo manually. Perhaps you need to install Qt 3
+ echo manually. Perhaps you need to install [T]Qt 3
echo development utilities. You may download them either
echo from the vendor of your operating system or from
echo www.trolltech.com
@@ -71,15 +71,15 @@
fi
fi
-if [ ! -x "$QTDIR/bin/tqmake" ]; then
+if [ ! -x "$QTDIR/bin/qmake" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
- echo Warning: tqmake not in \$QTDIR/bin/tqmake
+ echo Warning: qmake not in \$QTDIR/bin/qmake
echo trying to find it in \$PATH
fi
- qm=`type -p tqmake`
+ qm=`type -p qmake`
if [ -x "$qm" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
- echo tqmake found in $qm
+ echo qmake found in $qm
fi
else
echo fail
@@ -88,12 +88,12 @@
echo or I missdetected \$QTDIR=$QTDIR
echo
echo Please set \$QTDIR manually and make sure that
- echo \$QTDIR/bin/tqmake exists.
+ echo \$QTDIR/bin/qmake exists.
echo
exit 1;
fi
else
- qm=$QTDIR/bin/tqmake
+ qm=$QTDIR/bin/qmake
fi
gen_files() {
@@ -382,7 +382,7 @@
TQString str;
str += "# qconf\n";
- str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n';
+ str += "QT_PATH_PLUGINS = " + TQString(qInstallPathPlugins()) + '\n';
if(!conf->DEFINES.isEmpty())
str += "DEFINES += " + conf->DEFINES + '\n';
if(!conf->INCLUDEPATH.isEmpty())
@@ -417,7 +417,8 @@
TEMPLATE = app
CONFIG += qt x11 thread console
TARGET = conf
-INCLUDEPATH += '/usr/include/tqt'
+INCLUDEPATH += '${QTINC:-${QTDIR}/include}'
+INCLUDEPATH += '/usr/include/tqt'
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
@@ -442,16 +443,16 @@
)
if [ "$?" != "0" ]; then
- rm -rf .qconftemp
+# rm -rf .qconftemp
echo fail
echo
echo "There was an error compiling 'conf'. Be sure you have a proper"
echo "TQt 3.x Multithreaded (MT) build environment set up."
- if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then
- if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then
+ if [ ! -f "$QTDIR/lib/libqt-mt.so.3" ]; then
+ if [ ! -f "$QTDIR/lib64/libqt-mt.so.3" ]; then
echo
echo "One possible reason is that you don't have"
- echo "libtqt-mt.so.3 installed in $QTDIR/lib/"
+ echo "libqt-mt.so.3 installed in $QTDIR/lib/"
echo "or $QTDIR/lib64/."
fi
fi
@@ -480,7 +481,7 @@
if [ -x "./qcextra" ]; then
./qcextra
fi
-# run tqmake
+# run qmake
$qm qca.pro
if [ "$?" != "0" ]; then
echo

@ -32,10 +32,7 @@ Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: tqca-master.tar.gz
Patch0: qca-1.0-mach.patch
Patch1: tqca-1.0-fix_qt3_detection.patch
Source0: tqca-3.5.13.2.tar.gz
BuildRequires: qt3-devel >= 3.3.8.d
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -91,19 +88,15 @@ This packages contains the development files for TQCA
##########
%prep
%setup -q -n tqca-master
%patch0 -p0 -b .mach
%patch1 -p1 -b .qt
%setup -q -n tqca-3.5.13.2
# Fix 'lib64' library directory
perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
# Revert TQCA to QCA
%__sed -i examples/*/*.cpp src/*.h src/*.cpp -e "s|TQCA|QCA|g"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"

@ -135,8 +135,8 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DQTDIR="%{tde_datadir}/tqt3" \
-DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \
-DQT_LIBRARY_DIRS="%{tde_libdir}" \
-DQT_INCLUDE_DIR="%{tde_includedir}/tqt3" \
-DQT_LIBRARY_DIR="%{tde_libdir}" \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \

@ -1,22 +0,0 @@
--- akode-2.0.2/configure.in.in.ORI 2013-08-10 11:51:41.617074169 +0200
+++ akode-2.0.2/configure.in.in 2013-08-10 11:51:49.295565706 +0200
@@ -55,7 +55,7 @@
dnl without this order in this file, automake will be confused!
dnl
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
dnl checks for programs.
dnl first check for c/c++ compilers
--- akode-2.0.2/akode/configure.in.in.ORI 2013-08-10 11:53:11.355740687 +0200
+++ akode-2.0.2/akode/configure.in.in 2013-08-10 11:53:18.498367142 +0200
@@ -2,7 +2,7 @@
dnl AC_OUTPUT(akode/akode-config)
dnl AC_OUTPUT(akode/akode.pc)
-AM_CONFIG_HEADER(akode/lib/akode_export.h)
+AC_CONFIG_HEADER(akode/lib/akode_export.h)
AC_DEFUN([AC_CHECK_LIBFLAC],
[

@ -28,25 +28,12 @@ Group: System Environment/Libraries
#URL: http://carewolf.com/akode/
URL: http://www.kde-apps.org/content/show.php?content=30375
Source0: akode-2.0.2.tar.bz2
Source1: admin-14.0.0.tar.gz
Source0: akode-14.0.0.tar.gz
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Legacy Fedora 9 patches
Patch1: akode-pulseaudio.patch
Patch2: akode-2.0.2-multilib.patch
Patch3: akode-2.0.2-flac113-portable.patch
Patch4: akode-2.0.2-gcc43.patch
# New patches
Patch10: akode-autotools.patch
Patch11: akode-2.0.2-fix_ffmpeg_include.patch
Patch12: akode-2.0.2-fix_ftbfs.patch
Patch13: akode-14.0.0-ftbfs.patch
# FLAC support
%define _with_flac --with-flac
%if 0%{?mgaversion} || 0%{?mdkversion}
@ -284,21 +271,7 @@ Requires: %{name} = %{version}-%{release}
##########
%prep
%setup -q -n akode-%{version}
%__rm -rf admin
tar xfz %{SOURCE1}
%patch1 -p1 -b .pulseaudio
%patch2 -p1 -b .multilib
%patch3 -p4 -b .flac113_portable
%patch4 -p1 -b .gcc43
#patch10 -p1 -b .autotools
%patch11 -p1 -b .ffmpeg
%patch12 -p1 -b .ftbfs
%patch13 -p1 -b .ftbfs
%__rm -f libtool acinclude.m4 configure.in Makefile.cvs aclocal.m4
%setup -q -n akode-2.0.2
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"

@ -1,15 +0,0 @@
--- a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ORI 2012-08-04 22:36:12.435734576 +0200
+++ a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2012-08-04 22:37:20.153030459 +0200
@@ -26,9 +26,9 @@
#include "decoder.h"
#include <assert.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
#include "ffmpeg_decoder.h"
#include <iostream>

@ -1,20 +0,0 @@
--- ./akode/lib/akodelib.h.ORI 2013-07-25 11:49:19.524457787 +0200
+++ ./akode/lib/akodelib.h 2013-07-25 11:49:23.056360414 +0200
@@ -34,13 +34,13 @@
#include <inttypes.h>
#else
typedef signed char int8_t;
-typedef unsigned char int8_t;
+typedef unsigned char uint8_t;
typedef signed short int16_t;
-typedef unsigned short int16_t;
+typedef unsigned short uint16_t;
typedef signed int int32_t;
typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
+typedef signed long int64_t;
+typedef unsigned long uint64_t;
#endif
#endif

@ -1,11 +0,0 @@
--- branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:11:43 654042
+++ branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:14:06 654043
@@ -108,7 +108,7 @@
static FLAC__StreamDecoderReadStatus flac_read_callback(
const FLAC__StreamDecoder *,
FLAC__byte buffer[],
- unsigned *bytes,
+ size_t *bytes,
void *client_data)
{
FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data;

@ -1,46 +0,0 @@
diff -up akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 akode-2.0.2/akode/akodeplay/akodeplay.cpp
--- akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 2006-11-06 07:20:52.000000000 -0600
+++ akode-2.0.2/akode/akodeplay/akodeplay.cpp 2008-02-12 17:28:00.000000000 -0600
@@ -25,6 +25,7 @@
#include "../lib/sink.h"
#include "../lib/decoder.h"
+#include <stdlib.h>
#ifdef HAVE_GNU_GETOPT
#include <getopt.h>
#else
diff -up akode-2.0.2/akode/lib/player.cpp.gcc43 akode-2.0.2/akode/lib/player.cpp
--- akode-2.0.2/akode/lib/player.cpp.gcc43 2006-11-05 08:37:48.000000000 -0600
+++ akode-2.0.2/akode/lib/player.cpp 2008-02-12 17:10:58.000000000 -0600
@@ -21,6 +21,7 @@
#include <pthread.h>
#include <semaphore.h>
#include <assert.h>
+#include <string.h>
#include "audioframe.h"
#include "audiobuffer.h"
diff -up akode-2.0.2/akode/lib/magic.cpp.gcc43 akode-2.0.2/akode/lib/magic.cpp
--- akode-2.0.2/akode/lib/magic.cpp.gcc43 2008-02-12 16:52:26.000000000 -0600
+++ akode-2.0.2/akode/lib/magic.cpp 2008-02-12 17:16:54.000000000 -0600
@@ -21,6 +21,8 @@
#include "akodelib.h"
#include "magic.h"
#include "file.h"
+#include <stdlib.h>
+#include <string.h>
#include <iostream>
using std::cerr;
diff -up akode-2.0.2/akode/lib/akode_export.h.in.gcc43 akode-2.0.2/akode/lib/akode_export.h.in
diff -up akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 akode-2.0.2/akode/lib/auto_sink.cpp
--- akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 2005-10-26 08:50:29.000000000 -0500
+++ akode-2.0.2/akode/lib/auto_sink.cpp 2008-02-12 16:57:18.000000000 -0600
@@ -21,6 +21,7 @@
#include "audioframe.h"
#include "auto_sink.h"
+#include <stdlib.h>
#include <iostream>
namespace aKode {

@ -1,65 +0,0 @@
diff -up /dev/null akode-2.0.2/akode/akode.pc.in
--- /dev/null 2007-12-13 13:41:14.965729569 -0600
+++ akode-2.0.2/akode/akode.pc.in 2007-12-23 21:32:59.000000000 -0600
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: akode
+Description: aKode is a simple audio-decoding frame-work
+Version: 2.0.2
+Libs: -L${libdir} -lakode
+Cflags: -I${includedir}
+
diff -up akode-2.0.2/akode/configure.in.in.multilib akode-2.0.2/akode/configure.in.in
--- akode-2.0.2/akode/configure.in.in.multilib 2007-12-23 21:32:59.000000000 -0600
+++ akode-2.0.2/akode/configure.in.in 2007-12-23 21:32:59.000000000 -0600
@@ -1,5 +1,6 @@
dnl don't remove the below
dnl AC_OUTPUT(akode/akode-config)
+dnl AC_OUTPUT(akode/akode.pc)
AM_CONFIG_HEADER(akode/lib/akode_export.h)
diff -up akode-2.0.2/akode/akode-config.in.multilib akode-2.0.2/akode/akode-config.in
--- akode-2.0.2/akode/akode-config.in.multilib 2007-04-06 08:16:47.000000000 -0500
+++ akode-2.0.2/akode/akode-config.in 2007-12-23 21:37:40.000000000 -0600
@@ -15,9 +15,8 @@ EOH
}
prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+akode_libs="`pkg-config --libs akode`"
+akode_cflags="`pkg-config --cflags akode`"
flags=""
@@ -29,10 +28,10 @@ while test $# -gt 0
do
case $1 in
--libs)
- flags="$flags -L$libdir -lakode"
+ flags="$flags $akode_libs"
;;
--cflags)
- flags="$flags -I$includedir"
+ flags="$flags $akode_cflags"
;;
--version)
echo 2.0.2
diff -up akode-2.0.2/akode/Makefile.am.multilib akode-2.0.2/akode/Makefile.am
--- akode-2.0.2/akode/Makefile.am.multilib 2005-07-14 09:27:18.000000000 -0500
+++ akode-2.0.2/akode/Makefile.am 2007-12-23 21:32:59.000000000 -0600
@@ -1,3 +1,8 @@
bin_SCRIPTS = akode-config
SUBDIRS= lib plugins akodeplay
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = akode.pc
+
+EXTRA_DIST = akode.pc.in

@ -1,72 +0,0 @@
--- akode-2.0.2/akode/lib/Makefile.am.ORI 2012-01-16 19:17:09.849211160 +0100
+++ akode-2.0.2/akode/lib/Makefile.am 2012-01-16 19:17:24.496410002 +0100
@@ -12,6 +12,7 @@
player.cpp magic.cpp
AM_CPPFLAGS = -DAKODE_SEARCHDIR=\"$(libdir)\"
+AM_CXXFLAGS = -fPIC
libakode_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries)
libakode_la_LIBADD = $(LIBPTHREAD) $(AKODE_LIBDL) $(LIBSEM)
--- akode-2.0.2/configure.in.in.ORI 2013-05-19 23:25:31.450512262 +0200
+++ akode-2.0.2/configure.in.in 2013-05-19 23:25:37.156390421 +0200
@@ -55,7 +55,7 @@
dnl without this order in this file, automake will be confused!
dnl
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
dnl checks for programs.
dnl first check for c/c++ compilers
--- akode-2.0.2/admin/configure.in.min~ 2013-05-19 23:35:21.532965131 +0200
+++ akode-2.0.2/admin/configure.in.min 2013-05-19 23:34:19.011289846 +0200
@@ -41,7 +41,7 @@
KDE_SET_PREFIX
dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_CHECK_COMPILERS
--- akode-2.0.2/admin/cvs.sh.autotools 2007-01-15 10:06:45.000000000 +0100
+++ akode-2.0.2/admin/cvs.sh 2013-05-19 23:37:14.145581582 +0200
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
@@ -128,7 +128,7 @@
echo "*** Creating configure"
call_and_fix_autoconf
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in
@@ -184,7 +184,7 @@
fi
fi
$ACLOCAL $ACLOCALFLAGS
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in
--- akode-2.0.2/akode/configure.in.in.ORI 2013-05-19 23:39:02.874283156 +0200
+++ akode-2.0.2/akode/configure.in.in 2013-05-19 23:39:13.381061201 +0200
@@ -2,7 +2,7 @@
dnl AC_OUTPUT(akode/akode-config)
dnl AC_OUTPUT(akode/akode.pc)
-AM_CONFIG_HEADER(akode/lib/akode_export.h)
+AC_CONFIG_HEADER(akode/lib/akode_export.h)
AC_DEFUN([AC_CHECK_LIBFLAC],
[

@ -1,438 +0,0 @@
diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in
--- akode-2.0.1.orig/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -169,9 +169,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in
--- akode-2.0.1.orig/akode/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -158,9 +158,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in
--- akode-2.0.1.orig/akode/akodeplay/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/akodeplay/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -170,9 +170,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in
--- akode-2.0.2/akode/configure.in.in.pulseaudio 2007-02-06 22:47:43.000000000 +0100
+++ akode-2.0.2/akode/configure.in.in 2012-01-13 19:32:55.027887451 +0100
@@ -270,24 +270,24 @@
AC_SUBST(JACK_LDFLAGS)
fi
-AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])
+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
-if test "x$polypaudio_test" = "xyes" ; then
-AC_MSG_CHECKING(for Polypaudio 0.7 or later)
-if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
- have_polyp=yes
+if test "x$pulseaudio_test" = "xyes" ; then
+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
+ have_pulse=yes
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_LIBPOLYP, 1,
- [Define if you have polyplib (required if you want Polypaudio server support)])
+ AC_DEFINE(HAVE_LIBPULSE, 1,
+ [Define if you have libpulse (required if you want PulseAudio server support)])
else
AC_MSG_RESULT(not installed)
fi
-AC_SUBST(POLYP_CFLAGS)
-AC_SUBST(POLYP_LIBADD)
-AC_SUBST(POLYP_LDFLAGS)
+AC_SUBST(PULSE_CFLAGS)
+AC_SUBST(PULSE_LIBADD)
+AC_SUBST(PULSE_LDFLAGS)
fi
AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
@@ -482,7 +482,7 @@
AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
-AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)
+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
AC_MSG_CHECKING(for compilable aKode)
diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in
--- akode-2.0.1.orig/akode/lib/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/lib/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -194,9 +194,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in
--- akode-2.0.1.orig/akode/plugins/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -154,9 +154,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -251,11 +251,11 @@
@include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink
@include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink
@include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink
-@include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink
+@include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink
SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
$(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
$(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
- $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
+ $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
$(AKODE_SRC_RESAMPLER)
#>- all: all-recursive
diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in
--- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -177,9 +177,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in
--- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -178,9 +178,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in
--- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -177,9 +177,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in
--- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -191,9 +191,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in
--- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -169,9 +169,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in
--- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -178,9 +178,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in
--- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -177,9 +177,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am
--- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am 2005-07-15 13:20:03.000000000 +0200
+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am 2006-09-06 14:38:04.000000000 +0200
@@ -1,7 +1,7 @@
-INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
lib_LTLIBRARIES = libakode_polyp_sink.la
libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
-libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)
-libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in
--- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -177,9 +177,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -265,13 +265,13 @@
target_vendor = @target_vendor@
unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
lib_LTLIBRARIES = libakode_polyp_sink.la
libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
-#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)
+#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
#>+ 1
-libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(POLYP_LDFLAGS)
-libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS)
+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
#>- all: all-am
#>+ 1
all: docs-am all-am
diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp
--- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp 2005-10-20 22:54:12.000000000 +0200
+++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp 2006-09-06 15:14:52.000000000 +0200
@@ -25,7 +25,7 @@
#elif defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#endif
-#include <polyp/polyplib-simple.h>
+#include <pulse/simple.h>
#include "audioframe.h"
#include "audiobuffer.h"
@@ -59,7 +59,7 @@
bool PolypSink::open() {
int error = 0;
- m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error );
+ m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
if (!m_data->server || error != 0) {
m_data->error = true;
close();
diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in
--- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -178,9 +178,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in
--- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -175,9 +175,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in
--- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200
+++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200
@@ -185,9 +185,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POLYP_CFLAGS = @POLYP_CFLAGS@
-POLYP_LDFLAGS = @POLYP_LDFLAGS@
-POLYP_LIBADD = @POLYP_LIBADD@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LDFLAGS = @PULSE_LDFLAGS@
+PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in
--- akode-2.0.1.orig/config.h.in 2006-07-23 00:17:04.000000000 +0200
+++ akode-2.0.1/config.h.in 2006-09-06 14:44:55.000000000 +0200
@@ -43,9 +43,9 @@
/* Define if you have libOggFLAC (required for loading OggFLAC files) */
#undef HAVE_LIBOGGFLAC
-/* Define if you have polyplib (required if you want Polypaudio server
+/* Define if you have libpulse (required if you want PulseAudio server
support) */
-#undef HAVE_LIBPOLYP
+#undef HAVE_LIBPULSE
/* defined if you have libsamplerate library and header */
#undef HAVE_LIBSAMPLERATE
diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in
--- akode-2.0.2/configure.in.pulseaudio 2007-04-06 15:23:11.000000000 +0200
+++ akode-2.0.2/configure.in 2012-01-13 19:39:23.676340535 +0100
@@ -375,24 +375,24 @@
AC_SUBST(JACK_LDFLAGS)
fi
-AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])
+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
-if test "x$polypaudio_test" = "xyes" ; then
-AC_MSG_CHECKING(for Polypaudio 0.7 or later)
-if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then
- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"
- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"
- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"
- have_polyp=yes
+if test "x$pulseaudio_test" = "xyes" ; then
+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
+ have_pulse=yes
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_LIBPOLYP, 1,
- [Define if you have polyplib (required if you want Polypaudio server support)])
+ AC_DEFINE(HAVE_LIBPULSE, 1,
+ [Define if you have libpulse (required if you want PulseAudio server support)])
else
AC_MSG_RESULT(not installed)
fi
-AC_SUBST(POLYP_CFLAGS)
-AC_SUBST(POLYP_LIBADD)
-AC_SUBST(POLYP_LDFLAGS)
+AC_SUBST(PULSE_CFLAGS)
+AC_SUBST(PULSE_LIBADD)
+AC_SUBST(PULSE_LDFLAGS)
fi
AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
@@ -587,7 +587,7 @@
AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
-AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)
+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
AC_MSG_CHECKING(for compilable aKode)

@ -35,6 +35,7 @@ ffmpeg-devel
fftw-devel
file-devel
flac-devel
flex-devel
fontpackages-devel
fribidi-devel
gamin-devel
@ -80,6 +81,7 @@ libart_lgpl-devel
libblkid-devel
libcap-devel
libcdio-devel
libcdio-paranoia-devel
libconfig-devel
libcurl-devel
libdvdread-devel
@ -162,4 +164,3 @@ xmlto
xorg-x11-font-utils
xulrunner-devel
xz-devel
libcdio-paranoia-devel

@ -1,6 +1,6 @@
diff -Nuar fr.p2/messages/tdebase/kcmbackground.po fr.p3/messages/tdebase/kcmbackground.po
--- fr.p2/messages/tdebase/kcmbackground.po 2014-06-07 15:36:34.455347661 +0200
+++ fr.p3/messages/tdebase/kcmbackground.po 2014-06-07 16:44:15.728310955 +0200
diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po
--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po.ori 2014-06-07 15:36:34.455347661 +0200
+++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmbackground.po 2014-06-07 16:44:15.728310955 +0200
@@ -920,3 +920,9 @@
#, no-c-format
msgid "Move &Up"
@ -11,9 +11,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmbackground.po fr.p3/messages/tdebase/kcmbac
+
+msgid "Enables a smooth fading effect when changing background image."
+msgstr "Activer un effet de fondu lors du changement de fond d'écran."
diff -Nuar fr.p2/messages/tdebase/kcmenergy.po fr.p3/messages/tdebase/kcmenergy.po
--- fr.p2/messages/tdebase/kcmenergy.po 2014-06-07 15:36:34.455347661 +0200
+++ fr.p3/messages/tdebase/kcmenergy.po 2014-06-07 16:44:21.892169693 +0200
diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po
--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po.ori 2014-06-07 15:36:34.455347661 +0200
+++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmenergy.po 2014-06-07 16:44:21.892169693 +0200
@@ -102,3 +102,10 @@
"Choisissez la période d'inactivité après laquelle l'affichage doit être éteint. "
"Ceci est le plus haut niveau d'économie d'énergie qui puisse être utilisé "
@ -25,9 +25,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmenergy.po fr.p3/messages/tdebase/kcmenergy.
+msgid "Configure KPowersave..."
+msgstr "Configurer KPowersave..."
+
diff -Nuar fr.p2/messages/tdebase/kcmkonq.po fr.p3/messages/tdebase/kcmkonq.po
--- fr.p2/messages/tdebase/kcmkonq.po 2014-06-07 15:52:30.603936867 +0200
+++ fr.p3/messages/tdebase/kcmkonq.po 2014-06-07 16:44:27.234047255 +0200
diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po
--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po.ori 2014-06-07 15:52:30.603936867 +0200
+++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmkonq.po 2014-06-07 16:44:27.234047255 +0200
@@ -877,3 +877,43 @@
#: rootopts.cpp:276
msgid "Confirmation Required"
@ -72,9 +72,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmkonq.po fr.p3/messages/tdebase/kcmkonq.po
+
+msgid "&Show free space overlay on device icons"
+msgstr "&Afficher l'espace libre sur les icônes"
diff -Nuar fr.p2/messages/tdebase/kcmscreensaver.po fr.p3/messages/tdebase/kcmscreensaver.po
--- fr.p2/messages/tdebase/kcmscreensaver.po 2014-06-07 15:53:13.977782717 +0200
+++ fr.p3/messages/tdebase/kcmscreensaver.po 2014-06-07 16:44:38.180796311 +0200
diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po
--- tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ori 2014-06-07 15:53:13.977782717 +0200
+++ tde-i18n/tde-i18n-fr/messages/tdebase/kcmscreensaver.po 2014-06-07 16:44:38.180796311 +0200
@@ -362,3 +362,9 @@
msgid "Hide all active windows from the screen saver and use the desktop background as the screen saver input."
@ -85,9 +85,9 @@ diff -Nuar fr.p2/messages/tdebase/kcmscreensaver.po fr.p3/messages/tdebase/kcmsc
+
+msgid "Makes the unlock dialog box vibrate when entering an incorrect password."
+msgstr "Faire vibrer la fenêtre de déverrouillage lorsqu'un mauvais mot de passe est saisi."
diff -Nuar fr.p2/messages/tdebase/kdesktop.po fr.p3/messages/tdebase/kdesktop.po
--- fr.p2/messages/tdebase/kdesktop.po 2014-06-07 15:49:50.020212889 +0200
+++ fr.p3/messages/tdebase/kdesktop.po 2014-06-07 16:44:58.546329306 +0200
diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po
--- tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po.ori 2014-06-07 15:49:50.020212889 +0200
+++ tde-i18n/tde-i18n-fr/messages/tdebase/kdesktop.po 2014-06-07 16:44:58.546329306 +0200
@@ -250,6 +250,10 @@
msgid "Open Terminal Here..."
msgstr "Ouvrir un Terminal..."
@ -99,9 +99,9 @@ diff -Nuar fr.p2/messages/tdebase/kdesktop.po fr.p3/messages/tdebase/kdesktop.po
#: krootwm.cc:137
msgid "Configure Desktop..."
msgstr "Configurer le bureau..."
diff -Nuar fr.p2/messages/tdebase/kicker.po fr.p3/messages/tdebase/kicker.po
--- fr.p2/messages/tdebase/kicker.po 2014-06-07 16:41:47.636699669 +0200
+++ fr.p3/messages/tdebase/kicker.po 2014-06-07 16:45:04.820185402 +0200
diff -Nuar tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po.ori tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po
--- tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po.ori 2014-06-07 16:41:47.636699669 +0200
+++ tde-i18n/tde-i18n-fr/messages/tdebase/kicker.po 2014-06-07 16:45:04.820185402 +0200
@@ -889,6 +889,18 @@
msgid "My Documents"
msgstr "Mes Documents"

@ -1,16 +0,0 @@
diff -rcb kde-i18n-fr-3.5.10.ori/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po
*** tde-i18n-fr-3.5.10.ori/messages/tdebase/kdesktop.po 2011-07-21 10:02:12.261100210 +0200
--- tde-i18n-fr-3.5.10/messages/tdebase/kdesktop.po 2011-07-21 10:05:55.365975529 +0200
***************
*** 246,251 ****
--- 246,255 ----
msgid "Run Command..."
msgstr "Exécuter une commande..."
+ #: krootwm.cc:135 (Trinity Specific)
+ msgid "Open Terminal..."
+ msgstr "Ouvrir un Terminal..."
+
#: krootwm.cc:137
msgid "Configure Desktop..."
msgstr "Configurer le bureau..."

@ -1,45 +0,0 @@
diff -rcb kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po
*** kde-i18n-fr-3.5.10.ORI/messages/tdebase/tdesu.po 2010-12-19 01:32:05.649657741 +0100
--- kde-i18n-fr-3.5.10/messages/tdebase/tdesu.po 2010-12-19 01:33:50.416539931 +0100
***************
*** 132,151 ****
#: sudlg.cpp:36
msgid ""
"The action you requested needs root privileges. Please enter root's password "
! "below or click Ignore to continue with your current privileges."
msgstr ""
"L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
! "ci-dessous le mot de passe du superutilisateur ou cliquez sur « Ignorer » pour "
! "continuer avec vos droits actuels."
#: sudlg.cpp:40
msgid ""
"The action you requested needs additional privileges. Please enter the password "
! "for \"%1\" below or click Ignore to continue with your current privileges."
msgstr ""
"L'action requise nécessite des droits supplémentaires. Veuillez saisir "
! "ci-dessous le mot de passe de « %1 » ou cliquez sur « Ignorer » pour continuer "
! "avec vos droits actuels."
#: sudlg.cpp:48
msgid "&Ignore"
--- 132,149 ----
#: sudlg.cpp:36
msgid ""
"The action you requested needs root privileges. Please enter root's password "
! "below."
msgstr ""
"L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
! "ci-dessous le mot de passe du superutilisateur."
#: sudlg.cpp:40
msgid ""
"The action you requested needs additional privileges. Please enter the password "
! "for \"%1\" below."
msgstr ""
"L'action requise nécessite des droits supplémentaires. Veuillez saisir "
! "ci-dessous le mot de passe de « %1 »."
#: sudlg.cpp:48
msgid "&Ignore"
Seulement dans kde-i18n-fr-3.5.10/messages/kdebase: kdesu.po~

@ -0,0 +1,125 @@
--- trinity-tde-i18n-14.0.0~pre253+9fe98288/tde-i18n-fr/messages/tdelibs/tdelibs.po.orig 2014-08-22 22:50:18.774213510 +0200
+++ trinity-tde-i18n-14.0.0~pre253+9fe98288/tde-i18n-fr/messages/tdelibs/tdelibs.po 2014-08-22 23:04:26.927794495 +0200
@@ -5557,24 +5557,34 @@
#: tdeui/tdeabouttde.cpp:34
msgid ""
-"The <b>Trinity Desktop Environment</b> is a fork of the "
+"The <b>Trinity Desktop Environment</b> was born as a fork of the "
"K Desktop Environment version 3.5, which was originally written by the KDE Team, "
"a world-wide network of software engineers committed to <a "
"href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
-"development.<br><br>No single group, company or organization controls the "
+"development. The name <i>Trinity</i> was chosen because the word means "
+"<i>Three</i> as in <i>continuation of KDE 3</i>.<br>Since then, TDE has evolved to be "
+"an indipendent and standalone computer desktop environment project. The developers "
+"have molded the code to its own identity without giving up on the efficiency, "
+"productivity and traditional user interface experience characteristic of the "
+"original KDE 3 series.<br><br>No single group, company or organization controls the "
"Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
-"HREF=\"http://www.trinitydesktop.org/\">http://www.trinitydesktop.org</A> for more information "
-"about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
+"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> for more information "
+"about Trinity, and <A HREF=\"http://www.kde.org\">http://www.kde.org</A> "
"for more information on the KDE project. "
msgstr ""
-"L'<b>Environnement Bureautique Trinity</b> est un clone de l'environnement "
-"TDE version 3.5, originellement écrit par l'équipe KDE, des informaticiens "
-"du monde entier travaillant sur Internet au développement de <a "
-"href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">logiciels libres</a>."
-"<br><br>Aucune société ni organisation ne contrôle le code source de Trinity, et chacun "
-"est invité à y contribuer.<br><br>Visitez <A HREF=\"http://www.trinitydesktop.org/\">"
-"http://www.trinitydesktop.org</A> pour plus d'informations sur Trinity, et <a "
-"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
+"L'<b>Environnement Bureautique Trinity</b> est né par un fork de "
+"l'environnement KDE version 3.5, qui fut initialement créé par l'équipe KDE, "
+"des informaticiens du monde entier travaillant sur Internet au "
+"développement de <a href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">"
+"logiciels libres</a>. Le nom <i>Trinity</i> a été choisi car ce mot signifie "
+"<i>trois</i>, indiquant la <i>continuité de KDE 3</i>.<br>Depuis, Trinity a évolué "
+"pour devenir un environnement de bureau indépendant. Les développeurs ont "
+"façonné le code pour lui donner une identité sans sacrifier les performances, "
+"la productivité, et l'expérience de l'interface utilisateur classique de "
+"KDE 3.<br>Aucune société ni organisation ne contrôle le code source de Trinity, "
+"et chacun est invité à y contribuer.<br><br>Visitez <a "
+"HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> pour plus d'informations "
+"sur Trinity, et <A HREF=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
"pour plus d'informations sur le projet KDE."
#: tdeui/tdeabouttde.cpp:43
@@ -5583,7 +5593,7 @@
"do so. However, you - the user - must tell us when "
"something does not work as expected or could be done better.<br><br>"
"The Trinity Desktop Environment has a bug tracking system. Visit "
-"<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
+"<A HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</A> or "
"use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
"If you have a suggestion for improvement then you are welcome to use "
"the bug tracking system to register your wish. Make sure you use the "
@@ -5593,9 +5603,9 @@
"faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne "
"fonctionne pas correctement ou pourrait être perfectionné.<br><br>"
"L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez "
-"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> "
-"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les "
-"erreurs.<br><br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
+"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net/</A> "
+"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les erreurs.<br><br>"
+"Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
"système de suivi des bogues pour enregistrer votre souhait. Assurez-vous "
"d'avoir utilisé l'option « Souhait » (wish)."
@@ -5606,12 +5616,13 @@
"program interfaces. You can provide graphics, themes, sounds, and "
"improved documentation. You decide!"
"<br><br>"
-"Visit "
-"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A> "
-"for information on some projects in which you can participate."
+"Visit the "
+"<A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> "
+"webpage to find out how you can contribute or mail us using one of the "
+"available <A HREF=\"http://www.trinitydesktop.org/mailinglist.php\">mailing lists</A>."
"<br><br>"
"If you need more information or documentation, then a visit to "
-"<A HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
+"<A HREF=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</A> "
"will provide you with what you need."
msgstr ""
"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. "
@@ -5629,23 +5640,21 @@
#: tdeui/tdeabouttde.cpp:67
msgid ""
-"Trinity is available free of charge, but making it is not free.<br><br>"
-"<br><br>"
-"The Trinity team does need financial support. Most of the money is used to "
-"reimburse members and others on expenses they experienced when "
-"contributing to Trinity. You are encouraged to support Trinity through a financial "
-"donation, using one of the ways described at "
+"TDE is available free of charge, but making it is not free.<br><br>"
+"The Trinity team <i>does need</i> financial support. The money is used to "
+"support the expenses incurred to keep the TDE servers running, so that you - "
+"the user - can access them at any time. You are encouraged to support Trinity "
+"through a financial or hardware donation, using one of the ways described at "
"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
"<br><br>Thank you very much in advance for your support!"
msgstr ""
-"Trinity est disponible gratuitement, mais sa réalisation a un coût."
-"<br><br>"
-"<br>L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses "
-"fonds sert à rembourser les membres et d'autres intervenants des dépenses "
-"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre "
-"participation financière à Trinity, utilisez l'une des possibilités décrites à "
-"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
-"<br><br>Nous vous remercions vivement de votre soutien."
+"TDE est disponible gratuitement, mais sa réalisation a un coût.<br><br>"
+"L'équipe Trinity a <i>besoin</i> d'un appui financier. Cet argent permet "
+"de supporter les dépenses liées au fonctionnement des serveurs TDE, pour "
+"que vous puissiez y accéder à tout moment. Vous pouvez soutenir Trinity "
+"en faisant un don d'argent ou de matériel, d'une manière décrite à l'adresse "
+"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
+"<br><br>Nous vous remercions vivement de votre soutien!"
#: tdeui/tdeabouttde.cpp:81
#, c-format

@ -49,7 +49,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# Main patch: lots of updates for TDE R14.0.0
Patch1: tde-i18n-14.0.0-extra_translations.patch
Patch2: tde-i18n-14.0.0-updates.patch
BuildRequires: findutils
BuildRequires: gettext
@ -685,9 +685,8 @@ Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Patches for French translations
pushd tde-i18n-fr
%patch1 -p1
popd
%patch2 -p1
%build

@ -664,6 +664,11 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
%endif
%if 0%{?fedora} >= 20
%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
%endif
%endif
##########

@ -7,9 +7,9 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsol
dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 ));
- dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~"));
+ dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+"));
dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false));
dialog->SchemaEditor1->setSchema(config.readEntry("schema"));
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200
@ -20,8 +20,8 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cp
- s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+");
b_framevis = config->readBoolEntry("has frame",true);
b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false);
TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp 2013-07-10 07:58:53.684465202 +0200
@ -31,9 +31,9 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_pa
m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE);
- s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+");
n_encoding = config->readNumEntry("encoding",0);
TQFont tmpFont = TDEGlobalSettings::fixedFont();
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp 2013-07-10 07:58:53.690465276 +0200

@ -0,0 +1,16 @@
--- ./kicker/applets/clock/clock.cpp.orig 2014-09-13 20:24:15.429011133 +0200
+++ ./kicker/applets/clock/clock.cpp 2014-09-13 20:25:02.281084675 +0200
@@ -1515,11 +1515,8 @@
preferences();
break;
case 103:
- proc << locate("exe", "tdesu");
- proc << "--nonewdcop";
- proc << TQString("%1 tde-clock.desktop --lang %2")
- .arg(locate("exe", "tdecmshell"))
- .arg(TDEGlobal::locale()->language());
+ // Mageia/Mandriva only
+ proc << locate("exe", "drakclock");
proc.start(TDEProcess::DontCare);
break;
case 104:

@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/usr/local/lib
cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
rm -rf debian/fusion-icon-trinity/usr/local
mkdir -p debian/fusion-icon-trinity/temp
mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
mkdir -p debian/fusion-icon-trinity/opt/trinity
cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
rm -rf debian/fusion-icon-trinity/usr
dh_pysupport -pfusion-icon-trinity
###
# Must be done after invoking dh_pysupport, otherwise python scripts will
# end up in /usr/share/pyshare instead of dist-packages
mkdir -p debian/fusion-icon-trinity/usr
mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
rm -rf debian/fusion-icon-trinity/temp
###
dh_icons

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends: libdvdread4, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://www.k3b.org

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org

@ -3,9 +3,8 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Homepage: http://kopete-otr.follefuder.org/
Package: kopete-otr-trinity
Architecture: any

@ -1,6 +1,9 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/class/python-distutils.mk
@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS_APPEND := -L/opt/trinity/lib
@ -43,11 +46,11 @@ install/tde-guidance-trinity::
# fix the link properly
mkdir -p debian/tde-guidance-trinity/opt/trinity/bin
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig)
# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig)
(cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig)
# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig)
# move python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity
@ -87,51 +90,6 @@ install/guidance-backends-trinity::
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
install/tde-guidance-powermanager-trinity::
# install icon to right place
install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
install -D -p -m0644 kde/powermanager/pics/*.png \
$(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/
# install desktop file
install -D -p -m0644 powermanager/guidance-power-manager.desktop \
$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
# copy python modules in PYSUPPORT_PATH
mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity
# generate guidance-power-manager script
echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py
chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py
: # Replace all '#!' calls to python with /usr/bin/python
: # and make them executable
for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \
sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
$$i > $$i.temp; \
if cmp --quiet $$i $$i.temp; then \
rm -f $$i.temp; \
else \
mv -f $$i.temp $$i; \
chmod 755 $$i; \
echo "fixed interpreter: $$i"; \
fi; \
done
clean::
rm -rf build
@ -155,9 +113,6 @@ clean::
common-install-prehook-impl::
# generate form implementation using pytde user interface compiler
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui)
(cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui)
mkdir -p po
touch list
@ -190,4 +145,3 @@ common-install-prehook-impl::
fi
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version
rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version

@ -1,7 +1,7 @@
opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/
opt/trinity/lib/trinity/kcm_serviceconfig.la
opt/trinity/lib/trinity/kcm_userconfig.la
opt/trinity/lib/trinity/kcm_mountconfig.la
opt/trinity/lib/trinity/kcm_wineconfig.la
opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
@ -57,8 +57,8 @@ opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py
opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py
opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py
opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py
opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/
opt/trinity/lib/trinity/kcm_serviceconfig.so
opt/trinity/lib/trinity/kcm_userconfig.so
opt/trinity/lib/trinity/kcm_mountconfig.so
opt/trinity/lib/trinity/kcm_wineconfig.so
usr/share/lintian/overrides/tde-guidance-trinity

@ -52,6 +52,7 @@ build-%/configure-stamp:
cd build-$* && echo yes \
| python$* ../configure.py \
-c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \
@ -66,6 +67,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
-c -n /usr/include/tqscintilla \
-e python$* \
-o /usr/lib -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \

@ -41,6 +41,7 @@ build-%/configure-stamp:
cd build-$* \
&& python$* ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
touch $@
@ -50,6 +51,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* \
&& python$*-dbg ../configure.py \
-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-g python$* \
-e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
touch $@

@ -48,6 +48,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && python$* ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@
@ -56,6 +57,7 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && python$*-dbg ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
-v /opt/trinity/share/sip/trinity -j $(SPLIT)
touch $@

@ -7,10 +7,10 @@
-# Make sure a default wallpaper is set.
-if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
- # With Trinity this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
- if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
-cat >"$tdehome/share/config/kdesktoprc" <<EOF
-[Desktop0]
-Wallpaper=isadora.png
-Wallpaper=Trinity-lineart.svg
-WallpaperMode=Scaled
-EOF
- fi
@ -18,10 +18,10 @@
+## Make sure a default wallpaper is set.
+#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
+# # With Trinity this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+# if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
+#cat >"$tdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0]
+#Wallpaper=isadora.png
+#Wallpaper=Trinity-lineart.svg
+#WallpaperMode=Scaled
+#EOF
+# fi

@ -1,14 +0,0 @@
#!/bin/bash
DESKTOP_SESSION="$DESKTOP_SESSION"
echo "You are running $DESKTOP_SESSION"
if [[ "$DESKTOP_SESSION" == "trinity" ]]
then
# Do nothing, this is Trinity
echo "I detected Trinity"
else
# This is KDE4, start plasma-desktop
echo "I detected KDE4"
/usr/bin/plasma-desktop.kde4
fi

@ -1,14 +0,0 @@
#!/bin/bash
DESKTOP_SESSION="$DESKTOP_SESSION"
echo "You are running $DESKTOP_SESSION"
if [[ "$DESKTOP_SESSION" == "trinity" ]]
then
# Do nothing, this is Trinity
echo "I detected Trinity"
else
# This is KDE4, start plasma
echo "I detected KDE4"
/usr/bin/plasma.kde4
fi

@ -291,5 +291,3 @@ binary-install/tdebase-trinity-bin::
binary-install/ksmserver-trinity::
install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma
install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop

@ -1165,14 +1165,18 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg
debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav
debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg
debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/airplane.jpg
debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg
debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz
debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/another-view.jpg
debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/aurora.svgz
debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg
debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/celtic.svgz
@ -1195,14 +1199,14 @@ debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
debian/tmp/opt/trinity/share/wallpapers/isadora.png
debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/moon.svgz
debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop
debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg
debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg
debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg
@ -1219,6 +1223,10 @@ debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg
debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg
debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg
debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop
debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg

@ -33,3 +33,6 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook

@ -44,6 +44,7 @@ debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png
debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png
debian/tmp/opt/trinity/share/apps/tdm/themes/minimalist
debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2

@ -105,9 +105,9 @@ common-install-prehook-impl::
# sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
# done
# msgcat --use-first kde.pot po/tdelibs.pot > tdelibs.pot-merged
# msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
# mv -f tdelibs.pot-merged po/tdelibs.pot
cp -Rp kde.pot po/tdelibs.pot
cp -Rp tde.pot po/tdelibs.pot
# generate .po files for .desktop etc files
if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \

@ -160,29 +160,20 @@ debian/tmp/opt/trinity/share/apps/tdeprint/testprint.ps
debian/tmp/opt/trinity/share/apps/tdeprint/tiledown.png
debian/tmp/opt/trinity/share/apps/tdeprint/tileup.png
debian/tmp/opt/trinity/share/apps/tdeprint/tools/escputil.desktop
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-middle-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bar-top-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/back.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-bottom-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-center.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-middle-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/box-top-right.png
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
debian/tmp/opt/trinity/share/apps/tdeui/about/top-left.png
debian/tmp/opt/trinity/share/apps/tdeui/about/top-middle.png
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage.css
debian/tmp/opt/trinity/share/apps/tdeui/about/kde_infopage_rtl.css
debian/tmp/opt/trinity/share/apps/tdeui/pics/abouttde.png
debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-background.png
debian/tmp/opt/trinity/share/apps/tdeui/pics/ktip-bulb.png
@ -250,7 +241,7 @@ debian/tmp/opt/trinity/share/apps/kjava/icons/crystalsvg/16x16/actions/java.png
debian/tmp/opt/trinity/share/apps/kjava/kjava.jar
debian/tmp/opt/trinity/share/apps/kjava/kjava.policy
debian/tmp/opt/trinity/share/apps/kjava/pluginsinfo
debian/tmp/opt/trinity/share/apps/knewstuff/types
debian/tmp/opt/trinity/share/apps/tdenewstuff/types
debian/tmp/opt/trinity/share/apps/knotify/eventsrc
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog
debian/tmp/opt/trinity/share/apps/ksgmltools2/customization/af/catalog.xml

@ -218,7 +218,7 @@ debian/tmp/opt/trinity/include/tdesensordevice.h
debian/tmp/opt/trinity/include/tdestoragedevice.h
debian/tmp/opt/trinity/include/tdelibs_export.h
debian/tmp/opt/trinity/include/kdemacros.h
debian/tmp/opt/trinity/include/kde.pot
debian/tmp/opt/trinity/include/tde.pot
debian/tmp/opt/trinity/include/tdeprint/driver.h
debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h
debian/tmp/opt/trinity/include/tdeprint/kmjob.h
@ -433,16 +433,16 @@ debian/tmp/opt/trinity/include/tdemulticastsocket.h
debian/tmp/opt/trinity/include/tdemultipledrag.h
debian/tmp/opt/trinity/include/tdemultitabbar.h
debian/tmp/opt/trinity/include/knetworkinterface.h
debian/tmp/opt/trinity/include/knewstuff/downloaddialog.h
debian/tmp/opt/trinity/include/knewstuff/engine.h
debian/tmp/opt/trinity/include/knewstuff/entry.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffbutton.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffgeneric.h
debian/tmp/opt/trinity/include/knewstuff/knewstuff.h
debian/tmp/opt/trinity/include/knewstuff/knewstuffsecure.h
debian/tmp/opt/trinity/include/knewstuff/providerdialog.h
debian/tmp/opt/trinity/include/knewstuff/provider.h
debian/tmp/opt/trinity/include/knewstuff/uploaddialog.h
debian/tmp/opt/trinity/include/tdenewstuff/downloaddialog.h
debian/tmp/opt/trinity/include/tdenewstuff/engine.h
debian/tmp/opt/trinity/include/tdenewstuff/entry.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuffbutton.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuffgeneric.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuff.h
debian/tmp/opt/trinity/include/tdenewstuff/knewstuffsecure.h
debian/tmp/opt/trinity/include/tdenewstuff/providerdialog.h
debian/tmp/opt/trinity/include/tdenewstuff/provider.h
debian/tmp/opt/trinity/include/tdenewstuff/uploaddialog.h
debian/tmp/opt/trinity/include/knfsshare.h
debian/tmp/opt/trinity/include/knotifyclient.h
debian/tmp/opt/trinity/include/knotifydialog.h
@ -808,8 +808,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.la
debian/tmp/opt/trinity/lib/libtdemediaplayer.so
debian/tmp/opt/trinity/lib/libtdemid.la
debian/tmp/opt/trinity/lib/libtdemid.so
debian/tmp/opt/trinity/lib/libknewstuff.la
debian/tmp/opt/trinity/lib/libknewstuff.so
debian/tmp/opt/trinity/lib/libtdenewstuff.la
debian/tmp/opt/trinity/lib/libtdenewstuff.so
debian/tmp/opt/trinity/lib/libtdentlm.la
debian/tmp/opt/trinity/lib/libtdentlm.so
debian/tmp/opt/trinity/lib/libtdeparts.la

@ -287,8 +287,8 @@ debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0
debian/tmp/opt/trinity/lib/libtdemediaplayer.so.0.0.0
debian/tmp/opt/trinity/lib/libtdemid.so.0
debian/tmp/opt/trinity/lib/libtdemid.so.0.0.95
debian/tmp/opt/trinity/lib/libknewstuff.so.1
debian/tmp/opt/trinity/lib/libknewstuff.so.1.0.0
debian/tmp/opt/trinity/lib/libtdenewstuff.so.1
debian/tmp/opt/trinity/lib/libtdenewstuff.so.1.0.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0
debian/tmp/opt/trinity/lib/libtdentlm.so.0.0.0
debian/tmp/opt/trinity/lib/libtdeparts.so.2

@ -34,7 +34,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SNMP="ON" \
-DWITH_SENSORS="ON" \
-DWITH_XMMS="ON" \
-DWITH_KNEWSTUFF="ON"
-DWITH_TDENEWSTUFF="ON"
DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity

Loading…
Cancel
Save