TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: more updates

Browse Source
pull/3/head
François Andriot 12 years ago
parent 04dea0b400
commit 81cfe3de65
28 changed files with 3209 additions and 28 deletions
Show Stats Download Patch File Download Diff File

10
redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch
Unescape View File

@ -0,0 +1,10 @@
--- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.ORI 2013-07-07 15:07:12.912770044 +0200
+++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am 2013-07-07 15:11:43.224706604 +0200
@@ -55,6 +55,6 @@
libtqtcairo_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
libtqtcairo_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS)
-libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD)
+libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD) $(LIB_QT) $(LIB_TDEUI)
libtqtcairo_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS)

11
redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch
Unescape View File

@ -0,0 +1,11 @@
--- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am 2013-07-07 15:16:58.922069997 +0200
+++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.libsuffix 2013-07-07 15:23:35.272293968 +0200
@@ -36,7 +36,7 @@
$(srcdir)/tdegtk-baseengine.cpp \
$(srcdir)/tdegtk-theme.cpp
-enginedir = $(GTK3_PREFIX)/lib/gtk-3.0/$(GTK3_VERSION)/theming-engines
+enginedir = $(GTK3_PREFIX)/lib64/gtk-3.0/$(GTK3_VERSION)/theming-engines
engine_LTLIBRARIES = libtdegtk.la
libtdegtk_la_SOURCES = $(source_h) $(source_c)

11
redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch
Unescape View File

@ -0,0 +1,11 @@
--- trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am.ORI 2013-07-07 13:17:16.270257111 +0200
+++ trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am 2013-07-07 13:17:41.911536825 +0200
@@ -24,7 +24,7 @@
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO)
+kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = setupdlg.h kbiff.h kbiffmonitor.h notify.h kbiffurl.h \

152
redhat/applications/kdbg/kdbg-14.0.0.spec
Unescape View File

@ -0,0 +1,152 @@
# Default version for this component
%define tde_pkg kdbg
%define tde_version 14.0.0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{tde_pkg}
Summary: graphical debugger interface [Trinity]
Version: 2.2.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source0: kdbg-master.tar.gz
Source1: admin-master.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
%description
KDbg is a graphical user interface to gdb, the GNU debugger. It provides
an intuitive interface for setting breakpoints, inspecting variables,
stepping through code and much more. KDbg requires TDE but you can of
course debug any program.
KDbg can also debug XSLT (XML stylesheet translation) scripts by
interfacing with xsldbg. For this the package kxsldbg must be installed.
Features include the following:
* Inspection of variable values in a tree structure.
* Direct member: For certain compound data types the most important
member values are displayed next to the variable name, so that it is
not necessary to expand the subtree of that variable in order to see
the member value. KDbg can also display Qt's QString values, which
are Unicode strings.
* Debugger at your finger tips: The basic debugger functions (step,
next, run, finish, until, set/clear/enable/disable breakpoint) are
bound to function keys F5 through F10. Quick and easy.
* View source code, search text, set program arguments and environment
variables, display arbitrary expressions.
* Debugging of core dumps, attaching to running processes is possible.
* Conditional breakpoints.
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
##########
%prep
#setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%setup -q -a 1 -n kdbg-master
rmdir admin
mv admin-master admin
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--docdir=%{tde_tdedocdir} \
--libdir=%{tde_libdir} \
--disable-rpath
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
%post
update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || :
%postun
update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || :
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/kdbg
%{tde_tdeappdir}/kdbg.desktop
%{tde_datadir}/apps/kdbg/
%{tde_datadir}/config/kdbgrc
%lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
%lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
%lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
%{tde_datadir}/icons/hicolor/*/apps/kdbg.png
%{tde_datadir}/icons/locolor/*/apps/kdbg.png
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.2-1
- Initial release for TDE 14.0.0

9
redhat/applications/knetworkmanager9/knetworkmanager9-14.0.0.spec → redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
Unescape View File

@ -1,5 +1,5 @@
# Default version for this component # Default version for this component
%define tde_pkg knetworkmanager9 %define tde_pkg tdenetworkmanager
%define tde_version 14.0.0 %define tde_version 14.0.0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@ -32,7 +32,8 @@ Summary: Trinity applet for Network Manager
Group: Applications/Internet Group: Applications/Internet
License: GPLv2+ License: GPLv2+
URL: http://en.opensuse.org/Projects/KNetworkManager #URL: http://en.opensuse.org/Projects/KNetworkManager
URL: http://www.trinitydesktop.org/
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
@ -44,6 +45,10 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
Obsoletes: trinity-knetworkmanager < %{version}-%{release}
Provides: trinity-knetworkmanager = %{version}-%{release}
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
Requires: NetworkManager-gnome Requires: NetworkManager-gnome
%else %else

11
redhat/applications/kpowersave-nohal/kpowersave-nohal-14.0.0.spec → redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
Unescape View File

@ -1,5 +1,5 @@
# Default version for this component # Default version for this component
%define tdecomp kpowersave-nohal %define tdecomp tdepowersave
%define tde_version 14.0.0 %define tde_version 14.0.0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@ -48,9 +48,11 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
Obsoletes: trinity-kpowersave < %{version}-%{release}
Provides: trinity-kpowersave = %{version}-%{release}
%description %description
KPowersave is a TDE systray applet which allows to control the power TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer. management settings and policies of your computer.
Current feature list: Current feature list:
@ -87,6 +89,7 @@ settings for:
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
@ -125,6 +128,7 @@ update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun %postun
update-desktop-database %{tde_appdir} > /dev/null update-desktop-database %{tde_appdir} > /dev/null
/sbin/ldconfig /sbin/ldconfig
@ -147,6 +151,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/autostart/kpowersave-autostart.desktop %{tde_datadir}/autostart/kpowersave-autostart.desktop
%{tde_datadir}/config/kpowersaverc %{tde_datadir}/config/kpowersaverc
%changelog %changelog
* Thu Jul 04 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5 * Thu Jul 04 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0
@ -155,7 +160,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2 - Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3 * Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
- Initial build for TDE 3.5.13.1 - Initial release for TDE 3.5.13.1
* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2 * Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
- Add missing /sbin/ldconfig - Add missing /sbin/ldconfig

2
redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
Unescape View File

@ -33,6 +33,8 @@ BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: libtool BuildRequires: libtool
# DBUS support
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
%else %else

136
redhat/dependencies/sip4-tqt/sip4-tqt.spec
Unescape View File

