RHEL/Fedora/MGA/MDV/Suse: update main and libraries for TDE 3.5.13.1

pull/3/head
Francois Andriot 12 years ago
parent 59daf455b4
commit eebed6b614

File diff suppressed because it is too large Load Diff

@ -0,0 +1,525 @@
# 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 3.5.13 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Summary: Trinity Desktop Environment - Accessibility
Name: trinity-tdeaccessibility
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Source0: kdeaccessibility-3.5.13.1.tar.gz
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils
BuildRequires: trinity-akode-devel
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tdemultimedia-devel >= %{version}
BuildRequires: alsa-lib-devel
# X11 Libraries
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libXtst-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xi-devel
BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
BuildRequires: %{_lib}x11%{?mgaversion:_6}-devel
BuildRequires: %{_lib}xcb-devel
BuildRequires: %{_lib}xau%{?mgaversion:6}-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXi-devel
BuildRequires: libXext-devel
BuildRequires: libX11-devel
%if 0%{?rhel} >= 6 || 0%{?fedora}
BuildRequires: libxcb-devel
%endif
BuildRequires: libXau-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
# Mageia only: Special packages were built for missing '.la' files on Mageia 2 !!!
%if 0%{?mgaversion}
BuildRequires: %{_lib}xi-devel-libtool
BuildRequires: %{_lib}xext6-devel-libtool
BuildRequires: %{_lib}x11_6-devel-libtool
BuildRequires: %{_lib}xcb-devel-libtool
BuildRequires: %{_lib}xau6-devel-libtool
%endif
Obsoletes: trinity-kdeaccessibility < %{version}-%{release}
Provides: trinity-kdeaccessibility = %{version}-%{release}
Obsoletes: trinity-kdeaccessibility-libs < %{version}-%{release}
Provides: trinity-kdeaccessibility-libs = %{version}-%{release}
Requires: trinity-kde-icons-mono = %{version}-%{release}
Requires: trinity-kbstate = %{version}-%{release}
Requires: trinity-kmag = %{version}-%{release}
Requires: trinity-kmousetool = %{version}-%{release}
Requires: trinity-kmouth = %{version}-%{release}
Requires: trinity-ksayit = %{version}-%{release}
Requires: trinity-kttsd = %{version}-%{release}
Requires: trinity-kttsd-contrib-plugins = %{version}-%{release}
%description
Included with this package are:
* kmag, a screen magnifier,
* kmousetool, a program for people whom it hurts to click the mouse,
* kmouth, program that allows people who have lost their voice
to let their computer speak for them.
%files
##########
%package -n trinity-kde-icons-mono
Summary: A monochromatic icons theme for TDE
Group: User Interface/Desktops
%description -n trinity-kde-icons-mono
A monochromatic icon theme for TDE, designed for accessibility purposes.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kde-icons-mono
%defattr(-,root,root,-)
%{tde_datadir}/icons/mono/index.theme
%{tde_datadir}/icons/mono/scalable/*/*.svgz
##########
%package -n trinity-kbstate
Summary: a keyboard status applet for TDE
Group: User Interface/Desktops
%description -n trinity-kbstate
A panel applet that displays the keyboard status.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kbstate
%defattr(-,root,root,-)
%{tde_tdelibdir}/kbstate_panelapplet.la
%{tde_tdelibdir}/kbstate_panelapplet.so
%{tde_datadir}/apps/kbstateapplet/
%{tde_datadir}/apps/kicker/applets/kbstateapplet.desktop
##########
%package -n trinity-kmag
Summary: A screen magnifier for TDE
Group: User Interface/Desktops
%description -n trinity-kmag
KDE's screen magnifier tool.
You can use KMagnifier to magnify a part of the screen just as you would use
a lens to magnify a newspaper fine-print or a photograph. This application is
useful for a variety of people: from researchers to artists to web-designers to
people with low vision.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmag
%defattr(-,root,root,-)
%{tde_bindir}/kmag
%{tde_datadir}/applnk/Applications/kmag.desktop
%{tde_datadir}/apps/kmag/
%{tde_datadir}/icons/hicolor/*/apps/kmag.png
%{tde_datadir}/icons/locolor/*/apps/kmag.png
%{tde_tdedocdir}/HTML/en/kmag/
%post -n trinity-kmag
/sbin/ldconfig ||:
for icon_theme in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-kmag
/sbin/ldconfig ||:
for icon_theme in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-kmousetool
Summary: TDE mouse manipulation tool for the disabled
Group: User Interface/Desktops
%description -n trinity-kmousetool
KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
designed to help those with repetitive strain injuries, for whom pressing
buttons hurts.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmousetool
%defattr(-,root,root,-)
%{tde_bindir}/kmousetool
%{tde_datadir}/applnk/Applications/kmousetool.desktop
%{tde_datadir}/apps/kmousetool/
%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
%{tde_tdedocdir}/HTML/en/kmousetool/
%post -n trinity-kmousetool
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-kmousetool
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-kmouth
Summary: A type-and-say KDE frontend for speech synthesizers
Group: User Interface/Desktops
%description -n trinity-kmouth
KDE's type-and-say frontend for speech synthesizers.
It includes a history of spoken sentences from which the user can select
sentences to be re-spoken.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmouth
%defattr(-,root,root,-)
%{tde_datadir}/config/kmouthrc
%{tde_bindir}/kmouth
%{tde_datadir}/applnk/Applications/kmouth.desktop
%{tde_datadir}/apps/kmouth/
%{tde_datadir}/icons/hicolor/*/actions/speak.png
%{tde_datadir}/icons/hicolor/*/actions/nospeak.png
%{tde_datadir}/icons/hicolor/*/apps/kmouth.png
%{tde_datadir}/icons/locolor/*/actions/speak.png
%{tde_datadir}/icons/locolor/*/apps/kmouth.png
%{tde_tdedocdir}/HTML/en/kmouth/
%post -n trinity-kmouth
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-kmouth
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-ksayit
Summary: A frontend for the TDE Text-to-Speech system
Group: User Interface/Desktops
%description -n trinity-ksayit
Text-to-speech front-end to kttsd.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-ksayit
%defattr(-,root,root,-)
%{tde_bindir}/ksayit
%{tde_tdeincludedir}/ksayit_fxplugin.h
%{tde_tdelibdir}/libFreeverb_plugin.la
%{tde_tdelibdir}/libFreeverb_plugin.so
%{tde_libdir}/libKTTSD_Lib.so.*
%{tde_tdeappdir}/ksayit.desktop
%{tde_datadir}/apps/ksayit/
%{tde_datadir}/icons/hicolor/*/apps/ksayit.png
%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_clipempty.png
%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png
%{tde_datadir}/services/ksayit_libFreeverb.desktop
%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
%post -n trinity-ksayit
/sbin/ldconfig ||:
for icon_theme in mono hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-ksayit
/sbin/ldconfig ||:
for icon_theme in mono hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kttsd
Summary: A Text-to-Speech system for TDE
Group: User Interface/Desktops
%description -n trinity-kttsd
The KDE Text-to-Speech system is a plugin based service that allows any KDE
(or non-KDE) application to speak using the DCOP interface.
ksayit and kmouth are useful front-ends for this capability, while one of
festival, flite, and epos are essential back-ends.
This package is part of Trinity, as a component of the TDE accessibility module.
Homepage: http://accessibility.kde.org/developer/kttsd
%files -n trinity-kttsd
%defattr(-,root,root,-)
%{tde_bindir}/kttsd
%{tde_bindir}/kttsmgr
%{tde_tdelibdir}/kcm_kttsd.la
%{tde_tdelibdir}/kcm_kttsd.so
%{tde_tdelibdir}/ktexteditor_kttsd.la
%{tde_tdelibdir}/ktexteditor_kttsd.so
%{tde_tdelibdir}/libkttsd_akodeplugin.la
%{tde_tdelibdir}/libkttsd_akodeplugin.so
%{tde_tdelibdir}/libkttsd_alsaplugin.la
%{tde_tdelibdir}/libkttsd_alsaplugin.so
%{tde_tdelibdir}/libkttsd_artsplugin.la
%{tde_tdelibdir}/libkttsd_artsplugin.so
%{tde_tdelibdir}/libkttsd_commandplugin.la
%{tde_tdelibdir}/libkttsd_commandplugin.so
%{tde_tdelibdir}/libkttsd_eposplugin.la
%{tde_tdelibdir}/libkttsd_eposplugin.so
%{tde_tdelibdir}/libkttsd_festivalintplugin.la
%{tde_tdelibdir}/libkttsd_festivalintplugin.so
%{tde_tdelibdir}/libkttsd_fliteplugin.la
%{tde_tdelibdir}/libkttsd_fliteplugin.so
%{tde_tdelibdir}/libkttsd_sbdplugin.la
%{tde_tdelibdir}/libkttsd_sbdplugin.so
%{tde_tdelibdir}/libkttsd_stringreplacerplugin.la
%{tde_tdelibdir}/libkttsd_stringreplacerplugin.so
%{tde_tdelibdir}/libkttsd_talkerchooserplugin.la
%{tde_tdelibdir}/libkttsd_talkerchooserplugin.so
%{tde_tdelibdir}/libkttsd_xmltransformerplugin.la
%{tde_tdelibdir}/libkttsd_xmltransformerplugin.so
%{tde_tdelibdir}/libkttsjobmgrpart.la
%{tde_tdelibdir}/libkttsjobmgrpart.so
%{tde_libdir}/libkttsd.so.*
%{tde_tdeappdir}/kcmkttsd.desktop
%{tde_tdeappdir}/kttsmgr.desktop
%{tde_datadir}/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
%{tde_datadir}/apps/kttsd/
%{tde_datadir}/icons/hicolor/16x16/actions/female.png
%{tde_datadir}/icons/hicolor/16x16/actions/male.png
%{tde_datadir}/services/ktexteditor_kttsd.desktop
%{tde_datadir}/services/kttsd.desktop
%{tde_datadir}/services/kttsd_akodeplugin.desktop
%{tde_datadir}/services/kttsd_alsaplugin.desktop
%{tde_datadir}/services/kttsd_artsplugin.desktop
%{tde_datadir}/services/kttsd_commandplugin.desktop
%{tde_datadir}/services/kttsd_eposplugin.desktop
%{tde_datadir}/services/kttsd_festivalintplugin.desktop
%{tde_datadir}/services/kttsd_fliteplugin.desktop
%{tde_datadir}/services/kttsd_sbdplugin.desktop
%{tde_datadir}/services/kttsd_stringreplacerplugin.desktop
%{tde_datadir}/services/kttsd_talkerchooserplugin.desktop
%{tde_datadir}/services/kttsd_xmltransformerplugin.desktop
%{tde_datadir}/services/kttsjobmgr.desktop
%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
%{tde_tdedocdir}/HTML/en/kttsd/
%post -n trinity-kttsd
/sbin/ldconfig ||:
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kttsd
/sbin/ldconfig ||:
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kttsd-contrib-plugins
Summary: the TDE Text-to-Speech system
Group: User Interface/Desktops
Requires: trinity-kttsd = %{version}-%{release}
%description -n trinity-kttsd-contrib-plugins
kttsd synthetizer plugins that depends on non-free software :
* FreeTTS plugin.
* Hadifix (mbrola/txt2pho) plugin.
Those plugins will require manual installation of third party,
non free software to work.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kttsd-contrib-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/libkttsd_freettsplugin.la
%{tde_tdelibdir}/libkttsd_freettsplugin.so
%{tde_tdelibdir}/libkttsd_hadifixplugin.la
%{tde_tdelibdir}/libkttsd_hadifixplugin.so
%{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
%{tde_datadir}/services/kttsd_freettsplugin.desktop
%{tde_datadir}/services/kttsd_hadifixplugin.desktop
##########
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: trinity-tdelibs-devel >= %{version}
Obsoletes: trinity-kdeaccessibility-devel < %{version}-%{release}
Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
%description devel
%{summary}.
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/libkttsd.la
%{tde_libdir}/libkttsd.so
%{tde_libdir}/libKTTSD_Lib.la
%{tde_libdir}/libKTTSD_Lib.so
%post devel
/sbin/ldconfig ||:
%postun devel
/sbin/ldconfig ||:
##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep
%setup -q -n kdeaccessibility-3.5.13.1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Avoids conflict with KDE4, if installed
# see file: '/etc/profile.d/kde.sh' from package 'kde-settings'
export KDEDIRS=%{tde_prefix}
export KDEDIR=%{tde_prefix}
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--enable-new-ldflags \
--enable-closure \
--disable-debug --disable-warnings \
--enable-final \
--enable-ksayit-audio-plugins \
--with-akode \
--with-extra-includes=%{tde_includedir}:%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# file lists for locale
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -0,0 +1,728 @@
# 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 3.5.13 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdeaddons
Summary: Trinity Desktop Environment - Plugins
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Obsoletes: trinity-kdeaddons < %{version}-%{release}
Provides: trinity-kdeaddons = %{version}-%{release}
Obsoletes: trinity-kdeaddons-extras < %{version}-%{release}
Provides: trinity-kdeaddons-extras = %{version}-%{release}
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdeaddons-3.5.13.1.tar.gz
BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tdebase-devel >= %{version}
BuildRequires: trinity-tdegames-devel >= %{version}
BuildRequires: trinity-tdemultimedia-devel >= %{version}
BuildRequires: trinity-tdepim-devel >= %{version}
BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel
BuildRequires: openssl-devel
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel
%endif
%if 0%{?suse_version}
BuildRequires: libdb-4_8-devel
%endif
%if 0%{?fedora}
BuildRequires: xmms-devel
%endif
#Requires: which
Requires: trinity-atlantikdesigner = %{version}-%{release}
Requires: trinity-kaddressbook-plugins = %{version}-%{release}
Requires: trinity-kate-plugins = %{version}-%{release}
Requires: trinity-tdeaddons-kfile-plugins = %{version}-%{release}
Requires: trinity-kicker-applets = %{version}-%{release}
Requires: trinity-knewsticker-scripts = %{version}-%{release}
Requires: trinity-konq-plugins = %{version}-%{release}
Requires: trinity-ksig = %{version}-%{release}
Requires: trinity-noatun-plugins = %{version}-%{release}
%description
A collection of TDE Addons/Plugins, including:
* atlantikdesigner: game board designer
* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver
* kate (plugins)
* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol
* knewsticker-scripts
* noatun-plugins
%files
%defattr(-,root,root,-)
##########
%package -n trinity-atlantikdesigner
Summary: Game board designer for Atlantik
Group: Applications/Games
#Requires: trinity-atlantik
Requires: trinity-tdegames
%description -n trinity-atlantikdesigner
Atlantik Designer is a game board designer for the game Atlantik.
Atlantik is a TDE client for playing Monopoly-like board games on the
monopd network. It can play any board supported by the network
server, including the classic Monopoly game as well as the Atlantik
game in which the properties include several major cities in North
America and Europe.
%files -n trinity-atlantikdesigner
%defattr(-,root,root,-)
%doc README atlantikdesigner/TODO
%{tde_bindir}/atlantikdesigner
%{tde_datadir}/apps/atlantikdesigner
%{tde_tdeappdir}/atlantikdesigner.desktop
%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
%post -n trinity-atlantikdesigner
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-atlantikdesigner
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kaddressbook-plugins
Summary: Plugins for KAddressBook, the Trinity address book
Group: Applications/Utilities
Requires: trinity-kaddressbook
%description -n trinity-kaddressbook-plugins
This package contains a variety of useful plugins for the KDE address
book. These plugins can be loaded through the TDE address book settings.
Highlights include exporting postal addresses as flags in KWorldClock,
as well as importing and exporting contacts in the native format used
by the German freemail provider GMX.
%files -n trinity-kaddressbook-plugins
%defattr(-,root,root,-)
%doc README
%{tde_tdelibdir}/libkaddrbk_geo_xxport.la
%{tde_tdelibdir}/libkaddrbk_geo_xxport.so
%{tde_tdelibdir}/libkaddrbk_gmx_xxport.la
%{tde_tdelibdir}/libkaddrbk_gmx_xxport.so
%{tde_datadir}/apps/kaddressbook
%{tde_datadir}/services/kaddressbook
##########
%package -n trinity-kate-plugins
Summary: Plugins for Kate, the TDE Advanced Text Editor
Group: Applications/Utilities
Requires: trinity-kate
Requires: tidy
%description -n trinity-kate-plugins
This package contains a variety of useful plugins for Kate, the KDE
Advanced Text Editor. These plugins can be loaded through the plugin
manager in Kate settings.
Highlights include spell checking, text filtering, HTML/XML construction
and validation, vim/emacs modeline handling, templates for new files
and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
a tab bar, a Python browser and even more.
%files -n trinity-kate-plugins
%defattr(-,root,root,-)
%doc kate/xmltools/ChangeLog kate/xmltools/README
%{tde_tdelibdir}/katecppsymbolviewerplugin.la
%{tde_tdelibdir}/katecppsymbolviewerplugin.so
%{tde_tdelibdir}/katefiletemplates.la
%{tde_tdelibdir}/katefiletemplates.so
%{tde_tdelibdir}/katefll_plugin.la
%{tde_tdelibdir}/katefll_plugin.so
%{tde_tdelibdir}/katehelloworldplugin.la
%{tde_tdelibdir}/katehelloworldplugin.so
%{tde_tdelibdir}/katehtmltoolsplugin.la
%{tde_tdelibdir}/katehtmltoolsplugin.so
%{tde_tdelibdir}/kateinsertcommandplugin.la
%{tde_tdelibdir}/kateinsertcommandplugin.so
%{tde_tdelibdir}/katemakeplugin.la
%{tde_tdelibdir}/katemakeplugin.so
%{tde_tdelibdir}/katemodelineplugin.la
%{tde_tdelibdir}/katemodelineplugin.so
%{tde_tdelibdir}/kateopenheaderplugin.la
%{tde_tdelibdir}/kateopenheaderplugin.so
%{tde_tdelibdir}/katepybrowseplugin.la
%{tde_tdelibdir}/katepybrowseplugin.so
%{tde_tdelibdir}/katesnippetsplugin.la
%{tde_tdelibdir}/katesnippetsplugin.so
%{tde_tdelibdir}/katetextfilterplugin.la
%{tde_tdelibdir}/katetextfilterplugin.so
%{tde_tdelibdir}/katexmlcheckplugin.la
%{tde_tdelibdir}/katexmlcheckplugin.so
%{tde_tdelibdir}/katexmltoolsplugin.la
%{tde_tdelibdir}/katexmltoolsplugin.so
%{tde_tdelibdir}/libkatetabbarextensionplugin.la
%{tde_tdelibdir}/libkatetabbarextensionplugin.so
%{tde_datadir}/applnk/.hidden/katefll.desktop
%{tde_datadir}/apps/kate
%{tde_datadir}/apps/katepart
%{tde_datadir}/apps/katexmltools
%{tde_datadir}/services/katecppsymbolviewer.desktop
%{tde_datadir}/services/katefiletemplates.desktop
%{tde_datadir}/services/katefll_plugin.desktop
%{tde_datadir}/services/katehelloworld.desktop
%{tde_datadir}/services/katehtmltools.desktop
%{tde_datadir}/services/kateinsertcommand.desktop
%{tde_datadir}/services/katemake.desktop
%{tde_datadir}/services/katemodeline.desktop
%{tde_datadir}/services/kateopenheader.desktop
%{tde_datadir}/services/katepybrowse.desktop
%{tde_datadir}/services/katesnippets.desktop
%{tde_datadir}/services/katetabbarextension.desktop
%{tde_datadir}/services/katetextfilter.desktop
%{tde_datadir}/services/katexmlcheck.desktop
%{tde_datadir}/services/katexmltools.desktop
%{tde_tdedocdir}/HTML/en/kate-plugins/
##########
%package kfile-plugins
Summary: Trinity file dialog plugins for text files and folders
Group: Applications/Utilities
%description kfile-plugins
This is a collection of plugins for the TDE file dialog. These plugins
extend the file dialog to offer advanced meta-information for text,
HTML and desktop files, as well as for folders, Windows .lnk files,
MIME archives and X.509 certificates.
This package also includes plugins for the KDE file rename dialog,
allowing a user to more easily decide what to do when faced with a
decision regarding conflicting filenames. Rename dialog plugins are
provided for audio and image files.
%files kfile-plugins
%defattr(-,root,root,-)
%doc kfile-plugins/lnk/README
%{tde_bindir}/lnkforward
%{tde_tdelibdir}/kfile_cert.la
%{tde_tdelibdir}/kfile_cert.so
%{tde_tdelibdir}/kfile_desktop.la
%{tde_tdelibdir}/kfile_desktop.so
%{tde_tdelibdir}/kfile_folder.la
%{tde_tdelibdir}/kfile_folder.so
%{tde_tdelibdir}/kfile_html.la
%{tde_tdelibdir}/kfile_html.so
%{tde_tdelibdir}/kfile_lnk.la
%{tde_tdelibdir}/kfile_lnk.so
%{tde_tdelibdir}/kfile_mhtml.la
%{tde_tdelibdir}/kfile_mhtml.so
%{tde_tdelibdir}/kfile_txt.la
%{tde_tdelibdir}/kfile_txt.so
%{tde_tdelibdir}/librenaudioplugin.la
%{tde_tdelibdir}/librenaudioplugin.so
%{tde_tdelibdir}/librenimageplugin.la
%{tde_tdelibdir}/librenimageplugin.so
%{tde_datadir}/applnk/.hidden/lnkforward.desktop
%{tde_datadir}/mimelnk/application/x-win-lnk.desktop
%{tde_datadir}/services/kfile_cert.desktop
%{tde_datadir}/services/kfile_desktop.desktop
%{tde_datadir}/services/kfile_folder.desktop
%{tde_datadir}/services/kfile_html.desktop
%{tde_datadir}/services/kfile_lnk.desktop
%{tde_datadir}/services/kfile_mhtml.desktop
%{tde_datadir}/services/kfile_txt.desktop
%{tde_datadir}/services/renaudiodlg.desktop
%{tde_datadir}/services/renimagedlg.desktop
##########
%package -n trinity-kicker-applets
Summary: Applets for Kicker, the Trinity panel
Group: Applications/Utilities
Requires: trinity-kicker
%description -n trinity-kicker-applets
This package contains a variety of applets for Kicker, the KDE panel.
These applets will appear in the panel's Add--Applet menu.
Included are a system monitor, a colour picker, a media player controller,
a mathematical evaluator and a binary clock.
The media control applet does not support XMMS, as this would force all
kicker-applets users to install XMMS. If you want a kicker applet that
controls XMMS, install the xmms-kde-trinity package.
%files -n trinity-kicker-applets
%defattr(-,root,root,-)
%doc README
%{tde_tdelibdir}/kolourpicker_panelapplet.la
%{tde_tdelibdir}/kolourpicker_panelapplet.so
%{tde_tdelibdir}/ktimemon_panelapplet.la
%{tde_tdelibdir}/ktimemon_panelapplet.so
%{tde_tdelibdir}/math_panelapplet.la
%{tde_tdelibdir}/math_panelapplet.so
%{tde_tdelibdir}/mediacontrol_panelapplet.la
%{tde_tdelibdir}/mediacontrol_panelapplet.so
%{tde_tdelibdir}/kbinaryclock_panelapplet.la
%{tde_tdelibdir}/kbinaryclock_panelapplet.so
%{tde_datadir}/apps/kicker/applets
%{tde_datadir}/apps/mediacontrol
%{tde_datadir}/config.kcfg/kbinaryclock.kcfg
%{tde_datadir}/icons/locolor/*/apps/ktimemon.png
%{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
%{tde_tdedocdir}/HTML/en/kicker-applets/
%post -n trinity-kicker-applets
for f in crystalsvg locolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
%postun -n trinity-kicker-applets
for f in crystalsvg locolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
##########
%package -n trinity-knewsticker-scripts
Summary: scripts for KNewsTicker, the Trinity news ticker
Group: Applications/Utilities
Requires: perl
Requires: python
#Requires: libfinance-quote-perl
#Requires: libmime-perl
#Requires: libnews-nntpclient-perl
Requires: perl-libwww-perl
Requires: trinity-knewsticker
%description -n trinity-knewsticker-scripts
This package contains a variety of scripts that provide additional news
sources for KNewsTicker, the news ticker applet for the TDE panel.
Highlights include newsgroup handling, stock data retrieval, sports scores
and various local news sources.
%files -n trinity-knewsticker-scripts
%defattr(-,root,root,-)
%doc README
%{tde_datadir}/apps/knewsticker/
##########
%package -n trinity-konq-plugins
Summary: plugins for Konqueror, the Trinity file/web/doc browser
Group: Applications/Utilities
%if 0%{?mgaversion} || 0%{?mdkversion}
Requires: %{_lib}jpeg8
%endif
%if 0%{?rhel} || 0%{?fedora}
Requires: libjpeg
%endif
%if 0%{?suse_version}
Requires: libjpeg62
%endif
Requires: python
Requires: rsync
#Requires: unison
Requires: trinity-konqueror
%if 0%{?fedora}
Requires: python-exif
%endif
%description -n trinity-konq-plugins
This package contains a variety of useful plugins for Konqueror, the
file manager, web browser and document viewer for TDE. Many of these
plugins will appear in Konqueror's Tools menu.
Highlights for web browsing include web page translation, web page archiving,
auto-refreshing, HTML and CSS structural analysis, a search toolbar, a
sidebar news ticker, fast access to common options, bookmarklets, a crash
monitor, a microformat availability indicator, a del.icio.us bookmarks
sidebar, and integration with the aKregator RSS feed reader.
Highlights for directory browsing include directory filters, image gallery
creation, archive compression and extraction, quick copy/move, a sidebar
media player, a file information metabar/sidebar, a media folder helper, a
graphical disk usage viewer and image conversions and transformations.
%files -n trinity-konq-plugins
%defattr(-,root,root,-)
%doc konq-plugins/README
%{tde_datadir}/config/translaterc
%{tde_bindir}/fsview
%{tde_bindir}/jpegorient
%{tde_bindir}/kio_media_realfolder
%{tde_tdelibdir}/konq_sidebarnews.la
%{tde_tdelibdir}/konq_sidebarnews.so
%{tde_tdelibdir}/konqsidebar_delicious.la
%{tde_tdelibdir}/konqsidebar_delicious.so
%{tde_tdelibdir}/konqsidebar_mediaplayer.la
%{tde_tdelibdir}/konqsidebar_mediaplayer.so
%{tde_tdelibdir}/konqsidebar_metabar.la
%{tde_tdelibdir}/konqsidebar_metabar.so
%{tde_tdelibdir}/libakregatorkonqfeedicon.la
%{tde_tdelibdir}/libakregatorkonqfeedicon.so
%{tde_tdelibdir}/libakregatorkonqplugin.la
%{tde_tdelibdir}/libakregatorkonqplugin.so
%{tde_tdelibdir}/libarkplugin.la
%{tde_tdelibdir}/libarkplugin.so
%{tde_tdelibdir}/libautorefresh.la
%{tde_tdelibdir}/libautorefresh.so
%{tde_tdelibdir}/libbabelfishplugin.la
%{tde_tdelibdir}/libbabelfishplugin.so
%{tde_tdelibdir}/libcrashesplugin.la
%{tde_tdelibdir}/libcrashesplugin.so
%{tde_tdelibdir}/libdirfilterplugin.la
%{tde_tdelibdir}/libdirfilterplugin.so
%{tde_tdelibdir}/librsyncplugin.la
%{tde_tdelibdir}/librsyncplugin.so
%{tde_tdelibdir}/libdomtreeviewerplugin.la
%{tde_tdelibdir}/libdomtreeviewerplugin.so
%{tde_tdelibdir}/libfsviewpart.la
%{tde_tdelibdir}/libfsviewpart.so
%{tde_tdelibdir}/libkhtmlsettingsplugin.la
%{tde_tdelibdir}/libkhtmlsettingsplugin.so
%{tde_tdelibdir}/kcm_kuick.la
%{tde_tdelibdir}/kcm_kuick.so
%{tde_tdelibdir}/libkimgallery.la
%{tde_tdelibdir}/libkimgallery.so
%{tde_tdelibdir}/libkuickplugin.la
%{tde_tdelibdir}/libkuickplugin.so
%{tde_tdelibdir}/libmfkonqmficon.la
%{tde_tdelibdir}/libmfkonqmficon.so
%{tde_tdelibdir}/libminitoolsplugin.la
%{tde_tdelibdir}/libminitoolsplugin.so
%{tde_tdelibdir}/librellinksplugin.la
%{tde_tdelibdir}/librellinksplugin.so
%{tde_tdelibdir}/libsearchbarplugin.la
%{tde_tdelibdir}/libsearchbarplugin.so
%{tde_tdelibdir}/libuachangerplugin.la
%{tde_tdelibdir}/libuachangerplugin.so
%{tde_tdelibdir}/libvalidatorsplugin.la
%{tde_tdelibdir}/libvalidatorsplugin.so
%{tde_tdelibdir}/libwebarchiverplugin.la
%{tde_tdelibdir}/libwebarchiverplugin.so
%{tde_tdelibdir}/webarchivethumbnail.la
%{tde_tdelibdir}/webarchivethumbnail.so
%{tde_datadir}/applnk/.hidden/arkplugin.desktop
%{tde_datadir}/applnk/.hidden/kcmkuick.desktop
%{tde_datadir}/applnk/.hidden/kuickplugin.desktop
%{tde_datadir}/applnk/.hidden/mediaplayerplugin.desktop
%{tde_datadir}/applnk/.hidden/crashesplugin.desktop
%{tde_datadir}/applnk/.hidden/dirfilterplugin.desktop
%{tde_datadir}/applnk/.hidden/rsyncplugin.desktop
%{tde_datadir}/applnk/.hidden/fsview.desktop
%{tde_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop
%{tde_datadir}/applnk/.hidden/kimgalleryplugin.desktop
%{tde_datadir}/applnk/.hidden/plugin_babelfish.desktop
%{tde_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
%{tde_datadir}/applnk/.hidden/plugin_validators.desktop
%{tde_datadir}/applnk/.hidden/plugin_webarchiver.desktop
%{tde_datadir}/applnk/.hidden/uachangerplugin.desktop
%{tde_datadir}/apps/akregator
%{tde_datadir}/apps/domtreeviewer
%{tde_datadir}/apps/fsview
%{tde_datadir}/apps/imagerotation/orient.py*
%{tde_datadir}/apps/imagerotation/exif.py*
%{tde_datadir}/apps/khtml/kpartplugins
%{tde_datadir}/apps/konqiconview
%{tde_datadir}/apps/konqlistview
%{tde_datadir}/apps/konqsidebartng
%{tde_datadir}/apps/konqueror/icons
%{tde_datadir}/apps/konqueror/kpartplugins
%{tde_datadir}/apps/konqueror/servicemenus
%{tde_datadir}/apps/metabar/iconsrc
%{tde_datadir}/apps/metabar/themes/default/default.css
%{tde_datadir}/apps/metabar/themes/default/layout.html
%{tde_datadir}/apps/microformat/pics/microformat.png
%{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg
%{tde_datadir}/icons/locolor/16x16/apps/autorefresh.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/babelfish.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesync.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/validators.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/babelfish.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesync.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/validators.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png
%{tde_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/crystalsvg/32x32/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/crystalsvg/48x48/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/hicolor/16x16/apps/metabar.png
%{tde_datadir}/icons/hicolor/22x22/apps/fsview.png
%{tde_datadir}/icons/hicolor/32x32/apps/fsview.png
%{tde_datadir}/icons/hicolor/32x32/apps/metabar.png
%{tde_datadir}/icons/hicolor/48x48/apps/metabar.png
%{tde_datadir}/icons/hicolor/64x64/apps/metabar.png
%{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz
%{tde_datadir}/icons/hicolor/128x128/apps/metabar.png
%{tde_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/services/akregator_konqplugin.desktop
%{tde_datadir}/services/ark_plugin.desktop
%{tde_datadir}/services/fsview_part.desktop
%{tde_datadir}/services/kuick_plugin.desktop
%{tde_datadir}/services/webarchivethumbnail.desktop
%{tde_tdelibdir}/libadblock.la
%{tde_tdelibdir}/libadblock.so
%{tde_tdedocdir}/HTML/en/konq-plugins/
%post -n trinity-konq-plugins
for f in crystalsvg hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
%postun -n trinity-konq-plugins
for f in crystalsvg hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
##########
%package -n trinity-ksig
Summary: Graphical tool for managing multiple email signatures
Group: Applications/Utilities
Requires: trinity-kmail
%description -n trinity-ksig
KSig is a graphical tool for keeping track of many different email
signatures. The signatures themselves can be edited through KSig's
graphical user interface. A command-line interface is then available
for generating random or daily signatures from this list.
The command-line interface makes a suitable plugin for generating
signatures in external mail clients such as KMail.
%files -n trinity-ksig
%defattr(-,root,root,-)
%doc README
%{tde_bindir}/ksig
%{tde_tdeappdir}/ksig.desktop
%{tde_datadir}/apps/ksig/ksigui.rc
%{tde_datadir}/icons/hicolor/*/apps/ksig.png
%{tde_tdedocdir}/HTML/en/ksig/
%post -n trinity-ksig
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-ksig
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-noatun-plugins
Summary: plugins for Noatun, the Trinity media player
Group: Applications/Utilities
Requires: trinity-noatun
%description -n trinity-noatun-plugins
This package contains a variety of useful plugins for Noatun, the audio and
video media player for TDE. These plugins can be loaded through the plugin
manager in Noatun settings.
Highlights include an alarm clock, guessing tags from filenames, adjustable
playback speed, capture to wave file and displaying lyrics, plus a variety
of user interfaces, playlists and visualisation plugins.
%files -n trinity-noatun-plugins
%defattr(-,root,root,-)
%doc README
%{tde_bindir}/noatunsynaescope.bin
%{tde_bindir}/noatuntippecanoe.bin
%{tde_bindir}/noatuntyler.bin
%{tde_tdelibdir}/noatunalsaplayer.la
%{tde_tdelibdir}/noatunalsaplayer.so
%{tde_tdelibdir}/noatunblurscope.la
%{tde_tdelibdir}/noatunblurscope.so
%{tde_tdelibdir}/noatuncharlatan.la
%{tde_tdelibdir}/noatuncharlatan.so
%{tde_tdelibdir}/noatundub.la
%{tde_tdelibdir}/noatundub.so
%{tde_tdelibdir}/noatun_ffrs.la
%{tde_tdelibdir}/noatun_ffrs.so
%{tde_tdelibdir}/noatunluckytag.la
%{tde_tdelibdir}/noatunluckytag.so
%{tde_tdelibdir}/noatunlyrics.la
%{tde_tdelibdir}/noatunlyrics.so
%{tde_tdelibdir}/noatunmadness.la
%{tde_tdelibdir}/noatunmadness.so
%{tde_tdelibdir}/noatun_oblique.la
%{tde_tdelibdir}/noatun_oblique.so
%{tde_tdelibdir}/noatunpitchablespeed.la
%{tde_tdelibdir}/noatunpitchablespeed.so
%{tde_tdelibdir}/noatunsynaescope.la
%{tde_tdelibdir}/noatunsynaescope.so
%{tde_tdelibdir}/noatuntippecanoe.la
%{tde_tdelibdir}/noatuntippecanoe.so
%{tde_tdelibdir}/noatuntyler.la
%{tde_tdelibdir}/noatuntyler.so
%{tde_tdelibdir}/noatunwakeup.la
%{tde_tdelibdir}/noatunwakeup.so
%{tde_tdelibdir}/noatunwavecapture.la
%{tde_tdelibdir}/noatunwavecapture.so
%{tde_datadir}/apps/noatun/*
%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
%post -n trinity-noatun-plugins
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
%postun -n trinity-noatun-plugins
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep
%setup -q -n kdeaddons-3.5.13.1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /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}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--enable-new-ldflags \
--enable-closure \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-extra-includes=%{tde_includedir}/tqt:%{_includedir}/db4:%{tde_includedir}/arts:%{tde_includedir} \
--without-xmms \
--with-sdl \
--with-berkeley-db
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# File lists for locale
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -55,7 +55,12 @@ BuildRequires: trinity-tdepim-devel
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel BuildRequires: db4-devel
%endif
%if 0%{?suse_version}
BuildRequires: libdb-4_8-devel
%endif
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: xmms-devel BuildRequires: xmms-devel
@ -663,7 +668,7 @@ done
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
#export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" #export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"

@ -0,0 +1,482 @@
# Avoids relinking, which breaks consolehelper
%define dont_relink 1
# 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 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_sbindir %{tde_prefix}/sbin
%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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdeadmin
Summary: Administrative tools for TDE
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
Obsoletes: trinity-kdeadmin < %{version}-%{release}
Provides: trinity-kdeadmin = %{version}-%{release}
Source0: kdeadmin-%{version}.tar.gz
Source1: kuser.pam
Source2: kuser.pamd
Source5: kpackagerc
Source6: ksysvrc
Source7: kuserrc
BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: rpm-devel
BuildRequires: pam-devel
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: lilo
%endif
Requires: trinity-tdeadmin = %{version}-%{release}
Requires: trinity-kcron = %{version}-%{release}
Requires: trinity-kdat = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
Requires: trinity-knetworkconf = %{version}-%{release}
Requires: trinity-kpackage = %{version}-%{release}
Requires: trinity-ksysv = %{version}-%{release}
Requires: trinity-kuser = %{version}-%{release}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
Requires: trinity-lilo-config = %{version}-%{release}
%endif
%description
The tdeadmin package includes administrative tools for the Trinity Desktop
Environment (TDE) including:
kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%files
%defattr(-,root,root,-)
# LILO is not provided in RHEL or Fedora
%if 0%{?rhel} || 0%{?fedora}
%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
%endif
##########
%package -n trinity-kcron
Summary: The Trinity crontab editor
Group: Applications/Utilities
%description -n trinity-kcron
KCron is an application for scheduling programs to run in the background.
It is a graphical user interface to cron, the UNIX system scheduler.
%files -n trinity-kcron
%defattr(-,root,root,-)
%{tde_bindir}/kcron
%{tde_tdeappdir}/kcron.desktop
%{tde_datadir}/apps/kcron/kcronui.rc
%{tde_datadir}/icons/hicolor/*/apps/kcron.png
%{tde_tdedocdir}/HTML/en/kcron/
%post -n trinity-kcron
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kcron
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kdat
Summary: A Trinity tape backup tool
Group: Applications/Utilities
%description -n trinity-kdat
KDat is a tar-based tape archiver. It is designed to work with multiple
archives on a single tape.
Main features are:
* Simple graphical interface to local filesystem and tape contents.
* Multiple archives on the same physical tape.
* Complete index of archives and files is stored on local hard disk.
* Selective restore of files from an archive.
* Backup profiles for frequently used backups.
%files -n trinity-kdat
%defattr(-,root,root,-)
%doc rpmdocs/kdat/*
%{tde_bindir}/kdat
%{tde_tdeappdir}/kdat.desktop
%{tde_datadir}/apps/kdat/
%{tde_datadir}/icons/hicolor/*/apps/kdat.png
%{tde_datadir}/icons/locolor/*/apps/kdat.png
%{tde_tdedocdir}/HTML/en/kdat/
%post -n trinity-kdat
for icon_theme in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kdat
for icon_theme in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package kfile-plugins
Summary: Trinity file metainfo plugins for deb and rpm files
Group: Environment/Libraries
%description kfile-plugins
File metainfo plugins for deb and rpm package files.
%files kfile-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/kfile_deb.la
%{tde_tdelibdir}/kfile_deb.so
%{tde_tdelibdir}/kfile_rpm.la
%{tde_tdelibdir}/kfile_rpm.so
%{tde_datadir}/services/kfile_deb.desktop
%{tde_datadir}/services/kfile_rpm.desktop
##########
%package -n trinity-knetworkconf
Summary: Trinity network configuration tool
Group: Applications/Utilities
%description -n trinity-knetworkconf
This is a TDE control center module to configure TCP/IP settings. It
can be used to manage network devices and settings for each device.
%files -n trinity-knetworkconf
%defattr(-,root,root,-)
%doc rpmdocs/knetworkconf/*
%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
%{tde_datadir}/apps/knetworkconf/
%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
%{tde_tdelibdir}/kcm_knetworkconfmodule.so
%{tde_tdelibdir}/kcm_knetworkconfmodule.la
%{tde_tdedocdir}/HTML/en/knetworkconf/
%post -n trinity-knetworkconf
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-knetworkconf
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-kpackage
Summary: Trinity package management tool
Group: Applications/Utilities
%description -n trinity-kpackage
This is a frontend to both .rpm and .deb package formats. It allows you
to view currently installed packages, browse available packages, and
install/remove them.
%files -n trinity-kpackage
%defattr(-,root,root,-)
%doc rpmdocs/kpackage/*
%{tde_bindir}/kpackage
%{tde_tdeappdir}/kpackage.desktop
%{tde_datadir}/apps/kpackage/
%{tde_datadir}/config/kpackagerc
%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
%{tde_tdedocdir}/HTML/en/kpackage/
%post -n trinity-kpackage
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kpackage
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-ksysv
Summary: Trinity SysV-style init configuration editor
Group: Applications/Utilities
%description -n trinity-ksysv
This program allows you to edit your start and stop scripts using a
drag and drop GUI.
%files -n trinity-ksysv
%defattr(-,root,root,-)
%doc rpmdocs/ksysv/*
%{tde_bindir}/ksysv
%{tde_tdeappdir}/ksysv.desktop
%{tde_datadir}/apps/ksysv/
%{tde_datadir}/config/ksysvrc
%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
%{tde_datadir}/mimelnk/application/x-ksysv.desktop
%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
%{tde_tdedocdir}/HTML/en/ksysv/
%post -n trinity-ksysv
for icon_theme in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-ksysv
for icon_theme in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kuser
Summary: Trinity user/group administration tool
Group: Applications/Utilities
# package 'usermode' provides '/usr/bin/consolehelper-gtk'
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
Requires: usermode-gtk
%else
Requires: usermode
%endif
%description -n trinity-kuser
A user/group administration tool for TDE.
%files -n trinity-kuser
%defattr(-,root,root,-)
%doc rpmdocs/kuser/*
%{_sbindir}/kuser
%{tde_bindir}/kuser
%{tde_sbindir}/kuser
%{tde_tdeappdir}/kuser.desktop
%{tde_datadir}/apps/kuser/
%{tde_datadir}/config/kuserrc
%{tde_datadir}/config.kcfg/kuser.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kuser.png
%{tde_tdedocdir}/HTML/en/kuser/
%config(noreplace) /etc/pam.d/kuser
%config(noreplace) /etc/security/console.apps/kuser
%post -n trinity-kuser
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kuser
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%package -n trinity-lilo-config
Summary: Trinity frontend for lilo configuration
Group: Applications/Utilities
Requires: trinity-kcontrol
Requires: trinity-tdebase-bin
#Requires: lilo
%description -n trinity-lilo-config
lilo-config is a TDE based frontend to the lilo boot manager configuration.
It runs out of the TDE Control Center.
If you want to use the menu entry to launch lilo-config, you need to install
tdebase-bin since it uses the tdesu command to gain root privileges.
%files -n trinity-lilo-config
%defattr(-,root,root,-)
%{tde_tdelibdir}/kcm_lilo.la
%{tde_tdelibdir}/kcm_lilo.so
%{tde_tdeappdir}/lilo.desktop
%{tde_tdedocdir}/HTML/en/lilo-config/
%post -n trinity-lilo-config
touch /etc/lilo.conf
%endif
##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep
%setup -q -n kdeadmin-3.5.13.1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Do not build against any "/usr" installed KDE
export KDEDIR=%{tde_prefix}
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--sbindir=%{tde_sbindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
--with-rpm \
--with-pam=kde \
--with-shadow \
--with-private-groups \
--enable-final \
--enable-closure \
--with-private-groups \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
comps="kcron kdat knetworkconf kpackage ksysv kuser"
%__mkdir_p %{buildroot}%{tde_datadir}/config \
%{buildroot}%{_sysconfdir}/security/console.apps \
%{buildroot}%{_sysconfdir}/pam.d \
%{buildroot}%{tde_sbindir} \
%{buildroot}%{_sbindir}
%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
# Run kuser through consolehelper
%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser
%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser
%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser
%if "%{tde_prefix}" != "/usr"
%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser
%endif
# locale's
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
# rpmdocs
for dir in $comps ; do
for file in AUTHORS ChangeLog README TODO ; do
test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
done
done
# The following files are not installed in any binary package.
# This is deliberate.
# - This file serves no purpose that we can see, and conflicts
# with GNOME system tools, so be sure to leave it out.
%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc
# Extract from changelog:
# tdeadmin (4:3.5.5-2) unstable; urgency=low
# +++ Changes by Ana Beatriz Guerrero Lopez:
# * Removed useless program secpolicy. (Closes: #399426)
%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
%clean
%__rm -rf %{buildroot}
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -0,0 +1,701 @@
# 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 3.5.13 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdeartwork
Summary: Additional artwork (themes, sound themes, ...) for TDE
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
Url: http://www.trinitydesktop.org/
Source: kdeartwork-3.5.13.1.tar.gz
# [kdeartwork] Renames theme 'Locolor' to 'locolor'
Patch1: kdeartwork-3.5.13.1-fix_locolor_theme_name.patch.gz
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tdebase-devel >= %{version}
BuildRequires: gettext
BuildRequires: esound-devel
# kdeartwork specific settings
# OpenGL support
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-Mesa-libGLU
%endif
# NAS support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: nas-devel
%endif
# LIBART support
# On RHEL, libart is too old !
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_libart 1
BuildRequires: libart_lgpl-devel
%endif
# XSCREENSAVER support
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
BuildRequires: xscreensaver-extrusion
BuildRequires: xscreensaver-gl
%endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
BuildRequires: libXScrnSaver-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 6
# Provides '/usr/share/xscreensaver/config/deco.xml'
BuildRequires: xscreensaver-extras
%endif
%if 0%{?suse_version}
BuildRequires: xscreensaver-data-extra
%endif
# Opensuse does not provide 'webcollage' screensaver
%if 0%{?suse_version} == 0
%define with_webcollage 1
%endif
%endif
# JACK support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jack-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 5
BuildRequires: jack-audio-connection-kit-devel
%endif
Obsoletes: trinity-kdeartwork < %{version}-%{release}
Provides: trinity-kdeartwork = %{version}-%{release}
# Metapackage
Requires: %{name}-emoticons = %{version}-%{release}
Requires: %{name}-misc = %{version}-%{release}
Requires: %{name}-style = %{version}-%{release}
Requires: %{name}-theme-icon = %{version}-%{release}
Requires: %{name}-theme-window = %{version}-%{release}
Requires: trinity-kdewallpapers = %{version}-%{release}
Requires: trinity-kscreensaver = %{version}-%{release}
%if 0%{?with_xscreensaver}
Requires: trinity-kscreensaver-xsavers = %{version}-%{release}
Requires: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
%if 0%{?with_webcollage}
Requires: trinity-kscreensaver-xsavers-webcollage = %{version}-%{release}
%endif
%endif
%description
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
contemporary functionality, and outstanding graphical design with the
technological superiority of the Unix operating system.
This metapackage includes a collection of artistic extras (themes, widget
styles, screen savers, wallpaper, icons, emoticons and so on) provided
with the official release of KDE.
Homepage: http://artist.kde.org
%files
##########
%package emoticons
Summary: emoticon collections for tDE chat clients
Group: User Interface/Desktops
%description emoticons
This package contains several collections of emoticons used by official
and unofficial KDE chat clients, such as Kopete and Konversation.
This package is part of KDE, and a component of the KDE artwork module.
%files emoticons
%defattr(-,root,root,-)
%{tde_datadir}/emoticons/
##########
%package misc
Summary: various multimedia goodies released with TDE
Group: User Interface/Desktops
%description misc
This package contains miscellaneous multimedia goodies for KDE.
Included are additional TDE sounds and kworldclock themes.
This package is part of Trinity, and a component of the TDE artwork module.
%files misc
%defattr(-,root,root,-)
%{tde_datadir}/apps/kworldclock/
%{tde_datadir}/sounds/KDE_Logout_new.wav
%{tde_datadir}/sounds/KDE_Startup_new.wav
##########
%package style
Summary: widget styles released with Trinity
Group: User Interface/Desktops
%description style
This package contains additional widget styles for Trinity. Widget styles
can be used to customise the look and feel of interface components such
as buttons, scrollbars and so on. They can be applied using the style
manager in the TDE Control Centre.
This package is part of Trinity, and a component of the TDE artwork module.
%files style
%defattr(-,root,root,-)
%{tde_tdelibdir}/plugins/styles/
%{tde_tdelibdir}/kstyle_phase_config.la
%{tde_tdelibdir}/kstyle_phase_config.so
%{tde_datadir}/apps/kstyle/
##########
%package theme-icon
Summary: icon themes released with Trinity
Group: User Interface/Desktops
Obsoletes: trinity-kdeartwork-icons < %{version}-%{release}
Provides: trinity-kdeartwork-icons = %{version}-%{release}
%description theme-icon
This package contains additional icon themes for Trinity. Icon themes can be
used to customise the appearance of standard icons throughout KDE. They
can be applied using the icon manager in the Trinity Control Centre.
This package is part of Trinity, and a component of the TDE artwork module.
%files theme-icon
%defattr(-,root,root,-)
%{tde_datadir}/icons/*/*
%post theme-icon
for i in locolor ikons kdeclassic kids slick ; do
touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
done
%postun theme-icon
for i in locolor ikons kdeclassic kids slick ; do
touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
done
##########
%package theme-window
Summary: window decoration themes released with Trinity
Group: User Interface/Desktops
%description theme-window
This package contains additional window decoration themes for Trinity. Window
decoration themes can be used to customise the look of window borders and
buttons, and can be applied using the window decoration manager in the Trinity
Control Center.
This package is part of Trinity, and a component of the TDE artwork module.
%files theme-window
%defattr(-,root,root,-)
%{tde_tdelibdir}/[kt]win*
%{tde_datadir}/apps/[kt]win/
##########
%package -n trinity-kdewallpapers
Summary: wallpapers released with Trinity
Group: User Interface/Desktops
%description -n trinity-kdewallpapers
This package contains additional wallpapers for Trinity. Wallpapers can be
applied using the background manager in the TDE Control Centre.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kdewallpapers
%defattr(-,root,root,-)
%{tde_datadir}/wallpapers/
##########
%package -n trinity-kscreensaver
Summary: additional screen savers released with Trinity
Group: User Interface/Desktops
%description -n trinity-kscreensaver
This package contains the screen savers for Trinity. They can be tested and
selected within the Appearance and Themes section of the Trinity Control
Center.
The hooks for the standard xscreensavers are no longer part of this
package. To select and/or configure the standard xscreensavers through
the TDE Control Center, install the separate package kscreensaver-xsavers.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver
%defattr(-,root,root,-)
%{tde_bindir}/kslideshow.kss
%{tde_bindir}/kpolygon.kss
%{tde_bindir}/krotation.kss
%{tde_bindir}/ksolarwinds.kss
%{tde_bindir}/klorenz.kss
%{tde_bindir}/kvm.kss
%{tde_bindir}/kflux.kss
%{tde_bindir}/kscience.kss
%{tde_bindir}/kbanner.kss
%{tde_bindir}/kclock.kss
%{tde_bindir}/kfiresaver.kss
%{tde_bindir}/keuphoria.kss
%{tde_bindir}/kfountain.kss
%{tde_bindir}/kgravity.kss
%{tde_bindir}/kpartsaver.kss
%{tde_bindir}/kpendulum.kss
%{tde_bindir}/kblob.kss
%{tde_bindir}/klines.kss
%{tde_bindir}/kwave.kss
%{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kpartsaver.desktop
%{tde_datadir}/apps/kfiresaver/
%{tde_datadir}/apps/kscreensaver/
%if 0%{?with_xscreensaver}
%{tde_bindir}/kspace.kss
%{tde_bindir}/kswarm.kss
%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
%endif
##########
%if 0%{?with_xscreensaver}
%package -n trinity-kscreensaver-xsavers
Summary: Trinity hooks for standard xscreensavers
Group: User Interface/Desktops
Requires: trinity-tdebase-bin >= 3.5.13
Requires: xscreensaver
%description -n trinity-kscreensaver-xsavers
This package allows a smooth integration of the standard xscreensavers
into Trinity. With this package installed you can select and/or configure
the standard xscreensavers through the Appearances and Themes section of
the Trinity Control Centre.
Note that this package does not actually contain any screensavers itself.
For the additional screensavers shipped with Trinity, see the separate package
kscreensaver-trinity. This package does depend on the xscreensaver package, and
recommend the xscreensaver-gl package, as well as contain the necessary
files to integrate these packages into Trinity.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver-xsavers
%defattr(-,root,root,-)
#%{tde_bindir}/xscreensaver-getimage-file
#%{tde_bindir}/xscreensaver-getimage
%{tde_bindir}/kxsconfig
%{tde_bindir}/kxsrun
%{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
%{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
%{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
%{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
%{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
%{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
%{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
%{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
%{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
%{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
%{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
%{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
%{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
%{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
%{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
%{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
%{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
%{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
%{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
%{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
%{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
%{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
# These screensavers do not exist on Mageia 2
%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0
%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
%endif
##########
%if 0%{?with_webcollage}
%package -n trinity-kscreensaver-xsavers-webcollage
Summary: webcollage screensaver Trinity hook
Group: User Interface/Desktops
Requires: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
Requires: netpbm
%description -n trinity-kscreensaver-xsavers-webcollage
This package give access to the webcollage screensaver through the Trinity
screensaver configuration.
This screensaver downloads random pictures from the internet and creates
a collage as screensaver.
IMPORTANT NOTICE: The internet contains all kinds of pictures, some of which
you might find inappropriate and offensive.
You are specially discouraged to install this package if you are using
your computer in a working environment or in an environment with children.
If you still want to install this package, please read the file
/usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the
installation.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver-xsavers-webcollage
%defattr(-,root,root,-)
%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
%endif
##########
%package -n trinity-kscreensaver-xsavers-extra
Summary: Trinity hooks for standard xscreensavers
Group: User Interface/Desktops
Requires: trinity-kscreensaver-xsavers = %{version}-%{release}
%description -n trinity-kscreensaver-xsavers-extra
This package allows a smooth integration of the universe xscreensavers
into Trinity. With this package installed you can select and/or configure
the universe xscreensavers through the Appearances and Themes section of
the Trinity Control Centre.
Note that this package does not actually contain any screensavers itself.
For the additional screensavers shipped with TDE, see the separate package
kscreensaver.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver-xsavers-extra
%defattr(-,root,root,-)
%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop
%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop
%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop
%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop
%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop
%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop
%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop
%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop
%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop
%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop
%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop
%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop
%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop
%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop
%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop
%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop
%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop
%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop
%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop
%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop
%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop
%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop
%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop
%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop
%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop
%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop
%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop
%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop
%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop
%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop
%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop
%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop
%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop
%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop
%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop
%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop
%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop
%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop
%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop
%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop
%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop
%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop
%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop
%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop
%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop
%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop
%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop
%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop
%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop
%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop
%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop
%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tangram.desktop
%{tde_datadir}/applnk/System/ScreenSavers/thornbird.desktop
%{tde_datadir}/applnk/System/ScreenSavers/timetunnel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/triangle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/truchet.desktop
%{tde_datadir}/applnk/System/ScreenSavers/twang.desktop
%{tde_datadir}/applnk/System/ScreenSavers/vermiculate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/wander.desktop
%{tde_datadir}/applnk/System/ScreenSavers/whirlwindwarp.desktop
%{tde_datadir}/applnk/System/ScreenSavers/wormhole.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xanalogtv.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xflame.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xrayswarm.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop
%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
# These screensavers do not exist on OpenSuse 12.2
%if 0%{?suse_version} == 0
%{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop
%endif
# These screensavers do not exist on Mageia 2 and Mandriva 2011
%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0
%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
%endif
%endif
##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep
%setup -q -n kdeartwork-3.5.13.1
%patch1 -p0
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
%{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
%{!?with_libart}:-DWITH_LIBART=OFF} \
-DWITH_OPENGL=ON \
-DWITH_ARTS=ON \
-DBUILD_ALL=ON \
..
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install -C build DESTDIR=%{buildroot}
# webcollage -root -directory /usr/share/backgrounds/images #227683
# File lists
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Duplicate with trinity-kbabel (from tdesdk)
%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png
%clean
%__rm -rf %{buildroot}
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -0,0 +1,81 @@
--- kdebase/kdesktop/bgmanager.cc.ORI 2012-09-06 17:20:49.564915154 -0400
+++ kdebase/kdesktop/bgmanager.cc 2012-09-06 17:21:01.969682348 -0400
@@ -1013,13 +1013,13 @@
slotChangeDesktop(0);
}
-#ifdef COMPOSITE
void KBackgroundManager::slotCmBackgroundChanged( bool )
{
+#ifdef COMPOSITE
m_tPixmap->fill(TQColor(0, 0x0));
m_Hash = 0;
slotChangeDesktop(0);
-}
#endif
+}
#include "bgmanager.moc"
--- kdebase/kdesktop/main.cc.ORI 2012-09-07 20:33:09.716283507 +0200
+++ kdebase/kdesktop/main.cc 2012-09-07 20:33:31.683842727 +0200
@@ -43,7 +43,7 @@
#include <fcntl.h>
#include <stdlib.h>
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
#define COMPOSITE
#endif
--- kdebase/kdesktop/bgmanager.h.ORI 2012-09-07 20:36:28.196299160 +0200
+++ kdebase/kdesktop/bgmanager.h 2012-09-07 20:36:52.420812591 +0200
@@ -15,7 +15,7 @@
#include <KBackgroundIface.h>
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
#define COMPOSITE
#endif
--- kdebase/kdesktop/kdesktopapp.h.ORI 2012-09-07 20:37:14.677365503 +0200
+++ kdebase/kdesktop/kdesktopapp.h 2012-09-07 20:37:25.194154223 +0200
@@ -23,7 +23,7 @@
#include <config.h>
#include <kuniqueapplication.h>
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
#define COMPOSITE
#endif
--- kdebase/konsole/konsole/main.cpp.ORI 2012-09-07 20:37:37.749901966 +0200
+++ kdebase/konsole/konsole/main.cpp 2012-09-07 20:37:46.683722469 +0200
@@ -46,7 +46,7 @@
#include "konsole.h"
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
#define COMPOSITE
#endif
--- kdebase/CMakeLists.txt.ORI 2012-09-07 20:41:11.142612361 +0200
+++ kdebase/CMakeLists.txt 2012-09-07 20:42:40.138822080 +0200
@@ -78,6 +78,7 @@
option( WITH_ARTS "Enable aRts support" OFF )
option( WITH_I8K "Enable Dell laptop support (ksysguard)" OFF )
option( WITH_HAL "Enable HAL support" OFF )
+option( WITH_COMPOSITE "Enable COMPOSITE support" OFF )
##### user requested modules ####################
--- kdebase/config.h.cmake.composite 2012-09-07 20:44:49.980208832 +0200
+++ kdebase/config.h.cmake 2012-09-07 20:44:56.929068934 +0200
@@ -177,3 +177,6 @@
// tsak
#cmakedefine BUILD_TSAK "@BUILD_TSAK@"
+
+ // kdesktop, konsole
+ #cmakedefine WITH_COMPOSITE "@WITH_COMPOSITE@"

@ -0,0 +1,22 @@
--- kdebase/kdm/backend/CMakeLists.txt.ORI 2012-09-06 22:17:30.134745111 +0200
+++ kdebase/kdm/backend/CMakeLists.txt 2012-09-06 22:17:34.329664333 +0200
@@ -37,7 +37,7 @@
tde_add_executable( kdm
SOURCES
- access.c auth.c bootman.c choose.c client.c consolekit.c
+ access.c auth.c bootman.c choose.c client.c
ctrl.c daemon.c dm.c dpylist.c error.c genauth.c
inifile.c krb5auth.c mitauth.c netaddr.c policy.c
process.c protodpy.c reset.c resource.c rpcauth.c
--- kdebase/kdm/backend/dm.h.ORI 2012-09-06 17:33:31.284704186 -0400
+++ kdebase/kdm/backend/dm.h 2012-09-06 17:33:40.415522219 -0400
@@ -37,8 +37,6 @@
#ifndef _DM_H_
#define _DM_H_ 1
-#define WITH_CONSOLE_KIT
-
#include "greet.h"
#include <config.ci>

@ -0,0 +1,97 @@
--- kdebase/kdm/backend/CMakeLists.txt.ORI 2012-09-06 22:11:08.422091268 +0200
+++ kdebase/kdm/backend/CMakeLists.txt 2012-09-06 22:11:21.280843938 +0200
@@ -14,11 +14,11 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${DBUS_TQT_INCLUDE_DIRS}
+ ${DBUS_INCLUDE_DIRS}
)
link_directories(
- ${DBUS_TQT_LIBRARY_DIRS}
+ ${DBUS_LIBRARY_DIRS}
)
##### kdm (executable) ##########################
@@ -43,6 +43,6 @@
process.c protodpy.c reset.c resource.c rpcauth.c
server.c session.c sessreg.c socket.c streams.c
util.c xdmauth.c xdmcp.c
- LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
+ LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
--- kdebase/ksmserver/CMakeLists.txt.ORI 2012-09-06 17:22:59.990317001 -0400
+++ kdebase/ksmserver/CMakeLists.txt 2012-09-06 17:23:16.340989494 -0400
@@ -19,13 +19,13 @@
${CMAKE_SOURCE_DIR}/kdmlib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
- ${DBUS_TQT_INCLUDE_DIRS}
+ ${DBUS_INCLUDE_DIRS}
${HAL_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
- ${DBUS_TQT_LIBRARY_DIRS}
+ ${DBUS_LIBRARY_DIRS}
)
@@ -43,5 +43,5 @@
main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
legacy.cpp startup.cpp shutdown.cpp client.cpp
KSMServerInterface.skel server.skel timed.ui
- LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
+ LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_LIBRARIES}
)
--- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI 2012-09-07 23:57:56.858227336 +0200
+++ kdebase/kioslave/media/mediamanager/CMakeLists.txt 2012-09-07 23:58:54.948097583 +0200
@@ -20,12 +20,12 @@
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${HAL_INCLUDE_DIRS}
- ${DBUS_TQT_INCLUDE_DIRS}
+ ${DBUS_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
- ${DBUS_TQT_LIBRARY_DIRS}
+ ${DBUS_LIBRARY_DIRS}
)
@@ -48,7 +48,7 @@
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
+ LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_LIBRARIES} -ldbus-qt-1
DESTINATION ${PLUGIN_INSTALL_DIR}
)
else( )
--- kdebase-3.5.13.1/ConfigureChecks.cmake.ORI 2012-10-08 22:57:40.751052066 +0200
+++ kdebase-3.5.13.1/ConfigureChecks.cmake 2012-10-08 22:57:49.226885124 +0200
@@ -254,19 +254,4 @@
tde_message_fatal( "dbus-1 is required, but was not found on your system" )
endif( )
- # check for dbus-tqt
- pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
- set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
- check_cxx_source_compiles("
- #include <tqt.h>
- #include <dbus/connection.h>
- int main(int, char**) { return 0; } "
- HAVE_DBUS_QT3_07 )
- tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- if( NOT HAVE_DBUS_QT3_07 )
- tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
- endif( )
-
endif( )

@ -0,0 +1,50 @@
--- kdebase/config.h.cmake.ORI 2012-08-20 11:19:03.411461759 +0200
+++ kdebase/config.h.cmake 2012-08-20 11:19:40.587461736 +0200
@@ -174,3 +174,6 @@
// kdm, kcontrol
#cmakedefine WITH_XRANDR "@WITH_XRANDR@"
+
+// tsak
+#cmakedefine BUILD_TSAK "@BUILD_TSAK@"
--- kdebase/kdesktop/lock/main.cc.tsak 2012-08-20 13:55:47.265335687 +0200
+++ kdebase/kdesktop/lock/main.cc 2012-08-20 13:56:31.594856008 +0200
@@ -207,8 +207,11 @@
struct stat st;
KSimpleConfig* tdmconfig;
OPEN_TDMCONFIG_AND_SET_GROUP
+#ifdef BUILD_TSAK
trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
-
+#else
+ trinity_desktop_lock_use_sak = false;
+#endif
LockProcess process;
// Start loading core functions, such as the desktop wallpaper interface
@@ -272,7 +275,11 @@
trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
if (trinity_desktop_lock_use_system_modal_dialogs) {
+#ifdef BUILD_TSAK
trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
+#else
+ trinity_desktop_lock_use_sak = false;
+#endif
}
else {
trinity_desktop_lock_use_sak = false; // If SAK is enabled with unmanaged windows, the SAK dialog will never close and will "burn in" the screen
--- kdebase/kdm/kfrontend/kgapp.cpp.tsak 2012-08-20 14:00:44.387336567 +0200
+++ kdebase/kdm/kfrontend/kgapp.cpp 2012-08-20 14:01:26.280461134 +0200
@@ -195,7 +195,11 @@
KProcess *dcop = 0;
KProcess *kwin = 0;
+#ifdef BUILD_TSAK
trinity_desktop_lock_use_sak = _useSAK;
+#else
+ trinity_desktop_lock_use_sak = false;
+#endif
if (trinity_desktop_lock_use_sak) {
tsak = new KProcess;
*tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";

@ -0,0 +1,37 @@
--- kdebase/ConfigureChecks.cmake.afterlibdetect.ORI 2012-09-06 20:46:34.705339175 +0200
+++ kdebase/ConfigureChecks.cmake 2012-09-06 20:47:12.331548001 +0200
@@ -229,19 +229,21 @@
tde_message_fatal( "dbus-1 is required, but was not found on your system" )
endif( )
- # check for dbus-tqt
- pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
- set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
- check_cxx_source_compiles("
- #include <tqt.h>
- #include <dbus/connection.h>
- int main(int, char**) { return 0; } "
- HAVE_DBUS_QT3_07 )
- tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- if( NOT HAVE_DBUS_QT3_07 )
- tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
+ if( BUILD_TSAK )
+ # check for dbus-tqt
+ pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
+ tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+ set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
+ set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
+ check_cxx_source_compiles("
+ #include <tqt.h>
+ #include <dbus/connection.h>
+ int main(int, char**) { return 0; } "
+ HAVE_DBUS_QT3_07 )
+ tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+ if( NOT HAVE_DBUS_QT3_07 )
+ tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
+ endif( )
endif( )
endif( )

@ -0,0 +1,10 @@
--- kdebase/kdm/backend/CMakeLists.txt.ORI 2012-09-19 21:39:48.505001985 +0200
+++ kdebase/kdm/backend/CMakeLists.txt 2012-09-19 21:40:08.951005360 +0200
@@ -14,6 +14,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
+ ${DBUS_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
)

@ -0,0 +1,102 @@
--- kdebase/ConfigureChecks.cmake.libdetect 2012-09-06 20:55:39.679897201 +0200
+++ kdebase/ConfigureChecks.cmake 2012-09-06 21:06:41.454048511 +0200
@@ -100,22 +100,26 @@
# xext (kwin/kompmgr)
if( WITH_XEXT )
pkg_search_module( XEXT xext )
- if( XEXT_FOUND )
- set( HAVE_XEXT 1 )
- else( XEXT_FOUND )
- tde_message_fatal( "xext is requested, but was not found on your system" )
+ if( NOT XEXT_FOUND )
+ find_path( XEXT_INCLUDE_DIR "X11/extensions/Xext.h" )
+ if ( NOT XEXT_INCLUDE_DIR )
+ tde_message_fatal( "xext is requested, but was not found on your system" )
+ endif( )
endif( )
+ set( HAVE_XEXT 1 )
endif( )
# xtest (kxkb)
if( WITH_XTEST )
pkg_search_module( XTEST xtst )
- if( XTEST_FOUND )
- set( HAVE_XTEST 1 )
- else( XTEST_FOUND )
- tde_message_fatal( "xtest is requested, but was not found on your system" )
+ if( NOT XTEST_FOUND )
+ find_path ( XTEST_INCLUDE_DIR "X11/extensions/XTest.h" )
+ if( NOT XTEST_INCLUDE_DIR )
+ tde_message_fatal( "xtest is requested, but was not found on your system" )
+ endif( )
endif( )
+ set( HAVE_XTEST 1 )
endif( )
@@ -125,12 +129,20 @@
if( HAVE_XSSLIB )
pkg_search_module( XSS xscrnsaver )
else( )
- check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
- if( HAVE_XSSLIB )
- pkg_search_module( XSS xext )
+ find_path( XSS_LIBRARY_DIR "libXss.so" )
+ if( XSS_LIBRARY_DIR )
+ set( HAVE_XSSLIB 1 )
+ else( )
+ check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
+ if( HAVE_XSSLIB )
+ pkg_search_module( XSS xext )
+ endif( )
endif( )
endif( )
- check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
+ find_path( XSCREENSAVER_INCLUDE_DIR "X11/extensions/scrnsaver.h" )
+ if( XSCREENSAVER_INCLUDE_DIR )
+ set( HAVE_XSCREENSAVER_H 1 )
+ endif( )
if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
set( HAVE_XSCREENSAVER 1 )
else( )
--- kdebase/kcontrol/ConfigureChecks.cmake.ORI 2012-09-06 21:14:07.070747861 +0200
+++ kdebase/kcontrol/ConfigureChecks.cmake 2012-09-06 21:18:33.159501490 +0200
@@ -59,10 +59,13 @@
if( WITH_LIBUSB )
pkg_search_module( LIBUSB libusb )
- if( LIBUSB_FOUND )
- set( HAVE_LIBUSB 1 CACHE INTERNAL "" FORCE )
- else( )
- tde_message_fatal( "libusb are requested, but not found on your system" )
+ if( NOT LIBUSB_FOUND )
+ find_path( LIBUSB_LIBRARY_DIR libusb.so )
+ if( LIBUSB_LIBRARY_DIR )
+ set( HAVE_LIBUSB 1 CACHE INTERNAL "" FORCE )
+ else( )
+ #tde_message_fatal( "libusb are requested, but not found on your system" )
+ endif( )
endif( )
endif( )
--- kdebase/kdm/ConfigureChecks.cmake.ORI 2012-09-06 21:43:53.814013510 +0200
+++ kdebase/kdm/ConfigureChecks.cmake 2012-09-06 21:44:10.768708628 +0200
@@ -112,7 +112,7 @@
# Xau
pkg_search_module( XAU xau )
if( NOT XAU_FOUND )
- tde_message_fatal( "Xau are required, but not found on your system" )
+ set( XAU_LIBRARIES "-lXau" )
endif()
@@ -122,7 +122,7 @@
if( XDMCP_FOUND )
set( XDMCP 1 CACHE INTERNAL "" FORCE )
else()
- tde_message_fatal( "xdmcp is requested, but was not found on your system" )
+ set( XDMCP_LIBRARIES "-lXdmcp" )
endif()
endif()

@ -0,0 +1,152 @@
--- kdebase/kwin/kompmgr/kompmgr.c.rhel4 2012-09-06 22:02:37.201586743 +0200
+++ kdebase/kwin/kompmgr/kompmgr.c 2012-09-06 22:04:39.529337359 +0200
@@ -89,6 +89,8 @@
#include <pwd.h>
#endif
+#define ShapeInput 2
+
typedef enum {
WINTYPE_DESKTOP,
WINTYPE_DOCK,
@@ -403,6 +405,70 @@
#endif
}
+void
+loadConfig(char *filename){
+ FILE *file = NULL;
+ char line[ 1024 ];
+ size_t length = 0;
+ Bool wasNull = False;
+ Bool section = False;
+
+ if( filename == NULL ){
+#ifdef USE_ENV_HOME
+ const char *home = getenv("HOME");
+#else
+ const char *home;
+ struct passwd *p;
+ p = getpwuid(getuid());
+ if (p)
+ home = p->pw_dir;
+ else
+ home = getenv("HOME");
+#endif
+ const char *configfile = "/.xcompmgrrc";
+ int n = strlen(home)+strlen(configfile)+1;
+ filename = (char*)malloc(n*sizeof(char));
+ memset(filename,0,n);
+ wasNull = True;
+
+ strcat(filename, home);
+ strcat(filename, configfile);
+ }
+
+ printf("trying '%s' as configfile\n\n", filename);
+
+ if( (file = fopen(filename, "r")) == NULL ){
+ printf("failed to open config file. does it exist?\n");
+ if( wasNull ){
+ free(filename);
+ filename = NULL;
+ }
+ return;
+ }
+
+ /*find section*/
+ while( !section && fgets(line, 1023, file) != NULL ){
+ if( strcmp(line, "[xcompmgr]\n") == 0 )
+ section = True;
+ }
+ /*read and set values*/
+ while( section && fgets(line, 1023, file) != NULL ){
+ int ret = strlen( line );
+ if( ret > 1 ){
+ if( *line == '[' )/*found new section - maybe check for '\n'?*/
+ break;
+ *(line+ret-1) = '\0';
+ setParameter(line);
+ }
+ }
+ printf("\nfinished parsing the config file\n");
+ fclose(file);
+ if( wasNull ){
+ free(filename);
+ filename = NULL;
+ }
+}
+
void handle_siguser (int sig)
{
int uidnum;
@@ -2992,69 +3058,6 @@
return 0;
}
-void
-loadConfig(char *filename){
- FILE *file = NULL;
- char line[ 1024 ];
- size_t length = 0;
- Bool wasNull = False;
- Bool section = False;
-
- if( filename == NULL ){
-#ifdef USE_ENV_HOME
- const char *home = getenv("HOME");
-#else
- const char *home;
- struct passwd *p;
- p = getpwuid(getuid());
- if (p)
- home = p->pw_dir;
- else
- home = getenv("HOME");
-#endif
- const char *configfile = "/.xcompmgrrc";
- int n = strlen(home)+strlen(configfile)+1;
- filename = (char*)malloc(n*sizeof(char));
- memset(filename,0,n);
- wasNull = True;
-
- strcat(filename, home);
- strcat(filename, configfile);
- }
-
- printf("trying '%s' as configfile\n\n", filename);
-
- if( (file = fopen(filename, "r")) == NULL ){
- printf("failed to open config file. does it exist?\n");
- if( wasNull ){
- free(filename);
- filename = NULL;
- }
- return;
- }
-
- /*find section*/
- while( !section && fgets(line, 1023, file) != NULL ){
- if( strcmp(line, "[xcompmgr]\n") == 0 )
- section = True;
- }
- /*read and set values*/
- while( section && fgets(line, 1023, file) != NULL ){
- int ret = strlen( line );
- if( ret > 1 ){
- if( *line == '[' )/*found new section - maybe check for '\n'?*/
- break;
- *(line+ret-1) = '\0';
- setParameter(line);
- }
- }
- printf("\nfinished parsing the config file\n");
- fclose(file);
- if( wasNull ){
- free(filename);
- filename = NULL;
- }
-}
void
usage (char *program)

@ -0,0 +1,12 @@
--- kdebase/tsak/main.cpp.tsak 2012-08-20 18:12:34.000000000 -0400
+++ kdebase/tsak/main.cpp 2012-08-20 18:13:16.748272246 -0400
@@ -35,7 +35,9 @@
#include <sys/time.h>
#include <termios.h>
#include <signal.h>
+extern "C" {
#include <libudev.h>
+}
#include <libgen.h>
#define FIFO_DIR "/tmp/ksocket-global"

@ -0,0 +1,11 @@
--- kdebase/kdm/kfrontend/genkdmconf.c.ORI 2011-11-01 21:59:14.450046357 +0100
+++ kdebase/kdm/kfrontend/genkdmconf.c 2011-11-01 21:59:34.449045801 +0100
@@ -676,7 +676,7 @@
" ;;\n"
"esac\n"
"# invoke global X session script\n"
-". /etc/X11/Xsession\n";
+". /etc/X11/xdm/Xsession\n";
static const char def_background[] =
"[Desktop0]\n"

@ -0,0 +1,137 @@
From 553923b25dc41e2c17ba9038eb225cd3bb9b1770 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 21 Sep 2012 23:27:59 +0000
Subject: Forcibly prevent transient override redirect windows from showing up over the lock screen
This closes Bug 1079
---
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 236bf8a..005ac99 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -573,9 +573,19 @@ void PasswordDlg::gplugActivity()
void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
{
- TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM );
+ TQDialog dialog( this, 0, true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
+ if (trinity_desktop_lock_use_system_modal_dialogs) {
+ // Signal that we do not want any window controls to be shown at all
+ Atom kde_wm_system_modal_notification;
+ kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
+ XChangeProperty(tqt_xdisplay(), dialog.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
+ }
+ dialog.setCaption(i18n("Authentication Subsystem Notice"));
TQFrame *winFrame = new TQFrame( &dialog );
- winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
+ if (trinity_desktop_lock_use_system_modal_dialogs)
+ winFrame->setFrameStyle( TQFrame::NoFrame );
+ else
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
TQVBoxLayout *vbox = new TQVBoxLayout( &dialog );
vbox->addWidget( winFrame );
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 2ce7507..5265bc6 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -960,6 +960,27 @@ void LockProcess::createSaverWindow()
setGeometry(0, 0, mRootWidth, mRootHeight);
+ // HACK
+ // Close all tooltips and notification windows
+ {
+ Window rootWindow = RootWindow(x11Display(), x11Screen());
+ Window parent;
+ Window* children = NULL;
+ unsigned int noOfChildren = 0;
+ XWindowAttributes childAttr;
+ Window childTransient;
+
+ if (XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
+ for (unsigned int i=0; i<noOfChildren; i++) {
+ if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
+ if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
+ XUnmapWindow(x11Display(), children[i]);
+ }
+ }
+ }
+ }
+ }
+
kdDebug(1204) << "Saver window Id: " << winId() << endl;
}
@@ -2162,9 +2183,19 @@ void LockProcess::unlockXF86()
void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
{
- TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM );
+ TQDialog box( 0, "messagebox", true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
+ if (trinity_desktop_lock_use_system_modal_dialogs) {
+ // Signal that we do not want any window controls to be shown at all
+ Atom kde_wm_system_modal_notification;
+ kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
+ XChangeProperty(tqt_xdisplay(), box.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
+ }
+ box.setCaption(i18n("Authentication Subsystem Notice"));
TQFrame *winFrame = new TQFrame( &box );
- winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
+ if (trinity_desktop_lock_use_system_modal_dialogs)
+ winFrame->setFrameStyle( TQFrame::NoFrame );
+ else
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
TQLabel *label1 = new TQLabel( winFrame );
label1->setPixmap( TQMessageBox::standardIcon( type ) );
@@ -2264,8 +2295,10 @@ void LockProcess::windowAdded( WId w, bool managed )
int y = XDisplayHeight( tqt_xdisplay(), tqt_xscreen()) - attr_geom.height;
if( managed ) {
XSetWindowAttributes attr;
- attr.override_redirect = True;
- XChangeWindowAttributes( tqt_xdisplay(), w, CWOverrideRedirect, &attr );
+ if (!trinity_desktop_lock_use_system_modal_dialogs) {
+ attr.override_redirect = True;
+ XChangeWindowAttributes( tqt_xdisplay(), w, CWOverrideRedirect, &attr );
+ }
XReparentWindow( tqt_xdisplay(), w, tqt_xrootwin(), x, y );
XMapWindow( tqt_xdisplay(), w );
}
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 56b4b5f..e74d9f9 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -76,6 +76,30 @@ bool MyApp::x11EventFilter( XEvent *ev )
emit activity();
}
}
+ else if (ev->type == MapNotify) {
+ // HACK
+ // Close all tooltips and notification windows
+ XMapEvent map_event = ev->xmap;
+ XWindowAttributes childAttr;
+ Window childTransient;
+ if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
+ if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
+ XUnmapWindow(map_event.display, map_event.window);
+ }
+ }
+ }
+ else if (ev->type == CreateNotify) {
+ // HACK
+ // Close all tooltips and notification windows
+ XCreateWindowEvent create_event = ev->xcreatewindow;
+ XWindowAttributes childAttr;
+ Window childTransient;
+ if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
+ if ((childAttr.override_redirect) && (childTransient)) {
+ XDestroyWindow(create_event.display, create_event.window);
+ }
+ }
+ }
return KApplication::x11EventFilter( ev );
}
--
cgit v0.9.0.2-39-g756e

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -0,0 +1,20 @@
--- kdebase-3.5.13.1/kcontrol/displayconfig/displayconfig.desktop.ORI 2012-10-04 23:36:14.085070870 +0200
+++ kdebase-3.5.13.1/kcontrol/displayconfig/displayconfig.desktop 2012-10-04 23:36:23.449879298 +0200
@@ -3,7 +3,7 @@
Comment=Configure display
Comment[en_US]=Configure display
DocPath=kcontrol/displayconfig.html
-Exec[$e]=kcmshell displayconfig
+Exec=kcmshell displayconfig
GenericName=
GenericName[en_US]=
Icon=background
@@ -12,7 +12,7 @@
Name=Monitor & Display
Name[en_US]=Monitor & Display
NoDisplay=false
-Path[$e]=
+Path=
StartupNotify=true
Terminal=false
TerminalOptions=

@ -0,0 +1,135 @@
commit 553923b25dc41e2c17ba9038eb225cd3bb9b1770
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1348270079 -0500
Forcibly prevent transient override redirect windows from showing up over the lock screen
This closes Bug 1079
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 236bf8a..005ac99 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -573,9 +573,19 @@ void PasswordDlg::gplugActivity()
void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
{
- TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM );
+ TQDialog dialog( this, 0, true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
+ if (trinity_desktop_lock_use_system_modal_dialogs) {
+ // Signal that we do not want any window controls to be shown at all
+ Atom kde_wm_system_modal_notification;
+ kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
+ XChangeProperty(qt_xdisplay(), dialog.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
+ }
+ dialog.setCaption(i18n("Authentication Subsystem Notice"));
TQFrame *winFrame = new TQFrame( &dialog );
- winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
+ if (trinity_desktop_lock_use_system_modal_dialogs)
+ winFrame->setFrameStyle( TQFrame::NoFrame );
+ else
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
TQVBoxLayout *vbox = new TQVBoxLayout( &dialog );
vbox->addWidget( winFrame );
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 2ce7507..5265bc6 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -960,6 +960,27 @@ void LockProcess::createSaverWindow()
setGeometry(0, 0, mRootWidth, mRootHeight);
+ // HACK
+ // Close all tooltips and notification windows
+ {
+ Window rootWindow = RootWindow(x11Display(), x11Screen());
+ Window parent;
+ Window* children = NULL;
+ unsigned int noOfChildren = 0;
+ XWindowAttributes childAttr;
+ Window childTransient;
+
+ if (XQueryTree(x11Display(), rootWindow, &rootWindow, &parent, &children, &noOfChildren) && noOfChildren>0 ) {
+ for (unsigned int i=0; i<noOfChildren; i++) {
+ if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
+ if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
+ XUnmapWindow(x11Display(), children[i]);
+ }
+ }
+ }
+ }
+ }
+
kdDebug(1204) << "Saver window Id: " << winId() << endl;
}
@@ -2162,9 +2183,19 @@ void LockProcess::unlockXF86()
void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
{
- TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM );
+ TQDialog box( 0, "messagebox", true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM)) );
+ if (trinity_desktop_lock_use_system_modal_dialogs) {
+ // Signal that we do not want any window controls to be shown at all
+ Atom kde_wm_system_modal_notification;
+ kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
+ XChangeProperty(qt_xdisplay(), box.winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
+ }
+ box.setCaption(i18n("Authentication Subsystem Notice"));
TQFrame *winFrame = new TQFrame( &box );
- winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
+ if (trinity_desktop_lock_use_system_modal_dialogs)
+ winFrame->setFrameStyle( TQFrame::NoFrame );
+ else
+ winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
winFrame->setLineWidth( 2 );
TQLabel *label1 = new TQLabel( winFrame );
label1->setPixmap( TQMessageBox::standardIcon( type ) );
@@ -2264,8 +2295,10 @@ void LockProcess::windowAdded( WId w, bool managed )
int y = XDisplayHeight( qt_xdisplay(), qt_xscreen()) - attr_geom.height;
if( managed ) {
XSetWindowAttributes attr;
- attr.override_redirect = True;
- XChangeWindowAttributes( qt_xdisplay(), w, CWOverrideRedirect, &attr );
+ if (!trinity_desktop_lock_use_system_modal_dialogs) {
+ attr.override_redirect = True;
+ XChangeWindowAttributes( qt_xdisplay(), w, CWOverrideRedirect, &attr );
+ }
XReparentWindow( qt_xdisplay(), w, qt_xrootwin(), x, y );
XMapWindow( qt_xdisplay(), w );
}
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 56b4b5f..e74d9f9 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -76,6 +76,30 @@ bool MyApp::x11EventFilter( XEvent *ev )
emit activity();
}
}
+ else if (ev->type == MapNotify) {
+ // HACK
+ // Close all tooltips and notification windows
+ XMapEvent map_event = ev->xmap;
+ XWindowAttributes childAttr;
+ Window childTransient;
+ if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
+ if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
+ XUnmapWindow(map_event.display, map_event.window);
+ }
+ }
+ }
+ else if (ev->type == CreateNotify) {
+ // HACK
+ // Close all tooltips and notification windows
+ XCreateWindowEvent create_event = ev->xcreatewindow;
+ XWindowAttributes childAttr;
+ Window childTransient;
+ if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
+ if ((childAttr.override_redirect) && (childTransient)) {
+ XDestroyWindow(create_event.display, create_event.window);
+ }
+ }
+ }
return KApplication::x11EventFilter( ev );
}

@ -0,0 +1,159 @@
commit 57f5c0698d49f0a0a7a55c75404f5b9ded910002
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1348355175 -0500
Lower override redirect windows instead of unmapping them on lock start
Restore lowered windows on lock exit
This provides a better solution to Bug 1079
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 5265bc6..7191346 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -138,6 +138,8 @@ extern bool trinity_desktop_lock_delay_screensaver_start;
extern bool trinity_desktop_lock_use_sak;
extern bool trinity_desktop_lock_forced;
+extern TQXLibWindowList trinity_desktop_lock_hidden_window_list;
+
bool trinity_desktop_lock_autohide_lockdlg = TRUE;
bool trinity_desktop_lock_closing_windows = FALSE;
bool trinity_desktop_lock_in_sec_dlg = FALSE;
@@ -961,7 +963,7 @@ void LockProcess::createSaverWindow()
setGeometry(0, 0, mRootWidth, mRootHeight);
// HACK
- // Close all tooltips and notification windows
+ // Hide all tooltips and notification windows
{
Window rootWindow = RootWindow(x11Display(), x11Screen());
Window parent;
@@ -974,7 +976,10 @@ void LockProcess::createSaverWindow()
for (unsigned int i=0; i<noOfChildren; i++) {
if (XGetWindowAttributes(x11Display(), children[i], &childAttr) && XGetTransientForHint(x11Display(), children[i], &childTransient)) {
if ((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
- XUnmapWindow(x11Display(), children[i]);
+ if (!trinity_desktop_lock_hidden_window_list.contains(children[i])) {
+ trinity_desktop_lock_hidden_window_list.append(children[i]);
+ }
+ XLowerWindow(x11Display(), children[i]);
}
}
}
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 0dacc46..7fd4236 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -38,6 +38,8 @@ struct GreeterPluginHandle {
#define FIFO_FILE_OUT "/tmp/ksocket-global/kdesktoplockcontrol_out"
#define PIPE_CHECK_INTERVAL 50
+typedef TQValueList<Window> TQXLibWindowList;
+
//===========================================================================
//
// Screen saver handling process. Handles screensaver window,
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index e74d9f9..a95747e 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -47,6 +47,8 @@ else { \
} \
tdmconfig->setGroup("X-*-Greeter");
+TQXLibWindowList trinity_desktop_lock_hidden_window_list;
+
// [FIXME] Add GUI configuration checkboxes for these three settings (see kdesktoprc [ScreenSaver] UseUnmanagedLockWindows, DelaySaverStart, and UseTDESAK)
bool trinity_desktop_lock_use_system_modal_dialogs = FALSE;
bool trinity_desktop_lock_delay_screensaver_start = FALSE;
@@ -78,16 +80,43 @@ bool MyApp::x11EventFilter( XEvent *ev )
}
else if (ev->type == MapNotify) {
// HACK
- // Close all tooltips and notification windows
+ // Hide all tooltips and notification windows
XMapEvent map_event = ev->xmap;
XWindowAttributes childAttr;
Window childTransient;
if (XGetWindowAttributes(map_event.display, map_event.window, &childAttr) && XGetTransientForHint(map_event.display, map_event.window, &childTransient)) {
if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
- XUnmapWindow(map_event.display, map_event.window);
+ if (!trinity_desktop_lock_hidden_window_list.contains(map_event.window)) {
+ trinity_desktop_lock_hidden_window_list.append(map_event.window);
+ }
+ XLowerWindow(map_event.display, map_event.window);
}
}
}
+ else if (ev->type == VisibilityNotify) {
+ // HACK
+ // Hide all tooltips and notification windows
+ XVisibilityEvent visibility_event = ev->xvisibility;
+ XWindowAttributes childAttr;
+ Window childTransient;
+ if ((visibility_event.state == VisibilityUnobscured) || (visibility_event.state == VisibilityPartiallyObscured)) {
+ if (XGetWindowAttributes(visibility_event.display, visibility_event.window, &childAttr) && XGetTransientForHint(visibility_event.display, visibility_event.window, &childTransient)) {
+ if((childAttr.map_state == IsViewable) && (childAttr.override_redirect) && (childTransient)) {
+ if (!trinity_desktop_lock_hidden_window_list.contains(visibility_event.window)) {
+ trinity_desktop_lock_hidden_window_list.append(visibility_event.window);
+ }
+ XLowerWindow(visibility_event.display, visibility_event.window);
+ }
+ }
+ }
+ }
+ else if (ev->type == DestroyNotify) {
+ XDestroyWindowEvent destroy_event = ev->xdestroywindow;
+ if (trinity_desktop_lock_hidden_window_list.contains(destroy_event.window)) {
+ trinity_desktop_lock_hidden_window_list.remove(destroy_event.window);
+ }
+ }
+#if 0
else if (ev->type == CreateNotify) {
// HACK
// Close all tooltips and notification windows
@@ -100,6 +129,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
}
}
}
+#endif
return KApplication::x11EventFilter( ev );
}
@@ -114,6 +144,14 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
+void restore_hidden_override_redirect_windows() {
+ TQXLibWindowList::iterator it;
+ for (it = trinity_desktop_lock_hidden_window_list.begin(); it != trinity_desktop_lock_hidden_window_list.end(); ++it) {
+ Window win = *it;
+ XRaiseWindow(qt_xdisplay(), win);
+ }
+}
+
static void sigusr1_handler(int)
{
signalled_forcelock = TRUE;
@@ -356,7 +394,10 @@ int main( int argc, char **argv )
}
if (in_internal_mode == FALSE) {
- return app.exec();
+ trinity_desktop_lock_hidden_window_list.clear();
+ int ret = app.exec();
+ restore_hidden_override_redirect_windows();
+ return ret;
}
else {
pid_t kdesktop_pid = atoi(args->getOption( "internal" ));
@@ -364,7 +405,9 @@ int main( int argc, char **argv )
// The controlling kdesktop process probably died. Commit suicide...
return 12;
}
+ trinity_desktop_lock_hidden_window_list.clear();
app.exec();
+ restore_hidden_override_redirect_windows();
if (kill(kdesktop_pid, SIGUSR1) < 0) {
// The controlling kdesktop process probably died. Commit suicide...
return 12;

@ -0,0 +1,58 @@
commit 1f33dc8fd2fc14c2abb74be4e27ef08fdda784d6
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1348374670 -0500
Attempt to minimize the time in which new notifications are displayed before being hidden
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 7191346..db92c00 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -980,6 +980,7 @@ void LockProcess::createSaverWindow()
trinity_desktop_lock_hidden_window_list.append(children[i]);
}
XLowerWindow(x11Display(), children[i]);
+ XFlush(x11Display());
}
}
}
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index a95747e..7235776 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -90,6 +90,7 @@ bool MyApp::x11EventFilter( XEvent *ev )
trinity_desktop_lock_hidden_window_list.append(map_event.window);
}
XLowerWindow(map_event.display, map_event.window);
+ XFlush(map_event.display);
}
}
}
@@ -106,10 +107,27 @@ bool MyApp::x11EventFilter( XEvent *ev )
trinity_desktop_lock_hidden_window_list.append(visibility_event.window);
}
XLowerWindow(visibility_event.display, visibility_event.window);
+ XFlush(visibility_event.display);
}
}
}
}
+ else if (ev->type == CreateNotify) {
+ // HACK
+ // Close all tooltips and notification windows
+ XCreateWindowEvent create_event = ev->xcreatewindow;
+ XWindowAttributes childAttr;
+ Window childTransient;
+ if (XGetWindowAttributes(create_event.display, create_event.window, &childAttr) && XGetTransientForHint(create_event.display, create_event.window, &childTransient)) {
+ if ((childAttr.override_redirect) && (childTransient)) {
+ if (!trinity_desktop_lock_hidden_window_list.contains(create_event.window)) {
+ trinity_desktop_lock_hidden_window_list.append(create_event.window);
+ }
+ XLowerWindow(create_event.display, create_event.window);
+ XFlush(create_event.display);
+ }
+ }
+ }
else if (ev->type == DestroyNotify) {
XDestroyWindowEvent destroy_event = ev->xdestroywindow;
if (trinity_desktop_lock_hidden_window_list.contains(destroy_event.window)) {

@ -0,0 +1,11 @@
#%PAM-1.0
auth required pam_stack.so service=system-auth
auth required pam_nologin.so
auth sufficient pam_timestamp.so
account required pam_stack.so service=system-auth
password required pam_stack.so service=system-auth
session required pam_stack.so service=system-auth
session required pam_loginuid.so
session optional pam_timestamp.so
session optional pam_selinux.so
session optional pam_console.so

@ -0,0 +1,5 @@
#%PAM-1.0
auth include common-auth
account include common-account
password include common-password
session include common-session

@ -0,0 +1,9 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_nologin.so
auth required pam_permit.so
account required pam_stack.so service=system-auth
password required pam_stack.so service=system-auth
session required pam_stack.so service=system-auth
session required pam_loginuid.so
session optional pam_console.so

@ -0,0 +1,11 @@
#%PAM-1.0
auth required pam_stack.so service=system-auth
auth required pam_nologin.so
auth sufficient pam_timestamp.so
account required pam_stack.so service=system-auth
password required pam_stack.so service=system-auth
session required pam_stack.so service=system-auth
session required pam_loginuid.so
session optional pam_timestamp.so
session optional pam_selinux.so
session optional pam_console.so

@ -0,0 +1,11 @@
#%PAM-1.0
auth required pam_stack.so service=system-auth
auth required pam_nologin.so
auth sufficient pam_timestamp.so
account required pam_stack.so service=system-auth
password required pam_stack.so service=system-auth
session required pam_stack.so service=system-auth
session required pam_loginuid.so
session optional pam_timestamp.so
session optional pam_selinux.so
session optional pam_console.so

@ -11,20 +11,20 @@
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde %define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/kde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. # Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
# whereas newer versions use "qt3", "qt3-devel" ... # whereas newer versions use "qt3", "qt3-devel" ...
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _qt_suffix 3 %define _qt_suffix 3
%endif %endif
Name: trinity-tdebase Name: trinity-tdebase
Version: 3.5.13.1 Version: 3.5.13.1
Release: 0%{?dist}%{?_variant} Release: 1%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity Base Programs Summary: Trinity Base Programs
Group: User Interface/Desktops Group: User Interface/Desktops
@ -45,23 +45,25 @@ URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdebase-3.5.13.tar.gz Source0: kdebase-3.5.13.1.tar.gz
# Wrapper script to prevent Plasma launch at Trinity Startup # Wrapper script to prevent Plasma launch at Trinity Startup
Source1: plasma-desktop Source1: plasma-desktop
# Pam configuration files for RHEL / Fedora # Pam configuration files for RHEL / Fedora
%if 0%{?suse_version}
Source4: pamd.kcheckpass-trinity.opensuse%{?suse_version}
%else
Source2: pamd.kdm-trinity%{?dist} Source2: pamd.kdm-trinity%{?dist}
Source3: pamd.kdm-trinity-np%{?dist} Source3: pamd.kdm-trinity-np%{?dist}
Source4: pamd.kcheckpass-trinity%{?dist} Source4: pamd.kcheckpass-trinity%{?dist}
Source5: pamd.kscreensaver-trinity%{?dist} Source5: pamd.kscreensaver-trinity%{?dist}
%endif
# [kdebase] Switch to v3.5.13-sru
Patch0: kdebase-3.5.13-sru-20120806.patch
Patch1: cmake-3.5.13-sru-20120807.patch
Patch2: tdebase-3.5.13.1-missing_ldflags.patch
# TDE 3.5.13 patches # TDE 3.5.13 patches
## [kdebase] Fix syntax error in icon
Patch1: kdebase-3.5.13.1-fix_displayconfig_icon.patch
## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora] ## [kdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
Patch11: kdebase-3.5.12-desktop-openterminalhere.patch Patch11: kdebase-3.5.12-desktop-openterminalhere.patch
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora] ## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' [RHEL/Fedora]
@ -70,25 +72,25 @@ Patch13: kdebase-3.5.13-genkdmconf_Xsession_location.patch
Patch15: kdebase-3.5.13.1-startkde_icon.patch Patch15: kdebase-3.5.13.1-startkde_icon.patch
## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db' [Bug #714] ## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db' [Bug #714]
Patch21: kdebase-3.5.13-kio_man_utf8.patch Patch21: kdebase-3.5.13-kio_man_utf8.patch
## [kdebase/kpersonalizer] Repair KPersonalizer settings to match system defaults [Bug #759]
Patch26: kdebase-3.5.13-kpersonalizer_default_doubleclick.patch
## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora] ## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
Patch30: kdebase-3.5.12-kdm_hide_menu_button.patch Patch30: kdebase-3.5.12-kdm_hide_menu_button.patch
## [kdebase/kicker/applets] Adds option to disable desktop switch on mouse wheel cycling [Bug #908]
Patch36: kdebase-3.5.13-option_to_disable_scroll_desktop.patch ### Patches for RHEL4 (should not go upstream)
## [kdebase/kicker] Ensures that 'pagersettings.kcfg' is installed [Bug #908, Commit bd9c1479]
Patch44: kdebase-3.5.13-ensure_pagersettings_is_installed.patch ## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
## [tdebase] Add the ability to reorder documents in kate [Commit #46a657f7] Patch201: kdebase-3.5.13-fix_lib_detection.patch
Patch55: kdebase-3.5.13-add_reorder_documents_in_kate.patch ## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
## [tdebase] Add drag and drop to kate file list in manual mode [Commit #b0fa10df] Patch202: kdebase-3.5.13-build_without_dbustqt.patch
Patch56: kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch ## [tdebase] Do not build against ConsoleKit
## [tdebase] Disable keyboard shortcuts for file location moving, as they did not work properly Patch203: kdebase-3.5.13-build_without_consolekit.patch
## and have very little practical use [Commit #9a948c1a] ## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
Patch57: kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch Patch204: kdebase-3.5.13-add_disable_composite_option.patch
## [tdebase] Update default konqueror maximum image preview size to 10MB. [Commit #03e19305] ## [tdebase] Downgrade halbackend to support Hal 0.4
Patch60: kdebase-3.5.13-update_default_konq_max_image_prev_size.patch Patch205: kdebase-3.5.13-support_hal_04.patch
## [tdebase] Other(s) FTBFS ...
### FEDORA / RHEL distribution-specific settings ### Patch206: kdebase-3.5.13-fix_rhel4_compilation.patch
### Distribution-specific settings ###
# Fedora 15 Theme: "Lovelock" # Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15 %if 0%{?fedora} == 15
@ -123,6 +125,18 @@ Requires: fedora-release-notes
%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html %define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
%endif %endif
# RHEL 4 Theme
%if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic
%define tde_bg /usr/share/backgrounds/images/default.png
Requires: redhat-logos
%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
Requires: indexhtml
%define tde_aboutlabel Enterprise Linux 4
%define tde_aboutpage /usr/share/doc/HTML/index.html
%endif
# RHEL 5 Theme # RHEL 5 Theme
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic Requires: desktop-backgrounds-basic
@ -167,68 +181,169 @@ Requires: indexhtml
%define tde_aboutpage /usr/share/mdk/about/index.html %define tde_aboutpage /usr/share/mdk/about/index.html
%endif %endif
# OpenSuse 12.2 Theme
%if "%{?suse_version}" == "1220"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
Requires: opensuse-manuals_en
%define tde_aboutlabel OpenSuse 12.2
%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
%endif
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: gcc-c++ make BuildRequires: gcc-c++ make
BuildRequires: qt%{?_qt_suffix}-devel BuildRequires: qt%{?_qt_suffix}-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: imake BuildRequires: audiofile-devel
BuildRequires: OpenEXR-devel BuildRequires: alsa-lib-devel
BuildRequires: libsmbclient-devel
BuildRequires: dbus-devel
BuildRequires: dbus-tqt-devel
BuildRequires: lm_sensors-devel
BuildRequires: libfontenc-devel
BuildRequires: hal-devel
BuildRequires: audiofile-devel alsa-lib-devel
BuildRequires: libraw1394-devel BuildRequires: libraw1394-devel
BuildRequires: openldap-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: libxkbfile-devel
BuildRequires: libusb-devel BuildRequires: libusb-devel
BuildRequires: esound-devel BuildRequires: esound-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: nas-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: avahi-tqt-devel
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} # OPENLDAP support
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%else
BuildRequires: openldap-devel
%endif
# SENSORS support
# Disabled on OpenSuse
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
BuildRequires: lm_sensors-devel
%endif
%if 0%{?suse_version}
BuildRequires: libsensors4-devel
%endif
# TSAK support (requires libudev-devel)
# On RHEL5, udev is built statically, so TSAK cannot build.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_tsak 1
BuildRequires: libudev-devel BuildRequires: libudev-devel
%endif %endif
# XRANDR support
# On RHEL5, xrandr library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_xrandr 1
%endif
# HAL support
# On RHEL4, we do not use HAL (too old)
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_hal 1
BuildRequires: hal-devel >= 0.4.8
%endif
# OPENEXR support
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_exr 1
BuildRequires: OpenEXR-devel
%endif
# XSCREENSAVER support
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?rhel} == 5
BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-screensaver
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
BuildRequires: libXScrnSaver-devel
%endif
%endif
# AVAHI support
# Disabled on RHEL4 and RHEL5
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
BuildRequires: trinity-avahi-tqt-devel
Requires: trinity-avahi-tqt
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
%else
BuildRequires: avahi-devel
Requires: avahi
%endif
%endif
# NAS support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: nas-devel
%endif
# DBUS support
# TQT bindings not available for RHEL4
%if 0%{?rhel} == 4
# Dbus bindings were rebuilt with Qt support
BuildRequires: dbus-devel >= 0.22-12.EL.9p1
Requires: dbus-qt
%else
BuildRequires: trinity-dbus-tqt-devel
Requires: trinity-dbus-tqt >= %{version}
%endif
%if 0%{?fedora} >= 17 %if 0%{?fedora} >= 17
BuildRequires: perl-Digest-MD5 BuildRequires: perl-Digest-MD5
%endif %endif
# JACK support
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}jack-devel BuildRequires: %{_lib}jack-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 5
BuildRequires: jack-audio-connection-kit-devel
%endif
# X11 stuff ...
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
BuildRequires: samba-common
%else
BuildRequires: imake
BuildRequires: libxkbfile-devel
BuildRequires: libsmbclient-devel
BuildRequires: libfontenc-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
BuildRequires: %{_lib}xdamage-devel BuildRequires: %{_lib}xdamage-devel
BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst-devel BuildRequires: %{_lib}xtst-devel
BuildRequires: x11-font-util BuildRequires: x11-font-util
BuildRequires: x11-proto-devel BuildRequires: x11-proto-devel
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
Requires: %{_lib}avahi-client3
%else %else
BuildRequires: avahi-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libXcomposite-devel BuildRequires: libXcomposite-devel
BuildRequires: libXdamage-devel BuildRequires: libXdamage-devel
BuildRequires: libXdmcp-devel BuildRequires: libXdmcp-devel
BuildRequires: libXtst-devel BuildRequires: libXtst-devel
BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
%if 0%{?rhel} == 5
BuildRequires: gnome-screensaver %if 0%{?suse_version}
BuildRequires: font-util
BuildRequires: bdftopcf
%else %else
BuildRequires: xscreensaver BuildRequires: xorg-x11-font-utils
%endif %endif
Requires: avahi-qt3
%endif
%endif %endif
# tdebase is a metapackage that installs all sub-packages # tdebase is a metapackage that installs all sub-packages
@ -264,13 +379,12 @@ Requires: trinity-twin = %{version}-%{release}
Requires: trinity-libkonq = %{version}-%{release} Requires: trinity-libkonq = %{version}-%{release}
Requires: %{name}-libtqt3-integration = %{version}-%{release} Requires: %{name}-libtqt3-integration = %{version}-%{release}
Requires: tqtinterface Requires: trinity-tqtinterface >= %{version}
Requires: trinity-arts Requires: trinity-arts >= %{version}
Requires: trinity-kdelibs Requires: trinity-tdelibs >= %{version}
Requires: qt%{?_qt_suffix} Requires: qt%{?_qt_suffix}
Requires: openssl Requires: openssl
Requires: avahi
Requires: dbus-tqt
# RHEL 6 Configuration files are provided in separate packages # RHEL 6 Configuration files are provided in separate packages
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
@ -280,6 +394,10 @@ Requires: kde-settings-kdm
Requires: redhat-menus Requires: redhat-menus
%endif %endif
%if 0%{?suse_version}
Requires: desktop-data-openSUSE
%endif
%description %description
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use, desktop environment for Unix workstations. It combines ease of use,
@ -301,7 +419,7 @@ web browser, X terminal emulator, and many other programs and components.
Summary: %{summary} - Development files Summary: %{summary} - Development files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: trinity-kdelibs-devel Requires: trinity-tdelibs-devel
Requires: %{name}-bin-devel = %{version}-%{release} Requires: %{name}-bin-devel = %{version}-%{release}
Requires: trinity-kate-devel = %{version}-%{release} Requires: trinity-kate-devel = %{version}-%{release}
@ -456,6 +574,12 @@ Group: Environment/Libraries
%files -n trinity-libkateinterfaces %files -n trinity-libkateinterfaces
%{tde_libdir}/libkateinterfaces.so.* %{tde_libdir}/libkateinterfaces.so.*
%post -n trinity-libkateinterfaces
/sbin/ldconfig || :
%postun -n trinity-libkateinterfaces
/sbin/ldconfig || :
########## ##########
%package -n trinity-kate %package -n trinity-kate
@ -585,9 +709,12 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
Summary: control center for TDE Summary: control center for TDE
Group: Applications/Utilities Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-data = %{version}-%{release}
Requires: hwdata
Requires: usbutils Requires: usbutils
%if 0%{?suse_version} == 0
Requires: hwdata
%endif
%description -n trinity-kcontrol %description -n trinity-kcontrol
The TDE Control Center provides you with a centralized and convenient The TDE Control Center provides you with a centralized and convenient
way to configure all of your TDE settings. way to configure all of your TDE settings.
@ -835,7 +962,7 @@ plugdev group.
%{tde_datadir}/apps/kcmview1394/oui.db %{tde_datadir}/apps/kcmview1394/oui.db
# The following features are not compiled under RHEL 5 # The following features are not compiled under RHEL 5
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%{tde_bindir}/krandrtray %{tde_bindir}/krandrtray
%{tde_tdelibdir}/kcm_displayconfig.la %{tde_tdelibdir}/kcm_displayconfig.la
%{tde_tdelibdir}/kcm_displayconfig.so %{tde_tdelibdir}/kcm_displayconfig.so
@ -897,8 +1024,10 @@ TDE applications, particularly those in the TDE base module.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/krootbacking %{tde_bindir}/krootbacking
#%{tde_bindir}/tdeinit_phase1 #%{tde_bindir}/tdeinit_phase1
%if 0%{?with_tsak}
%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak %attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
%{tde_bindir}/tsak %{tde_bindir}/tsak
%endif
%{tde_bindir}/kdebugdialog %{tde_bindir}/kdebugdialog
%{tde_bindir}/kreadconfig %{tde_bindir}/kreadconfig
%{tde_bindir}/kwriteconfig %{tde_bindir}/kwriteconfig
@ -965,7 +1094,9 @@ TDE applications, particularly those in the TDE base module.
%{tde_datadir}/services/kded/khotkeys.desktop %{tde_datadir}/services/kded/khotkeys.desktop
%{tde_datadir}/services/kxkb.desktop %{tde_datadir}/services/kxkb.desktop
%{_sysconfdir}/pam.d/kcheckpass-trinity %{_sysconfdir}/pam.d/kcheckpass-trinity
%if 0%{?suse_version} == 0
%{_sysconfdir}/pam.d/kscreensaver-trinity %{_sysconfdir}/pam.d/kscreensaver-trinity
%endif
%{tde_tdedocdir}/HTML/en/kdcop/ %{tde_tdedocdir}/HTML/en/kdcop/
%{tde_tdedocdir}/HTML/en/kdebugdialog// %{tde_tdedocdir}/HTML/en/kdebugdialog//
%{tde_tdedocdir}/HTML/en/[kt]desu/ %{tde_tdedocdir}/HTML/en/[kt]desu/
@ -1090,6 +1221,7 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png %{tde_datadir}/icons/crystalsvg/*/apps/package_development.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png %{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png %{tde_datadir}/icons/crystalsvg/*/apps/package_games.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png %{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png
%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png %{tde_datadir}/icons/crystalsvg/*/apps/package_network.png
%{tde_datadir}/icons/crystalsvg/*/apps/package.png %{tde_datadir}/icons/crystalsvg/*/apps/package.png
@ -1150,6 +1282,7 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz %{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz %{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz %{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz
%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz %{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz %{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz %{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
@ -1296,7 +1429,7 @@ for f in crystalsvg ; do
done done
%if 0%{?mdkversion} %if 0%{?mdkversion}
# Mandriva-specific: we have to choose a background for current distribution variant # Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
# First, we read the "product" key in /etc/product.id # First, we read the "product" key in /etc/product.id
eval $(tr "," ";" </etc/product.id) 2>/dev/null eval $(tr "," ";" </etc/product.id) 2>/dev/null
# Then, we create a symbolic link to the corresponding background # Then, we create a symbolic link to the corresponding background
@ -1317,7 +1450,14 @@ Group: Applications/Utilities
Requires: trinity-kdesktop = %{version}-%{release} Requires: trinity-kdesktop = %{version}-%{release}
Requires: cyrus-sasl Requires: cyrus-sasl
Requires: psmisc Requires: psmisc
%if 0%{?with_hal}
Requires: hal >= 0.4.8
%endif
%if 0%{?rhel} == 4 || 0%{?suse_version}
Requires: cryptsetup
%else
Requires: cryptsetup-luks Requires: cryptsetup-luks
%endif
Obsoletes: tdebase-kio-plugins < %{version}-%{release} Obsoletes: tdebase-kio-plugins < %{version}-%{release}
Provides: tdebase-kio-plugins = %{version}-%{release} Provides: tdebase-kio-plugins = %{version}-%{release}
@ -1340,8 +1480,6 @@ group.
%{tde_tdelibdir}/cursorthumbnail.so %{tde_tdelibdir}/cursorthumbnail.so
%{tde_tdelibdir}/djvuthumbnail.la %{tde_tdelibdir}/djvuthumbnail.la
%{tde_tdelibdir}/djvuthumbnail.so %{tde_tdelibdir}/djvuthumbnail.so
%{tde_tdelibdir}/exrthumbnail.la
%{tde_tdelibdir}/exrthumbnail.so
%{tde_tdelibdir}/htmlthumbnail.la %{tde_tdelibdir}/htmlthumbnail.la
%{tde_tdelibdir}/htmlthumbnail.so %{tde_tdelibdir}/htmlthumbnail.so
%{tde_tdelibdir}/imagethumbnail.la %{tde_tdelibdir}/imagethumbnail.la
@ -1406,8 +1544,6 @@ group.
%{tde_tdelibdir}/kio_trash.so %{tde_tdelibdir}/kio_trash.so
%{tde_tdelibdir}/libkmanpart.la %{tde_tdelibdir}/libkmanpart.la
%{tde_tdelibdir}/libkmanpart.so %{tde_tdelibdir}/libkmanpart.so
%{tde_tdelibdir}/media_propsdlgplugin.la
%{tde_tdelibdir}/media_propsdlgplugin.so
%{tde_tdelibdir}/textthumbnail.la %{tde_tdelibdir}/textthumbnail.la
%{tde_tdelibdir}/textthumbnail.so %{tde_tdelibdir}/textthumbnail.so
%{tde_tdeappdir}/kcmcgi.desktop %{tde_tdeappdir}/kcmcgi.desktop
@ -1432,7 +1568,6 @@ group.
%{tde_datadir}/services/cgi.protocol %{tde_datadir}/services/cgi.protocol
%{tde_datadir}/services/cursorthumbnail.desktop %{tde_datadir}/services/cursorthumbnail.desktop
%{tde_datadir}/services/djvuthumbnail.desktop %{tde_datadir}/services/djvuthumbnail.desktop
%{tde_datadir}/services/exrthumbnail.desktop
%{tde_datadir}/services/finger.protocol %{tde_datadir}/services/finger.protocol
%{tde_datadir}/services/fish.protocol %{tde_datadir}/services/fish.protocol
%{tde_datadir}/services/floppy.protocol %{tde_datadir}/services/floppy.protocol
@ -1452,7 +1587,6 @@ group.
%{tde_datadir}/services/mac.protocol %{tde_datadir}/services/mac.protocol
%{tde_datadir}/services/man.protocol %{tde_datadir}/services/man.protocol
%{tde_datadir}/services/media.protocol %{tde_datadir}/services/media.protocol
%{tde_datadir}/services/media_propsdlgplugin.desktop
%{tde_datadir}/services/nfs.protocol %{tde_datadir}/services/nfs.protocol
%{tde_datadir}/services/nxfish.protocol %{tde_datadir}/services/nxfish.protocol
%{tde_datadir}/services/programs.protocol %{tde_datadir}/services/programs.protocol
@ -1469,6 +1603,16 @@ group.
%{tde_datadir}/servicetypes/thumbcreator.desktop %{tde_datadir}/servicetypes/thumbcreator.desktop
%{tde_datadir}/services/kfile_trash.desktop %{tde_datadir}/services/kfile_trash.desktop
%{tde_tdedocdir}/HTML/en/kioslave/ %{tde_tdedocdir}/HTML/en/kioslave/
%if 0%{?with_exr}
%{tde_tdelibdir}/exrthumbnail.la
%{tde_tdelibdir}/exrthumbnail.so
%{tde_datadir}/services/exrthumbnail.desktop
%endif
%if 0%{?with_hal}
%{tde_tdelibdir}/media_propsdlgplugin.la
%{tde_tdelibdir}/media_propsdlgplugin.so
%{tde_datadir}/services/media_propsdlgplugin.desktop
%endif
%post kio-plugins %post kio-plugins
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
@ -1592,7 +1736,9 @@ Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-data = %{version}-%{release}
Requires: trinity-libkonq = %{version}-%{release} Requires: trinity-libkonq = %{version}-%{release}
Requires: eject Requires: eject
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
Requires: xdg-utils Requires: xdg-utils
%endif
%description -n trinity-kdesktop %description -n trinity-kdesktop
This package contains miscellaneous binaries and files integral to This package contains miscellaneous binaries and files integral to
@ -1659,9 +1805,13 @@ Requires: %{name}-data = %{version}-%{release}
Requires: pam Requires: pam
# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession) # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
Requires: xinitrc Requires: xinitrc
%else %endif
%if 0%{?suse_version}
Requires: xdm
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
Requires: xorg-x11-xinit Requires: xorg-x11-xinit
%endif %endif
@ -1705,21 +1855,20 @@ already. Most users won't need this.
%{tde_datadir}/apps/[kt]dm/themes/ %{tde_datadir}/apps/[kt]dm/themes/
%{tde_datadir}/config/[kt]dm/ %{tde_datadir}/config/[kt]dm/
%{tde_tdedocdir}/HTML/en/[kt]dm/ %{tde_tdedocdir}/HTML/en/[kt]dm/
%if 0%{?suse_version} == 0
%{_sysconfdir}/pam.d/kdm-trinity
%{_sysconfdir}/pam.d/kdm-trinity-np
%endif
# Distribution specific stuff # Distribution specific stuff
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%{_usr}/share/xsessions/tde.desktop %{_usr}/share/xsessions/tde.desktop
%endif %endif
%{_sysconfdir}/pam.d/kdm-trinity
%{_sysconfdir}/pam.d/kdm-trinity-np
%if 0%{?mgaversion} || 0%{?mdkversion}
%{_sysconfdir}/X11/wmsession.d/*
%post -n trinity-tdm
%make_session
%postun -n trinity-tdm # https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
%make_session %if 0%{?mgaversion} || 0%{?mdkversion}
%{_sysconfdir}/X11/wmsession.d/45TDE
%{_datadir}/X11/dm.d/45TDE.conf
%endif %endif
########## ##########
@ -1924,7 +2073,7 @@ functionality.
%{tde_datadir}/autostart/panel.desktop %{tde_datadir}/autostart/panel.desktop
%{tde_datadir}/config.kcfg/kickerSettings.kcfg %{tde_datadir}/config.kcfg/kickerSettings.kcfg
%{tde_datadir}/config.kcfg/launcherapplet.kcfg %{tde_datadir}/config.kcfg/launcherapplet.kcfg
#%{tde_datadir}/config.kcfg/pagersettings.kcfg %{tde_datadir}/config.kcfg/pagersettings.kcfg
%{tde_datadir}/config.kcfg/taskbar.kcfg %{tde_datadir}/config.kcfg/taskbar.kcfg
%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png %{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png %{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
@ -2209,11 +2358,15 @@ for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done done
/sbin/ldconfig || : /sbin/ldconfig || :
%if 0%{?suse_version}
update-alternatives --install \
%else
alternatives --install \ alternatives --install \
%endif
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \ %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
media_safelyremove.desktop_konqueror \ media_safelyremove.desktop_konqueror \
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \ %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
10 10 || :
%postun -n trinity-konqueror %postun -n trinity-konqueror
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
@ -2225,9 +2378,13 @@ done
%preun -n trinity-konqueror %preun -n trinity-konqueror
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%if 0%{?suse_version}
update-alternatives --remove \
%else
alternatives --remove \ alternatives --remove \
%endif
media_safelyremove.desktop_konqueror \ media_safelyremove.desktop_konqueror \
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
fi fi
########## ##########
@ -2452,6 +2609,12 @@ KDE will start, but many good defaults will not be set.
%{tde_bindir}/plasma-desktop %{tde_bindir}/plasma-desktop
%endif %endif
%post -n trinity-ksmserver
/sbin/ldconfig || :
%postun -n trinity-ksmserver
/sbin/ldconfig || :
########## ##########
%package -n trinity-ksplash %package -n trinity-ksplash
@ -2817,13 +2980,16 @@ Konqueror libraries.
########## ##########
%prep %if 0%{?suse_version}
%setup -q -n kdebase %debug_package
%endif
%patch0 -p1 ##########
%patch1 -p1
%patch2 -p1 %prep
%setup -q -n kdebase-3.5.13.1
%patch1 -p1 -b .icon
%patch11 -p1 -b .openterminalhere %patch11 -p1 -b .openterminalhere
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
%patch13 -p1 -b .Xsession %patch13 -p1 -b .Xsession
@ -2832,14 +2998,16 @@ Konqueror libraries.
%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
%patch21 -p1 -b .man %patch21 -p1 -b .man
%endif %endif
%patch26 -p1 -b .doubleclick
%patch30 -p1 -b .xtestsupport %patch30 -p1 -b .xtestsupport
%patch36 -p1 -b .disablescrolldesktop
%patch44 -p1 -b .kxdglauncherdoc %if 0%{?rhel} == 4
%patch55 -p1 -b .addreorderdocinkate %patch201 -p1 -b .libdetect
%patch56 -p1 -b .adddraganddropinkate %patch202 -p1 -b .dbustqt
%patch57 -p1 -b .disablekeybshortcut %patch203 -p1 -b .consolekit
%patch60 -p1 -b .defaultkonqmaxsizepreview %patch204 -p1 -b .composite
%patch205 -p1 -b .hal04
%patch206 -p1 -b .rhel4
%endif
# Applies an optional distro-specific graphical theme # Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != "" %if "%{?tde_bg}" != ""
@ -2877,13 +3045,23 @@ Konqueror libraries.
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
%if 0%{?rhel} || 0%{?fedora} # Avoids building against KDE3's old stuff, if installed
export KDEDIR=%{tde_prefix}
# Shitty hack for RHEL4 ...
if [ -d /usr/X11R6 ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH=}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${CFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif %endif
@ -2897,53 +3075,63 @@ cd build
-DWITH_SASL=ON \ -DWITH_SASL=ON \
-DWITH_LDAP=ON \ -DWITH_LDAP=ON \
-DWITH_SAMBA=ON \ -DWITH_SAMBA=ON \
-DWITH_OPENEXR=ON \ %{?with_exr:-DWITH_OPENEXR=ON} \
-DWITH_XCOMPOSITE=ON \ %{?with_hal:-DWITH_HAL=ON} \
-DWITH_XCURSOR=ON \ %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-DWITH_XFIXES=ON \ %if 0%{?rhel} == 4
%if 0%{?fedora} || 0%{?rhel} >= 6 -DWITH_XTEST=OFF \
-DWITH_XRANDR=ON \
%else %else
-DWITH_XRANDR=OFF \ -DWITH_XTEST=ON \
%endif %endif
-DWITH_XRENDER=ON \ -DWITH_XCURSOR=ON \
-DWITH_XFIXES=ON \
%{?with_xrandr:-DWITH_XRANDR=ON} \
-DWITH_XDAMAGE=ON \ -DWITH_XDAMAGE=ON \
-DWITH_XEXT=ON \ -DWITH_XEXT=ON \
-DWITH_XTEST=ON \
-DWITH_LIBUSB=ON \ -DWITH_LIBUSB=ON \
-DWITH_LIBRAW1394=ON \ -DWITH_LIBRAW1394=ON \
-DWITH_PAM=ON \ -DWITH_PAM=ON \
-DWITH_XDMCP=ON \ -DWITH_XDMCP=ON \
-DWITH_XINERAMA=ON \ -DWITH_XINERAMA=ON \
-DWITH_XCOMPOSITE=ON \
-DWITH_XRENDER=ON \
-DWITH_ARTS=ON \ -DWITH_ARTS=ON \
-DWITH_I8K=ON \ -DWITH_I8K=ON \
-DWITH_HAL=ON \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
%if 0%{?suse_version}
-DKDM_PAM_SERVICE="xdm" \
-DKSCREENSAVER_PAM_SERVICE="kcheckpass-trinity" \
%else
-DKDM_PAM_SERVICE="kdm-trinity" \ -DKDM_PAM_SERVICE="kdm-trinity" \
-DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \ -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
-DWITH_XSCREENSAVER=ON \ %endif
%{!?with_tsak:-DBUILD_TSAK=OFF} \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build %__make install DESTDIR=%{?buildroot} -C build
# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
# Adds a GDM/KDM/XDM session called 'TDE' # Adds a GDM/KDM/XDM session called 'TDE'
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__install -D -m 644 \ %__install -D -m 644 \
"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \ "%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
"%{?buildroot}%{_usr}/share/xsessions/tde.desktop" "%{?buildroot}%{_datadir}/xsessions/tde.desktop"
# Force session name to be 'TDE' # Force session name to be 'TDE'
%__sed -i "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" \ %__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-e "s,^Name=.*,Name=TDE," -e "s,^Name=.*,Name=TDE,"
%endif %endif
# Mageia/Mandriva stores its session file in different folder than RHEL/Fedora # Mageia/Mandriva stores its session file in different folder than RHEL/Fedora
# Generated files for TDM/KDM4 are in '/usr/share/apps/kdm/sessions'
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
@ -2954,6 +3142,15 @@ EXEC=%{tde_bindir}/startkde
SCRIPT: SCRIPT:
exec %{tde_bindir}/startkde exec %{tde_bindir}/startkde
EOF EOF
%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
NAME=TDM
DESCRIPTION=TDM (Trinity Display Manager)
PACKAGE=trinity-tdm
EXEC=%{tde_bindir}/kdm
FNDSESSION_EXEC="/usr/sbin/chksession -K"
EOF
%endif %endif
# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard' # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
@ -2967,14 +3164,18 @@ EOF
%endif %endif
# PAM configuration files # PAM configuration files
%if 0%{?suse_version}
%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%else
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity" %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np" %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity" %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
%endif
# KDM configuration for RHEL/Fedora # KDM configuration for RHEL/Fedora
%__sed -i "%{?buildroot}%{tde_datadir}/config/kdm/kdmrc" \ %__sed -i "%{?buildroot}%{tde_datadir}/config/kdm/kdmrc" \
%if 0%{?fedora} >= 16 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220
-e "s/^#*MinShowUID=.*/MinShowUID=1000/" -e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else %else
-e "s/^#*MinShowUID=.*/MinShowUID=500/" -e "s/^#*MinShowUID=.*/MinShowUID=500/"
@ -2987,8 +3188,10 @@ EOF
%endif %endif
# Symlinks 'usb.ids' # Symlinks 'usb.ids'
%if 0%{?suse_version} == 0
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%endif
# Makes 'media_safelyremove.desktop' an alternative # Makes 'media_safelyremove.desktop' an alternative
%__mv -f %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %__mv -f %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
@ -3002,8 +3205,5 @@ EOF
%changelog %changelog
* Sat Jul 14 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-26 * Mon Sep 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Add xscreensaver support to CMake [Bug #659] [Commit #80deb529] - Initial build for TDE 3.5.13.1
- Enables 'shadow' support
- Enables 'i8k' support

@ -17,7 +17,7 @@
# Older RHEL/Fedora versions use packages named "qt", "qt-devel", .. # Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
# whereas newer versions use "qt3", "qt3-devel" ... # whereas newer versions use "qt3", "qt3-devel" ...
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _qt_suffix 3 %define _qt_suffix 3
%endif %endif
@ -51,10 +51,14 @@ Source0: kdebase-%{version}.tar.gz
Source1: plasma-desktop Source1: plasma-desktop
# Pam configuration files for RHEL / Fedora # Pam configuration files for RHEL / Fedora
%if 0%{?suse_version}
Source4: pamd.kcheckpass-trinity.opensuse%{?suse_version}
%else
Source2: pamd.kdm-trinity%{?dist} Source2: pamd.kdm-trinity%{?dist}
Source3: pamd.kdm-trinity-np%{?dist} Source3: pamd.kdm-trinity-np%{?dist}
Source4: pamd.kcheckpass-trinity%{?dist} Source4: pamd.kcheckpass-trinity%{?dist}
Source5: pamd.kscreensaver-trinity%{?dist} Source5: pamd.kscreensaver-trinity%{?dist}
%endif
# [kdebase] Fix corrupted PNG images [Bug #298] # [kdebase] Fix corrupted PNG images [Bug #298]
Source6: tiles-fixed-png-images.tar.gz Source6: tiles-fixed-png-images.tar.gz
@ -170,10 +174,36 @@ Patch60: kdebase-3.5.13-update_default_konq_max_image_prev_size.patch
Patch61: kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch Patch61: kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch
## [tdebase] Add xscreensaver support to CMake [Bug #659] [Commit #80deb529] ## [tdebase] Add xscreensaver support to CMake [Bug #659] [Commit #80deb529]
Patch62: kdebase-3.5.13-add_xscreensaver_support.patch Patch62: kdebase-3.5.13-add_xscreensaver_support.patch
## [tdebase] Dirty patch to close tooltips when screensaver engages ## [tdebase] Forcibly prevent transient override redirect windows from showing up over the lock screen [Bug #1079] [Commit #553923b2]
Patch63: kdebase-3.5.13-fix_tooltip_lock.patch Patch63: kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch
## [tdebase] Fix tsak FTBFS on RHEL6
Patch64: kdebase-3.5.13-fix_tsak_ftbfs.patch
## [tdebase] Do not require DBUS-TQT if TSAK is not built
Patch65: kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xdm/Xsession' [RHEL4/Suse]
Patch66: kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch
## [kdebase/kdm/backend] Fix DBUS include directory
Patch67: kdebase-3.5.13-fix_dbus_include.patch
## [tdebase] Upgrade to v3.5.13-sru branch ## [tdebase] Upgrade to v3.5.13-sru branch
Patch100: kdebase-3.5.13-upgrade_to_sru_20120806.patch Patch100: kdebase-3.5.13-upgrade_to_sru_20120806.patch
## [tdebase] Fix for SAK dialog are displayed even if TSAK is not built.
Patch101: kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch
### Patches for RHEL4 (should not go upstream)
## [tdebase] Fix build on RHEL4, detect old libraries without pkg file
Patch201: kdebase-3.5.13-fix_lib_detection.patch
## [tdebase] Do not build against DBUS-TQT, only DBUS and DBUS-QT
Patch202: kdebase-3.5.13-build_without_dbustqt.patch
## [tdebase] Do not build against ConsoleKit
Patch203: kdebase-3.5.13-build_without_consolekit.patch
## [tdebase] Add WITH_COMPOSITE option to CMakeLists.txt
Patch204: kdebase-3.5.13-add_disable_composite_option.patch
## [tdebase] Downgrade halbackend to support Hal 0.4
Patch205: kdebase-3.5.13-support_hal_04.patch
## [tdebase] Other(s) FTBFS ...
Patch206: kdebase-3.5.13-fix_rhel4_compilation.patch
### FEDORA / RHEL distribution-specific settings ### ### FEDORA / RHEL distribution-specific settings ###
@ -210,6 +240,18 @@ Requires: fedora-release-notes
%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html %define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
%endif %endif
# RHEL 4 Theme
%if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic
%define tde_bg /usr/share/backgrounds/images/default.png
Requires: redhat-logos
%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
Requires: indexhtml
%define tde_aboutlabel Enterprise Linux 4
%define tde_aboutpage /usr/share/doc/HTML/index.html
%endif
# RHEL 5 Theme # RHEL 5 Theme
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic Requires: desktop-backgrounds-basic
@ -254,47 +296,85 @@ Requires: indexhtml
%define tde_aboutpage /usr/share/mdk/about/index.html %define tde_aboutpage /usr/share/mdk/about/index.html
%endif %endif
# OpenSuse 12.2 Theme
%if "%{?suse_version}" == "1220"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
Requires: opensuse-manuals_en
%define tde_aboutlabel OpenSuse 12.2
%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
%endif
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-tdelibs-devel
BuildRequires: gcc-c++ make BuildRequires: gcc-c++ make
BuildRequires: qt%{?_qt_suffix}-devel BuildRequires: qt%{?_qt_suffix}-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: imake
BuildRequires: OpenEXR-devel
BuildRequires: libsmbclient-devel
BuildRequires: dbus-devel
BuildRequires: dbus-tqt-devel
BuildRequires: lm_sensors-devel
BuildRequires: libfontenc-devel
BuildRequires: hal-devel
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: libraw1394-devel BuildRequires: libraw1394-devel
BuildRequires: openldap-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: libxkbfile-devel
BuildRequires: libusb-devel BuildRequires: libusb-devel
BuildRequires: esound-devel BuildRequires: esound-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: nas-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: avahi-tqt-devel
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%else
BuildRequires: lm_sensors-devel
BuildRequires: openldap-devel
%endif
# TSAK support requires libudev-devel # TSAK support requires libudev-devel
# On RHEL5, udev is built statically, so TSAK cannot build # On RHEL5, udev is built statically, so TSAK cannot build.
# On RHEL6, libudev-devel exists but is too old. No TSAK neither. # On RHEL5, xrandr library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_tsak 1 %define with_tsak 1
%define with_xrandr 1
BuildRequires: libudev-devel BuildRequires: libudev-devel
%endif %endif
# On RHEL4, we do not have openexr
# On RHEL4, we do not use HAL
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_exr 1
BuildRequires: OpenEXR-devel
%define with_hal 1
BuildRequires: hal-devel >= 0.4.8
%endif
%if 0%{?fedora} >= 17 %if 0%{?fedora} >= 17
BuildRequires: perl-Digest-MD5 BuildRequires: perl-Digest-MD5
%endif %endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
BuildRequires: samba-common
# Dbus bindings were rebuilt with Qt support
BuildRequires: dbus-devel >= 0.22-12.EL.9p1
%else
BuildRequires: imake
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
%else
BuildRequires: dbus-devel
BuildRequires: nas-devel
%endif
BuildRequires: dbus-tqt-devel
BuildRequires: avahi-tqt-devel
BuildRequires: libxkbfile-devel
BuildRequires: libsmbclient-devel
BuildRequires: libfontenc-devel
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}jack-devel BuildRequires: %{_lib}jack-devel
@ -313,14 +393,20 @@ BuildRequires: libXcomposite-devel
BuildRequires: libXdamage-devel BuildRequires: libXdamage-devel
BuildRequires: libXdmcp-devel BuildRequires: libXdmcp-devel
BuildRequires: libXtst-devel BuildRequires: libXtst-devel
%if 0%{?suse_version}
BuildRequires: font-util
BuildRequires: bdftopcf
%else
BuildRequires: xorg-x11-font-utils BuildRequires: xorg-x11-font-utils
%endif
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
BuildRequires: gnome-screensaver BuildRequires: gnome-screensaver
%else %else
BuildRequires: xscreensaver BuildRequires: xscreensaver
%endif %endif
Requires: avahi-qt3 Requires: avahi-tqt
%endif
%endif %endif
# tdebase is a metapackage that installs all sub-packages # tdebase is a metapackage that installs all sub-packages
@ -358,11 +444,16 @@ Requires: %{name}-libtqt3-integration = %{version}-%{release}
Requires: tqtinterface Requires: tqtinterface
Requires: trinity-arts Requires: trinity-arts
Requires: trinity-kdelibs Requires: trinity-tdelibs
Requires: qt%{?_qt_suffix} Requires: qt%{?_qt_suffix}
Requires: openssl Requires: openssl
Requires: avahi
%if 0%{?rhel} == 4
Requires: dbus-qt
%else
Requires: dbus-tqt Requires: dbus-tqt
Requires: avahi
%endif
# RHEL 6 Configuration files are provided in separate packages # RHEL 6 Configuration files are provided in separate packages
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
@ -372,6 +463,10 @@ Requires: kde-settings-kdm
Requires: redhat-menus Requires: redhat-menus
%endif %endif
%if 0%{?suse_version}
Requires: desktop-data-openSUSE
%endif
%description %description
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use, desktop environment for Unix workstations. It combines ease of use,
@ -393,7 +488,7 @@ web browser, X terminal emulator, and many other programs and components.
Summary: %{summary} - Development files Summary: %{summary} - Development files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: trinity-kdelibs-devel Requires: trinity-tdelibs-devel
Requires: %{name}-bin-devel = %{version}-%{release} Requires: %{name}-bin-devel = %{version}-%{release}
Requires: trinity-kate-devel = %{version}-%{release} Requires: trinity-kate-devel = %{version}-%{release}
@ -548,6 +643,12 @@ Group: Environment/Libraries
%files -n trinity-libkateinterfaces %files -n trinity-libkateinterfaces
%{tde_libdir}/libkateinterfaces.so.* %{tde_libdir}/libkateinterfaces.so.*
%post -n trinity-libkateinterfaces
/sbin/ldconfig || :
%postun -n trinity-libkateinterfaces
/sbin/ldconfig || :
########## ##########
%package -n trinity-kate %package -n trinity-kate
@ -677,9 +778,12 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
Summary: control center for TDE Summary: control center for TDE
Group: Applications/Utilities Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-data = %{version}-%{release}
Requires: hwdata
Requires: usbutils Requires: usbutils
%if 0%{?suse_version} == 0
Requires: hwdata
%endif
%description -n trinity-kcontrol %description -n trinity-kcontrol
The TDE Control Center provides you with a centralized and convenient The TDE Control Center provides you with a centralized and convenient
way to configure all of your TDE settings. way to configure all of your TDE settings.
@ -927,7 +1031,7 @@ plugdev group.
%{tde_datadir}/apps/kcmview1394/oui.db %{tde_datadir}/apps/kcmview1394/oui.db
# The following features are not compiled under RHEL 5 # The following features are not compiled under RHEL 5
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%{tde_bindir}/krandrtray %{tde_bindir}/krandrtray
%{tde_tdelibdir}/kcm_displayconfig.la %{tde_tdelibdir}/kcm_displayconfig.la
%{tde_tdelibdir}/kcm_displayconfig.so %{tde_tdelibdir}/kcm_displayconfig.so
@ -1059,7 +1163,9 @@ TDE applications, particularly those in the TDE base module.
%{tde_datadir}/services/kded/khotkeys.desktop %{tde_datadir}/services/kded/khotkeys.desktop
%{tde_datadir}/services/kxkb.desktop %{tde_datadir}/services/kxkb.desktop
%{_sysconfdir}/pam.d/kcheckpass-trinity %{_sysconfdir}/pam.d/kcheckpass-trinity
%if 0%{?suse_version} == 0
%{_sysconfdir}/pam.d/kscreensaver-trinity %{_sysconfdir}/pam.d/kscreensaver-trinity
%endif
%{tde_tdedocdir}/HTML/en/kdcop/ %{tde_tdedocdir}/HTML/en/kdcop/
%{tde_tdedocdir}/HTML/en/kdebugdialog// %{tde_tdedocdir}/HTML/en/kdebugdialog//
%{tde_tdedocdir}/HTML/en/[kt]desu/ %{tde_tdedocdir}/HTML/en/[kt]desu/
@ -1411,7 +1517,14 @@ Group: Applications/Utilities
Requires: trinity-kdesktop = %{version}-%{release} Requires: trinity-kdesktop = %{version}-%{release}
Requires: cyrus-sasl Requires: cyrus-sasl
Requires: psmisc Requires: psmisc
%if 0%{?with_hal}
Requires: hal >= 0.4.8
%endif
%if 0%{?rhel} == 4 || 0%{?suse_version}
Requires: cryptsetup
%else
Requires: cryptsetup-luks Requires: cryptsetup-luks
%endif
Obsoletes: tdebase-kio-plugins < %{version}-%{release} Obsoletes: tdebase-kio-plugins < %{version}-%{release}
Provides: tdebase-kio-plugins = %{version}-%{release} Provides: tdebase-kio-plugins = %{version}-%{release}
@ -1434,8 +1547,6 @@ group.
%{tde_tdelibdir}/cursorthumbnail.so %{tde_tdelibdir}/cursorthumbnail.so
%{tde_tdelibdir}/djvuthumbnail.la %{tde_tdelibdir}/djvuthumbnail.la
%{tde_tdelibdir}/djvuthumbnail.so %{tde_tdelibdir}/djvuthumbnail.so
%{tde_tdelibdir}/exrthumbnail.la
%{tde_tdelibdir}/exrthumbnail.so
%{tde_tdelibdir}/htmlthumbnail.la %{tde_tdelibdir}/htmlthumbnail.la
%{tde_tdelibdir}/htmlthumbnail.so %{tde_tdelibdir}/htmlthumbnail.so
%{tde_tdelibdir}/imagethumbnail.la %{tde_tdelibdir}/imagethumbnail.la
@ -1500,8 +1611,6 @@ group.
%{tde_tdelibdir}/kio_trash.so %{tde_tdelibdir}/kio_trash.so
%{tde_tdelibdir}/libkmanpart.la %{tde_tdelibdir}/libkmanpart.la
%{tde_tdelibdir}/libkmanpart.so %{tde_tdelibdir}/libkmanpart.so
%{tde_tdelibdir}/media_propsdlgplugin.la
%{tde_tdelibdir}/media_propsdlgplugin.so
%{tde_tdelibdir}/textthumbnail.la %{tde_tdelibdir}/textthumbnail.la
%{tde_tdelibdir}/textthumbnail.so %{tde_tdelibdir}/textthumbnail.so
%{tde_tdeappdir}/kcmcgi.desktop %{tde_tdeappdir}/kcmcgi.desktop
@ -1526,7 +1635,6 @@ group.
%{tde_datadir}/services/cgi.protocol %{tde_datadir}/services/cgi.protocol
%{tde_datadir}/services/cursorthumbnail.desktop %{tde_datadir}/services/cursorthumbnail.desktop
%{tde_datadir}/services/djvuthumbnail.desktop %{tde_datadir}/services/djvuthumbnail.desktop
%{tde_datadir}/services/exrthumbnail.desktop
%{tde_datadir}/services/finger.protocol %{tde_datadir}/services/finger.protocol
%{tde_datadir}/services/fish.protocol %{tde_datadir}/services/fish.protocol
%{tde_datadir}/services/floppy.protocol %{tde_datadir}/services/floppy.protocol
@ -1546,7 +1654,6 @@ group.
%{tde_datadir}/services/mac.protocol %{tde_datadir}/services/mac.protocol
%{tde_datadir}/services/man.protocol %{tde_datadir}/services/man.protocol
%{tde_datadir}/services/media.protocol %{tde_datadir}/services/media.protocol
%{tde_datadir}/services/media_propsdlgplugin.desktop
%{tde_datadir}/services/nfs.protocol %{tde_datadir}/services/nfs.protocol
%{tde_datadir}/services/nxfish.protocol %{tde_datadir}/services/nxfish.protocol
%{tde_datadir}/services/programs.protocol %{tde_datadir}/services/programs.protocol
@ -1563,6 +1670,16 @@ group.
%{tde_datadir}/servicetypes/thumbcreator.desktop %{tde_datadir}/servicetypes/thumbcreator.desktop
%{tde_datadir}/services/kfile_trash.desktop %{tde_datadir}/services/kfile_trash.desktop
%{tde_tdedocdir}/HTML/en/kioslave/ %{tde_tdedocdir}/HTML/en/kioslave/
%if 0%{?with_exr}
%{tde_tdelibdir}/exrthumbnail.la
%{tde_tdelibdir}/exrthumbnail.so
%{tde_datadir}/services/exrthumbnail.desktop
%endif
%if 0%{?with_hal}
%{tde_tdelibdir}/media_propsdlgplugin.la
%{tde_tdelibdir}/media_propsdlgplugin.so
%{tde_datadir}/services/media_propsdlgplugin.desktop
%endif
%post kio-plugins %post kio-plugins
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
@ -1686,7 +1803,9 @@ Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-data = %{version}-%{release}
Requires: trinity-libkonq = %{version}-%{release} Requires: trinity-libkonq = %{version}-%{release}
Requires: eject Requires: eject
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
Requires: xdg-utils Requires: xdg-utils
%endif
%description -n trinity-kdesktop %description -n trinity-kdesktop
This package contains miscellaneous binaries and files integral to This package contains miscellaneous binaries and files integral to
@ -1753,9 +1872,13 @@ Requires: %{name}-data = %{version}-%{release}
Requires: pam Requires: pam
# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession) # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
Requires: xinitrc Requires: xinitrc
%else %endif
%if 0%{?suse_version}
Requires: xdm
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
Requires: xorg-x11-xinit Requires: xorg-x11-xinit
%endif %endif
@ -1799,11 +1922,13 @@ already. Most users won't need this.
%{tde_datadir}/apps/[kt]dm/themes/ %{tde_datadir}/apps/[kt]dm/themes/
%{tde_datadir}/config/[kt]dm/ %{tde_datadir}/config/[kt]dm/
%{tde_tdedocdir}/HTML/en/[kt]dm/ %{tde_tdedocdir}/HTML/en/[kt]dm/
%if 0%{?suse_version} == 0
%{_sysconfdir}/pam.d/kdm-trinity %{_sysconfdir}/pam.d/kdm-trinity
%{_sysconfdir}/pam.d/kdm-trinity-np %{_sysconfdir}/pam.d/kdm-trinity-np
%endif
# Distribution specific stuff # Distribution specific stuff
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%{_usr}/share/xsessions/tde.desktop %{_usr}/share/xsessions/tde.desktop
%endif %endif
@ -2300,11 +2425,15 @@ for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done done
/sbin/ldconfig || : /sbin/ldconfig || :
%if 0%{?suse_version}
update-alternatives --install \
%else
alternatives --install \ alternatives --install \
%endif
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \ %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
media_safelyremove.desktop_konqueror \ media_safelyremove.desktop_konqueror \
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \ %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
10 10 || :
%postun -n trinity-konqueror %postun -n trinity-konqueror
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
@ -2316,9 +2445,13 @@ done
%preun -n trinity-konqueror %preun -n trinity-konqueror
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%if 0%{?suse_version}
update-alternatives --remove \
%else
alternatives --remove \ alternatives --remove \
%endif
media_safelyremove.desktop_konqueror \ media_safelyremove.desktop_konqueror \
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
fi fi
########## ##########
@ -2543,6 +2676,12 @@ KDE will start, but many good defaults will not be set.
%{tde_bindir}/plasma-desktop %{tde_bindir}/plasma-desktop
%endif %endif
%post -n trinity-ksmserver
/sbin/ldconfig || :
%postun -n trinity-ksmserver
/sbin/ldconfig || :
########## ##########
%package -n trinity-ksplash %package -n trinity-ksplash
@ -2908,6 +3047,12 @@ Konqueror libraries.
########## ##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep %prep
%setup -q -n kdebase %setup -q -n kdebase
%__tar xfz %{SOURCE6} -C kicker/data/tiles %__tar xfz %{SOURCE6} -C kicker/data/tiles
@ -2920,7 +3065,10 @@ Konqueror libraries.
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} == 4 || 0%{?suse_version}
%patch66 -p1 -b .Xsession
%endif
%if 0%{?rhel} >= 5|| 0%{?fedora}
%patch13 -p1 -b .Xsession %patch13 -p1 -b .Xsession
%endif %endif
%patch14 -p1 %patch14 -p1
@ -2973,7 +3121,22 @@ Konqueror libraries.
%patch61 -p1 %patch61 -p1
%patch62 -p1 %patch62 -p1
%patch63 -p1 -b .tooltips %patch63 -p1 -b .tooltips
%patch64 -p1 -b .tsak
%patch65 -p1 -b .dbustsak
%patch67 -p1 -b .dbus
%patch100 -p1 %patch100 -p1
%patch101 -p1 -b .tsak
%if 0%{?rhel} == 4
%patch201 -p1 -b .libdetect
%patch202 -p1 -b .dbustqt
%patch203 -p1 -b .consolekit
%patch204 -p1 -b .composite
%patch205 -p1 -b .hal04
%patch206 -p1 -b .rhel4
%endif
# Applies an optional distro-specific graphical theme # Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != "" %if "%{?tde_bg}" != ""
@ -3005,19 +3168,29 @@ Konqueror libraries.
%__sed -i "startkde" \ %__sed -i "startkde" \
-e "s|/opt/trinity|%{tde_prefix}|g" -e "s|/opt/trinity|%{tde_prefix}|g"
# TDE default start button icon [See Patch15] # TDE default start button icon
%__sed -i "startkde" \ %__sed -i "startkde" \
-e "s|%%{tde_starticon}|%{tde_starticon}|g" -e "s|%%{tde_starticon}|%{tde_starticon}|g"
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
%if 0%{?rhel} || 0%{?fedora} # Avoids building against KDE3's old stuff, if installed
export KDEDIR=%{tde_prefix}
# Shitty hack for RHEL4 ...
if [ -d /usr/X11R6 ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH=}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${CFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif %endif
@ -3031,56 +3204,64 @@ cd build
-DWITH_SASL=ON \ -DWITH_SASL=ON \
-DWITH_LDAP=ON \ -DWITH_LDAP=ON \
-DWITH_SAMBA=ON \ -DWITH_SAMBA=ON \
-DWITH_OPENEXR=ON \ %{?with_exr:-DWITH_OPENEXR=ON} \
-DWITH_XCOMPOSITE=ON \ %{?with_hal:-DWITH_HAL=ON} \
-DWITH_XCURSOR=ON \ %if 0%{?rhel} == 4
-DWITH_XFIXES=ON \ -DWITH_XTEST=OFF \
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} -DWITH_XSCREENSAVER=OFF \
-DWITH_XRANDR=ON \
%else %else
-DWITH_XRANDR=OFF \ -DWITH_XTEST=ON \
-DWITH_XSCREENSAVER=ON \
%endif %endif
-DWITH_XRENDER=ON \ -DWITH_XCURSOR=ON \
-DWITH_XFIXES=ON \
%{?with_xrandr:-DWITH_XRANDR=ON} \
-DWITH_XDAMAGE=ON \ -DWITH_XDAMAGE=ON \
-DWITH_XEXT=ON \ -DWITH_XEXT=ON \
-DWITH_XTEST=ON \
-DWITH_LIBUSB=ON \ -DWITH_LIBUSB=ON \
-DWITH_LIBRAW1394=ON \ -DWITH_LIBRAW1394=ON \
-DWITH_PAM=ON \ -DWITH_PAM=ON \
-DWITH_XDMCP=ON \ -DWITH_XDMCP=ON \
-DWITH_XINERAMA=ON \ -DWITH_XINERAMA=ON \
-DWITH_XCOMPOSITE=ON \
-DWITH_XRENDER=ON \
-DWITH_ARTS=ON \ -DWITH_ARTS=ON \
-DWITH_I8K=ON \ -DWITH_I8K=ON \
-DWITH_HAL=ON \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
%if 0%{?suse_version}
-DKDM_PAM_SERVICE="xdm" \
-DKSCREENSAVER_PAM_SERVICE="kcheckpass-trinity" \
%else
-DKDM_PAM_SERVICE="kdm-trinity" \ -DKDM_PAM_SERVICE="kdm-trinity" \
-DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \ -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
-DWITH_XSCREENSAVER=ON \
%if 0%{?with_tsak} == 0
-DBUILD_TSAK=OFF \
%endif %endif
%{!?with_tsak:-DBUILD_TSAK=OFF} \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build %__make install DESTDIR=%{?buildroot} -C build
# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
# Adds a GDM/KDM/XDM session called 'TDE' # Adds a GDM/KDM/XDM session called 'TDE'
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__install -D -m 644 \ %__install -D -m 644 \
"%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \ "%{?buildroot}%{tde_datadir}/apps/kdm/sessions/tde.desktop" \
"%{?buildroot}%{_usr}/share/xsessions/tde.desktop" "%{?buildroot}%{_datadir}/xsessions/tde.desktop"
# Force session name to be 'TDE' # Force session name to be 'TDE'
%__sed -i "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" \ %__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \
-e "s,^Name=.*,Name=TDE," -e "s,^Name=.*,Name=TDE,"
%endif %endif
# Mageia/Mandriva stores its session file in different folder than RHEL/Fedora # Mageia/Mandriva stores its session file in different folder than RHEL/Fedora
# Generated files for TDM/KDM4 are in '/usr/share/apps/kdm/sessions'
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
@ -3098,7 +3279,7 @@ NAME=TDM
DESCRIPTION=TDM (Trinity Display Manager) DESCRIPTION=TDM (Trinity Display Manager)
PACKAGE=trinity-tdm PACKAGE=trinity-tdm
EXEC=%{tde_bindir}/kdm EXEC=%{tde_bindir}/kdm
FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions" FNDSESSION_EXEC="/usr/sbin/chksession -K"
EOF EOF
%endif %endif
@ -3113,14 +3294,18 @@ EOF
%endif %endif
# PAM configuration files # PAM configuration files
%if 0%{?suse_version}
%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%else
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity" %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np" %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity" %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
%endif
# KDM configuration for RHEL/Fedora # KDM configuration for RHEL/Fedora
%__sed -i "%{?buildroot}%{tde_datadir}/config/kdm/kdmrc" \ %__sed -i "%{?buildroot}%{tde_datadir}/config/kdm/kdmrc" \
%if 0%{?fedora} >= 16 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220
-e "s/^#*MinShowUID=.*/MinShowUID=1000/" -e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else %else
-e "s/^#*MinShowUID=.*/MinShowUID=500/" -e "s/^#*MinShowUID=.*/MinShowUID=500/"
@ -3133,8 +3318,10 @@ EOF
%endif %endif
# Symlinks 'usb.ids' # Symlinks 'usb.ids'
%if 0%{?suse_version} == 0
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%endif
# Makes 'media_safelyremove.desktop' an alternative # Makes 'media_safelyremove.desktop' an alternative
%__mv -f %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %__mv -f %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase

@ -0,0 +1,86 @@
commit de49c7480893e7d52f64ec1166a55cdf97b2541e
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1347381606 -0500
Detect presence of Ruby pkg-config file and adjust directory search accordingly
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index 81ad0bc..5782123 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -1,13 +1,28 @@
+KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
+ AC_MSG_WARN([Could not find pkg-config])
+])
+
AC_CHECK_PROG(RUBY, ruby, ruby)
if test -z "$RUBY"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
else
AC_MSG_CHECKING(for ruby dirs)
- RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
- RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
- RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
+ if test -n "$PKGCONFIG"; then
+ RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
+ if test -n "$RUBY_VERSION"; then
+ RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
+ RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
+ RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
+ fi
+ fi
+ if test -z "$RUBY_VERSION"; then
+ RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+ RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+ RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
+ fi
AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 453bb68..3cfa630 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -1,15 +1,32 @@
+KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
+ AC_MSG_WARN([Could not find pkg-config])
+])
+
AC_CHECK_PROG(RUBY, ruby, ruby)
if test -z "$RUBY"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
else
AC_MSG_CHECKING(for ruby dirs)
- RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
- RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
- RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
- RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
- RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
- RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+ if test -n "$PKGCONFIG"; then
+ RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
+ if test -n "$RUBY_VERSION"; then
+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
+ RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
+ RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+ fi
+ fi
+ if test -z "$RUBY_VERSION"; then
+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+ RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
+ RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+ fi
AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)

@ -0,0 +1,34 @@
commit 2f6e9c735fe8486ee3484c47c0e8ff999b699abc
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1347987185 -0500
Fall back to ruby-1.9 pkgconfig file if needed
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index e4ab2fd..924f42f 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -10,6 +10,9 @@ else
AC_MSG_CHECKING(for ruby dirs)
if test -n "$PKGCONFIG"; then
RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
+ if test -z "$RUBY_VERSION"; then
+ RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
+ fi
if test -n "$RUBY_VERSION"; then
RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 7ad0e4d..e7f4f2c 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -10,6 +10,9 @@ else
AC_MSG_CHECKING(for ruby dirs)
if test -n "$PKGCONFIG"; then
RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
+ if test -z "$RUBY_VERSION"; then
+ RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
+ fi
if test -n "$RUBY_VERSION"; then
RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`

@ -0,0 +1,11 @@
--- kdebindings-3.5.13.1/dcopjava/binding/Makefile.am.ORI 2012-09-29 19:17:32.829295550 +0200
+++ kdebindings-3.5.13.1/dcopjava/binding/Makefile.am 2012-09-29 19:17:07.309943594 +0200
@@ -1,7 +1,7 @@
lib_LTLIBRARIES = libjavadcop.la
libjavadcop_la_SOURCES = client.cpp
-libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx
+libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx $(QT_LDFLAGS)
libjavadcop_la_LIBADD = $(LIB_KDECORE)
INCLUDES = $(jni_includes) $(all_includes)

@ -0,0 +1,82 @@
commit a901a1232ab8f8432c63dc97e0efd9fed051d2c7
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1348264715 -0500
Fix FTBFS on x86 systems
diff --git a/korundum/bin/krubyinit.cpp b/korundum/bin/krubyinit.cpp
index 12b0f6e..2a7f6c5 100644
--- a/korundum/bin/krubyinit.cpp
+++ b/korundum/bin/krubyinit.cpp
@@ -1,5 +1,7 @@
#include <ruby.h>
+#define HAVE_STRLCAT_PROTO 1
+#define HAVE_STRLCPY_PROTO 1
#include "config.h"
#ifndef HAVE_RUBY_1_9
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index 124e2a1..da9f099 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -40,6 +40,8 @@
#include <smokeruby.h>
#include <smoke.h>
+#define HAVE_STRLCAT_PROTO 1
+#define HAVE_STRLCPY_PROTO 1
#include "config.h"
#ifndef HAVE_RUBY_1_9
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index 6961301..11b97b5 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -52,6 +52,8 @@
#include <dom/dom_string.h>
#include <dom/html_element.h>
+#define HAVE_STRLCAT_PROTO 1
+#define HAVE_STRLCPY_PROTO 1
#include "config.h"
#ifndef HAVE_RUBY_1_9
diff --git a/qtruby/bin/qtrubyinit.cpp b/qtruby/bin/qtrubyinit.cpp
index c9569d9..dd732b1 100644
--- a/qtruby/bin/qtrubyinit.cpp
+++ b/qtruby/bin/qtrubyinit.cpp
@@ -1,5 +1,7 @@
#include <ruby.h>
+#define HAVE_STRLCAT_PROTO 1
+#define HAVE_STRLCPY_PROTO 1
#include "config.h"
#ifndef HAVE_RUBY_1_9
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 370ad6d..b264d44 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -60,6 +60,8 @@
#include "smokeruby.h"
#include "smoke.h"
+#define HAVE_STRLCAT_PROTO 1
+#define HAVE_STRLCPY_PROTO 1
#include "config.h"
#ifndef HAVE_RUBY_1_9
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index f3d0dda..2f6b5e7 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -47,6 +47,8 @@
#define HINT_BYTES HINT_BYTE
#endif
+#define HAVE_STRLCAT_PROTO 1
+#define HAVE_STRLCPY_PROTO 1
#include "config.h"
#ifndef HAVE_RUBY_1_9

@ -0,0 +1,56 @@
commit 14594d81891b0bdf9aa03f72b88d6939eee59f02
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1347389903 -0500
Fix FTBFS on ruby 1.8.x
diff --git a/korundum/bin/krubyinit.cpp b/korundum/bin/krubyinit.cpp
index f53f830..12b0f6e 100644
--- a/korundum/bin/krubyinit.cpp
+++ b/korundum/bin/krubyinit.cpp
@@ -25,13 +25,18 @@
* *
***************************************************************************/
-// this name can be used to allow apps
+// this name can be used to allow apps
// to detect what they were started with
static const char* script_name = "krubyinit_app";
int main(int argc, char **argv) {
ruby_init();
ruby_script((char*)script_name);
- void* node = ruby_options(argc, argv);
+#ifdef HAVE_RUBY_1_9
+ void* node = ruby_options(argc, argv);
ruby_run_node(node);
+#else // HAVE_RUBY_1_9
+ ruby_options(argc, argv);
+ ruby_run();
+#endif // HAVE_RUBY_1_9
}
diff --git a/qtruby/bin/qtrubyinit.cpp b/qtruby/bin/qtrubyinit.cpp
index 65c00c4..c9569d9 100644
--- a/qtruby/bin/qtrubyinit.cpp
+++ b/qtruby/bin/qtrubyinit.cpp
@@ -25,13 +25,18 @@ qrubyinit - makes use of tdeinit_wrapper possible for ruby programs
* *
***************************************************************************/
-// this name can be used to allow apps
+// this name can be used to allow apps
// to detect what they were started with
static const char* script_name = "qrubyinit_app";
int main(int argc, char **argv) {
ruby_init();
ruby_script((char*)script_name);
- void* node = ruby_options(argc, argv);
+#ifdef HAVE_RUBY_1_9
+ void* node = ruby_options(argc, argv);
ruby_run_node(node);
+#else // HAVE_RUBY_1_9
+ ruby_options(argc, argv);
+ ruby_run();
+#endif // HAVE_RUBY_1_9
}

@ -0,0 +1,683 @@
commit ef7a60860d18e9be343b6fa5fe8d76fd080cead0
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1347385969 -0500
Fix FTBS on ruby 1.9.x
Thanks to Darrell Anderson for the majority of the patch!
diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
index f8c0942..4c3e637 100644
--- a/korundum/bin/Makefile.am
+++ b/korundum/bin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
+INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
bin_PROGRAMS = krubyinit
krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/ -L$(RUBY_LIBDIR) -lkmdi -lknewstuff
diff --git a/korundum/bin/krubyinit.cpp b/korundum/bin/krubyinit.cpp
index 7ed0b0a..f53f830 100644
--- a/korundum/bin/krubyinit.cpp
+++ b/korundum/bin/krubyinit.cpp
@@ -1,5 +1,13 @@
#include <ruby.h>
+#include "config.h"
+
+#ifndef HAVE_RUBY_1_9
+#define RARRAY_LEN(x) (RARRAY(x)->len)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define rb_str_catf_1 rb_str_catf
+#endif
+
/***************************************************************************
krubyinit - makes use of kdeinit_wrapper possible for ruby programs
-------------------
@@ -24,6 +32,6 @@ static const char* script_name = "krubyinit_app";
int main(int argc, char **argv) {
ruby_init();
ruby_script((char*)script_name);
- ruby_options(argc, argv);
- ruby_run();
+ void* node = ruby_options(argc, argv);
+ ruby_run_node(node);
}
diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp
index cc3ce2a..124e2a1 100644
--- a/korundum/rubylib/korundum/Korundum.cpp
+++ b/korundum/rubylib/korundum/Korundum.cpp
@@ -40,6 +40,14 @@
#include <smokeruby.h>
#include <smoke.h>
+#include "config.h"
+
+#ifndef HAVE_RUBY_1_9
+#define RARRAY_LEN(x) (RARRAY(x)->len)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define rb_str_catf_1 rb_str_catf
+#endif
+
extern "C" {
extern VALUE qt_internal_module;
extern VALUE kconfigskeleton_class;
@@ -805,7 +813,7 @@ public:
// isn't in the Smoke runtime
TQValueList<DCOPRef> windowList;
- for (long i = 0; i < RARRAY(result)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(result); i++) {
VALUE item = rb_ary_entry(result, i);
smokeruby_object *o = value_obj_info(item);
if( !o || !o->ptr)
@@ -822,7 +830,7 @@ public:
// And special case this type too
TQValueList<TQCString> propertyList;
- for (long i = 0; i < RARRAY(result)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(result); i++) {
VALUE item = rb_ary_entry(result, i);
propertyList.append(TQCString(StringValuePtr(item)));
}
@@ -836,7 +844,7 @@ public:
// Convert the ruby hash to an array of key/value arrays
VALUE temp = rb_funcall(result, rb_intern("to_a"), 0);
- for (long i = 0; i < RARRAY(temp)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(temp); i++) {
VALUE action = rb_ary_entry(rb_ary_entry(temp, i), 0);
VALUE item = rb_ary_entry(rb_ary_entry(temp, i), 1);
@@ -926,7 +934,7 @@ k_dcop_signal(int argc, VALUE * argv, VALUE self)
{
VALUE dcopObject = rb_funcall(kde_module, rb_intern("createDCOPObject"), 1, self);
- TQString signalname(rb_id2name(rb_frame_last_func()));
+ TQString signalname(rb_id2name(rb_frame_this_func()));
VALUE args = getdcopinfo(self, signalname);
if(args == Qnil) return Qfalse;
@@ -1020,7 +1028,7 @@ new_kde(int argc, VALUE * argv, VALUE klass)
if (rb_funcall(kde_module, rb_intern("hasDCOPSignals"), 1, klass) == Qtrue) {
VALUE signalNames = rb_funcall(kde_module, rb_intern("getDCOPSignalNames"), 1, klass);
- for (long index = 0; index < RARRAY(signalNames)->len; index++) {
+ for (long index = 0; index < RARRAY_LEN(signalNames); index++) {
VALUE signal = rb_ary_entry(signalNames, index);
rb_define_method(klass, StringValuePtr(signal), (VALUE (*) (...)) k_dcop_signal, -1);
}
@@ -1088,9 +1096,9 @@ konsole_part_startprogram(VALUE self, VALUE value_program, VALUE value_args)
TQStrList *args = new TQStrList;
if (value_args != Qnil) {
- for (long i = 0; i < RARRAY(value_args)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(value_args); i++) {
VALUE item = rb_ary_entry(value_args, i);
- args->append(TQString::fromLatin1(StringValuePtr(item), RSTRING(item)->len));
+ args->append(TQString::fromLatin1(StringValuePtr(item), RSTRING_LEN(item)));
}
}
diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index 70932d5..6961301 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -52,6 +52,14 @@
#include <dom/dom_string.h>
#include <dom/html_element.h>
+#include "config.h"
+
+#ifndef HAVE_RUBY_1_9
+#define RARRAY_LEN(x) (RARRAY(x)->len)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define rb_str_catf_1 rb_str_catf
+#endif
+
extern "C" {
extern VALUE set_obj_info(const char * className, smokeruby_object * o);
};
@@ -122,7 +130,7 @@ void marshall_TQCStringList(Marshall *m) {
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
QCStringList *stringlist = new QCStringList;
for(long i = 0; i < count; i++) {
@@ -131,7 +139,7 @@ void marshall_TQCStringList(Marshall *m) {
stringlist->append(TQCString());
continue;
}
- stringlist->append(TQCString(StringValuePtr(item), RSTRING(item)->len + 1));
+ stringlist->append(TQCString(StringValuePtr(item), RSTRING_LEN(item) + 1));
}
m->item().s_voidp = stringlist;
@@ -184,19 +192,19 @@ void marshall_KCmdLineOptions(Marshall *m) {
VALUE optionslist = *(m->var());
if (optionslist == Qnil
|| TYPE(optionslist) != T_ARRAY
- || RARRAY(optionslist)->len == 0 )
+ || RARRAY_LEN(optionslist) == 0 )
{
m->item().s_voidp = 0;
break;
}
// Allocate 'length + 1' entries, to include an all NULLs last entry
- KCmdLineOptions *cmdLineOptions = (KCmdLineOptions *) calloc( RARRAY(optionslist)->len + 1,
+ KCmdLineOptions *cmdLineOptions = (KCmdLineOptions *) calloc( RARRAY_LEN(optionslist) + 1,
sizeof(struct KCmdLineOptions) );
VALUE options;
long i;
- for(i = 0; i < RARRAY(optionslist)->len; i++) {
+ for(i = 0; i < RARRAY_LEN(optionslist); i++) {
options = rb_ary_entry(optionslist, i);
VALUE temp = rb_ary_entry(options, 0);
cmdLineOptions[i].name = StringValuePtr(temp);
@@ -244,7 +252,7 @@ void marshall_WIdList(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
TQValueList<WId> *valuelist = new TQValueList<WId>;
long i;
for(i = 0; i < count; i++) {
@@ -815,7 +823,7 @@ void marshall_KURLList(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
KURL::List *kurllist = new KURL::List;
long i;
for(i = 0; i < count; i++) {
@@ -916,11 +924,11 @@ void marshall_UDSEntryList(Marshall *m) {
KIO::UDSEntryList *cpplist = new KIO::UDSEntryList;
- for(long i = 0; i < RARRAY(list)->len; i++) {
+ for(long i = 0; i < RARRAY_LEN(list); i++) {
VALUE item = rb_ary_entry(list, i);
KIO::UDSEntry *cppsublist = new KIO::UDSEntry;
- for (int j = 0; j < RARRAY(item)->len; j++) {
+ for (int j = 0; j < RARRAY_LEN(item); j++) {
VALUE subitem = rb_ary_entry(item, j);
smokeruby_object *o = value_obj_info(subitem);
if(!o || !o->ptr)
@@ -998,7 +1006,7 @@ void marshall_ItemList(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
ItemList *cpplist = new ItemList;
long i;
for(i = 0; i < count; i++) {
@@ -1103,7 +1111,7 @@ void marshall_ValueItemList(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
ItemList *cpplist = new ItemList;
long i;
for(i = 0; i < count; i++) {
@@ -1211,7 +1219,7 @@ void marshall_Map(Marshall *m) {
// Convert the ruby hash to an array of key/value arrays
VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
- for (long i = 0; i < RARRAY(temp)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(temp); i++) {
VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
@@ -1316,7 +1324,7 @@ void marshall_TQMapTQCStringDCOPRef(Marshall *m) {
// Convert the ruby hash to an array of key/value arrays
VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
- for (long i = 0; i < RARRAY(temp)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(temp); i++) {
VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am
index e53bd0f..0e1dbdb 100644
--- a/qtruby/bin/Makefile.am
+++ b/qtruby/bin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
+INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
bin_PROGRAMS = qtrubyinit
qtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/qt/ -L$(RUBY_LIBDIR)
diff --git a/qtruby/bin/qtrubyinit.cpp b/qtruby/bin/qtrubyinit.cpp
index c4e8024..65c00c4 100644
--- a/qtruby/bin/qtrubyinit.cpp
+++ b/qtruby/bin/qtrubyinit.cpp
@@ -1,5 +1,13 @@
#include <ruby.h>
+#include "config.h"
+
+#ifndef HAVE_RUBY_1_9
+#define RARRAY_LEN(x) (RARRAY(x)->len)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define rb_str_catf_1 rb_str_catf
+#endif
+
/***************************************************************************
qrubyinit - makes use of kdeinit_wrapper possible for ruby programs
-------------------
@@ -24,6 +32,6 @@ static const char* script_name = "qrubyinit_app";
int main(int argc, char **argv) {
ruby_init();
ruby_script((char*)script_name);
- ruby_options(argc, argv);
- ruby_run();
+ void* node = ruby_options(argc, argv);
+ ruby_run_node(node);
}
diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
index 04ce1c8..9900635 100644
--- a/qtruby/rubylib/designer/uilib/Makefile.am
+++ b/qtruby/rubylib/designer/uilib/Makefile.am
@@ -1,7 +1,7 @@
-INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
+INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = qui.la
qui_la_SOURCES = qui.cpp
qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
-qui_la_LIBADD = -lqui
\ No newline at end of file
+qui_la_LIBADD = -lqui
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 3d71cfc..370ad6d 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -60,6 +60,14 @@
#include "smokeruby.h"
#include "smoke.h"
+#include "config.h"
+
+#ifndef HAVE_RUBY_1_9
+#define RARRAY_LEN(x) (RARRAY(x)->len)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define rb_str_catf_1 rb_str_catf
+#endif
+
// #define DEBUG
#define QTRUBY_VERSION "1.0.13"
@@ -110,7 +118,7 @@ bool application_terminated = false;
};
#define logger logger_backend
-void rb_str_catf(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
+void rb_str_catf_1(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
static VALUE (*_new_kde)(int, VALUE *, VALUE) = 0;
static VALUE (*_kconfigskeletonitem_immutable)(VALUE) = 0;
@@ -820,7 +828,7 @@ public:
}
};
-void rb_str_catf(VALUE self, const char *format, ...)
+void rb_str_catf_1(VALUE self, const char *format, ...)
{
va_list ap;
va_start(ap, format);
@@ -985,16 +993,16 @@ VALUE prettyPrintMethod(Smoke::Index id)
VALUE r = rb_str_new2("");
Smoke::Method &meth = qt_Smoke->methods[id];
const char *tname = qt_Smoke->types[meth.ret].name;
- if(meth.flags & Smoke::mf_static) rb_str_catf(r, "static ");
- rb_str_catf(r, "%s ", (tname ? tname:"void"));
- rb_str_catf(r, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
+ if(meth.flags & Smoke::mf_static) rb_str_catf_1(r, "static ");
+ rb_str_catf_1(r, "%s ", (tname ? tname:"void"));
+ rb_str_catf_1(r, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
for(int i = 0; i < meth.numArgs; i++) {
- if(i) rb_str_catf(r, ", ");
+ if(i) rb_str_catf_1(r, ", ");
tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;
- rb_str_catf(r, "%s", (tname ? tname:"void"));
+ rb_str_catf_1(r, "%s", (tname ? tname:"void"));
}
- rb_str_catf(r, ")");
- if(meth.flags & Smoke::mf_const) rb_str_catf(r, " const");
+ rb_str_catf_1(r, ")");
+ if(meth.flags & Smoke::mf_const) rb_str_catf_1(r, " const");
return r;
}
@@ -1177,7 +1185,7 @@ inspect_qobject(VALUE self)
// Start with #<Qt::HBoxLayout:0x30139030> from the original inspect() call
// Drop the closing '>'
VALUE inspect_str = rb_call_super(0, 0);
- rb_str_resize(inspect_str, RSTRING(inspect_str)->len - 1);
+ rb_str_resize(inspect_str, RSTRING_LEN(inspect_str) - 1);
smokeruby_object * o = 0;
Data_Get_Struct(self, smokeruby_object, o);
@@ -1220,7 +1228,7 @@ pretty_print_qobject(VALUE self, VALUE pp)
// Start with #<Qt::HBoxLayout:0x30139030>
// Drop the closing '>'
VALUE inspect_str = rb_funcall(self, rb_intern("to_s"), 0, 0);
- rb_str_resize(inspect_str, RSTRING(inspect_str)->len - 1);
+ rb_str_resize(inspect_str, RSTRING_LEN(inspect_str) - 1);
rb_funcall(pp, rb_intern("text"), 1, inspect_str);
rb_funcall(pp, rb_intern("breakable"), 0);
@@ -1236,7 +1244,7 @@ pretty_print_qobject(VALUE self, VALUE pp)
VALUE obj = getPointerObject(qobject->parent());
if (obj != Qnil) {
VALUE parent_inspect_str = rb_funcall(obj, rb_intern("to_s"), 0, 0);
- rb_str_resize(parent_inspect_str, RSTRING(parent_inspect_str)->len - 1);
+ rb_str_resize(parent_inspect_str, RSTRING_LEN(parent_inspect_str) - 1);
parentInspectString = StringValuePtr(parent_inspect_str);
} else {
parentInspectString.sprintf("#<%s:0x0", qobject->parent()->className());
@@ -1382,7 +1390,7 @@ static Smoke::Index new_qvariant_qmap = 0;
return *(c.var());
} else if ( argc == 1
&& TYPE(argv[0]) == T_ARRAY
- && RARRAY(argv[0])->len > 0
+ && RARRAY_LEN(argv[0]) > 0
&& TYPE(rb_ary_entry(argv[0], 0)) != T_STRING )
{
_current_method = new_qvariant_qlist;
@@ -1741,7 +1749,7 @@ new_qapplication(int argc, VALUE * argv, VALUE klass)
VALUE * local_argv = (VALUE *) calloc(argc + 1, sizeof(VALUE));
VALUE temp = rb_ary_dup(argv[0]);
rb_ary_unshift(temp, rb_gv_get("$0"));
- local_argv[0] = INT2NUM(RARRAY(temp)->len);
+ local_argv[0] = INT2NUM(RARRAY_LEN(temp));
local_argv[1] = temp;
result = new_qt(2, local_argv, klass);
free(local_argv);
@@ -1772,7 +1780,7 @@ qapplication_argv(VALUE /*self*/)
VALUE
getmetainfo(VALUE self, int &offset, int &index)
{
- const char * signalname = rb_id2name(rb_frame_last_func());
+ const char * signalname = rb_id2name(rb_frame_this_func());
VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
smokeruby_object *ometa = value_obj_info(metaObject_value);
@@ -1862,7 +1870,7 @@ tqt_invoke(int /*argc*/, VALUE * argv, VALUE self)
// Now, I need to find out if this means me
int index;
char *slotname;
- bool isSignal = qstrcmp(rb_id2name(rb_frame_last_func()), "qt_emit") == 0;
+ bool isSignal = qstrcmp(rb_id2name(rb_frame_this_func()), "qt_emit") == 0;
VALUE mocArgs = getslotinfo(self, id, slotname, index, isSignal);
if(mocArgs == Qnil) {
// No ruby slot/signal found, assume the target is a C++ one
@@ -2009,7 +2017,7 @@ qbytearray_setRawData(VALUE self, VALUE data)
return Qnil;
}
TQByteArray * dataArray = (TQByteArray*) o->ptr;
- dataArray->setRawData(StringValuePtr(data), RSTRING(data)->len);
+ dataArray->setRawData(StringValuePtr(data), RSTRING_LEN(data));
return self;
}
@@ -2195,7 +2203,7 @@ make_QUMethod(VALUE /*self*/, VALUE name_value, VALUE params)
m->name = new char[strlen(name) + 1]; // this too
strcpy((char*)m->name, name);
m->parameters = 0;
- m->count = RARRAY(params)->len;
+ m->count = RARRAY_LEN(params);
if (m->count > 0) {
m->parameters = new QUParameter[m->count];
@@ -2213,7 +2221,7 @@ make_QUMethod(VALUE /*self*/, VALUE name_value, VALUE params)
static VALUE
make_QMetaData_tbl(VALUE /*self*/, VALUE list)
{
- long count = RARRAY(list)->len;
+ long count = RARRAY_LEN(list);
QMetaData *m = new QMetaData[count];
for (long i = 0; i < count; i++) {
@@ -2281,7 +2289,7 @@ add_metaobject_methods(VALUE self, VALUE klass)
static VALUE
add_signal_methods(VALUE self, VALUE klass, VALUE signalNames)
{
- for (long index = 0; index < RARRAY(signalNames)->len; index++) {
+ for (long index = 0; index < RARRAY_LEN(signalNames); index++) {
VALUE signal = rb_ary_entry(signalNames, index);
rb_define_method(klass, StringValuePtr(signal), (VALUE (*) (...)) qt_signal, -1);
}
@@ -2597,28 +2605,28 @@ dumpCandidates(VALUE /*self*/, VALUE rmeths)
{
VALUE errmsg = rb_str_new2("");
if(rmeths != Qnil) {
- int count = RARRAY(rmeths)->len;
+ int count = RARRAY_LEN(rmeths);
for(int i = 0; i < count; i++) {
- rb_str_catf(errmsg, "\t");
+ rb_str_catf_1(errmsg, "\t");
int id = NUM2INT(rb_ary_entry(rmeths, i));
Smoke::Method &meth = qt_Smoke->methods[id];
const char *tname = qt_Smoke->types[meth.ret].name;
if(meth.flags & Smoke::mf_enum) {
- rb_str_catf(errmsg, "enum ");
- rb_str_catf(errmsg, "%s::%s", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
- rb_str_catf(errmsg, "\n");
+ rb_str_catf_1(errmsg, "enum ");
+ rb_str_catf_1(errmsg, "%s::%s", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
+ rb_str_catf_1(errmsg, "\n");
} else {
if(meth.flags & Smoke::mf_static) rb_str_catf(errmsg, "static ");
- rb_str_catf(errmsg, "%s ", (tname ? tname:"void"));
- rb_str_catf(errmsg, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
+ rb_str_catf_1(errmsg, "%s ", (tname ? tname:"void"));
+ rb_str_catf_1(errmsg, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
for(int i = 0; i < meth.numArgs; i++) {
- if(i) rb_str_catf(errmsg, ", ");
+ if(i) rb_str_catf_1(errmsg, ", ");
tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;
- rb_str_catf(errmsg, "%s", (tname ? tname:"void"));
+ rb_str_catf_1(errmsg, "%s", (tname ? tname:"void"));
}
- rb_str_catf(errmsg, ")");
- if(meth.flags & Smoke::mf_const) rb_str_catf(errmsg, " const");
- rb_str_catf(errmsg, "\n");
+ rb_str_catf_1(errmsg, ")");
+ if(meth.flags & Smoke::mf_const) rb_str_catf_1(errmsg, " const");
+ rb_str_catf_1(errmsg, "\n");
}
}
}
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index 703c9d0..f3d0dda 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -47,6 +47,14 @@
#define HINT_BYTES HINT_BYTE
#endif
+#include "config.h"
+
+#ifndef HAVE_RUBY_1_9
+#define RARRAY_LEN(x) (RARRAY(x)->len)
+#define RSTRING_LEN(x) (RSTRING(x)->len)
+#define rb_str_catf_1 rb_str_catf
+#endif
+
extern "C" {
extern VALUE set_obj_info(const char * className, smokeruby_object * o);
extern VALUE qt_internal_module;
@@ -755,7 +763,7 @@ static void marshall_charP(Marshall *m) {
break;
}
- int len = RSTRING(rv)->len;
+ int len = RSTRING_LEN(rv);
char* mem = (char*) malloc(len+1);
memcpy(mem, StringValuePtr(rv), len);
mem[len] ='\0';
@@ -788,7 +796,7 @@ void marshall_ucharP(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int len = RSTRING(rv)->len;
+ int len = RSTRING_LEN(rv);
char* mem = (char*) malloc(len+1);
memcpy(mem, StringValuePtr(rv), len);
mem[len] ='\0';
@@ -824,7 +832,7 @@ qstringFromRString(VALUE rstring) {
TQString * s;
if (qstrcmp(KCODE, "UTF8") == 0)
- s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING(rstring)->len));
+ s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING_LEN(rstring)));
else if (qstrcmp(KCODE, "EUC") == 0)
s = new TQString(codec->toUnicode(StringValuePtr(rstring)));
else if (qstrcmp(KCODE, "SJIS") == 0)
@@ -832,7 +840,7 @@ qstringFromRString(VALUE rstring) {
else if(qstrcmp(KCODE, "NONE") == 0)
s = new TQString(TQString::fromLatin1(StringValuePtr(rstring)));
else
- s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING(rstring)->len));
+ s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING_LEN(rstring)));
return s;
}
@@ -944,7 +952,7 @@ static void marshall_TQCString(Marshall *m) {
s = new TQCString();
} else {
// Add 1 to the ruby string length to allow for a TQCString '\0' terminator
- s = new TQCString(StringValuePtr(*(m->var())), RSTRING(*(m->var()))->len + 1);
+ s = new TQCString(StringValuePtr(*(m->var())), RSTRING_LEN(*(m->var())) + 1);
}
m->item().s_voidp = s;
@@ -1007,7 +1015,7 @@ static void marshall_TQCOORD_array(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(av)->len;
+ int count = RARRAY_LEN(av);
QCOORD *coord = new QCOORD[count + 2];
for(long i = 0; i < count; i++) {
VALUE svp = rb_ary_entry(av, i);
@@ -1167,15 +1175,15 @@ static void marshall_charP_array(Marshall *m) {
VALUE arglist = *(m->var());
if (arglist == Qnil
|| TYPE(arglist) != T_ARRAY
- || RARRAY(arglist)->len == 0 )
+ || RARRAY_LEN(arglist) == 0 )
{
m->item().s_voidp = 0;
break;
}
- char **argv = new char *[RARRAY(arglist)->len + 1];
+ char **argv = new char *[RARRAY_LEN(arglist) + 1];
long i;
- for(i = 0; i < RARRAY(arglist)->len; i++) {
+ for(i = 0; i < RARRAY_LEN(arglist); i++) {
VALUE item = rb_ary_entry(arglist, i);
char *s = StringValuePtr(item);
argv[i] = new char[strlen(s) + 1];
@@ -1207,7 +1215,7 @@ void marshall_TQStringList(Marshall *m) {
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
TQStringList *stringlist = new QStringList;
for(long i = 0; i < count; i++) {
@@ -1269,7 +1277,7 @@ void marshall_TQStrList(Marshall *m) {
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
TQStrList *stringlist = new QStrList;
for(long i = 0; i < count; i++) {
@@ -1278,7 +1286,7 @@ void marshall_TQStrList(Marshall *m) {
stringlist->append(TQString());
continue;
}
- stringlist->append(TQString::fromUtf8(StringValuePtr(item), RSTRING(item)->len));
+ stringlist->append(TQString::fromUtf8(StringValuePtr(item), RSTRING_LEN(item)));
}
m->item().s_voidp = stringlist;
@@ -1331,7 +1339,7 @@ void marshall_ItemList(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
ItemList *cpplist = new ItemList;
long i;
for(i = 0; i < count; i++) {
@@ -1421,7 +1429,7 @@ void marshall_TQValueListInt(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
TQValueList<int> *valuelist = new TQValueList<int>;
long i;
for(i = 0; i < count; i++) {
@@ -1513,7 +1521,7 @@ void marshall_TQMapTQStringTQString(Marshall *m) {
// Convert the ruby hash to an array of key/value arrays
VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
- for (long i = 0; i < RARRAY(temp)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(temp); i++) {
VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
(*map)[TQString(StringValuePtr(key))] = TQString(StringValuePtr(value));
@@ -1569,7 +1577,7 @@ void marshall_TQMapTQStringTQVariant(Marshall *m) {
// Convert the ruby hash to an array of key/value arrays
VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
- for (long i = 0; i < RARRAY(temp)->len; i++) {
+ for (long i = 0; i < RARRAY_LEN(temp); i++) {
VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
@@ -1673,7 +1681,7 @@ void marshall_TQRgb_array(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
QRgb *rgb = new QRgb[count + 2];
long i;
for(i = 0; i < count; i++) {
@@ -1702,7 +1710,7 @@ void marshall_TQPairintint(Marshall *m) {
case Marshall::FromVALUE:
{
VALUE list = *(m->var());
- if (TYPE(list) != T_ARRAY || RARRAY(list)->len != 2) {
+ if (TYPE(list) != T_ARRAY || RARRAY_LEN(list) != 2) {
m->item().s_voidp = 0;
break;
}
@@ -1770,7 +1778,7 @@ void marshall_ValueItemList(Marshall *m) {
m->item().s_voidp = 0;
break;
}
- int count = RARRAY(list)->len;
+ int count = RARRAY_LEN(list);
ItemList *cpplist = new ItemList;
long i;
for(i = 0; i < count; i++) {

@ -0,0 +1,31 @@
--- kdebindings-3.5.13.1/qtruby/rubylib/qtruby/Qt.cpp.OLD 2012-09-29 20:08:00.156164195 +0200
+++ kdebindings-3.5.13.1/qtruby/rubylib/qtruby/Qt.cpp 2012-09-29 20:08:43.936538689 +0200
@@ -1782,7 +1782,7 @@
VALUE
getmetainfo(VALUE self, int &offset, int &index)
{
- const char * signalname = rb_id2name(rb_frame_this_func());
+ const char * signalname = rb_id2name(rb_frame_last_func());
VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
smokeruby_object *ometa = value_obj_info(metaObject_value);
@@ -1872,7 +1872,7 @@
// Now, I need to find out if this means me
int index;
char *slotname;
- bool isSignal = qstrcmp(rb_id2name(rb_frame_this_func()), "qt_emit") == 0;
+ bool isSignal = qstrcmp(rb_id2name(rb_frame_last_func()), "qt_emit") == 0;
VALUE mocArgs = getslotinfo(self, id, slotname, index, isSignal);
if(mocArgs == Qnil) {
// No ruby slot/signal found, assume the target is a C++ one
--- kdebindings-3.5.13.1/korundum/rubylib/korundum/Korundum.cpp.OLD 2012-09-29 20:11:43.597168589 +0200
+++ kdebindings-3.5.13.1/korundum/rubylib/korundum/Korundum.cpp 2012-09-29 20:11:56.908163792 +0200
@@ -936,7 +936,7 @@
{
VALUE dcopObject = rb_funcall(kde_module, rb_intern("createDCOPObject"), 1, self);
- TQString signalname(rb_id2name(rb_frame_this_func()));
+ TQString signalname(rb_id2name(rb_frame_last_func()));
VALUE args = getdcopinfo(self, signalname);
if(args == Qnil) return Qfalse;

@ -0,0 +1,55 @@
commit 10fc891a7e282d2cbab27ab53d9b980147fadb9a
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1348248800 -0500
Fix Ruby detection when .pc file is ruby-1.9
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index 924f42f..e19d5b4 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -10,15 +10,17 @@ else
AC_MSG_CHECKING(for ruby dirs)
if test -n "$PKGCONFIG"; then
RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
- if test -z "$RUBY_VERSION"; then
+ if test -n "$RUBY_VERSION"; then
+ RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
+ else
RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
+ RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
fi
if test -n "$RUBY_VERSION"; then
RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
- RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
fi
fi
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index e7f4f2c..f0594c6 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -10,8 +10,11 @@ else
AC_MSG_CHECKING(for ruby dirs)
if test -n "$PKGCONFIG"; then
RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
- if test -z "$RUBY_VERSION"; then
+ if test -n "$RUBY_VERSION"; then
+ RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
+ else
RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
+ RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
fi
if test -n "$RUBY_VERSION"; then
RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
@@ -20,7 +23,6 @@ else
RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
- RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
fi
fi

@ -0,0 +1,30 @@
commit 46659f992d49f86347c43528a8705657b6896cb7
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1347384077 -0500
Set HAVE_RUBY_1_9 if ruby 1.9.x installed
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index e0d581b..e4ab2fd 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -16,6 +16,7 @@ else
RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
fi
fi
if test -z "$RUBY_VERSION"; then
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index a875b2f..7ad0e4d 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -18,6 +18,7 @@ else
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
fi
fi
if test -z "$RUBY_VERSION"; then

@ -0,0 +1,78 @@
commit c1faffb8ed0ebae85f21eb3e3ca81a2692a81ae9
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1347382645 -0500
Use cflags from ruby pc file
diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
index 5642728..541e3f5 100644
--- a/korundum/rubylib/korundum/Makefile.am
+++ b/korundum/rubylib/korundum/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
+INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
rubylibdir = $(RUBY_ARCHDIR)
rubylib_LTLIBRARIES = korundum.la
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index 5782123..e0d581b 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -15,6 +15,7 @@ else
RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
+ RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
fi
fi
if test -z "$RUBY_VERSION"; then
@@ -23,10 +24,11 @@ else
RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
fi
- AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR])
+ AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, cflags $RUBY_CFLAGS])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_RUBYLIBDIR)
AC_SUBST(RUBY_SITEDIR)
+ AC_SUBST(RUBY_CFLAGS)
fi
diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
index 156f80a..56b320f 100644
--- a/qtruby/rubylib/qtruby/Makefile.am
+++ b/qtruby/rubylib/qtruby/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR)
+INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 3cfa630..a875b2f 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -17,6 +17,7 @@ else
RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubylibdir"@:>@)'`
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+ RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
fi
fi
if test -z "$RUBY_VERSION"; then
@@ -27,12 +28,13 @@ else
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
fi
- AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG])
+ AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG, cflags $RUBY_CFLAGS])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_SITEDIR)
AC_SUBST(RUBY_RUBYLIBDIR)
AC_SUBST(RUBY_LIBDIR)
AC_SUBST(RUBY_LIBRUBYARG)
+ AC_SUBST(RUBY_CFLAGS)
fi

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -21,7 +21,7 @@
Name: trinity-tdegames Name: trinity-tdegames
Summary: Trinity Desktop Environment - Games Summary: Trinity Desktop Environment - Games
Version: 3.5.13 Version: 3.5.13
Release: 4%{?dist}%{?_variant} Release: 5%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
Group: Amusements/Games Group: Amusements/Games
@ -36,9 +36,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: kdegames-%{version}.tar.gz Source: kdegames-%{version}.tar.gz
# [kdegames/ktuberling] Fix ktuberling pictures loading # [kdegames/ktuberling] Fix ktuberling pictures loading
Patch0: kdegames-3.5.13-ktuberling_fail_load_picture.patch Patch1: kdegames-3.5.13-ktuberling_fail_load_picture.patch
# [kdegames] Missing LDFLAGS cause FTBFS on Mageia 2 # [kdegames] Missing LDFLAGS cause FTBFS on Mageia 2
Patch1: kdegames-3.5.13-missing_ldflags.patch Patch2: kdegames-3.5.13-missing_ldflags.patch
# [kdegames] Switch to v3.5.13-sru branch
Patch3: kdegames-3.5.13-sru-20120827.patch
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdelibs-devel
@ -1519,8 +1521,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%prep %prep
%setup -q -n kdegames %setup -q -n kdegames
%patch0 -p1 #patch1 -p1
%patch1 -p1 -b .ftbfs #patch2 -p1 -b .ftbfs
%patch3 -p1
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@ -1587,6 +1590,9 @@ fi
%changelog %changelog
* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Switch to v3.5.13-sru branch
* Tue Jul 31 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 * Tue Jul 31 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Split into several packages - Split into several packages
- Add support for Mageia 2 - Add support for Mageia 2

@ -0,0 +1,12 @@
--- kdegraphics-3.5.13.1/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake.ORI 2012-10-14 15:03:54.880338162 +0200
+++ kdegraphics-3.5.13.1/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake 2012-10-14 15:04:12.400975329 +0200
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/kde
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
Name: poppler-tqt
Description: TQt bindings for poppler

@ -0,0 +1,38 @@
--- kdegraphics-3.5.13.1/kgamma/ConfigureChecks.cmake.ORI 2012-10-10 21:25:24.204928664 +0200
+++ kdegraphics-3.5.13.1/kgamma/ConfigureChecks.cmake 2012-10-10 21:26:51.812154610 +0200
@@ -11,10 +11,10 @@
include( CheckIncludeFileCXX )
pkg_search_module( XXF86VM xxf86vm )
if( NOT XXF86VM_FOUND )
- tde_message_fatal( "xxf86vm is required, but was not found on your system" )
+ set( XXF86VM_LIBRARIES "-lXxf86vm" )
endif( )
tde_save( CMAKE_REQUIRED_INCLUDES )
set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
--- kdegraphics-3.5.13.1/kpovmodeler/ConfigureChecks.cmake.ORI 2012-10-10 21:33:43.491841294 +0200
+++ kdegraphics-3.5.13.1/kpovmodeler/ConfigureChecks.cmake 2012-10-10 21:34:11.245282172 +0200
@@ -23,5 +23,5 @@
# xmu
pkg_search_module( XMU xmu )
if( NOT XMU_FOUND )
- tde_message_fatal( "xmu is required, but was not found on your system" )
+ set( XMU_LIBRARIES "-lXmu" )
endif( )
--- kdegraphics-3.5.13.1/ksvg/plugin/backends/libart/GlyphTracerLibart.cpp.ORI 2012-10-11 22:17:26.285831149 +0200
+++ kdegraphics-3.5.13.1/ksvg/plugin/backends/libart/GlyphTracerLibart.cpp 2012-10-11 22:17:31.815712301 +0200
@@ -31,11 +31,7 @@
#include <config.h>
-#ifdef HAVE_FREETYPE_2_2_x
- #define FT_VECTOR_PARAMETER const FT_Vector
-#else
- #define FT_VECTOR_PARAMETER FT_Vector
-#endif
+#define FT_VECTOR_PARAMETER FT_Vector
using namespace T2P;

File diff suppressed because it is too large Load Diff

@ -1,100 +0,0 @@
commit 513ffc6edff67b5f7f121c3064b059ce82cbb842
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1341187933 -0500
Add ability to set KLed off color
diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp
index 3a3aa2a..dc245cd 100644
--- a/kdeui/kled.cpp
+++ b/kdeui/kled.cpp
@@ -536,6 +536,12 @@ KLed::color() const
return led_color;
}
+TQColor
+KLed::offColor() const
+{
+ return led_off_color;
+}
+
KLed::Look
KLed::look() const
{
@@ -581,6 +587,17 @@ KLed::setColor(const TQColor& col)
}
void
+KLed::setOffColor(const TQColor& col)
+{
+ if(led_off_color!=col) {
+ if(d->on_map) { delete d->on_map; d->on_map = 0; }
+ if(d->off_map) { delete d->off_map; d->off_map = 0; }
+ d->offcolor = col;
+ update();
+ }
+}
+
+void
KLed::setDarkFactor(int darkfactor)
{
if (d->dark_factor != darkfactor) {
diff --git a/kdeui/kled.h b/kdeui/kled.h
index 7b9f327..b4f828e 100644
--- a/kdeui/kled.h
+++ b/kdeui/kled.h
@@ -50,6 +50,7 @@ class TDEUI_EXPORT KLed : public TQWidget
Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape )
Q_PROPERTY( Look look READ look WRITE setLook )
Q_PROPERTY( TQColor color READ color WRITE setColor )
+ Q_PROPERTY( TQColor offColor READ color WRITE setOffColor )
Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
public:
@@ -148,6 +149,14 @@ public:
TQColor color() const;
/**
+ * Returns the off color of the widget
+ *
+ * @see OffColor
+ * @short Returns LED off color.
+ */
+ TQColor offColor() const;
+
+ /**
* Returns the look of the widget.
*
* @see Look
@@ -204,6 +213,23 @@ public:
void setColor(const TQColor& color);
/**
+ * Set the off color of the widget.
+ * The Color is shown with the KLed::On state.
+ * The KLed::Off state is shown with this color if set
+ *
+ * The widget calls the update() method, so it will
+ * be updated when entering the main event loop.
+ *
+ * Note that calling setColor will override this value
+ *
+ * @see Color
+ *
+ * @param color New off color of the LED.
+ * @short Sets the LED off color.
+ */
+ void setOffColor(const TQColor& color);
+
+ /**
* Sets the factor to darken the LED in OFF state.
* Same as TQColor::dark().
* "darkfactor should be greater than 100, else the LED gets lighter
@@ -316,6 +342,7 @@ protected:
private:
State led_state;
TQColor led_color;
+ TQColor led_off_color;
Look led_look;
Shape led_tqshape;

@ -0,0 +1,987 @@
--- kdelibs/kdefx/CMakeLists.txt.ORI 2012-09-05 14:49:17.332664590 -0400
+++ kdelibs/kdefx/CMakeLists.txt 2012-09-05 14:50:29.605179741 -0400
@@ -20,6 +20,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/keramik/CMakeLists.txt.ORI 2012-09-05 14:52:39.488511648 -0400
+++ kdelibs/kstyles/keramik/CMakeLists.txt 2012-09-05 14:52:46.135375114 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/plastik/CMakeLists.txt.ORI 2012-09-05 14:55:52.184554103 -0400
+++ kdelibs/kstyles/plastik/CMakeLists.txt 2012-09-05 14:55:59.389406152 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/asteroid/CMakeLists.txt.ORI 2012-09-05 14:57:14.714859423 -0400
+++ kdelibs/kstyles/asteroid/CMakeLists.txt 2012-09-05 14:57:25.833631121 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/highcolor/CMakeLists.txt.ORI 2012-09-05 14:59:43.880796883 -0400
+++ kdelibs/kstyles/highcolor/CMakeLists.txt 2012-09-05 14:59:52.769614406 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/highcontrast/CMakeLists.txt.ORI 2012-09-05 15:00:52.531387606 -0400
+++ kdelibs/kstyles/highcontrast/CMakeLists.txt 2012-09-05 15:00:59.908236179 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/light/CMakeLists.txt.ORI 2012-09-05 15:02:37.873225343 -0400
+++ kdelibs/kstyles/light/CMakeLists.txt 2012-09-05 15:02:46.535047560 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdecore/CMakeLists.txt.ORI 2012-09-05 15:04:44.597624532 -0400
+++ kdelibs/kdecore/CMakeLists.txt 2012-09-05 15:04:58.009349300 -0400
@@ -37,6 +37,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
${LIBIDN_LIBRARY_DIRS}
+ ${XCOMPOSITE_LIBRARY_DIRS}
)
--- kdelibs/dcop/client/CMakeLists.txt.ORI 2012-09-05 15:09:40.211558975 -0400
+++ kdelibs/dcop/client/CMakeLists.txt 2012-09-05 15:09:46.973420255 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kjs/CMakeLists.txt.ORI 2012-09-05 15:10:44.871247689 -0400
+++ kdelibs/kjs/CMakeLists.txt 2012-09-05 15:10:55.546035695 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
${LIBPCRE_LIBDIR}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/CMakeLists.txt.ORI 2012-09-05 15:11:50.982934593 -0400
+++ kdelibs/kio/misc/CMakeLists.txt 2012-09-05 15:11:59.380767769 -0400
@@ -40,6 +40,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdecore/kconfig_compiler/CMakeLists.txt.ORI 2012-09-05 15:12:54.956663587 -0400
+++ kdelibs/kdecore/kconfig_compiler/CMakeLists.txt 2012-09-05 15:13:01.689529800 -0400
@@ -17,6 +17,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kwallet/client/CMakeLists.txt.ORI 2012-09-05 15:13:46.102647178 -0400
+++ kdelibs/kwallet/client/CMakeLists.txt 2012-09-05 15:13:54.441481441 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kwallet/backend/CMakeLists.txt.ORI 2012-09-05 15:14:39.946576908 -0400
+++ kdelibs/kwallet/backend/CMakeLists.txt 2012-09-05 15:14:46.189452800 -0400
@@ -20,6 +20,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kunittest/CMakeLists.txt.ORI 2012-09-05 15:15:30.724567350 -0400
+++ kdelibs/kunittest/CMakeLists.txt 2012-09-05 15:15:37.191438762 -0400
@@ -18,6 +18,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/kdesasl/CMakeLists.txt.ORI 2012-09-05 15:16:23.686514140 -0400
+++ kdelibs/kio/misc/kdesasl/CMakeLists.txt 2012-09-05 15:16:30.107386437 -0400
@@ -18,6 +18,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdesu/CMakeLists.txt.ORI 2012-09-05 15:17:18.220429423 -0400
+++ kdelibs/kdesu/CMakeLists.txt 2012-09-05 15:17:25.132291924 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/kntlm/CMakeLists.txt.ORI 2012-09-05 15:18:10.203395218 -0400
+++ kdelibs/kio/misc/kntlm/CMakeLists.txt 2012-09-05 15:18:16.090278085 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdewidgets/CMakeLists.txt.ORI 2012-09-05 15:19:01.043383536 -0400
+++ kdelibs/kdewidgets/CMakeLists.txt 2012-09-05 15:19:08.404237043 -0400
@@ -29,6 +29,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kded/CMakeLists.txt.ORI 2012-09-05 15:19:53.290343643 -0400
+++ kdelibs/kded/CMakeLists.txt 2012-09-05 15:19:59.050228986 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kinit/CMakeLists.txt.ORI 2012-09-05 15:20:56.013094954 -0400
+++ kdelibs/kinit/CMakeLists.txt 2012-09-05 15:21:01.877978180 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kconf_update/CMakeLists.txt.ORI 2012-09-05 15:21:46.470090230 -0400
+++ kdelibs/kconf_update/CMakeLists.txt 2012-09-05 15:21:52.129977515 -0400
@@ -17,6 +17,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kabc/vcard/CMakeLists.txt.ORI 2012-09-05 15:22:33.653150519 -0400
+++ kdelibs/kabc/vcard/CMakeLists.txt 2012-09-05 15:22:39.350037047 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeui/CMakeLists.txt.ORI 2012-09-05 15:23:43.705755018 -0400
+++ kdelibs/kdeui/CMakeLists.txt 2012-09-05 15:23:52.102587723 -0400
@@ -33,6 +33,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kimgio/CMakeLists.txt.ORI 2012-09-05 15:24:52.729379655 -0400
+++ kdelibs/kimgio/CMakeLists.txt 2012-09-05 15:24:59.825238243 -0400
@@ -20,6 +20,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/kthemestyle/CMakeLists.txt.ORI 2012-09-05 15:25:41.501407611 -0400
+++ kdelibs/kstyles/kthemestyle/CMakeLists.txt 2012-09-05 15:25:48.051277056 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/libkmid/CMakeLists.txt.ORI 2012-09-05 15:26:30.215436548 -0400
+++ kdelibs/libkmid/CMakeLists.txt 2012-09-05 15:26:36.349314265 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/http/kcookiejar/CMakeLists.txt.ORI 2012-09-05 15:27:21.689410284 -0400
+++ kdelibs/kioslave/http/kcookiejar/CMakeLists.txt 2012-09-05 15:27:28.281278845 -0400
@@ -22,6 +22,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/utils/installtheme/CMakeLists.txt.ORI 2012-09-05 15:28:14.233362491 -0400
+++ kdelibs/kstyles/utils/installtheme/CMakeLists.txt 2012-09-05 15:28:21.719213198 -0400
@@ -17,6 +17,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
##### kinstalltheme #############################
--- kdelibs/dnssd/CMakeLists.txt.ORI 2012-09-05 15:29:09.718255841 -0400
+++ kdelibs/dnssd/CMakeLists.txt 2012-09-05 15:29:15.350143500 -0400
@@ -20,6 +20,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
##### headers ###################################
--- kdelibs/kstyles/highcontrast/config/CMakeLists.txt.ORI 2012-09-05 15:30:26.325727548 -0400
+++ kdelibs/kstyles/highcontrast/config/CMakeLists.txt 2012-09-05 15:30:31.885616614 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/libkscreensaver/CMakeLists.txt.ORI 2012-09-05 15:31:25.686543044 -0400
+++ kdelibs/libkscreensaver/CMakeLists.txt 2012-09-05 15:31:31.287431270 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/pics/CMakeLists.txt.ORI 2012-09-05 15:33:15.116358829 -0400
+++ kdelibs/pics/CMakeLists.txt 2012-09-05 15:33:22.821205010 -0400
@@ -28,6 +28,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/tools/escputil/CMakeLists.txt.ORI 2012-09-05 15:34:18.809087161 -0400
+++ kdelibs/kdeprint/tools/escputil/CMakeLists.txt 2012-09-05 15:34:24.838966757 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/arts/message/CMakeLists.txt.ORI 2012-09-05 15:35:54.035185423 -0400
+++ kdelibs/arts/message/CMakeLists.txt 2012-09-05 15:35:59.572074829 -0400
@@ -18,6 +18,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kstyles/plastik/config/CMakeLists.txt.ORI 2012-09-05 15:37:59.047687962 -0400
+++ kdelibs/kstyles/plastik/config/CMakeLists.txt 2012-09-05 15:38:04.596577086 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/networkstatus/CMakeLists.txt.ORI 2012-09-05 15:39:15.031169518 -0400
+++ kdelibs/networkstatus/CMakeLists.txt 2012-09-05 15:39:22.330023641 -0400
@@ -22,6 +22,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/CMakeLists.txt.ORI 2012-09-05 15:40:44.810374939 -0400
+++ kdelibs/kio/CMakeLists.txt 2012-09-05 15:40:54.052190177 -0400
@@ -30,6 +30,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/tests/CMakeLists.txt.ORI 2012-09-05 15:41:48.532100927 -0400
+++ kdelibs/kio/tests/CMakeLists.txt 2012-09-05 15:41:54.080989975 -0400
@@ -18,6 +18,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/kioexec/CMakeLists.txt.ORI 2012-09-05 15:42:48.434903055 -0400
+++ kdelibs/kio/kioexec/CMakeLists.txt 2012-09-05 15:42:54.144788864 -0400
@@ -22,6 +22,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/kfile/CMakeLists.txt.ORI 2012-09-05 15:43:44.232787087 -0400
+++ kdelibs/kio/misc/kfile/CMakeLists.txt 2012-09-05 15:43:51.120649315 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
@@ -36,4 +37,4 @@
SOURCES ${${target}_SRCS}
LINK kio-shared
DESTINATION ${BIN_INSTALL_DIR}
-)
\ No newline at end of file
+)
--- kdelibs/kdoctools/CMakeLists.txt.ORI 2012-09-05 15:44:33.205807471 -0400
+++ kdelibs/kdoctools/CMakeLists.txt 2012-09-05 15:44:39.466682225 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/ksendbugmail/CMakeLists.txt.ORI 2012-09-05 15:45:24.401783247 -0400
+++ kdelibs/kio/misc/ksendbugmail/CMakeLists.txt 2012-09-05 15:45:31.286645499 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/interfaces/kscript/CMakeLists.txt.ORI 2012-09-05 15:46:39.496306960 -0400
+++ kdelibs/interfaces/kscript/CMakeLists.txt 2012-09-05 15:46:45.331193604 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kparts/CMakeLists.txt.ORI 2012-09-05 15:47:41.529101602 -0400
+++ kdelibs/kparts/CMakeLists.txt 2012-09-05 15:47:47.294989542 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/CMakeLists.txt.ORI 2012-09-05 15:48:34.508071783 -0400
+++ kdelibs/kdeprint/CMakeLists.txt 2012-09-05 15:48:41.700931937 -0400
@@ -40,6 +40,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/cups/cupsdconf2/CMakeLists.txt.ORI 2012-09-05 15:49:26.236065937 -0400
+++ kdelibs/kdeprint/cups/cupsdconf2/CMakeLists.txt 2012-09-05 15:49:31.824957243 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/http/CMakeLists.txt.ORI 2012-09-05 15:50:45.284528209 -0400
+++ kdelibs/kioslave/http/CMakeLists.txt 2012-09-05 15:50:52.468388422 -0400
@@ -27,6 +27,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/file/CMakeLists.txt.ORI 2012-09-05 15:51:43.357398032 -0400
+++ kdelibs/kioslave/file/CMakeLists.txt 2012-09-05 15:51:50.506258876 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/ftp/CMakeLists.txt.ORI 2012-09-05 15:52:39.615302790 -0400
+++ kdelibs/kioslave/ftp/CMakeLists.txt 2012-09-05 15:52:45.935179729 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/arts/kde/CMakeLists.txt.ORI 2012-09-05 15:53:32.040281826 -0400
+++ kdelibs/arts/kde/CMakeLists.txt 2012-09-05 15:53:38.541155204 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
${ARTS_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
# pkg-config stripping -I/usr/include
--- kdelibs/interfaces/kimproxy/library/CMakeLists.txt.ORI 2012-09-05 15:54:52.117721726 -0400
+++ kdelibs/interfaces/kimproxy/library/CMakeLists.txt 2012-09-05 15:55:02.693515629 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kresources/CMakeLists.txt.ORI 2012-09-05 15:55:55.219491830 -0400
+++ kdelibs/kresources/CMakeLists.txt 2012-09-05 15:56:01.964360344 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/iso/CMakeLists.txt.ORI 2012-09-05 15:57:00.178225273 -0400
+++ kdelibs/kioslave/iso/CMakeLists.txt 2012-09-05 15:57:06.535101301 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/gzip/CMakeLists.txt.ORI 2012-09-05 15:58:24.363583139 -0400
+++ kdelibs/kioslave/gzip/CMakeLists.txt 2012-09-05 15:58:29.777477507 -0400
@@ -18,6 +18,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/bzip2/CMakeLists.txt.ORI 2012-09-05 15:59:29.076320316 -0400
+++ kdelibs/kioslave/bzip2/CMakeLists.txt 2012-09-05 15:59:34.117221927 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kioslave/metainfo/CMakeLists.txt.ORI 2012-09-05 16:00:23.606255852 -0400
+++ kdelibs/kioslave/metainfo/CMakeLists.txt 2012-09-05 16:00:29.200146638 -0400
@@ -20,6 +20,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/krsync/CMakeLists.txt.ORI 2012-09-05 16:01:17.567202186 -0400
+++ kdelibs/krsync/CMakeLists.txt 2012-09-05 16:01:23.763081184 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/kssld/CMakeLists.txt.ORI 2012-09-05 16:02:12.759124170 -0400
+++ kdelibs/kio/misc/kssld/CMakeLists.txt 2012-09-05 16:02:19.426993911 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeui/kdetrayproxy/CMakeLists.txt.ORI 2012-09-05 16:03:48.650271606 -0400
+++ kdelibs/kdeui/kdetrayproxy/CMakeLists.txt 2012-09-05 16:03:54.752156274 -0400
@@ -20,6 +20,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/kwalletd/CMakeLists.txt.ORI 2012-09-05 16:04:55.631005088 -0400
+++ kdelibs/kio/misc/kwalletd/CMakeLists.txt 2012-09-05 16:05:03.666853065 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/knewstuff/CMakeLists.txt.ORI 2012-09-05 16:05:51.805942029 -0400
+++ kdelibs/knewstuff/CMakeLists.txt 2012-09-05 16:05:57.713830182 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/kpasswdserver/CMakeLists.txt.ORI 2012-09-05 16:06:46.686902706 -0400
+++ kdelibs/kio/kpasswdserver/CMakeLists.txt 2012-09-05 16:06:53.345776552 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kio/misc/kpac/CMakeLists.txt.ORI 2012-09-05 16:07:43.907818289 -0400
+++ kdelibs/kio/misc/kpac/CMakeLists.txt 2012-09-05 16:07:49.444713316 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
##### other data ################################
--- kdelibs/kabc/CMakeLists.txt.ORI 2012-09-05 16:08:49.154580815 -0400
+++ kdelibs/kabc/CMakeLists.txt 2012-09-05 16:08:57.154429020 -0400
@@ -36,6 +36,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/khtml/java/CMakeLists.txt.ORI 2012-09-05 16:09:55.224326707 -0400
+++ kdelibs/khtml/java/CMakeLists.txt 2012-09-05 16:10:02.194194348 -0400
@@ -28,6 +28,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kutils/CMakeLists.txt.ORI 2012-09-05 16:10:45.848365097 -0400
+++ kdelibs/kutils/CMakeLists.txt 2012-09-05 16:10:51.715253615 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/interfaces/kscript/sample/CMakeLists.txt.ORI 2012-09-05 16:11:52.986088900 -0400
+++ kdelibs/interfaces/kscript/sample/CMakeLists.txt 2012-09-05 16:12:00.529945437 -0400
@@ -20,6 +20,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/khtml/kmultipart/CMakeLists.txt.ORI 2012-09-05 16:12:49.105021375 -0400
+++ kdelibs/khtml/kmultipart/CMakeLists.txt 2012-09-05 16:12:55.035908513 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kcert/CMakeLists.txt.ORI 2012-09-05 16:13:43.686982413 -0400
+++ kdelibs/kcert/CMakeLists.txt 2012-09-05 16:13:51.788828139 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/arts/knotify/CMakeLists.txt.ORI 2012-09-05 16:14:42.802856412 -0400
+++ kdelibs/arts/knotify/CMakeLists.txt 2012-09-05 16:14:50.217715126 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
${ARTS_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/interfaces/kmediaplayer/CMakeLists.txt.ORI 2012-09-05 16:15:47.850616551 -0400
+++ kdelibs/interfaces/kmediaplayer/CMakeLists.txt 2012-09-05 16:15:53.805503001 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/management/CMakeLists.txt.ORI 2012-09-05 16:16:51.704398570 -0400
+++ kdelibs/kdeprint/management/CMakeLists.txt 2012-09-05 16:16:58.402270762 -0400
@@ -32,6 +32,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/lpdunix/CMakeLists.txt.ORI 2012-09-05 16:18:05.348992771 -0400
+++ kdelibs/kdeprint/lpdunix/CMakeLists.txt 2012-09-05 16:18:13.274841407 -0400
@@ -28,6 +28,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/ext/CMakeLists.txt.ORI 2012-09-05 16:19:06.696820851 -0400
+++ kdelibs/kdeprint/ext/CMakeLists.txt 2012-09-05 16:19:13.589689130 -0400
@@ -26,6 +26,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt.ORI 2012-09-05 16:20:09.255625011 -0400
+++ kdelibs/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt 2012-09-05 16:20:16.883479148 -0400
@@ -28,6 +28,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
${ARTS_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/khtml/CMakeLists.txt.ORI 2012-09-05 16:21:17.056328088 -0400
+++ kdelibs/khtml/CMakeLists.txt 2012-09-05 16:21:23.855197987 -0400
@@ -46,6 +46,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kspell2/ui/CMakeLists.txt.ORI 2012-09-05 16:22:21.155101145 -0400
+++ kdelibs/kspell2/ui/CMakeLists.txt 2012-09-05 16:22:28.929952270 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kcmshell/CMakeLists.txt.ORI 2012-09-05 16:23:26.764844457 -0400
+++ kdelibs/kcmshell/CMakeLists.txt 2012-09-05 16:23:32.943726066 -0400
@@ -23,6 +23,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kmdi/kmdi/CMakeLists.txt.ORI 2012-09-05 16:24:30.703618985 -0400
+++ kdelibs/kmdi/kmdi/CMakeLists.txt 2012-09-05 16:24:36.946499290 -0400
@@ -25,6 +25,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kmdi/CMakeLists.txt.ORI 2012-09-05 16:25:27.631527239 -0400
+++ kdelibs/kmdi/CMakeLists.txt 2012-09-05 16:25:33.639411986 -0400
@@ -27,6 +27,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kspell2/plugins/ispell/CMakeLists.txt.ORI 2012-09-05 16:26:26.062406048 -0400
+++ kdelibs/kspell2/plugins/ispell/CMakeLists.txt 2012-09-05 16:26:31.159308217 -0400
@@ -19,6 +19,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kspell2/plugins/aspell/CMakeLists.txt.ORI 2012-09-05 16:27:38.670011962 -0400
+++ kdelibs/kspell2/plugins/aspell/CMakeLists.txt 2012-09-05 16:27:44.931891687 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
${ASPELL_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kabc/formats/CMakeLists.txt.ORI 2012-09-05 16:28:38.501862464 -0400
+++ kdelibs/kabc/formats/CMakeLists.txt 2012-09-05 16:28:44.382749443 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kabc/plugins/ldapkio/CMakeLists.txt.ORI 2012-09-05 16:29:38.283713293 -0400
+++ kdelibs/kabc/plugins/ldapkio/CMakeLists.txt 2012-09-05 16:29:44.129600887 -0400
@@ -27,6 +27,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kabc/plugins/file/CMakeLists.txt.ORI 2012-09-05 16:30:42.311481817 -0400
+++ kdelibs/kabc/plugins/file/CMakeLists.txt 2012-09-05 16:30:47.634379406 -0400
@@ -27,6 +27,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/interfaces/ktexteditor/CMakeLists.txt.ORI 2012-09-05 16:31:40.221367404 -0400
+++ kdelibs/interfaces/ktexteditor/CMakeLists.txt 2012-09-05 16:31:47.174233563 -0400
@@ -28,6 +28,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kabc/plugins/dir/CMakeLists.txt.ORI 2012-09-05 16:32:39.930217776 -0400
+++ kdelibs/kabc/plugins/dir/CMakeLists.txt 2012-09-05 16:32:45.775105207 -0400
@@ -27,6 +27,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kabc/plugins/net/CMakeLists.txt.ORI 2012-09-05 16:33:52.745814992 -0400
+++ kdelibs/kabc/plugins/net/CMakeLists.txt 2012-09-05 16:34:01.271650687 -0400
@@ -27,6 +27,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/cups/CMakeLists.txt.ORI 2012-09-05 16:35:01.843483032 -0400
+++ kdelibs/kdeprint/cups/CMakeLists.txt 2012-09-05 16:35:10.784310629 -0400
@@ -35,6 +35,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/rlpr/CMakeLists.txt.ORI 2012-09-05 16:36:01.783326981 -0400
+++ kdelibs/kdeprint/rlpr/CMakeLists.txt 2012-09-05 16:36:08.502197359 -0400
@@ -29,6 +29,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kate/plugins/wordcompletion/CMakeLists.txt.ORI 2012-09-05 16:37:02.425156810 -0400
+++ kdelibs/kate/plugins/wordcompletion/CMakeLists.txt 2012-09-05 16:37:08.514039285 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
##### other data ################################
--- kdelibs/kate/plugins/isearch/CMakeLists.txt.ORI 2012-09-05 16:38:01.583014723 -0400
+++ kdelibs/kate/plugins/isearch/CMakeLists.txt 2012-09-05 16:38:07.610898319 -0400
@@ -22,6 +22,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kate/interfaces/CMakeLists.txt.ORI 2012-09-05 16:39:02.822865446 -0400
+++ kdelibs/kate/interfaces/CMakeLists.txt 2012-09-05 16:39:11.673700838 -0400
@@ -21,6 +21,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kdeprint/lpr/CMakeLists.txt.ORI 2012-09-05 16:40:04.179723987 -0400
+++ kdelibs/kdeprint/lpr/CMakeLists.txt 2012-09-05 16:40:15.471513833 -0400
@@ -29,6 +29,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kate/plugins/insertfile/CMakeLists.txt.ORI 2012-09-05 16:41:07.687541674 -0400
+++ kdelibs/kate/plugins/insertfile/CMakeLists.txt 2012-09-05 16:41:13.326436653 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kate/plugins/kdatatool/CMakeLists.txt.ORI 2012-09-05 16:42:09.313393591 -0400
+++ kdelibs/kate/plugins/kdatatool/CMakeLists.txt 2012-09-05 16:42:15.058286525 -0400
@@ -24,6 +24,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
--- kdelibs/kate/part/CMakeLists.txt.ORI 2012-09-05 16:43:06.975318648 -0400
+++ kdelibs/kate/part/CMakeLists.txt 2012-09-05 16:43:13.228202040 -0400
@@ -35,6 +35,7 @@
link_directories(
${TQT_LIBRARY_DIRS}
${LUA_LIBRARY_DIRS}
+ ${XRENDER_LIBRARY_DIRS}
)
##### kate (static library) #####################

@ -10,15 +10,15 @@
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdedocdir %{tde_docdir}/kde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/kde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir} %define _docdir %{tde_docdir}
Name: trinity-tdelibs Name: trinity-tdelibs
Version: 3.5.13.1 Version: 3.5.13.1
Release: 0%{?dist}%{?_variant} Release: 1%{?dist}%{?_variant}
License: GPL License: GPL
Summary: TDE Libraries Summary: TDE Libraries
Group: Environment/Libraries Group: Environment/Libraries
@ -30,9 +30,7 @@ URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdelibs-3.5.13.tar.gz Source0: kdelibs-3.5.13.1.tar.gz
# [tdelibs] Diff between 3.5.13-stable and 3.5.13-sru
Patch0: tdelibs-3.5.13-sru-20120805.patch
Obsoletes: tdelibs < %{version}-%{release} Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release} Provides: tdelibs = %{version}-%{release}
@ -44,45 +42,113 @@ Provides: trinity-kdelibs-apidocs = %{version}-%{release}
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: libtool BuildRequires: libtool
BuildRequires: tqtinterface-devel BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel BuildRequires: krb5-devel
BuildRequires: libutempter-devel BuildRequires: libxslt-devel
BuildRequires: bzip2-devel BuildRequires: cups-devel
BuildRequires: libart_lgpl-devel
BuildRequires: pcre-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: libidn-devel BuildRequires: libidn-devel
BuildRequires: qt3-devel BuildRequires: qt3-devel
BuildRequires: jasper-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: OpenEXR-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gamin-devel BuildRequires: gamin-devel
BuildRequires: aspell
BuildRequires: aspell-devel BuildRequires: aspell-devel
BuildRequires: hspell-devel
BuildRequires: avahi-tqt-devel >= 3.5.13
# LUA support are not ready yet # LUA support are not ready yet
#BuildRequires: lua-devel #BuildRequires: lua-devel
# BZIP2 support
%if 0%{?suse_version}
BuildRequires: libbz2-devel
%else
BuildRequires: bzip2-devel
%endif
# UTEMPTER support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libutempter-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: utempter
%endif
%if 0%{?suse_version}
BuildRequires: utempter-devel
%endif
# HSPELL support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_hspell 1
BuildRequires: hspell-devel
%endif
# JASPER support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
%else
BuildRequires: jasper-devel
%endif
%endif
# AVAHI support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_avahi 1
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: trinity-avahi-tqt-devel >= %{version}
BuildRequires: %{_lib}avahi-client-devel BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}ltdl-devel
BuildRequires: x11-proto-devel
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
Requires: %{_lib}avahi-client3 Requires: %{_lib}avahi-client3
%else %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: trinity-avahi-tqt-devel >= %{version}
BuildRequires: avahi-devel BuildRequires: avahi-devel
Requires: avahi
%endif
%endif
# OPENEXR support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_openexr 1
BuildRequires: OpenEXR-devel
%endif
# LIBTOOL
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libtool-ltdl-devel BuildRequires: libtool-ltdl-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: libtool
%endif
# X11 support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: x11-proto-devel
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: libXcomposite-devel BuildRequires: libXcomposite-devel
%endif %endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
Requires: tqtinterface >= 3.5.13
Requires: trinity-arts >= 3.5.13 Requires: trinity-tqtinterface >= %{version}
Requires: avahi Requires: trinity-arts >= %{version}
Requires: qt3 >= 3.3.8.d Requires: qt3 >= 3.3.8.d
%description %description
Libraries for the Trinity Desktop Environment: Libraries for the Trinity Desktop Environment:
TDE Libraries included: tdecore (TDE core library), kdeui (user interface), TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
@ -202,6 +268,12 @@ kimgio (image manipulation).
# New in TDE 3.5.13 # New in TDE 3.5.13
%{tde_bindir}/kdetcompmgr %{tde_bindir}/kdetcompmgr
%pre
# Bug 1074
if [ -d %{tde_datadir}/locale/all_languages ]; then
rm -rf %{tde_datadir}/locale/all_languages
fi
%post %post
/sbin/ldconfig || : /sbin/ldconfig || :
@ -248,13 +320,18 @@ applications for TDE.
########## ##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep %prep
%setup -q -n kdelibs %setup -q -n kdelibs-3.5.13.1
%patch0 -p1
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
@ -262,8 +339,12 @@ export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet # We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
export LD_LIBRARY_PATH="%{tde_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${CXXFLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
fi
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif %endif
@ -285,14 +366,19 @@ cd build
-DWITH_CUPS=ON \ -DWITH_CUPS=ON \
-DWITH_LUA=OFF \ -DWITH_LUA=OFF \
-DWITH_TIFF=ON \ -DWITH_TIFF=ON \
-DWITH_JASPER=ON \ %{?with_jasper:-DWITH_JASPER=ON} \
-DWITH_OPENEXR=ON \ %{?with_hspell:-DWITH_HSPELL=ON} \
-DWITH_UTEMPTER=ON \ %{?with_openexr:-DWITH_OPENEXR=ON} \
-DWITH_AVAHI=ON \ %{?with_avahi:-DWITH_AVAHI=ON} \
-DWITH_ASPELL=ON \ %if 0%{?rhel} == 4
-DWITH_HSPELL=ON \ -DWITH_PCRE=OFF \
-DWITH_INOTIFY=OFF \
%else
-DWITH_PCRE=ON \ -DWITH_PCRE=ON \
-DWITH_INOTIFY=ON \ -DWITH_INOTIFY=ON \
%endif
-DWITH_UTEMPTER=ON \
-DWITH_ASPELL=ON \
-DWITH_GAMIN=ON \ -DWITH_GAMIN=ON \
.. ..
@ -326,5 +412,5 @@ EOF
%changelog %changelog
* Sun Aug 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-0 * Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial SRU build - Initial build for TDE 3.5.13.1

@ -91,34 +91,62 @@ Patch34: kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
Patch35: kdelibs-3.5.13-fix_all_languages_installation.patch Patch35: kdelibs-3.5.13-fix_all_languages_installation.patch
## [tdelibs] Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb] ## [tdelibs] Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb]
Patch36: kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch Patch36: kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch
## [tdelibs] Fix xrender include dir
Patch37: kdelibs-3.5.13-fix_xrender_libdir.patch
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: libtool BuildRequires: libtool
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel
BuildRequires: avahi-tqt-devel >= 3.5.13
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: libart_lgpl-devel BuildRequires: libart_lgpl-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: libutempter-devel
BuildRequires: bzip2-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: libidn-devel BuildRequires: libidn-devel
BuildRequires: qt3-devel BuildRequires: qt3-devel
BuildRequires: jasper-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: OpenEXR-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gamin-devel BuildRequires: gamin-devel
BuildRequires: aspell
BuildRequires: aspell-devel BuildRequires: aspell-devel
BuildRequires: hspell-devel BuildRequires: OpenEXR-devel
BuildRequires: avahi-tqt-devel >= 3.5.13
# LUA support are not ready yet # LUA support are not ready yet
#BuildRequires: lua-devel #BuildRequires: lua-devel
%if 0%{?suse_version}
BuildRequires: utempter-devel
BuildRequires: libbz2-devel
%else
BuildRequires: libutempter-devel
BuildRequires: bzip2-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%else
# Hspell support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_hspell 1
BuildRequires: hspell-devel
%endif
# Jasper support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
%else
BuildRequires: jasper-devel
%endif
%endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}ltdl-devel BuildRequires: %{_lib}ltdl-devel
@ -132,10 +160,13 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: libXcomposite-devel BuildRequires: libXcomposite-devel
%endif %endif
Requires: avahi
%endif
Requires: tqtinterface >= 3.5.13 Requires: tqtinterface >= 3.5.13
Requires: trinity-arts >= 3.5.13 Requires: trinity-arts >= 3.5.13
Requires: avahi Requires: qt3
Requires: qt3 >= 3.3.8.d
%description %description
Libraries for the Trinity Desktop Environment: Libraries for the Trinity Desktop Environment:
@ -308,6 +339,12 @@ applications for TDE.
########## ##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep %prep
%setup -q -n kdelibs %setup -q -n kdelibs
%patch10 -p1 %patch10 -p1
@ -336,10 +373,11 @@ applications for TDE.
%patch34 -p1 %patch34 -p1
%patch35 -p1 %patch35 -p1
%patch36 -p1 %patch36 -p1
%patch37 -p1
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt?.sh
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
@ -348,7 +386,7 @@ export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif %endif
@ -370,14 +408,21 @@ cd build
-DWITH_CUPS=ON \ -DWITH_CUPS=ON \
-DWITH_LUA=OFF \ -DWITH_LUA=OFF \
-DWITH_TIFF=ON \ -DWITH_TIFF=ON \
-DWITH_JASPER=ON \ %{?with_jasper:-DWITH_JASPER=ON} \
%{?with_hspell:-DWITH_HSPELL=ON} \
%if 0%{?rhel} == 4
-DWITH_OPENEXR=OFF \
-DWITH_PCRE=OFF \
-DWITH_INOTIFY=OFF \
-DWITH_AVAHI=OFF \
%else
-DWITH_OPENEXR=ON \ -DWITH_OPENEXR=ON \
-DWITH_UTEMPTER=ON \
-DWITH_AVAHI=ON \
-DWITH_ASPELL=ON \
-DWITH_HSPELL=ON \
-DWITH_PCRE=ON \ -DWITH_PCRE=ON \
-DWITH_INOTIFY=ON \ -DWITH_INOTIFY=ON \
-DWITH_AVAHI=ON \
%endif
-DWITH_UTEMPTER=ON \
-DWITH_ASPELL=ON \
-DWITH_GAMIN=ON \ -DWITH_GAMIN=ON \
.. ..

File diff suppressed because it is too large Load Diff

@ -0,0 +1,9 @@
--- kdenetwork-3.5.13.1/krfb/ConfigureChecks.cmake.ORI 2012-10-09 20:58:42.674713186 +0200
+++ kdenetwork-3.5.13.1/krfb/ConfigureChecks.cmake 2012-10-09 20:59:17.585002712 +0200
@@ -11,5 +11,5 @@
pkg_search_module( XTST xtst )
if( NOT XTST_FOUND )
- tde_message_fatal( "xtst is required, but was not found on your system" )
+ set( XTST_LIBRARIES "-lXtst" )
endif( )

@ -0,0 +1,58 @@
commit 6f17856dec29f6a84d5e38b6db12fdc632cd4394
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1339484900 -0500
Fix build errors
Thanks to Roman Savochenko for the patch!
diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt
index 6c691ae..9539457 100644
--- a/kopete/protocols/jabber/kioslave/CMakeLists.txt
+++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt
@@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC
LINK
jabberclient-static idn
iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
- qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
+ qca-static cutestuff_network-static cutestuff_util-static kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 9fb5a92..984e843 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg)
m_msg = msg;
KConfigGroup* c = m_account->configGroup();
- TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName");
+ TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"));
if (provider.isNull())
{
@@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg)
return;
}
- TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName");
+ TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"));
if (programName.isNull())
programName = "/usr/bin/sms_client";
@@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent)
prefWidget->configDir->setMode(KFile::Directory);
TQString configDir;
if (m_account)
- configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir");
+ configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"));
if (configDir.isNull())
configDir = "/etc/sms";
prefWidget->configDir->setURL(configDir);
TQString programName;
if (m_account)
- programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName");
+ programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"));
if (programName.isNull())
programName = "/usr/bin/sms_client";
prefWidget->program->setURL(programName);

File diff suppressed because it is too large Load Diff

@ -0,0 +1,44 @@
--- kdepim-3.5.13.1/kioslaves/imap4/imapparser.cc.segv 2012-09-08 12:06:42.000000000 +0200
+++ kdepim-3.5.13.1/kioslaves/imap4/imapparser.cc 2012-09-26 12:05:13.897737893 +0200
@@ -345,6 +345,7 @@
parseOneWordC(result); // *
TQByteArray what = parseLiteral (result); // see whats coming next
+ if(!what.isEmpty ()) {
switch (what[0])
{
//the status responses
@@ -482,6 +483,7 @@
if (valid)
{
what = parseLiteral (result);
+ if(!what.isEmpty ()) {
switch (what[0])
{
case 'E':
@@ -520,10 +522,12 @@
default:
break;
}
+ }
}
}
break;
} //switch
+ }
} //func
@@ -1915,9 +1919,10 @@
if (!inWords.isEmpty() && inWords[0] == '{')
{
TQCString retVal;
- ulong runLen = inWords.find ('}', 1);
- if (runLen > 0)
+ long srunLen = inWords.find ('}', 1); // Can return -1, so use a signed long
+ if (srunLen > 0)
{
+ ulong runLen = (ulong)srunLen;
bool proper;
ulong runLenSave = runLen + 1;
TQCString tmpstr(runLen);

@ -0,0 +1,15 @@
--- kdepim-3.5.13.1/kioslaves/imap4/imapparser.h~ 2012-09-26 14:43:52.932265697 +0200
+++ kdepim-3.5.13.1/kioslaves/imap4/imapparser.h 2012-09-26 14:45:33.190317168 +0200
@@ -94,7 +94,11 @@
}
uint length()
{
- return data.size() - pos;
+ if( pos < data.size() ) {
+ return data.size() - pos;
+ } else {
+ return 0;
+ }
}
void fromString(const TQString &s)
{

@ -0,0 +1,41 @@
--- kdepim-3.5.13.1/libkmime/kmime_util.cpp.quotes 2012-09-08 12:06:45.000000000 +0200
+++ kdepim-3.5.13.1/libkmime/kmime_util.cpp 2012-09-25 18:49:54.806551812 +0200
@@ -436,29 +436,25 @@
void removeQuots(TQCString &str)
{
- str.replace(TQRegExp("\\\""), "\"");
- str.replace(TQRegExp("\\\\"), "\\");
+ // Removes any quote or backslash caracter
+ str.replace(TQRegExp("[\\\"]"), "");
}
void removeQuots(TQString &str)
{
- str.replace(TQRegExp("\\\""), "\"");
- str.replace(TQRegExp("\\\\"), "\\");
+ // Removes any quote or backslash caracter
+ str.replace(TQRegExp("[\\\"]"), "");
}
void addQuotes(TQCString &str, bool forceQuotes)
{
- bool needsQuotes=false;
- if ( TQString( str ) .contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) )
- needsQuotes = true;
-
- str.replace(TQRegExp("\\"), "\\\\");
- str.replace(TQRegExp("\""), "\\\"");
-
- if (needsQuotes || forceQuotes) {
- str.insert(0,'\"');
+ if ( forceQuotes || TQString(str).contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) ) {
+ // Adds a backslash in front of any existing quote or backslash caracter
+ str.replace(TQRegExp("([\\\"])"), "\\\\1");
+ // Adds quote at beginning and end of thestring
+ str.insert(0,'"');
str.append("\"");
}
}

File diff suppressed because it is too large Load Diff

@ -0,0 +1,309 @@
diff -Nuar kdesdk-3.5.13.1/CMakeLists.txt kdesdk-3.5.13.1.patched/CMakeLists.txt
--- kdesdk-3.5.13.1/CMakeLists.txt 2012-09-08 12:06:50.000000000 +0200
+++ kdesdk-3.5.13.1.patched/CMakeLists.txt 2012-10-01 19:24:39.244352538 +0200
@@ -109,7 +109,7 @@
tde_conditional_add_subdirectory( BUILD_POXML poxml )
tde_conditional_add_subdirectory( BUILD_SCHECK scheck )
tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts )
-tde_conditional_add_subdirectory( BUILD_KDECACHEGRIND kdecachegrind )
+tde_conditional_add_subdirectory( BUILD_KDECACHEGRIND kcachegrind )
tde_conditional_add_subdirectory( BUILD_UMBRELLO umbrello )
diff -Nuar kdesdk-3.5.13.1/kcachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/CMakeLists.txt
--- kdesdk-3.5.13.1/kcachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ kdesdk-3.5.13.1.patched/kcachegrind/CMakeLists.txt 2012-10-01 19:35:12.689266467 +0200
@@ -0,0 +1,21 @@
+#################################################
+#
+# (C) 2012 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include( ConfigureChecks.cmake )
+
+set( KCACHEGRIND_VERSION "0.4.6kde" )
+configure_file( version.h.in version.h @ONLY )
+configure_file( kcachegrind.spec.in kcachegrind.spec @ONLY )
+configure_file( kcachegrind.lsm.in kcachegrind.lsm @ONLY )
+
+add_subdirectory( kcachegrind )
+add_subdirectory( pics )
+add_subdirectory( converters )
diff -Nuar kdesdk-3.5.13.1/kcachegrind/ConfigureChecks.cmake kdesdk-3.5.13.1.patched/kcachegrind/ConfigureChecks.cmake
--- kdesdk-3.5.13.1/kcachegrind/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100
+++ kdesdk-3.5.13.1.patched/kcachegrind/ConfigureChecks.cmake 2012-10-01 19:35:15.546204776 +0200
@@ -0,0 +1,12 @@
+#################################################
+#
+# (C) 2012 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+check_function_exists( mmap HAVE_MMAP )
diff -Nuar kdesdk-3.5.13.1/kcachegrind/converters/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/converters/CMakeLists.txt
--- kdesdk-3.5.13.1/kcachegrind/converters/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ kdesdk-3.5.13.1.patched/kcachegrind/converters/CMakeLists.txt 2012-10-01 19:33:48.381089049 +0200
@@ -0,0 +1,15 @@
+#################################################
+#
+# (C) 2012 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+install( PROGRAMS
+ hotshot2calltree op2calltree pprof2calltree
+ dprof2calltree memprof2calltree
+ DESTINATION ${BIN_INSTALL_DIR} )
diff -Nuar kdesdk-3.5.13.1/kcachegrind/kcachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/kcachegrind/CMakeLists.txt
--- kdesdk-3.5.13.1/kcachegrind/kcachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ kdesdk-3.5.13.1.patched/kcachegrind/kcachegrind/CMakeLists.txt 2012-10-01 19:35:46.872528600 +0200
@@ -0,0 +1,50 @@
+#################################################
+#
+# (C) 2012 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+tde_install_icons( )
+install( FILES kcachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kcachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
+install( FILES x-kcachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
+
+
+##### kcachegrind (executable) ##################
+
+tde_add_executable( kcachegrind AUTOMOC
+ SOURCES
+ functionselectionbase.ui stackselectionbase.ui partselectionbase.ui
+ configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp
+ main.cpp configuration.cpp functionselection.cpp coverage.cpp
+ partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp
+ subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp
+ utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp
+ sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp
+ costtypeview.cpp partview.cpp listutils.cpp costtypeitem.cpp
+ multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp
+ costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp
+ stackitem.cpp callgraphview.cpp
+ LINK kio-shared
+ DESTINATION ${BIN_INSTALL_DIR}
+)
\ Pas de fin de ligne à la fin du fichier
diff -Nuar kdesdk-3.5.13.1/kcachegrind/pics/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/pics/CMakeLists.txt
--- kdesdk-3.5.13.1/kcachegrind/pics/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ kdesdk-3.5.13.1.patched/kcachegrind/pics/CMakeLists.txt 2012-10-01 19:35:59.697251930 +0200
@@ -0,0 +1,14 @@
+#################################################
+#
+# (C) 2012 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( hicolor )
+
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons )
diff -Nuar kdesdk-3.5.13.1/kcachegrind/pics/hicolor/CMakeLists.txt kdesdk-3.5.13.1.patched/kcachegrind/pics/hicolor/CMakeLists.txt
--- kdesdk-3.5.13.1/kcachegrind/pics/hicolor/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ kdesdk-3.5.13.1.patched/kcachegrind/pics/hicolor/CMakeLists.txt 2012-10-01 19:36:11.193004007 +0200
@@ -0,0 +1,12 @@
+#################################################
+#
+# (C) 2012 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kcachegrind/icons )
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/CMakeLists.txt
--- kdesdk-3.5.13.1/kdecachegrind/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
+++ kdesdk-3.5.13.1.patched/kdecachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#################################################
-#
-# (C) 2012 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-include( ConfigureChecks.cmake )
-
-set( KCACHEGRIND_VERSION "0.4.6kde" )
-configure_file( version.h.in version.h @ONLY )
-configure_file( kdecachegrind.spec.in kcachegrind.spec @ONLY )
-configure_file( kdecachegrind.lsm.in kcachegrind.lsm @ONLY )
-
-add_subdirectory( kdecachegrind )
-add_subdirectory( pics )
-add_subdirectory( converters )
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/ConfigureChecks.cmake kdesdk-3.5.13.1.patched/kdecachegrind/ConfigureChecks.cmake
--- kdesdk-3.5.13.1/kdecachegrind/ConfigureChecks.cmake 2012-09-08 12:06:51.000000000 +0200
+++ kdesdk-3.5.13.1.patched/kdecachegrind/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#################################################
-#
-# (C) 2012 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-check_function_exists( mmap HAVE_MMAP )
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/converters/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/converters/CMakeLists.txt
--- kdesdk-3.5.13.1/kdecachegrind/converters/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
+++ kdesdk-3.5.13.1.patched/kdecachegrind/converters/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#################################################
-#
-# (C) 2012 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-install( PROGRAMS
- hotshot2calltree op2calltree pprof2calltree
- dprof2calltree memprof2calltree
- DESTINATION ${BIN_INSTALL_DIR} )
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/kdecachegrind/CMakeLists.txt
--- kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
+++ kdesdk-3.5.13.1.patched/kdecachegrind/kdecachegrind/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-#################################################
-#
-# (C) 2012 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
- ${TQT_LIBRARY_DIRS}
-)
-
-
-##### other data ################################
-
-tde_install_icons( )
-install( FILES kdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
-install( FILES x-kdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
-
-
-##### kdecachegrind (executable) ##################
-
-tde_add_executable( kdecachegrind AUTOMOC
- SOURCES
- functionselectionbase.ui stackselectionbase.ui partselectionbase.ui
- configdlgbase.ui loader.cpp cachegrindloader.cpp treemap.cpp pool.cpp
- main.cpp configuration.cpp functionselection.cpp coverage.cpp
- partgraph.cpp toplevel.cpp stackselection.cpp stackbrowser.cpp
- subcost.cpp tracedata.cpp partselection.cpp configdlg.cpp
- utils.cpp fixcost.cpp traceitemview.cpp instrview.cpp tabview.cpp
- sourceview.cpp callmapview.cpp callview.cpp coverageview.cpp
- costtypeview.cpp partview.cpp listutils.cpp costtypeitem.cpp
- multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp
- costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp
- stackitem.cpp callgraphview.cpp
- LINK kio-shared
- DESTINATION ${BIN_INSTALL_DIR}
-)
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/pics/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/pics/CMakeLists.txt
--- kdesdk-3.5.13.1/kdecachegrind/pics/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
+++ kdesdk-3.5.13.1.patched/kdecachegrind/pics/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#################################################
-#
-# (C) 2012 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-add_subdirectory( hicolor )
-
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons )
diff -Nuar kdesdk-3.5.13.1/kdecachegrind/pics/hicolor/CMakeLists.txt kdesdk-3.5.13.1.patched/kdecachegrind/pics/hicolor/CMakeLists.txt
--- kdesdk-3.5.13.1/kdecachegrind/pics/hicolor/CMakeLists.txt 2012-09-08 12:06:51.000000000 +0200
+++ kdesdk-3.5.13.1.patched/kdecachegrind/pics/hicolor/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#################################################
-#
-# (C) 2012 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind/icons )

@ -0,0 +1,17 @@
--- kdesdk-3.5.13.1/kioslave/svn/ConfigureChecks.cmake 2012-09-30 20:05:52.627163660 +0200
+++ kdesdk/kioslave/svn/ConfigureChecks.cmake 2012-09-30 20:02:29.267164082 +0200
@@ -34,11 +34,11 @@
# check for subversion headers
-tde_save_and_set( CMAKE_REQUIRED_FLAGS "-I${APR_INCLUDE_DIRS}" )
-tde_save_and_set( CMAKE_REQUIRED_DEFINITIONS "${APR_CFLAGS}" )
+set( CMAKE_REQUIRED_FLAGS "-I${APR_INCLUDE_DIRS}" )
+set( CMAKE_REQUIRED_DEFINITIONS "${APR_CFLAGS}" )
if( SVN_INCLUDE_DIR )
- set_and_save( CMAKE_REQUIRED_INCLUDES "${SVN_INCLUDE_DIR}" )
+ set( CMAKE_REQUIRED_INCLUDES "${SVN_INCLUDE_DIR}" )
check_include_file( "svn_types.h" HAVE_SVN_TYPES_H )
tde_restore( CMAKE_REQUIRED_INCLUDES )
else( )

@ -0,0 +1,13 @@
--- kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt.kcachegrind 2012-09-08 12:06:51.000000000 +0200
+++ kdesdk-3.5.13.1/kdecachegrind/kdecachegrind/CMakeLists.txt 2012-09-30 21:43:25.863163587 +0200
@@ -26,8 +26,8 @@
tde_install_icons( )
install( FILES kdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
-install( FILES x-kdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
+install( FILES kdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kdecachegrind )
+install( FILES x-kcachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
##### kdecachegrind (executable) ##################

@ -0,0 +1,11 @@
--- kdesdk-3.5.13.1/kbabel/ConfigureChecks.cmake.ORI 2012-09-30 21:50:19.573288788 +0200
+++ kdesdk-3.5.13.1/kbabel/ConfigureChecks.cmake 2012-09-30 21:50:26.499538745 +0200
@@ -9,7 +9,7 @@
#
#################################################
-find_program( LEX_EXECUTABLE "lex" )
+find_program( LEX_EXECUTABLE "flex" )
if( NOT LEX_EXECUTABLE )
tde_message_fatal( "lex is required, but was not found on your system" )
endif( )

File diff suppressed because it is too large Load Diff

@ -1040,7 +1040,7 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
%patch5 -p1 -b .svn %patch5 -p1 -b .svn
%build %build
unset QTDIR || :; . /etc/profile.d/qt.sh unset QTDIR || :; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LD_LIBRARY_PATH="%{tde_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"

@ -0,0 +1,450 @@
# 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 3.5.13 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Summary: Trinity Desktop Environment - Toys and Amusements
Name: trinity-tdetoys
Group: Amusements/Graphics
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2+
Source0: kdetoys-3.5.13.1.tar.gz
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: gettext
Obsoletes: trinity-kdetoys < %{version}-%{release}
Provides: trinity-kdetoys = %{version}-%{release}
# Metapackage
Requires: trinity-amor = %{version}-%{release}
Requires: trinity-eyesapplet = %{version}-%{release}
Requires: trinity-fifteenapplet = %{version}-%{release}
Requires: trinity-kmoon = %{version}-%{release}
Requires: trinity-kodo = %{version}-%{release}
Requires: trinity-kteatime = %{version}-%{release}
Requires: trinity-ktux = %{version}-%{release}
Requires: trinity-kweather = %{version}-%{release}
Requires: trinity-kworldclock = %{version}-%{release}
%description
Includes:
* amor: Amusing Misuse Of Resources put's comic figures above your windows
* eyesapplet: a kicker applet similar to XEyes
* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
* kmoon: system tray applet showing the moon phase
* kodo: mouse movement meter
* kteatime: system tray applet that makes sure your tea doesn't get too strong
* ktux: Tux-in-a-Spaceship screen saver
* kweather: kicker applet that will display the current weather outside
* kworldwatch: application and kicker applet showing daylight area on the world
globe
NOTE: kicker applets and screen savers require kdebase to be installed,
and user to be logged-in to TDE.
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
##########
%package -n trinity-amor
Summary: a Trinity creature for your desktop
Group: Amusements/Graphics
%description -n trinity-amor
AMOR stands for Amusing Misuse Of Resources. It provides several different
characters who prance around your X screen doing tricks and giving you tips.
Note that AMOR will only work with some window managers. Both KWin (the
KDE window manager) and Metacity (a GTK2 window manager) are supported.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-amor
%defattr(-,root,root,-)
%{tde_bindir}/amor
%{tde_datadir}/apps/amor/
%{tde_tdeappdir}/amor.desktop
%{tde_datadir}/icons/hicolor/*/apps/amor.png
%{tde_tdedocdir}/HTML/en/amor/
%doc AUTHORS COPYING README
%post -n trinity-amor
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-amor
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-eyesapplet
Summary: eyes applet for Trinity
Group: Amusements/Graphics
%description -n trinity-eyesapplet
An applet for the KDE panel containing a pair of eyes that follow your mouse
around the screen.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-eyesapplet
%defattr(-,root,root,-)
%{tde_tdelibdir}/eyes_panelapplet.la
%{tde_tdelibdir}/eyes_panelapplet.so
%{tde_datadir}/apps/kicker/applets/eyesapplet.desktop
%doc AUTHORS COPYING README
##########
%package -n trinity-fifteenapplet
Summary: fifteen pieces puzzle for Trinity
Group: Amusements/Graphics
%description -n trinity-fifteenapplet
An applet for the KDE panel that lets you play the Fifteen Pieces
sliding block puzzle. You have to order 15 pieces in a 4x4 square by
moving them around.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-fifteenapplet
%defattr(-,root,root,-)
%{tde_tdelibdir}/fifteen_panelapplet.la
%{tde_tdelibdir}/fifteen_panelapplet.so
%{tde_datadir}/apps/kicker/applets/kfifteenapplet.desktop
%doc AUTHORS COPYING README
##########
%package -n trinity-kmoon
Summary: moon phase indicator for Trinity
Group: Amusements/Graphics
%description -n trinity-kmoon
An applet for the KDE panel that displays the current phase of the moon.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kmoon
%defattr(-,root,root,-)
%{tde_tdelibdir}/kmoon_panelapplet.la
%{tde_tdelibdir}/kmoon_panelapplet.so
%{tde_datadir}/apps/kicker/applets/kmoonapplet.desktop
%{tde_datadir}/apps/kmoon/
%{tde_datadir}/icons/hicolor/*/apps/kmoon.png
%{tde_tdedocdir}/HTML/en/kmoon/
%doc AUTHORS COPYING README
%post -n trinity-kmoon
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
%postun
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
##########
%package -n trinity-kodo
Summary: mouse odometer for Trinity
Group: Amusements/Graphics
%description -n trinity-kodo
KOdometer measures your desktop mileage. It tracks the movement of your mouse
pointer across your desktop and renders it in inches/feet/miles! It can
do cm/metres/km too. Its most exciting feature is the tripometer.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kodo
%defattr(-,root,root,-)
%{tde_bindir}/kodo
%{tde_tdeappdir}/kodo.desktop
%{tde_datadir}/apps/kodo/numbers.png
%{tde_datadir}/icons/hicolor/*/apps/kodo.png
%{tde_tdedocdir}/HTML/en/kodo/
%doc AUTHORS COPYING README
%post -n trinity-kodo
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kodo
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kteatime
Summary: Trinity utility for making a fine cup of tea
Group: Amusements/Graphics
%description -n trinity-kteatime
KTeaTime is a handy timer for steeping tea. No longer will you have to
guess at how long it takes for your tea to be ready. Simply select the
type of tea you have, and it will alert you when the tea is ready to
drink.
KTeaTime sits in the Trinity system tray.
Please note that KTeaTime is written explicitly for Trinity. If you are
using a non-KDE window manager or desktop environment then it is quite
possible that KTeaTime will not work on your system.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kteatime
%defattr(-,root,root,-)
%{tde_bindir}/kteatime
%{tde_tdeappdir}/kteatime.desktop
%{tde_datadir}/apps/kteatime/
%{tde_datadir}/icons/hicolor/*/apps/kteatime.png
%{tde_tdedocdir}/HTML/en/kteatime/
%doc AUTHORS COPYING README
%post -n trinity-kteatime
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kteatime
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-ktux
Summary: Tux screensaver for Trinity
Group: Amusements/Graphics
%description -n trinity-ktux
A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-ktux
%defattr(-,root,root,-)
%{tde_bindir}/ktux
%{tde_datadir}/apps/ktux/
%{tde_datadir}/applnk/System/ScreenSavers/ktux.desktop
%{tde_datadir}/icons/hicolor/*/apps/ktux.png
%doc AUTHORS COPYING README
%post -n trinity-ktux
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
%postun -n trinity-ktux
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
##########
%package -n trinity-kweather
Summary: weather display applet for Trinity
Group: Amusements/Graphics
%description -n trinity-kweather
An applet for the KDE panel that displays your area's current weather.
Information shown includes the temperature, wind speed, air pressure
and more. By pressing a button a full weather report can be obtained.
KWeather also provides a weather service that can track multiple weather
stations and provide this information to other applications, including
Konqueror's sidebar and Kontact's summary page.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kweather
%defattr(-,root,root,-)
%{tde_bindir}/kweatherservice
%{tde_bindir}/kweatherreport
%{tde_libdir}/lib[kt]deinit_kweatherreport.so
%{tde_libdir}/lib[kt]deinit_kweatherreport.la
%{tde_tdelibdir}/kcm_weather.so
%{tde_tdelibdir}/kcm_weather.la
%{tde_tdelibdir}/kcm_weatherservice.so
%{tde_tdelibdir}/kcm_weatherservice.la
%{tde_tdelibdir}/kweatherreport.so
%{tde_tdelibdir}/kweatherreport.la
%{tde_tdelibdir}/weather_panelapplet.la
%{tde_tdelibdir}/weather_panelapplet.so
%{tde_datadir}/apps/kicker/applets/kweather.desktop
%{tde_datadir}/apps/kweather/
%{tde_datadir}/apps/kweatherservice/stations.dat
%{tde_datadir}/apps/kweatherservice/weather_stations.desktop
%{tde_datadir}/icons/hicolor/*/apps/kweather.png
%{tde_datadir}/services/kweatherservice.desktop
%{tde_datadir}/services/kcmweather.desktop
%{tde_datadir}/services/kcmweatherservice.desktop
%{tde_tdedocdir}/HTML/en/kweather/
%doc AUTHORS COPYING README
%post -n trinity-kweather
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kweather
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kworldclock
Summary: earth watcher for Trinity
Group: Amusements/Graphics
%description -n trinity-kworldclock
Displays where in the world it is light and dark depending on time, as
well as offering the time in all of the major cities of the world.
This can be run standalone, as an applet in the KDE panel or as a
desktop background.
Additional kworldclock themes are available in the tdeartwork-misc package.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kworldclock
%defattr(-,root,root,-)
%{tde_bindir}/kworldclock
%{tde_tdelibdir}/ww_panelapplet.la
%{tde_tdelibdir}/ww_panelapplet.so
%{tde_tdeappdir}/kworldclock.desktop
%{tde_datadir}/apps/kdesktop/programs/kdeworld.desktop
%{tde_datadir}/apps/kicker/applets/kwwapplet.desktop
%{tde_datadir}/apps/kworldclock/
%{tde_datadir}/icons/hicolor/*/apps/kworldclock.png
%{tde_tdedocdir}/HTML/en/kworldclock/
%doc AUTHORS COPYING README
%post -n trinity-kworldclock
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kworldclock
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep
%setup -q -n kdetoys-3.5.13.1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix}
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--enable-new-ldflags \
--enable-closure \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf "%{buildroot}"
%__make install DESTDIR=%{buildroot}
# replace absolute symlink with relative
ln -nfs tips-en %{buildroot}%{tde_datadir}/apps/amor/tips
## File lists
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
# Useless include file from Amor
%__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h
%clean
%__rm -rf %{buildroot}
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

File diff suppressed because it is too large Load Diff

@ -0,0 +1,636 @@
# 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 3.5.13 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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdevelop
Summary: Integrated Development Environment for C++/C
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2
Group: Development/Tools
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: kdevelop-3.5.13.1.tar.gz
Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
# [c_cpp_ref] Fix library directories detection
Patch1: c_cpp_reference-2.0.2-config.patch
# [kdevelop] fix FTBFS
Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
# [c_cpp_ref] Fix installation of 'asm' files
Patch4: c_cpp_reference-2.0.2-install.patch
Requires: %{name}-libs = %{version}-%{release}
Requires: make
Requires: perl
Requires: flex >= 2.5.4
%if 0%{?rhel} || 0%{?fedora}
Requires: qt3-designer
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
Requires: %{_lib}qt3-devel
%endif
%if 0%{?suse_version}
Requires: qt3-devel
%endif
Requires: gettext
Requires: ctags
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tdesdk-devel >= %{version}
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel
%endif
BuildRequires: flex
# FIXME: No CVS support in KDevelop? This is going to suck...
# Requires kdesdk3.
BuildRequires: subversion-devel
BuildRequires: neon-devel
# looks like this is dragged in by apr-devel (dep of subversion-devel), but not
# a dependency
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%else
BuildRequires: openldap-devel
%endif
Obsoletes: trinity-kdevelop < %{version}-%{release}
Provides: trinity-kdevelop = %{version}-%{release}
%description
The TDevelop Integrated Development Environment provides many features
that developers need as well as providing a unified interface to programs
like gdb, the C/C++ compiler, and make. TDevelop manages or provides:
All development tools needed for C++ programming like Compiler,
Linker, automake and autoconf; KAppWizard, which generates complete,
ready-to-go sample applications; Classgenerator, for creating new
classes and integrating them into the current project; File management
for sources, headers, documentation etc. to be included in the
project; The creation of User-Handbooks written with SGML and the
automatic generation of HTML-output with the KDE look and feel;
Automatic HTML-based API-documentation for your project's classes with
cross-references to the used libraries; Internationalization support
for your application, allowing translators to easily add their target
language to a project;
KDevelop also includes WYSIWYG (What you see is what you get)-creation
of user interfaces with a built-in dialog editor; Debugging your
application by integrating KDbg; Editing of project-specific pixmaps
with KIconEdit; The inclusion of any other program you need for
development by adding it to the "Tools"-menu according to your
individual needs.
%files
%defattr(-,root,root,-)
%{tde_bindir}/kdevassistant
%{tde_bindir}/kdevdesigner
%{tde_bindir}/kdevelop
%{tde_bindir}/kdevelop-htdig
%{tde_bindir}/kdevprj2kdevelop
%{tde_bindir}/kdevprofileeditor
%{tde_libdir}/kconf_update_bin/kdev-gen-settings-kconf_update
%{tde_tdeappdir}/kdevassistant.desktop
%{tde_tdeappdir}/kdevdesigner.desktop
%{tde_tdeappdir}/kdevelop.desktop
%{tde_tdeappdir}/kdevelop_c_cpp.desktop
%{tde_tdeappdir}/kdevelop_kde_cpp.desktop
%{tde_tdeappdir}/kdevelop_ruby.desktop
%{tde_tdeappdir}/kdevelop_scripting.desktop
%{tde_tdelibdir}/kio_chm.la
%{tde_tdelibdir}/kio_chm.so
%{tde_tdelibdir}/kio_csharpdoc.la
%{tde_tdelibdir}/kio_csharpdoc.so
%{tde_tdelibdir}/kio_perldoc.la
%{tde_tdelibdir}/kio_perldoc.so
%{tde_tdelibdir}/kio_pydoc.la
%{tde_tdelibdir}/kio_pydoc.so
%{tde_tdelibdir}/libdocchmplugin.la
%{tde_tdelibdir}/libdocchmplugin.so
%{tde_tdelibdir}/libdoccustomplugin.la
%{tde_tdelibdir}/libdoccustomplugin.so
%{tde_tdelibdir}/libdocdevhelpplugin.la
%{tde_tdelibdir}/libdocdevhelpplugin.so
%{tde_tdelibdir}/libdocdoxygenplugin.la
%{tde_tdelibdir}/libdocdoxygenplugin.so
%{tde_tdelibdir}/libdockdevtocplugin.la
%{tde_tdelibdir}/libdockdevtocplugin.so
%{tde_tdelibdir}/libdocqtplugin.la
%{tde_tdelibdir}/libdocqtplugin.so
%{tde_tdelibdir}/libkchmpart.la
%{tde_tdelibdir}/libkchmpart.so
%{tde_tdelibdir}/libkdevabbrev.la
%{tde_tdelibdir}/libkdevabbrev.so
%{tde_tdelibdir}/libkdevadaproject.la
%{tde_tdelibdir}/libkdevadaproject.so
%{tde_tdelibdir}/libkdevadasupport.la
%{tde_tdelibdir}/libkdevadasupport.so
%{tde_tdelibdir}/libkdevantproject.la
%{tde_tdelibdir}/libkdevantproject.so
%{tde_tdelibdir}/libkdevappview.la
%{tde_tdelibdir}/libkdevappview.so
%{tde_tdelibdir}/libkdevappwizard.la
%{tde_tdelibdir}/libkdevappwizard.so
%{tde_tdelibdir}/libkdevastyle.la
%{tde_tdelibdir}/libkdevastyle.so
%{tde_tdelibdir}/libkdevautoproject.la
%{tde_tdelibdir}/libkdevautoproject.so
%{tde_tdelibdir}/libkdevbashsupport.la
%{tde_tdelibdir}/libkdevbashsupport.so
%{tde_tdelibdir}/libkdevbookmarks.la
%{tde_tdelibdir}/libkdevbookmarks.so
%{tde_tdelibdir}/libkdevclassview.la
%{tde_tdelibdir}/libkdevclassview.so
%{tde_tdelibdir}/libkdevcppsupport.la
%{tde_tdelibdir}/libkdevcppsupport.so
%{tde_tdelibdir}/libkdevcsharpsupport.la
%{tde_tdelibdir}/libkdevcsharpsupport.so
%{tde_tdelibdir}/libkdevctags2.la
%{tde_tdelibdir}/libkdevctags2.so
%{tde_tdelibdir}/libkdevcustompcsimporter.la
%{tde_tdelibdir}/libkdevcustompcsimporter.so
%{tde_tdelibdir}/libkdevcustomproject.la
%{tde_tdelibdir}/libkdevcustomproject.so
%{tde_tdelibdir}/libkdevdccoptions.la
%{tde_tdelibdir}/libkdevdccoptions.so
%{tde_tdelibdir}/libkdevdebugger.la
%{tde_tdelibdir}/libkdevdebugger.so
%{tde_tdelibdir}/libkdevdesignerpart.la
%{tde_tdelibdir}/libkdevdesignerpart.so
%{tde_tdelibdir}/libkdevdiff.la
%{tde_tdelibdir}/libkdevdiff.so
%{tde_tdelibdir}/libkdevdistpart.la
%{tde_tdelibdir}/libkdevdistpart.so
%{tde_tdelibdir}/libkdevdocumentation.la
%{tde_tdelibdir}/libkdevdocumentation.so
%{tde_tdelibdir}/libkdevdoxygen.la
%{tde_tdelibdir}/libkdevdoxygen.so
%{tde_tdelibdir}/libkdeveditorchooser.la
%{tde_tdelibdir}/libkdeveditorchooser.so
%{tde_tdelibdir}/libkdevfilecreate.la
%{tde_tdelibdir}/libkdevfilecreate.so
%{tde_tdelibdir}/libkdevfilegroups.la
%{tde_tdelibdir}/libkdevfilegroups.so
%{tde_tdelibdir}/libkdevfilelist.la
%{tde_tdelibdir}/libkdevfilelist.so
%{tde_tdelibdir}/libkdevfileselector.la
%{tde_tdelibdir}/libkdevfileselector.so
%{tde_tdelibdir}/libkdevfileview.la
%{tde_tdelibdir}/libkdevfileview.so
%{tde_tdelibdir}/libkdevfilter.la
%{tde_tdelibdir}/libkdevfilter.so
%{tde_tdelibdir}/libkdevfortransupport.la
%{tde_tdelibdir}/libkdevfortransupport.so
%{tde_tdelibdir}/libkdevfpcoptions.la
%{tde_tdelibdir}/libkdevfpcoptions.so
%{tde_tdelibdir}/libkdevfullscreen.la
%{tde_tdelibdir}/libkdevfullscreen.so
%{tde_tdelibdir}/libkdevgccoptions.la
%{tde_tdelibdir}/libkdevgccoptions.so
%{tde_tdelibdir}/libkdevgrepview.la
%{tde_tdelibdir}/libkdevgrepview.so
%{tde_tdelibdir}/libkdevjavasupport.la
%{tde_tdelibdir}/libkdevjavasupport.so
%{tde_tdelibdir}/libkdevkdelibsimporter.la
%{tde_tdelibdir}/libkdevkdelibsimporter.so
%{tde_tdelibdir}/libkdevkonsoleview.la
%{tde_tdelibdir}/libkdevkonsoleview.so
%{tde_tdelibdir}/libkdevmakeview.la
%{tde_tdelibdir}/libkdevmakeview.so
%{tde_tdelibdir}/libkdevopenwith.la
%{tde_tdelibdir}/libkdevopenwith.so
%{tde_tdelibdir}/libkdevpartexplorer.la
%{tde_tdelibdir}/libkdevpartexplorer.so
%{tde_tdelibdir}/libkdevpascalproject.la
%{tde_tdelibdir}/libkdevpascalproject.so
%{tde_tdelibdir}/libkdevpascalsupport.la
%{tde_tdelibdir}/libkdevpascalsupport.so
%{tde_tdelibdir}/libkdevperlsupport.la
%{tde_tdelibdir}/libkdevperlsupport.so
%{tde_tdelibdir}/libkdevpgioptions.la
%{tde_tdelibdir}/libkdevpgioptions.so
%{tde_tdelibdir}/libkdevphpsupport.la
%{tde_tdelibdir}/libkdevphpsupport.so
%{tde_tdelibdir}/libkdevpythonsupport.la
%{tde_tdelibdir}/libkdevpythonsupport.so
%{tde_tdelibdir}/libkdevqt4importer.la
%{tde_tdelibdir}/libkdevqt4importer.so
%{tde_tdelibdir}/libkdevqtimporter.la
%{tde_tdelibdir}/libkdevqtimporter.so
%{tde_tdelibdir}/libkdevquickopen.la
%{tde_tdelibdir}/libkdevquickopen.so
%{tde_tdelibdir}/libkdevrbdebugger.la
%{tde_tdelibdir}/libkdevrbdebugger.so
%{tde_tdelibdir}/libkdevregexptest.la
%{tde_tdelibdir}/libkdevregexptest.so
%{tde_tdelibdir}/libkdevreplace.la
%{tde_tdelibdir}/libkdevreplace.so
%{tde_tdelibdir}/libkdevrubysupport.la
%{tde_tdelibdir}/libkdevrubysupport.so
%{tde_tdelibdir}/libkdevscripting.la
%{tde_tdelibdir}/libkdevscripting.so
%{tde_tdelibdir}/libkdevscriptproject.la
%{tde_tdelibdir}/libkdevscriptproject.so
%{tde_tdelibdir}/libkdevsnippet.la
%{tde_tdelibdir}/libkdevsnippet.so
%{tde_tdelibdir}/libkdevsqlsupport.la
%{tde_tdelibdir}/libkdevsqlsupport.so
%{tde_tdelibdir}/libkdevtexttools.la
%{tde_tdelibdir}/libkdevtexttools.so
%{tde_tdelibdir}/libkdevtipofday.la
%{tde_tdelibdir}/libkdevtipofday.so
%{tde_tdelibdir}/libkdevtools.la
%{tde_tdelibdir}/libkdevtools.so
%{tde_tdelibdir}/libkdevtrollproject.la
%{tde_tdelibdir}/libkdevtrollproject.so
%{tde_tdelibdir}/libkdevuichooser.la
%{tde_tdelibdir}/libkdevuichooser.so
%{tde_tdelibdir}/libkdevvalgrind.la
%{tde_tdelibdir}/libkdevvalgrind.so
%{tde_tdelibdir}/libkdevvcsmanager.la
%{tde_tdelibdir}/libkdevvcsmanager.so
%{tde_datadir}/apps/kconf_update/
%{tde_datadir}/apps/kdevabbrev/
%{tde_datadir}/apps/kdevadaproject/kdevadaproject.rc
%{tde_datadir}/apps/kdevadasupport/kdevadasupport.rc
%{tde_datadir}/apps/kdevantproject/kdevantproject.rc
%{tde_datadir}/apps/kdevappoutputview/kdevmakeview.rc
%{tde_datadir}/apps/kdevappwizard/
%{tde_datadir}/apps/kdevassistant/kdevassistantui.rc
%{tde_datadir}/apps/kdevastyle/kdevpart_astyle.rc
%{tde_datadir}/apps/kdevautoproject/kdevautoproject.rc
%{tde_datadir}/apps/kdevbashsupport/kdevbashsupport.rc
%{tde_datadir}/apps/kdevclassview/
%{tde_datadir}/apps/kdevcppsupport/
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete.png
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete_all.png
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_edit.png
%{tde_datadir}/icons/hicolor/*/actions/ktip.png
%{tde_datadir}/icons/hicolor/*/apps/kdevassistant.png
%{tde_datadir}/icons/hicolor/*/apps/kdevdesigner.png
%{tde_datadir}/icons/hicolor/*/apps/kdevelop.png
%{tde_datadir}/icons/locolor/*/actions/kdevelop_tip.png
%{tde_datadir}/mimelnk/application/x-kdevelop.desktop
%{tde_datadir}/mimelnk/x-fortran.desktop
%{tde_datadir}/services/chm.protocol
%{tde_datadir}/services/csharpdoc.protocol
%{tde_datadir}/services/docchmplugin.desktop
%{tde_datadir}/services/doccustomplugin.desktop
%{tde_datadir}/services/docdevhelpplugin.desktop
%{tde_datadir}/services/docdoxygenplugin.desktop
%{tde_datadir}/services/dockdevtocplugin.desktop
%{tde_datadir}/services/docqtplugin.desktop
%{tde_datadir}/services/kchmpart.desktop
%{tde_datadir}/services/kdevabbrev.desktop
%{tde_datadir}/services/kdevadaproject.desktop
%{tde_datadir}/services/kdevadasupport.desktop
%{tde_datadir}/services/kdevantproject.desktop
%{tde_datadir}/services/kdevappoutputview.desktop
%{tde_datadir}/services/kdevappwizard.desktop
%{tde_datadir}/services/kdevastyle.desktop
%{tde_datadir}/services/kdevautoproject.desktop
%{tde_datadir}/services/kdevbashsupport.desktop
%{tde_datadir}/services/kdevbookmarks.desktop
%{tde_datadir}/services/kdevclassview.desktop
%{tde_datadir}/services/kdevcppsupport.desktop
%{tde_datadir}/services/kdevcsharpsupport.desktop
%{tde_datadir}/services/kdevcsupport.desktop
%{tde_datadir}/services/kdevctags2.desktop
%{tde_datadir}/services/kdevcustomproject.desktop
%{tde_datadir}/services/kdevdccoptions.desktop
%{tde_datadir}/services/kdevdebugger.desktop
%{tde_datadir}/services/kdevdesigner_part.desktop
%{tde_datadir}/services/kdevdiff.desktop
%{tde_datadir}/services/kdevdistpart.desktop
%{tde_datadir}/services/kdevdocumentation.desktop
%{tde_datadir}/services/kdevdoxygen.desktop
%{tde_datadir}/services/kdeveditorchooser.desktop
%{tde_datadir}/services/kdevfilecreate.desktop
%{tde_datadir}/services/kdevfilegroups.desktop
%{tde_datadir}/services/kdevfilelist.desktop
%{tde_datadir}/services/kdevfileselector.desktop
%{tde_datadir}/services/kdevfileview.desktop
%{tde_datadir}/services/kdevfilter.desktop
%{tde_datadir}/services/kdevfortransupport.desktop
%{tde_datadir}/services/kdevfpcoptions.desktop
%{tde_datadir}/services/kdevfullscreen.desktop
%{tde_datadir}/services/kdevg77options.desktop
%{tde_datadir}/services/kdevgccoptions.desktop
%{tde_datadir}/services/kdevgppoptions.desktop
%{tde_datadir}/services/kdevgrepview.desktop
%{tde_datadir}/services/kdevjavasupport.desktop
%{tde_datadir}/services/kdevkdeautoproject.desktop
%{tde_datadir}/services/kdevkdelibsimporter.desktop
%{tde_datadir}/services/kdevkonsoleview.desktop
%{tde_datadir}/services/kdevmakeview.desktop
%{tde_datadir}/services/kdevopenwith.desktop
%{tde_datadir}/services/kdevpartexplorer.desktop
%{tde_datadir}/services/kdevpascalproject.desktop
%{tde_datadir}/services/kdevpascalsupport.desktop
%{tde_datadir}/services/kdevpcscustomimporter.desktop
%{tde_datadir}/services/kdevperlsupport.desktop
%{tde_datadir}/services/kdevpgf77options.desktop
%{tde_datadir}/services/kdevpghpfoptions.desktop
%{tde_datadir}/services/kdevphpsupport.desktop
%{tde_datadir}/services/kdevpythonsupport.desktop
%{tde_datadir}/services/kdevqt4importer.desktop
%{tde_datadir}/services/kdevqtimporter.desktop
%{tde_datadir}/services/kdevquickopen.desktop
%{tde_datadir}/services/kdevrbdebugger.desktop
%{tde_datadir}/services/kdevregexptest.desktop
%{tde_datadir}/services/kdevreplace.desktop
%{tde_datadir}/services/kdevrubysupport.desktop
%{tde_datadir}/services/kdevscripting.desktop
%{tde_datadir}/services/kdevscriptproject.desktop
%{tde_datadir}/services/kdevsnippet.desktop
%{tde_datadir}/services/kdevsqlsupport.desktop
%{tde_datadir}/services/kdevtexttools.desktop
%{tde_datadir}/services/kdevtipofday.desktop
%{tde_datadir}/services/kdevtmakeproject.desktop
%{tde_datadir}/services/kdevtools.desktop
%{tde_datadir}/services/kdevtrollproject.desktop
%{tde_datadir}/services/kdevuichooser.desktop
%{tde_datadir}/services/kdevvalgrind.desktop
%{tde_datadir}/services/kdevvcsmanager.desktop
%{tde_datadir}/services/perldoc.protocol
%{tde_datadir}/services/pydoc.protocol
%{tde_datadir}/servicetypes/kdevelopappfrontend.desktop
%{tde_datadir}/servicetypes/kdevelopcodebrowserfrontend.desktop
%{tde_datadir}/servicetypes/kdevelopcompileroptions.desktop
%{tde_datadir}/servicetypes/kdevelopcreatefile.desktop
%{tde_datadir}/servicetypes/kdevelopdifffrontend.desktop
%{tde_datadir}/servicetypes/kdevelopdocumentationplugins.desktop
%{tde_datadir}/servicetypes/kdeveloplanguagesupport.desktop
%{tde_datadir}/servicetypes/kdevelopmakefrontend.desktop
%{tde_datadir}/servicetypes/kdeveloppcsimporter.desktop
%{tde_datadir}/servicetypes/kdevelopplugin.desktop
%{tde_datadir}/servicetypes/kdevelopproject.desktop
%{tde_datadir}/servicetypes/kdevelopquickopen.desktop
%{tde_datadir}/servicetypes/kdevelopsourceformatter.desktop
%{tde_datadir}/servicetypes/kdevelopvcsintegrator.desktop
%{tde_datadir}/servicetypes/kdevelopversioncontrol.desktop
%{tde_datadir}/apps/kdevcsharpsupport/kdevcsharpsupport.rc
%{tde_datadir}/apps/kdevctags2/kdevpart_ctags2.rc
%{tde_datadir}/apps/kdevcustomproject/kdevcustomproject.rc
%{tde_datadir}/apps/kdevdebugger/
%{tde_datadir}/apps/kdevdesigner/kdevdesigner_shell.rc
%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part.rc
%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part_sh.rc
%{tde_datadir}/apps/kdevdiff/kdevdiff.rc
%{tde_datadir}/apps/kdevdistpart/kdevpart_distpart.rc
%{tde_datadir}/apps/kdevdocumentation/
%{tde_datadir}/apps/kdevdoxygen/kdevdoxygen.rc
%{tde_datadir}/apps/kdevelop/
%{tde_datadir}/apps/kdevfilecreate/
%{tde_datadir}/apps/kdevfilelist/kdevfilelist.rc
%{tde_datadir}/apps/kdevfilter/kdevfilter.rc
%{tde_datadir}/apps/kdevfortransupport/kdevfortransupport.rc
%{tde_datadir}/apps/kdevfullscreen/kdevpart_fullscreen.rc
%{tde_datadir}/apps/kdevgrepview/
%{tde_datadir}/apps/kdevjavasupport/kdevjavasupport.rc
%{tde_datadir}/apps/kdevmakeview/kdevmakeview.rc
%{tde_datadir}/apps/kdevpartexplorer/kdevpartexplorer.rc
%{tde_datadir}/apps/kdevpascalproject/kdevpascalproject.rc
%{tde_datadir}/apps/kdevpascalsupport/kdevpascalsupport.rc
%{tde_datadir}/apps/kdevperlsupport/kdevperlsupport.rc
%{tde_datadir}/apps/kdevphpsupport/kdevphpsupport.rc
%{tde_datadir}/apps/kdevphpsupport/phpfunctions
%{tde_datadir}/apps/kdevpythonsupport/kdevpythonsupport.rc
%{tde_datadir}/apps/kdevquickopen/kdevpart_quickopen.rc
%{tde_datadir}/apps/kdevrbdebugger/
%{tde_datadir}/apps/kdevregexptest/kdevregexptest.rc
%{tde_datadir}/apps/kdevreplace/kdevpart_replace.rc
%{tde_datadir}/apps/kdevrubysupport/kdevrubysupport.rc
%{tde_datadir}/apps/kdevrubysupport/pics/ruby_config.png
%{tde_datadir}/apps/kdevrubysupport/pics/ruby_run.png
%{tde_datadir}/apps/kdevscripting/kdevscripting.rc
%{tde_datadir}/apps/kdevscriptproject/kdevscriptproject.rc
%{tde_datadir}/apps/kdevsnippet/kdevpart_snippet.rc
%{tde_datadir}/apps/kdevsqlsupport/kdevsqlsupport.rc
%{tde_datadir}/apps/kdevtipofday/kdevpart_tipofday.rc
%{tde_datadir}/apps/kdevtipofday/tips
%{tde_datadir}/apps/kdevtools/kdevpart_tools.rc
%{tde_datadir}/apps/kdevtrollproject/kdevtrollproject.rc
%{tde_datadir}/apps/kdevvalgrind/kdevpart_valgrind.rc
%{tde_datadir}/apps/kio_pydoc/kde_pydoc.py*
%{tde_datadir}/config/kdevassistantrc
%{tde_datadir}/config/kdeveloprc
%{tde_datadir}/desktop-directories/kde-development-kdevelop.directory
%{tde_tdedocdir}/HTML/en/kdevelop/
%post
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Obsoletes: trinity-kdevelop-devel < %{version}-%{release}
Provides: trinity-kdevelop-devel = %{version}-%{release}
%description devel
%{summary}.
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/lib*.so
%{tde_libdir}/lib*.la
%{tde_includedir}/*
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
##########
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-kdelibs
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
Obsoletes: trinity-kdevelop-libs < %{version}-%{release}
Provides: trinity-kdevelop-libs = %{version}-%{release}
%description libs
%{summary}.
%files libs
%defattr(-,root,root,-)
%{tde_libdir}/libdesignerintegration.so.0
%{tde_libdir}/libdesignerintegration.so.0.0.0
%{tde_libdir}/libdocumentation_interfaces.so.0
%{tde_libdir}/libdocumentation_interfaces.so.0.0.0
%{tde_libdir}/libgdbmi_parser.so.0
%{tde_libdir}/libgdbmi_parser.so.0.0.0
%{tde_libdir}/libkdevbuildbase.so.0
%{tde_libdir}/libkdevbuildbase.so.0.0.0
%{tde_libdir}/libkdevbuildtoolswidgets.so.0
%{tde_libdir}/libkdevbuildtoolswidgets.so.0.0.0
%{tde_libdir}/libkdevcatalog.so.0
%{tde_libdir}/libkdevcatalog.so.0.0.0
%{tde_libdir}/libkdevcppparser.so.0
%{tde_libdir}/libkdevcppparser.so.0.0.0
%{tde_libdir}/libkdevelop.so.1
%{tde_libdir}/libkdevelop.so.1.0.0
%{tde_libdir}/libkdevextras.so.0
%{tde_libdir}/libkdevextras.so.0.0.0
%{tde_libdir}/libkdevpropertyeditor.so.0
%{tde_libdir}/libkdevpropertyeditor.so.0.0.0
%{tde_libdir}/libkdevqmakeparser.so.0
%{tde_libdir}/libkdevqmakeparser.so.0.0.0
%{tde_libdir}/libkdevshell.so.0
%{tde_libdir}/libkdevshell.so.0.0.0
%{tde_libdir}/libkdevwidgets.so.0
%{tde_libdir}/libkdevwidgets.so.0.0.0
%{tde_libdir}/liblang_debugger.so.0
%{tde_libdir}/liblang_debugger.so.0.0.0
%{tde_libdir}/liblang_interfaces.so.0
%{tde_libdir}/liblang_interfaces.so.0.0.0
%{tde_libdir}/libprofileengine.so.0
%{tde_libdir}/libprofileengine.so.0.0.0
%post libs
/sbin/ldconfig || :
%postun libs
/sbin/ldconfig || :
##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep
%setup -q -n kdevelop-3.5.13.1 -a1
%patch1 -p0 -b .config
%patch2 -p1
%patch4 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
%__cp -ar admin c_cpp_reference-2.0.2_for_KDE_3.0/
%__make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
# c references
pushd c_cpp_reference-2.0.2_for_KDE_3.0
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
--with-qt-includes=${QTINC:-${QTDIR}/include} \
--with-extra-libs=%{tde_libdir}
popd
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \
-DWITH_BUILDTOOL_ALL=ON \
-DWITH_LANGUAGE_ALL=ON \
-DWITH_VCS_ALL=OFF \
-DBUILD_ALL=ON \
..
%__make %{?_smp_mflags}
# c references
cd ..
%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
%clean
%__rm -rf %{buildroot}
%changelog
* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -194,7 +194,7 @@ Provides: trinity-kdevelop-libs = %{version}-%{release}
%prep %prep
%setup -q -n kdevelop -a1 %setup -q -n kdevelop -a1
%patch1 -p0 -b .config %patch1 -p0 -b .config
#patch2 -p1 %patch2 -p1
%patch3 -p1 -b .gcc47 %patch3 -p1 -b .gcc47
%patch4 -p1 %patch4 -p1

@ -0,0 +1,566 @@
# 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 3.5.13 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 tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdewebdev
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPL
Summary: Web development applications
Group: Applications/Editors
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdewebdev-3.5.13.1.tar.gz
Source1: http://download.sourceforge.net/quanta/css.tar.bz2
Source2: http://download.sourceforge.net/quanta/html.tar.bz2
Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
Source5: hi48-app-kxsldbg.png
Patch0: javascript.patch
Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tdesdk-devel >= %{version}
BuildRequires: libxslt-devel
BuildRequires: libxml2-devel
%if 0%{?rhel} == 4
# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
BuildRequires: libgcrypt-devel
%endif
BuildRequires: perl
Obsoletes: trinity-kdewebdev-libs < %{version}-%{release}
Provides: trinity-kdewebdev-libs = %{version}-%{release}
Obsoletes: trinity-kdewebdev < %{version}-%{release}
Provides: trinity-kdewebdev = %{version}-%{release}
Requires: trinity-quanta = %{version}-%{release}
Requires: trinity-quanta-data = %{version}-%{release}
Requires: trinity-kfilereplace = %{version}-%{release}
Requires: trinity-kimagemapeditor = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release}
Requires: trinity-kommander = %{version}-%{release}
Requires: trinity-kxsldbg = %{version}-%{release}
%description
%{summary}, including:
* kfilereplace: batch search and replace tool
* kimagemapeditor: HTML image map editor
* klinkstatus: link checker
* kommander: visual dialog building tool
* kxsldbg: xslt Debugger
* quanta+: web development
%files
##########
%package -n trinity-quanta
Summary: web development environment for KDE [Trinity]
Group: Applications/Development
Requires: trinity-kfilereplace = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release}
Requires: trinity-kommander = %{version}-%{release}
Requires: trinity-quanta-data = %{version}-%{release}
#Requires: trinity-kimagemapeditor = %{version}-%{release}
#Requires: trinity-kxsldbg = %{version}-%{release}
Requires: tidy
%description -n trinity-quanta
Quanta Plus is a web development environment for working with HTML
and associated languages. It strives to be neutral and transparent
to all markup languages, while supporting popular web-based scripting
languages, CSS and other emerging W3C recommendations.
Quanta Plus supports many external components, debuggers and other tools
for web development, several of which are shipped with the KDE web
development module.
Quanta Plus is not in any way affiliated with any commercial versions
of Quanta. The primary coders from the original team left the GPL'd
version to produce a commercial product.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-quanta
%defattr(-,root,root,-)
%{tde_bindir}/quanta
%{tde_tdelibdir}/quantadebuggerdbgp.la
%{tde_tdelibdir}/quantadebuggerdbgp.so
%{tde_tdelibdir}/quantadebuggergubed.la
%{tde_tdelibdir}/quantadebuggergubed.so
%{tde_tdeappdir}/quanta.desktop
%{tde_datadir}/apps/kafkapart
%{tde_datadir}/icons/hicolor/*/apps/quanta.png
%{tde_datadir}/mimelnk/application/x-webprj.desktop
%{tde_datadir}/services/quantadebuggerdbgp.desktop
%{tde_datadir}/services/quantadebuggergubed.desktop
%{tde_datadir}/services/quanta_preview_config.desktop
%{tde_datadir}/servicetypes/quantadebugger.desktop
%{tde_tdedocdir}/HTML/en/quanta/
%post -n trinity-quanta
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-quanta
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-quanta-data
Summary: data files for Quanta Plus web development environment [Trinity]
Group: Applications/Development
%description -n trinity-quanta-data
This package contains architecture-independent data files for Quanta
Plus, a web development environment for working with HTML and associated
languages.
See the quanta package for further information.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-quanta-data
%defattr(-,root,root,-)
%{tde_datadir}/apps/quanta/
##########
%package -n trinity-kfilereplace
Summary: batch search-and-replace component for KDE [Trinity]
Group: Applications/Development
%description -n trinity-kfilereplace
KFileReplace is an embedded component for KDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with
another in many files at once.
Note that at the moment KFileReplace does not come as a standalone
application. An example of an application that uses the KFileReplace
component is Quanta Plus (found in the package quanta).
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kfilereplace
%defattr(-,root,root,-)
%{tde_bindir}/kfilereplace
%{tde_tdelibdir}/libkfilereplacepart.la
%{tde_tdelibdir}/libkfilereplacepart.so
%{tde_tdeappdir}/kfilereplace.desktop
%{tde_datadir}/apps/kfilereplace/kfilereplaceui.rc
%{tde_datadir}/apps/kfilereplacepart
%{tde_datadir}/icons/hicolor/*/apps/kfilereplace.png
%{tde_datadir}/services/kfilereplacepart.desktop
%{tde_tdedocdir}/HTML/en/kfilereplace/
%post -n trinity-kfilereplace
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kfilereplace
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kimagemapeditor
Summary: HTML image map editor for KDE [Trinity]
Group: Applications/Development
%description -n trinity-kimagemapeditor
KImageMapEditor is a tool that allows you to edit image maps in HTML
files. As well as providing a standalone application, KImageMapEditor
makes itself available as a KPart for embedding into larger applications.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kimagemapeditor
%defattr(-,root,root,-)
%{tde_bindir}/kimagemapeditor
%{tde_tdelibdir}/libkimagemapeditor.la
%{tde_tdelibdir}/libkimagemapeditor.so
%{tde_tdeappdir}/kimagemapeditor.desktop
%{tde_datadir}/apps/kimagemapeditor/
%{tde_datadir}/icons/hicolor/*/apps/kimagemapeditor.png
%{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png
%{tde_datadir}/services/kimagemapeditorpart.desktop
%post -n trinity-kimagemapeditor
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kimagemapeditor
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-klinkstatus
Summary: web link validity checker for KDE [Trinity]
Group: Applications/Development
%description -n trinity-klinkstatus
KLinkStatus is KDE's web link validity checker. It allows you to
search internal and external links throughout your web site. Simply
point it to a single page and choose the depth to search.
You can also check local files, or files over ftp:, fish: or any other
KIO protocols. For performance, links can be checked simultaneously.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-klinkstatus
%defattr(-,root,root,-)
%{tde_bindir}/klinkstatus
%{tde_tdelibdir}/libklinkstatuspart.la
%{tde_tdelibdir}/libklinkstatuspart.so
%{tde_tdeappdir}/klinkstatus.desktop
%{tde_datadir}/apps/klinkstatus/
%{tde_datadir}/apps/klinkstatuspart/
%{tde_datadir}/config.kcfg/klinkstatus.kcfg
%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png
%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
%{tde_datadir}/services/klinkstatus_part.desktop
%{tde_tdedocdir}/HTML/en/klinkstatus/
%post -n trinity-klinkstatus
for f in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-klinkstatus
for f in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kommander
Summary: visual dialog builder and executor tool [Trinity]
Group: Applications/Development
Requires: gettext
%description -n trinity-kommander
Kommander is a visual dialog building tool whose primary objective is
to create as much functionality as possible without using any scripting
language.
More specifically, Kommander is a set of tools that allow you to create
dynamic GUI dialogs that generate, based on their state, a piece of
text. The piece of text can be a command line to a program, any piece
of code, business documents that contain a lot of repetitious or
templated text and so on.
The resulting generated text can then be executed as a command line
program (hence the name "Kommander"), written to a file, passed to a
script for extended processing, and literally anything else you can
think of. And you aren't required to write a single line of code!
As well as building dialogs, Kommander may be expanded to create full
mainwindow applications.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kommander
%defattr(-,root,root,-)
%{tde_bindir}/kmdr-editor
%{tde_bindir}/kmdr-executor
%{tde_bindir}/kmdr-plugins
%{tde_libdir}/libkommanderplugin.so.*
%{tde_libdir}/libkommanderwidgets.la
%{tde_libdir}/libkommanderwidget.so.*
%{tde_libdir}/libkommanderwidgets.so.*
%{tde_tdeappdir}/kmdr-editor.desktop
%{tde_datadir}/applnk/.hidden/kmdr-executor.desktop
%{tde_datadir}/apps/katepart/syntax/kommander.xml
%{tde_datadir}/apps/kommander/pics/kommandersplash.png
%{tde_tdedocdir}/HTML/en/kommander/
%{tde_datadir}/icons/crystalsvg/*/apps/kommander.png
%{tde_datadir}/mimelnk/application/x-kommander.desktop
#kommander/examples /opt/trinity/share/doc/kommander
#kommander/working/extractkmdr /opt/trinity/bin
#kommander/working/kmdr2po /opt/trinity/bin
%{tde_tdelibdir}/libkommander_part.so
%{tde_tdelibdir}/libkommander_part.la
%{tde_datadir}/apps/kommander/
%{tde_datadir}/apps/kmdr-editor/editor/
%{tde_datadir}/apps/katepart/syntax/kommander-new.xml
%{tde_datadir}/apps/kdevappwizard/kommanderplugin.png
%{tde_datadir}/apps/kdevappwizard/kommanderplugin.tar.gz
%{tde_datadir}/apps/kdevappwizard/templates/kommanderplugin.kdevtemplate
%{tde_datadir}/services/kommander_part.desktop
%post -n trinity-kommander
/sbin/ldconfig || :
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kommander
/sbin/ldconfig || :
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kommander-devel
Summary: development files for Kommander [Trinity]
Group: Development/Libraries
Requires: trinity-kommander = %{version}-%{release}
%description -n trinity-kommander-devel
This package contains the headers and other development files for
building plugins or otherwise extending Kommander.
Kommander is a visual dialog building tool whose primary objective is
to create as much functionality as possible without using any scripting
language.
See the kommander package for further information.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kommander-devel
%defattr(-,root,root,-)
%{tde_libdir}/libkommanderplugin.la
%{tde_libdir}/libkommanderplugin.so
%{tde_libdir}/libkommanderwidget.la
%{tde_libdir}/libkommanderwidget.so
%{tde_libdir}/libkommanderwidgets.so
%{tde_tdeincludedir}/kommander*
%{tde_tdeincludedir}/specials.h
%post -n trinity-kommander-devel
/sbin/ldconfig || :
%postun -n trinity-kommander-devel
/sbin/ldconfig || :
##########
%package -n trinity-kxsldbg
Summary: graphical XSLT debugger for KDE [Trinity]
Group: Applications/Development
%description -n trinity-kxsldbg
KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
interface as well as a text-based debugger. KXSLDbg can be run as a
standalone application or as an embedded KDE part.
XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
using standard XSLT stylesheets.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kxsldbg
%defattr(-,root,root,-)
%{tde_bindir}/kxsldbg
%{tde_bindir}/xsldbg
%{tde_tdelibdir}/libkxsldbgpart.la
%{tde_tdelibdir}/libkxsldbgpart.so
%{tde_tdeappdir}/kxsldbg.desktop
%{tde_datadir}/apps/kxsldbg
%{tde_datadir}/apps/kxsldbgpart
%{tde_tdedocdir}/HTML/en/kxsldbg/
%{tde_tdedocdir}/HTML/en/xsldbg/
%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
%{tde_datadir}/icons/hicolor/*/actions/configure.png
%{tde_datadir}/icons/hicolor/*/actions/exit.png
%{tde_datadir}/icons/hicolor/*/actions/hash.png
%{tde_datadir}/icons/hicolor/*/actions/mark.png
%{tde_datadir}/icons/hicolor/*/actions/next.png
%{tde_datadir}/icons/hicolor/*/actions/run.png
%{tde_datadir}/icons/hicolor/*/actions/step.png
%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png
%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png
%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
%{tde_datadir}/services/kxsldbg_part.desktop
%post -n trinity-kxsldbg
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kxsldbg
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package devel
Group: Development/Libraries
Summary: Header files and documentation for %{name}
Obsoletes: trinity-kdewebdev-devel < %{version}-%{release}
Provides: trinity-kdewebdev-devel = %{version}-%{release}
Requires: trinity-tdelibs-devel
Requires: trinity-kommander-devel = %{version}-%{release}
%description devel
%{summary}.
%files devel
##########
%if 0%{?suse_version}
%debug_package
%endif
##########
%prep
%setup -q -a 1 -a 2 -a 3 -a 4 -n kdewebdev-3.5.13.1
%patch0 -p0 -b .javascript
%patch1 -p1 -b .kxsldbg-icons
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__make -f "admin/Makefile.common"
%__install -m644 -p %{SOURCE5} kxsldbg/
%build
unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Do not build against any "/usr" installed KDE
export KDEDIR=%{tde_prefix}
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--enable-new-ldflags \
--enable-closure \
--disable-debug --disable-warnings \
--disable-dependancy-tracking --enable-final \
--with-extra-includes=%{tde_includedir}/tqt \
# WTF hack for RHEL4
%if 0%{?rhel} == 4
mkdir kommander/plugin/.libs/
ln -s . kommander/plugin/.libs/.libs
%endif
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot}
## package separately? Why doesn't upstream include this? -- Rex
# install docs
for i in css html javascript ; do
pushd $i
./install.sh <<EOF
%{buildroot}%{tde_datadir}/apps/quanta/doc
EOF
popd
rm -rf $i
done
cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
# make symlinks relative
pushd %{buildroot}%{tde_tdedocdir}/HTML/en
for i in *; do
if [ -d $i -a -L $i/common ]; then
rm -f $i/common
ln -nfs ../common $i
fi
done
popd
%clean
%__rm -rf %{buildroot}
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -0,0 +1,166 @@
# Default version for this component
%define kdecomp libkdcraw
# 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 3.5.13 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 tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Raw picture decoding C++ library (runtime) [Trinity]
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2+
Group: Environment/Libraries
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: %{kdecomp}-3.5.13.1.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: desktop-file-utils
%if 0%{?suse_version}
BuildRequires: liblcms-devel
%else
BuildRequires: lcms-devel
%endif
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
BuildRequires: automake autoconf libtool
BuildRequires: gettext
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%else
BuildRequires: libtool-ltdl-devel
%endif
%description
C++ interface around dcraw binary program used to decode RAW
picture files.
This library is used by kipi-plugins, digiKam and others kipi host programs.
libkdcraw contains the library of libkdcraw.
%package devel
Group: Development/Libraries
Summary: RAW picture decoding C++ library (development) [Trinity]
Requires: %{name} = %{version}
%description devel
Libkdcraw is a C++ interface around dcraw binary program used to
decode Raw picture files.
libkdcraw-devel contains development files and documentation. The
library documentation is available on kdcraw.h header file.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean
%__rm -rf %{buildroot}
%post
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
/sbin/ldconfig || :
%postun
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
/sbin/ldconfig || :
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%{tde_libdir}/libkdcraw.so.4
%{tde_libdir}/libkdcraw.so.4.0.3
%{tde_datadir}/icons/hicolor/*/apps/kdcraw.png
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/libkdcraw.so
%{tde_libdir}/libkdcraw.la
%{tde_tdeincludedir}/libkdcraw/
%{tde_libdir}/pkgconfig/libkdcraw.pc
%Changelog
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial release for TDE 3.5.13.1

@ -0,0 +1,150 @@
# Default version for this component
%define kdecomp libkexiv2
# 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 3.5.13 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 tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Qt like interface for the libexiv2 library (runtime) [Trinity]
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2+
Group: Environment/Libraries
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: %{kdecomp}-3.5.13.1.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: automake autoconf libtool
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}exiv2-devel
BuildRequires: %{_lib}ltdl-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: exiv2-devel
BuildRequires: libtool-ltdl-devel
%endif
%if 0%{?suse_version}
BuildRequires: libexiv2-devel
BuildRequires: libtool-ltdl-devel
%endif
%description
libkexif2 contains the library of libkexiv2.
Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
%package devel
Group: Development/Libraries
Summary: Qt like interface for the libexiv2 library (development) [Trinity]
Requires: %{name} = %{version}
%description devel
libkexif2-devel contains development files and documentation for libkexiv2
library. The library documentation is available on kexiv2.h header file.
Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%clean
%__rm -rf %{buildroot}
%post
/sbin/ldconfig || :
%postun
/sbin/ldconfig || :
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files
%defattr(-,root,root,-)
%{tde_libdir}/libkexiv2.so.*
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/libkexiv2.so
%{tde_libdir}/libkexiv2.la
%{tde_tdeincludedir}/libkexiv2/
%{tde_libdir}/pkgconfig/libkexiv2.pc
%Changelog
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial release for TDE 3.5.13.1

@ -0,0 +1,172 @@
# Default version for this component
%define kdecomp libkipi
# 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 3.5.13 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 tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity]
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
License: GPLv2+
Group: Environment/Libraries
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: %{kdecomp}-3.5.13.1.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: desktop-file-utils
%if 0%{?suse_version}
BuildRequires: liblcms-devel
%else
BuildRequires: lcms-devel
%endif
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
BuildRequires: automake autoconf libtool
BuildRequires: gettext
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%else
BuildRequires: libtool-ltdl-devel
%endif
%description
Libkipi is a library
o that contains common routines and widget used by kipi-plugins
o to ease implementation of the kipi-plugins interface in an application
that wants to use kipi-plugins
Homepage: http://www.kipi-plugins.org/
%package devel
Group: Development/Libraries
Summary: library for apps that want to use kipi-plugins (development version) [Trinity]
Requires: %{name} = %{version}
%description devel
Libkipi is a library
o that contains common routines and widget used by kipi-plugins
o to ease implementation of the kipi-plugins interface in an application
that wants to use kipi-plugins
This package contains development files and documentation for libkipi library.
Homepage: http://www.kipi-plugins.org/
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean
%__rm -rf %{buildroot}
%post
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
/sbin/ldconfig || :
%postun
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
/sbin/ldconfig || :
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%{tde_libdir}/libkipi.so.0
%{tde_libdir}/libkipi.so.0.1.1
%{tde_datadir}/apps/kipi/
%{tde_datadir}/icons/hicolor/*/apps/kipi.png
%{tde_datadir}/servicetypes/kipiplugin.desktop
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/libkipi.so
%{tde_libdir}/libkipi.la
%{tde_tdeincludedir}/libkipi/
%{tde_libdir}/pkgconfig/libkipi.pc
%Changelog
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial release for TDE 3.5.13.1

@ -0,0 +1,442 @@
# Default version for this component
%define kdecomp libksquirrel
# 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 3.5.13 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 tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Trinity image viewer
Version: 0.8.0
Release: 2%{?dist}%{?_variant}
License: GPLv2+
Group: Environment/Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.1.tar.gz
Patch0: libksquirrel-3.5.13-detect_netpbm.patch
Patch1: libksquirrel-3.5.13-fix_docdir.patch
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
BuildRequires: trinity-arts-devel >= 3.5.13.1
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gettext-devel
BuildRequires: transfig
BuildRequires: djvulibre
# XMEDCON support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xmedcon 1
BuildRequires: xmedcon
BuildRequires: xmedcon-devel
%endif
# RSVG support
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: librsvg2
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: librsvg
%endif
%if 0%{?suse_version}
BuildRequires: rsvg-view
BuildRequires: librsvg-devel
%endif
BuildRequires: libwmf-devel
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: netpbm
%else
BuildRequires: netpbm-progs
%endif
%description
Runtime libraries for KSquirrel.
%package devel
Group: Development/Libraries
Summary: Trinity image viewer
Requires: %{name}
%description devel
Development libraries for KSquirrel.
%package tools
Summary: Trinity image viewer
Group: Environment/Libraries
Requires: %{name}
%description tools
Tools for KSquirrel.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
%patch0 -p1
%patch1 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_includedir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt \
--enable-djvu
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%clean
%__rm -rf %{buildroot}
%post
/sbin/ldconfig || :
%postun
/sbin/ldconfig || :
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LICENSE README
%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0
%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0
%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0
%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0
%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0
%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0.8.0
%if 0%{?with_xmedcon}
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0.8.0
%endif
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0
%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0
%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0
%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0
%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0
%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0
%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0
%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0
%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0
%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0
%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_png.so.0
%{tde_libdir}/ksquirrel-libs/libkls_png.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0
%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0
%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0
%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0
%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0
%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0
%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0
%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0
%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0
%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0
%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0
%{tde_libdir}/libksquirrel-libs-png.so.0
%{tde_libdir}/libksquirrel-libs-png.so.0.0.0
%{tde_libdir}/libksquirrel-libs.so.0
%{tde_libdir}/libksquirrel-libs.so.0.8.0
%{tde_datadir}/ksquirrel-libs/libkls_camera.so.ui
%{tde_datadir}/ksquirrel-libs/libkls_djvu.so.ui
%{tde_datadir}/ksquirrel-libs/libkls_svg.so.ui
%{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
%{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
%{tde_datadir}/ksquirrel-libs/rgbmap
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/ksquirrel-libs/error.h
%{tde_includedir}/ksquirrel-libs/fileio.h
%{tde_includedir}/ksquirrel-libs/fmt_codec_base.h
%{tde_includedir}/ksquirrel-libs/fmt_defs.h
%{tde_includedir}/ksquirrel-libs/fmt_types.h
%{tde_includedir}/ksquirrel-libs/fmt_utils.h
%{tde_includedir}/ksquirrel-libs/settings.h
%{tde_libdir}/ksquirrel-libs/libkls_avs.la
%{tde_libdir}/ksquirrel-libs/libkls_avs.so
%{tde_libdir}/ksquirrel-libs/libkls_bmp.la
%{tde_libdir}/ksquirrel-libs/libkls_bmp.so
%{tde_libdir}/ksquirrel-libs/libkls_camera.la
%{tde_libdir}/ksquirrel-libs/libkls_camera.so
%{tde_libdir}/ksquirrel-libs/libkls_cut.la
%{tde_libdir}/ksquirrel-libs/libkls_cut.so
%{tde_libdir}/ksquirrel-libs/libkls_dds.la
%{tde_libdir}/ksquirrel-libs/libkls_dds.so
%if 0%{?with_xmedcon}
%{tde_libdir}/ksquirrel-libs/libkls_dicom.la
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so
%endif
%{tde_libdir}/ksquirrel-libs/libkls_djvu.la
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so
%{tde_libdir}/ksquirrel-libs/libkls_eps.la
%{tde_libdir}/ksquirrel-libs/libkls_eps.so
%{tde_libdir}/ksquirrel-libs/libkls_fig.la
%{tde_libdir}/ksquirrel-libs/libkls_fig.so
%{tde_libdir}/ksquirrel-libs/libkls_fli.la
%{tde_libdir}/ksquirrel-libs/libkls_fli.so
%{tde_libdir}/ksquirrel-libs/libkls_gif.la
%{tde_libdir}/ksquirrel-libs/libkls_gif.so
%{tde_libdir}/ksquirrel-libs/libkls_hdr.la
%{tde_libdir}/ksquirrel-libs/libkls_hdr.so
%{tde_libdir}/ksquirrel-libs/libkls_ico.la
%{tde_libdir}/ksquirrel-libs/libkls_ico.so
%{tde_libdir}/ksquirrel-libs/libkls_iff.la
%{tde_libdir}/ksquirrel-libs/libkls_iff.so
%{tde_libdir}/ksquirrel-libs/libkls_jbig.la
%{tde_libdir}/ksquirrel-libs/libkls_jbig.so
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.la
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.la
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so
%{tde_libdir}/ksquirrel-libs/libkls_koala.la
%{tde_libdir}/ksquirrel-libs/libkls_koala.so
%{tde_libdir}/ksquirrel-libs/libkls_leaf.la
%{tde_libdir}/ksquirrel-libs/libkls_leaf.so
%{tde_libdir}/ksquirrel-libs/libkls_lif.la
%{tde_libdir}/ksquirrel-libs/libkls_lif.so
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.la
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so
%{tde_libdir}/ksquirrel-libs/libkls_mac.la
%{tde_libdir}/ksquirrel-libs/libkls_mac.so
%{tde_libdir}/ksquirrel-libs/libkls_mdl.la
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so
%{tde_libdir}/ksquirrel-libs/libkls_mng.la
%{tde_libdir}/ksquirrel-libs/libkls_mng.so
%{tde_libdir}/ksquirrel-libs/libkls_mtv.la
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so
%{tde_libdir}/ksquirrel-libs/libkls_neo.la
%{tde_libdir}/ksquirrel-libs/libkls_neo.so
%{tde_libdir}/ksquirrel-libs/libkls_openexr.la
%{tde_libdir}/ksquirrel-libs/libkls_openexr.so
%{tde_libdir}/ksquirrel-libs/libkls_pcx.la
%{tde_libdir}/ksquirrel-libs/libkls_pcx.so
%{tde_libdir}/ksquirrel-libs/libkls_pi1.la
%{tde_libdir}/ksquirrel-libs/libkls_pi1.so
%{tde_libdir}/ksquirrel-libs/libkls_pi3.la
%{tde_libdir}/ksquirrel-libs/libkls_pi3.so
%{tde_libdir}/ksquirrel-libs/libkls_pix.la
%{tde_libdir}/ksquirrel-libs/libkls_pix.so
%{tde_libdir}/ksquirrel-libs/libkls_png.la
%{tde_libdir}/ksquirrel-libs/libkls_png.so
%{tde_libdir}/ksquirrel-libs/libkls_pnm.la
%{tde_libdir}/ksquirrel-libs/libkls_pnm.so
%{tde_libdir}/ksquirrel-libs/libkls_psd.la
%{tde_libdir}/ksquirrel-libs/libkls_psd.so
%{tde_libdir}/ksquirrel-libs/libkls_psp.la
%{tde_libdir}/ksquirrel-libs/libkls_psp.so
%{tde_libdir}/ksquirrel-libs/libkls_pxr.la
%{tde_libdir}/ksquirrel-libs/libkls_pxr.so
%{tde_libdir}/ksquirrel-libs/libkls_ras.la
%{tde_libdir}/ksquirrel-libs/libkls_ras.so
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.la
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so
%{tde_libdir}/ksquirrel-libs/libkls_sct.la
%{tde_libdir}/ksquirrel-libs/libkls_sct.so
%{tde_libdir}/ksquirrel-libs/libkls_sgi.la
%{tde_libdir}/ksquirrel-libs/libkls_sgi.so
%{tde_libdir}/ksquirrel-libs/libkls_sun.la
%{tde_libdir}/ksquirrel-libs/libkls_sun.so
%{tde_libdir}/ksquirrel-libs/libkls_svg.la
%{tde_libdir}/ksquirrel-libs/libkls_svg.so
%{tde_libdir}/ksquirrel-libs/libkls_tga.la
%{tde_libdir}/ksquirrel-libs/libkls_tga.so
%{tde_libdir}/ksquirrel-libs/libkls_tiff.la
%{tde_libdir}/ksquirrel-libs/libkls_tiff.so
%{tde_libdir}/ksquirrel-libs/libkls_ttf.la
%{tde_libdir}/ksquirrel-libs/libkls_ttf.so
%{tde_libdir}/ksquirrel-libs/libkls_utah.la
%{tde_libdir}/ksquirrel-libs/libkls_utah.so
%{tde_libdir}/ksquirrel-libs/libkls_wal.la
%{tde_libdir}/ksquirrel-libs/libkls_wal.so
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.la
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so
%{tde_libdir}/ksquirrel-libs/libkls_wmf.la
%{tde_libdir}/ksquirrel-libs/libkls_wmf.so
%{tde_libdir}/ksquirrel-libs/libkls_xbm.la
%{tde_libdir}/ksquirrel-libs/libkls_xbm.so
%{tde_libdir}/ksquirrel-libs/libkls_xcf.la
%{tde_libdir}/ksquirrel-libs/libkls_xcf.so
%{tde_libdir}/ksquirrel-libs/libkls_xcur.la
%{tde_libdir}/ksquirrel-libs/libkls_xcur.so
%{tde_libdir}/ksquirrel-libs/libkls_xim.la
%{tde_libdir}/ksquirrel-libs/libkls_xim.so
%{tde_libdir}/ksquirrel-libs/libkls_xpm.la
%{tde_libdir}/ksquirrel-libs/libkls_xpm.so
%{tde_libdir}/ksquirrel-libs/libkls_xwd.la
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so
%{tde_libdir}/libksquirrel-libs-png.la
%{tde_libdir}/libksquirrel-libs-png.so
%{tde_libdir}/libksquirrel-libs.la
%{tde_libdir}/libksquirrel-libs.so
%{tde_libdir}/pkgconfig/ksquirrellibs.pc
%{tde_docdir}/ksquirrel-libs/
%files tools
%defattr(-,root,root,-)
%{tde_bindir}/ksquirrel-libs-camera2ppm
%{tde_bindir}/ksquirrel-libs-dcraw
%if 0%{?with_xmedcon}
%{tde_bindir}/ksquirrel-libs-dicom2png
%endif
%{tde_bindir}/ksquirrel-libs-fig2ppm
%{tde_bindir}/ksquirrel-libs-iff2ppm
%{tde_bindir}/ksquirrel-libs-leaf2ppm
%{tde_bindir}/ksquirrel-libs-ljpeg2ppm
%{tde_bindir}/ksquirrel-libs-ljpeg2ppm-s
%{tde_bindir}/ksquirrel-libs-mac2ppm
%{tde_bindir}/ksquirrel-libs-neo2ppm
%{tde_bindir}/ksquirrel-libs-pi12ppm
%{tde_bindir}/ksquirrel-libs-pi32ppm
%{tde_bindir}/ksquirrel-libs-svg2png
%{tde_bindir}/ksquirrel-libs-ttf2pnm
%{tde_bindir}/ksquirrel-libs-utah2ppm
%{tde_bindir}/ksquirrel-libs-xcf2pnm
%{tde_bindir}/ksquirrel-libs-xim2ppm
%Changelog
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0-2
- Initial release for TDE 3.5.13.1

@ -0,0 +1,11 @@
--- pykdeextensions/src/kdedistutils.py.ORI 2012-08-27 22:10:18.873738368 +0200
+++ pykdeextensions/src/kdedistutils.py 2012-08-27 22:10:50.234094262 +0200
@@ -539,7 +539,7 @@
canidatepaths.append(os.path.join(kdedir,"include"))
canidatepaths.append(os.path.join(install.prefix,"include"))
canidatepaths.append('/opt/trinity/include')
- canidatepaths.append('/opt/kde/include')
+ canidatepaths.append('/opt/trinity/include/kde')
self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths)
if self.kde_inc_dir is None:
raise SystemExit, "Failed to find the KDE header file directory."

@ -0,0 +1,18 @@
--- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule 2012-09-08 17:33:05.000000000 +0000
+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2012-10-02 19:19:40.185384207 +0000
@@ -712,6 +712,7 @@
# Build the 'stub' code.
cppcode = self.cpptemplate % {"moduledir": self.data_dir,
+ "extramodule": os.getenv("EXTRA_MODULE_DIR"),
"modulename": modulename,
"factoryfunction": factoryfunction,
"python_version": python_version}
@@ -854,6 +855,7 @@
#include <sip.h>
#define MODULE_DIR "%(moduledir)s"
+#define EXTRA_MODULE_DIR "%(extramodule)s"
#define MODULE_NAME "%(modulename)s"
#define FACTORY "%(factoryfunction)s"
#define CPP_FACTORY %(factoryfunction)s

@ -0,0 +1,62 @@
--- pykdeextensions-3.5.13.1/setup.py.libgcc 2012-09-08 11:59:03.000000000 +0200
+++ pykdeextensions-3.5.13.1/setup.py 2012-10-06 12:52:03.768762713 +0200
@@ -126,7 +126,7 @@
# Find the C library (libgcc, libgcc_s or some other variation).
if self.clib is None:
- canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name() ]
+ canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name(), "/usr/lib" ]
self.clib = kdedistutils.FindFileInPaths("libgcc*.so",canidatepaths)
if self.clib!=None:
self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
--- pykdeextensions-3.5.13.1/src/kdedistutils.py.libgcc 2012-10-06 13:29:31.920413352 +0200
+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2012-10-06 13:31:23.440538658 +0200
@@ -564,6 +564,9 @@
# Qt inc dir
if self.qt_inc_dir is None:
canidatepaths = []
+ qtinc = os.getenv("QTINC")
+ if qtinc != None:
+ canidatepaths.append(qtinc)
qtdir = os.getenv("QTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,"include"))
@@ -585,6 +588,9 @@
# Qt lib dir
if self.qt_lib_dir is None:
canidatepaths = []
+ qtlib = os.getenv("QTLIB")
+ if qtlib != None:
+ canidatepaths.append(qtlib)
qtdir = os.getenv("QTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
@@ -634,7 +640,7 @@
# Find the C library (libgcc, libgcc_s or some other variation).
if self.clib is None:
- canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ]
+ canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ]
self.clib = FindFileInPaths("libgcc*.so",canidatepaths)
if self.clib!=None:
self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
@@ -1481,6 +1487,9 @@
# Qt inc dir
if self.qt_inc_dir is None:
canidatepaths = []
+ qtinc = os.getenv("QTINC")
+ if qtinc != None:
+ canidatepaths.append(qtinc)
qtdir = os.getenv("QTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,"include"))
@@ -1501,6 +1510,9 @@
# Qt lib dir
if self.qt_lib_dir is None:
canidatepaths = []
+ qtlib = os.getenv("QTLIB")
+ if qtlib != None:
+ canidatepaths.append(qtlib)
qtdir = os.getenv("QTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))

@ -0,0 +1,209 @@
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# 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 3.5.13 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 tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-pytdeextensions
Summary: Python packages to support TDE applications (scripts) [Trinity]
Version: 0.4.0
Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.simonzone.com/software/pykdeextensions
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: pykdeextensions-3.5.13.1.tar.gz
# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
Patch2: pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
# [pykdeextensions] Fix include directory search location
Patch5: pykdeextensions-3.5.13-fix_include_dir.patch
# [pykdeextensions] Fix 'libgcc' search location
Patch6: pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
BuildRequires: trinity-arts-devel >= 3.5.13.1
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: python-trinity-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: python-qt
%else
%if 0%{?rhel} == 5 || 0%{?suse_version}
BuildRequires: trinity-PyQt-devel
%else
BuildRequires: PyQt-devel
%endif
%endif
Requires: trinity-libpythonize0 = %{version}-%{release}
Obsoletes: trinity-pykdeextensions < %{version}-%{release}
Provides: trinity-pykdeextensions = %{version}-%{release}
%description
PyKDE Extensions is a collection of software and Python packages
to support the creation and installation of KDE applications.
%package -n trinity-libpythonize0
Summary: Python packages to support KDE applications (library) [Trinity]
Group: Environment/Libraries
%description -n trinity-libpythonize0
PyKDE Extensions is a collection of software and Python packages
to support the creation and installation of KDE applications.
This package contains the libpythonize library files.
%package -n trinity-libpythonize0-devel
Summary: Python packages to support KDE applications (development) [Trinity]
Group: Development/Libraries
Requires: trinity-libpythonize0 = %{version}-%{release}
%description -n trinity-libpythonize0-devel
PyKDE Extensions is a collection of software and Python packages
to support the creation and installation of KDE applications.
This package contains the libpythonize development files.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n pykdeextensions-3.5.13.1
%patch2 -p1 -b .extramodule
%patch5 -p1 -b .incdir
%patch6 -p1 -b .libgcc
# Changes library directory to 'lib64'
for f in src/*.py; do
%__sed -i "${f}" \
-e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \
-e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \
-e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
-e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
done
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
%__mkdir_p build
./setup.py build_libpythonize
%install
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
export PYTHONDONTWRITEBYTECODE=
%__rm -rf %{buildroot}
./setup.py install \
--root=%{buildroot} \
--prefix=%{tde_prefix} \
--install-clib=%{tde_libdir} \
--install-cheaders=%{tde_tdeincludedir}
# Removes BUILDROOT directory reference in installed files
for f in \
%{buildroot}%{tde_libdir}/libpythonize.la \
%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
%{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
; do
%__sed -i "${f}" -e "s|%{buildroot}||g"
:
done
# Moves PYTHON libraries to distribution directory
%__mkdir_p %{buildroot}%{python_sitearch}
%__mv -f %{buildroot}%{tde_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
%__rm -rf %{buildroot}%{tde_prefix}/lib/python*/site-packages
# Removes useless files
%__rm -rf %{?buildroot}%{tde_libdir}/*.a
# Fix permissions on include files
%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h
%clean
%__rm -rf %{buildroot}
%post -n trinity-libpythonize0
/sbin/ldconfig
%postun -n trinity-libpythonize0
/sbin/ldconfig
%post -n trinity-libpythonize0-devel
/sbin/ldconfig
%postun -n trinity-libpythonize0-devel
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{tde_datadir}/apps/pykdeextensions
%{tde_tdedocdir}/HTML/en/pykdeextensions
%{python_sitearch}/*
%files -n trinity-libpythonize0
%defattr(-,root,root,-)
%{tde_libdir}/libpythonize.so.*
%files -n trinity-libpythonize0-devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/*.h
%{tde_libdir}/libpythonize.la
%{tde_libdir}/libpythonize.so
%Changelog
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
- Initial release for TDE 3.5.13.1

@ -52,6 +52,8 @@ Patch2: pykdeextensions-3.5.13-fix_extra_module_dir.patch
Patch3: pykdeextensions-3.5.13-fix_libsuffix.patch Patch3: pykdeextensions-3.5.13-fix_libsuffix.patch
# [pykdeextensions] Do not link with stdc++ # [pykdeextensions] Do not link with stdc++
Patch4: pykdeextensions-3.5.13-do_not_link_stdc++.patch Patch4: pykdeextensions-3.5.13-do_not_link_stdc++.patch
# [pykdeextensions] Fix include directory search location
Patch5: pykdeextensions-3.5.13-fix_include_dir.patch
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdelibs-devel
@ -111,6 +113,7 @@ This package contains the libpythonize development files.
%patch2 -p1 -b .extramodule %patch2 -p1 -b .extramodule
%patch3 -p1 -b .libsuffix %patch3 -p1 -b .libsuffix
%patch4 -p1 -b .stdc++ %patch4 -p1 -b .stdc++
%patch5 -p1 -b .incdir
# Changes library directory to 'lib64' # Changes library directory to 'lib64'
for f in src/*.py; do for f in src/*.py; do

@ -0,0 +1,10 @@
--- python-trinity-3.5.13.1/configure.py.ORI 2012-10-02 19:01:51.164215802 +0000
+++ python-trinity-3.5.13.1/configure.py 2012-10-02 19:02:06.842913909 +0000
@@ -411,6 +411,7 @@
if not opt_kdeincdir:
incSearchPaths = [os.path.join (opt_kdebasedir, "include")]
incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat
+ incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # TDE 3.5.13.1
opt_kdeincdir = search ("kapplication.h", incSearchPaths)
def check_kde_installation():

@ -0,0 +1,183 @@
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# 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 3.5.13 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 tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
%define __arch_install_post %{nil}
Name: python-trinity
Summary: Trinity bindings for Python [Trinity]
Version: 3.16.3
Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.simonzone.com/software/pykdeextensions
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: python-trinity-3.5.13.1.tar.gz
## RHEL/Fedora patches
Patch1: python-trinity-3.5.13-install_directories.patch
# [python-trinity] Fix Mandrake detection function
Patch3: python-trinity-3.5.13-fix_mandrake_detection.patch
# [python-trinity] Add 'include/tde' include directory
Patch4: python-trinity-3.5.13.1-add_include_directory.patch
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
BuildRequires: trinity-arts-devel >= 3.5.13.1
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: python
%if 0%{?rhel} == 5
# RHEL 5 comes with old version, so we brought ours ...
BuildRequires: trinity-sip-devel
BuildRequires: trinity-PyQt-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: python-sip
BuildRequires: python-qt
%endif
%if 0%{?rhel} >= 6 || 0%{?fedora}
BuildRequires: sip-devel
BuildRequires: PyQt-devel
%endif
%if 0%{?suse_version}
BuildRequires: python-sip-devel
BuildRequires: trinity-PyQt-devel
%endif
%description
Python binding module that provides wide access to the Trinity API,
also known as PyKDE. Using this, you'll get (for example) classes
from kio, kjs, khtml and kprint.
%package devel
Summary: Trinity bindings for Python - Development files and scripts [Trinity]
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Development .sip files with definitions of PyKDE classes. They
are needed to build PyKDE, but also as building blocks of other
packages based on them.
The package also contains kdepyuic, a wrapper script around PyQt's
user interface compiler.
%package doc
Summary: Documentation and examples for PyKDE [Trinity]
Group: Development/Libraries
%description doc
General documentation and examples for PyKDE providing programming
tips and working code you can use to learn from.
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -q -n python-trinity-3.5.13.1
%patch1 -p1
%patch3 -p1
%patch4 -p1
# Hack to get TQT include files under /opt
%__sed -i "configure.py" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export LDFLAGS="${LDFLAGS} -lpython2.7"
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
%__python configure.py \
-k %{tde_prefix} \
-L %{_lib} \
-v %{_datadir}/sip/trinity
%if 0%{?mgaversion} || 0%{?mdkversion}
# Shitty hack to add LDFLAGS
%__sed -i */Makefile \
-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
%endif
%__make %{_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# Install documentation
%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitearch}/*.so
%{python_sitearch}/dcop*.py*
%{python_sitearch}/pykde*.py*
%files devel
%defattr(-,root,root,-)
%{tde_bindir}/kdepyuic
# The SIP files are outside TDE's prefix
%{_datadir}/sip/trinity/
%files doc
%defattr(-,root,root,-)
%{tde_tdedocdir}/HTML/en/python-trinity/
%Changelog
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-3
- Initial release for TDE 3.5.13.1

@ -80,6 +80,7 @@ from kio, kjs, khtml and kprint.
%package devel %package devel
Summary: Trinity bindings for Python - Development files and scripts [Trinity] Summary: Trinity bindings for Python - Development files and scripts [Trinity]
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel %description devel
Development .sip files with definitions of PyKDE classes. They Development .sip files with definitions of PyKDE classes. They
Loading…
Cancel
Save