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: update tdetoys

Browse Source
pull/3/head
François Andriot 10 years ago
parent e8ff98591d
commit f57c87947e
14 changed files with 2 additions and 4103 deletions
Show Stats Download Patch File Download Diff File

2
redhat/main/tdetoys/tdetoys-14.0.0.spec
Unescape View File

@ -58,6 +58,8 @@ License: GPLv2+
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
# Trinity dependencies # Trinity dependencies
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}

361
redhat/main/tdeutils/kdeutils-3.5.12.spec
Unescape View File

@ -1,361 +0,0 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.12
%endif
%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"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.12 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/kde3
Name: trinity-kdeutils
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
License: GPL
Summary: TDE Utilities
Group: Applications/System
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: kdeutils-%{version}.tar.gz
Source1: klaptop_acpi_helper.pam
Source2: klaptop_acpi_helper.console
Source3: kcmlaptoprc
BuildRequires: tqtinterface
BuildRequires: trinity-arts
BuildRequires: trinity-kdelibs
# RedHat / Fedora legacy patches
Patch1: kdf-3.0.2-label.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires: tqtinterface
Requires: trinity-kdelibs
BuildRequires: gettext
BuildRequires: net-snmp-devel
BuildRequires: python-devel
BuildRequires: gmp-devel
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libXScrnSaver-devel libXtst-devel
%endif
BuildRequires: xmms-devel
%define superkaramba_ver 0.39
Obsoletes: superkaramba < 0:%{superkaramba_ver}
Provides: superkaramba = 0:%{superkaramba_ver}
%description
Utilities for the Trinity Desktop Environment, including:
* ark (tar/gzip archive manager)
* kcalc (scientific calculator)
* kcharselect (character selector)
* kdepasswd (change password)
* kdessh (ssh front end)
* kdf (view disk usage)
* kedit (simple text editor)
* kfloppy (floppy formatting tool)
* kgpg (gpg gui)
* khexedit (hex editor)
* kjots (note taker)
* kregexpeditor (regular expression editor)
* ktimer (task scheduler)
* kwikdisk (removable media utility)
# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-extras = %{version}-%{release}
Requires: trinity-kdelibs-devel
%description devel
Development files for %{name}.
%package extras
Summary: Extras packages from %{name}
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} > 5 || 0%{?rhel} > 4
Requires: pm-utils
%endif
Requires: usermode
%description extras
More Utilities for the K Desktop Environment:
* kmilo
* ksim (system information monitor);
* klaptopdaemon (battery monitoring and management for laptops);
%prep
%setup -q -n kdeutils
%patch1 -p1 -b .label
%__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}"
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
--disable-debug --disable-warnings \
--enable-final \
--includedir=%{tde_includedir} \
--with-snmp \
--with-xscreensaver \
--with-extra-includes=%{_includedir}/tqt \
--enable-closure
%__make %{?_smp_mflags}
%install
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot}
# Show only in KDE (really? -- Rex)
for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
KCharSelect ark kwalletmanager kwalletconfig \
irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then
echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop
fi
done
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
pushd $lang_dir/kcontrol
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
done
popd
fi
done
fi
# using pam
install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
pushd %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir}
mv klaptop_acpi_helper ../sbin
ln -s consolehelper klaptop_acpi_helper
popd
# klaptop setting
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
%clean
%__rm -rf %{?buildroot}
%post
/sbin/ldconfig
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
/sbin/ldconfig
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%post extras
/sbin/ldconfig
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
%postun extras
/sbin/ldconfig
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
%files extras
%defattr(-,root,root,-)
# kmilo
%{tde_libdir}/kded_kmilod.*
%{tde_libdir}/kmilo*
%{_libdir}/libkmilo.la
%{_libdir}/libkmilo.so.*
%{_datadir}/services/kded/kmilod.desktop
%{_datadir}/services/kmilo
%{_datadir}/servicetypes/kmilo
# ksim
%{tde_docdir}/HTML/*/ksim/
%{tde_libdir}/ksim*
%{_libdir}/libksimcore.la
%{_libdir}/libksimcore.so.*
%{_datadir}/apps/kicker/extensions/ksim.desktop
%{_datadir}/apps/ksim/
%config %{_datadir}/config/ksim_panelextensionrc
%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
# klaptop
%{tde_docdir}/HTML/en/kcontrol
%{_sysconfdir}/pam.d/klaptop_acpi_helper
%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
%{_bindir}/klaptop*
%{tde_libdir}/kded_klaptopdaemon.*
%{_sbindir}/klaptop_acpi_helper
%{_datadir}/apps/klaptopdaemon
%{_datadir}/services/kded/klaptopdaemon.desktop
%{tde_libdir}/kcm_laptop.*
%{_libdir}/libkcmlaptop.*
%{_datadir}/applications/kde/laptop.desktop
%config %{_datadir}/config/kcmlaptoprc
%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
%files -f %{name}.lang
%defattr(-,root,root,-)
# kmilo
%exclude %{tde_libdir}/kded_kmilod.*
%exclude %{tde_libdir}/kmilo*
%exclude %{_libdir}/libkmilo.la
%exclude %{_libdir}/libkmilo.so.*
%exclude %{_datadir}/services/kded/kmilod.desktop
%exclude %{_datadir}/services/kmilo
%exclude %{_datadir}/servicetypes/kmilo
# ksim
%exclude %{tde_docdir}/HTML/*/ksim/
%exclude %{tde_libdir}/ksim*
%exclude %{_libdir}/libksimcore.la
%exclude %{_libdir}/libksimcore.so.*
%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop
%exclude %{_datadir}/apps/ksim/
%exclude %{_datadir}/config/ksim_panelextensionrc
%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
# klaptop
%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper
%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
%exclude %{_bindir}/klaptop*
%exclude %{tde_libdir}/kded_klaptopdaemon.*
%exclude %{_sbindir}/klaptop_acpi_helper
%exclude %{_datadir}/apps/klaptopdaemon
%exclude %{_datadir}/services/kded/klaptopdaemon.desktop
%exclude %{tde_libdir}/kcm_laptop.*
%exclude %{_libdir}/libkcmlaptop.*
%exclude %{_datadir}/applications/kde/laptop.desktop
%exclude %{_datadir}/config/kcmlaptoprc
%exclude %{tde_docdir}/HTML/en/kcontrol/
%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
%{tde_docdir}/HTML/en/*
%attr(644,root,root) %{_sysconfdir}/security/console.apps/*
%attr(644,root,root) %{_sysconfdir}/pam.d/*
%{_bindir}/*
%{_sbindir}/*
%{tde_libdir}/*
%{_libdir}/*.la
%{_libdir}/libkdeinit*.so
%{_libdir}/lib*.so.*
%{_datadir}/icons/*/*/*/*
%{_datadir}/apps/*
%config %{_datadir}/config/*
%{_datadir}/config.kcfg/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_datadir}/applications/kde/*
%if 0%{?rhel} >= 5
%{_datadir}/applnk/Utilities/*
%{_datadir}/mimelnk/application/*
%endif
%{_datadir}/autostart/*
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/*
%{_libdir}/libkcmlaptop.so
%{_libdir}/libkhexeditcommon.so
%{_libdir}/libkmilo.so
%{_libdir}/libkregexpeditorcommon.so
%{_libdir}/libksimcore.so
%changelog
* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
- Add RHEL5 support
* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
- Merge Spec file from Fedora8 "kdeutils-3.5.10-6"
* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
- Import to GIT
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
- Correct (again) macro to install under "/opt", if desired
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
- Correct macro to install under "/opt", if desired
* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
- Rebuilt
* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
- Add '--with-extra-includes=%{_includedir}/tqt'
* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
- Initial version

63
redhat/main/tdeutils/kdeutils-3.5.13-ark_fix_utf8.patch
Unescape View File

@ -1,63 +0,0 @@
--- kdeutils/ark/arch.cpp~ 2011-08-13 09:25:08.000000000 +0300
+++ kdeutils/ark/arch.cpp 2012-06-14 16:58:52.417875615 +0300
@@ -33,6 +33,7 @@
// QT includes
#include <tqapplication.h>
#include <tqfile.h>
+#include <tqtextcodec.h>
// KDE includes
#include <kdebug.h>
@@ -288,7 +290,7 @@
data[ lfChar ] = '\0';
- m_buffer.append( TQString::fromUtf8(data + startChar).latin1() );
+ m_buffer.append( data + startChar );
data[ lfChar ] = '\n';
startChar = lfChar + 1;
@@ -333,12 +335,15 @@
unsigned int pos = 0;
int strpos, len;
+ TQTextCodec *codec = TQTextCodec::codecForLocale();
+ TQString tqunicode_line = codec->toUnicode( line );
+
// Go through our columns, try to pick out data, return silently on failure
for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col )
{
ArchColumns *curCol = *col;
- strpos = curCol->pattern.search( line, pos );
+ strpos = curCol->pattern.search( tqunicode_line, pos );
len = curCol->pattern.matchedLength();
if ( ( strpos == -1 ) || ( len > curCol->maxLength ) )
@@ -354,7 +359,7 @@
pos = strpos + len;
- columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) );
+ columns[curCol->colRef] = tqunicode_line.mid(strpos, len).utf8();
}
--- kdeutils-3.5.1/ark/arkapp.cpp~ 2006-01-19 19:49:29 +0300
+++ kdeutils-3.5.1/ark/arkapp.cpp 2006-02-20 19:28:23 +0300
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <tqfile.h>
#include <errno.h>
+#include <qtextcodec.h>
#include "arkapp.h"
@@ -110,6 +111,7 @@ ArkApplication::ArkApplication()
{
m_mainwidget = new TQWidget;
setMainWidget(m_mainwidget);
+ QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
}
int

1281
redhat/main/tdeutils/kdeutils-3.5.13-ark_repairs_and_extensions.patch
View File

File diff suppressed because it is too large Load Diff

16
redhat/main/tdeutils/kdeutils-3.5.13-fix_ark_embedding.patch
Unescape View File

@ -1,16 +0,0 @@
commit 2a1d4a67d148c750266837db16a3e7b34cf13258
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1326326096 -0600
Allow ark embedding
This closes Bug 670
diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop
index f09a772..e62db26 100644
--- a/ark/ark_part.desktop
+++ b/ark/ark_part.desktop
@@ -133,4 +133,3 @@ Icon=ark
Type=Service
ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=libarkpart
-Hidden=true

49
redhat/main/tdeutils/kdeutils-3.5.13-further_organise_menu.patch
Unescape View File

@ -1,49 +0,0 @@
commit b970fc42f21431495c12a97f52e6f0699b173170
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331779039 -0500
Further organize TDE Menu.
diff --git a/kcalc/kcalc.desktop b/kcalc/kcalc.desktop
index 19ae663..6481922 100644
--- a/kcalc/kcalc.desktop
+++ b/kcalc/kcalc.desktop
@@ -85,4 +85,4 @@ GenericName[zu]=Umshini wokubala ezenzululwazi
Terminal=false
Type=Application
X-KDE-StartupNotify=true
-Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
+Categories=Qt;KDE;Utility;
diff --git a/kdelirc/irkick/irkick.desktop b/kdelirc/irkick/irkick.desktop
index 24a17b6..2f85103 100644
--- a/kdelirc/irkick/irkick.desktop
+++ b/kdelirc/irkick/irkick.desktop
@@ -58,7 +58,7 @@ X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-DCOP-ServiceType=Unique
X-KDE-autostart-condition=irkickrc:General:AutoStart:false
-Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
+Categories=Qt;KDE;Utility;
Exec=irkick
Icon=irkick
diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop
index 0170151..f4e3abc 100644
--- a/kedit/KEdit.desktop
+++ b/kedit/KEdit.desktop
@@ -79,4 +79,4 @@ Name[xh]=Abahleli Be K
Name[zh_TW]=KDE 編輯器
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;TextEditor;
+Categories=Qt;KDE;TextEditor;
diff --git a/kfloppy/KFloppy.desktop b/kfloppy/KFloppy.desktop
index 113a24d..e1f7a59 100644
--- a/kfloppy/KFloppy.desktop
+++ b/kfloppy/KFloppy.desktop
@@ -93,4 +93,4 @@ Type=Application
Terminal=false
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;
+Categories=Qt;KDE;Utility

31
redhat/main/tdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
Unescape View File

@ -1,31 +0,0 @@
--- 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 {

61
redhat/main/tdeutils/kdeutils-3.5.13-missing_ldflags.patch
Unescape View File

@ -1,61 +0,0 @@
--- kdeutils/kcalc/Makefile.am.ORI 2012-08-01 22:22:16.274750161 +0200
+++ kdeutils/kcalc/Makefile.am 2012-08-01 22:23:10.181783997 +0200
@@ -19,7 +19,7 @@
kcalctype.h dlabel.h stats.h
kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la
+kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_KDECORE)
KDE_ICON = kcalc
--- kdeutils/kedit/Makefile.am.ORI 2012-08-01 22:26:20.127379647 +0200
+++ kdeutils/kedit/Makefile.am 2012-08-01 22:26:38.144056739 +0200
@@ -12,7 +12,7 @@
kdeinit_LTLIBRARIES = kedit.la
kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc
-kedit_la_LIBADD = -lkdeprint $(LIB_KFILE)
+kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
noinst_HEADERS = kedit.h ktextfiledlg.h\
--- kdeutils/khexedit/lib/Makefile.am.ORI 2012-08-01 22:28:26.956106523 +0200
+++ kdeutils/khexedit/lib/Makefile.am 2012-08-01 22:28:33.941981315 +0200
@@ -7,7 +7,7 @@
# this library is used by the kbytesedit part and the khepart part
lib_LTLIBRARIES = libkhexeditcommon.la
libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined
-libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE)
+libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) $(LIB_QT)
libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \
kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \
kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \
--- kdeutils/kregexpeditor/Makefile.am.ORI 2012-08-01 22:31:33.556720026 +0200
+++ kdeutils/kregexpeditor/Makefile.am 2012-08-01 22:31:48.203381087 +0200
@@ -29,7 +29,7 @@
libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
- KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO)
+ KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
METASOURCES = AUTO
--- kdeutils/ksim/library/Makefile.am.ORI 2012-08-01 22:35:30.852281916 +0200
+++ kdeutils/ksim/library/Makefile.am 2012-08-01 22:35:39.599384576 +0200
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libksimcore.la
+lib_LTLIBRARIES = libksimcore.la
libksimcore_la_SOURCES = common.cpp themeloader.cpp \
chart.cpp label.cpp \
@@ -7,7 +7,7 @@
pluginmodule.cpp ksimconfig.cpp
libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
-libksimcore_la_LIBADD = $(LIB_KDEUI)
+libksimcore_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lkdefx
ksiminclude_HEADERS = common.h themeloader.h \
chart.h label.h \

46
redhat/main/tdeutils/kdeutils-3.5.13-remove_more_applications.patch
Unescape View File

@ -1,46 +0,0 @@
commit 803f475286c861cb5e7c9fa4f4dfadc5d0900177
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331690354 -0500
Remove "More Applications" from TDE menu. Add Utility category to KEdit.
This partially resolves bug report 653.
--- a/kdf/kdf.desktop
+++ b/kdf/kdf.desktop
@@ -85,4 +85,4 @@ Terminal=false
DocPath=kdf/index.html
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;System;X-KDE-More;
+Categories=Qt;KDE;System;
diff --git a/kdf/kwikdisk.desktop b/kdf/kwikdisk.desktop
index 28ca5b5..c723364 100644
--- a/kdf/kwikdisk.desktop
+++ b/kdf/kwikdisk.desktop
@@ -74,5 +74,5 @@ GenericName[zh_CN]=可移动介质工具
GenericName[zh_TW]=可移動媒體公用程式
GenericName[zu]=Umsebenzi Wonozindaba Ogudluzekayo
Terminal=false
-Categories=Qt;KDE;System;X-KDE-More;
+Categories=Qt;KDE;System;
OnlyShowIn=KDE;
diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop
index f4e3abc..0170151 100644
--- a/kedit/KEdit.desktop
+++ b/kedit/KEdit.desktop
@@ -79,4 +79,4 @@ Name[xh]=Abahleli Be K
Name[zh_TW]=KDE 編輯器
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;TextEditor;
+Categories=Qt;KDE;Utility;TextEditor;
diff --git a/ktimer/ktimer.desktop b/ktimer/ktimer.desktop
index d34c43b..1d12283 100644
--- a/ktimer/ktimer.desktop
+++ b/ktimer/ktimer.desktop
@@ -60,4 +60,4 @@ Name[xh]=Umjongi Wexesha
Name[zh_TW]=KDE 計時器
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;X-KDE-More;
+Categories=Qt;KDE;Utility;

57
redhat/main/tdeutils/kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch
Unescape View File

@ -1,57 +0,0 @@
commit 7780bb7b2050cadc6b77d0adc2b0b9629365379c
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331778476 -0500
Reorganize KControl menu tree.
* Move former KInfoCenter items -> Hardware/Information.
* Move Laptop Battery -> Hardware.
diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop
index 4c2613b..62cc3f6 100644
--- a/kdf/kcmdf.desktop
+++ b/kdf/kcmdf.desktop
@@ -2,6 +2,7 @@
X-KDE-ModuleType=Library
X-KDE-Library=kdf
X-KDE-FactoryName=kdf
+X-KDE-ParentApp=kinfocenter
X-KDE-LocalUser=false
Exec=kcmshell kcmdf
Icon=kcmdf
@@ -135,4 +136,4 @@ Comment[zh_CN]=显示挂接设备的磁盘使用率
Comment[zh_TW]=顯示連接的設備的磁碟使用率
Comment[zu]=Ikhombisa ukusebenziswa kwediski yamathuluzi okunyuka
-Categories=Qt;KDE;X-KDE-settings-hardware;
+Categories=Qt;KDE;X-KDE-settings-information;
diff --git a/klaptopdaemon/applnk/laptop.desktop b/klaptopdaemon/applnk/laptop.desktop
index 5c4101c..5a3ce26 100644
--- a/klaptopdaemon/applnk/laptop.desktop
+++ b/klaptopdaemon/applnk/laptop.desktop
@@ -6,7 +6,7 @@ Exec=kcmshell laptop
Icon=laptop_battery
Type=Application
DocPath=kcontrol/laptop/index.html
-Categories=Qt;KDE;X-KDE-settings-power;
+Categories=Qt;KDE;X-KDE-settings-hardware;
Comment=Laptop Battery
Comment[af]=Draagbare rekenaar Batery
Comment[ar]=بطّاريّة الحاسوب المحمول
diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop
index f139c2a..a519aec 100644
--- a/klaptopdaemon/applnk/pcmcia.desktop
+++ b/klaptopdaemon/applnk/pcmcia.desktop
@@ -2,6 +2,7 @@
X-KDE-ModuleType=Library
X-KDE-Library=laptop
X-KDE-FactoryName=pcmcia
+X-KDE-ParentApp=kinfocenter
Exec=kcmshell pcmcia
Icon=laptop_pcmcia
Type=Application
@@ -81,4 +82,4 @@ Name[pt_BR]=Cartões PCMCIA
Name[ta]= PCMCIA
Name[th]=อุปกรณ์ PCMCIA
-Categories=Qt;KDE;X-KDE-settings-hardware;
+Categories=Qt;KDE;X-KDE-settings-information;

1038
redhat/main/tdeutils/kdeutils-3.5.13.1.spec
View File

File diff suppressed because it is too large Load Diff

11
redhat/main/tdeutils/kdeutils-3.5.13.2-rhel4.patch
Unescape View File

@ -1,11 +0,0 @@
--- trinity-tdeutils-3.5.13.2/ConfigureChecks.cmake.rhel4 2013-01-09 02:43:16.000000000 +0100
+++ trinity-tdeutils-3.5.13.2/ConfigureChecks.cmake 2013-03-10 16:25:27.108634832 +0100
@@ -109,8 +107,6 @@
set( CMAKE_REQUIRED_LIBRARIES )
set( HAVE_DPMS 1 )
endif( WITH_DPMS )
- else( XEXT_FOUND )
- tde_message_fatal( "libXext is requested, but was not found on your system" )
endif( XEXT_FOUND )
endif( )

1076
redhat/main/tdeutils/kdeutils-3.5.13.spec
View File

File diff suppressed because it is too large Load Diff

13
redhat/main/tdeutils/kdf-3.0.2-label.patch
Unescape View File

@ -1,13 +0,0 @@
--- kdeutils-3.0.3/kdf/disklist.cpp.label 2002-08-19 14:36:13.000000000 +0200
+++ kdeutils-3.0.3/kdf/disklist.cpp 2002-08-19 14:37:34.000000000 +0200
@@ -163,8 +163,9 @@
while (! t.eof()) {
s=t.readLine();
s=s.simplifyWhiteSpace();
- if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) ) {
+ if ( (!s.isEmpty() ) && (s.find(DELIMITER)!=0) && (s.find("LABEL")!=0) ) {
// not empty or commented out by '#'
+ // skip LABEL entries as long as kdf can't handle them properly
// kdDebug() << "GOT: [" << s << "]" << endl;
disk = new DiskEntry();// Q_CHECK_PTR(disk);
disk->setMounted(FALSE);
Write Preview
Loading…
Cancel
Save