@ -0,0 +1,136 @@
# Some distribution already provides this package.
# Mageia 3
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# Always install under standard prefix
%define tde_prefix /usr
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-sip4-tqt
Epoch: 2
Version: 14.0.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: Python/C++ bindings generator runtime library
Group: System Environment/Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{version}
# TDE specific building variables
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= %{version}
%description
##########
%package -n python-sip
Summary: Python/C++ bindings generator runtime library
Epoch: 2
%description -n python-sip
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
specificity towards C++ and Python.
%post -n python-sip
/sbin/ldconfig || :
%postun -n python-sip
/sbin/ldconfig || :
%files -n python-sip
%defattr(-,root,root,-)
%{python_sitearch}/sip.so
%{python_sitearch}/sipconfig.py
%{python_sitearch}/sipdistutils.py
##########
%package -n python-sip-devel
Summary: Python/C++ bindings generator development files
Group: Development/Libraries
Requires: python-sip = %{version}-%{release}
%description -n python-sip-devel
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
specificity towards C++ and Python.
SIP was originally designed to generate Python bindings for KDE and so
has explicit support for the signal slot mechanism used by the Qt/KDE
class libraries.
Features:
- connecting Qt signals to Python functions and class methods
- connecting Python signals to Qt slots
- overloading virtual member functions with Python class methods
- protected member functions
- abstract classes
- enumerated types
- global class instances
- static member functions.
This package contains the code generator tool and the development headers
needed to develop Python bindings with sip.
%post -n python-sip-devel
/sbin/ldconfig || :
%postun -n python-sip-devel
/sbin/ldconfig || :
%files -n python-sip-devel
%defattr(-,root,root,-)
%{_bindir}/sip
%{_includedir}/python*/sip.h
##########
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
mkdir build
cd build
python ../configure.py \
-d %{python_sitearch} \
-u STRIP="" \
CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3" \
CFLAGS_RELEASE="" \
CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3" \
CXXFLAGS_RELEASE=""
%install
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
%clean
%__rm -rf %{?buildroot}
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial build for TDE R14, using 'tqt3' instead of 'qt3'

19
redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
Unescape View File

@ -125,6 +125,7 @@ Requires: trinity-kcmldap
Requires: trinity-kcmldapcontroller Requires: trinity-kcmldapcontroller
Requires: trinity-kcmldapmanager Requires: trinity-kcmldapmanager
Requires: trinity-kcpuload Requires: trinity-kcpuload
Requires: trinity-kdbg
Requires: trinity-kdiff3 Requires: trinity-kdiff3
Requires: trinity-kdirstat Requires: trinity-kdirstat
Requires: trinity-keep Requires: trinity-keep
@ -159,8 +160,6 @@ Requires: trinity-potracegui
Requires: trinity-smb4k Requires: trinity-smb4k
Requires: trinity-smartcardauth Requires: trinity-smartcardauth
Requires: trinity-soundkonverter Requires: trinity-soundkonverter
Requires: trinity-tde-guidance
Requires: trinity-tde-guidance-powermanager
Requires: trinity-tde-style-lipstik Requires: trinity-tde-style-lipstik
Requires: trinity-tde-style-qtcurve Requires: trinity-tde-style-qtcurve
Requires: trinity-tde-systemsettings Requires: trinity-tde-systemsettings
@ -180,7 +179,7 @@ Requires: trinity-gtk3-tqt-engine
# Disabled applications for RHEL5 # Disabled applications for RHEL5
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
# On RHEL 5, HAL version is too old for kpowersave . # On RHEL 5, HAL version is too old for kpowersave .
Requires: trinity-kpowersave-nohal Requires: trinity-tdekpowersave
# On RHEL 5, GTK2 version is too old for GTK stuff ... # On RHEL 5, GTK2 version is too old for GTK stuff ...
Requires: trinity-gtk-qt-engine Requires: trinity-gtk-qt-engine
# On RHEL 5, lilypond is not available, so no rosegarden :'-( # On RHEL 5, lilypond is not available, so no rosegarden :'-(
@ -189,6 +188,14 @@ Requires: trinity-rosegarden
Requires: trinity-kpilot Requires: trinity-kpilot
%endif %endif
# These python stuff have not been ported to TQT3 and still rely on HAL
#Requires: trinity-tde-guidance
#Requires: trinity-tde-guidance-powermanager
Obsoletes: trinity-guidance
Obsoletes: trinity-guidance-powermanager
Obsoletes: trinity-tde-guidance
Obsoletes: trinity-tde-guidance-powermanager
# This one causes several crashes . Obsolete. # This one causes several crashes . Obsolete.
#Requires: trinity-kgtk-qt3 #Requires: trinity-kgtk-qt3
Obsoletes: trinity-kgtk-qt3 Obsoletes: trinity-kgtk-qt3
@ -198,11 +205,13 @@ Obsoletes: trinity-kgtk-qt3
Obsoletes: trinity-kerry Obsoletes: trinity-kerry
# RHEL 6 only: knetworkmanager8 # RHEL 6 only: knetworkmanager8
# knetworkmanager9 is too unstable for now.
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
Requires: trinity-knetworkmanager8 Requires: trinity-knetworkmanager8
%endif %endif
Requires: trinity-knetworkmanager9 # Other distros: tdenetworkmanager (knetworkmanager9)
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora}
Requires: trinity-tdenetworkmanager
%endif
# RHEL 4 # RHEL 4
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}

27
redhat/tdebase/tdebase-14.0.0-bookmark_global_copy.patch
Unescape View File

@ -0,0 +1,27 @@
--- ./libkonq/konqbookmarkmanager.h.ori 2013-05-08 23:26:03.558587419 +0200
+++ ./libkonq/konqbookmarkmanager.h 2013-05-08 23:29:25.317517880 +0200
@@ -3,6 +3,8 @@
#include <kbookmarkmanager.h>
#include <kstandarddirs.h>
+#include <kurl.h>
+#include <tdeio/job.h>
#include <libkonq_export.h>
class LIBKONQ_EXPORT KonqBookmarkManager
@@ -11,7 +13,14 @@
static KBookmarkManager * self() {
if ( !s_bookmarkManager )
{
- TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
+ TQString globalBookmarkFile = locate( "data", TQString::fromLatin1( "konqueror/bookmarks.xml" ) );
+ TQString bookmarksFile = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml" ), true);
+ if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null ) {
+ TDEIO::file_copy(
+ KURL::fromPathOrURL( globalBookmarkFile ),
+ KURL::fromPathOrURL( bookmarksFile ), -1, false, false
+ );
+ }
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
}
return s_bookmarkManager;

