From 508b91c3cece9b64fd257df69e4f3928c15ca518 Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Sun, 6 Nov 2011 11:27:32 -0500 Subject: [PATCH 01/18] added release kdebase --- .../trinity-base/trinity-kdebase/PKGBUILD | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 arch/release/trinity-base/trinity-kdebase/PKGBUILD diff --git a/arch/release/trinity-base/trinity-kdebase/PKGBUILD b/arch/release/trinity-base/trinity-kdebase/PKGBUILD new file mode 100644 index 000000000..e43079bdd --- /dev/null +++ b/arch/release/trinity-base/trinity-kdebase/PKGBUILD @@ -0,0 +1,131 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-kdebase +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity-base') +pkgdesc="Trinity - kdebase" +depends=('hal' 'trinity-dbus-1-qt3' 'trinity-arts' 'trinity-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1' 'trinity-dbus-tqt' 'trinity-kdelibs') +makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') +optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' + 'pciutils: PCI bus configuration space access library and tools' + 'xscreensaver: Screen saver and locker for the X Window System') +options=('libtool' '!strip') +source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff') +md5sums=('d1f7e1f94eeb46b981fe1ba144179840' + 'c9ce810c281002440a6de8cfd8735d07') + +_qtdir=/opt/qt +_prefix="/opt/trinity" + +_tdesktop() { + # create/install desktop + install -d -m755 ${pkgdir}/etc/X11/sessions + echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo "Exec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo "TryExec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop +} + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + [[ -n $QTDIR ]] && _qtdir=$QTDIR + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/trinity/include/dbus-1-tqt/:/opt/trinity/include/dbus-1.0/:/opt/trinity/include:/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/opt/qt/lib:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig:$PKG_CONFIG_PATH + echo $PKG_CONFIG_PATH + + patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < ${srcdir}/dbusfix.diff + cd $srcdir + + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/kdebase --debug-output \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DWITH_XFIXES=ON \ + -DWITH_HAL=ON \ + -DWITH_ARTS=ON \ + -DWITH_SASL=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_XCOMPOSITE=ON \ + -DWITH_XCURSOR=ON \ + -DWITH_XRANDR=ON \ + -DWITH_XRENDER=ON \ + -DWITH_XDAMAGE=ON \ + -DWITH_SHADOW=ON \ + -DWITH_XDMCP=ON \ + -DWITH_XINERAMA=ON \ + -DWITH_XEXT=ON \ + -DWITH_PAM=ON \ + -DBUILD_ALL=ON \ + -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0 + make +# -DWITH_QT3=ON \ +# -DQTDIR=/opt/qt \ +# -DQT_LIBRARY_DIRS=/opt/qt/lib \ +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + + cd ${startdir} + + # install desktop and update kdmrc and Xsession +# [[ -f trinity.desktop ]] && { +# install -d -m755 ${pkgdir}/etc/X11/sessions +# install -m644 trinity.desktop ${pkgdir}/etc/X11/sessions +# } + _tdesktop + [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop" + + # set kdm directory + _kdmdir=${_prefix}/share/config/kdm + [[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} + + # install kdmrc + [[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir} + + # update the Xsession file + [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir} + + # create the starttrinity link + [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin + cd ${pkgdir}/usr/bin + ln -sf /opt/trinity/bin/startkde starttrinity + + cd ${startdir} + +# rm -r ${srcdir}/${_svnmod} +} From db927c1b41d9456da788bfa27d9dc5be880a50df Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 9 Nov 2011 20:57:09 +0100 Subject: [PATCH 02/18] RHEL/Fedora: add Amarok --- .../amarok/amarok-1.4.8-gcc43.patch | 79 +++++ .../applications/amarok/trinity-amarok.spec | 302 ++++++++++++++++++ 2 files changed, 381 insertions(+) create mode 100644 redhat/applications/amarok/amarok-1.4.8-gcc43.patch create mode 100644 redhat/applications/amarok/trinity-amarok.spec diff --git a/redhat/applications/amarok/amarok-1.4.8-gcc43.patch b/redhat/applications/amarok/amarok-1.4.8-gcc43.patch new file mode 100644 index 000000000..8b0c78133 --- /dev/null +++ b/redhat/applications/amarok/amarok-1.4.8-gcc43.patch @@ -0,0 +1,79 @@ +diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp +--- amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600 ++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp 2008-02-21 21:05:18.000000000 -0600 +@@ -30,6 +30,7 @@ email : aumuell@reserv.at + #include + + #include ++#include + + #define MP4V2_HAS_WRITE_BUG 1 + +diff -up amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp +--- amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600 ++++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp 2008-02-21 21:05:18.000000000 -0600 +@@ -24,6 +24,7 @@ + + #include "taglib_mp4filetyperesolver.h" + #include "mp4file.h" ++#include + + TagLib::File *MP4FileTypeResolver::createFile(const char *fileName, + bool readProperties, +diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp +--- amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600 ++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp 2008-02-21 21:05:18.000000000 -0600 +@@ -24,6 +24,8 @@ email : andrew.leadbetter + + #include + #include ++#include ++#include + + using namespace TagLib; + +diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp +--- amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600 ++++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp 2008-02-21 21:05:18.000000000 -0600 +@@ -30,6 +30,7 @@ email : andrew.leadbetter + #endif + + #include ++#include + + #ifndef UINT64_TO_DOUBLE + #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a))) +diff -up amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp +--- amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 2007-12-17 09:53:18.000000000 -0600 ++++ amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp 2008-02-21 21:07:10.000000000 -0600 +@@ -15,6 +15,8 @@ + the alsa guys + ***************************************************************************/ + ++#include ++#include + #include + #include + #include +diff -up amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h +--- amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 2007-12-17 09:53:18.000000000 -0600 ++++ amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h 2008-02-21 21:07:54.000000000 -0600 +@@ -23,6 +23,7 @@ class HelixSimplePlayerAudioStreamInfoRe + #include + #include + #include ++#include + #include + #include + #include +diff -up amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp +--- amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 2007-12-17 09:53:18.000000000 -0600 ++++ amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp 2008-02-21 21:09:38.000000000 -0600 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec new file mode 100644 index 000000000..a181d1246 --- /dev/null +++ b/redhat/applications/amarok/trinity-amarok.spec @@ -0,0 +1,302 @@ +# If Trinity is built in a specific prefix, we move all directories under it +%if "%{_prefix}" != "/usr" +%define _variant .opt +%endif + +# Basic package informations +%define kdecomp amarok +%define version 1.4.10 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + + +# TODO: +# Rio Karma support : libkarma + +%if 0%{?fedora} > 0 && 0%{?fedora} < 9 +# define to include konquisidebar support for kde3 desktop +%define konq 1 +%endif + +# No Xine support on older RHEL +%if 0%{?rhel} && 0%{?rhel} <= 5 +%define _with_xine %{nil} +%else +%define _with_xine 1 +%endif + +Name: trinity-%{kdecomp} +Summary: A drop-down terminal emulator. +Version: %{version} +Release: %{release}%{?dist}%{?_variant} + +Group: Applications/Multimedia +License: GPLv2+ +Url: http://amarok.kde.org +Source0: amarok-3.5.13.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# RedHat / Fedora legacy patches +Patch1: amarok-1.4.8-gcc43.patch + +BuildRequires: alsa-lib-devel +BuildRequires: desktop-file-utils +BuildRequires: esound-devel +BuildRequires: gettext +BuildRequires: trinity-kdelibs-devel +%if 0%{?konq} +BuildRequires: trinity-kdebase-devel +%else +Obsoletes: %{name}-konqueror < %{version}-%{release} +%endif +BuildRequires: taglib-devel +BuildRequires: libifp-devel +# Ipod +BuildRequires: libgpod-devel +BuildRequires: libmp4v2-devel +# MTP players +BuildRequires: libmtp-devel +BuildRequires: libmusicbrainz-devel +# Creative Nomad Jukebox +BuildRequires: libnjb-devel +BuildRequires: libtool +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +BuildRequires: libtool-ltdl-devel +%endif +BuildRequires: libtunepimp-devel +BuildRequires: libusb-devel +BuildRequires: libvisual-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: ruby-devel ruby +BuildRequires: SDL-devel +BuildRequires: taglib-devel +BuildRequires: xine-lib-devel +BuildRequires: sqlite-devel +# not used anymore, in favor of libvisual ? -- Rex +#%{?fedora:BuildRequires: xmms-devel} +BuildRequires: dbus-devel +BuildRequires: dbus-tqt-devel + +# For dir ownership and some default plugins (lyrics), -ruby subpkg? -- Rex +Requires: ruby + +# To open the selected browser, works with Patch2 +Requires: xdg-utils +Requires(post): xdg-utils +Requires(postun): xdg-utils + +Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 + +Obsoletes: amarok-devel < %{version}-%{release} +%if 0%{?fedora} > 6 && 0%{?fedora} < 9 +# need to keep this around for previous releases, so not to break multilib compat. +Provides: amarok-devel = %{version}-%{release} +%endif + +# engines, etc... +# old, obsolete ones: arts, akode +Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 +%if 0%{?_with_xine} +# xine-lib +Provides: %{name}-engine-xine = %{version}-%{release} +%endif + + +%description +Amarok is a multimedia player with: + - fresh playlist concept, very fast to use, with drag and drop + - plays all formats supported by the various engines + - audio effects, like reverb and compressor + - compatible with the .m3u and .pls formats for playlists + - nice GUI, integrates into the KDE look, but with a unique touch + + +%package konqueror +Summary: Amarok konqueror (service menus, sidebar) support +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} +%description konqueror +%{summary}. + +%package visualisation +Summary: Visualisation plugins for Amarok +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} +# No plugins by default, we need libvisual-plugins +Requires: libvisual-plugins +%description visualisation +Amarok can use visualisation plugins from different origins. +Right now, only xmms is supported, which means that you can +use any of xmms' visualisation plugins with Amarok. + + +%prep +%setup -q -n applications/amarok +%patch1 -p1 -b .gcc43 + + +%build +unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" + +%__mkdir_p build +cd build +%cmake \ + -DWITH_LIBVISUAL=ON \ + -DWITH_KONQSIDEBAR=OFF \ + -DWITH_XINE=ON \ + -DWITH_YAUAP=ON \ + -DWITH_IPOD=ON \ + -DWITH_IFP=ON \ + -DWITH_NJB=ON \ + -DWITH_MTP=ON \ + -DWITH_RIOKARMA=OFF \ + -DWITH_DAAP=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + +%install +rm -fr $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT -C build + +# desktop files +desktop-file-install --vendor "" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop + +# unpackaged files +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +%if ! 0%{?konq} +rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/*.desktop +%endif + + +# HTML +for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + [ "$lang" == "en" ] && d=en/%{name} || d=$lang + echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang + fi +done + + +%post +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : + +%postun +/sbin/ldconfig +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : + + +%clean +rm -fr $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING AUTHORS ChangeLog README +%{_bindir}/amarok +%{_bindir}/amarokapp +%{_bindir}/amarokcollectionscanner +%{_bindir}/amarok_proxy.rb +%{_datadir}/apps/amarok/ +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/servicetypes/*.desktop +%{_datadir}/apps/profiles/amarok.profile.xml +%{_datadir}/config/amarokrc +%{_datadir}/config.kcfg/*.kcfg +%{_datadir}/services/amarokitpc.protocol +%{_datadir}/services/amaroklastfm.protocol +%{_datadir}/services/amarokpcast.protocol +# -libs ? -- Rex +%{_libdir}/libamarok.* +# -ruby ? -- Rex +%{_libdir}/ruby_lib/* +# DAAP +%{_bindir}/amarok_daapserver.rb +%{tde_libdir}/libamarok_daap-mediadevice.* +%{_datadir}/services/amarok_daap-mediadevice.desktop +# Mass-storage +%{_datadir}/services/amarok_massstorage-device.desktop +%{tde_libdir}/libamarok_massstorage-device.* +# NFS +%{_datadir}/services/amarok_nfs-device.desktop +%{tde_libdir}/libamarok_nfs-device.* +# SMB +%{_datadir}/services/amarok_smb-device.desktop +%{tde_libdir}/libamarok_smb-device.* +# IPod +%{_datadir}/services/amarok_ipod-mediadevice.desktop +%{tde_libdir}/libamarok_ipod-mediadevice.* +# VFAT +%{_datadir}/services/amarok_generic-mediadevice.desktop +%{tde_libdir}/libamarok_generic-mediadevice.* +# iRiver +%{_datadir}/services/amarok_ifp-mediadevice.desktop +%{tde_libdir}/libamarok_ifp-mediadevice.* +# Creative Zen +%{_datadir}/services/amarok_njb-mediadevice.desktop +%{tde_libdir}/libamarok_njb-mediadevice.* +# MTP players +%{_datadir}/services/amarok_mtp-mediadevice.desktop +%{tde_libdir}/libamarok_mtp-mediadevice.* +# Rio Karma +#%{_datadir}/services/amarok_riokarma-mediadevice.desktop +#%{tde_libdir}/libamarok_riokarma-mediadevice.* +# Void engine (noop) +%{_datadir}/services/amarok_void-engine_plugin.desktop +%{tde_libdir}/libamarok_void-engine_plugin.* +# Xine engine +%{_datadir}/services/amarok_xine-engine.desktop +%{tde_libdir}/libamarok_xine-engine.* +## Gstreamer engine +#%{_datadir}/services/amarok_gst10engine_plugin.desktop +#%{tde_libdir}/libamarok_gst10engine_plugin.* +# YAUAP +%{_datadir}/services/amarok_yauap-engine_plugin.desktop +%{tde_libdir}/libamarok_yauap-engine_plugin.* + + +%{tde_docdir}/HTML/*/amarok +%{_datadir}/locale/*/LC_MESSAGES/amarok.mo + +%if 0%{?konq} +%files konqueror +%defattr(-,root,root,-) +%{_datadir}/apps/konqueror/servicemenus/*.desktop +%{tde_libdir}/konqsidebar_universalamarok.* +%{_datadir}/apps/konqsidebartng/*/amarok.desktop +%endif + +%files visualisation +%defattr(-,root,root,-) +%{_bindir}/amarok_libvisual + + +%changelog +* Wed Nov 09 2011 Francois Andriot - 1.4.10-1 +- Initial build for TDE 3.5.13 on RHEL 5, RHEL 6, Fedora 15, Fedora 16 +- Spec file based on Fedora 8 'amarok-1.4.10-1' From d86c76de1cbdf3db15cefbf2c9c30de0d34889c1 Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 9 Nov 2011 20:57:28 +0100 Subject: [PATCH 03/18] RHEL/Fedora: some more updates --- redhat/components.txt | 6 ++++-- redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec | 10 ++++++++-- redhat/genrpm.sh | 4 +++- redhat/kdebase/trinity-kdebase-3.5.13.spec | 9 +++++++-- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/redhat/components.txt b/redhat/components.txt index 0fd13a935..1cd16cec1 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -5,7 +5,8 @@ dependencies/tqtinterface dependencies/dbus-tqt dependencies/arts trinity-desktop -trinity-settings +#trinity-settings +trinity-live kdelibs kdebase kdebindings @@ -39,7 +40,7 @@ applications/filelight applications/kdiff3 #applications/kuickshow #applications/basket -applications/katapult +#applications/katapult #compizconfig-backend-kconfig applications/kbookreader applications/kdbusnotification @@ -49,3 +50,4 @@ applications/kdesudo applications/digikam applications/konversation applications/ksensors +applications/amarok diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index 9a2be3b1e..670a6f9d5 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -31,9 +31,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: dbus-qt-devel +BuildRequires: dbus-devel BuildRequires: tqtinterface-devel +Provides: dbus-qt + %description Dbus TQT Interface @@ -42,6 +44,7 @@ Dbus TQT Interface Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries +Provides: dbus-qt-devel %description devel Development files for %{name} @@ -78,6 +81,9 @@ cd build %{_libdir}/pkgconfig/*.pc %changelog +* Tue Nov 07 2011 Francois Andriot - 3.5.13-2 +- Updates BuildRequires + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 25ea69be1..d54c88c21 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -43,9 +43,11 @@ if [ -z "${VERSION}" ]; then select VERSION in $*; do break; done elif [ -r "${COMP}/$1" ]; then VERSION="$1" + elif [ "${COMP}" = "trinity-live" ]; then + VERSION="3.5.13" else echo "No source tarball found for '${COMP}' !" - continue + exit 0 fi VERSION="${VERSION##${COMP##*/}-}" VERSION="${VERSION%%.tar.gz}" diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 967f8f3cf..ce45a86c4 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -59,6 +59,8 @@ Patch6: kdebase-3.5.12-halmountoptions.patch Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch # [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64 Patch8: kdebase-3.5.13-startkde_ldpreload.patch +# [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes +Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -180,7 +182,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch6 -p1 %patch7 -p1 %patch8 -p1 - +%patch9 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -519,6 +521,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Tue Nov 08 2011 Francois Andriot - 3.5.13-4 +- Fix FTBFS with dbus-tqt + * Thu Nov 03 2011 Francois Andriot - 3.5.13-3 - Add missing BuildRequires From cefaaec2e7a6c4f0d406bea1a00b1af88c8ae510 Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 9 Nov 2011 22:17:36 +0100 Subject: [PATCH 04/18] RHEL/Fedora: add Kaffeine --- .../kaffeine/trinity-kaffeine.spec | 187 ++++++++++++++++++ redhat/components.txt | 1 + 2 files changed, 188 insertions(+) create mode 100644 redhat/applications/kaffeine/trinity-kaffeine.spec diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec new file mode 100644 index 000000000..a9597a754 --- /dev/null +++ b/redhat/applications/kaffeine/trinity-kaffeine.spec @@ -0,0 +1,187 @@ +# Default version for this component +%define kdecomp kaffeine +%define version 0.8.6 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: sudo frontend for Trinity + +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Summary: Xine-based media player +Group: Applications/Multimedia +URL: http://kaffeine.sourceforge.net/ + +Source0: kaffeine-3.5.13.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gettext +BuildRequires: trinity-kdelibs-devel +BuildRequires: cdparanoia-devel cdparanoia +BuildRequires: libvorbis-devel +BuildRequires: xine-lib-devel +BuildRequires: libxcb-devel +BuildRequires: libXext-devel libXinerama-devel libXtst-devel +BuildRequires: libcdio-devel +# dvb +BuildRequires: glibc-kernheaders +BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10 + +Requires: %{name}-libs = %{version}-%{release} + +%description +Kaffeine is a xine-based media player for KDE. It plays back CDs, +and VCDs, and can decode all (local or streamed) multimedia formats +supported by xine-lib. +Additionally, Kaffeine is fully integrated in KDE, it supports drag +and drop and provides an editable playlist, a bookmark system, a +Konqueror plugin, OSD and much more. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: trinity-kdelibs-devel +%description devel +%{summary}. + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +# helps multilib upgrades +Obsoletes: %{name} < %{version}-%{release} +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + + +%prep +%setup -q -n applications/kaffeine + +# 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,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +# easier than patching, and using +# --with-extra-includes=%{_includedir}/cdda below -- Rex +#CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --disable-final \ + --with-gstreamer \ + --without-lame \ + --with-extra-includes=%{_includedir}/tqt + + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + +## File lists +# locale's +%find_lang %{kdecomp} +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then +for lang_dir in $RPM_BUILD_ROOT$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 + +# Unpackaged files +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database >& /dev/null ||: + +%postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database >& /dev/null ||: + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README TODO +%{_bindir}/kaffeine +%{_libdir}/libkaffeinepart.so +%{tde_libdir}/lib*.* +%{_datadir}/appl*/*/*.desktop +%{_datadir}/apps/gstreamerpart/ +%{_datadir}/apps/kaffeine/ +%{_datadir}/apps/konqueror/servicemenus/*.desktop +%{_datadir}/apps/profiles/ +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/service*/*.desktop +%{_docdir}/HTML/en/kaffeine + +%files libs +%defattr(-,root,root,-) +%{_libdir}/lib*.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/kaffeine/ +%{_libdir}/lib*.so +%exclude %{_libdir}/libkaffeinepart.so + + +%changelog +* Wed Nov 09 2011 Francois Andriot - 0.8.6-1 +- Spec file based on Fedora 8 'kaffeine-0.8.6-3' diff --git a/redhat/components.txt b/redhat/components.txt index 1cd16cec1..dfd59433e 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -51,3 +51,4 @@ applications/digikam applications/konversation applications/ksensors applications/amarok +applications/kaffeine From 3ab3e65898ddc99639165ba2065c92aa9aa49ae1 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 11 Nov 2011 21:26:44 +0100 Subject: [PATCH 05/18] RHEL/Fedora: add knetworkmanager (+dbus-1-tqt) --- ...tworkmanager-3.5.13-missing_includes.patch | 10 ++ ...networkmanager-3.5.13-subdir_version.patch | 22 +++ ...orkmanager-3.5.13-wpa_passphrase_lag.patch | 33 +++++ .../trinity-knetworkmanager.spec | 130 ++++++++++++++++++ redhat/components.txt | 2 + 5 files changed, 197 insertions(+) create mode 100644 redhat/applications/knetworkmanager/knetworkmanager-3.5.13-missing_includes.patch create mode 100644 redhat/applications/knetworkmanager/knetworkmanager-3.5.13-subdir_version.patch create mode 100644 redhat/applications/knetworkmanager/knetworkmanager-3.5.13-wpa_passphrase_lag.patch create mode 100644 redhat/applications/knetworkmanager/trinity-knetworkmanager.spec diff --git a/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-missing_includes.patch b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-missing_includes.patch new file mode 100644 index 000000000..175d299e7 --- /dev/null +++ b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-missing_includes.patch @@ -0,0 +1,10 @@ +--- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI 2011-11-11 15:06:49.854247242 -0500 ++++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt 2011-11-11 15:06:58.662060747 -0500 +@@ -18,6 +18,7 @@ + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ++ ${DBUS_INCLUDE_DIRS} + ${DBUS_TQT_INCLUDE_DIRS} + ${NM_UTIL_INCLUDE_DIRS} + ) diff --git a/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-subdir_version.patch b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-subdir_version.patch new file mode 100644 index 000000000..9db3ab5de --- /dev/null +++ b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-subdir_version.patch @@ -0,0 +1,22 @@ +--- knetworkmanager9/CMakeLists.txt.ORI 2011-11-11 13:36:01.462536187 -0500 ++++ knetworkmanager9/CMakeLists.txt 2011-11-11 13:36:10.762446937 -0500 +@@ -63,7 +63,7 @@ + + ##### source directories ######################## + +-add_subdirectory( knetworkmanager-0.8 ) ++add_subdirectory( knetworkmanager-0.9 ) + + + ##### write configure files ##################### +--- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI 2011-11-11 13:39:32.866229477 -0500 ++++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt 2011-11-11 13:39:48.169042904 -0500 +@@ -18,7 +18,7 @@ + + ##### knm_dbus (static) ######################### + +-set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" ) ++set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" ) + + # options: + # p - generate proxy files diff --git a/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-wpa_passphrase_lag.patch b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-wpa_passphrase_lag.patch new file mode 100644 index 000000000..ad10145cf --- /dev/null +++ b/redhat/applications/knetworkmanager/knetworkmanager-3.5.13-wpa_passphrase_lag.patch @@ -0,0 +1,33 @@ +diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp +--- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp 2011-11-11 20:45:47.964680619 +0100 ++++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp 2011-11-11 20:51:32.689072955 +0100 +@@ -432,14 +432,15 @@ + , _wireless_setting(wireless_setting) + { + txtPSK->setText(_security_setting->getPSK()); +- connect(txtPSK, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPSKChanged(const TQString&))); ++ connect(txtPSK, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotPSKChanged())); + } + + void +-WirelessSecurityWPAPSKImpl::slotPSKChanged(const TQString& psk) ++WirelessSecurityWPAPSKImpl::slotPSKChanged() + { + if (_wireless_setting) + { ++ TQString psk = txtPSK->text(); + _security_setting->setPSK(psk); + } + } +diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h +--- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h 2011-11-11 20:45:47.962680657 +0100 ++++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h 2011-11-11 20:46:21.640030856 +0100 +@@ -145,7 +145,7 @@ + TQCString String2Hex(TQByteArray bytes, int final_len) const; + + public slots: +- void slotPSKChanged(const TQString&); ++ void slotPSKChanged(); + + private: + WirelessSecurity* _security_setting; diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec new file mode 100644 index 000000000..9173e163c --- /dev/null +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -0,0 +1,130 @@ +# Default version for this component +%define kdecomp knetworkmanager +%if 0%{?fedora} >= 15 +%define version 0.9 +%else +%define version 0.8 +%endif +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_libdir %{_libdir}/trinity + +Name: trinity-%{kdecomp} +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +Summary: Trinity applet for Network Manager + +Group: Applications/Internet +License: GPLv2+ +URL: http://en.opensuse.org/Projects/KNetworkManager + +%if "%{?version}" == "0.9" +Source0: %{kdecomp}9-3.5.13.tar.gz +%else +Source0: %{kdecomp}8-3.5.13.tar.gz +%endif + +Patch0: knetworkmanager-3.5.13-missing_includes.patch +Patch1: knetworkmanager-3.5.13-wpa_passphrase_lag.patch + +# For knetworkmanager 0.9 only ! +Patch10: knetworkmanager-3.5.13-subdir_version.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: NetworkManager-gnome +Requires: kde-filesystem +BuildRequires: desktop-file-utils + +BuildRequires: dbus-1-tqt-devel +BuildRequires: dbus-tqt-devel +BuildRequires: NetworkManager-glib-devel + +%description +KNetworkManager is a system tray applet for controlling network +connections on systems that use the NetworkManager daemon. + + +%package devel +Summary: Common data shared among the MySQL GUI Suites +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development headers for knetworkmanager + + +%prep +%if "%{?version}" == "0.9" +%setup -q -n applications/%{kdecomp}9 +%else +%setup -q -n applications/%{kdecomp}8 +%endif + +%if "%{?version}" == "0.9" +%patch10 -p1 +%endif + +cd knetworkmanager-0.*/src +%patch0 -p3 +%patch1 -p3 + + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +# Missing TDE macros +%__mkdir_p cmake +%__ln_s %{_datadir}/cmake cmake/modules + +%__mkdir build +cd build +%cmake .. +%__make %{?_smp_mflags} + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=%{?buildroot} -C build + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_bindir}/knetworkmanager +%{_libdir}/*.la +%{_libdir}/*.so +%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf +%{_datadir}/applications/kde/knetworkmanager.desktop +%{_datadir}/apps/knetworkmanager +%{_datadir}/icons/*/*/apps/knetworkmanager* +%{_datadir}/servicetypes/knetworkmanager_plugin.desktop +%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop + + +%files devel +%defattr(-,root,root,-) +%{_includedir}/*.h +%{tde_libdir}/*.la +%{tde_libdir}/*.so + +%changelog +* Tue Nov 11 2011 Francois Andriot - 0.8-1 +- Initial build diff --git a/redhat/components.txt b/redhat/components.txt index dfd59433e..14d9b1e4e 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -3,6 +3,7 @@ dependencies/libcaldav dependencies/libcarddav dependencies/tqtinterface dependencies/dbus-tqt +dependencies/dbus-1-tqt dependencies/arts trinity-desktop #trinity-settings @@ -52,3 +53,4 @@ applications/konversation applications/ksensors applications/amarok applications/kaffeine +applications/knetworkmanager From f4a746cfc0707d4969a46168d3f9702199bb1d90 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 11 Nov 2011 21:26:58 +0100 Subject: [PATCH 06/18] RHEL/Fedora: updates kde-i18n packaging --- redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec | 231 +++++++------------ 1 file changed, 85 insertions(+), 146 deletions(-) diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec index 16484c0ed..855b4aef4 100644 --- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec +++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -46,6 +46,9 @@ AutoReq: no Source0: kde-i18n-%{version}.tar.gz +# [zh_TW] Updated translations, thanks to Wei-Lun Chao ! +Source1: kde-i18n-zh_TW-3.5.10.tar.bz2 + # TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package Patch0: kde-i18n-kdesu.patch @@ -619,6 +622,7 @@ Requires: kde-filesystem %prep %setup -q -n kde-i18n +%__cp -f %{SOURCE1} . for l in %{KDE_LANGS}; do for f in kde-i18n-${l}-*.tar.bz2; do @@ -701,476 +705,414 @@ popd find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \; # See http://fedoraproject.org/wiki/Languages (???) -rm -f %{buildroot}%{_datadir}/locale/*/flag.png -# And also the 'desktop.entry' (???) -rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop +%__rm -f %{buildroot}%{_datadir}/locale/*/flag.png + +# Removes conflict with KDE4 +%if "%{?_prefix}" == "/usr" +%__rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop +%endif # remove obsolete KDE 3 application data translations -rm -rf %{buildroot}%{_datadir}/apps +%__rm -rf %{buildroot}%{_datadir}/apps %clean -rm -rf %{buildroot} +%__rm -rf %{buildroot} %if "%( grep -w af <<< '%{KDE_LANGS}' )" != "" %files Afrikaans %defattr(-,root,root,-) -%lang(af) %{_datadir}/locale/af/LC_MESSAGES/* -%lang(af) %{_datadir}/locale/af/charset +%lang(af) %{_datadir}/locale/af/* %lang(af) %{_docdir}/HTML/af/ %endif %if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" %files Arabic %defattr(-,root,root,-) -%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/* -%lang(ar) %{_datadir}/locale/ar/charset +%lang(ar) %{_datadir}/locale/ar/* %endif %if "%( grep -w az <<< '%{KDE_LANGS}' )" != "" %files Azerbaijani %defattr(-,root,root,-) -%lang(az) %{_datadir}/locale/az/LC_MESSAGES/* -%lang(az) %{_datadir}/locale/az/charset +%lang(az) %{_datadir}/locale/az/* %endif %if "%( grep -w be <<< '%{KDE_LANGS}' )" != "" %files Belarusian %defattr(-,root,root,-) -%lang(be) %{_datadir}/locale/be/LC_MESSAGES/* -%lang(be) %{_datadir}/locale/be/charset +%lang(be) %{_datadir}/locale/be/* %endif %if "%( grep -w bg <<< '%{KDE_LANGS}' )" != "" %files Bulgarian %defattr(-,root,root,-) -%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/* -%lang(bg) %{_datadir}/locale/bg/charset +%lang(bg) %{_datadir}/locale/bg/* %endif %if "%( grep -w bn <<< '%{KDE_LANGS}' )" != "" %files Bengali %defattr(-,root,root,-) -%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/* -%lang(bn) %{_datadir}/locale/bn/charset +%lang(bn) %{_datadir}/locale/bn/* %endif %if "%( grep -w bo <<< '%{KDE_LANGS}' )" != "" %files Tibetan %defattr(-,root,root,-) -%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/* -%lang(bo) %{_datadir}/locale/bo/charset +%lang(bo) %{_datadir}/locale/bo/* %endif %if "%( grep -w br <<< '%{KDE_LANGS}' )" != "" %files Breton %defattr(-,root,root,-) -%lang(br) %{_datadir}/locale/br/LC_MESSAGES/* -%lang(br) %{_datadir}/locale/br/charset +%lang(br) %{_datadir}/locale/br/* %endif %if "%( grep -w bs <<< '%{KDE_LANGS}' )" != "" %files Bosnian %defattr(-,root,root,-) -%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/* -%lang(bs) %{_datadir}/locale/bs/charset +%lang(bs) %{_datadir}/locale/bs/* %endif %if "%( grep -w ca <<< '%{KDE_LANGS}' )" != "" %files Catalan %defattr(-,root,root,-) -%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/* -%lang(ca) %{_datadir}/locale/ca/charset +%lang(ca) %{_datadir}/locale/ca/* %lang(ca) %{_docdir}/HTML/ca/ %endif %if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" %files Czech %defattr(-,root,root,-) -%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/* -%lang(cs) %{_datadir}/locale/cs/charset +%lang(cs) %{_datadir}/locale/cs/* %lang(cs) %{_docdir}/HTML/cs/ %endif %if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" %files Welsh %defattr(-,root,root,-) -%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/* -%lang(cy) %{_datadir}/locale/cy/charset +%lang(cy) %{_datadir}/locale/cy/* %endif %if "%( grep -w da <<< '%{KDE_LANGS}' )" != "" %files Danish %defattr(-,root,root,-) -%lang(da) %{_datadir}/locale/da/LC_MESSAGES/* -%lang(da) %{_datadir}/locale/da/charset -%lang(da) %{_datadir}/locale/da/da.compendium +%lang(da) %{_datadir}/locale/da/* %lang(da) %{_docdir}/HTML/da/ %endif %if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" %files German %defattr(-,root,root,-) -%lang(de) %{_datadir}/locale/de/LC_MESSAGES/* -%lang(de) %{_datadir}/locale/de/charset +%lang(de) %{_datadir}/locale/de/* %lang(de) %{_docdir}/HTML/de/ %endif %if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" %files Greek %defattr(-,root,root,-) -%lang(el) %{_datadir}/locale/el/LC_MESSAGES/* -%lang(el) %{_datadir}/locale/el/charset +%lang(el) %{_datadir}/locale/el/* %endif %if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != "" %files British %defattr(-,root,root,-) -%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/* -%lang(en_GB) %{_datadir}/locale/en_GB/charset +%lang(en_GB) %{_datadir}/locale/en_GB/* %lang(en_GB) %{_docdir}/HTML/en_GB/ %endif %if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" %files Esperanto %defattr(-,root,root,-) -%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/* -%lang(eo) %{_datadir}/locale/eo/charset +%lang(eo) %{_datadir}/locale/eo/* %endif %if "%( grep -w es <<< '%{KDE_LANGS}' )" != "" %files Spanish %defattr(-,root,root,-) -%lang(es) %{_datadir}/locale/es/LC_MESSAGES/* -%lang(es) %{_datadir}/locale/es/charset +%lang(es) %{_datadir}/locale/es/* %lang(es) %{_docdir}/HTML/es/ %endif %if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" %files Estonian %defattr(-,root,root,-) -%lang(et) %{_datadir}/locale/et/LC_MESSAGES/* -%lang(et) %{_datadir}/locale/et/charset +%lang(et) %{_datadir}/locale/et/* %lang(et) %{_docdir}/HTML/et/ %endif %if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" %files Basque %defattr(-,root,root,-) -%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/* -%lang(eu) %{_datadir}/locale/eu/charset +%lang(eu) %{_datadir}/locale/eu/* %endif %if "%( grep -w fa <<< '%{KDE_LANGS}' )" != "" %files Farsi %defattr(-,root,root,-) -%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/* -%lang(fa) %{_datadir}/locale/fa/charset +%lang(fa) %{_datadir}/locale/fa/* %endif %if "%( grep -w fi <<< '%{KDE_LANGS}' )" != "" %files Finnish %defattr(-,root,root,-) -%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/* -%lang(fi) %{_datadir}/locale/fi/charset +%lang(fi) %{_datadir}/locale/fi/* %lang(fi) %{_docdir}/HTML/fi/ %endif %if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" %files Faroese %defattr(-,root,root,-) -%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/* -%lang(fo) %{_datadir}/locale/fo/charset +%lang(fo) %{_datadir}/locale/fo/* %endif %if "%( grep -w fr <<< '%{KDE_LANGS}' )" != "" %files French %defattr(-,root,root,-) -%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/* -%lang(fr) %{_datadir}/locale/fr/charset -%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt -%lang(fr) %{_datadir}/locale/fr/relecture_* +%lang(fr) %{_datadir}/locale/fr/* %lang(fr) %{_docdir}/HTML/fr/ %endif %if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" %files Frisian %defattr(-,root,root,-) -%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/* -%lang(fy) %{_datadir}/locale/fy/charset +%lang(fy) %{_datadir}/locale/fy/* %endif %if "%( grep -w ga <<< '%{KDE_LANGS}' )" != "" %files Irish %defattr(-,root,root,-) -%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/* -%lang(ga) %{_datadir}/locale/ga/charset +%lang(ga) %{_datadir}/locale/ga/* %endif %if "%( grep -w gl <<< '%{KDE_LANGS}' )" != "" %files Galician %defattr(-,root,root,-) -%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/* -%lang(gl) %{_datadir}/locale/gl/charset +%lang(gl) %{_datadir}/locale/gl/* %endif %if "%( grep -w he <<< '%{KDE_LANGS}' )" != "" %files Hebrew %defattr(-,root,root,-) -%lang(he) %{_datadir}/locale/he/LC_MESSAGES/* -%lang(he) %{_datadir}/locale/he/charset +%lang(he) %{_datadir}/locale/he/* %lang(he) %{_docdir}/HTML/he/ %endif %if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" %files Hindi %defattr(-,root,root,-) -%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/* -%lang(hi) %{_datadir}/locale/hi/charset +%lang(hi) %{_datadir}/locale/hi/* %endif %if "%( grep -w hr <<< '%{KDE_LANGS}' )" != "" %files Croatian %defattr(-,root,root,-) -%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/* -%lang(hr) %{_datadir}/locale/hr/charset +%lang(hr) %{_datadir}/locale/hr/* %lang(hr) %{_docdir}/HTML/hr/ %endif %if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" %files Hungarian %defattr(-,root,root,-) -%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/* -%lang(hu) %{_datadir}/locale/hu/charset +%lang(hu) %{_datadir}/locale/hu/* %lang(hu) %{_docdir}/HTML/hu/ %endif %if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" %files Indonesian %defattr(-,root,root,-) -%lang(id) %{_datadir}/locale/id/LC_MESSAGES/* -%lang(id) %{_datadir}/locale/id/charset +%lang(id) %{_datadir}/locale/id/* %lang(id) %{_docdir}/HTML/id/ %endif %if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" %files Icelandic %defattr(-,root,root,-) -%lang(is) %{_datadir}/locale/is/LC_MESSAGES/* -%lang(is) %{_datadir}/locale/is/charset +%lang(is) %{_datadir}/locale/is/* %endif %if "%( grep -w it <<< '%{KDE_LANGS}' )" != "" %files Italian %defattr(-,root,root,-) -%lang(it) %{_datadir}/locale/it/LC_MESSAGES/* -%lang(it) %{_datadir}/locale/it/charset +%lang(it) %{_datadir}/locale/it/* %lang(it) %{_docdir}/HTML/it/ %endif %if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" %files Japanese %defattr(-,root,root,-) -%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/* -%lang(ja) %{_datadir}/locale/ja/charset +%lang(ja) %{_datadir}/locale/ja/* %lang(ja) %{_docdir}/HTML/ja/ %endif %if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" %files Korean %defattr(-,root,root,-) -%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/* -%lang(ko) %{_datadir}/locale/ko/charset +%lang(ko) %{_datadir}/locale/ko/* %lang(ko) %{_docdir}/HTML/ko/ %endif %if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" %files Kurdish %defattr(-,root,root,-) -%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/* -%lang(ku) %{_datadir}/locale/ku/charset +%lang(ku) %{_datadir}/locale/ku/* %lang(ku) %{_docdir}/HTML/ku/ %endif %if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" %files Lao %defattr(-,root,root,-) -%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/* -%lang(lo) %{_datadir}/locale/lo/charset +%lang(lo) %{_datadir}/locale/lo/* %lang(lo) %{_docdir}/HTML/lo/ %endif %if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" %files Lithuanian %defattr(-,root,root,-) -%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/* -%lang(lt) %{_datadir}/locale/lt/charset +%lang(lt) %{_datadir}/locale/lt/* %endif %if "%( grep -w lv <<< '%{KDE_LANGS}' )" != "" %files Latvian %defattr(-,root,root,-) -%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/* -%lang(lv) %{_datadir}/locale/lv/charset +%lang(lv) %{_datadir}/locale/lv/* %endif %if "%( grep -w mi <<< '%{KDE_LANGS}' )" != "" %files Maori %defattr(-,root,root,-) -%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/* -%lang(mi) %{_datadir}/locale/mi/charset +%lang(mi) %{_datadir}/locale/mi/* %endif %if "%( grep -w mk <<< '%{KDE_LANGS}' )" != "" %files Macedonian %defattr(-,root,root,-) -%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/* -%lang(mk) %{_datadir}/locale/mk/charset +%lang(mk) %{_datadir}/locale/mk/* %endif %if "%( grep -w mt <<< '%{KDE_LANGS}' )" != "" %files Maltese %defattr(-,root,root,-) -%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/* -%lang(mt) %{_datadir}/locale/mt/charset +%lang(mt) %{_datadir}/locale/mt/* %endif %if "%( grep -w nl <<< '%{KDE_LANGS}' )" != "" %files Dutch %defattr(-,root,root,-) -%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/* -%lang(nl) %{_datadir}/locale/nl/charset +%lang(nl) %{_datadir}/locale/nl/* %lang(nl) %{_docdir}/HTML/nl/ %endif %if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" %files Norwegian %defattr(-,root,root,-) -%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/* -%lang(nb) %{_datadir}/locale/nb/charset -%lang(nb) %{_datadir}/locale/nb/README +%lang(nb) %{_datadir}/locale/nb/* #%lang(nb) %{_docdir}/HTML/nb/ %endif %if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" %files Norwegian-Nynorsk %defattr(-,root,root,-) -%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/* -%lang(nn) %{_datadir}/locale/nn/charset +%lang(nn) %{_datadir}/locale/nn/* #%lang(nn) %{_docdir}/HTML/nn/ %endif %if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" %files Occitan %defattr(-,root,root,-) -%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/* -%lang(oc) %{_datadir}/locale/oc/charset +%lang(oc) %{_datadir}/locale/oc/* %endif %if "%( grep -w pa <<< '%{KDE_LANGS}' )" != "" %files Punjabi %defattr(-,root,root,-) -%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/* -%lang(pa) %{_datadir}/locale/pa/charset +%lang(pa) %{_datadir}/locale/pa/* %endif %if "%( grep -w pl <<< '%{KDE_LANGS}' )" != "" %files Polish %defattr(-,root,root,-) -%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/* -%lang(pl) %{_datadir}/locale/pl/charset +%lang(pl) %{_datadir}/locale/pl/* %lang(pl) %{_docdir}/HTML/pl/ %endif %if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" %files Portuguese %defattr(-,root,root,-) -%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/* -%lang(pt) %{_datadir}/locale/pt/charset +%lang(pt) %{_datadir}/locale/pt/* %lang(pt) %{_docdir}/HTML/pt/ %endif %if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" %files Brazil %defattr(-,root,root,-) -%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/* -%lang(pt_BR) %{_datadir}/locale/pt_BR/charset +%lang(pt_BR) %{_datadir}/locale/pt_BR/* %lang(pt_BR) %{_docdir}/HTML/pt_BR/ %endif %if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" %files Romanian %defattr(-,root,root,-) -%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/* -%lang(ro) %{_datadir}/locale/ro/charset +%lang(ro) %{_datadir}/locale/ro/* %lang(ro) %{_docdir}/HTML/ro/ %endif %if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" %files Russian %defattr(-,root,root,-) -%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/* -%lang(ru) %{_datadir}/locale/ru/charset +%lang(ru) %{_datadir}/locale/ru/* %lang(ru) %{_docdir}/HTML/ru/ %endif %if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" %files Slovak %defattr(-,root,root,-) -%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/* -%lang(sk) %{_datadir}/locale/sk/charset +%lang(sk) %{_datadir}/locale/sk/* %lang(sk) %{_docdir}/HTML/sk/ %endif %if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" %files Slovenian %defattr(-,root,root,-) -%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/* -%lang(sl) %{_datadir}/locale/sl/charset +%lang(sl) %{_datadir}/locale/sl/* %lang(sl) %{_docdir}/HTML/sl/ %endif %if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" %files Serbian %defattr(-,root,root,-) -%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/* -%lang(sr) %{_datadir}/locale/sr/charset +%lang(sr) %{_datadir}/locale/sr/* %lang(sr) %{_docdir}/HTML/sr/ %endif %if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" %files Swedish %defattr(-,root,root,-) -%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/* -%lang(sv) %{_datadir}/locale/sv/charset +%lang(sv) %{_datadir}/locale/sv/* %lang(sv) %{_docdir}/HTML/sv/ %endif %if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" %files Tamil %defattr(-,root,root,-) -%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/* -%lang(ta) %{_datadir}/locale/ta/charset +%lang(ta) %{_datadir}/locale/ta/* %endif %if "%( grep -w tg <<< '%{KDE_LANGS}' )" != "" %files Tajik %defattr(-,root,root,-) -%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/* -%lang(tg) %{_datadir}/locale/tg/charset +%lang(tg) %{_datadir}/locale/tg/* %endif %if "%( grep -w th <<< '%{KDE_LANGS}' )" != "" %files Thai %defattr(-,root,root,-) -%lang(th) %{_datadir}/locale/th/LC_MESSAGES/* -%lang(th) %{_datadir}/locale/th/charset +%lang(th) %{_datadir}/locale/th/* %endif %if "%( grep -w tr <<< '%{KDE_LANGS}' )" != "" %files Turkish %defattr(-,root,root,-) -%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/* -%lang(tr) %{_datadir}/locale/tr/charset +%lang(tr) %{_datadir}/locale/tr/* %lang(tr) %{_docdir}/HTML/tr/ %endif @@ -1178,56 +1120,53 @@ rm -rf %{buildroot} %files Ukrainian %defattr(-,root,root,-) %lang(uk) %{_docdir}/HTML/uk/ -%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/* -%lang(uk) %{_datadir}/locale/uk/charset +%lang(uk) %{_datadir}/locale/uk/* %endif %if "%( grep -w ven <<< '%{KDE_LANGS}' )" != "" %files Venda %defattr(-,root,root,-) -%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/* -%lang(ven) %{_datadir}/locale/ven/charset +%lang(ven) %{_datadir}/locale/ven/* %endif %if "%( grep -w vi <<< '%{KDE_LANGS}' )" != "" %files Vietnamese %defattr(-,root,root,-) -%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/* -%lang(vi) %{_datadir}/locale/vi/charset +%lang(vi) %{_datadir}/locale/vi/* %endif %if "%( grep -w wa <<< '%{KDE_LANGS}' )" != "" %files Walloon %defattr(-,root,root,-) -%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/* -%lang(wa) %{_datadir}/locale/wa/charset +%lang(wa) %{_datadir}/locale/wa/* %endif %if "%( grep -w xh <<< '%{KDE_LANGS}' )" != "" %files Xhosa %defattr(-,root,root,-) -%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/* -%lang(xh) %{_datadir}/locale/xh/charset +%lang(xh) %{_datadir}/locale/xh/* %lang(xh) %{_docdir}/HTML/xh/ %endif %if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" %files Chinese %defattr(-,root,root,-) -%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* -%lang(zh_CN) %{_datadir}/locale/zh_CN/charset +%lang(zh_CN) %{_datadir}/locale/zh_CN/* %lang(zh_CN) %{_docdir}/HTML/zh_CN/ %endif %if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" %files Chinese-Big5 %defattr(-,root,root,-) -%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/* -%lang(zh_TW) %{_datadir}/locale/zh_TW/charset +%lang(zh_TW) %{_datadir}/locale/zh_TW/* %lang(zh_TW) %{_docdir}/HTML/zh_TW/ %endif %changelog +* Fri Nov 11 2011 Francois Andriot - 3.5.13-3 +- Re-adds missing files 'entry.desktop' +- Updates zh_TW translation, thanks to Wei-Lun Chao + * Tue Nov 01 2011 Francois Andriot - 3.5.13-2 - Add missing french translations for TDE 3.5.13 From b3e5f705c4684e569ed06003a65e76b6d5075bc6 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 11 Nov 2011 21:28:01 +0100 Subject: [PATCH 07/18] RHEL/Fedora: kdebase updates --- redhat/kdebase/trinity-kdebase-3.5.13.spec | 35 ++++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index ce45a86c4..2193aa4f4 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 4 +%define release 5 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -61,6 +61,8 @@ Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch Patch8: kdebase-3.5.13-startkde_ldpreload.patch # [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch +# [kdebase/kicker/kicker/ui] +Patch10: kdebase-3.5.12-kickoff_unstable.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -72,7 +74,8 @@ BuildRequires: imake BuildRequires: xorg-x11-proto-devel BuildRequires: OpenEXR-devel BuildRequires: libsmbclient-devel -BuildRequires: dbus-devel dbus-qt-devel +BuildRequires: dbus-devel +BuildRequires: dbus-tqt-devel BuildRequires: lm_sensors-devel BuildRequires: libfontenc-devel BuildRequires: hal-devel @@ -114,6 +117,10 @@ Requires: kde-settings-kdm %endif Requires: redhat-menus +# Required for Fedora LiveCD +Provides: service(graphical-login) + + %description Core applications for the Trinity K Desktop Environment. Included are: kdm (replacement for xdm), kwin (window manager), konqueror (filemanager, @@ -183,6 +190,8 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch7 -p1 %patch8 -p1 %patch9 -p1 +cd kicker/kicker +%patch10 -p0 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -233,19 +242,19 @@ cd build # Adds a GDM/KDM/XDM session called 'TDE' %if "%{?_prefix}" != "/usr" %__mkdir_p "%{?buildroot}%{_usr}/share/xsessions" -install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" +%__install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" %endif # Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE -sed -i "%{?buildroot}%{_bindir}/startkde" \ +%__sed -i "%{?buildroot}%{_bindir}/startkde" \ -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,' # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard' -mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde +%__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde # TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4 %if "%{?_prefix}" != "/usr" -%__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" +%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{_bindir}" %endif # PAM configuration files @@ -255,6 +264,15 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg %__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" %__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity" +# KDM configuration for RHEL/Fedora +%__sed -i "%{?buildroot}%{_datadir}/config/kdm/kdmrc" \ +%if 0%{?fedora} >= 16 + -e "s/^#*MinShowUID=.*/MinShowUID=1000/" +%else + -e "s/^#*MinShowUID=.*/MinShowUID=500/" +%endif + + %clean %__rm -rf %{?buildroot} @@ -521,6 +539,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Fri Nov 11 2011 Francois Andriot - 3.5.13-5 +- Add "service(graphical-login)" +- Add kickoff menu fix [TDE Bug #508] +- kdmrc: sets "MinShowUID=500" + * Tue Nov 08 2011 Francois Andriot - 3.5.13-4 - Fix FTBFS with dbus-tqt From 21700c329b74f3e0e97ab6dedb674976493c5005 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 11 Nov 2011 21:28:43 +0100 Subject: [PATCH 08/18] RHEL/Fedora: remove 'dpkg' commands from klaptopdaemon --- ...ls-3.5.13-klaptopdaemon_dpkg_command.patch | 31 +++++++++++++++++++ redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 12 +++++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch diff --git a/redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch b/redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch new file mode 100644 index 000000000..faff103f4 --- /dev/null +++ b/redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch @@ -0,0 +1,31 @@ +--- kdeutils/klaptopdaemon/acpi.cpp.ORI 2011-11-11 17:44:28.515033721 +0100 ++++ kdeutils/klaptopdaemon/acpi.cpp 2011-11-11 17:50:52.703492308 +0100 +@@ -178,7 +178,7 @@ + proc << kdesu; + proc << "-u"; + proc << "root"; +- proc << "dpkg-statoverride --update --add root root 6755 "+helper; ++ proc << "chown root "+helper+"; chmod +s "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { +--- kdeutils/klaptopdaemon/apm.cpp.ORI 2011-11-11 17:45:11.515912373 +0100 ++++ kdeutils/klaptopdaemon/apm.cpp 2011-11-11 17:51:07.095195808 +0100 +@@ -166,7 +166,7 @@ + proc << kdesu; + proc << "-u"; + proc << "root"; +- proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name; ++ proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name; + proc.start(KProcess::Block); // run it sync so has_apm below sees the results + } + } else { +@@ -200,7 +200,7 @@ + proc << kdesu; + proc << "-u"; + proc << "root"; +- proc << "dpkg-statoverride --update --add root root 6755 "+helper; ++ proc << "chown root "+helper+"; chmod +s "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index fab189481..6519e8aa2 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -41,7 +41,11 @@ BuildRequires: trinity-arts BuildRequires: trinity-kdelibs # RedHat / Fedora legacy patches -Patch1: kdf-3.0.2-label.patch +Patch1: kdf-3.0.2-label.patch + +# TDE 3.5.13 RHEL/Fedora patches +## [kdeutils/klaptodaemon] removes dpkg commands +Patch2: kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -112,6 +116,7 @@ More Utilities for the K Desktop Environment: %setup -q -n kdeutils %patch1 -p1 -b .label +%patch2 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -342,6 +347,9 @@ done %changelog +* Fri Nov 11 2011 Francois Andriot - 3.5.13-3 +- Removes 'dpkg' commands inside klaptopdaemon + * Fri Nov 04 2011 Francois Andriot - 3.5.13-2 - Updates BuildRequires From ba0a15d74e98b4cb42279dcda25e1730197a003e Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 12 Nov 2011 17:24:02 +0100 Subject: [PATCH 09/18] RHEL/Fedora: better integration with distribution, small fixes --- .../trinity-knetworkmanager.spec | 16 ++++ .../arts/trinity-arts-3.5.13.spec | 6 +- redhat/kdebase/trinity-kdebase-3.5.13.spec | 76 +++++++++++---- .../kdenetwork/trinity-kdenetwork-3.5.13.spec | 15 ++- .../trinity-3.5.13-fedora.repo | 36 +++++++ .../trinity-desktop/trinity-3.5.13-rhel.repo | 36 +++++++ redhat/trinity-desktop/trinity-desktop.spec | 32 ++++++- redhat/trinity-live/fedora-live-tde-base.ks | 94 +++++++++++++++++++ redhat/trinity-live/fedora-livecd-tde.ks | 79 ++++++++++++++++ redhat/trinity-live/trinity-live.spec | 84 +++++++++++++++++ 10 files changed, 454 insertions(+), 20 deletions(-) create mode 100644 redhat/trinity-desktop/trinity-3.5.13-fedora.repo create mode 100644 redhat/trinity-desktop/trinity-3.5.13-rhel.repo create mode 100644 redhat/trinity-live/fedora-live-tde-base.ks create mode 100644 redhat/trinity-live/fedora-livecd-tde.ks create mode 100644 redhat/trinity-live/trinity-live.spec diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec index 9173e163c..b561200b4 100644 --- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -106,6 +106,22 @@ cd build %__rm -rf $RPM_BUILD_ROOT +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + %files %defattr(-,root,root,-) %{_bindir}/knetworkmanager diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 46ff718f6..69ff66ea5 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -29,6 +29,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: arts-%{version}.tar.gz +# TDE 3.5.13: Re-enable lost OSS support +Patch0: arts-3.5.13-enable_oss.patch + BuildRequires: tqtinterface-devel BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel @@ -70,6 +73,7 @@ Development files for %{name} %prep %setup -q -n dependencies/arts +%patch0 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 2193aa4f4..f5ff987a7 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 5 +%define release 6 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -49,21 +49,45 @@ Source5: pamd.kscreensaver-trinity%{?dist} # TDE for RHEL/Fedora specific patches -# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box +## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch -# [kdebase/kdesktop] Modifies "open terminal here" on desktop +## [kdebase/kdesktop] Modifies "open terminal here" on desktop Patch5: kdebase-3.5.12-desktop-openterminalhere.patch -# [kdebase/kioslave] Forces HAL backend to use HAL mount options +## [kdebase/kioslave] Forces HAL backend to use HAL mount options Patch6: kdebase-3.5.12-halmountoptions.patch -# [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' +## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession' Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch -# [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64 +## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64 Patch8: kdebase-3.5.13-startkde_ldpreload.patch -# [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes +## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch -# [kdebase/kicker/kicker/ui] +## [kdebase/kicker/kicker/ui] Patch10: kdebase-3.5.12-kickoff_unstable.patch +# Fedora 15 Theme: "Lovelock" +%if 0%{?fedora} == 15 +Requires: lovelock-backgrounds-single +%define kde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png +%endif + +# Fedora 16 Theme: "Verne" +%if 0%{?fedora} == 16 +Requires: verne-backgrounds-single +%define kde_bg /usr/share/backgrounds/verne/default/standard/verne.png +%endif + +# RHEL 5 Theme +%if 0%{?rhel} == 5 +Requires: desktop-backgrounds-basic +%define kde_bg /usr/share/backgrounds/images/default.jpg +%endif + +# RHEL 6 Theme +%if 0%{?rhel} == 6 +Requires: redhat-logos +%define kde_bg /usr/share/backgrounds/default.png +%endif + BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel @@ -192,6 +216,22 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch9 -p1 cd kicker/kicker %patch10 -p0 +cd - + +# Applies an optional distro-specific graphical theme +%if "%{?kde_bg}" != "" +# KDM Background +%__sed -i "kdm/kfrontend/genkdmconf.c" \ + -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{kde_bg}\n",' + +# TDE user default background +%__sed -i "kpersonalizer/keyecandypage.cpp" \ + -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{kde_bg}",' + +%__sed -i "startkde" \ + -e 's,/usr/share/wallpapers/isadora.png.desktop,%{kde_bg},' \ + -e 's,Wallpaper=isadora.png,Wallpaper=%{kde_bg},' +%endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -272,6 +312,10 @@ cd build -e "s/^#*MinShowUID=.*/MinShowUID=500/" %endif +# Moves the XDG configuration files to TDE directory +%__mkdir_p "%{?buildroot}%{_prefix}/etc" +%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{_prefix}/etc" + %clean %__rm -rf %{?buildroot} @@ -474,14 +518,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/sounds/* %{tde_libdir}/* %{_libdir}/libkdeinit_*.* -%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu -%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr" -%exclude %{_sysconfdir}/xdg/menus/kde-information.menu -%else -%{_sysconfdir}/xdg/menus/kde-information.menu -%endif -%{_sysconfdir}/xdg/menus/kde-screensavers.menu -%{_sysconfdir}/xdg/menus/kde-settings.menu +%{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu +%{_prefix}/etc/xdg/menus/kde-information.menu +%{_prefix}/etc/xdg/menus/kde-screensavers.menu +%{_prefix}/etc/xdg/menus/kde-settings.menu /usr/share/xsessions/*.desktop # Remove conflicts with redhat-menus %if "%{?_prefix}" != "/usr" @@ -539,6 +579,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Sat Nov 12 2011 Francois Andriot - 3.5.13-6 +- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE + * Fri Nov 11 2011 Francois Andriot - 3.5.13-5 - Add "service(graphical-login)" - Add kickoff menu fix [TDE Bug #508] diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec index d06c7b328..d54a01d40 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -257,6 +257,11 @@ install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa +# RHEL 5: Avoids conflict with 'kdenetwork' +%if 0%{?rhel} == 5 +%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde +%endif + %post /sbin/chkconfig --add lisa ||: for f in crystalsvg hicolor locolor ; do @@ -264,6 +269,9 @@ for f in crystalsvg hicolor locolor ; do gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +if [ -r %{_sysconfdir}/lisarc.tde ] && [ ! -r %{_sysconfdir}/lisarc ]; then + cp -f %{_sysconfdir}/lisarc.tde %{_sysconfdir}/lisarc +fi %postun for f in crystalsvg hicolor locolor ; do @@ -433,7 +441,7 @@ done %else %attr(4755,root,root) %{_bindir}/kppp %endif -%config(noreplace) %{_sysconfdir}/lisarc +%config(noreplace) %{_sysconfdir}/lisarc* %config(noreplace) %{_initrddir}/lisa %{_libdir}/libkdeinit_*.so %{tde_libdir}/* @@ -465,6 +473,9 @@ done %changelog +* Sat Nov 12 2011 Francois Andriot - 3.5.13-2 +- Removes conflict on file 'lisarc' for RHEL 5 + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/trinity-desktop/trinity-3.5.13-fedora.repo new file mode 100644 index 000000000..e6ac33dad --- /dev/null +++ b/redhat/trinity-desktop/trinity-3.5.13-fedora.repo @@ -0,0 +1,36 @@ +[trinity-3.5.13-fedora] +name=trinity-3.5.13-fedora +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-fedora-noarch] +name=trinity-3.5.13-fedora-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-fedora-source] +name=trinity-3.5.13-fedora-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS +enabled=1 +gpgcheck=0 + +[trinity-extras-fedora] +name=trinity-extras-fedora +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-extras-fedora-noarch] +name=trinity-extras-fedora-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-extras-fedora-source] +name=trinity-extras-fedora-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/SRPMS +enabled=1 +gpgcheck=0 + diff --git a/redhat/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/trinity-desktop/trinity-3.5.13-rhel.repo new file mode 100644 index 000000000..e54847b54 --- /dev/null +++ b/redhat/trinity-desktop/trinity-3.5.13-rhel.repo @@ -0,0 +1,36 @@ +[trinity-3.5.13-rhel] +name=trinity-3.5.13-rhel +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-rhel-noarch] +name=trinity-3.5.13-rhel-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-3.5.13-rhel-source] +name=trinity-3.5.13-f16-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS +enabled=1 +gpgcheck=0 + +[trinity-extras-rhel] +name=trinity-extras-rhel +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/$basearch +enabled=1 +gpgcheck=0 + +[trinity-extras-rhel-noarch] +name=trinity-extras-rhel-noarch +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/noarch +enabled=1 +gpgcheck=0 + +[trinity-extras-rhel-source] +name=trinity-extras-rhel-source +baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/SRPMS +enabled=1 +gpgcheck=0 + diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec index cf9a96d22..c109fd82b 100644 --- a/redhat/trinity-desktop/trinity-desktop.spec +++ b/redhat/trinity-desktop/trinity-desktop.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -25,6 +25,9 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +Source0: trinity-3.5.13-fedora.repo +Source1: trinity-3.5.13-rhel.repo + Requires: trinity-kdeaccessibility >= %{version} Requires: trinity-kdeaddons >= %{version} Requires: trinity-kdeadmin >= %{version} @@ -40,6 +43,7 @@ Requires: trinity-kdenetwork >= %{version} Requires: trinity-kdepim >= %{version} Requires: trinity-kdeutils >= %{version} Requires: trinity-kdetoys >= %{version} +Requires: trinity-repo >= %{version} %description The TDE project aims to keep the KDE3.5 computing style alive, as well as @@ -86,6 +90,25 @@ Requires: %{name}-extras == %{version} %description all %{summary} +%package -n trinity-repo +Group: User Interface/Desktops +Summary: Yum configuration files for Trinity + +%description -n trinity-repo +%{summary} + +%prep + +%build + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d +%if 0%{?fedora} +%__install -m 644 %{SOURCE0} %{?buildroot}%{_sysconfdir}/yum.repos.d +%else +%__install -m 644 %{SOURCE1} %{?buildroot}%{_sysconfdir}/yum.repos.d +%endif %files @@ -94,3 +117,10 @@ Requires: %{name}-extras == %{version} %files extras %files all + +%files -n trinity-repo +%{_sysconfdir}/yum.repos.d/*.repo + +%changelog +* Sat Nov 12 2011 Francois Andriot - 3.5.13-2 +- Add 'repo' package diff --git a/redhat/trinity-live/fedora-live-tde-base.ks b/redhat/trinity-live/fedora-live-tde-base.ks new file mode 100644 index 000000000..b56e5c92a --- /dev/null +++ b/redhat/trinity-live/fedora-live-tde-base.ks @@ -0,0 +1,94 @@ +# Copied from 'fedora-live-kde-base.ks' + +%include fedora-live-base.ks +repo --name=trinity --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/$basearch +repo --name=trinity-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/noarch +repo --name=trinity-extras --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/$basearch +repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/noarch + +%packages + +### The KDE-Desktop + +trinity-desktop + + +### fixes + +# make sure alsaunmute is there +alsa-utils + +# make sure gnome-packagekit doesn't end up the KDE live images +-gnome-packagekit* + +%end + + +%post + +# create /etc/sysconfig/desktop (needed for installation) +cat > /etc/sysconfig/desktop < /root/.gtkrc-2.0 << EOF +include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc" +include "/etc/gtk-2.0/gtkrc" +gtk-theme-name="oxygen-gtk" +EOF + +# add initscript +cat >> /etc/rc.d/init.d/livesys << EOF + +if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then + # use image also for kdm + mkdir -p /usr/share/apps/kdm/faces + cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon +fi + +# make liveuser use KDE +echo "/opt/trinity/bin/startkde" > /home/liveuser/.xsession +chmod a+x /home/liveuser/.xsession +chown liveuser:liveuser /home/liveuser/.xsession + +# set up autologin for user liveuser +sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /opt/trinity/share/config/kdm/kdmrc +sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /opt/trinity/share/config/kdm/kdmrc + +# set up user liveuser as default user and preselected user +sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /opt/trinity/share/config/kdm/kdmrc +sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /opt/trinity/share/config/kdm/kdmrc + +# add liveinst.desktop to favorites menu +mkdir -p /home/liveuser/.trinity/share/config/ + +# show liveinst.desktop on desktop and in menu +sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop + +# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning +chmod +x /usr/share/applications/liveinst.desktop + +# copy over the icons for liveinst to hicolor +cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/ +cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/ +cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/ +cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/ +cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/ +cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/ +touch /usr/share/icons/hicolor/ + +# Create user Desktop directory +mkdir -p /home/liveuser/Desktop + +# make sure to set the right permissions and selinux contexts +chown -R liveuser:liveuser /home/liveuser/ +restorecon -R /home/liveuser/ + +# don't use prelink on a running KDE live image +sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink + +EOF + +%end diff --git a/redhat/trinity-live/fedora-livecd-tde.ks b/redhat/trinity-live/fedora-livecd-tde.ks new file mode 100644 index 000000000..16c799d1f --- /dev/null +++ b/redhat/trinity-live/fedora-livecd-tde.ks @@ -0,0 +1,79 @@ +# fedora-livecd-tde.ks +# +# Description: +# - Fedora Livecd Spin with the Trinity Desktop Environment (TDE) +# - Based on 'fedora-livecd-kde.ks' provided by Fedora 15 +# +# Maintainer(s): +# - Francois Andriot + +%include fedora-live-tde-base.ks +%include fedora-live-minimization.ks + + +%packages +# Additional packages that are not default in trinity-desktop but useful +trinity-desktop-extras +trinity-live-openbox + +# Some TDE applications +trinity-amarok +trinity-digikam +trinity-dolphin +trinity-gwenview +trinity-k3b +trinity-kaffeine +trinity-kbookreader +trinity-konversation +trinity-ksensors +trinity-kstreamripper +trinity-yakuake + +# Some TDE translations +trinity-kde-i18n-French +trinity-kde-i18n-German +#trinity-kde-i18n-Spanish +trinity-kde-i18n-Chinese-Big5 + +# Fedora stuff +fuse +liveusb-creator + + +### more desktop stuff +fedora-icon-theme +adwaita-cursor-theme +adwaita-gtk2-theme +adwaita-gtk3-theme + +# use yum-presto by default +yum-presto + +### space issues + +# fonts (we make no bones about admitting we're english-only) +wqy-microhei-fonts # a compact CJK font, to replace: +-un-core-dotum-fonts # Korean +-vlgothic-fonts # Japanese +-wqy-zenhei-fonts # Chinese + +-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge +#-stix-fonts # mathematical symbols + +# remove input methods to free space +-@input-methods +-scim* +-m17n* +-ibus* +-iok + +# save some space (from @base) +-make +-nss_db + +## avoid serious bugs by omitting broken stuff + +%end + +%post +%end diff --git a/redhat/trinity-live/trinity-live.spec b/redhat/trinity-live/trinity-live.spec new file mode 100644 index 000000000..95733ae80 --- /dev/null +++ b/redhat/trinity-live/trinity-live.spec @@ -0,0 +1,84 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 1 + +%define _datadir %{_usr}/share + +Name: trinity-live +Version: %{version} +Release: %{?release}%{?dist} +License: GPL +Summary: Trinity Spins +Group: Applications/System + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +Requires: fedora-kickstarts +Requires: livecd-tools + +Source0: fedora-live-tde-base.ks +Source1: fedora-livecd-tde.ks + +%description +This package contains the Trinity configuration file to build a Fedora +LiveCD containing Fedora. + +%package openbox +Summary: bootstrap 'openbox' script that runs TDE's kwin +Requires: trinity-kdebase +BuildArch: noarch +Group: Applications/System + +%description openbox +There is a bug in 'firstboot' that prevents it to invoke 'openbox' correctly. +The provided script redirects 'openbox' to 'kwin'. +It is used on the Fedora TDE LiveCD. + +%prep + +%build +cat <openbox +#!/bin/sh + +# This script is used by 'firstboot' only. +# It allows to run TDE's kwin instead of openbox. + +export PATH=%{_bindir}:\${PATH} +export HOME=/root +rm -rf \${HOME}/.DCOPserver* + +rpm -e trinity-live-openbox + +exec kwin \$@ +EOF + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_datadir}/spin-kickstarts +%__install -m 644 %{SOURCE0} %{?buildroot}%{_datadir}/spin-kickstarts +%__install -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/spin-kickstarts + +# Openbox +%__mkdir_p "%{?buildroot}/usr/local/bin" +%__install -m 755 openbox "%{?buildroot}/usr/local/bin" + + +%files +%{_datadir}/spin-kickstarts/fedora-live-tde-base.ks +%{_datadir}/spin-kickstarts/fedora-livecd-tde.ks + +%files openbox +/usr/local/bin/openbox + + +%changelog +* Wed Nov 09 2011 Francois Andriot - 3.5.13-1 +- Initial build From ad0e3be60dfe5a9edf595aca9bee8210bc93ef1e Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 12 Nov 2011 17:24:36 +0100 Subject: [PATCH 10/18] ARTS: enable OSS support --- .../arts/arts-3.5.13-enable_oss.patch | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 redhat/dependencies/arts/arts-3.5.13-enable_oss.patch diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch new file mode 100644 index 000000000..0a6ab7c83 --- /dev/null +++ b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch @@ -0,0 +1,72 @@ +--- arts.3513/config.h.cmake.ORI 2011-11-12 00:33:38.784907854 +0100 ++++ arts.3513/config.h.cmake 2011-11-12 00:33:55.548557832 +0100 +@@ -28,3 +28,7 @@ + #cmakedefine HAVE_SND_PCM_RESUME 1 + #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1 + #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1 ++ ++#cmakedefine HAVE_SYS_SOUNDCARD_H 1 ++#cmakedefine HAVE_LIBPTHREAD 1 ++#define HAVE_IOCTL_INT_ULONGINT_DOTS 3 +--- arts.3513/artsc/CMakeLists.txt.ORI 2011-11-12 00:50:03.023418039 +0100 ++++ arts.3513/artsc/CMakeLists.txt 2011-11-12 00:50:19.776070197 +0100 +@@ -43,6 +43,7 @@ + include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ++ ${CMAKE_SOURCE_DIR}/artsc + ${CMAKE_BINARY_DIR}/mcop + ${CMAKE_SOURCE_DIR}/mcop + ${CMAKE_BINARY_DIR}/flow +@@ -64,7 +65,7 @@ + tde_add_library( artsdsp SHARED + SOURCES artsdsp.c + VERSION 0.0.0 +- LINK artsc-shared ++ LINK artsc-shared dl + DESTINATION ${LIB_INSTALL_DIR} + ) + +--- arts.3513/flow/CMakeLists.txt.ORI 2011-11-12 00:56:01.582978475 +0100 ++++ arts.3513/flow/CMakeLists.txt 2011-11-12 00:56:14.392712888 +0100 +@@ -15,6 +15,7 @@ + + include_directories( + ${CMAKE_BINARY_DIR} ++ ${CMAKE_SOURCE_DIR}/artsc + ${CMAKE_BINARY_DIR}/mcop + ${CMAKE_SOURCE_DIR}/mcop + ${CMAKE_CURRENT_BINARY_DIR} +--- arts.3513/mcop_mt/CMakeLists.txt.ORI 2011-11-12 00:59:06.148132592 +0100 ++++ arts.3513/mcop_mt/CMakeLists.txt 2011-11-12 01:16:08.584636258 +0100 +@@ -11,6 +11,11 @@ + + include_directories( + ${CMAKE_BINARY_DIR} ++ ${CMAKE_BINARY_DIR}/flow ++ ${CMAKE_BINARY_DIR}/mcop ++ ${CMAKE_SOURCE_DIR}/flow ++ ${CMAKE_SOURCE_DIR}/mcop ++ ${GLIB2_INCLUDE_DIRS} + ) + + +@@ -19,6 +24,6 @@ + tde_add_library( mcop_mt SHARED + SOURCES threads_posix.cc + VERSION 1.0.0 +- LINK artsflow-shared ++ LINK artsflow-shared pthread + DESTINATION ${LIB_INSTALL_DIR} + ) +--- arts/CMakeLists.txt.ORI 2011-11-12 01:20:34.671118554 +0100 ++++ arts/CMakeLists.txt 2011-11-12 01:22:04.857248409 +0100 +@@ -58,6 +58,8 @@ + check_include_file( "malloc.h" HAVE_MALLOC_H ) + check_include_file( "memory.h" HAVE_MEMORY_H ) + check_include_file( "dlfcn.h" HAVE_DLFCN_H ) ++check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H ) ++check_include_file( "pthread.h" HAVE_LIBPTHREAD ) + + + ##### check for system libraries ################ From b7bc75a7f79015c615ee5403f9fd459e846c05ac Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 12 Nov 2011 17:25:41 +0100 Subject: [PATCH 11/18] Updates kdebase for Fedora 16 --- .../kdebase-3.5.12-kickoff_unstable.patch | 13 +++++++++++++ .../kdebase-3.5.13-mediamanager_ftbfs.patch | 10 ++++++++++ redhat/kdebase/pamd.kcheckpass-trinity.fc16 | 5 +++++ redhat/kdebase/pamd.kdm-trinity-np.fc16 | 15 +++++++++++++++ redhat/kdebase/pamd.kdm-trinity.fc16 | 18 ++++++++++++++++++ redhat/kdebase/pamd.kscreensaver-trinity.fc16 | 5 +++++ 6 files changed, 66 insertions(+) create mode 100644 redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch create mode 100644 redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch create mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.fc16 create mode 100644 redhat/kdebase/pamd.kdm-trinity-np.fc16 create mode 100644 redhat/kdebase/pamd.kdm-trinity.fc16 create mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.fc16 diff --git a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch new file mode 100644 index 000000000..2a58f0020 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch @@ -0,0 +1,13 @@ +Index: ui/k_new_mnu.cpp +=================================================================== +--- ui/k_new_mnu.cpp (revision 1259264) ++++ ui/k_new_mnu.cpp (working copy) +@@ -3502,6 +3502,8 @@ + descr, "system:/media/" + name, nId++, -1 ); + + ++it; // skip separator ++ ++it; ++ ++it; + } + } + diff --git a/redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch b/redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch new file mode 100644 index 000000000..1d72b2378 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch @@ -0,0 +1,10 @@ +--- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI 2011-11-08 15:00:40.248406596 -0500 ++++ kdebase/kioslave/media/mediamanager/CMakeLists.txt 2011-11-08 15:00:56.417996538 -0500 +@@ -20,6 +20,7 @@ + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${HAL_INCLUDE_DIRS} ++ ${DBUS_TQT_INCLUDE_DIRS} + ) + + link_directories( diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.fc16 b/redhat/kdebase/pamd.kcheckpass-trinity.fc16 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kcheckpass-trinity.fc16 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/kdebase/pamd.kdm-trinity-np.fc16 b/redhat/kdebase/pamd.kdm-trinity-np.fc16 new file mode 100644 index 000000000..96fcfe378 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity-np.fc16 @@ -0,0 +1,15 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/kdebase/pamd.kdm-trinity.fc16 b/redhat/kdebase/pamd.kdm-trinity.fc16 new file mode 100644 index 000000000..ff7b155c6 --- /dev/null +++ b/redhat/kdebase/pamd.kdm-trinity.fc16 @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +-session optional pam_gnome_keyring.so auto_start +session include system-auth +session include postlogin diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.fc16 b/redhat/kdebase/pamd.kscreensaver-trinity.fc16 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/kdebase/pamd.kscreensaver-trinity.fc16 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth From 689b6fa4878d733803b859d4dbb1c6be4ec166cd Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 12 Nov 2011 17:26:18 +0100 Subject: [PATCH 12/18] RHEL/fedora: add dbus-1-tqt --- .../dbus-1-tqt/dbus-1-tqt-3.5.13.spec | 89 +++++++++++++++++++ .../dbus1tqt-3.5.13-memory_leak.patch | 16 ++++ 2 files changed, 105 insertions(+) create mode 100644 redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec create mode 100644 redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec new file mode 100644 index 000000000..02e7734f1 --- /dev/null +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec @@ -0,0 +1,89 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +BuildRequires: qt3-devel >= 3.3.8d +Requires: qt3 >= 3.3.8d + + +Name: dbus-1-tqt +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Summary: Dbus TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}.tar.gz + +# Fix for a nasty memleak in knetworkmanager +Patch0: dbus1tqt-3.5.13-memory_leak.patch + +BuildRequires: gcc-c++ +BuildRequires: dbus-devel +BuildRequires: tqtinterface-devel + +#Provides: dbus-1-qt + +%description +Dbus TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + +%description devel +Development files for %{name} + + +%prep +%setup -q -n dependencies/%{name} +%patch0 -p1 + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh + +%__mkdir build +cd build +%cmake .. +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_includedir} +%__make install DESTDIR=%{?buildroot} -C build + +%clean +%__rm -rf %{?buildroot} + +%files +%{_bindir}/dbusxml2qt3 +%{_libdir}/*.so.* + +%files devel +%{_includedir}/*.h +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc + +%changelog +* Tue Nov 11 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5, Fedora 15 and Fedora 16 + diff --git a/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch b/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch new file mode 100644 index 000000000..cae8fea03 --- /dev/null +++ b/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch @@ -0,0 +1,16 @@ +--- dbus-1-tqt/tqdbusconnection.cpp.ORI 2011-11-11 20:37:57.684881138 +0100 ++++ dbus-1-tqt/tqdbusconnection.cpp 2011-11-11 20:40:33.910795465 +0100 +@@ -285,7 +285,12 @@ + + dbus_message_unref(msg); + +- return TQT_DBusMessage::fromDBusMessage(reply); ++ TQT_DBusMessage mess = TQT_DBusMessage::fromDBusMessage(reply); ++ ++ /* XXX fromDbusMessage do a ref(), avoid leaking */ ++ dbus_message_unref(reply); ++ ++ return mess; + } + + void TQT_DBusConnection::flush() const From 70daaabb4fd5f3b559f5ef489377c9fe93a47f0d Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 12 Nov 2011 17:28:04 +0100 Subject: [PATCH 13/18] Fedora/Redhat: delete old patches --- redhat/kdeaddons/svn.patch | Bin 252 -> 0 bytes redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ | 264 ------------------- redhat/kdemultimedia/kdemultimedia-svn.patch | 19 -- 3 files changed, 283 deletions(-) delete mode 100644 redhat/kdeaddons/svn.patch delete mode 100755 redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ delete mode 100644 redhat/kdemultimedia/kdemultimedia-svn.patch diff --git a/redhat/kdeaddons/svn.patch b/redhat/kdeaddons/svn.patch deleted file mode 100644 index 10fb2d8f688da647ae7c3122e3041058a744a4f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmb8ny$*sf7=>Y1dlg?;Yum3>ek8_pb<#My5L&Q-R6;R^yYXJUF)=#2xSTgR!^0Q@ zE?Q$tW3E1k*4uj+UDeuwg=%p97(_i;9~wLIe&UDIei@^bOd?YV5{oq!G4f5OvQ)_= z0g4ilP)h%Cf0#Ls(|k5DS6@?WV0pS)1D#ia)&#a<2w_JciXsApEyx*;WdLKLcK)5t THQvJW0bTjIZgZ-OvjZnDI7&wA diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ deleted file mode 100755 index 4b98b33f9..000000000 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec~ +++ /dev/null @@ -1,264 +0,0 @@ -# Default version for this component -%if "%{?version}" == "" -%define version 3.5.13 -%endif -%define release 0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _variant .opt -%define _docdir %{_prefix}/share/doc -%endif - -# TDE 3.5.13 specific variables -BuildRequires: cmake >= 2.8 -%define tde_docdir %{_docdir}/kde -%define tde_libdir %{_libdir}/trinity - - -Name: trinity-kdelibs -Version: %{version} -Release: %{?release}%{?dist}%{?_variant} -License: GPL -Summary: Trinity KDE Libraries - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Source0: kdelibs-%{version}.tar.gz -Prefix: %{_prefix} - -BuildRequires: libtool -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: qt3-devel -BuildRequires: avahi-devel avahi-qt3-devel -#BuildRequires: lua-devel -BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel -BuildRequires: libutempter-devel -BuildRequires: bzip2-devel -BuildRequires: openssl-devel - -Requires: tqtinterface -Requires: trinity-arts -Requires: qt3 -Requires: avahi avahi-qt3 - -%if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs3 -%endif - -%description -Libraries for the Trinity K Desktop Environment - -%package devel -Requires: %{name} -Summary: %{name} - Development files -%if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs3-devel -%endif - -%description devel -Development files for %{name} - -%package apidocs -Requires: %{name} -Summary: %{name} - API documentation - -%description apidocs -This package includes the KDE 3 API documentation in HTML -format for easy browsing - -%prep -%setup -q -n kdelibs - -# Gets the cmake modules in current build directory -%__mkdir_p cmake/modules -%__cp -f %{_datadir}/cmake/*.* cmake/modules - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LD_LIBRARY_PATH="%{_libdir}" -export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" - -%__mkdir build -cd build -%cmake \ - -DWITH_ARTS=ON \ - -DWITH_ALSA=ON \ - -DWITH_LIBART=ON \ - -DWITH_LIBIDN=OFF \ - -DWITH_SSL=ON \ - -DWITH_CUPS=ON \ - -DWITH_LUA=OFF \ - -DWITH_TIFF=ON \ - -DWITH_JASPER=ON \ - -DWITH_OPENEXR=ON \ - -DWITH_UTEMPTER=ON \ - -DWITH_AVAHI=ON \ - -DWITH_ASPELL=OFF \ - -DWITH_HSPELL=OFF \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot} -%make_install -C build - -%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d -cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf -%if "%{?_prefix}" != "/usr" -%{_libdir} -%endif -%{_libdir}/trinity -EOF - -%clean -%__rm -rf %{?buildroot} - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc README -%doc COPYING.LIB -%{_bindir}/artsmessage -%{_bindir}/cupsdconf -%{_bindir}/cupsdoprint -%{_bindir}/dcop -%{_bindir}/dcopclient -%{_bindir}/dcopfind -%{_bindir}/dcopobject -%{_bindir}/dcopquit -%{_bindir}/dcopref -%{_bindir}/dcopserver -%{_bindir}/dcopserver_shutdown -%{_bindir}/dcopstart -%{_bindir}/filesharelist -%{_bindir}/fileshareset -%{_bindir}/imagetops -%{_bindir}/kab2kabc -%{_bindir}/kaddprinterwizard -%{_bindir}/kbuildsycoca -%{_bindir}/kcmshell -%{_bindir}/kconf_update -%{_bindir}/kcookiejar -%{_bindir}/kde-config -%{_bindir}/kde-menu -%{_bindir}/kded -%{_bindir}/kdeinit -%{_bindir}/kdeinit_shutdown -%{_bindir}/kdeinit_wrapper -%{_bindir}/kdesu_stub -%{_bindir}/kdontchangethehostname -%{_bindir}/kdostartupconfig -%{_bindir}/kfile -%{_bindir}/kfmexec -%{_bindir}/khotnewstuff -%{_bindir}/kinstalltheme -%{_bindir}/kio_http_cache_cleaner -%{_bindir}/kio_uiserver -%{_bindir}/kioexec -%{_bindir}/kioslave -%{_bindir}/klauncher -%{_bindir}/kmailservice -%{_bindir}/kmimelist -%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper -%{_bindir}/ksendbugmail -%{_bindir}/kshell -%{_bindir}/kstartupconfig -%{_bindir}/ktelnetservice -%{_bindir}/ktradertest -%{_bindir}/kwrapper -%{_bindir}/lnusertemp -%{_bindir}/make_driver_db_cups -%{_bindir}/make_driver_db_lpr -%{_bindir}/meinproc -%{_bindir}/networkstatustestservice -%{_bindir}/start_kdeinit -%{_bindir}/start_kdeinit_wrapper -%attr(4755,root,root) %{_bindir}/kgrantpty -%{_libdir}/lib*.so.* -%{_libdir}/libkdeinit_*.so -%{_libdir}/lib*.la -%{tde_libdir}/ -%{_datadir}/applications/kde/*.desktop -%{_datadir}/autostart/kab2kabc.desktop -%{_datadir}/applnk/kio_iso.desktop -%{_datadir}/apps/* -%exclude %{_datadir}/apps/ksgmltools2/ -%config(noreplace) %{_datadir}/config/* -%{_datadir}/emoticons/* -%{_datadir}/icons/default.kde -%{_datadir}/mimelnk/magic -%{_datadir}/mimelnk/*/*.desktop -%{_datadir}/services/* -%{_datadir}/servicetypes/* -%{_datadir}/icons/crystalsvg/ -%{tde_docdir}/HTML/en/kspell -# remove conflicts with kdelibs-4 -%if "%{?_prefix}" != "/usr" -%{_bindir}/checkXML -%{_bindir}/ksvgtopng -%{_bindir}/kunittestmodrunner -%{_bindir}/preparetips -%{_datadir}/icons/hicolor/index.theme -%{_datadir}/locale/all_languages -%{tde_docdir}/HTML/en/common/* -%else -%exclude %{_bindir}/checkXML -%exclude %{_bindir}/ksvgtopng -%exclude %{_bindir}/kunittestmodrunner -%exclude %{_bindir}/preparetips -%exclude %{_datadir}/config/colors -%exclude %{_datadir}/config/kdebug.areas -%exclude %{_datadir}/config/kdebugrc -%exclude %{_datadir}/config/ksslcalist -%exclude %{_datadir}/config/ui/ui_standards.rc -%exclude %{_datadir}/icons/hicolor/index.theme -%exclude %{_datadir}/locale/all_languages -%exclude %{tde_docdir}/HTML/en/common/* -%endif -%{_sysconfdir}/ld.so.conf.d/trinity.conf - -# Provided by 'redhat-menus' package -%exclude %{_sysconfdir}/xdg/menus/applications.menu - -# New in TDE 3.5.13 -%{_bindir}/kdetcompmgr - -%files devel -%defattr(-,root,root,-) -%{_bindir}/dcopidl* -%{_bindir}/kconfig_compiler -%{_bindir}/makekdewidgets -%{_datadir}/apps/ksgmltools2/ -%{_includedir}/ -%{_libdir}/lib*.so -%{_libdir}/lib*.a -%exclude %{_libdir}/libkdeinit_*.so - -# New in TDE 3.5.13 -%{_datadir}/cmake/kdelibs.cmake - -%files apidocs -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version}/ -#%{tde_docdir}/HTML/en/kdelibs* - - -%changelog -* Wed Sep 02 2011 Francois Andriot - 3.5.13pre.svn20110902-0.el6 -- Import to GIT -- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/kdemultimedia/kdemultimedia-svn.patch b/redhat/kdemultimedia/kdemultimedia-svn.patch deleted file mode 100644 index 669309d3f..000000000 --- a/redhat/kdemultimedia/kdemultimedia-svn.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** configure.in.in.ORI 2011-09-10 21:38:57.805533683 +0200 ---- configure.in.in 2011-09-10 21:39:08.687283728 +0200 -*************** -*** 542,548 **** - if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then - LIB_ARTS="-lartskde" - ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] -! ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" - AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) - else - build_arts="no" ---- 542,548 ---- - if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then - LIB_ARTS="-lartskde" - ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] -! ARTS_CFLAGS="-I$ARTS_PREFIX/include" - AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) - else - build_arts="no" From 020bf83511bd20e1ab3ff699fbeecdb9a76bf525 Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Sun, 13 Nov 2011 19:20:38 -0500 Subject: [PATCH 14/18] Added the 3.5.13 Release PKGBUILDs. --- .../3.5.13/trinity-base/trinity-arts/PKGBUILD | 80 +++++++++++ .../trinity-base/trinity-dbus-1-qt3/PKGBUILD | 31 +++++ .../trinity-base/trinity-dbus-tqt-1/PKGBUILD | 61 ++++++++ .../trinity-base/trinity-dbus-tqt/PKGBUILD | 65 +++++++++ .../trinity-base/trinity-kdebase/PKGBUILD | 131 ++++++++++++++++++ .../trinity-base/trinity-kdebase/dbusfix.diff | 11 ++ .../trinity-kdebase/trinity.desktop | 8 ++ .../trinity-base/trinity-kdelibs/PKGBUILD | 81 +++++++++++ .../trinity-kdelibs/trinity-kdelibs.install | 11 ++ .../trinity-base/trinity-kdelibs/trinity.sh | 14 ++ .../trinity-base/trinity-pyqt3/PKGBUILD | 41 ++++++ arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 65 +++++++++ .../trinity-tqtinterface/PKGBUILD | 79 +++++++++++ .../trinity-extras/trinity-amarok/PKGBUILD | 67 +++++++++ .../trinity-gtk-qt-engine/PKGBUILD | 63 +++++++++ .../trinity-kdegraphics/GSmartPointer.h.patch | 10 ++ .../trinity-kdegraphics/PKGBUILD | 89 ++++++++++++ .../trinity-extras/trinity-kdevelop/PKGBUILD | 60 ++++++++ .../trinity-kpowersave/PKGBUILD | 68 +++++++++ .../kpowersave-inactivity.cpp.patch | 11 ++ .../trinity-extras/trinity-qtcurve/PKGBUILD | 64 +++++++++ 21 files changed, 1110 insertions(+) create mode 100644 arch/3.5.13/trinity-base/trinity-arts/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.diff create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/trinity.desktop create mode 100644 arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-kdelibs/trinity-kdelibs.install create mode 100644 arch/3.5.13/trinity-base/trinity-kdelibs/trinity.sh create mode 100644 arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD create mode 100644 arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD create mode 100644 arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD create mode 100644 arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD create mode 100644 arch/3.5.13/trinity-extras/trinity-kdegraphics/GSmartPointer.h.patch create mode 100644 arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD create mode 100644 arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD create mode 100644 arch/3.5.13/trinity-extras/trinity-kpowersave/PKGBUILD create mode 100644 arch/3.5.13/trinity-extras/trinity-kpowersave/kpowersave-inactivity.cpp.patch create mode 100644 arch/3.5.13/trinity-extras/trinity-qtcurve/PKGBUILD diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD new file mode 100644 index 000000000..3edb15cde --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-arts +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL') +groups=('trinity-base') +pkgdesc="Trinity - arts" +depends=('audiofile' + 'alsa-lib' + 'libmad' + 'libvorbis' + 'trinity-tqtinterface') +makedepends=('pkgconfig' 'cmake' 'autoconf') +provides=('trinity-arts') +conflicts=('trinity-arts') +replaces=('trinity-arts') +options=('libtool' '!strip') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz) +md5sums=('109124dabb1aaa9d44eb32e43b549142') + +# set Qt location (not needed if profile.d/q3.sh present, set prefix (not used) +_qtdir=/opt/qt +_prefix=${_qtdir} + +build() { + + + msg "Setting PATH, CMAKE and Trinity Environment variables" + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + [[ -n $QTDIR ]] && _qtdir=$QTDIR + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + + # exports not required with /opt/qt/include in the right place + # export CMAKE_PREFIX_PATH=$QTDIR + # export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt + + trinity_prefix="/opt/trinity" + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/dependencies/arts/ \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DQT_VERSION=3 || return 1 + +# -DQT_VERSION=3 \ +# -DWITH_QT3=ON \ +# -DQT_LIBRARY_DIRS=/opt/qt/lib + + make VERBOSE=1 + +} + +package() { + msg "Packaging - $pkgname-$pkgver" + +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + +# rm -r ${srcdir}/${_svnmod} +} diff --git a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD new file mode 100644 index 000000000..12824d782 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: David C. Rankin + +pkgname=trinity-dbus-1-qt3 +pkgver=0.9 +pkgrel=8 +arch=('i686' 'x86_64') +pkgdesc="DBUS/Qt3 bindings." +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +license=('GPL') +groups=('trinity-base') +pkgdesc="Trinity - dbus-1-qt3" +depends=('dbus' 'trinity-qt3' 'networkmanager') +provides=('trinity-dbus-1-qt3' 'dbus-1-qt3') +conflicts=('dbus-1-qt3') +replaces=('dbus-1-qt3') +options=('libtool' '!strip') +source=(http://people.freedesktop.org/~krake/dbus-1-qt3/${pkgname#*trinity-}-${pkgver}.tar.gz) +md5sums=('8ca3d13c372126aa9b0e16beb0a9d82d') + +build() { + cd $srcdir/${pkgname#*trinity-}-$pkgver + + . /etc/profile.d/qt3.sh + ./configure --prefix=$QTDIR + make || return 1 + make DESTDIR="$pkgdir/" install + + # Libtool slay +# find $startdir/pkg -name *.la -exec rm {} \; +} diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD new file mode 100644 index 000000000..3a6163729 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD @@ -0,0 +1,61 @@ +pkgname=trinity-dbus-tqt-1 +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity-base') +pkgdesc="Trinity - kdebase" +depends=('trinity-tqtinterface') +makedepends=('pkgconfig' 'cmake') +options=('libtool' '!strip') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz) +md5sums=('a7ba1071f4bf7b5930f805b4036f8a97') +_svnmod=dependencies/dbus-1-tqt + +_qtdir=/opt/qt +_prefix="/opt/trinity" + + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + [[ -n $QTDIR ]] && _qtdir=$QTDIR + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\ +/usr/include/dbus-1.0:\ +/opt/trinity/include:\ +/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON + make +# -DWITH_QT3=ON \ +# -DQTDIR=/opt/qt \ +# -DQT_LIBRARY_DIRS=/opt/qt/lib \ +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + + cd ${startdir} +} diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD new file mode 100644 index 000000000..3ff9e07a7 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD @@ -0,0 +1,65 @@ +pkgname=trinity-dbus-tqt +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity') +pkgdesc="Trinity - kdebase" +depends=('trinity-tqtinterface') +makedepends=('pkgconfig' 'cmake') +provides=('trinity-dbus-tqt') +conflicts=('trinity-dbus-tqt') +replaces=('trinity-dbus-tqt') +options=('libtool' '!strip') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz) +md5sums=('46ae165c068271485c827f6fc6687a9a') + + +_svnmod=dependencies/dbus-tqt +_qtdir=/opt/qt +_prefix="/opt/trinity" + + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + [[ -n $QTDIR ]] && _qtdir=$QTDIR + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\ +/usr/include/dbus-1.0:\ +/opt/trinity/include:\ +/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON + make +# -DWITH_QT3=ON \ +# -DQTDIR=/opt/qt \ +# -DQT_LIBRARY_DIRS=/opt/qt/lib \ +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + + cd ${startdir} +} diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD new file mode 100644 index 000000000..e43079bdd --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -0,0 +1,131 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-kdebase +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity-base') +pkgdesc="Trinity - kdebase" +depends=('hal' 'trinity-dbus-1-qt3' 'trinity-arts' 'trinity-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1' 'trinity-dbus-tqt' 'trinity-kdelibs') +makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') +optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' + 'pciutils: PCI bus configuration space access library and tools' + 'xscreensaver: Screen saver and locker for the X Window System') +options=('libtool' '!strip') +source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff') +md5sums=('d1f7e1f94eeb46b981fe1ba144179840' + 'c9ce810c281002440a6de8cfd8735d07') + +_qtdir=/opt/qt +_prefix="/opt/trinity" + +_tdesktop() { + # create/install desktop + install -d -m755 ${pkgdir}/etc/X11/sessions + echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo "Exec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo "TryExec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop +} + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + [[ -n $QTDIR ]] && _qtdir=$QTDIR + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/trinity/include/dbus-1-tqt/:/opt/trinity/include/dbus-1.0/:/opt/trinity/include:/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/opt/qt/lib:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig:$PKG_CONFIG_PATH + echo $PKG_CONFIG_PATH + + patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < ${srcdir}/dbusfix.diff + cd $srcdir + + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/kdebase --debug-output \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DWITH_XFIXES=ON \ + -DWITH_HAL=ON \ + -DWITH_ARTS=ON \ + -DWITH_SASL=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_XCOMPOSITE=ON \ + -DWITH_XCURSOR=ON \ + -DWITH_XRANDR=ON \ + -DWITH_XRENDER=ON \ + -DWITH_XDAMAGE=ON \ + -DWITH_SHADOW=ON \ + -DWITH_XDMCP=ON \ + -DWITH_XINERAMA=ON \ + -DWITH_XEXT=ON \ + -DWITH_PAM=ON \ + -DBUILD_ALL=ON \ + -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0 + make +# -DWITH_QT3=ON \ +# -DQTDIR=/opt/qt \ +# -DQT_LIBRARY_DIRS=/opt/qt/lib \ +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + + cd ${startdir} + + # install desktop and update kdmrc and Xsession +# [[ -f trinity.desktop ]] && { +# install -d -m755 ${pkgdir}/etc/X11/sessions +# install -m644 trinity.desktop ${pkgdir}/etc/X11/sessions +# } + _tdesktop + [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop" + + # set kdm directory + _kdmdir=${_prefix}/share/config/kdm + [[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} + + # install kdmrc + [[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir} + + # update the Xsession file + [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir} + + # create the starttrinity link + [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin + cd ${pkgdir}/usr/bin + ln -sf /opt/trinity/bin/startkde starttrinity + + cd ${startdir} + +# rm -r ${srcdir}/${_svnmod} +} diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.diff b/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.diff new file mode 100644 index 000000000..8e37b4148 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.diff @@ -0,0 +1,11 @@ +--- halbackend.h 2010-08-12 18:37:24.000000000 -0400 ++++ halbackend.h~ 2011-11-03 22:15:02.002228291 -0400 +@@ -40,7 +40,7 @@ + /* We acknowledge the the dbus API is unstable */ + #define DBUS_API_SUBJECT_TO_CHANGE + /* DBus-Qt bindings */ +-#include ++#include "/opt/trinity/include/dbus-1.0/dbus/connection.h" + /* HAL libraries */ + #include + #include diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/trinity.desktop b/arch/3.5.13/trinity-base/trinity-kdebase/trinity.desktop new file mode 100644 index 000000000..30c209f5d --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/trinity.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=XSession +Exec=/opt/trinity/bin/startkde +TryExec=/opt/trinity/bin/startkde +Name=Trinity +Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment + diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD new file mode 100644 index 000000000..4d6e59068 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -0,0 +1,81 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-kdelibs +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL') +groups=('trinity-base') +pkgdesc="Trinity - kdelibs" +depends=('libical' + 'libxslt' + 'avahi' + 'pam-krb5' + 'taglib' + 'trinity-arts') +makedepends=('pkgconfig' 'cmake' 'autoconf' ) +provides=('trinity-kdelibs' 'kdelibs3') +conflicts=('trinity-kdelibs' 'kdelibs3') +replaces=('trinity-kdelibs') +options=('libtool' '!strip' '!makeflags') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz) +md5sums=('f62eefb63b4ba2141b4c576f859806dd') + + +qtdir=/opt/qt +trinity_prefix="/opt/trinity" + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + [[ -n $QTDIR ]] && _qtdir=$QTDIR + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/bin + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/qt/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/kdelibs \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=OFF \ + -DQT_VERSION=3 \ + -DWITH_QT3=ON \ + -DQTDIR=/opt/qt \ + -DQT_LIBRARY_DIRS=/opt/qt/lib \ + -DWITH_PAM=ON \ + -DBUILD_ALL=ON + make +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + + install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ + echo "${trinity_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf + + install -d -m755 ${pkgdir}/etc/profile.d/ + install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/ + +# rm -r ${srcdir}/${_svnmod} +} diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/trinity-kdelibs.install b/arch/3.5.13/trinity-base/trinity-kdelibs/trinity-kdelibs.install new file mode 100644 index 000000000..e2db661ac --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/trinity-kdelibs.install @@ -0,0 +1,11 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/trinity.sh b/arch/3.5.13/trinity-base/trinity-kdelibs/trinity.sh new file mode 100644 index 000000000..cd28e88c4 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/trinity.sh @@ -0,0 +1,14 @@ +export KDEDIR=/opt/trinity +export KDEDIRS=$KDEDIR:/usr +export PATH=$KDEDIR/bin:$PATH +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib/pkgconfig +if [ ! -z $XDG_DATA_DIRS ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDEDIR/share +else + export XDG_DATA_DIRS=$KDEDIR/share +fi +if [ ! -z $XDG_CONFIG_DIRS ]; then + export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$KDEDIR/etc/xdg +else + export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg +fi diff --git a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD new file mode 100644 index 000000000..88db1ddf7 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-pyqt3 +pkgver=3.18.1 +pkgrel=1 +pkgdesc="A set of Python bindings for the Qt3 toolkit" +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.com/software/pyqt/intro" +groups=('trinity-base') +depends=('python2-sip' 'qscintilla-qt3' 'trinity-qt3') +license=('GPL') +provides=('trinity-pyqt3' 'pyqt3') +conflicts=('pyqt3') +replaces=('trinity-pyqt3') +source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('f1d120495d1aaf393819e988c0a7bb7e') + +build() { + cd ${srcdir}/PyQt-x11-gpl-${pkgver} + + . /etc/profile.d/qt3.sh + + export QMAKESPEC="/opt/qt/mkspecs/default" + + echo yes | python2.7 configure.py -q /opt/qt/ + + make +} + +package() { + cd ${srcdir}/PyQt-x11-gpl-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD new file mode 100644 index 000000000..cd9385df2 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: Calvin Morrison +pkgname=trinity-qt3 +pkgver=3884 +pkgrel=1 +pkgdesc="The Qt3 gui toolkit - with Trinity upstream" +_prefix="/opt/qt" +arch=('i686' 'x86_64') +license=('GPL') +url="http://trinitydesktop.org" +# install=qt.install +groups=('trinity-base') +depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu' 'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs' 'unixodbc') +makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3') +optdepends=() +# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +provides=('trinity-qt3' 'qt3') +conflicts=('qt3' 'qt3-enhanced') +replaces=('trinity-qt3') +_prefix="opt/qt" +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz) +md5sums=('78dc675e84aed595375449818cbb589a') +options=(!libtool) + +build() { + export QTDIR="${srcdir}/qt3/" + export PATH=${QTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + + if [ "$CARCH" = "x86_64" ]; then + export ARCH="-64" + else unset ARCH +fi + + cd "${srcdir}/qt3" + + rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} + + msg "Starting configure..." + #make -C qmake || return 1 + ./configure -prefix ${_prefix} \ + -fast \ + -sysconfdir /etc/qt \ + -thread \ + -shared \ + -system-zlib \ + -platform linux-g++$ARCH \ + -system-lib{png,jpeg,mng} + make + +} + +package() { + cd "$srcdir/qt3" + + # Build and install qt.profile + echo "export QTDIR=/${_prefix}" > ${srcdir}/qt.profile + echo "export QT_XFT=true" >> ${srcdir}/qt.profile + echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile + echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile + install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh + + make INSTALL_ROOT="$pkgdir/" install + +} diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD new file mode 100644 index 000000000..966bdf992 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -0,0 +1,79 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-tqtinterface +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://trinity.pearsoncomputing.net" +license=('GPL2') +groups=('trinity-base') +pkgdesc="Trinity - tqtinterface" +depends=('python2-sip' + 'trinity-qt3' + 'trinity-pyqt3') +makedepends=( + 'pkgconfig' + 'cmake' + 'autoconf' + 'libxi' + 'libxft' + 'libxrandr' + 'libxcursor' + 'libxinerama' + 'mesa') +provides=('trinity-tqtinterface') +conflicts=('trinity-tqtinterface') +replaces=('trinity-tqtinterface') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz) +md5sums=('d54cc9fd0b35555298efd17c32471a2b') + +_qtdir=/opt/qt +_prefix=/opt/trinity + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + + echo $PATH + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake "../dependencies/tqtinterface" -DCMAKE_INSTALL_PREFIX=${_prefix} -DQT_PREFIX_DIR=/opt/qt/ -DQT_LIBRARY_DIRS=/opt/qt/lib -DQT_INCLUDE_DIR=/opt/qt/include -DQT_VERSION=3 -DMOC_EXECUTABLE=${_qtdir}/bin/moc || return 1 +# -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt +# -DWITH_QT3=ON \ +# -DQT_LIBRARY_DIRS=/opt/qt/lib \ +# -DCMAKE_SKIP_RPATH=ON || return 1 + make +} + +package() { + + msg "Packaging - $pkgname-$pkgver" + +# cd ${_svnmod} + cd ${srcdir}/build + make DESTDIR="$pkgdir/" install + + # include uic-tqt in package +# cd ${srcdir} +# mkdir -p ${pkgdir}/usr/bin +# cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin + +# rm -r ${srcdir}/${_svnmod} +} diff --git a/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD new file mode 100644 index 000000000..402414894 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-amarok +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity-extras') +pkgdesc="Trinity - Amarok music player " +depends=('trinity-kdebase' 'libifp' 'libmtp' 'libnjb' 'python-daap') +makedepends=('pkgconfig' 'cmake' 'imake') +options=('libtool' '!strip') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/amarok-3.5.13.tar.gz) +md5sums=('7145ebee38f104bef6cfaf56e7f81959') + +_svnmod=applications/amarok + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig + + trinity_prefix="/opt/trinity" + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + # Baho additions + CFLAGS=${CFLAGS}" -fpermissive" + CXXFLAGS=${CXXFLAGS}" -fpermissive" + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DWITH_IFP=ON \ + -DWITH_NJB=ON \ + -DWITH_MTP=ON \ + -DWITH_DAAP=ON \ + -DBUILD_ALL=ON + make +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + +# rm -r ${srcdir}/${_svnmod} +} diff --git a/arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD new file mode 100644 index 000000000..e68ddf895 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-gtk-qt-engine/PKGBUILD @@ -0,0 +1,63 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-gtk-qt-engine +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL') +groups=('trinity-extras') +pkgdesc="Trinity - Qt wrapper for GTK, makes gtk2 apps look pretty under TDE" +depends=('trinity-kdebase') +makedepends=('pkgconfig' 'cmake' 'imake') +options=('libtool' '!strip') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/gtk-qt-engine-3.5.13.tar.gz) +md5sums=('96da675949ef8743d4fe91531f734030') + +_svnmod=applications/gtk-qt-engine + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + + trinity_prefix="/opt/trinity" + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DWITH_QT3=ON \ + -DQTDIR=/opt/qt \ + -DQT_DOCDIR=/opt/qt/man \ + -DQT_LIBRARY_DIRS=/opt/qt/lib \ + -DBUILD_ALL=ON + make +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + +# rm -r ${srcdir}/${_svnmod} +} diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/GSmartPointer.h.patch b/arch/3.5.13/trinity-extras/trinity-kdegraphics/GSmartPointer.h.patch new file mode 100644 index 000000000..4634f8ca0 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/GSmartPointer.h.patch @@ -0,0 +1,10 @@ +--- kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h ++++ kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h 2011-05-08 11:47:20.000000000 -0500 +@@ -56,6 +56,7 @@ + + #ifndef _GSMARTPOINTER_H_ + #define _GSMARTPOINTER_H_ ++#include + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD new file mode 100644 index 000000000..a6a365c64 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-kdegraphics +pkgver=3513 +pkgrel=1.0 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL') +groups=('trinity-extras') +pkgdesc="Trinity - kdegraphics" +depends=('trinity-kdebase' 'libart-lgpl' 'libgphoto2' 'libtiff' 'openexr' 't1lib') +makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi') +# 'poppler-qt' +optdepends=('xscreensaver: Screen saver and locker for the X Window System') +provides=('trinity-kdegraphics') +conflicts=('trinity-kdegraphics') +replaces=('trinity-kdegraphics') +options=('libtool' '!strip') +source=('GSmartPointer.h.patch' 'http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdegraphics-3.5.13.tar.gz') +md5sums=('7b93c9bdf1208df453c9838519fab109' 'a75c254cd1060343cd04c6744bce6798') + +_svnmod=kdegraphics +trinity_prefix="/opt/trinity" + +build() { + + # patch for gcc-4.6 + if grep -q cstddef ${srcdir}/kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h; then + msg "Patch for GCC 4.6 - Previously Applied" + else + msg "Applying Patch for GCC 4.6" + patch -p0 -i ${srcdir}/GSmartPointer.h.patch || return 1 + fi + + msg "Setting PATH, CMAKE and Trinity Environment variables" + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + [[ -n $QTDIR ]] && _qtdir=$QTDIR + else + [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + fi + + export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DCMAKE_CXX_FLAGS="-fpermissive" \ + -DWITH_T1LIB=ON \ + -DWITH_LIBPAPER=ON \ + -DWITH_TIFF=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_PAM=ON \ + -DBUILD_ALL=ON + make + +# -DWITH_PDF=ON \ (waiting on poppler-qt3) + +# -DWITH_QT3=ON \ +# -DQTDIR=/opt/qt \ +# -DQT_LIBRARY_DIRS=/opt/qt/lib \ +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + + cd ${startdir} +} diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD new file mode 100644 index 000000000..2b04cd679 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-kdevelop +pkgver=12345 +pkgrel=1.0 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL') +groups=('trinity-extras') +pkgdesc="Trinity - kdevelop" +depends=('trinity-kdebase') +# 'xorg' +makedepends=('pkgconfig' 'cmake' 'imake') +options=('libtool' '!strip') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdevelop-3.5.13.tar.gz) +md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0') +_svnmod=kdevelop + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + + trinity_prefix="/opt/trinity" + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DWITH_QT3=ON \ + -DQTDIR=/opt/qt \ + -DQT_DOCDIR=/opt/qt/man \ + -DQT_LIBRARY_DIRS=/opt/qt/lib \ + -DBUILD_ALL=ON + make +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install +} diff --git a/arch/3.5.13/trinity-extras/trinity-kpowersave/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kpowersave/PKGBUILD new file mode 100644 index 000000000..566bb4d98 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-kpowersave/PKGBUILD @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-kpowersave +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity-extras') +pkgdesc="Trinity - kpowersave" +depends=('xscreensaver' + 'libxss' + 'trinity-kdebase') +makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake') +options=('libtool' '!strip') +source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kpowersave-3.5.13.tar.gz) +md5sums=('c887eb282fd035655b370f133ce58664') + +_svnmod=applications/kpowersave + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + + # patch for inactivity.cpp + # patch -p0 -i ${srcdir}/kpowersave-app-inactivity.cpp.patch || return 1 + + trinity_prefix="/opt/trinity" + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DWITH_QT3=ON \ + -DQTDIR=/opt/qt \ + -DQT_DOCDIR=/opt/qt/man \ + -DQT_LIBRARY_DIRS=/opt/qt/lib \ + -DBUILD_ALL=ON + make +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + +# rm -r ${srcdir}/${_svnmod} +} diff --git a/arch/3.5.13/trinity-extras/trinity-kpowersave/kpowersave-inactivity.cpp.patch b/arch/3.5.13/trinity-extras/trinity-kpowersave/kpowersave-inactivity.cpp.patch new file mode 100644 index 000000000..08645af32 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-kpowersave/kpowersave-inactivity.cpp.patch @@ -0,0 +1,11 @@ +--- kpowersave/src/inactivity.cpp ++++ kpowersave/src/inactivity.cpp 2011-03-12 18:40:52.000000000 -0600 +@@ -325,7 +325,7 @@ + blacklisted_running = false; + } + else { +- if (pids.contains(QRegExp::QRegExp("[0-9]"))) { ++ if (pids.contains(QRegExp("[0-9]"))) { + kdDebug() << "BLACKLISTED IS RUNNING" << endl; + blacklisted_running = true; + blacklisted_running_last = idleTime; diff --git a/arch/3.5.13/trinity-extras/trinity-qtcurve/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-qtcurve/PKGBUILD new file mode 100644 index 000000000..c8385a361 --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-qtcurve/PKGBUILD @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: David C. Rankin +# +# All modifications and uses of this file are licensed under +# the software for which this file was made for, should the software +# be under an Open Source License, at least version 1.9, defined +# by the Open Source Initiative. In other cases, this file is automatically +# released to the Public Domain. +# + +pkgname=trinity-qtcurve +pkgver=3513 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('trinity-extras') +pkgdesc="Trinity - Trinity style QtCurve" +depends=('trinity-kdebase') +makedepends=('pkgconfig' 'cmake' 'imake') +options=('libtool' '!strip') +source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-qtcurve-3.5.13.tar.gz') +_svnmod=applications/kde-style-qtcurve +md5sums=('98133893b9c6736804d4dfc134a3a256') + +build() { + + msg "Setting PATH, CMAKE and Trinity Environment variables" + export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity + export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + +# cd ${srcdir}/${_svnmod} + + trinity_prefix="/opt/trinity" + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${_svnmod} \ + -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DWITH_QT3=ON \ + -DQTDIR=/opt/qt \ + -DQT_DOCDIR=/opt/qt/man \ + -DQT_LIBRARY_DIRS=/opt/qt/lib \ + -DBUILD_ALL=ON + make +} + +package() { + msg "Packaging - $pkgname-$pkgver" +# cd ${srcdir}/${_svnmod} + cd ${srcdir}/build + + make DESTDIR="$pkgdir/" install + +# rm -r ${srcdir}/${_svnmod} +} From 7123ebd91f9851d8a0479d043508ec5885e24f91 Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Sun, 13 Nov 2011 19:22:56 -0500 Subject: [PATCH 15/18] removed old calvin folder --- arch/calvin/trinity-qt3/189checkservices.sh | 47 --- arch/calvin/trinity-qt3/PKGBUILD | 86 ------ arch/calvin/trinity-qt3/PKGBUILD-old | 276 ------------------ .../old-patches/eastern_asian_languagues.diff | 39 --- .../trinity-qt3/old-patches/gcc46-arch.diff | 61 ---- .../trinity-qt3/old-patches/mysql.patch | 47 --- .../old-patches/qt-copy-kde-patches.tar.bz2 | Bin 31498 -> 0 bytes .../old-patches/qt-font-default-subst.diff | 77 ----- .../trinity-qt3/old-patches/qt-odbc.patch | 19 -- .../old-patches/qt-patches.tar.bz2 | Bin 3708 -> 0 bytes .../trinity-qt3/old-patches/qt3-png14.patch | 33 --- .../old-patches/qt3_3.3.8c.arch.diff | 72 ----- .../trinity-qt3/old-patches/utf8-bug-qt3.diff | 101 ------- arch/calvin/trinity-qt3/qt.install | 12 - arch/calvin/trinity-qt3/qt.profile | 4 - 15 files changed, 874 deletions(-) delete mode 100644 arch/calvin/trinity-qt3/189checkservices.sh delete mode 100644 arch/calvin/trinity-qt3/PKGBUILD delete mode 100644 arch/calvin/trinity-qt3/PKGBUILD-old delete mode 100644 arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff delete mode 100644 arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff delete mode 100644 arch/calvin/trinity-qt3/old-patches/mysql.patch delete mode 100644 arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2 delete mode 100644 arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff delete mode 100644 arch/calvin/trinity-qt3/old-patches/qt-odbc.patch delete mode 100644 arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2 delete mode 100644 arch/calvin/trinity-qt3/old-patches/qt3-png14.patch delete mode 100644 arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff delete mode 100644 arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff delete mode 100644 arch/calvin/trinity-qt3/qt.install delete mode 100644 arch/calvin/trinity-qt3/qt.profile diff --git a/arch/calvin/trinity-qt3/189checkservices.sh b/arch/calvin/trinity-qt3/189checkservices.sh deleted file mode 100644 index bca50c93d..000000000 --- a/arch/calvin/trinity-qt3/189checkservices.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -IP_ADDRESS_1=97.64.229.82 -IP_ADDRESS_2=97.64.229.83 - -STATUS_1=0 -STATUS_2=0 - -CURDATE=$('date') - -netcat -z ${IP_ADDRESS_1} 80 -if [ $? -eq 0 ] -then - STATUS_1=1 -else - sleep 5 - netcat -z ${IP_ADDRESS_1} 80 - if [ $? -eq 0 ] - then - STATUS_1=1 - else - echo "Interface 1 is DOWN" - fi -fi - -netcat -z ${IP_ADDRESS_2} 80 -if [ $? -eq 0 ] -then - STATUS_2=1 -else - sleep 5 - netcat -z ${IP_ADDRESS_2} 80 - if [ $? -eq 0 ] - then - STATUS_2=1 - else - echo "Interface 2 is DOWN" - fi -fi - -if [[ STATUS_1 == 0 ]]; then - mail -s "[SERVICE FAILURE NOTIFICATION] pearsoncomputing.net" kb9vqf@pearsoncomputing.net < "The network interface ${IP_ADDRESS_1}:80 failed to respond on ${CURDATE}" -fi - -if [[ STATUS_2 == 0 ]]; then - mail -s "[SERVICE FAILURE NOTIFICATION] pearsoncomputing.net" kb9vqf@pearsoncomputing.net < "The network interface ${IP_ADDRESS_2}:80 failed to respond on ${CURDATE}" -fi diff --git a/arch/calvin/trinity-qt3/PKGBUILD b/arch/calvin/trinity-qt3/PKGBUILD deleted file mode 100644 index 2fe272238..000000000 --- a/arch/calvin/trinity-qt3/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# Maintainer: Calvin Morrison -pkgname=trinity-qt3 -pkgver=20110919 -pkgrel=1 -pkgdesc="The Qt3 gui toolkit - with Trinity upstream" -_prefix="/opt/qt" -arch=('i686' 'x86_64') -license=('GPL') -url="http://trinitydesktop.org" -# install=qt.install -groups=('trinity') -depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu' 'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs' 'unixodbc') -makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3') -optdepends=() -# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') -provides=('trinity-qt3' 'qt3') -conflicts=('qt3' 'qt3-enhanced') -replaces=('trinity-qt3') -_prefix="opt/qt3" -source=() -options=(!libtool) - - -_gitroot="http://scm.trinitydesktop.org/scm/git/tde" -_gitname="tde/main/dependencies/qt3" - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - - export QTDIR="${srcdir}/"$_gitname - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - - if [ "$CARCH" = "x86_64" ]; then - export ARCH="-64" - else unset ARCH -fi - - cd "$srcdir/$_gitname" - - - - rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - - - - msg "Starting configure..." - #make -C qmake || return 1 - ./configure -prefix ${_prefix} \ - -fast \ - -sysconfdir /etc/qt \ - -thread \ - -shared \ - -system-zlib \ - -platform linux-g++$ARCH \ - -system-lib{png,jpeg,mng} - make - -} - -package() { - cd "$srcdir/$_gitname" - - # Build and install qt.profile - echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile - echo "export QT_XFT=true" >> ${srcdir}/qt.profile - echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile - echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile - install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh - - make INSTALL_ROOT="$pkgdir/" install - -} diff --git a/arch/calvin/trinity-qt3/PKGBUILD-old b/arch/calvin/trinity-qt3/PKGBUILD-old deleted file mode 100644 index 1a38195e9..000000000 --- a/arch/calvin/trinity-qt3/PKGBUILD-old +++ /dev/null @@ -1,276 +0,0 @@ -# $Id$ -# Maintainer: David C. Rankin -# -# All modifications and uses of this file are licensed under -# the software for which this file was made for, should the software -# be under an Open Source License, at least version 1.9, defined -# by the Open Source Initiative. In other cases, this file is automatically -# released to the Public Domain. -# - -pkgname=trinity-qt3 -pkgver=3.3.8b -pkgrel=1 -pkgdesc="The Qt3 gui toolkit - with Trinity patch." -_prefix="opt/qt" -_patchver=3.3.8c -arch=(i686 x86_64) -license=('GPL') -url="http://www.trolltech.com/products/qt/index.html" -pkgfqn=qt-x11-free-${pkgver} -# install=qt.install -groups=('trinity-bld') -depends=('libjpeg-turbo' - 'libmng' - 'libmysqlclient' - 'libpng' - 'libxmu' - 'libxcursor' - 'libxinerama' - 'libxft' - 'libxrandr' - 'mesa' - 'postgresql-libs' - 'unixodbc') -makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3') -optdepends=() -# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') -provides=('trinity-qt3' 'qt3') -conflicts=('qt3' 'qt3-enhanced') -replaces=('trinity-qt3') -# 'ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz' -# ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8b.tar.gz -source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz - qt3-png14.patch - qt-patches.tar.bz2 - qt3-png14.patch - eastern_asian_languagues.diff - qt-odbc.patch - gcc46-arch.diff - qt3_3.3.8c.arch.diff) -# 'qt.profile' -# 'qt-copy-kde-patches.tar.bz2' -# 'utf8-bug-qt3.diff' -# 'mysql.patch' -# 'qt-font-default-subst.diff' -options=(!libtool) -md5sums=('9f05b4125cfe477cc52c9742c3c09009' - '1dc671df42b9030dbdf68bb61cd3375e' - '2f00e5c0c1e2c2a23dddc982cd79f3e0' - '1dc671df42b9030dbdf68bb61cd3375e' - '616f1f3029cf8375256ad6a406de3549' - '2178ca88dfd75a230918593b30eb0dbe' - '445d6937ad197fa31e1a8e4668d3caa6' - 'd763bdc087786a45e5e5eec84f5c9896') - -# gcc46.diff -# 'e77192301879b05a4b8ebc35d5c5702b' - -# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ -# other qt-patches come from fedora and gentoo - -build() { - unset QMAKESPEC - export QTDIR=${srcdir}/$pkgfqn - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - export CPATH=/usr/include/postgresql/server:/usr/include/mysql - - cd ${QTDIR} -# cd ${srcdir}/$pkgfqn - - # apply other qt patches and one security fix from debian/gentoo - for i in ../qt-patches/*; do - patch -Np1 -i $i || return 1 - done - # fix CJK font/chars select error (FS#11245) - patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1 - # fix build problem against new unixODBC - patch -p1 -i ${srcdir}/qt-odbc.patch || return 1 - patch -p0 -i ${srcdir}/qt3-png14.patch || return 1 - - # patch for gcc 4.6 - patch -p1 -i ${srcdir}/gcc46-arch.diff || return 1 - - # patch for qt3_3.3.8c - patch -p0 -i ${srcdir}/qt3_3.3.8c.arch.diff || return 1 - - # start compiling qt - # baho additions -# # remove runtime library search not needed when installed into /usr -# sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf - sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix - rm -rf doc/html examples tutorial - sed -i "s|sub-tutorial sub-examples||" Makefile - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf - sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix - sed -i "s|read acceptance|acceptance=yes|" configure - - # remove unwanted mkspecs - rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - - # set arch if x86_64 build - if [ "$CARCH" = "x86_64" ]; then - export ARCH="-64" - else unset ARCH - fi - -# ./configure -prefix /opt/qt -platform linux-g++$ARCH \ -# -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \ -# -system-lib{png,jpeg,mng} \ -# -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc} - - msg "Starting configure..." - ./configure -prefix ${_prefix} \ - -sysconfdir /etc/qt \ - -qt-gif \ - -system-zlib \ - -system-libjpeg \ - -plugin-imgfmt-jpeg \ - -system-libmng \ - -plugin-imgfmt-mng \ - -system-libpng \ - -plugin-imgfmt-png \ - -plugin-sql-mysql \ - -plugin-sql-psql \ - -plugin-sql-sqlite \ - -plugin-sql-odbc \ - -no-exceptions \ - -thread \ - -no-tablet - #-platform linux-g++ \ - -## remove custom locations from Baho's /usr install experiment -# -docdir ${_prefix}/share/doc/qt \ -# -headerdir ${_prefix}/include/qt \ -# -plugindir ${_prefix}/lib/qt/plugins \ -# -datadir ${_prefix}/share/qt \ -# -translationdir ${_prefix}/share/qt/translations \ - - # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile - -# bahoo make -# make sub-tools - - cd ${QTDIR} - make -C qmake || return 1 - cd ${QTDIR}/plugins/src/sqldrivers/mysql - ${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd ${QTDIR}/plugins/src/sqldrivers/psql - ${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro - - cd ${QTDIR} - # fix the broken makefiles - #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - make || return 1 - -} - - -package() { - msg "Packaging - $pkgname-$pkgver" - cd ${QTDIR} - pkgver=${_patchver} - make INSTALL_ROOT=${pkgdir} install - - ## Original Qt Build - rm -rf ${pkgdir}${_prefix}/{phrasebooks,templates,translations} - sed -i "s|-L${QTDIR}/lib ||g" ${pkgdir}${_prefix}/lib/*.prl - install -D -m755 qmake/qmake ${pkgdir}${_prefix}/bin/qmake - - # Build and install qt.profile - echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile - echo "export QT_XFT=true" >> ${srcdir}/qt.profile - echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile - echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile - install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh - - ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config - rm -f ${pkgdir}${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH - - # install man pages - mkdir -p ${pkgdir}${_prefix}/man - cp -r ${QTDIR}/doc/man/{man1,man3} ${pkgdir}${_prefix}/man/ - - # Uncomment to install examples -# cp -v -r ${QTDIR}/examples ${pkgdir}${_prefix}/share/doc/qt - - install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ - echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/qt3.conf - -} - - ## Baho Additions - -# ln -v -sf libqt-mt.so ${pkgdir}${_prefix}/lib/libqt.so -# ln -v -snf ../../bin ${pkgdir}${_prefix}/share/qt/bin -# ln -v -snf ../../include/qt ${pkgdir}${_prefix}/share/qt/include -# ln -v -snf ../../lib ${pkgdir}${_prefix}/share/qt/lib -# rm ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++ -# ln -v -snf ../linux-g++ ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++ -# cp -v -r doc/man ${pkgdir}${_prefix}/share -# # Don't do examples -# cp -v -r examples ${pkgdir}${_prefix}/share/doc/qt -# # Build qt.profile -# echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile -# echo "export QT_XFT=true" >> ${srcdir}/qt.profile -# echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile -# echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile -# -# install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh -# ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config - - -## scraps - # apply qt patches from kde.org -# for i in ../qt-copy-kde-patches/*; do -# patch -Np0 -i $i || return 1 -# done - # fix utf8 bug -# patch -Np0 -i ../utf8-bug-qt3.diff || return 1 - # fix asia fonts -# patch -Np0 -i ../qt-font-default-subst.diff || return 1 - # fix segfaults on exit when using mysql DB driver -# patch -Np0 -i ../mysql.patch || return 1 - -# # fix /opt/qt/lib path -# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/src/Makefile -# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/designer/Makefile -# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/editor/Makefile -# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/assistant/lib/Makefile -# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile -# -# cd ${srcdir}/$pkgfqn -# make -C qmake || return 1 -# cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql -# ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro -# cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql -# ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro -# -# cd ${srcdir}/$pkgfqn -# # fix the broken makefiles -# #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile -# make || return 1 -# make INSTALL_ROOT=${pkgdir} install -# rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations} -# sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl -# install -D -m755 qmake/qmake ${pkgdir}/opt/qt/bin/qmake -# install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh -# ln -sf /opt/qt/bin/qtconfig ${pkgdir}/opt/qt/bin/qt3config -# rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH -# -# # install man pages -# mkdir -p ${pkgdir}/opt/qt/man -# cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/ -# -# install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ -# echo '/opt/qt/lib' > ${pkgdir}/etc/ld.so.conf.d/qt3.conf -# } diff --git a/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff b/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff deleted file mode 100644 index 7c25eef7d..000000000 --- a/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 -+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 -@@ -966,20 +966,22 @@ - - #ifdef Q_WS_X11 - if (script == QFont::Han) { -- // modify script according to locale -- static QFont::Script defaultHan = QFont::UnknownScript; -- if (defaultHan == QFont::UnknownScript) { -- QCString locale = setlocale(LC_ALL, NULL); -- if (locale.contains("ko")) -- defaultHan = QFont::Han_Korean; -- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -- defaultHan = QFont::Han_TraditionalChinese; -- else if (locale.contains("zh")) -- defaultHan = QFont::Han_SimplifiedChinese; -- else -- defaultHan = QFont::Han_Japanese; -- } -- script = defaultHan; -+ // modify script according to locale -+ static QFont::Script defaultHan; -+ QCString locale = setlocale(LC_ALL, NULL); -+ -+ if (locale.contains("ko")) -+ defaultHan = QFont::Han_Korean; -+ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -+ defaultHan = QFont::Han_TraditionalChinese; -+ else if (locale.contains("zh")) -+ defaultHan = QFont::Han_SimplifiedChinese; -+ else if (locale.contains("ja")) -+ defaultHan = QFont::Han_Japanese; -+ else -+ defaultHan = QFont::Han; // don't change -+ -+ script = defaultHan; - } - #endif - diff --git a/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff b/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff deleted file mode 100644 index caa9bfc44..000000000 --- a/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qmap.h ---- qt-x11-free-3.3.8b -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-05-10 08:47:27.000000000 -0500 -@@ -50,6 +50,7 @@ - #endif // QT_H - - #ifndef QT_NO_STL -+#include - #include - #include - #endif -@@ -107,7 +108,7 @@ - #endif - typedef T value_type; - #ifndef QT_NO_STL -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - #else - typedef int difference_type; - #endif -@@ -223,7 +224,7 @@ - #endif - typedef T value_type; - #ifndef QT_NO_STL -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - #else - typedef int difference_type; - #endif -@@ -604,7 +605,7 @@ - typedef value_type& reference; - typedef const value_type& const_reference; - #ifndef QT_NO_STL -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - #else - typedef int difference_type; - #endif -diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluelist.h ---- qt-x11-free-3.3.8b -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-05-10 08:46:46.000000000 -0500 -@@ -50,6 +50,7 @@ - #ifndef QT_NO_STL - #include - #include -+#include - #endif - - //#define QT_CHECK_VALUELIST_RANGE -diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluevector.h ---- qt-x11-free-3.3.8b -+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-05-10 08:46:46.000000000 -0500 -@@ -244,7 +244,7 @@ - typedef const value_type& const_reference; - typedef size_t size_type; - #ifndef QT_NO_STL -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - #else - typedef int difference_type; - #endif diff --git a/arch/calvin/trinity-qt3/old-patches/mysql.patch b/arch/calvin/trinity-qt3/old-patches/mysql.patch deleted file mode 100644 index 5f61edc67..000000000 --- a/arch/calvin/trinity-qt3/old-patches/mysql.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- src/sql/drivers/mysql/qsql_mysql.cpp -+++ src/sql/drivers/mysql/qsql_mysql.cpp -@@ -37,7 +37,6 @@ - #include "qsql_mysql.h" - #include - --#include - #include - #include - #include -@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() - } - - ///////////////////////////////////////////////////////// --static void qServerEnd() --{ --#ifndef Q_NO_MYSQL_EMBEDDED --# if MYSQL_VERSION_ID >= 40000 -- mysql_server_end(); --# endif // MYSQL_VERSION_ID --#endif // Q_NO_MYSQL_EMBEDDED --} - - static void qServerInit() - { -@@ -366,9 +357,7 @@ static void qServerInit() - qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); - # endif - } -- qAddPostRoutine(qServerEnd); - init = TRUE; -- - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED - } -@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() - QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); - delete ext; - } -+#ifndef Q_NO_MYSQL_EMBEDDED -+# if MYSQL_VERSION_ID > 40000 -+ mysql_server_end(); -+# endif -+#endif - } - - bool QMYSQLDriver::hasFeature( DriverFeature f ) const diff --git a/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2 b/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2 deleted file mode 100644 index 19d8999635e80f4846fb48f9d2dd29e23e31a682..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31498 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 Btj7QV diff --git a/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff b/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff deleted file mode 100644 index 3e286f74e..000000000 --- a/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- src/kernel/qfontdatabase_x11.cpp -+++ src/kernel/qfontdatabase_x11.cpp -@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese){ -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } -@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c - FcPatternPrint(pattern); - #endif - -+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use -+ // FcFontMatch/Sort here we have to do it manually. - FcConfigSubstitute(0, pattern, FcMatchPattern); -+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); -+ - // qDebug("1: pattern contains:"); - // FcPatternPrint(pattern); - -@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c - value.u.s = (const FcChar8 *)cs.data(); - FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); - } --#ifdef FONT_MATCH_DEBUG -- printf("final pattern contains:\n"); -- FcPatternPrint(pattern); --#endif - } - - if (script != QFont::Unicode) { -@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese) { -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } - -+#ifdef FONT_MATCH_DEBUG -+ printf("final pattern contains:\n"); -+ FcPatternPrint(pattern); -+#endif -+ - QFontEngine *fe = 0; - - for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { ---- src/kernel/qfontdatabase.cpp -+++ src/kernel/qfontdatabase.cpp -@@ -554,7 +554,7 @@ static const unsigned short sample_chars - // GeometricSymbols, - { 0x2500, 0x0 }, - // MiscellaneousSymbols, -- { 0x2640, 0x0 }, -+ { 0x2640, 0x2714, 0x0 }, - // EnclosedAndSquare, - { 0x2460, 0x0 }, - // Braille, diff --git a/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch b/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch deleted file mode 100644 index 6f21e3cf1..000000000 --- a/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 -+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 -@@ -57,13 +57,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER diff --git a/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2 b/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2 deleted file mode 100644 index 3f4aee1713895795f714998c8210a2ad47b33a2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3708 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 atrans_values.gray; -+ const int g = info_ptr->trans_color.gray; - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -187,7 +187,7 @@ - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr->trans_alpha[i] - ) - ); - i++; -@@ -321,9 +321,9 @@ - png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) - if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { - QRgb trans = 0xFF000000 | qRgb( -- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); -+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); - for (uint y=0; ywidth; x++) { - if (((uint**)jt)[y][x] == trans) { diff --git a/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff b/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff deleted file mode 100644 index 39c751a71..000000000 --- a/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff +++ /dev/null @@ -1,72 +0,0 @@ ---- include/qobject.h 2008-01-15 13:09:13.000000000 -0600 -+++ include/qobject.h 2011-01-01 18:33:19.715656496 -0600 -@@ -101,8 +101,11 @@ - - QObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0 - const QObjectList *children() const { return childObjects; } -+ QObjectList childrenListObject(); -+ const QObjectList childrenListObject() const; - - static const QObjectList *objectTrees(); -+ static const QObjectList objectTreesListObject(); - - QObjectList *queryList( const char *inheritsClass = 0, - const char *objName = 0, ---- src/kernel/qobject.cpp 2008-01-15 13:09:13.000000000 -0600 -+++ src/kernel/qobject.cpp 2011-01-01 18:28:16.191270264 -0600 -@@ -360,6 +360,30 @@ - } - } - -+/*! \internal -+ TQt compatibility function -+*/ -+QObjectList QObject::childrenListObject() { -+ if (children()) return *(children()); -+ else return QObjectList(); -+} -+ -+/*! \internal -+ TQt compatibility function -+*/ -+const QObjectList QObject::childrenListObject() const { -+ if (children()) return *(children()); -+ else return QObjectList(); -+} -+ -+/*! \internal -+ TQt compatibility function -+*/ -+const QObjectList QObject::objectTreesListObject() { -+ if (objectTrees()) return *(objectTrees()); -+ else return QObjectList(); -+} -+ - - /***************************************************************************** - QObject member functions ---- src/kernel/qobject.h 2008-01-15 13:09:13.000000000 -0600 -+++ src/kernel/qobject.h 2011-01-01 18:33:19.715656496 -0600 -@@ -101,8 +101,11 @@ - - QObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0 - const QObjectList *children() const { return childObjects; } -+ QObjectList childrenListObject(); -+ const QObjectList childrenListObject() const; - - static const QObjectList *objectTrees(); -+ static const QObjectList objectTreesListObject(); - - QObjectList *queryList( const char *inheritsClass = 0, - const char *objName = 0, ---- src/tools/qglobal.h 2008-01-15 21:09:13.000000000 +0200 -+++ src/tools/qglobal.h 2011-03-15 00:28:11.221711757 +0200 -@@ -41,7 +41,7 @@ - #ifndef QGLOBAL_H - #define QGLOBAL_H - --#define QT_VERSION_STR "3.3.8b" -+#define QT_VERSION_STR "3.3.8c" - /* - QT_VERSION is (major << 16) + (minor << 8) + patch. - */ diff --git a/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff b/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff deleted file mode 100644 index 43e84a99f..000000000 --- a/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- src/codecs/qutfcodec.cpp -+++ src/codecs/qutfcodec.cpp -@@ -154,6 +154,7 @@ - - class QUtf8Decoder : public QTextDecoder { - uint uc; -+ uint min_uc; - int need; - bool headerDone; - public: -@@ -167,8 +168,9 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uchar ch; -+ int error = -1; - for (int i=0; i= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ *qch++ = QChar::replacement; - } else { - if (headerDone || QChar(uc) != QChar::byteOrderMark) - *qch++ = uc; -@@ -190,6 +194,7 @@ - } - } else { - // error -+ i = error; - *qch++ = QChar::replacement; - need = 0; - } -@@ -200,12 +205,21 @@ - } else if ((ch & 0xe0) == 0xc0) { - uc = ch & 0x1f; - need = 1; -+ error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; -+ error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; -+ error = i; -+ min_uc = 0x10000; -+ } else { -+ // error -+ *qch++ = QChar::replacement; - } - } - } ---- src/tools/qstring.cpp -+++ src/tools/qstring.cpp -@@ -5805,6 +5805,7 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uint uc = 0; -+ uint min_uc = 0; - int need = 0; - int error = -1; - uchar ch; -@@ -5822,6 +5823,12 @@ - unsigned short low = uc%0x400 + 0xdc00; - *qch++ = QChar(high); - *qch++ = QChar(low); -+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // overlong seqence, UTF16 surrogate or BOM -+ i = error; -+ qch = addOne(qch, result); -+ *qch++ = QChar(0xdbff); -+ *qch++ = QChar(0xde00+((uchar)utf8[i])); - } else { - *qch++ = uc; - } -@@ -5844,14 +5851,17 @@ - uc = ch & 0x1f; - need = 1; - error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; - error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; - error = i; -+ min_uc = 0x10000; - } else { - // Error - qch = addOne(qch, result); diff --git a/arch/calvin/trinity-qt3/qt.install b/arch/calvin/trinity-qt3/qt.install deleted file mode 100644 index 6d042daae..000000000 --- a/arch/calvin/trinity-qt3/qt.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf -} diff --git a/arch/calvin/trinity-qt3/qt.profile b/arch/calvin/trinity-qt3/qt.profile deleted file mode 100644 index ed4d232ae..000000000 --- a/arch/calvin/trinity-qt3/qt.profile +++ /dev/null @@ -1,4 +0,0 @@ -export QTDIR=/opt/qt -export QT_XFT=true -export PATH=$PATH:$QTDIR/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig From 306a78ba62a0ed385c85ee18a9ebab6a8a3eb50b Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Sun, 13 Nov 2011 19:35:03 -0500 Subject: [PATCH 16/18] seems something extra slipped in there --- .../trinity-base/trinity-kdebase/PKGBUILD | 131 ------------------ 1 file changed, 131 deletions(-) delete mode 100644 arch/release/trinity-base/trinity-kdebase/PKGBUILD diff --git a/arch/release/trinity-base/trinity-kdebase/PKGBUILD b/arch/release/trinity-base/trinity-kdebase/PKGBUILD deleted file mode 100644 index e43079bdd..000000000 --- a/arch/release/trinity-base/trinity-kdebase/PKGBUILD +++ /dev/null @@ -1,131 +0,0 @@ -# $Id$ -# Maintainer: David C. Rankin -# -# All modifications and uses of this file are licensed under -# the software for which this file was made for, should the software -# be under an Open Source License, at least version 1.9, defined -# by the Open Source Initiative. In other cases, this file is automatically -# released to the Public Domain. -# - -pkgname=trinity-kdebase -pkgver=3513 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.trinitydesktop.org' -license=('GPL') -groups=('trinity-base') -pkgdesc="Trinity - kdebase" -depends=('hal' 'trinity-dbus-1-qt3' 'trinity-arts' 'trinity-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1' 'trinity-dbus-tqt' 'trinity-kdelibs') -makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') -optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' - 'pciutils: PCI bus configuration space access library and tools' - 'xscreensaver: Screen saver and locker for the X Window System') -options=('libtool' '!strip') -source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff') -md5sums=('d1f7e1f94eeb46b981fe1ba144179840' - 'c9ce810c281002440a6de8cfd8735d07') - -_qtdir=/opt/qt -_prefix="/opt/trinity" - -_tdesktop() { - # create/install desktop - install -d -m755 ${pkgdir}/etc/X11/sessions - echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo "Exec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo "TryExec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop -} - -build() { - - msg "Setting PATH, CMAKE and Trinity Environment variables" - if [[ -r /etc/profile.d/qt3.sh ]]; then - . /etc/profile.d/qt3.sh - [[ -n $QTDIR ]] && _qtdir=$QTDIR - else - [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH - fi - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - export CMAKE_INCLUDE_PATH=/opt/trinity/include/dbus-1-tqt/:/opt/trinity/include/dbus-1.0/:/opt/trinity/include:/opt/trinity/include/libkrandr - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/opt/qt/lib:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig:$PKG_CONFIG_PATH - echo $PKG_CONFIG_PATH - - patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < ${srcdir}/dbusfix.diff - cd $srcdir - - msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build - - msg "Starting cmake..." - cmake ${srcdir}/kdebase --debug-output \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DQT_VERSION=3 \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DWITH_XFIXES=ON \ - -DWITH_HAL=ON \ - -DWITH_ARTS=ON \ - -DWITH_SASL=ON \ - -DWITH_OPENEXR=ON \ - -DWITH_XCOMPOSITE=ON \ - -DWITH_XCURSOR=ON \ - -DWITH_XRANDR=ON \ - -DWITH_XRENDER=ON \ - -DWITH_XDAMAGE=ON \ - -DWITH_SHADOW=ON \ - -DWITH_XDMCP=ON \ - -DWITH_XINERAMA=ON \ - -DWITH_XEXT=ON \ - -DWITH_PAM=ON \ - -DBUILD_ALL=ON \ - -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0 - make -# -DWITH_QT3=ON \ -# -DQTDIR=/opt/qt \ -# -DQT_LIBRARY_DIRS=/opt/qt/lib \ -} - -package() { - msg "Packaging - $pkgname-$pkgver" -# cd ${srcdir}/${_svnmod} - cd ${srcdir}/build - - make DESTDIR="$pkgdir/" install - - cd ${startdir} - - # install desktop and update kdmrc and Xsession -# [[ -f trinity.desktop ]] && { -# install -d -m755 ${pkgdir}/etc/X11/sessions -# install -m644 trinity.desktop ${pkgdir}/etc/X11/sessions -# } - _tdesktop - [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop" - - # set kdm directory - _kdmdir=${_prefix}/share/config/kdm - [[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} - - # install kdmrc - [[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir} - - # update the Xsession file - [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir} - - # create the starttrinity link - [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - ln -sf /opt/trinity/bin/startkde starttrinity - - cd ${startdir} - -# rm -r ${srcdir}/${_svnmod} -} From 4f5750cbaf62281fd04eee8511756758d037f7f6 Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 14 Nov 2011 19:51:48 +0100 Subject: [PATCH 17/18] RHEL/Fedora: fixes --- .../trinity-knetworkmanager.spec | 9 +++-- .../dbus-1-tqt/dbus-1-tqt-3.5.13.spec | 4 +-- redhat/genrpm.sh | 33 ++++++++++++++++--- redhat/kdebase/trinity-kdebase-3.5.13.spec | 27 +++++++++------ redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 16 +++++++-- .../trinity-kdemultimedia-3.5.13.spec | 14 ++++++-- redhat/trinity-desktop/trinity-desktop.spec | 1 + redhat/trinity-live/fedora-live-tde-base.ks | 21 +++++++++++- redhat/trinity-live/fedora-livecd-tde.ks | 16 +++++++-- 9 files changed, 112 insertions(+), 29 deletions(-) diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec index b561200b4..1c45101ff 100644 --- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -5,7 +5,7 @@ %else %define version 0.8 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -77,7 +77,7 @@ Development headers for knetworkmanager cd knetworkmanager-0.*/src %patch0 -p3 -%patch1 -p3 +#patch1 -p3 @@ -142,5 +142,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_libdir}/*.so %changelog -* Tue Nov 11 2011 Francois Andriot - 0.8-1 +* Sat Nov 13 2011 Francois Andriot - 0.8-2 / 0.9-2 +- Remove faulty patch for WPA authentication + +* Tue Nov 11 2011 Francois Andriot - 0.8-1 / 0.9-1 - Initial build diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec index 02e7734f1..27a167636 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec @@ -37,8 +37,6 @@ BuildRequires: gcc-c++ BuildRequires: dbus-devel BuildRequires: tqtinterface-devel -#Provides: dbus-1-qt - %description Dbus TQT Interface @@ -54,7 +52,7 @@ Development files for %{name} %prep %setup -q -n dependencies/%{name} -%patch0 -p1 +#patch0 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index d54c88c21..c0627d032 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -5,6 +5,7 @@ cd "$( dirname "$0" )" while [ $# -gt 0 ]; do case "$1" in "--auto") AUTO=1;; + "--version") REQVERSION="$2"; shift;; *) COMP="$1";; esac shift @@ -12,6 +13,7 @@ done clear cat <&1 | tee /tmp/log +) 2>&1 | tee ${LOGFILE} +RET=$? set +x +if [ ${RET} -gt 0 ]; then + exit ${RET} +fi + +if grep -q "error: Failed build dependencies:" ${LOGFILE}; then +# DEPS=$( sed -n -e "/.* is needed by .*/ s/^[ \t]*\([a-zA-Z2-9_-]*\) .*/\1/p" ${LOGFILE} ) + set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 ) + exit 2 +fi + + diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index f5ff987a7..faf8d13ad 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 6 +%define release 7 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -63,29 +63,32 @@ Patch8: kdebase-3.5.13-startkde_ldpreload.patch Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch ## [kdebase/kicker/kicker/ui] Patch10: kdebase-3.5.12-kickoff_unstable.patch +## [kdebase/startkde] Sets default Start Icon in 'kickerrc' +Patch11: kdebase-3.5.13-startkde_icon.patch + # Fedora 15 Theme: "Lovelock" %if 0%{?fedora} == 15 Requires: lovelock-backgrounds-single -%define kde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png +%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png %endif # Fedora 16 Theme: "Verne" %if 0%{?fedora} == 16 Requires: verne-backgrounds-single -%define kde_bg /usr/share/backgrounds/verne/default/standard/verne.png +%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png %endif # RHEL 5 Theme %if 0%{?rhel} == 5 Requires: desktop-backgrounds-basic -%define kde_bg /usr/share/backgrounds/images/default.jpg +%define tde_bg /usr/share/backgrounds/images/default.jpg %endif # RHEL 6 Theme %if 0%{?rhel} == 6 Requires: redhat-logos -%define kde_bg /usr/share/backgrounds/default.png +%define tde_bg /usr/share/backgrounds/default.png %endif BuildRequires: tqtinterface-devel @@ -217,20 +220,21 @@ Protocol handlers (KIOslaves) for personal information management, including: cd kicker/kicker %patch10 -p0 cd - +%patch11 -p1 # Applies an optional distro-specific graphical theme -%if "%{?kde_bg}" != "" +%if "%{?tde_bg}" != "" # KDM Background %__sed -i "kdm/kfrontend/genkdmconf.c" \ - -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{kde_bg}\n",' + -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{tde_bg}\n",' # TDE user default background %__sed -i "kpersonalizer/keyecandypage.cpp" \ - -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{kde_bg}",' + -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",' %__sed -i "startkde" \ - -e 's,/usr/share/wallpapers/isadora.png.desktop,%{kde_bg},' \ - -e 's,Wallpaper=isadora.png,Wallpaper=%{kde_bg},' + -e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \ + -e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},' %endif %build @@ -579,6 +583,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Sun Nov 13 2011 Francois Andriot - 3.5.13-7 +- Add distribution-specific start button icon + * Sat Nov 12 2011 Francois Andriot - 3.5.13-6 - Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 5c2652f17..abbb9a047 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -145,6 +145,13 @@ cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf %{tde_libdir} EOF +# Moves the XDG configuration files to TDE directory +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" + + %clean %__rm -rf %{?buildroot} @@ -258,8 +265,8 @@ EOF %endif %{_sysconfdir}/ld.so.conf.d/trinity.conf -# Provided by 'redhat-menus' package -%exclude %{_sysconfdir}/xdg/menus/applications.menu +# Avoid conflict with 'redhat-menus' package +%{_prefix}/etc/xdg/menus/kde-applications.menu # New in TDE 3.5.13 %{_bindir}/kdetcompmgr @@ -285,6 +292,9 @@ EOF %changelog +* Sat Nov 12 2011 Francois Andriot - 3.5.13-3 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE + * Thu Nov 03 2011 Francois Andriot - 3.5.13-2 - Add missing BuildRequires diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index c6e1e9ac0..c595d542c 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -223,6 +223,13 @@ for dir in k* ; do done done +# Moves the XDG configuration files to TDE directory +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" + + %post /sbin/ldconfig @@ -351,7 +358,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/icons/crystalsvg/*/*/juk* %exclude %{_datadir}/icons/hicolor/*/apps/juk.png -/etc/xdg/menus/applications-merged/* +%{_prefix}/etc/xdg/menus/applications-merged/* %{_libdir}/mcop/* %{_libdir}/libkdeinit_*.so #%{_libdir}/liboggarts.so @@ -404,6 +411,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libyafxplayer.so %changelog +* Sat Nov 12 2011 Francois Andriot - 3.5.13-3 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE + * Fri Nov 04 2011 Francois Andriot - 3.5.13-2 - Updates BuildRequires diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec index c109fd82b..1820928c9 100644 --- a/redhat/trinity-desktop/trinity-desktop.spec +++ b/redhat/trinity-desktop/trinity-desktop.spec @@ -44,6 +44,7 @@ Requires: trinity-kdepim >= %{version} Requires: trinity-kdeutils >= %{version} Requires: trinity-kdetoys >= %{version} Requires: trinity-repo >= %{version} +Requires: hal %description The TDE project aims to keep the KDE3.5 computing style alive, as well as diff --git a/redhat/trinity-live/fedora-live-tde-base.ks b/redhat/trinity-live/fedora-live-tde-base.ks index b56e5c92a..ed912dfff 100644 --- a/redhat/trinity-live/fedora-live-tde-base.ks +++ b/redhat/trinity-live/fedora-live-tde-base.ks @@ -9,8 +9,11 @@ repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$rel %packages ### The KDE-Desktop - trinity-desktop +hal + +# TDE is missing a Network Applet, so we use Gnome... +NetworkManager-gnome ### fixes @@ -81,6 +84,7 @@ touch /usr/share/icons/hicolor/ # Create user Desktop directory mkdir -p /home/liveuser/Desktop +mkdir -p /home/liveuser/Documents # make sure to set the right permissions and selinux contexts chown -R liveuser:liveuser /home/liveuser/ @@ -91,4 +95,19 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink EOF +# Sets 'nm-applet' to run automatically +mkdir -p /home/liveuser/.trinity/Autostart +cat </home/liveuser/.trinity/Autostart/nm-applet +#!/bin/sh + +# Waits until kicker is started, so that +# nm-applet can dock correctly. +while ! pidof kicker; do + sleep 1 +done +sleep 3 +/usr/bin/nm-applet +EOF +chmod +x /home/liveuser/.trinity/Autostart/nm-applet + %end diff --git a/redhat/trinity-live/fedora-livecd-tde.ks b/redhat/trinity-live/fedora-livecd-tde.ks index 16c799d1f..88ab2f91a 100644 --- a/redhat/trinity-live/fedora-livecd-tde.ks +++ b/redhat/trinity-live/fedora-livecd-tde.ks @@ -10,6 +10,9 @@ %include fedora-live-tde-base.ks %include fedora-live-minimization.ks +# 3rd party for VLC +#repo --name=atrpms --baseurl=http://dl.atrpms.net/f$releasever-$basearch/atrpms/stable + %packages # Additional packages that are not default in trinity-desktop but useful @@ -18,12 +21,13 @@ trinity-live-openbox # Some TDE applications trinity-amarok -trinity-digikam +#trinity-digikam trinity-dolphin trinity-gwenview trinity-k3b trinity-kaffeine trinity-kbookreader +#trinity-knetworkmanager trinity-konversation trinity-ksensors trinity-kstreamripper @@ -31,13 +35,19 @@ trinity-yakuake # Some TDE translations trinity-kde-i18n-French -trinity-kde-i18n-German -#trinity-kde-i18n-Spanish +#trinity-kde-i18n-German +trinity-kde-i18n-Spanish trinity-kde-i18n-Chinese-Big5 +# 3rd party stuff +#vlc + # Fedora stuff fuse liveusb-creator +#wlassistant +#wicd +#wicd-gtk ### more desktop stuff From 35bee9455536ec115fddfa30cdbd2dcade240cfb Mon Sep 17 00:00:00 2001 From: albator Date: Tue, 15 Nov 2011 00:06:05 +0100 Subject: [PATCH 18/18] Update ARTS support for OSS/ESD --- .../arts/arts-3.5.13-enable_oss.patch | 121 ++++++++++++++---- .../arts/trinity-arts-3.5.13.spec | 9 ++ 2 files changed, 103 insertions(+), 27 deletions(-) diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch index 0a6ab7c83..ca89ed76c 100644 --- a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch +++ b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch @@ -1,15 +1,6 @@ ---- arts.3513/config.h.cmake.ORI 2011-11-12 00:33:38.784907854 +0100 -+++ arts.3513/config.h.cmake 2011-11-12 00:33:55.548557832 +0100 -@@ -28,3 +28,7 @@ - #cmakedefine HAVE_SND_PCM_RESUME 1 - #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1 - #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1 -+ -+#cmakedefine HAVE_SYS_SOUNDCARD_H 1 -+#cmakedefine HAVE_LIBPTHREAD 1 -+#define HAVE_IOCTL_INT_ULONGINT_DOTS 3 ---- arts.3513/artsc/CMakeLists.txt.ORI 2011-11-12 00:50:03.023418039 +0100 -+++ arts.3513/artsc/CMakeLists.txt 2011-11-12 00:50:19.776070197 +0100 +diff -Nuar arts.ORI/artsc/CMakeLists.txt arts.PATCHED/artsc/CMakeLists.txt +--- arts.ORI/artsc/CMakeLists.txt 2011-06-12 07:57:03.000000000 +0200 ++++ arts.PATCHED/artsc/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100 @@ -43,6 +43,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} @@ -27,8 +18,69 @@ DESTINATION ${LIB_INSTALL_DIR} ) ---- arts.3513/flow/CMakeLists.txt.ORI 2011-11-12 00:56:01.582978475 +0100 -+++ arts.3513/flow/CMakeLists.txt 2011-11-12 00:56:14.392712888 +0100 +diff -Nuar arts.ORI/CMakeLists.txt arts.PATCHED/CMakeLists.txt +--- arts.ORI/CMakeLists.txt 2011-03-28 04:09:15.000000000 +0200 ++++ arts.PATCHED/CMakeLists.txt 2011-11-14 21:53:46.000000000 +0100 +@@ -33,6 +33,7 @@ + option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON ) + option( WITH_VORBIS "Enable Ogg/Vorbis support" ON ) + option( WITH_MAD "Enable MAD mp3 decoder support" ON ) ++option( WITH_ESOUND "Enable ESOUND support" OFF ) + + + ##### paths setup ############################### +@@ -58,6 +59,8 @@ + check_include_file( "malloc.h" HAVE_MALLOC_H ) + check_include_file( "memory.h" HAVE_MEMORY_H ) + check_include_file( "dlfcn.h" HAVE_DLFCN_H ) ++check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H ) ++check_include_file( "pthread.h" HAVE_LIBPTHREAD ) + + + ##### check for system libraries ################ +@@ -145,6 +148,21 @@ + endif( WITH_ALSA ) + + ++##### check for esound ####################### ++ ++set( HAVE_LIBESD 0 ) ++if( WITH_ESOUND ) ++ ++ pkg_search_module( ESOUND esound ) ++ if( ESOUND_FOUND ) ++ set( HAVE_LIBESD 1 ) ++ else( ESOUND_FOUND ) ++ message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" ) ++ endif( ESOUND_FOUND ) ++ ++endif( WITH_ESOUND ) ++ ++ + ##### check for glib/gthread modules ############ + + pkg_search_module( GLIB2 glib-2.0 ) +diff -Nuar arts.ORI/config.h.cmake arts.PATCHED/config.h.cmake +--- arts.ORI/config.h.cmake 2010-10-12 03:53:06.000000000 +0200 ++++ arts.PATCHED/config.h.cmake 2011-11-14 22:00:50.000000000 +0100 +@@ -23,8 +23,14 @@ + + #cmakedefine HAVE_LIBAUDIOFILE 1 + ++#cmakedefine HAVE_LIBESD 1 ++ + #cmakedefine HAVE_LIBASOUND2 1 + #cmakedefine HAVE_ALSA_ASOUNDLIB_H 1 + #cmakedefine HAVE_SND_PCM_RESUME 1 + #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1 + #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1 ++ ++#cmakedefine HAVE_SYS_SOUNDCARD_H 1 ++#cmakedefine HAVE_LIBPTHREAD 1 ++#define HAVE_IOCTL_INT_ULONGINT_DOTS 3 +diff -Nuar arts.ORI/flow/CMakeLists.txt arts.PATCHED/flow/CMakeLists.txt +--- arts.ORI/flow/CMakeLists.txt 2011-10-04 04:01:15.000000000 +0200 ++++ arts.PATCHED/flow/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100 @@ -15,6 +15,7 @@ include_directories( @@ -37,8 +89,34 @@ ${CMAKE_BINARY_DIR}/mcop ${CMAKE_SOURCE_DIR}/mcop ${CMAKE_CURRENT_BINARY_DIR} ---- arts.3513/mcop_mt/CMakeLists.txt.ORI 2011-11-12 00:59:06.148132592 +0100 -+++ arts.3513/mcop_mt/CMakeLists.txt 2011-11-12 01:16:08.584636258 +0100 +diff -Nuar arts.ORI/mcop/CMakeLists.txt arts.PATCHED/mcop/CMakeLists.txt +--- arts.ORI/mcop/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200 ++++ arts.PATCHED/mcop/CMakeLists.txt 2011-11-14 22:04:29.000000000 +0100 +@@ -12,11 +12,11 @@ + configure_file( arts_export.h.in arts_export.h ) + + if( NOT EXTENSION_DIR ) +- set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib ) ++ set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ) + endif( NOT EXTENSION_DIR ) + + if( NOT DTRADER_DIR ) +- set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop ) ++ set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop ) + endif( NOT DTRADER_DIR ) + + add_definitions( +@@ -66,6 +66,6 @@ + tde_add_library( ${target} SHARED + SOURCES ${${target}_SRCS} + VERSION 1.0.0 +- LINK ltdlc-static ++ LINK ltdlc-static ${ESOUND_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR} + ) +diff -Nuar arts.ORI/mcop_mt/CMakeLists.txt arts.PATCHED/mcop_mt/CMakeLists.txt +--- arts.ORI/mcop_mt/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200 ++++ arts.PATCHED/mcop_mt/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100 @@ -11,6 +11,11 @@ include_directories( @@ -59,14 +137,3 @@ + LINK artsflow-shared pthread DESTINATION ${LIB_INSTALL_DIR} ) ---- arts/CMakeLists.txt.ORI 2011-11-12 01:20:34.671118554 +0100 -+++ arts/CMakeLists.txt 2011-11-12 01:22:04.857248409 +0100 -@@ -58,6 +58,8 @@ - check_include_file( "malloc.h" HAVE_MALLOC_H ) - check_include_file( "memory.h" HAVE_MEMORY_H ) - check_include_file( "dlfcn.h" HAVE_DLFCN_H ) -+check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H ) -+check_include_file( "pthread.h" HAVE_LIBPTHREAD ) - - - ##### check for system libraries ################ diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 69ff66ea5..297db868e 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -83,9 +83,15 @@ cd build %cmake \ -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \ -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ + -DWITH_ALSA=ON \ + -DWITH_AUDIOFILE=ON \ + -DWITH_VORBIS=ON \ -DWITH_MAD=OFF \ + -DWITH_ESOUND=ON \ .. +#cp -f /tmp/config.h . + %__make %{?_smp_mflags} %install @@ -125,6 +131,9 @@ cd build %changelog +* Mon Nov 14 2011 Francois Andriot - 3.5.13-3 +- Enables OSS and ESD support + * Thu Nov 03 2011 Francois Andriot - 3.5.13-2 - Add missing BuildRequires