20
redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
Unescape View File

@ -0,0 +1,20 @@
--- trinity-tdebase-14.0.0~pre737+02bf1e69/starttde.ORI 2013-07-07 20:01:47.656584924 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/starttde 2013-07-07 20:04:37.039608089 +0200
@@ -347,6 +347,17 @@
fi
fi
+# Default Start Button icon for TDE
+if [ ! -e $tdehome/share/config/kickerrc ]; then
+ if [ -r "%{tde_starticon}" ]; then
+ cat <<EOF >$tdehome/share/config/kickerrc
+[KMenu]
+CustomIcon=%{tde_starticon}
+EOF
+ fi
+fi
+
+
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"

37
redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
Unescape View File

@ -0,0 +1,37 @@
--- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop.ORI 2013-05-11 14:53:30.914170537 +0200
+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop 2013-05-11 14:53:59.495582944 +0200
@@ -2,6 +2,7 @@
Categories=Qt;TDE;X-TDE-settings-system;
Comment=Configure display
Comment[en_US]=Configure display
+Comment[fr]=Configuration de l'affichage
DocPath=kcontrol/displayconfig.html
Exec=tdecmshell displayconfig
GenericName=
@@ -11,6 +12,7 @@
MimeType=
Name=Monitor & Display
Name[en_US]=Monitor & Display
+Name[fr]=Moniteurs & Affichage
NoDisplay=false
Path=
StartupNotify=true
--- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI 2013-05-11 21:21:04.241337141 +0200
+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop 2013-05-11 21:21:44.782537929 +0200
@@ -12,6 +12,7 @@
Categories=Qt;TDE;X-TDE-settings-hardware;
Comment=Configure display ICC profile
Comment[en_US]=Configure display ICC profile
+Comment[fr]=Configurer les profils de couleurs ICC
DocPath=kcontrol/iccconfig.html
GenericName=
GenericName[en_US]=
@@ -19,5 +20,6 @@
MimeType=
Name=ICC Color Profile
Name[en_US]=ICC Color Profile
+Name[fr]=Profils de couleurs ICC
-NoDisplay=false
\ Pas de fin de ligne à la fin du fichier
+NoDisplay=false

20
redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch
Unescape View File

@ -0,0 +1,20 @@
--- ./kcontrol/kcontrol/KControl.desktop~ 2013-01-09 02:12:13.000000000 +0100
+++ ./kcontrol/kcontrol/KControl.desktop 2013-05-08 17:55:54.250733219 +0200
@@ -5,7 +5,7 @@
DocPath=kcontrol/index.html
X-TDE-StartupNotify=true
-Name=Control Center
+Name=Trinity Control Center
Name[af]=Beheer Sentrum
Name[ar]=مركز التحكم
Name[az]=İdarə Mərkəzi
@@ -28,7 +28,7 @@
Name[eu]=Kontrol gunea
Name[fa]=مرکز کنترل
Name[fi]=Ohjauskeskus
-Name[fr]=Centre de configuration de TDE
+Name[fr]=Centre de configuration de Trinity
Name[fy]=Konfiguraasjesintrum
Name[ga]=Lárionad Rialaithe
Name[gl]=Centro de Control

20
redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch~
Unescape View File

@ -0,0 +1,20 @@
--- ./kcontrol/kcontrol/KControl.desktop~ 2013-01-09 02:12:13.000000000 +0100
+++ ./kcontrol/kcontrol/KControl.desktop 2013-05-08 17:55:54.250733219 +0200
@@ -5,7 +5,7 @@
DocPath=kcontrol/index.html
X-KDE-StartupNotify=true
-Name=Control Center
+Name=Trinity Control Center
Name[af]=Beheer Sentrum
Name[ar]=مركز التحكم
Name[az]=İdarə Mərkəzi
@@ -28,7 +28,7 @@
Name[eu]=Kontrol gunea
Name[fa]=مرکز کنترل
Name[fi]=Ohjauskeskus
-Name[fr]=Centre de configuration de KDE
+Name[fr]=Centre de configuration de Trinity
Name[fy]=Konfiguraasjesintrum
Name[ga]=Lárionad Rialaithe
Name[gl]=Centro de Control

1002
redhat/tdebase/tdebase-14.0.0-kdesktop_crossfade.patch
View File

File diff suppressed because it is too large Load Diff

1002
redhat/tdebase/tdebase-14.0.0-kdesktop_crossfade.patch~
View File

File diff suppressed because it is too large Load Diff

16
redhat/tdebase/tdebase-14.0.0-kickoff_default_favs.patch
Unescape View File

@ -0,0 +1,16 @@
--- trinity-tdebase-3.5.13.2~pre86+807a5445/kicker/kicker/ui/default-favs.ORI 2013-05-09 22:50:36.607264087 +0200
+++ trinity-tdebase-3.5.13.2~pre86+807a5445/kicker/kicker/ui/default-favs 2013-05-09 22:50:46.935039753 +0200
@@ -1,9 +1,7 @@
-MozillaFirefox.desktop
-tde-Kontact.desktop
-writer.desktop
-tde-amarok.desktop
-tde-digikam.desktop
tde-Home.desktop
+tde-konqbrowser.desktop
+tde-Kfind.desktop
+tde-kate.desktop
+tde-konsole.desktop
tde-KControl.desktop
tde-Help.desktop
-tde-konsole.desktop

45
redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch
Unescape View File

@ -0,0 +1,45 @@
--- ./kicker/kicker/ui/k_new_mnu.cpp.ori 2013-05-08 21:56:01.084691260 +0200
+++ ./kicker/kicker/ui/k_new_mnu.cpp 2013-05-08 21:58:02.086130445 +0200
@@ -1428,6 +1428,42 @@
m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ );
}
+ if ( TDEStandardDirs::exists( TDEGlobalSettings::picturesPath() + "/" ) )
+ {
+ TQString picturesPath = TDEGlobalSettings::picturesPath();
+ if ( picturesPath.endsWith( "/" ) )
+ picturesPath = picturesPath.left( picturesPath.length() - 1 );
+ if (picturesPath!=TQDir::homeDirPath())
+ m_systemView->insertItem( "folder_image", i18n( "My Images" ), picturesPath, picturesPath, nId++, index++ );
+ }
+
+ if ( TDEStandardDirs::exists( TDEGlobalSettings::musicPath() + "/" ) )
+ {
+ TQString musicPath = TDEGlobalSettings::musicPath();
+ if ( musicPath.endsWith( "/" ) )
+ musicPath = musicPath.left( musicPath.length() - 1 );
+ if (musicPath!=TQDir::homeDirPath())
+ m_systemView->insertItem( "folder_sound", i18n( "My Music" ), musicPath, musicPath, nId++, index++ );
+ }
+
+ if ( TDEStandardDirs::exists( TDEGlobalSettings::videosPath() + "/" ) )
+ {
+ TQString videosPath = TDEGlobalSettings::videosPath();
+ if ( videosPath.endsWith( "/" ) )
+ videosPath = videosPath.left( videosPath.length() - 1 );
+ if (videosPath!=TQDir::homeDirPath())
+ m_systemView->insertItem( "folder_video", i18n( "My Videos" ), videosPath, videosPath, nId++, index++ );
+ }
+
+ if ( TDEStandardDirs::exists( TDEGlobalSettings::downloadPath() + "/" ) )
+ {
+ TQString downloadPath = TDEGlobalSettings::downloadPath();
+ if ( downloadPath.endsWith( "/" ) )
+ downloadPath = downloadPath.left( downloadPath.length() - 1 );
+ if (downloadPath!=TQDir::homeDirPath())
+ m_systemView->insertItem( "folder_inbox", i18n( "My Downloads" ), downloadPath, downloadPath, nId++, index++ );
+ }
+
m_systemView->insertItem( "network", i18n( "Network Folders" ),
"remote:/", "remote:/", nId++, index++ );

48
redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch
Unescape View File

@ -0,0 +1,48 @@
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp 2013-07-10 07:56:40.070802259 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp 2013-07-10 07:58:53.680465150 +0200
@@ -107,7 +107,7 @@
dialog->frameCB->setChecked(config.readBoolEntry("has frame",true));
dialog->line_spacingSB->setValue(config.readUnsignedNumEntry( "LineSpacing", 0 ));
dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 ));
- dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~"));
+ dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+"));
dialog->SchemaEditor1->setSchema(config.readEntry("schema"));
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200
@@ -1573,7 +1573,7 @@
b_warnQuit=config->readBoolEntry( "WarnQuit", true );
b_allowResize=config->readBoolEntry( "AllowResize", false);
b_bidiEnabled = config->readBoolEntry("EnableBidi",false);
- s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+");
b_framevis = config->readBoolEntry("has frame",true);
TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp 2013-07-10 07:58:53.684465202 +0200
@@ -565,7 +565,7 @@
n_keytab=config->readNumEntry("keytab",0); // act. the keytab for this session
n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE);
- s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+");
n_encoding = config->readNumEntry("encoding",0);
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp 2013-07-10 07:58:53.690465276 +0200
@@ -352,7 +352,7 @@
,preserve_line_breaks(true)
,column_selection_mode(false)
,scrollLoc(SCRNONE)
-,word_characters(":@-./_~")
+,word_characters(":@-./_~+")
,m_bellMode(BELLSYSTEM)
,blinking(false)
,cursorBlinking(false)

11
redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
Unescape View File

@ -0,0 +1,11 @@
--- trinity-tdebase-14.0.0~pre737+02bf1e69/kdesktop/krootwm.c.ORI 2013-07-07 19:52:01.913986986 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/kdesktop/krootwm.cc 2013-07-07 19:52:49.676516510 +0200
@@ -760,7 +760,7 @@
TDEConfigGroupSaver gs(TDEGlobal::config(), "General");
TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
- *p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/";
+ *p << terminal;
p->start(TDEProcess::DontCare);

151
redhat/tdebase/tdebase-14.0.0-suspend_unmount.patch
Unescape View File

@ -0,0 +1,151 @@
--- ./tdeioslave/media/libmediacommon/medium.cpp.ori 2013-05-08 22:57:09.317384423 +0200
+++ ./tdeioslave/media/libmediacommon/medium.cpp 2013-05-08 22:57:36.730837358 +0200
@@ -46,6 +46,7 @@
loadUserLabel();
m_halmounted = false;
+ m_isHotplug = false;
}
Medium::Medium()
@@ -69,6 +70,7 @@
m_properties+= "false"; /* HIDDEN */
m_halmounted = false;
+ m_isHotplug = false;
}
const Medium Medium::create(const TQStringList &properties)
--- ./tdeioslave/media/libmediacommon/medium.h.ORI 2013-05-08 22:59:10.772959829 +0200
+++ ./tdeioslave/media/libmediacommon/medium.h 2013-05-08 22:59:56.602044404 +0200
@@ -92,6 +92,9 @@
void setHalMounted(bool flag) const { m_halmounted = flag; }
bool halMounted() const { return m_halmounted; }
+ void setIsHotplug( bool state ) { m_isHotplug = state; }
+ bool isHotplug() const { return m_isHotplug; }
+
//private:
Medium();
@@ -100,6 +103,8 @@
TQStringList m_properties;
mutable bool m_halmounted;
+
+ bool m_isHotplug;
friend class TQValueListNode<const Medium>;
};
--- ./tdeioslave/media/mediamanager/mediamanager.cpp.ori 2013-05-08 23:00:39.673183801 +0200
+++ ./tdeioslave/media/mediamanager/mediamanager.cpp 2013-05-08 23:04:47.639224260 +0200
@@ -354,6 +354,57 @@
emit mediumChanged(name);
}
+TQString MediaManager::unmountAllSuspend()
+{
+ TQPtrList<Medium> list = m_mediaList.list();
+
+ TQPtrList<Medium>::const_iterator it = list.begin();
+ TQPtrList<Medium>::const_iterator end = list.end();
+
+ TQString result;
+
+ for (; it!=end; ++it)
+ {
+ if ( (*it)->isMounted() && (*it)->isHotplug() )
+ {
+ TQString tmp = unmount( (*it)->id() );
+ if ( !tmp.isEmpty() ) { // umount failed
+ result = tmp;
+ } else {
+ m_suspendResumeMountList.append( (*it)->id() );
+ }
+ }
+ }
+
+ // return last error
+ return result;
+}
+
+TQString MediaManager::remountAllResume()
+{
+ TQString result;
+
+ for (TQStringList::const_iterator it = m_suspendResumeMountList.begin();
+ it != m_suspendResumeMountList.end();
+ ++it)
+ {
+ const Medium *m = m_mediaList.findById(*it);
+
+ if ( m && m->needMounting() )
+ {
+ TQString tmp = mount( *it );
+ if ( !tmp.isEmpty() ) { // mount failed
+ result = tmp;
+ }
+ }
+ }
+
+ m_suspendResumeMountList.clear();
+
+ // return last error
+ return result;
+}
+
extern "C" {
KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
--- ./tdeioslave/media/mediamanager/mediamanager.h.ORI 2013-05-08 23:05:36.250251036 +0200
+++ ./tdeioslave/media/mediamanager/mediamanager.h 2013-05-08 23:07:27.650019601 +0200
@@ -60,6 +60,20 @@
bool removableUnplug(const TQString &devNode);
bool removableCamera(const TQString &devNode);
+ /**
+ * Unmount manually all partitions when going to suspend
+ *
+ * @return last error if any
+ */
+ TQString unmountAllSuspend();
+
+ /**
+ * Remount previously unmounted partitions in unmountAllSuspend()
+ *
+ * @return last error if any
+ */
+ TQString remountAllResume();
+
k_dcop_signals:
void mediumAdded(const TQString &name, bool allowNotification);
void mediumRemoved(const TQString &name, bool allowNotification);
@@ -89,6 +103,7 @@
TDEBackend *m_tdebackend;
MediaDirNotify m_dirNotify;
FstabBackend *m_fstabbackend;
+ TQStringList m_suspendResumeMountList;
};
#endif
--- ./tdeioslave/media/mediamanager/halbackend.cpp.ori 2013-05-08 23:08:12.196126863 +0200
+++ ./tdeioslave/media/mediamanager/halbackend.cpp 2013-05-08 23:08:51.096347073 +0200
@@ -541,6 +541,7 @@
libhal_volume_is_mounted(halVolume) ); /* Mounted ? */
}
+ medium->setIsHotplug( libhal_drive_is_hotpluggable(halDrive) );
char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
TQString volume_name = TQString::fromUtf8(name);
--- ./tdeioslave/media/mediamanager/halbackend.h.ORI 2013-05-08 23:09:35.761451488 +0200
+++ ./tdeioslave/media/mediamanager/halbackend.h 2013-05-08 23:10:21.608531952 +0200
@@ -89,6 +89,8 @@
TQString decrypt(const TQString &id, const TQString &password);
TQString undecrypt(const TQString &id);
+ static bool isHotplug( const TQString & id );
+
private:
/**
* Append a device in the media list. This function will check if the device

186
redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch
Unescape View File

@ -0,0 +1,186 @@
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h.ORI 2013-05-14 22:12:18.159235590 +0200
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h 2013-05-14 22:12:56.657422259 +0200
@@ -58,6 +58,7 @@
void slotLock( bool );
void slotDelaySaverStart( bool );
void slotUseTSAK( bool );
+ void slotVibrateUnlock( bool );
void slotUseUnmanagedLockWindows( bool );
void slotHideActiveWindowsFromSaver( bool );
void processLockouts();
@@ -101,6 +102,7 @@
TQGroupBox *mSettingsGroup;
TQCheckBox *mDelaySaverStartCheckBox;
TQCheckBox *mUseTSAKCheckBox;
+ TQCheckBox *mVibrateUnlockCheckBox;
TQCheckBox *mUseUnmanagedLockWindowsCheckBox;
TQCheckBox *mHideActiveWindowsFromSaverCheckBox;
@@ -119,6 +121,7 @@
bool mImmutable;
bool mDelaySaverStart;
bool mUseTSAK;
+ bool mVibrateUnlock;
bool mUseUnmanagedLockWindows;
bool mHideActiveWindowsFromSaver;
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog 2013-04-26 22:15:23.000000000 +0200
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp 2013-05-14 22:24:37.354375502 +0200
@@ -270,6 +270,13 @@
settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
+ mVibrateUnlockCheckBox = new TQCheckBox( i18n("&Vibrate unlock dialog box on failure"), mSettingsGroup );
+ mVibrateUnlockCheckBox->setEnabled( true );
+ mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
+ connect( mVibrateUnlockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotVibrateUnlock( bool ) ) );
+ settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1);
+ TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") );
+
// right column
TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint());
@@ -429,6 +436,7 @@
mLock = config->readBoolEntry("Lock", false);
mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true);
mUseTSAK = config->readBoolEntry("UseTDESAK", true);
+ mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
mSaver = config->readEntry("Saver");
@@ -481,6 +489,7 @@
config->writeEntry("Lock", mLock);
config->writeEntry("DelaySaverStart", mDelaySaverStart);
config->writeEntry("UseTDESAK", mUseTSAK);
+ config->writeEntry("VibrateUnlock", mVibrateUnlock);
config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
@@ -688,10 +697,14 @@
mUseTSAKCheckBox->setChecked( false );
}
if (!mUseUnmanagedLockWindows) {
+ mVibrateUnlockCheckBox->setEnabled( true );
+ mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
}
else {
+ mVibrateUnlockCheckBox->setEnabled( false );
+ mVibrateUnlockCheckBox->setChecked( false );
mHideActiveWindowsFromSaverCheckBox->setEnabled( false );
mHideActiveWindowsFromSaverCheckBox->setChecked( false );
}
@@ -936,6 +949,16 @@
processLockouts();
mChanged = true;
emit changed(true);
+}
+
+//---------------------------------------------------------------------------
+//
+void KScreenSaver::slotVibrateUnlock( bool u )
+{
+ if (mVibrateUnlockCheckBox->isEnabled()) mVibrateUnlock = u;
+ processLockouts();
+ mChanged = true;
+ emit changed(true);
}
//---------------------------------------------------------------------------
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h.vibrate_dialog 2013-01-09 02:12:13.000000000 +0100
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h 2013-05-14 22:42:50.562878532 +0200
@@ -60,6 +60,7 @@
void slotOK();
void layoutClicked();
void slotActivity();
+ void moveTimerDone();
protected slots:
virtual void reject();
@@ -79,6 +80,8 @@
void handleVerify();
void reapVerify();
void cantCheck();
+ void movedialog( int _move );
+ void badPasswordLogin();
GreeterPluginHandle *mPlugin;
KGreeterPlugin *greet;
TQFrame *frame;
@@ -95,6 +98,8 @@
int sPid, sFd;
TQListView *lv;
TQDateTime m_lockStartDT;
+ bool waitMoveDialog;
+ bool VibrateUnlock;
};
#endif
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc.vibrate_dialog 2013-01-09 02:12:13.000000000 +0100
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc 2013-05-14 22:42:12.809621715 +0200
@@ -55,6 +55,7 @@
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <fixx11h.h>
+#include <tdeapplication.h>
#ifndef AF_LOCAL
# define AF_LOCAL AF_UNIX
@@ -246,6 +247,11 @@
mLayoutButton->hide(); // no kxkb running
}
capsLocked();
+
+ TDEConfig* config = new TDEConfig("kdesktoprc");
+ config->setGroup("ScreenSaver");
+ VibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
+ delete config;
}
PasswordDlg::~PasswordDlg()
@@ -302,6 +308,37 @@
}
}
+void PasswordDlg::movedialog( int _move )
+{
+ waitMoveDialog = true;
+ this->move(pos().x()+_move, pos().y());
+ TQTimer::singleShot( 50, this, TQT_SLOT(moveTimerDone()) );
+ while (waitMoveDialog) {
+ kapp->processEvents();
+ }
+}
+
+void PasswordDlg::moveTimerDone()
+{
+ waitMoveDialog = false;
+}
+
+void PasswordDlg::badPasswordLogin()
+{
+ if ( VibrateUnlock && mUnlockingFailed )
+ {
+ for ( int i = 0 ; i<2 ; i++)
+ {
+ movedialog( 10 );
+ movedialog( -20 );
+ movedialog( 20 );
+ movedialog( -20 );
+ movedialog( 20 );
+ movedialog( -10 );
+ }
+ }
+}
+
//---------------------------------------------------------------------------
//
// Handle timer events.
@@ -442,6 +479,7 @@
ok->setEnabled(false);
cancel->setEnabled(false);
mNewSessButton->setEnabled( false );
+ badPasswordLogin();
return;
case AuthAbort:
return;

49
redhat/tdebase/tdebase-14.0.0.spec
Unescape View File

@ -71,6 +71,26 @@ Source8: tdm%{?dist}.pp
Source9: mgabutton.svg Source9: mgabutton.svg
%endif %endif
# Patch party !
## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
Patch1: tdebase-14.0.0-open_terminal_here.patch
## [tdebase/starttde] Sets default Start Icon in 'kickerrc' [RHEL/Fedora]
Patch2: tdebase-14.0.0-default_menu_icon.patch
## [kdebase/kcontrol] Adds FR translation for KCM ICC
Patch3: tdebase-14.0.0-displayconfig_translation.patch
## [kdebase/kcontrol] Adds FR translation for KCM ICC
Patch4: tdebase-14.0.0-kickoff_default_favs.patch
## [kdebase] Changes konsole default word separator
Patch5: tdebase-14.0.0-konsole_wordseps.patch
# Patches from Mandriva
Patch101: tdebase-14.0.0-vibrate_dialog.patch
Patch102: tdebase-14.0.0-kcontrol_menu_entry.patch
Patch103: tdebase-14.0.0-kdesktop_crossfade.patch
Patch104: tdebase-14.0.0-kickoff_xdg_dirs.patch
Patch105: tdebase-14.0.0-suspend_unmount.patch
Patch106: tdebase-14.0.0-bookmark_global_copy.patch
### Distribution-specific settings ### ### Distribution-specific settings ###
@ -2793,9 +2813,15 @@ TDE will start, but many good defaults will not be set.
%post -n trinity-ksmserver %post -n trinity-ksmserver
/sbin/ldconfig || : /sbin/ldconfig || :
%if 0%{?mdkversion} || 0%{?mgaversion}
fndSession
%endif
%postun -n trinity-ksmserver %postun -n trinity-ksmserver
/sbin/ldconfig || : /sbin/ldconfig || :
%if 0%{?mdkversion} || 0%{?mgaversion}
fndSession
%endif
########## ##########
@ -3191,7 +3217,18 @@ Windows and Samba shares.
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .openterminalhere
%patch2 -p1 -b .startmenuicon
%patch3 -p1 -b .displayconfigtranslation
%patch4 -p1 -b .kickoffdefaultsfav
%patch5 -p1 -b .konsolewordseps
%patch101 -p1 -b .vibrate_dialog
%patch102 -p1 -b .kcontrol_menu_entry
%patch103 -p1 -b .kdesktop_crossfade
%patch104 -p1 -b .kickoff_xdg
%patch105 -p1 -b .suspend_unmount
%patch106 -p1 -b .bookmark_global_copy
# Applies an optional distro-specific graphical theme # Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != "" %if "%{?tde_bg}" != ""
@ -3224,6 +3261,14 @@ Windows and Samba shares.
-e "s|/opt/trinity|%{tde_prefix}|g" \ -e "s|/opt/trinity|%{tde_prefix}|g" \
-e "s|%%{tde_starticon}|%{tde_starticon}|g" -e "s|%%{tde_starticon}|%{tde_starticon}|g"
# Xsession script location may vary on some distro
%if 0%{?rhel} || 0%{?fedora}
%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
%endif
%if 0%{?suse_version}
%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
%endif
%build %build
unset QTDIR unset QTDIR
@ -3410,7 +3455,7 @@ EOF
# Mageia icon # Mageia icon
%if 0%{?mgaversion} >= 3 %if 0%{?mgaversion} >= 3
%__install -D -m 644 %{SOURCE9} %{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg %__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg"
%endif %endif

2
redhat/tdebase/tdebase-3.5.13.2-kdesktop_crossfade.patch
Unescape View File

@ -814,7 +814,7 @@ diff -p -up kdebase-3.5.9/kcontrol/background/KCrossBGRender.cc.crossfade-efect
#include <tqstring.h> #include <tqstring.h>
#include <tqptrvector.h> #include <tqptrvector.h>
+#include <qdatetime.h> +#include <tqdatetime.h>
#include <KBackgroundIface.h> #include <KBackgroundIface.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300

33
redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch
Unescape View File

@ -0,0 +1,33 @@
--- ./tdeprint/kmfactory.cpp.ORI 2013-05-09 00:14:51.664045869 +0200
+++ ./tdeprint/kmfactory.cpp 2013-05-09 00:16:59.154367127 +0200
@@ -249,8 +249,21 @@
conf->writeEntry("PrintSystem", sys);
conf->sync();
}
- else if ( sys.length()==1 && sys[0].isDigit() ) // discard old-style settings
+ else if ( sys.length()==1 && sys[0].isDigit() ) { // discard old-style settings
sys = "lpdunix";
+ } else {
+ //Always Autodetect
+ //it will not try autodetect if user changes any option
+ //when user force some option, AlwaysSearch will be "no" and then
+ //kprinter will not to try autodetect again.
+ if(conf->readEntry("AlwaysSearch") != "no" ) {
+ sys = autoDetect();
+ conf->writeEntry("PrintSystem",sys);
+ conf->writeEntry("AlwaysSearch","yes");
+ conf->sync();
+ }
+ }
+
return sys;
}
@@ -278,6 +291,7 @@
{
TDEConfig *conf = printConfig();
conf->setGroup("General");
+ conf->writeEntry("AlwaysSearch","no");
conf->writeEntry("PrintSystem", syst);
conf->sync();

18
redhat/tdelibs/tdelibs-14.0.0-fix_battery_charge.patch
Unescape View File

@ -0,0 +1,18 @@
--- trinity-tdelibs-14.0.0~pre596+d6816283/tdecore/tdehardwaredevices.cpp.batterycharge 2013-07-07 11:55:57.000000000 +0200
+++ trinity-tdelibs-14.0.0~pre596+d6816283/tdecore/tdehardwaredevices.cpp 2013-07-08 20:21:00.196653825 +0200
@@ -4704,6 +4704,15 @@
if (nodename == "alarm") {
bdevice->internalSetAlarmEnergy(line.toDouble()/1000000.0);
}
+ if (nodename == "charge_full") {
+ bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0);
+ }
+ if (nodename == "charge_full_design") {
+ bdevice->internalSetMaximumDesignEnergy(line.toDouble()/1000000.0);
+ }
+ if (nodename == "charge_now") {
+ bdevice->internalSetEnergy(line.toDouble()/1000000.0);
+ }
if (nodename == "energy_full") {
bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0);
}

150
redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch
Unescape View File

@ -0,0 +1,150 @@
--- ./tdecore/tdeglobalsettings.h.Ori 2013-05-08 22:16:42.771982104 +0200
+++ ./tdecore/tdeglobalsettings.h 2013-05-08 22:18:33.882577602 +0200
@@ -253,6 +253,29 @@
*/
static TQString documentPath() { initStatic(); return *s_documentPath; }
+ /**
+ * The path where documents are stored of the current user.
+ * @return the path of the videos directory
+ */
+ static TQString videosPath() { initStatic(); return *s_videosPath; }
+
+ /**
+ * The path where documents are stored of the current user.
+ * @return the path of the music directory
+ */
+ static TQString musicPath() { initStatic(); return *s_musicPath; }
+
+ /**
+ * The path where documents are stored of the current user.
+ * @return the path of the downloads directory
+ */
+ static TQString downloadPath() { initStatic(); return *s_downloadPath; }
+
+ /**
+ * The path where documents are stored of the current user.
+ * @return the path of the pictures directory
+ */
+ static TQString picturesPath() { initStatic(); return *s_picturesPath; }
/**
* The default color to use when highlighting toolbar buttons.
@@ -560,6 +583,10 @@
static TQString* s_autostartPath;
static TQString* s_trashPath;
static TQString* s_documentPath;
+ static TQString* s_picturesPath;
+ static TQString* s_downloadPath;
+ static TQString* s_musicPath;
+ static TQString* s_videosPath;
static TQFont *_generalFont;
static TQFont *_fixedFont;
static TQFont *_toolBarFont;
--- ./tdecore/tdeglobalsettings.cpp.xdg_path 2013-01-09 19:23:09.000000000 +0100
+++ ./tdecore/tdeglobalsettings.cpp 2013-05-08 22:26:26.451376166 +0200
@@ -62,6 +62,10 @@
TQString* TDEGlobalSettings::s_autostartPath = 0;
TQString* TDEGlobalSettings::s_trashPath = 0;
TQString* TDEGlobalSettings::s_documentPath = 0;
+TQString* TDEGlobalSettings::s_videosPath = 0;
+TQString* TDEGlobalSettings::s_musicPath = 0;
+TQString* TDEGlobalSettings::s_downloadPath = 0;
+TQString* TDEGlobalSettings::s_picturesPath = 0;
TQFont *TDEGlobalSettings::_generalFont = 0;
TQFont *TDEGlobalSettings::_fixedFont = 0;
TQFont *TDEGlobalSettings::_toolBarFont = 0;
@@ -83,7 +87,7 @@
// helper function for reading xdg user dirs: it is required in order to take
// care of locale stuff
-void readXdgUserDirs(TQString *desktop, TQString *documents)
+void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *videos, TQString *music, TQString *download, TQString *pictures)
{
TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" );
@@ -101,6 +105,14 @@
*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
else if (line.startsWith("XDG_DOCUMENTS_DIR="))
*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ else if (line.startsWith("XDG_MUSIC_DIR="))
+ *videos = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ else if (line.startsWith("XDG_DOWNLOAD_DIR="))
+ *download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ else if (line.startsWith("XDG_VIDEOS_DIR="))
+ *music = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ else if (line.startsWith("XDG_PICTURES_DIR="))
+ *pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
line = s.readLine();
}
@@ -515,30 +527,45 @@
s_autostartPath = new TQString();
s_trashPath = new TQString();
s_documentPath = new TQString();
+ s_videosPath = new TQString();
+ s_musicPath = new TQString();
+ s_downloadPath = new TQString();
+ s_picturesPath = new TQString();
+
TDEConfigGroup g( TDEGlobal::config(), "Paths" );
- // Read desktop and documents path using XDG_USER_DIRS
- readXdgUserDirs(s_desktopPath, s_documentPath);
+ // Read desktop and documents path using XDG_USER_DIRS
+ readXdgUserDirs(s_desktopPath, s_documentPath, s_musicPath, s_videosPath, s_downloadPath, s_picturesPath);
if (s_desktopPath->isEmpty() == true) {
*s_desktopPath = TQDir::homeDirPath() + "/Desktop/";
}
+
*s_desktopPath = TQDir::cleanDirPath( *s_desktopPath );
if ( !s_desktopPath->endsWith("/") )
s_desktopPath->append('/');
- if (s_documentPath->isEmpty() == true) {
-#ifdef Q_WS_WIN
- *s_documentPath = getWin32ShellFoldersPath("Personal");
-#else
- *s_documentPath = TQDir::homeDirPath() + "/Documents/";
-#endif
- }
*s_documentPath = TQDir::cleanDirPath( *s_documentPath );
if ( !s_documentPath->endsWith("/"))
s_documentPath->append('/');
+ *s_musicPath = TQDir::cleanDirPath( *s_musicPath );
+ if ( !s_musicPath->endsWith("/"))
+ s_musicPath->append('/');
+
+ *s_videosPath = TQDir::cleanDirPath( *s_videosPath );
+ if ( !s_videosPath->endsWith("/"))
+ s_videosPath->append('/');
+
+ *s_downloadPath = TQDir::cleanDirPath( *s_downloadPath );
+ if ( !s_downloadPath->endsWith("/"))
+ s_downloadPath->append('/');
+
+ *s_picturesPath = TQDir::cleanDirPath( *s_picturesPath );
+ if ( !s_picturesPath->endsWith("/"))
+ s_picturesPath->append('/');
+
// Trash Path - TODO remove in KDE4 (tdeio_trash can't use it for interoperability reasons)
*s_trashPath = *s_desktopPath + i18n("Trash") + "/";
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
@@ -603,6 +630,14 @@
s_desktopPath = 0L;
delete s_documentPath;
s_documentPath = 0L;
+ delete s_videosPath;
+ s_videosPath = 0L;
+ delete s_picturesPath;
+ s_picturesPath = 0L;
+ delete s_downloadPath;
+ s_downloadPath = 0L;
+ delete s_musicPath;
+ s_musicPath = 0L;
}
TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()

39
redhat/tdelibs/tdelibs-14.0.0.spec
Unescape View File

@ -32,6 +32,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
# Patches from Mandriva
Patch1: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch2: tdelibs-14.0.0-cups_by_default.patch
# Fix battery charge detection
Patch3: tdelibs-14.0.0-fix_battery_charge.patch
Obsoletes: tdelibs < %{version}-%{release} Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release} Provides: tdelibs = %{version}-%{release}
@ -232,13 +238,13 @@ kimgio (image manipulation).
%{tde_bindir}/tdecmshell %{tde_bindir}/tdecmshell
%{tde_bindir}/tdeconf_update %{tde_bindir}/tdeconf_update
%{tde_bindir}/kcookiejar %{tde_bindir}/kcookiejar
%{tde_bindir}/[kt]de-config %{tde_bindir}/tde-config
%{tde_bindir}/[kt]de-menu %{tde_bindir}/tde-menu
%{tde_bindir}/kded %{tde_bindir}/kded
%{tde_bindir}/[kt]deinit %{tde_bindir}/tdeinit
%{tde_bindir}/[kt]deinit_shutdown %{tde_bindir}/tdeinit_shutdown
%{tde_bindir}/[kt]deinit_wrapper %{tde_bindir}/tdeinit_wrapper
%{tde_bindir}/[kt]desu_stub %{tde_bindir}/tdesu_stub
%{tde_bindir}/kdetcompmgr %{tde_bindir}/kdetcompmgr
%{tde_bindir}/kdontchangethehostname %{tde_bindir}/kdontchangethehostname
%{tde_bindir}/tdedostartupconfig %{tde_bindir}/tdedostartupconfig
@ -265,8 +271,8 @@ kimgio (image manipulation).
%{tde_bindir}/make_driver_db_lpr %{tde_bindir}/make_driver_db_lpr
%{tde_bindir}/meinproc %{tde_bindir}/meinproc
%{tde_bindir}/networkstatustestservice %{tde_bindir}/networkstatustestservice
%{tde_bindir}/start_[kt]deinit %{tde_bindir}/start_tdeinit
%{tde_bindir}/start_[kt]deinit_wrapper %{tde_bindir}/start_tdeinit_wrapper
%attr(4755,root,root) %{tde_bindir}/kgrantpty %attr(4755,root,root) %{tde_bindir}/kgrantpty
%{tde_bindir}/tde_dbus_hardwarecontrol %{tde_bindir}/tde_dbus_hardwarecontrol
%{tde_bindir}/checkXML %{tde_bindir}/checkXML
@ -275,9 +281,9 @@ kimgio (image manipulation).
%{tde_bindir}/preparetips %{tde_bindir}/preparetips
%{tde_tdelibdir}/* %{tde_tdelibdir}/*
%{tde_libdir}/lib*.so.* %{tde_libdir}/lib*.so.*
%{tde_libdir}/lib[kt]deinit_*.la %{tde_libdir}/libtdeinit_*.la
%{tde_libdir}/lib[kt]deinit_*.so %{tde_libdir}/libtdeinit_*.so
%{tde_datadir}/applications/[kt]de/*.desktop %{tde_datadir}/applications/tde/*.desktop
%{tde_datadir}/autostart/tdeab2tdeabc.desktop %{tde_datadir}/autostart/tdeab2tdeabc.desktop
%{tde_datadir}/applnk/tdeio_iso.desktop %{tde_datadir}/applnk/tdeio_iso.desktop
%{tde_datadir}/apps/* %{tde_datadir}/apps/*
@ -333,16 +339,16 @@ applications for TDE.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/dcopidl* %{tde_bindir}/dcopidl*
%{tde_bindir}/*config_compiler %{tde_bindir}/*config_compiler
%{tde_bindir}/make[kt]dewidgets %{tde_bindir}/maketdewidgets
%{tde_datadir}/apps/ksgmltools2/ %{tde_datadir}/apps/ksgmltools2/
%{tde_tdeincludedir}/* %{tde_tdeincludedir}/*
%{tde_libdir}/*.la %{tde_libdir}/*.la
%{tde_libdir}/*.so %{tde_libdir}/*.so
%{tde_libdir}/*.a %{tde_libdir}/*.a
%{tde_libdir}/pkgconfig/tdelibs.pc %{tde_libdir}/pkgconfig/tdelibs.pc
%exclude %{tde_libdir}/lib[kt]deinit_*.la %exclude %{tde_libdir}/libtdeinit_*.la
%exclude %{tde_libdir}/lib[kt]deinit_*.so %exclude %{tde_libdir}/libtdeinit_*.so
%{tde_datadir}/cmake/[kt]delibs.cmake %{tde_datadir}/cmake/tdelibs.cmake
%post devel %post devel
/sbin/ldconfig || : /sbin/ldconfig || :
@ -360,6 +366,9 @@ applications for TDE.
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .xdg_path
%patch2 -p1 -b .cups_by_default
%patch3 -p1 -b .batterycharge
%build %build

Write Preview
Loading…
Cancel
Save