Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Timothy Pearson
13 years ago
commit
d2587a8509
@ -0,0 +1,24 @@
|
||||
--- kdelibs-3.5.10/admin/configure.in.min~ 2008-08-19 22:28:39.000000000 +0200
|
||||
+++ kdelibs-3.5.10/admin/configure.in.min 2009-08-17 19:13:01.823156420 +0200
|
||||
@@ -44,6 +44,9 @@
|
||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
+
|
||||
AC_CHECK_COMPILERS
|
||||
AC_ENABLE_SHARED(yes)
|
||||
AC_ENABLE_STATIC(no)
|
||||
--- kdelibs-3.5.10/configure.in.in~ 2006-05-22 20:14:23.000000000 +0200
|
||||
+++ kdelibs-3.5.10/configure.in.in 2009-08-17 19:16:04.549804009 +0200
|
||||
@@ -25,6 +25,9 @@
|
||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
+
|
||||
AC_CHECK_COMPILERS
|
||||
AC_LIBLTDL_CONVENIENCE
|
||||
|
||||
@ -0,0 +1,66 @@
|
||||
2009-12-10 Stepan Kasal <skasal@redhat.com>
|
||||
|
||||
The change of implementation of AC_REQUIRE in 2.64 caused a regression
|
||||
in the arts project.
|
||||
This can be fixed by shuffling some macro calls.
|
||||
|
||||
I suppose that most of this patch will not be needed with a future
|
||||
release of Autoconf.
|
||||
But the last chunk of this patch is a real bug in this source and
|
||||
should go upstream.
|
||||
|
||||
--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
|
||||
+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
|
||||
@@ -3081,8 +3081,18 @@
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
|
||||
+[
|
||||
+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
+ CFLAGS=" $CFLAGS"
|
||||
+ AC_PROG_CC
|
||||
+ CXXFLAGS=" $CXXFLAGS"
|
||||
+ AC_PROG_CXX
|
||||
+])
|
||||
+
|
||||
AC_DEFUN([AC_CHECK_COMPILERS],
|
||||
[
|
||||
+ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
|
||||
AC_ARG_ENABLE(debug,
|
||||
AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
|
||||
[
|
||||
@@ -3141,11 +3151,6 @@
|
||||
[kde_use_profiling="no"]
|
||||
)
|
||||
|
||||
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
- CFLAGS=" $CFLAGS"
|
||||
-
|
||||
- AC_PROG_CC
|
||||
-
|
||||
AC_PROG_CPP
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
@@ -3174,10 +3179,6 @@
|
||||
LDFLAGS=""
|
||||
fi
|
||||
|
||||
- CXXFLAGS=" $CXXFLAGS"
|
||||
-
|
||||
- AC_PROG_CXX
|
||||
-
|
||||
KDE_CHECK_FOR_BAD_COMPILER
|
||||
|
||||
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
|
||||
@@ -3503,8 +3504,8 @@
|
||||
AC_REQUIRE([AC_LIBTOOL_DLOPEN])
|
||||
AC_REQUIRE([KDE_CHECK_LIB64])
|
||||
|
||||
-AC_OBJEXT
|
||||
-AC_EXEEXT
|
||||
+AC_REQUIRE([AC_OBJEXT])
|
||||
+AC_REQUIRE([AC_EXEEXT])
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AC_LIBTOOL_CXX
|
||||
@ -0,0 +1,2 @@
|
||||
This directory contains some common patches which are applied to the majority
|
||||
of the Trinity sources.
|
||||
@ -0,0 +1,13 @@
|
||||
--- arts-1.5.3/mcop/mcoputils.cc 2005-12-22 21:20:23.000000000 -0200
|
||||
+++ arts-1.5.3/mcop/mcoputils.cc.new 2006-07-19 14:44:08.000000000 -0300
|
||||
@@ -371,7 +371,9 @@
|
||||
}
|
||||
if (!mcop_dir)
|
||||
{
|
||||
- arts_fatal("can't create mcop directory");
|
||||
+ return "Unable to create mcop directory";
|
||||
+
|
||||
+ // arts_fatal("can't create mcop directory");
|
||||
}
|
||||
string tmpdir = mcop_dir;
|
||||
return tmpdir+"/"+name;
|
||||
@ -0,0 +1,70 @@
|
||||
? flow/audioiooss.cc,v
|
||||
? flow/audioioossthreaded.cc,v
|
||||
Index: flow/Makefile.am
|
||||
===================================================================
|
||||
RCS file: /home/kde/arts/flow/Makefile.am,v
|
||||
retrieving revision 1.79
|
||||
diff -u -3 -p -r1.79 Makefile.am
|
||||
--- flow/Makefile.am 18 Nov 2004 20:19:59 -0000 1.79
|
||||
+++ flow/Makefile.am 25 Feb 2005 13:58:07 -0000
|
||||
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libartsflow_idl.la lib
|
||||
|
||||
libartsflow_idl_la_SOURCES = artsflow.cc
|
||||
libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
|
||||
-libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
|
||||
+libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4) -lresmgr
|
||||
|
||||
libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) $(LIBMAS) $(JACK_LIBADD) -lm \
|
||||
$(top_builddir)/flow/gsl/libgsl.la
|
||||
Index: flow/audioiooss.cc
|
||||
===================================================================
|
||||
RCS file: /home/kde/arts/flow/audioiooss.cc,v
|
||||
retrieving revision 1.17
|
||||
diff -u -3 -p -r1.17 audioiooss.cc
|
||||
--- flow/audioiooss.cc 20 Nov 2004 04:55:21 -0000 1.17
|
||||
+++ flow/audioiooss.cc 25 Feb 2005 13:58:07 -0000
|
||||
@@ -49,6 +49,7 @@
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#include <resmgr.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
@@ -157,7 +158,9 @@ bool AudioIOOSS::open()
|
||||
return false;
|
||||
}
|
||||
|
||||
- audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
+ audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
|
||||
+ if(audio_fd == -1)
|
||||
+ audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
|
||||
if(audio_fd == -1)
|
||||
{
|
||||
Index: flow/audioioossthreaded.cc
|
||||
===================================================================
|
||||
RCS file: /home/kde/arts/flow/audioioossthreaded.cc,v
|
||||
retrieving revision 1.6
|
||||
diff -u -3 -p -r1.6 audioioossthreaded.cc
|
||||
--- flow/audioioossthreaded.cc 20 Jan 2005 12:34:01 -0000 1.6
|
||||
+++ flow/audioioossthreaded.cc 25 Feb 2005 13:58:07 -0000
|
||||
@@ -50,6 +50,7 @@
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#include <resmgr.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
@@ -202,7 +203,9 @@ bool AudioIOOSSThreaded::open()
|
||||
return false;
|
||||
}
|
||||
|
||||
- audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
+ audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
|
||||
+ if(audio_fd == -1)
|
||||
+ audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
|
||||
if(audio_fd == -1)
|
||||
{
|
||||
@ -0,0 +1,20 @@
|
||||
--- arts-1.5.9/mcop/mcoputils.cc.orig 2008-06-02 09:28:23.000000000 -0300
|
||||
+++ arts-1.5.9/mcop/mcoputils.cc 2008-06-02 09:28:42.000000000 -0300
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
+#include <limits.h>
|
||||
#include <netdb.h>
|
||||
#include <errno.h>
|
||||
#include <config.h>
|
||||
--- arts-1.5.9/artsc/artsdsp.c.orig 2008-06-02 09:27:24.000000000 -0300
|
||||
+++ arts-1.5.9/artsc/artsdsp.c 2008-06-02 09:27:52.000000000 -0300
|
||||
@@ -21,6 +21,7 @@
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE 1
|
||||
+#undef _FORTIFY_SOURCE
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
@ -0,0 +1,347 @@
|
||||
%define compile_apidox 1
|
||||
%{?_no_apidox: %{expand: %%global compile_apidox 0}}
|
||||
%define oname arts
|
||||
%define epoch_arts 30000001
|
||||
|
||||
# Define short-cuts for libification
|
||||
%define major 1
|
||||
|
||||
%define libname %mklibname arts %{major}
|
||||
|
||||
%define lib_name_orig libarts
|
||||
|
||||
Name: arts3
|
||||
Summary: Arts - Libraries
|
||||
Version: 1.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: %{epoch_arts}
|
||||
Group: Graphical desktop/KDE3
|
||||
License: ARTISTIC BSD GPL_V2 LGPL_V2 QPL_V1.0
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
Requires(pre): %{libname} = %{epoch_arts}:%version-%release
|
||||
URL: http://www.kde.org
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
Patch0: arts-1.5.3-resmgr.patch
|
||||
Patch2: arts-1.5.3-mcop-msgkill.patch
|
||||
Patch4: arts-1.5.9-gcc4.3.x-compile.patch
|
||||
Patch5: kde-3.5.10-acinclude.patch
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: audiofile-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: resmgr-devel
|
||||
BuildRequires: X11-devel
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: esound-devel
|
||||
BuildRequires: multiarch-utils >= 1.0.3
|
||||
BuildRequires: jackit-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: libtqtinterface-devel >= 3.5.12
|
||||
BuildConflicts: mas-devel
|
||||
Obsoletes: aethera =< 0.9.3-5mdk
|
||||
Obsoletes: brahms =< 1.02-3mdk
|
||||
Obsoletes: dotNETStyle =< 0.9.2-2mdk
|
||||
Obsoletes: drivetweak-kde- =< 0.9.1-1mdk
|
||||
Obsoletes: guarddog =< 1.9.14-1mdk
|
||||
Obsoletes: k3b =< 0.5.1-2mdk
|
||||
Obsoletes: karchiver =< 2.0.5-3mdk
|
||||
Obsoletes: kdestudio =< 2.0.0-10mdk
|
||||
Obsoletes: kdevmon =< 0.4.5-2mdk
|
||||
Obsoletes: keduca =< 0.4-6mdk
|
||||
Obsoletes: keurocalc =< 0.5.8-1mdk
|
||||
Obsoletes: kfontinst =< 0.10-1mdk
|
||||
Obsoletes: kgesture =< 0.3-6mdk
|
||||
Obsoletes: kguitar =< 0.4-2mdk
|
||||
Obsoletes: kinkatta =< 1.00-1mdk
|
||||
Obsoletes: kmag =< 0.7-1mdk
|
||||
Obsoletes: kmymoney2 =< 0.4-1mdk
|
||||
Obsoletes: knetfilter =< 2.2.5-1mdk
|
||||
Obsoletes: komba2 =< 0.72-1mdk
|
||||
Obsoletes: koncd =< 1.0rc2-2mdk
|
||||
Obsoletes: konnector =< 0.5-4mdk
|
||||
Obsoletes: konverse =< 0.2-3mdk
|
||||
Obsoletes: kover =< 0.8.3-2mdk
|
||||
Obsoletes: kreatecd =< 1.1.0-2mdk
|
||||
Obsoletes: krpmbuilder =< 0.2.6-4mdk
|
||||
Obsoletes: krusader =< 1.01-1mdk
|
||||
Obsoletes: kshowmail =< 2.2.3-1mdk
|
||||
Obsoletes: ksnuffle =< 2.2-6mdk
|
||||
Obsoletes: ksplashml =< 0.92-1mdk
|
||||
Obsoletes: kstars =< 0.8.5-1mdk
|
||||
Obsoletes: kstocks =< 2.0.2-8mdk
|
||||
Obsoletes: ktexmaker2 =< 1.7-2mdk
|
||||
Obsoletes: ktouch =< 1.0-4mdk
|
||||
Obsoletes: kuickshow =< 0.8.2-3mdk
|
||||
Obsoletes: kwatch =< 2.2.0-1mdk
|
||||
Obsoletes: kwave =< 0.6.3-3mdk
|
||||
Obsoletes: kwintv =< 0.8.11-5mdk
|
||||
Obsoletes: kxicq2 =< 0.7.6-1mdk
|
||||
Obsoletes: kxmleditor =< 0.7.1-2mdk
|
||||
Obsoletes: libbrahms0 =< 1.02-3mdk
|
||||
Obsoletes: libkarchiver2 =< 2.0.5-3mdk
|
||||
Obsoletes: libkguitar1 =< 0.4-2mdk
|
||||
Obsoletes: libxmms-kde1 =< 6.5-5mdk
|
||||
Obsoletes: sakuraplayer =< 1.0.6-1mdk umlmodeller =< 1.0.3-5mdk
|
||||
Obsoletes: cervisia =< 1.4.1-7mdk
|
||||
Obsoletes: kbiff =< 3.5.4-3mdk
|
||||
Obsoletes: kcpuload =< 1.90-11mdk
|
||||
Obsoletes: kdbg =< 1.2.5-1mdk
|
||||
Obsoletes: kdeaddons3
|
||||
Obsoletes: kdeadmin3
|
||||
Obsoletes: kdeartwork3
|
||||
Obsoletes: kdebindings3
|
||||
Obsoletes: kdemultimedia3
|
||||
Obsoletes: kdemultimedia3-aktion
|
||||
Obsoletes: kdenetwork3
|
||||
Obsoletes: kdepim3
|
||||
Obsoletes: kdesdk3
|
||||
Obsoletes: kdetoys3
|
||||
Obsoletes: kdeutils3
|
||||
Obsoletes: kdevelop3
|
||||
Obsoletes: klogic =< 1.35-1mdk
|
||||
Obsoletes: klyx =< 2.0-17mdk
|
||||
Obsoletes: kmago =< 1.1.2-5mdk
|
||||
Obsoletes: knetload =< 1.91-8mdk
|
||||
Obsoletes: koffice =< 1.1.1-14mdk
|
||||
Obsoletes: kpl2 =< 2.3.0-1mdk
|
||||
Obsoletes: krootwarning =< 8.2-13mdk
|
||||
Obsoletes: krozat =< 8.2-13mdk
|
||||
Obsoletes: ksetiwatch =< 2.2.5-1mdk
|
||||
Obsoletes: ktelnet =< 0.7b1-13mdk
|
||||
Obsoletes: kvirc =< 2.1.1-5mdk
|
||||
Obsoletes: libqt2-devel =< 2.3.1-29mdk
|
||||
Obsoletes: licq-kde =< 1.0.4-2mdk
|
||||
Obsoletes: qt2-designer =< 2.3.1-29mdk
|
||||
Obsoletes: qtrans =< 0.1.1-7mdk
|
||||
Obsoletes: quanta =< 2.0.1-2mdk
|
||||
Obsoletes: kdelibs-sound
|
||||
Obsoletes: %{libname}-static-devel
|
||||
Obsoletes: arts3 < %{epoch_arts}:1.5.3
|
||||
Provides: arts3 = %{epoch_arts}:%version-%release
|
||||
BuildConflicts: unsermake
|
||||
Conflicts: arts < 30000001:1.5.10-4
|
||||
Provides: arts = %epoch_arts:%version-%release
|
||||
|
||||
%description
|
||||
aRts is a short form for "analog realtime synthesizer". The idea of the whole
|
||||
thing is to create/process sound using small modules which do certain tasks.
|
||||
These may be create a waveform (oscillators), play samples, filter data, add
|
||||
signals, perform effects like delay/flanger/chorus, or output the data to the
|
||||
soundcard.
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/artscat
|
||||
%_kde3_bindir/artsd
|
||||
%_kde3_bindir/artsplay
|
||||
%_kde3_bindir/artsshell
|
||||
%_kde3_bindir/artsdsp
|
||||
%_kde3_bindir/artsrec
|
||||
%_kde3_bindir/artswrapper
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
%package -n %{libname}
|
||||
Group: System/Libraries
|
||||
Summary: The libraries for arts
|
||||
Obsoletes: libarts2, libarts3
|
||||
Requires: libtqtinterface >= 3.5.12-1
|
||||
|
||||
%description -n %{libname}
|
||||
Libraries needed for arts.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %{libname}
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/*.la
|
||||
%_kde3_libdir/*.so.*
|
||||
%dir %_kde3_libdir/mcop/
|
||||
%_kde3_libdir/mcop/*
|
||||
%_sysconfdir/ld.so.conf.d/*
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
%package devel
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Development files for arts
|
||||
Requires: %{libname} = %{epoch_arts}:%version-%release
|
||||
Obsoletes: %{_lib}arts1-devel
|
||||
Obsoletes: libarts2-devel
|
||||
Obsoletes: libarts3-devel
|
||||
Provides: arts-devel
|
||||
Provides: libarts-devel
|
||||
Conflicts: arts <= %epoch_arts:1.5.3-5mdv2007
|
||||
|
||||
%description devel
|
||||
Development libraries for arts.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/artsc-config
|
||||
%multiarch %_kde3_bindir/*/artsc-config
|
||||
%_kde3_bindir/mcopidl
|
||||
%_kde3_libdir/*.so
|
||||
%_kde3_includedir/*
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %oname-%version
|
||||
%patch0 -p0 -b .resmgr
|
||||
%patch2 -p1 -b .msgkill
|
||||
%patch4 -p1 -b .gcc4.3
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
# Patch from resmgr needs rebuild builsystem
|
||||
make -f admin/Makefile.common
|
||||
QTDIR=%qt3dir
|
||||
export QTDIR
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
|
||||
%configure_kde3 \
|
||||
--without-nas \
|
||||
|
||||
%make
|
||||
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
%makeinstall_std
|
||||
%multiarch_binaries $RPM_BUILD_ROOT%{_kde3_bindir}/artsc-config
|
||||
%multiarch_includes $RPM_BUILD_ROOT%{_kde3_includedir}/arts/gsl/gslconfig.h
|
||||
|
||||
install -d %buildroot/%_sysconfdir/ld.so.conf.d
|
||||
cat > %buildroot/%_sysconfdir/ld.so.conf.d/%{libname}.conf <<EOF
|
||||
%_kde3_libdir
|
||||
EOF
|
||||
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 03 2011 Tim Williams <tim@my-place.org.uk> 30000001:1.5.12-11mdf2010.2
|
||||
+ Add Trinity KDE 3.5.12 sources
|
||||
+ Add libtqtinterface dependencies
|
||||
- Remove arts-1.5.0-check_tmp_dir.patch and fix_autotools.patch, no longer necessary
|
||||
|
||||
* Tue May 04 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.1
|
||||
+ Rebuild
|
||||
|
||||
* Sat Jan 16 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.0
|
||||
+ Use automake 1.11 and above
|
||||
+ Patch for built with autoconf 2.65
|
||||
+ Fix package group
|
||||
|
||||
* Tue Nov 14 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-10mdv2010.0
|
||||
- Remove some of the obsoletes which are causing problems
|
||||
|
||||
* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-9mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Sat Mar 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-8mdv2009.1
|
||||
+ Revision: 361978
|
||||
- fix apparent typo in provides/conflicts change of r356949
|
||||
|
||||
* Fri Mar 27 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-7mdv2009.1
|
||||
+ Revision: 361677
|
||||
- fix new obsolete for biarch
|
||||
|
||||
* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-6mdv2009.1
|
||||
+ Revision: 361121
|
||||
- The return of undead. Changing name from libarts1-devel to a real arts3-devel
|
||||
|
||||
* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-5mdv2009.1
|
||||
+ Revision: 356949
|
||||
- Add provides
|
||||
|
||||
* Sun Mar 15 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-4mdv2009.1
|
||||
+ Revision: 355208
|
||||
- Remove old spec file
|
||||
- Update to new name
|
||||
- Change arts to arts3 ( kde3 reintroduction step 1 )
|
||||
|
||||
* Sat Feb 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-3mdv2009.1
|
||||
+ Revision: 345972
|
||||
- rebuild due to removed i586 binaries
|
||||
|
||||
* Sat Nov 08 2008 Adam Williamson <awilliamson@mandriva.org> 30000001:1.5.10-2mdv2009.1
|
||||
+ Revision: 300956
|
||||
- rebuild for xcb changes
|
||||
|
||||
* Tue Aug 26 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-1mdv2009.0
|
||||
+ Revision: 276164
|
||||
- Update for probably the last upstream arts from kde3
|
||||
|
||||
* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 30000001:1.5.9-8mdv2009.0
|
||||
+ Revision: 264319
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Mon Jun 02 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-7mdv2009.0
|
||||
+ Revision: 214278
|
||||
- Fix compilations against gcc 4.3.x. Close bug https://qa.mandriva.com/show_bug.cgi?id=41171
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- rebuild for new qt3
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Rebuild because of qt3 move
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-3mdv2009.0
|
||||
+ Revision: 200792
|
||||
- Begin changes for kde. Time to go to /opt
|
||||
- Added arts.conf on ld.so.conf.d
|
||||
|
||||
* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.9-2mdv2008.1
|
||||
+ Revision: 189485
|
||||
- Fix groups ( tks to pterjan)
|
||||
|
||||
* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-1mdv2008.1
|
||||
+ Revision: 167752
|
||||
- Last arts ever arrived. 1.5.9. This will be the last update for old codebase and closing the cycle of stable releases of KDE3
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix description-line-too-long
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Tue Oct 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.8-1mdv2008.1
|
||||
+ Revision: 101650
|
||||
- Arts 1.5.8 from kde 3.5.8
|
||||
- Add Patch5, it fixes problems between aRts and Knotify
|
||||
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- add buildconflict on unsermake as it gets used by default if installed and breaks building
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- remove hardcoded packager tag
|
||||
|
||||
* Mon May 21 2007 Olivier Blin <oblin@mandriva.com> 30000001:1.5.7-2mdv2008.0
|
||||
+ Revision: 29295
|
||||
- build with esound support
|
||||
|
||||
* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.7-1mdv2008.0
|
||||
+ Revision: 27452
|
||||
- 1.5.7 release
|
||||
|
||||
@ -0,0 +1,116 @@
|
||||
Name: kde3-macros
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Base install macros for kde 3
|
||||
Source: kde3.macros
|
||||
URL: http://www.mandriva.com
|
||||
License: GPL
|
||||
BuildArch: noarch
|
||||
Requires: rpm-manbo-setup-build >= 2-7
|
||||
BuildRoot: %{_tmppath}/%{name}-buildroot
|
||||
|
||||
%description
|
||||
Base install macros for kde 3
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_sysconfdir/rpm/macros.d/kde3.macros
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
install -d -m 755 %buildroot%_sysconfdir/rpm/macros.d
|
||||
install -m 644 %SOURCE0 %buildroot%_sysconfdir/rpm/macros.d/
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 16 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.1
|
||||
+ Rebuild for Trinity 3.5.12
|
||||
+ Add extra-libs and extra-includes so build can find tqtinterface
|
||||
+ Add --enable-closure
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-5mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-4mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Mon Oct 27 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-3mdv2009.1
|
||||
+ Revision: 297523
|
||||
- specify qt3 dir
|
||||
|
||||
* Wed Sep 24 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-2mdv2009.0
|
||||
+ Revision: 287688
|
||||
- add libdir to pkgconfig dir
|
||||
|
||||
* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.10-1mdv2009.0
|
||||
+ Revision: 285306
|
||||
- Update version and fix bug 43876 - /etc/profile.d/91kde3.sh should contain redefination of PKG_CONFIG_PATH
|
||||
|
||||
* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 3.5.9-15mdv2009.0
|
||||
+ Revision: 264759
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
* Fri Jun 06 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-14mdv2009.0
|
||||
+ Revision: 216405
|
||||
- Requires rpm-manbo-setup-build for %%before_configure
|
||||
|
||||
* Thu Jun 05 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-13mdv2009.0
|
||||
+ Revision: 215104
|
||||
- change configure_kde3 to use %%before_configure
|
||||
|
||||
* Fri May 30 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-12mdv2009.0
|
||||
+ Revision: 213551
|
||||
- Proper new qtdir libraries
|
||||
|
||||
* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-11mdv2009.0
|
||||
+ Revision: 212725
|
||||
- Revert of the previous commit
|
||||
|
||||
* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-10mdv2009.0
|
||||
+ Revision: 212717
|
||||
- Fix macros
|
||||
|
||||
* Fri May 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-9mdv2009.0
|
||||
+ Revision: 205308
|
||||
- Fix typo
|
||||
|
||||
* Thu May 08 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-8mdv2009.0
|
||||
+ Revision: 204698
|
||||
- Add clean_kde3_icon_cache and update_kde3_icon_cache macros
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-7mdv2009.0
|
||||
+ Revision: 200791
|
||||
- Yes, we need a copy. Sometimes we loose a lot of time that we don't have
|
||||
because some nitpicking pointing.
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-6mdv2009.0
|
||||
+ Revision: 200553
|
||||
- Using again configure2_5x. Some impatient people can't wait some work in progress...
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-4mdv2009.0
|
||||
+ Revision: 200535
|
||||
- Added xinerama and alsa
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-3mdv2009.0
|
||||
+ Revision: 200534
|
||||
- Added mitshm and enable-libfam
|
||||
|
||||
* Fri May 02 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-2mdv2009.0
|
||||
+ Revision: 200518
|
||||
- Created configure_kde macro to make kde3 build easier too like kde4 and make transition to /opt less painfull. Thanks to Blino for the help.
|
||||
There's no need anymore add all define switches, even for libsuffix detection, so if you want:
|
||||
- Disable enable-final: use --define _disable_final=1
|
||||
- Compile with debug full: use --define _unstable=1
|
||||
- Compile in non 32bits arch: No need add the usual lib test
|
||||
|
||||
* Sun Apr 13 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-1mdv2009.0
|
||||
+ Revision: 192655
|
||||
- import kde3-macros
|
||||
|
||||
|
||||
@ -0,0 +1,57 @@
|
||||
%use_enable_final %{!?_disable_final:--enable-final}
|
||||
%use_unstable %{?_unstable:--enable-debug=full}
|
||||
|
||||
%_kde3_prefix /opt/kde3
|
||||
%_kde3_libdir %_kde3_prefix/%_lib
|
||||
%_kde3_iconsdir %_kde3_prefix/share/icons
|
||||
%_kde3_sysconfdir %_sysconfdir
|
||||
%_kde3_datadir %_kde3_prefix/share
|
||||
%_kde3_configdir %_kde3_datadir/config
|
||||
%_kde3_appsdir %_kde3_datadir/apps
|
||||
%_kde3_docdir %_kde3_prefix/share/doc
|
||||
%_kde3_bindir %_kde3_prefix/bin
|
||||
%_kde3_sbindir %_kde3_prefix/sbin
|
||||
%_kde3_includedir %_kde3_prefix/include
|
||||
%_kde3_mandir %_kde3_prefix/share/man
|
||||
%_kde3_autostart %_kde3_prefix/share/autostart
|
||||
|
||||
%configure_kde3 \\\
|
||||
%before_configure ; \
|
||||
%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
|
||||
[ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
|
||||
CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
|
||||
PKG_CONFIG_PATH="%{_kde3_libdir}/pkgconfig:%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}" \
|
||||
$CONFIGURE_TOP/configure --build=%{_target_platform} \\\
|
||||
--prefix=%{_kde3_prefix} \\\
|
||||
--bindir=%{_kde3_bindir} \\\
|
||||
--sbindir=%{_kde3_sbindir} \\\
|
||||
--sysconfdir=%{_sysconfdir} \\\
|
||||
--datadir=%{_kde3_datadir} \\\
|
||||
--includedir=%{_kde3_includedir} \\\
|
||||
--libdir=%{_kde3_libdir} %use_unstable %use_enable_final \\\
|
||||
--infodir=%{_infodir} \\\
|
||||
--mandir=%{_mandir} \\\
|
||||
--disable-static \\\
|
||||
--enable-mitshm \\\
|
||||
--with-ipv6-lookup=auto \\\
|
||||
--with-pic \\\
|
||||
--with-xinerama \\\
|
||||
--with-alsa \\\
|
||||
--enable-libfam \\\
|
||||
--enable-pcre \\\
|
||||
--with-qt-dir=%{qt3dir} --with-qt-includes=%{qt3include} --with-qt-libraries=%{qt3lib}\\\
|
||||
--with-extra-libs=%{_kde3_libdir} --with-extra-includes=%{_kde3_includedir}/tqt \\\
|
||||
%if "%{_lib}" != "lib" \
|
||||
--enable-libsuffix="%(A=%{_lib}; echo ${A/lib/})" \\\
|
||||
%endif \
|
||||
--disable-rpath \\\
|
||||
--enable-closure \\\
|
||||
$CONFIGURE_XPATH
|
||||
# Rebuild icon cache
|
||||
%update_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} ]; then \
|
||||
%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true; fi \
|
||||
%{nil}
|
||||
|
||||
%clean_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} -a -r %{_kde3_iconsdir}/%{1}/index.theme ]; then \
|
||||
%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true ; fi \
|
||||
%{nil}
|
||||
@ -0,0 +1,135 @@
|
||||
# TODO
|
||||
# - for some unknown reason to me it creates dead symlinks instead of libtqt shared library
|
||||
# libtool: install: /usr/bin/install -c -p .libs/libtqt.so.4.2.0 /tmp/xxx/usr/lib64/libtqt.so.4.2.0
|
||||
# /usr/bin/install: cannot stat `.libs/libtqt.so.4.2.0': No such file or directory
|
||||
# workarounded in spec r1.2 commit
|
||||
#
|
||||
# Conditional build:
|
||||
%bcond_with qt4 # Enable Qt4 support (this will disable all Qt3 support)
|
||||
|
||||
%define epoch_kdelibs 30000000
|
||||
|
||||
Summary: Interface and abstraction library for Qt and Trinity
|
||||
Name: libtqtinterface
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
#Epoch: %epoch_kdelibs
|
||||
License: GPL v2
|
||||
Group: Graphical desktop/KDE3
|
||||
Source0: http://mirror.its.uidaho.edu/pub/trinity/releases/%{version}/dependencies/tqtinterface-%{version}.tar.gz
|
||||
# Source0-md5: 361c45961184f01f95d3b771138c8229
|
||||
Patch0: tqt-comments.patch
|
||||
Patch1: tqglobal-comments.patch
|
||||
Patch2: tqt-r1217318.diff
|
||||
URL: http://trinity.pearsoncomputing.net/
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libltdl-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: sed >= 4.0
|
||||
#BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
|
||||
|
||||
%description
|
||||
This package includes libraries that abstract the underlying Qt system
|
||||
from the actual Trinity code, allowing easy, complete upgrades to new
|
||||
versions of Qt.
|
||||
|
||||
It also contains various functions that have been removed from newer
|
||||
versions of Qt, but are completely portable and isolated from other
|
||||
APIs such as Xorg. This allows the Trinity project to efficiently
|
||||
perform certain operations that are infeasible or unneccessarily
|
||||
difficult when using pure Qt4 or above.
|
||||
|
||||
%package devel
|
||||
Summary: Header files for libtqtinterface library
|
||||
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libtqtinterface
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Header files for libtqtinterface library.
|
||||
|
||||
%description devel -l pl.UTF-8
|
||||
Pliki nagłówkowe biblioteki libtqtinterface.
|
||||
|
||||
%prep
|
||||
%setup -qc
|
||||
mv dependencies/tqtinterface/* .
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p2
|
||||
|
||||
# libtool copy
|
||||
rm -r libltdl
|
||||
%{__sed} -i -e '/ltdl.m4/d' Makefile.am.in
|
||||
|
||||
# remove copy of QtCore and QtGui devel headers
|
||||
rm -r qtinterface/qt4 qtinterface/tqt4
|
||||
%{__sed} -i -e /tqt4/d qtinterface/Makefile.am
|
||||
|
||||
%build
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
QTDIR=%qt3dir ; export QTDIR;
|
||||
PATH=%{qt3dir}/bin:$PATH; export PATH;
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
%configure_kde3 \
|
||||
--includedir=%{_kde3_includedir}/tqt \
|
||||
%if "%{_lib}" == "lib64"
|
||||
--enable-libsuffix=64 \
|
||||
%endif
|
||||
%{?with_qt4:--enable-qt4}
|
||||
|
||||
%{__make} \
|
||||
LIBTOOL="%{_bindir}/libtool -v"
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# force -j1 or USE_QTX is replaced _after_ file is installed
|
||||
%{__make} -j1 install \
|
||||
DESTDIR=$RPM_BUILD_ROOT \
|
||||
|
||||
# --disable-static did not work, rm it again
|
||||
#rm $RPM_BUILD_ROOT%{_libdir}/libtqt.a
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(644,root,root,755)
|
||||
%attr(755,root,root) %{_kde3_libdir}/libtqt.so.*.*.*
|
||||
%attr(755,root,root) %{_kde3_libdir}/libtqt.a
|
||||
%ghost %attr(755,root,root) %{_kde3_libdir}/libtqt.so.4
|
||||
|
||||
%files devel
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS COPYING README
|
||||
%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt1
|
||||
%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt2
|
||||
%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt3
|
||||
%attr(755,root,root) %{_kde3_bindir}/dcopidl-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/dcopidl2cpp-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/dcopidlng-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/mcopidl-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/moc-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/tqt-replace
|
||||
%attr(755,root,root) %{_kde3_bindir}/tqt-replace-stream
|
||||
%dir %{_kde3_includedir}/tqt
|
||||
%{_kde3_includedir}/tqt/tq*.h
|
||||
%{_kde3_libdir}/libtqt.la
|
||||
%{_kde3_libdir}/libtqt.so
|
||||
|
||||
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
|
||||
%changelog
|
||||
* Wed Feb 1 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvf2010.2
|
||||
+ Rewrite for MDV 2010.2
|
||||
+ Spec based on revision 1.4 from PLD linux
|
||||
+ Add tqt-comments.patch, tqglobal-comments.patch. My compiler doesn't like // comments.
|
||||
@ -0,0 +1,26 @@
|
||||
--- qtinterface/tqglobal.h.orig 2011-02-04 12:35:10.215472605 +0000
|
||||
+++ qtinterface/tqglobal.h 2011-02-04 12:35:45.537474675 +0000
|
||||
@@ -26,18 +26,18 @@
|
||||
|
||||
#ifdef USE_QT3
|
||||
|
||||
-// Pull in all Qt3 global defines
|
||||
+/* Pull in all Qt3 global defines */
|
||||
|
||||
#include <qglobal.h>
|
||||
|
||||
-#endif // USE_QT3
|
||||
+#endif /* USE_QT3 */
|
||||
|
||||
#ifdef USE_QT4
|
||||
|
||||
-// Pull in all Qt4 global defines
|
||||
+/* Pull in all Qt4 global defines */
|
||||
|
||||
#include <Qt/qglobal.h>
|
||||
|
||||
-#endif // USE_QT4
|
||||
+#endif /* USE_QT4 */
|
||||
|
||||
#endif /* TQGLOBAL_H */
|
||||
\ No newline at end of file
|
||||
@ -0,0 +1,23 @@
|
||||
--- qtinterface/tqt.h.orig 2010-08-31 00:37:01.000000000 +0100
|
||||
+++ qtinterface/tqt.h 2011-02-03 13:48:47.483987570 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
#define TQT_METHOD(a) METHOD(a)
|
||||
#define TQT_SLOT(a) SLOT(a)
|
||||
#define TQT_SIGNAL(a) SIGNAL(a)
|
||||
-#endif // __cplusplus
|
||||
+#endif
|
||||
|
||||
#ifdef USE_QT3
|
||||
#define qint64 long
|
||||
@@ -1319,11 +1319,4 @@
|
||||
#define TQXmlDefaultHandler QXmlDefaultHandler
|
||||
#endif
|
||||
|
||||
-// Undo any damage caused by the tqt-replace utility
|
||||
-//#define QCStringList TQCStringList
|
||||
-//#define QtWIN TQtWIN
|
||||
-
|
||||
-//#include "kdemacros.h.in"
|
||||
-//#define TQT_EXPORT KDE_EXPORT
|
||||
-
|
||||
#endif /* TQT_H */
|
||||
@ -0,0 +1,12 @@
|
||||
Index: dependencies/tqtinterface/qtinterface/tqt.h
|
||||
===================================================================
|
||||
--- dependencies/tqtinterface/qtinterface/tqt.h (revision 1217317)
|
||||
+++ dependencies/tqtinterface/qtinterface/tqt.h (revision 1217318)
|
||||
@@ -85,6 +85,7 @@
|
||||
#define TQ_ControlButton ControlButton
|
||||
#define TQ_AltButton AltButton
|
||||
#define TQ_MetaButton MetaButton
|
||||
+#define TQ_WFlags TQt::WFlags
|
||||
#define TQIODevice_OpenModeFlag int
|
||||
|
||||
#define TQAlignCenter AlignCenter
|
||||
@ -0,0 +1,35 @@
|
||||
diff -Naur mandriva-kde-config-2009.0/kdm/backgroundrc mandriva-kde-config.yeni/kdm/backgroundrc
|
||||
--- mandriva-kde-config-2009.0/kdm/backgroundrc 2006-08-23 20:58:15.000000000 +0300
|
||||
+++ mandriva-kde-config.yeni/kdm/backgroundrc 2009-11-24 21:35:26.592448000 +0200
|
||||
@@ -13,6 +13,6 @@
|
||||
Program=
|
||||
ReverseBlending=false
|
||||
UseSHM=false
|
||||
-Wallpaper=/usr/share/mdk/backgrounds/default.png
|
||||
+Wallpaper=/usr/share/mdk/backgrounds/default.jpg
|
||||
WallpaperList=
|
||||
WallpaperMode=Scaled
|
||||
diff -Naur mandriva-kde-config-2009.0/kdm/kdmrc mandriva-kde-config.yeni/kdm/kdmrc
|
||||
--- mandriva-kde-config-2009.0/kdm/kdmrc 2008-06-23 21:03:31.000000000 +0300
|
||||
+++ mandriva-kde-config.yeni/kdm/kdmrc 2009-12-15 00:27:11.727822403 +0200
|
||||
@@ -451,7 +451,7 @@
|
||||
# The theme to use for the greeter. Can point to either a directory or an XML
|
||||
# file.
|
||||
# Default is ""
|
||||
-Theme=/usr/share/mdk/dm
|
||||
+Theme=/opt/kde3/share/config/kdm/themes/2010
|
||||
|
||||
# Core config for local displays
|
||||
[X-:*-Core]
|
||||
diff -Naur mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml mandriva-kde-config.yeni/kdm/themes/2008/2008.xml
|
||||
--- mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml 2007-09-12 01:17:40.000000000 +0300
|
||||
+++ mandriva-kde-config.yeni/kdm/themes/2008/2008.xml 2009-11-25 02:13:17.273313000 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
<!DOCTYPE greeter SYSTEM "greeter.dtd">
|
||||
<greeter>
|
||||
<item type="pixmap">
|
||||
- <normal file="/usr/share/mdk/backgrounds/default.png"/>
|
||||
+ <normal file="/usr/share/mdk/backgrounds/default.jpg"/>
|
||||
<pos x="0" y="0" width="100%" height="100%"/>
|
||||
</item>
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,907 @@
|
||||
%define epoch_kdelibs 30000000
|
||||
%define oname mandriva-kde-config
|
||||
|
||||
Name: mandriva-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Version: 2010.2
|
||||
Release: %mkrel 1
|
||||
URL: http://www.mandriva.com
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %_tmppath/%name-buildroot
|
||||
BuildRequires: kde3-macros
|
||||
Source0: %{oname}-%{version}.tar.bz2
|
||||
# OpenOffice.org icons. Should be in a separate package
|
||||
# in the future, since they're shared between kde, OOo
|
||||
# and maybe others
|
||||
Source1: ooo-icons.tar.bz2
|
||||
Source2: opendocument-mime.tar.bz2
|
||||
Patch0: fix_kdmtheme.patch
|
||||
License: GPL
|
||||
BuildArch: noarch
|
||||
Obsoletes: %{name} < %version-%release
|
||||
Obsoletes: mandriva-kde-config
|
||||
Provides: mandriva-kde-config = %version-%release
|
||||
|
||||
|
||||
%description
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
(kicker config etc.)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package common
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Common configs used for Mandriva theme
|
||||
Requires(pre): update-alternatives
|
||||
Requires: urw-fonts
|
||||
Obsoletes: %{name}-common < %version-%release
|
||||
Obsoletes: mandriva-kde-config-common
|
||||
Provides: mandriva-kde-config-common = %version-%release
|
||||
|
||||
%description common
|
||||
common configs used for Mandriva theme
|
||||
|
||||
%post common
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config 9
|
||||
|
||||
%postun common
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/common/upstream-kde-config ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/common/upstream-kde-config
|
||||
fi
|
||||
|
||||
%files common
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/common
|
||||
%_localstatedir/lib/mandriva/kde-profiles/common/*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n powerpack-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Obsoletes: powerpackplus-kde-config < 2008.0
|
||||
Provides: powerpack-kde-config = %version-%release
|
||||
Provides: powerpackplus-kde-config = %version-%release
|
||||
Obsoletes: powerpack-kde-config
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: powerpack-kde3-config < %version-%release
|
||||
|
||||
%pre -n powerpack-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n powerpack-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/powerpack/kderc 10
|
||||
|
||||
%postun -n powerpack-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/powerpack/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/powerpack/kderc
|
||||
fi
|
||||
|
||||
%description -n powerpack-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%files -n powerpack-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/powerpack
|
||||
%_localstatedir/lib/mandriva/kde-profiles/powerpack/*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n one-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde3-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Provides: one-kde-config = %version-%release
|
||||
Obsoletes: one-kde-config
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: one-kde3-config < %version-%release
|
||||
|
||||
%description -n one-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%pre -n one-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n one-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/one/kderc 10
|
||||
|
||||
%postun -n one-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/one/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/one/kderc
|
||||
fi
|
||||
|
||||
%files -n one-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/one
|
||||
%_localstatedir/lib/mandriva/kde-profiles/one/*
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n flash-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde3-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Provides: flash-kde-config = %version-%release
|
||||
Obsoletes: flash-kde-config
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: flash-kde3-config < %version-%release
|
||||
|
||||
%description -n flash-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%pre -n flash-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n flash-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/flash/kderc 10
|
||||
|
||||
%postun -n flash-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/flash/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/flash/kderc
|
||||
fi
|
||||
|
||||
%files -n flash-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/flash
|
||||
%_localstatedir/lib/mandriva/kde-profiles/flash/*
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n free-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: qt4-style-iaora
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde3-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: download-kde-config-2007 < 2008.0
|
||||
Provides: download-kde-config-2007
|
||||
Obsoletes: discovery-kde-config < 2008.0
|
||||
Provides: discovery-kde-config = %version-%release
|
||||
Provides: free-kde-config = %version-%release
|
||||
Obsoletes: free-kde-config
|
||||
Obsoletes: free-kde3-config < %version-%release
|
||||
|
||||
%description -n free-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%pre -n free-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n free-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/free/kderc 10
|
||||
|
||||
%postun -n free-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/free/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/free/kderc
|
||||
fi
|
||||
|
||||
%files -n free-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/free
|
||||
%_localstatedir/lib/mandriva/kde-profiles/free/*
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# KDM
|
||||
|
||||
%package -n mandriva-kdm3-config
|
||||
Summary: Mandriva KDM config file
|
||||
Group: Graphical desktop/KDE3
|
||||
Obsoletes: kdebase-kdm-config-file < 2008.0
|
||||
Provides: kdm-config-file = %version-%release
|
||||
# For upgrade
|
||||
Provides: kdebase-kdm-config-file = 2:%version
|
||||
Conflicts: kdebase-progs <= 3.5.1-15.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Requires(post): perl-MDK-Common
|
||||
Obsoletes: mandriva-kdm-config
|
||||
Provides: mandriva-kdm-config = %version-%release
|
||||
|
||||
|
||||
%description -n mandriva-kdm3-config
|
||||
Mandriva KDM config file
|
||||
|
||||
%trigger -n mandriva-kdm3-config -- kdebase-kdm-config-file
|
||||
perl -MMDK::Common -e 'update_gnomekderc("%{_kde3_configdir}/kdm/kdmrc", "General", "ConsoleTTYs", "tty1,tty2,tty3,tty4,tty5,tty6", "ServerVTs", "-7")'
|
||||
|
||||
%files -n mandriva-kdm3-config
|
||||
%defattr(0644,root,root,0755)
|
||||
%config(noreplace) %_kde3_configdir/kdm/backgroundrc
|
||||
%config(noreplace) %_kde3_configdir/kdm/kdmrc
|
||||
%_kde3_configdir/kdm/themes
|
||||
|
||||
#---------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version} -a 1 -a 2
|
||||
%patch0 -p1
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
# Create profile dirs
|
||||
mkdir -p %buildroot/%{_kde3_configdir}
|
||||
mkdir -p %buildroot/%_localstatedir/lib/mandriva
|
||||
|
||||
mv kde-profiles %buildroot/%_localstatedir/lib/mandriva
|
||||
mv kdm %buildroot/%{_kde3_configdir}
|
||||
|
||||
# openoffice icons, see #26311
|
||||
mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
|
||||
cp -a ooo-icons/hicolor %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
|
||||
|
||||
# openoffice mimetypes, see #26311
|
||||
mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
|
||||
cp -a opendocument-mime/* %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
|
||||
# XXX we have to rename them to the same name provided by kdelibs-common, otherwise the
|
||||
# global ones are used.
|
||||
pushd %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
|
||||
mv openoffice.org2.4-oasis-drawing.desktop vnd.oasis.opendocument.graphics.desktop
|
||||
mv openoffice.org2.4-oasis-drawing-template.desktop vnd.oasis.opendocument.graphics-template.desktop
|
||||
mv openoffice.org2.4-oasis-master-document.desktop vnd.oasis.opendocument.text-master.desktop
|
||||
mv openoffice.org2.4-oasis-formula.desktop vnd.oasis.opendocument.formula.desktop
|
||||
mv openoffice.org2.4-oasis-spreadsheet.desktop vnd.oasis.opendocument.spreadsheet.desktop
|
||||
mv openoffice.org2.4-oasis-spreadsheet-template.desktop vnd.oasis.opendocument.spreadsheet-template.desktop
|
||||
mv openoffice.org2.4-oasis-text.desktop vnd.oasis.opendocument.text.desktop
|
||||
mv openoffice.org2.4-oasis-text-template.desktop vnd.oasis.opendocument.text-template.desktop
|
||||
mv openoffice.org2.4-oasis-web-template.desktop vnd.oasis.opendocument.text-web.desktop
|
||||
mv openoffice.org2.4-oasis-presentation.desktop vnd.oasis.opendocument.presentation.desktop
|
||||
mv openoffice.org2.4-oasis-presentation-template.desktop vnd.oasis.opendocument.presentation-template.desktop
|
||||
mv openoffice.org2.4-spreadsheet.desktop vnd.sun.xml.calc.desktop
|
||||
mv openoffice.org2.4-spreadsheet-template.desktop vnd.sun.xml.calc.template.desktop
|
||||
mv openoffice.org2.4-presentation.desktop vnd.sun.xml.impress.desktop
|
||||
mv openoffice.org2.4-presentation-template.desktop vnd.sun.xml.impress.template.desktop
|
||||
mv openoffice.org2.4-drawing.desktop vnd.sun.xml.draw.desktop
|
||||
mv openoffice.org2.4-drawing-template.desktop vnd.sun.xml.draw.template.desktop
|
||||
mv openoffice.org2.4-text.desktop vnd.sun.xml.writer.desktop
|
||||
mv openoffice.org2.4-text-template.desktop vnd.sun.xml.writer.template.desktop
|
||||
mv openoffice.org2.4-master-document.desktop vnd.sun.xml.writer.master.desktop
|
||||
mv openoffice.org2.4-formula.desktop vnd.sun.xml.math.desktop
|
||||
popd
|
||||
|
||||
|
||||
for name in flash free one powerpack; do
|
||||
echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
|
||||
echo "prefixes=/var/lib/mandriva/kde-profiles/common,%_localstatedir/lib/mandriva/kde-profiles/$name" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
|
||||
# create the symlink to the desktop data
|
||||
mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop
|
||||
ln -s %_datadir/mdk/desktop/$name %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop/DesktopLinks
|
||||
done
|
||||
|
||||
# Upstream
|
||||
echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
|
||||
echo "prefixes=%{_kde3_prefix}" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
|
||||
|
||||
# Bookmarks
|
||||
mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/{free,flash,one,powerpack}/share/apps/konqueror/
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-download.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/free/share/apps/konqueror/bookmarks.xml
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/one/share/apps/konqueror/bookmarks.xml
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/konqueror/bookmarks.xml
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-powerpack.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/konqueror/bookmarks.xml
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 4 2011 Tim Williams <tim@my-place.org.uk> 2010.2-1mvt2010.2
|
||||
+ Rebuild for 2010.2
|
||||
|
||||
* Fri Jul 16 2010 Tim Williams <tim@my-place.org.uk> 2010.1-1mvt2010.1
|
||||
+ Rebuild for 2010.1
|
||||
|
||||
* Sun Feb 07 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-3mvt2010.0
|
||||
+ Prevent to install old 2009.0 packages
|
||||
+ Change mandriva-kdm-config package name to mandriva-kdm3-config to avoid possible future
|
||||
conflicts. (Mandriva developer may decide to change mandriva-kdm4-config to this one)
|
||||
|
||||
* Tue Jan 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-2mvt2010.0
|
||||
+ Fix ksplash and wallpaper issues
|
||||
|
||||
* Fri Jan 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-1mvt2010.0
|
||||
+ Rebuild source for 2010.0
|
||||
- Mandriva 2010.0 KDM theme added
|
||||
- Mandriva 2010.0 KSplash theme added
|
||||
|
||||
* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2009.0-11mvt2010.0
|
||||
+ Fixed pacakge name to avoid old official Mandriva package upgrade
|
||||
|
||||
* Wed Nov 18 2009 Tim Williams <tim@my-place.org.uk> 2009.0-10mdv2010.0
|
||||
+ Add konq-home.patch. Changes default start page to avoid crash when viewing the default /usr/share/doc/HTML/index.html
|
||||
|
||||
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 2009.0-9mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Fri Sep 19 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-8mdv2009.0
|
||||
+ Revision: 285971
|
||||
- Mandriva simple splash for kde3
|
||||
|
||||
* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-7mdv2009.0
|
||||
+ Revision: 285202
|
||||
- Update Mandriva Simple kde3 splash
|
||||
|
||||
* Mon Sep 01 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-6mdv2009.0
|
||||
+ Revision: 278597
|
||||
- Fix profilerc due new .desktop files
|
||||
|
||||
* Thu Aug 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-5mdv2009.0
|
||||
+ Revision: 265832
|
||||
- Start to disable basic services of kde3. kde4 runs kded daemon from kde3 to enable easy way to run kde3 applications. We don't want duplicate media notifiers, writed and other similar daemons.
|
||||
|
||||
* Mon Jul 28 2008 Anne Nicolas <anne.nicolas@mandriva.com> 2009.0-4mdv2009.0
|
||||
+ Revision: 251563
|
||||
- add qt4-style-iaora require
|
||||
|
||||
* Mon Jun 23 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2009.0-3mdv2009.0
|
||||
+ Revision: 228397
|
||||
- Changing X11* references in kdmrc to /usr/share/X11...
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
|
||||
|
||||
* Wed May 14 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2009.0-2mdv2009.0
|
||||
+ Revision: 207234
|
||||
- Update Flash design
|
||||
|
||||
* Tue May 06 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-1mdv2009.0
|
||||
+ Revision: 201967
|
||||
- Fixed kdm position of new config file. Bye bye /etc/kde
|
||||
|
||||
* Wed Apr 02 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-27mdv2008.1
|
||||
+ Revision: 191678
|
||||
- Kmenu font size
|
||||
|
||||
* Tue Apr 01 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-26mdv2008.1
|
||||
+ Revision: 191389
|
||||
- I've commited this file with a wrong dir path. Fixed now...
|
||||
- Adding support to Mentor Office Keyboard again, with VolumeKeys disabled, because
|
||||
it's a kmilo function
|
||||
|
||||
* Fri Mar 28 2008 Ademar de Souza Reis Jr <ademar@mandriva.com.br> 2008.1-25mdv2008.1
|
||||
+ Revision: 190961
|
||||
- add openoffice icons and openoffice mimetypes so that
|
||||
opendocuments use the latest iconset from openoffice.org.
|
||||
Closes: #26311
|
||||
|
||||
* Thu Mar 27 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-24mdv2008.1
|
||||
+ Revision: 190675
|
||||
- Fixing Multimedia keyboard pb, by removing Mentor Office Wireless Keyboard shortcuts
|
||||
|
||||
* Fri Mar 14 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-23mdv2008.1
|
||||
+ Revision: 187866
|
||||
- Fix https://qa.mandriva.com/show_bug.cgi?id=37109
|
||||
- Line up icons by default on desktop
|
||||
|
||||
* Wed Mar 12 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-22mdv2008.1
|
||||
+ Revision: 187106
|
||||
- Fixing minipager issue, by adding a default config file acording to
|
||||
https://qa.mandriva.com/show_bug.cgi?id=37796
|
||||
|
||||
* Mon Mar 10 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-21mdv2008.1
|
||||
+ Revision: 183669
|
||||
- Fixing lockout-buttons in kicker to save their configurations affter logout.
|
||||
|
||||
* Fri Mar 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-20mdv2008.1
|
||||
+ Revision: 181604
|
||||
- Bookmarking made easy...
|
||||
|
||||
* Thu Mar 06 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-19mdv2008.1
|
||||
+ Revision: 181059
|
||||
- Use the right color scheme for KDM greeter
|
||||
- Add the config for the default wallpaper for 2008.1
|
||||
|
||||
* Wed Mar 05 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-18mdv2008.1
|
||||
+ Revision: 180241
|
||||
- Houston, we're out of space icons...
|
||||
|
||||
* Mon Mar 03 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-17mdv2008.1
|
||||
+ Revision: 177993
|
||||
- Updated with transparent buttons
|
||||
- Removed scaled allowing button getting good sizing and centerd position
|
||||
|
||||
* Fri Feb 29 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-16mdv2008.1
|
||||
+ Revision: 176912
|
||||
- Fix shutdown kfm image
|
||||
|
||||
* Fri Feb 29 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-15mdv2008.1
|
||||
+ Revision: 176750
|
||||
- Make sure the right colors are used
|
||||
|
||||
* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-14mdv2008.1
|
||||
+ Revision: 175931
|
||||
- New release containing:
|
||||
* Fixed default colors for the kde profiles
|
||||
* Removed shadows from the status labels of splash themes
|
||||
* Updated kmenu icons
|
||||
* Updated metabar images
|
||||
|
||||
* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-13mdv2008.1
|
||||
+ Revision: 175813
|
||||
- New release updating splash themes and color schemes for 2008.1
|
||||
|
||||
* Mon Feb 25 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-12mdv2008.1
|
||||
+ Revision: 175126
|
||||
- Proper faces dir for kdm
|
||||
|
||||
* Fri Feb 22 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-11mdv2008.1
|
||||
+ Revision: 173976
|
||||
- Add a simple splash screen for the ones who don't like the full screen splash
|
||||
|
||||
* Tue Feb 19 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-10mdv2008.1
|
||||
+ Revision: 173041
|
||||
- Fix the button background colors
|
||||
|
||||
* Fri Feb 15 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-9mdv2008.1
|
||||
+ Revision: 169003
|
||||
- Add a default configuration file to minipagerapplet
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-8mdv2008.1
|
||||
+ Revision: 168879
|
||||
- No use of external player as standard
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-not-capitalized
|
||||
|
||||
* Fri Feb 01 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-7mdv2008.1
|
||||
+ Revision: 161221
|
||||
- Change the kside top images to match the new layout
|
||||
|
||||
* Wed Jan 09 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-6mdv2008.1
|
||||
+ Revision: 147151
|
||||
- Make standard menu default again
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Fri Dec 21 2007 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-5mdv2008.1
|
||||
+ Revision: 136414
|
||||
- Kicker's clockapplet was not saving their options
|
||||
when exits only one clock on kicker. Now its working.
|
||||
|
||||
* Tue Dec 18 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-4mdv2008.1
|
||||
+ Revision: 132432
|
||||
- Added media applet in kicker by default
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- do not hardcode man pages extension
|
||||
|
||||
* Thu Dec 13 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-3mdv2008.1
|
||||
+ Revision: 119505
|
||||
- Fix upgrade from non alternatives /etc/kderc
|
||||
- Moved common kdeglobal settings for kdeglobals in common and removed the duplicated in the profiles
|
||||
- Set kspell default encoding for UTF8
|
||||
|
||||
* Thu Nov 22 2007 Thierry Vignaud <tvignaud@mandriva.com> 2008.1-2mdv2008.1
|
||||
+ Revision: 111300
|
||||
- reupload (missing on x86_64)
|
||||
|
||||
* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.1-1mdv2008.1
|
||||
+ Revision: 102378
|
||||
- Update tarball with merged patches
|
||||
|
||||
* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.0-31mdv2008.1
|
||||
+ Revision: 102229
|
||||
- Add patch to activate klipper
|
||||
|
||||
* Tue Oct 23 2007 Olivier Blin <oblin@mandriva.com> 2008.0-30mdv2008.1
|
||||
+ Revision: 101644
|
||||
- update Flash splash (from Helio)
|
||||
|
||||
* Thu Oct 18 2007 Olivier Blin <oblin@mandriva.com> 2008.0-29mdv2008.1
|
||||
+ Revision: 100018
|
||||
- add flash-kde-config
|
||||
|
||||
* Tue Oct 02 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-28mdv2008.0
|
||||
+ Revision: 94768
|
||||
- Make the Mandriva theme select the proper components (#33822)
|
||||
|
||||
* Mon Oct 01 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-27mdv2008.0
|
||||
+ Revision: 94151
|
||||
- Use the ia_ora style and colors in kdm
|
||||
|
||||
* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-26mdv2008.0
|
||||
+ Revision: 93584
|
||||
- Restore kicker pager
|
||||
- Use official preview for moodin theme
|
||||
- Use sound notification only for session start and stop
|
||||
- Properly obsolete the discovery and powerpackplus kde config packages
|
||||
- Make all obsoletes tags versioned
|
||||
|
||||
* Wed Sep 26 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-24mdv2008.0
|
||||
+ Revision: 93095
|
||||
- Use DesktopLinks instead of Desktop to put icons on desktop (this way they get
|
||||
copied to the user home dir (#33204)
|
||||
|
||||
* Tue Sep 25 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-23mdv2008.0
|
||||
+ Revision: 92891
|
||||
- Enforce kaffeine as the default player for One and Free
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Flatten people image on powerpack images
|
||||
|
||||
* Fri Sep 21 2007 Anne Nicolas <anne.nicolas@mandriva.com> 2008.0-21mdv2008.0
|
||||
+ Revision: 91776
|
||||
- update sources
|
||||
- add metabar themes
|
||||
|
||||
* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-20mdv2008.0
|
||||
+ Revision: 91199
|
||||
- Add squared icons for the K menu
|
||||
|
||||
* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-19mdv2008.0
|
||||
+ Revision: 91017
|
||||
- Fix One color scheme
|
||||
|
||||
* Tue Sep 18 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-18mdv2008.0
|
||||
+ Revision: 89764
|
||||
- Define totem as the default player for powerpack
|
||||
|
||||
* Mon Sep 17 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-17mdv2008.0
|
||||
+ Revision: 89272
|
||||
- Use the desktop icons from desktop-common-data so that they are proper
|
||||
translated
|
||||
|
||||
* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-16mdv2008.0
|
||||
+ Revision: 85869
|
||||
- Multimedia direction change
|
||||
|
||||
* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-15mdv2008.0
|
||||
+ Revision: 85852
|
||||
- Fix kickoff button
|
||||
|
||||
* Fri Sep 14 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-14mdv2008.0
|
||||
+ Revision: 85758
|
||||
- KDM changes
|
||||
- Sound changes
|
||||
|
||||
* Wed Sep 12 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-13mdv2008.0
|
||||
+ Revision: 84580
|
||||
- Fixed clock position
|
||||
- Fixed "fat" menu letters
|
||||
- Fixed spacing on itens
|
||||
|
||||
* Mon Sep 10 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-12mdv2008.0
|
||||
+ Revision: 84142
|
||||
- ksmserver image change
|
||||
- kdm call grub instead of lilo
|
||||
- Proper naming
|
||||
|
||||
* Thu Sep 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-11mdv2008.0
|
||||
+ Revision: 81020
|
||||
- Font and config
|
||||
- kdm, kicker and Free splash update
|
||||
|
||||
* Wed Sep 05 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-9mdv2008.0
|
||||
+ Revision: 80365
|
||||
- Position text
|
||||
- New kicker buttons
|
||||
- No kdm userlist
|
||||
- New ia_ora one scheme
|
||||
|
||||
* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-8mdv2008.0
|
||||
+ Revision: 79481
|
||||
- Updated themes
|
||||
|
||||
* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-7mdv2008.0
|
||||
+ Revision: 78913
|
||||
- Starting migrate kde theme for 2008.0
|
||||
|
||||
* Mon Aug 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-5mdv2008.0
|
||||
+ Revision: 59467
|
||||
- Restore original images lost on svn crash
|
||||
|
||||
* Thu Aug 02 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-4mdv2008.0
|
||||
+ Revision: 58316
|
||||
- Fixed splash, removing Galaxy at last !
|
||||
- Removed wallpaper patch, commited on svn
|
||||
- Fixed Discovery theme
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- [BUGFIX] change wallpaper link to more userfriendly one (bug #10638)'
|
||||
|
||||
* Fri Jun 08 2007 Anssi Hannula <anssi@mandriva.org> 2008.0-3mdv2008.0
|
||||
+ Revision: 37525
|
||||
- do not remove profile alternatives when upgrading package
|
||||
|
||||
* Fri Jun 08 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-2mdv2008.0
|
||||
+ Revision: 37505
|
||||
- Added possibility to change to upstream kde config, as requested by Anssi
|
||||
|
||||
* Mon Jun 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-1mdv2008.0
|
||||
+ Revision: 35211
|
||||
- Removed old faulty updatekdeprofiles for a solution based on update-alternatives. Simple, using
|
||||
cascade for common avoiding symlinks, and letting have one profile read instead of a list of
|
||||
profiles that never keep same order
|
||||
- Added hardcoded files present before on kdebase package
|
||||
- Changed konsole config for Linux schema, instead of white one
|
||||
|
||||
|
||||
* Fri Apr 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-25mdv2007.1
|
||||
+ Revision: 150809
|
||||
- Fix nsplugins config
|
||||
|
||||
* Wed Mar 28 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-24mdv2007.1
|
||||
+ Revision: 149172
|
||||
- Fix kicker default icon
|
||||
|
||||
* Tue Mar 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-23mdv2007.1
|
||||
+ Revision: 149058
|
||||
- Fix kdesktop icon order
|
||||
|
||||
* Thu Mar 22 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-22mdv2007.1
|
||||
+ Revision: 148090
|
||||
- Fix windows key
|
||||
|
||||
* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-21mdv2007.1
|
||||
+ Revision: 147454
|
||||
- Fix konsole default config
|
||||
|
||||
* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-20mdv2007.1
|
||||
+ Revision: 147276
|
||||
- don't autostart klipper
|
||||
|
||||
* Mon Mar 19 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-19mdv2007.1
|
||||
+ Revision: 146426
|
||||
- Fix selected text color
|
||||
|
||||
* Thu Mar 15 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-18mdv2007.1
|
||||
+ Revision: 144247
|
||||
- Fix title text color
|
||||
|
||||
* Wed Mar 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-17mdv2007.1
|
||||
+ Revision: 143441
|
||||
- Fix kicker top
|
||||
Fix kdesktop icons order
|
||||
|
||||
* Mon Mar 12 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-16mdv2007.1
|
||||
+ Revision: 141633
|
||||
- Update kside top
|
||||
|
||||
* Sat Mar 10 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-15mdv2007.1
|
||||
+ Revision: 140413
|
||||
- Add jam search engine
|
||||
|
||||
* Wed Mar 07 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-14mdv2007.1
|
||||
+ Revision: 134313
|
||||
- Add specific desktop file
|
||||
|
||||
* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-13mdv2007.1
|
||||
+ Revision: 134007
|
||||
- Fix free color
|
||||
|
||||
* Mon Mar 05 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-12mdv2007.1
|
||||
+ Revision: 133018
|
||||
- Minor fix
|
||||
|
||||
* Fri Mar 02 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-10mdv2007.1
|
||||
+ Revision: 130993
|
||||
- Update preview
|
||||
|
||||
* Thu Mar 01 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-9mdv2007.1
|
||||
+ Revision: 130605
|
||||
- Update moodin picture
|
||||
|
||||
* Tue Feb 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-8mdv2007.1
|
||||
+ Revision: 126305
|
||||
- Fix kicker config
|
||||
|
||||
* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-7mdv2007.1
|
||||
+ Revision: 121648
|
||||
- Fix kicker config
|
||||
|
||||
* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-6mdv2007.1
|
||||
+ Revision: 121631
|
||||
- New kside
|
||||
|
||||
* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-5mdv2007.1
|
||||
+ Revision: 121620
|
||||
- Fix version
|
||||
- Add kicker 16x16 icons
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-4mdv2007.1
|
||||
+ Revision: 121083
|
||||
- Add kside
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-3mdv2007.1
|
||||
+ Revision: 121080
|
||||
- New update
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-2mdv2007.1
|
||||
+ Revision: 121001
|
||||
- Fix icons pos
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-1mdv2007.1
|
||||
+ Revision: 120949
|
||||
- New version
|
||||
- New source
|
||||
|
||||
* Thu Nov 16 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-29mdv2007.1
|
||||
+ Revision: 85037
|
||||
- Touch default kdmrc to been able to provide userlist
|
||||
|
||||
+ Laurent Montel <lmontel@mandriva.com>
|
||||
- New package (2006-09-22 28mdv)
|
||||
Fix kmplayer backend
|
||||
- New package (2006-09-20 27mdv)
|
||||
Fix migrate kdm from 2006 (thanks Pixel)
|
||||
- New package (26mdv 2006-09-19)
|
||||
Only description into menu for one/discovery
|
||||
|
||||
* Tue Sep 19 2006 Laurent Montel <lmontel@mandriva.com> 2007-25mdv2007.0
|
||||
+ Revision: 61919
|
||||
- New package( 2006-09-18 25mdv)
|
||||
Fix wav encodage
|
||||
|
||||
* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-24mdv2007.0
|
||||
+ Revision: 61581
|
||||
- New sound
|
||||
|
||||
* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-23mdv2007.0
|
||||
+ Revision: 61570
|
||||
- New package (2006-09-15 23mdv)
|
||||
Add new mdk statup function
|
||||
|
||||
* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-22mdv2007.0
|
||||
+ Revision: 61542
|
||||
- New package (2006-09-15 22mdv)
|
||||
Add default sounds
|
||||
|
||||
* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-21mdv2007.0
|
||||
+ Revision: 61458
|
||||
- New package (2006-09-14 21mdv)
|
||||
Use double click
|
||||
|
||||
* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-20mdv2007.0
|
||||
+ Revision: 61419
|
||||
- New version
|
||||
Fix kicker right button
|
||||
|
||||
* Wed Sep 13 2006 Laurent Montel <lmontel@mandriva.com> 2007-19mdv2007.0
|
||||
+ Revision: 61072
|
||||
- New package (2006-09-12 19mdv)
|
||||
Rename download->free
|
||||
Fix typo
|
||||
- Add missing test
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-18mdv2007.0
|
||||
+ Revision: 60840
|
||||
- New package (2006-09-11 18mdv)
|
||||
Workaround for Requires(preun) which doesn't work
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-17mdv2007.0
|
||||
+ Revision: 60830
|
||||
- New package (2006-09-11 16mdv)
|
||||
Fix device on desktop
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-16mdv2007.0
|
||||
+ Revision: 60764
|
||||
- New package (2006-09-11 16mdv)
|
||||
Fix default color, don't display tooltip by default
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-15mdv2007.0
|
||||
+ Revision: 60757
|
||||
- New package (2006-09-11 15mdv)
|
||||
Fix kicker default apps
|
||||
|
||||
* Sat Sep 09 2006 Laurent Montel <lmontel@mandriva.com> 2007-14mdv2007.0
|
||||
+ Revision: 60598
|
||||
- New package (2006-09-08 14mdv)
|
||||
Use by default ia_ora-kde theme
|
||||
|
||||
* Thu Sep 07 2006 Laurent Montel <lmontel@mandriva.com> 2007-13mdv2007.0
|
||||
+ Revision: 60211
|
||||
- New package (2006/09/06 -13mdv)
|
||||
/var/lib/mandriva now is owned by this package
|
||||
Add requires postun (need to uninstall package)
|
||||
|
||||
* Wed Sep 06 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-12mdv2007.0
|
||||
+ Revision: 60141
|
||||
- Added new configuration for kscd
|
||||
|
||||
* Wed Sep 06 2006 Laurent Montel <lmontel@mandriva.com> 2007-11mdv2007.0
|
||||
+ Revision: 60084
|
||||
- New package (2006-09-05 2007-10mdv)
|
||||
Now each distro load correct scheme files
|
||||
- Fix typo
|
||||
|
||||
* Fri Sep 01 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-10mdv2007.0
|
||||
+ Revision: 59028
|
||||
- Xdmcp back to disabled due popular demand.
|
||||
- Fixed post update of profile ( Thanks to Nanar )
|
||||
|
||||
* Thu Aug 31 2006 Laurent Montel <lmontel@mandriva.com> 2007-9mdv2007.0
|
||||
+ Revision: 58847
|
||||
- Fix kside
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Fixed background defaults. Thanks to Laurent Montel
|
||||
- Moved configs for a non versionated directories. Requested by Pixel and Laurent
|
||||
- Fixed the clean generation if /etc/kderc.
|
||||
- Fixed kcookiejar config, which for some reason is making some people getting
|
||||
the cookies ask dialog back
|
||||
|
||||
* Tue Aug 29 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-7mdv2007.0
|
||||
+ Revision: 58364
|
||||
- Fix install for directories with space ( Galaxy )
|
||||
- Use the right tarball
|
||||
- Return to old Galaxy name for ksplash. Keep Mandriva2007 for "in the middel of
|
||||
cooker" upgrade
|
||||
- Fixed invalid resources
|
||||
- Set 2 desktops for discovery
|
||||
|
||||
* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-6mdv2007.0
|
||||
+ Revision: 57975
|
||||
- Moved terminal from rxvt to xterm in failsafe session of kdm. rxvt not support
|
||||
utf-8 and most installations are using this by default
|
||||
- Fixed bug http://qa.mandriva.com/show_bug.cgi?id=24690 ( Wrong X path )
|
||||
- enabled xdmcp by default. System listen just locally.
|
||||
|
||||
* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-5mdv2007.0
|
||||
+ Revision: 57956
|
||||
- Fixed type on ksplash theme rc
|
||||
- Fixed kdm postinstall
|
||||
|
||||
* Thu Aug 24 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-4mdv2007.0
|
||||
+ Revision: 57753
|
||||
- Fixed updatekdeprofile by Nanar ( thanks )
|
||||
- Fixed config paths
|
||||
- Fixed upgrade of kdm config
|
||||
- Uploaded Mandriva configs for svn on soft
|
||||
- Added kside images ( depends on remove switch patch on kdebase )
|
||||
- Added new ksplash theme ( will have different color ones ones ? )
|
||||
- First fully operational package. Thanks to Nanar for all help
|
||||
- import mandriva-kde-config-2007-1mdv2007.0
|
||||
|
||||
+ Olivier Thauvin <nanardon@mandriva.org>
|
||||
- preserv order of value
|
||||
- the regexp need an eol marker
|
||||
- no space around the ,
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,33 @@
|
||||
From 977d49018cebcc37d0b667713ad422f80ba9c8d2 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Fri, 16 Apr 2010 16:17:04 +0200
|
||||
Subject: [PATCH] Fix pinentry-gtk-2 SIGSEGV when unfocusing with -g argument
|
||||
|
||||
gdk_window_set_transient_for cannot be used with parent = NULL to
|
||||
unset transient hint (unlike gtk_ version which can). Replacement
|
||||
code is taken from gtk_window_transient_parent_unrealized
|
||||
|
||||
Applied cleanly at least over 0.8.0 and 0.7.6
|
||||
|
||||
More info see: https://bugzilla.redhat.com/show_bug.cgi?id=520236
|
||||
---
|
||||
gtk+-2/pinentry-gtk-2.c | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
|
||||
index 7cd7616..fdd5822 100644
|
||||
--- a/gtk+-2/pinentry-gtk-2.c
|
||||
+++ b/gtk+-2/pinentry-gtk-2.c
|
||||
@@ -145,7 +145,8 @@ ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
|
||||
{
|
||||
gdk_keyboard_ungrab (gdk_event_get_time (event));
|
||||
/* Unmake window transient for the root window. */
|
||||
- gdk_window_set_transient_for (win->window, NULL);
|
||||
+ gdk_property_delete (win->window,
|
||||
+ gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
Index: gtk+-2/pinentry-gtk-2.c
|
||||
===================================================================
|
||||
--- gtk+-2/pinentry-gtk-2.c (revision 228)
|
||||
+++ gtk+-2/pinentry-gtk-2.c (revision 229)
|
||||
@@ -52,6 +52,7 @@
|
||||
#endif
|
||||
|
||||
static pinentry_t pinentry;
|
||||
+static int grab_failed;
|
||||
static int passphrase_ok;
|
||||
typedef enum { CONFIRM_CANCEL, CONFIRM_OK, CONFIRM_NOTOK } confirm_value_t;
|
||||
static confirm_value_t confirm_value;
|
||||
@@ -135,7 +136,11 @@
|
||||
return;
|
||||
|
||||
if (gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event)))
|
||||
- g_error ("could not grab keyboard");
|
||||
+ {
|
||||
+ g_critical ("could not grab keyboard");
|
||||
+ grab_failed = 1;
|
||||
+ gtk_main_quit ();
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -520,7 +525,7 @@
|
||||
while (gtk_events_pending ())
|
||||
gtk_main_iteration ();
|
||||
|
||||
- if (confirm_value == CONFIRM_CANCEL)
|
||||
+ if (confirm_value == CONFIRM_CANCEL || grab_failed)
|
||||
pe->canceled = 1;
|
||||
|
||||
pinentry = NULL;
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
Index: gtk+-2/pinentry-gtk-2.c
|
||||
===================================================================
|
||||
--- gtk+-2/pinentry-gtk-2.c
|
||||
+++ gtk+-2/pinentry-gtk-2.c 2010-05-13 08:17:10.000000000 +0200
|
||||
@@ -306,8 +306,11 @@
|
||||
g_signal_connect (G_OBJECT (win),
|
||||
"realize", G_CALLBACK (make_transient), NULL);
|
||||
|
||||
+ //we need to grab the keyboard when its visible! not when its mapped (there is a difference)
|
||||
+ g_object_set(G_OBJECT(win), "events", GDK_VISIBILITY_NOTIFY_MASK | GDK_STRUCTURE_MASK, NULL);
|
||||
+
|
||||
g_signal_connect (G_OBJECT (win),
|
||||
- pinentry->grab ? "map-event" : "focus-in-event",
|
||||
+ pinentry->grab ? "visibility-notify-event" : "focus-in-event",
|
||||
G_CALLBACK (grab_keyboard), NULL);
|
||||
g_signal_connect (G_OBJECT (win),
|
||||
pinentry->grab ? "unmap-event" : "focus-out-event",
|
||||
@ -0,0 +1,26 @@
|
||||
From 0cc3dd71213687ccb5ec0a1866864558bf03260b Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Fri, 7 May 2010 14:45:44 +0200
|
||||
Subject: [PATCH] Fix qt4 pinentry window created in the background
|
||||
|
||||
This is probably just a workaround. Proper fix is being investigated.
|
||||
---
|
||||
qt4/pinentrydialog.cpp | 1 -
|
||||
1 files changed, 0 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
|
||||
index 8644136..6064ab9 100644
|
||||
--- a/qt4/pinentrydialog.cpp
|
||||
+++ b/qt4/pinentrydialog.cpp
|
||||
@@ -63,7 +63,6 @@ void raiseWindow( QWidget* w )
|
||||
SetForegroundWindowEx( w->winId() );
|
||||
#endif
|
||||
w->raise();
|
||||
- w->activateWindow();
|
||||
}
|
||||
|
||||
QPixmap icon( QStyle::StandardPixmap which )
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,70 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 Fedora Project
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
# Anna Bernathova <anicka@novell.com> 2006
|
||||
# Pavel Nemec <pnemec@novell.com> 2006
|
||||
# Rex Dieter <rdieter@fedoraproject.org> 2009
|
||||
#
|
||||
# use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses)
|
||||
|
||||
if [ -z "$PINENTRY_BINARY" ]; then
|
||||
|
||||
kde_running=
|
||||
if [ -n "$KDE_FULL_SESSION" ]; then
|
||||
kde_running=1
|
||||
elif [ -n "$DISPLAY" ]; then
|
||||
xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
|
||||
if test $? -eq 0; then
|
||||
kde_running=1
|
||||
fi
|
||||
else
|
||||
arg=
|
||||
display=
|
||||
for opt in "$@"; do
|
||||
if [ "$opt" = "--display" ]; then
|
||||
arg=1
|
||||
elif [ -n "$arg" ]; then
|
||||
display="$opt"
|
||||
else
|
||||
arg=
|
||||
fi
|
||||
done
|
||||
if [ -n "$display" ]; then
|
||||
DISPLAY="$display" xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
|
||||
if test $? -eq 0; then
|
||||
kde_running=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# if KDE is detected and pinentry-qt exists, use pinentry-qt
|
||||
if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt4 ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
|
||||
# otherwise test if pinentry-gtk-2 is installed
|
||||
elif [ -x /usr/bin/pinentry-gtk-2 ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2"
|
||||
# otherwise test if pinentry-qt4 is installed
|
||||
elif [ -x /usr/bin/pinentry-qt ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-qt"
|
||||
# otherwise test if pinentry-qt exists although KDE is not detected
|
||||
elif [ -x /usr/bin/pinentry-qt4 ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
|
||||
# pinentry-curses is installed by default
|
||||
else
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-curses"
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
exec $PINENTRY_BINARY "$@"
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
#!/bin/bash
|
||||
# This adds a USB device to the "desktop usb" group.
|
||||
# You just need to create an entry "desktopdev ..." in a usermap file
|
||||
# and it will be picked up automatically.
|
||||
|
||||
# Mandriva uses udev, you don't have to create a usermap
|
||||
# If you want this script to be called, you have to create an udev
|
||||
# rule in /etc/udev/rules.d/ that starts it, using
|
||||
# RUN+="/etc/udev/agents.d/usb/desktopdev"
|
||||
|
||||
if [ -x /sbin/resmgr ]; then
|
||||
if [ "${ACTION}" = "add" ]; then
|
||||
/sbin/resmgr ${ACTION} ${DEVICE} desktop usb && exit 0
|
||||
else
|
||||
/sbin/resmgr ${ACTION} ${DEVICE} desktop && exit 0
|
||||
fi
|
||||
fi
|
||||
@ -0,0 +1,10 @@
|
||||
--- resmgr-1.0/pam_resmgr.c 2003-03-05 14:32:19.000000000 +0100
|
||||
+++ resmgr-1.0.patched/pam_resmgr.c 2006-07-26 02:22:59.000000000 +0200
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <ctype.h>
|
||||
+#include <syslog.h>
|
||||
|
||||
#include <security/pam_modules.h>
|
||||
#include "protocol.h"
|
||||
Binary file not shown.
@ -0,0 +1,10 @@
|
||||
--- class.c 2002-11-11 05:31:46.000000000 -0500
|
||||
+++ class.c.oden 2008-07-18 07:26:19.000000000 -0400
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#include <limits.h>
|
||||
#include "resmgrd.h"
|
||||
|
||||
res_class_t * res_classes;
|
||||
@ -0,0 +1,33 @@
|
||||
--- Makefile 2003-04-10 10:21:01.000000000 +0200
|
||||
+++ Makefile.oden 2008-07-18 21:41:19.000000000 +0200
|
||||
@@ -23,6 +23,8 @@
|
||||
LIBBASE = libresmgr.so
|
||||
LIB = $(LIBBASE).$(VERSION)
|
||||
LIBOBJS = $(addprefix .lobjs/,conn.o client.o glob.o)
|
||||
+LDFLAGS =
|
||||
+PAMLIBS = -lpam
|
||||
|
||||
ALL = $(SRV) $(CLT) $(LIB) $(PAM) tester
|
||||
|
||||
@@ -46,17 +48,17 @@
|
||||
rm -rf $(ALL) $(LIBBASE) .objs .lobjs
|
||||
|
||||
$(SRV): $(SRVOBJS) $(LIB)
|
||||
- $(CC) -o $@ $(SRVOBJS) -L. -lresmgr
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(SRVOBJS) -L. -lresmgr
|
||||
|
||||
$(CLT): $(CLTOBJS) $(LIB)
|
||||
- $(CC) -o $@ $(CLTOBJS) -L. -lresmgr
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(CLTOBJS) -L. -lresmgr
|
||||
|
||||
$(LIB): $(LIBOBJS)
|
||||
- $(CC) -shared -Wl,-soname,$(notdir $(LIB)) -o $@ $(LIBOBJS)
|
||||
+ $(CC) -shared -Wl,-soname,$(notdir $(LIB)) $(LDFLAGS) -o $@ $(LIBOBJS)
|
||||
ln -sf $(LIB) $(LIBBASE)
|
||||
|
||||
$(PAM): $(PAMOBJS) $(LIB)
|
||||
- $(CC) -shared -o $@ $(PAMOBJS) -L. -lresmgr
|
||||
+ $(CC) -shared $(LDFLAGS) -o $@ $(PAMOBJS) $(PAMLIBS) -L. -lresmgr
|
||||
|
||||
tester: .objs/tester.o $(LIB)
|
||||
$(CC) -o $@ .objs/tester.o -L. -lresmgr
|
||||
@ -0,0 +1,23 @@
|
||||
--- Makefile 2008-07-18 21:48:27.000000000 +0200
|
||||
+++ Makefile.oden 2008-07-18 21:49:27.000000000 +0200
|
||||
@@ -33,15 +33,15 @@
|
||||
install: $(ALL)
|
||||
mkdir -p $(SBINDIR) $(LIBDIR) $(MANDIR)/man{1,3,5,8} \
|
||||
$(ETCDIR) $(PAMDIR) $(INCDIR)
|
||||
- install -m 555 $(LIB) $(LIBDIR)
|
||||
- install -m 555 $(PAM) $(PAMDIR)
|
||||
+ install -m 755 $(LIB) $(LIBDIR)
|
||||
+ install -m 755 $(PAM) $(PAMDIR)
|
||||
if [ ! -f $(ETCDIR)/resmgr.conf ]; then \
|
||||
install -m 644 etc/resmgr.conf $(ETCDIR); \
|
||||
fi
|
||||
- install -m 444 resmgr.h $(INCDIR)
|
||||
- install -m 555 -s $(CLT) $(SRV) $(SBINDIR)
|
||||
+ install -m 644 resmgr.h $(INCDIR)
|
||||
+ install -m 755 -s $(CLT) $(SRV) $(SBINDIR)
|
||||
for x in 1 3 5 8; do \
|
||||
- install -m 444 doc/*.$$x $(MANDIR)/man$$x; \
|
||||
+ install -m 644 doc/*.$$x $(MANDIR)/man$$x; \
|
||||
done
|
||||
|
||||
clean distclean:
|
||||
@ -0,0 +1,12 @@
|
||||
diff -ur resmgr-1.0.orig/utils.c resmgr-1.0/utils.c
|
||||
--- resmgr-1.0.orig/utils.c 2003-03-05 14:32:19.000000000 +0100
|
||||
+++ resmgr-1.0/utils.c 2005-03-16 11:47:58.000000000 +0100
|
||||
@@ -101,7 +101,7 @@
|
||||
sprintf(buffer, "%03d ", code);
|
||||
n = strlen(buffer);
|
||||
vsnprintf(buffer+n, sizeof(buffer)-n, fmt, ap);
|
||||
- vlog(LOG_INFO, "%s", buffer);
|
||||
+ def_log("%s", buffer);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
# This is the default set of devices people logged in on the desktop get
|
||||
# access to:
|
||||
class desktop
|
||||
#
|
||||
# Standard multimedia devices
|
||||
add /dev/audio desktop
|
||||
add /dev/mixer desktop
|
||||
add /dev/dsp desktop
|
||||
add /dev/sequencer desktop
|
||||
add /dev/video desktop
|
||||
#
|
||||
# Modem device
|
||||
add /dev/modem desktop
|
||||
#
|
||||
# CD-ROMs - giving permission to open the corresponding SCSI
|
||||
# device is highly useful for CD writers such as cdrecord.
|
||||
add /dev/cdrom desktop scsi paride
|
||||
add /dev/cdrom1 desktop scsi paride
|
||||
add /dev/cdrecorder desktop scsi
|
||||
add /dev/dvd desktop scsi paride
|
||||
add /dev/dvd1 desktop scsi paride
|
||||
add /dev/sr0 desktop scsi
|
||||
add /dev/sr1 desktop scsi
|
||||
add /dev/sr2 desktop scsi
|
||||
add /dev/sr3 desktop scsi
|
||||
#
|
||||
# Dito for SCSI scanners, which all use /dev/scanner symlink.
|
||||
add /dev/scanner desktop scsi
|
||||
#
|
||||
# And USB scanners.
|
||||
add /dev/usbscanner desktop
|
||||
add /dev/usb/scanner desktop
|
||||
add /dev/usb/scanner0 desktop
|
||||
add /dev/usb/scanner1 desktop
|
||||
add /dev/usb/scanner2 desktop
|
||||
add /dev/usb/scanner3 desktop
|
||||
add /dev/usb/scanner4 desktop
|
||||
add /dev/usb/scanner5 desktop
|
||||
add /dev/usb/scanner6 desktop
|
||||
add /dev/usb/scanner7 desktop
|
||||
#
|
||||
# make /dev/console accessible read-only
|
||||
add /dev/console desktop read-only
|
||||
|
||||
#
|
||||
# This rule grants access to users logged in locally
|
||||
#
|
||||
allow desktop tty=/dev/tty[1-9]* || tty=tty[1-9]* || tty=:0
|
||||
|
||||
# For serial gphoto cameras.
|
||||
# add /dev/ttyS0 desktop
|
||||
# add /dev/ttyS1 desktop
|
||||
#
|
||||
# Sample rules, do not enable by default:
|
||||
#
|
||||
# This rule denies access to users uucp and news
|
||||
#
|
||||
# deny desktop user=uucp || user=news
|
||||
#
|
||||
# This rule gives access to all members of group wheel
|
||||
#
|
||||
# allow desktop group=wheel
|
||||
#
|
||||
# To make resmgr work with ssh, for instance, add the following
|
||||
# line to /etc/pam.d/ssh:
|
||||
# session optional pam_resmgr.so fake_ttyname
|
||||
# When a user logs in, a resmgr session will be opened, and
|
||||
# access will be granted automaticially to all resource classes
|
||||
# matched via access control statements in resmgr.conf.
|
||||
@ -0,0 +1,56 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# chkconfig: 2345 15 15
|
||||
# description: The resource manager is a framework to give user applications
|
||||
# access to certain device files. The resource manager daemon can be configured
|
||||
# to give certain users access to different resource classes.
|
||||
# processname: resmgr
|
||||
# pidfile: /var/run/resmgr.pid
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: resmgr
|
||||
# Default-Start: 2 3 4 5
|
||||
# Short-Description: A program to allow arbitrary access to device files
|
||||
# Description: The resource manager is a framework to give user applications \
|
||||
# access to certain device files. The resource manager daemon can be configured \
|
||||
# to give certain users access to different resource classes.
|
||||
### END INIT INFO
|
||||
|
||||
# source function library
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
RETVAL=0
|
||||
|
||||
RESMGR_BIN=/sbin/resmgrd
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
gprintf "Starting resource manager services: "
|
||||
daemon $RESMGR_BIN
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/resmgr
|
||||
;;
|
||||
stop)
|
||||
gprintf "Shutting down resmgr services: "
|
||||
killproc resmgr
|
||||
RETVAL=$?
|
||||
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/resmgr
|
||||
;;
|
||||
restart|reload)
|
||||
$0 stop
|
||||
$0 start
|
||||
RETVAL=$?
|
||||
;;
|
||||
status)
|
||||
status resmgr
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
gprintf "Usage: resmgr {start|stop|status|restart|reload}\n"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
@ -0,0 +1,212 @@
|
||||
%define major 1
|
||||
%define libname %mklibname %{name} %{major}
|
||||
%define develname %mklibname %{name} -d
|
||||
|
||||
Summary: A program to allow arbitrary access to device files
|
||||
Name: resmgr
|
||||
Version: 1.0
|
||||
Release: %mkrel 14
|
||||
License: GPLv2
|
||||
Group: System/Servers
|
||||
URL: http://www.lst.de/~okir/resmgr/
|
||||
Source: ftp://ftp.lst.de/pub/people/okir/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source1: resmgr.init
|
||||
Source2: resmgr.conf
|
||||
Source3: desktopdev
|
||||
Patch0: resmgr-1.0-syslog.patch
|
||||
Patch1: resmgr-va_list.patch
|
||||
Patch2: resmgr-glibc28.diff
|
||||
Patch3: resmgr-linkage_fix.diff
|
||||
Patch4: resmgr-permission_fix.diff
|
||||
Requires(post): rpm-helper
|
||||
Requires(preun): rpm-helper
|
||||
BuildRequires: pam-devel
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
%description
|
||||
The resource manager is a framework to give user applications access
|
||||
to certain device files. The resource manager daemon can be configured
|
||||
to give certain users access to different resource classes.
|
||||
|
||||
It supports hotplugging devices (i.e. new devices can be added to
|
||||
and removed from resource classes at run time), and it provides
|
||||
transparent access to the raw SCSI device corresponding to
|
||||
a CD writer or a scanner.
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: Shared libraries for %{name}
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname}
|
||||
The resource manager is a framework to give user applications access
|
||||
to certain device files. The resource manager daemon can be configured
|
||||
to give certain users access to different resource classes.
|
||||
|
||||
It supports hotplugging devices (i.e. new devices can be added to
|
||||
and removed from resource classes at run time), and it provides
|
||||
transparent access to the raw SCSI device corresponding to
|
||||
a CD writer or a scanner.
|
||||
|
||||
%package -n %{develname}
|
||||
Summary: Development headers and libraries for %{name}
|
||||
Group: Development/C
|
||||
Requires: %{libname} = %{version}
|
||||
Provides: lib%{name}-devel = %{version}-%{release}
|
||||
Provides: %{name}-devel = %{version}-%{release}
|
||||
Obsoletes: %{mklibname resmgr 1 -d}
|
||||
|
||||
%description -n %{develname}
|
||||
The resource manager is a framework to give user applications access
|
||||
to certain device files. The resource manager daemon can be configured
|
||||
to give certain users access to different resource classes.
|
||||
|
||||
It supports hotplugging devices (i.e. new devices can be added to
|
||||
and removed from resource classes at run time), and it provides
|
||||
transparent access to the raw SCSI device corresponding to
|
||||
a CD writer or a scanner.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q
|
||||
%patch0 -p1 -b .syslog
|
||||
%patch1 -p1 -b .va_list
|
||||
%patch2 -p0 -b .glibc28
|
||||
%patch3 -p0 -b .linkage_fix
|
||||
%patch4 -p0 -b .permission_fix
|
||||
|
||||
%build
|
||||
%make CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{ldflags}"
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%makeinstall_std LIBDIR=%{buildroot}/%{_lib} PAMDIR=%{buildroot}/%{_lib}/security
|
||||
|
||||
ln -sf libresmgr.so.* %{buildroot}/%{_lib}/libresmgr.so
|
||||
install -m755 %{SOURCE1} -D %{buildroot}%{_initrddir}/%{name}
|
||||
mkdir -p %{buildroot}/usr/sbin/
|
||||
ln -s ../..%{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
|
||||
# install config file
|
||||
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}.conf
|
||||
install -c -m755 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/udev/agents.d/usb/desktopdev
|
||||
|
||||
%post
|
||||
%_post_service %{name}
|
||||
|
||||
%preun
|
||||
%_preun_service %{name}
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README TODO ANNOUNCE
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||
%{_initrddir}/%{name}
|
||||
%{_sysconfdir}/udev/agents.d/usb/desktopdev
|
||||
%{_sbindir}/rc%{name}
|
||||
/sbin/%{name}
|
||||
/sbin/%{name}d
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%files -n %{libname}
|
||||
%defattr(-,root,root)
|
||||
/%{_lib}/*.so.*
|
||||
/%{_lib}/security/*
|
||||
|
||||
%files -n %{develname}
|
||||
%defattr(-,root,root)
|
||||
/%{_lib}/*.so
|
||||
%{_includedir}/%{name}.h
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1.0-14mdv2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Thu Sep 03 2009 Christophe Fergeau <cfergeau@mandriva.com> 1.0-13mdv2010.0
|
||||
+ Revision: 426907
|
||||
- rebuild
|
||||
|
||||
* Mon Dec 22 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-12mdv2009.1
|
||||
+ Revision: 317576
|
||||
- use %%ldflags
|
||||
|
||||
* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-11mdv2009.0
|
||||
+ Revision: 238350
|
||||
- fix linkage
|
||||
- fix errors in the init script
|
||||
- fix permissions (for strip + debug packaging)
|
||||
|
||||
* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-10mdv2009.0
|
||||
+ Revision: 238102
|
||||
- added P1 from pld
|
||||
- fix build, P2 + -D_GNU_SOURCE
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- rebuild
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Wed Mar 05 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-8mdv2008.1
|
||||
+ Revision: 179431
|
||||
- rebuild
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Wed Aug 01 2007 Adam Williamson <awilliamson@mandriva.org> 1.0-7mdv2008.0
|
||||
+ Revision: 57363
|
||||
- rebuild for 2008
|
||||
- new devel policy
|
||||
- spec clean
|
||||
|
||||
|
||||
* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-31 20:51:47 (42877)
|
||||
- Increase release number
|
||||
|
||||
* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-31 20:50:48 (42876)
|
||||
- Fix for http://qa.mandriva.com/show_bug.cgi?id=23968 ( wrong init services )
|
||||
|
||||
* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-26 03:39:04 (42167)
|
||||
- Moved to subversion
|
||||
- Added patch from Jan Ciger to fix syslog defines
|
||||
|
||||
* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-26 03:11:36 (42165)
|
||||
- import resmgr-1.0-4mdk
|
||||
|
||||
* Wed Jan 18 2006 Olivier Blin <oblin@mandriva.com> 1.0-4mdk
|
||||
- fix pam files installation on x86_64
|
||||
- buildrequire pam-devel
|
||||
- drop hotplug requirement
|
||||
|
||||
* Sat Aug 27 2005 Olivier Blin <oblin@mandriva.com> 1.0-3mdk
|
||||
- move hotplug script to in udev agents.d directory
|
||||
- update Source4 to explain how it should be handled with udev
|
||||
|
||||
* Sun Jun 12 2005 Per Øyvind Karlsen <pkarlsen@mandriva.com> 1.0-2mdk
|
||||
- rebuild
|
||||
- fix requires
|
||||
- do not mark init file as config file
|
||||
- %%{1}mdv2007.0
|
||||
|
||||
* Fri May 21 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 1.0-1mdk
|
||||
- initial mdk release (based on suse package)
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig 2011-02-04 15:59:27.725473830 +0000
|
||||
+++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp 2011-02-04 16:00:30.800473078 +0000
|
||||
@@ -17,7 +17,6 @@
|
||||
*/
|
||||
|
||||
#include "halbackend.h"
|
||||
-#include "linuxcdpolling.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <locale.h>
|
||||
@@ -586,19 +585,12 @@
|
||||
medium->setIconName(TQString::null);
|
||||
|
||||
/* check if the disc id a vcd or a video dvd */
|
||||
- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume));
|
||||
- switch (type)
|
||||
- {
|
||||
- case DiscType::VCD:
|
||||
+ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL))
|
||||
mimeType = "media/vcd";
|
||||
- break;
|
||||
- case DiscType::SVCD:
|
||||
+ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL))
|
||||
mimeType = "media/svcd";
|
||||
- break;
|
||||
- case DiscType::DVD:
|
||||
+ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL))
|
||||
mimeType = "media/dvdvideo";
|
||||
- break;
|
||||
- }
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -0,0 +1,30 @@
|
||||
diff -Naur kdebase-3.5.10/kcontrol/crypto/crypto.cpp kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp
|
||||
--- kdebase-3.5.10/kcontrol/crypto/crypto.cpp 2006-10-01 20:31:49.000000000 +0300
|
||||
+++ kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp 2010-05-05 08:27:59.323611142 +0300
|
||||
@@ -2321,7 +2321,7 @@
|
||||
unsigned int i;
|
||||
SSL_CTX *ctx;
|
||||
SSL *ssl;
|
||||
-SSL_METHOD *meth;
|
||||
+SSL_METHOD const *meth;
|
||||
|
||||
SSLv2Box->clear();
|
||||
SSLv3Box->clear();
|
||||
@@ -2337,7 +2337,7 @@
|
||||
CipherItem *item;
|
||||
for (i=0; ; i++) {
|
||||
int j, k;
|
||||
- SSL_CIPHER *sc;
|
||||
+ SSL_CIPHER const *sc;
|
||||
sc = (meth->get_cipher)(i);
|
||||
if (!sc)
|
||||
break;
|
||||
@@ -2365,7 +2365,7 @@
|
||||
|
||||
for (i=0; ; i++) {
|
||||
int j, k;
|
||||
- SSL_CIPHER *sc;
|
||||
+ SSL_CIPHER const *sc;
|
||||
sc = (meth->get_cipher)(i);
|
||||
if (!sc)
|
||||
break;
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,28 @@
|
||||
--- kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp-- 2005-02-28 15:16:19.881739297 +0100
|
||||
+++ kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp 2005-02-28 15:17:37.816468727 +0100
|
||||
@@ -57,11 +57,23 @@ KdmThemer::KdmThemer( const QString &_fi
|
||||
|
||||
// read the XML file and create DOM tree
|
||||
TQString filename = _filename;
|
||||
- if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
|
||||
+ if ( _filename.startsWith("/usr/share/mdk/dm") )
|
||||
+ {
|
||||
+ if (!::access( TQFile::encodeName( filename + "/KdmGreeterTheme.desktop" ), R_OK )) {
|
||||
+ KSimpleConfig cfg( filename + "/KdmGreeterTheme.desktop" );
|
||||
+ cfg.setGroup( "GdmGreeterTheme" );
|
||||
+ filename += '/' + cfg.readEntry( "Greeter" );
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
|
||||
KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
|
||||
cfg.setGroup( "GdmGreeterTheme" );
|
||||
filename += '/' + cfg.readEntry( "Greeter" );
|
||||
- }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
TQFile opmlFile( filename );
|
||||
if (!opmlFile.open( IO_ReadOnly )) {
|
||||
FDialog::box( widget(), errorbox, i18n( "Cannot open theme file %1" ).arg(filename) );
|
||||
@ -0,0 +1,18 @@
|
||||
--- kdebase-3.4.0/kcontrol/screensaver/scrnsave.cpp-- 2005-04-12 05:03:07.927420021 -0400
|
||||
+++ kdebase-3.4.0/kcontrol/screensaver/scrnsave.cpp 2005-04-12 05:04:27.259781143 -0400
|
||||
@@ -103,13 +103,14 @@ KScreenSaver::KScreenSaver(TQWidget *pare
|
||||
|
||||
// Add KDE specific screensaver path
|
||||
TQString relPath="System/ScreenSavers/";
|
||||
+#if 0 //disable because we mustn't use it
|
||||
KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers" );
|
||||
if (servGroup)
|
||||
{
|
||||
relPath=servGroup->relPath();
|
||||
kdDebug() << "relPath=" << relPath << endl;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
KGlobal::dirs()->addResourceType("scrsav",
|
||||
KGlobal::dirs()->kde_default("apps") +
|
||||
relPath);
|
||||
@ -0,0 +1,14 @@
|
||||
--- kdebase-3.4.2/kdm/config.def-- 2005-09-08 15:28:23.000000000 +0200
|
||||
+++ kdebase-3.4.2/kdm/config.def 2005-09-08 15:28:49.000000000 +0200
|
||||
@@ -1348,9 +1348,9 @@ Description:
|
||||
|
||||
Key: ServerArgsLocal
|
||||
Type: string
|
||||
-Default: ""
|
||||
+Default: "-nolisten tcp"
|
||||
User: core
|
||||
-Instance: :*/"-nolisten tcp"
|
||||
+Instance: */"-deferglyphs 16 -nolisten tcp"
|
||||
Comment: &
|
||||
Description:
|
||||
Additional arguments for the &X-Server;s for local sessions.
|
||||
@ -0,0 +1,20 @@
|
||||
--- kdebase-3.4.2/kdm/kfrontend/kgapp.cpp-- 2005-09-07 20:13:23.000000000 +0200
|
||||
+++ kdebase-3.4.2/kdm/kfrontend/kgapp.cpp 2005-09-07 20:13:52.000000000 +0200
|
||||
@@ -140,7 +140,7 @@ kg_main( const char *argv0 )
|
||||
app.setFont( _normalFont );
|
||||
|
||||
setup_modifiers( dpy, _numLockStatus );
|
||||
- SecureDisplay( dpy );
|
||||
+ //SecureDisplay( dpy );
|
||||
KProcess *proc = 0;
|
||||
if (!_grabServer) {
|
||||
if (_useBackground) {
|
||||
@@ -226,7 +226,7 @@ kg_main( const char *argv0 )
|
||||
KGVerify::done();
|
||||
|
||||
delete proc;
|
||||
- UnsecureDisplay( dpy );
|
||||
+ //UnsecureDisplay( dpy );
|
||||
restore_modifiers();
|
||||
|
||||
XSetInputFocus( qt_xdisplay(), PointerRoot, PointerRoot, CurrentTime );
|
||||
@ -0,0 +1,7 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session optional pam_console.so
|
||||
session include system-auth
|
||||
@ -0,0 +1,8 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_permit.so
|
||||
auth include system-auth
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session optional pam_console.so
|
||||
session include system-auth
|
||||
|
After Width: | Height: | Size: 78 KiB |
@ -0,0 +1,86 @@
|
||||
--- kdesktop/lock/lockdlg.cc.fix_vibrate_dialog 2007-05-14 09:55:44.000000000 +0200
|
||||
+++ kdesktop/lock/lockdlg.cc 2009-01-04 06:20:33.000000000 +0100
|
||||
@@ -53,6 +53,7 @@
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/keysym.h>
|
||||
#include <fixx11h.h>
|
||||
+#include <kapplication.h>
|
||||
|
||||
#ifndef AF_LOCAL
|
||||
# define AF_LOCAL AF_UNIX
|
||||
@@ -202,6 +203,38 @@
|
||||
}
|
||||
}
|
||||
|
||||
+void PasswordDlg::movedialog( int _move )
|
||||
+{
|
||||
+ waitMoveDialog = true;
|
||||
+ this->move(pos().x()+_move, pos().y());
|
||||
+ TQTimer::singleShot( 50, this, SLOT(moveTimerDone()) );
|
||||
+ while (waitMoveDialog)
|
||||
+ kapp->processEvents();
|
||||
+}
|
||||
+
|
||||
+void PasswordDlg::moveTimerDone()
|
||||
+{
|
||||
+ waitMoveDialog = false;
|
||||
+}
|
||||
+
|
||||
+void PasswordDlg::badPasswordLogin()
|
||||
+{
|
||||
+ if ( mUnlockingFailed )
|
||||
+ {
|
||||
+ for ( int i = 0 ; i<2 ; i++)
|
||||
+ {
|
||||
+ movedialog( 10 );
|
||||
+ movedialog( -20 );
|
||||
+ movedialog( 20 );
|
||||
+ movedialog( -20 );
|
||||
+ movedialog( 20 );
|
||||
+ movedialog( -10 );
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
// Handle timer events.
|
||||
@@ -332,6 +365,7 @@
|
||||
ok->setEnabled(false);
|
||||
cancel->setEnabled(false);
|
||||
mNewSessButton->setEnabled( false );
|
||||
+ badPasswordLogin();
|
||||
return;
|
||||
case AuthAbort:
|
||||
return;
|
||||
--- kdesktop/lock/lockdlg.h.fix_vibrate_dialog 2005-09-10 10:25:41.000000000 +0200
|
||||
+++ kdesktop/lock/lockdlg.h 2009-01-04 06:20:33.000000000 +0100
|
||||
@@ -55,7 +55,7 @@
|
||||
void slotOK();
|
||||
void layoutClicked();
|
||||
void slotActivity();
|
||||
-
|
||||
+ void moveTimerDone();
|
||||
private:
|
||||
void setLayoutText( const TQString &txt );
|
||||
void capsLocked();
|
||||
@@ -71,6 +71,9 @@
|
||||
void handleVerify();
|
||||
void reapVerify();
|
||||
void cantCheck();
|
||||
+ void movedialog( int _move );
|
||||
+ void badPasswordLogin();
|
||||
+
|
||||
GreeterPluginHandle *mPlugin;
|
||||
KGreeterPlugin *greet;
|
||||
TQFrame *frame;
|
||||
@@ -86,6 +89,7 @@
|
||||
TQStringList::iterator currLayout;
|
||||
int sPid, sFd;
|
||||
TQListView *lv;
|
||||
+ bool waitMoveDialog;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,12 @@
|
||||
--- admin/configure.in.min.orig 2011-07-13 14:02:37.735906184 +0100
|
||||
+++ admin/configure.in.min 2011-07-13 14:03:14.916906166 +0100
|
||||
@@ -44,6 +44,9 @@
|
||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
+
|
||||
AC_CHECK_COMPILERS
|
||||
AC_ENABLE_SHARED(yes)
|
||||
AC_ENABLE_STATIC(no)
|
||||
@ -0,0 +1,42 @@
|
||||
--- kcontrol/kcontrol/KControl.desktop 2011-07-20 12:08:11.913774590 +0100
|
||||
+++ kcontrol/kcontrol/KControl.desktop.new 2011-07-22 10:21:25.604284524 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+
|
||||
[Desktop Entry]
|
||||
Exec=kcontrol -caption "%c" %i %m
|
||||
Icon=kcontrol
|
||||
@@ -5,7 +6,7 @@
|
||||
DocPath=kcontrol/index.html
|
||||
X-KDE-StartupNotify=true
|
||||
|
||||
-Name=KDE3 Control Center
|
||||
+Name=Trinity Control Center
|
||||
Name[af]=Beheer Sentrum
|
||||
Name[ar]=مركز التحكم
|
||||
Name[az]=İdarə Mərkəzi
|
||||
@@ -21,14 +22,14 @@
|
||||
Name[da]=Kontrolcenter
|
||||
Name[de]=Kontrollzentrum
|
||||
Name[el]=Κέντρο ελέγχου
|
||||
-Name[en_GB]=Control Centre
|
||||
+Name[en_GB]=Trinity Control Centre
|
||||
Name[eo]=Stircentro
|
||||
Name[es]=Centro de control
|
||||
Name[et]=Juhtimiskeskus
|
||||
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
|
||||
@@ -90,6 +91,6 @@
|
||||
Name[zu]=Indawo Yokulawula
|
||||
|
||||
X-DCOP-ServiceType=Unique
|
||||
-Categories=Qt;KDE;Core;System;
|
||||
+Categories=Qt;KDE;Core;System;X-MandrivaLinux-CrossDesktop;
|
||||
+X-Desktop-File-Install-Version=0.16
|
||||
OnlyShowIn=KDE;
|
||||
-NoDisplay=true
|
||||
@ -0,0 +1,198 @@
|
||||
--- kcontrol/kdm/kdm-users.cpp.nopatch 2011-07-19 11:06:21.493310808 +0100
|
||||
+++ kcontrol/kdm/kdm-users.cpp 2011-07-19 11:15:19.120311520 +0100
|
||||
@@ -56,7 +56,7 @@
|
||||
} else if (!stat( "/usr/portage", &st )) { /* gentoo */
|
||||
defminuid = "1000";
|
||||
defmaxuid = "65000";
|
||||
- } else if (!stat( "/etc/mandrake-release", &st )) { /* mandrake - check before redhat! */
|
||||
+ } else if (!stat( "/etc/mandriva-release", &st )) { /* mandrake - check before redhat! */
|
||||
defminuid = "500";
|
||||
defmaxuid = "65000";
|
||||
} else if (!stat( "/etc/redhat-release", &st )) { /* redhat */
|
||||
@@ -74,12 +74,8 @@
|
||||
// We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
|
||||
// and create them if necessary.
|
||||
config->setGroup( "X-*-Greeter" );
|
||||
- m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
|
||||
+ m_pixDir = "/usr/share/faces/";
|
||||
m_notFirst = false;
|
||||
- TQDir testDir( m_userPixDir );
|
||||
- if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
|
||||
- KMessageBox::sorry( this, i18n("Unable to create folder %1").arg( testDir.absPath() ) );
|
||||
- chmod( TQFile::encodeName( m_userPixDir ), 0755 );
|
||||
|
||||
m_defaultText = i18n("<default>");
|
||||
|
||||
@@ -146,18 +142,6 @@
|
||||
connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
|
||||
TQT_SLOT(slotChanged()) );
|
||||
|
||||
- faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
|
||||
- TQWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users."
|
||||
- " \"Admin\" represents the global folder; these are the pictures you can set below."
|
||||
- " \"User\" means that KDM should read the user's $HOME/.face.icon file."
|
||||
- " The two selections in the middle define the order of preference if both sources are available.") );
|
||||
- connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) );
|
||||
- connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
|
||||
- rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup );
|
||||
- rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup );
|
||||
- rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup );
|
||||
- rbusronly = new TQRadioButton( i18n("User"), faceGroup );
|
||||
-
|
||||
TQGroupBox *picGroup = new TQVGroupBox( i18n("User Images"), this );
|
||||
TQWidget *hlpw = new TQWidget( picGroup );
|
||||
usercombo = new KComboBox( hlpw );
|
||||
@@ -191,6 +175,7 @@
|
||||
TQVBoxLayout *lLayout = new TQVBoxLayout( main, 10 );
|
||||
lLayout->addWidget( minGroup );
|
||||
lLayout->addWidget( usrGroup );
|
||||
+ lLayout->addWidget( picGroup );
|
||||
lLayout->addStretch( 1 );
|
||||
|
||||
TQVBoxLayout *mLayout = new TQVBoxLayout( main, 10 );
|
||||
@@ -199,11 +184,6 @@
|
||||
mLayout->setStretchFactor( wstack, 1 );
|
||||
main->setStretchFactor( mLayout, 1 );
|
||||
|
||||
- TQVBoxLayout *rLayout = new TQVBoxLayout( main, 10 );
|
||||
- rLayout->addWidget( faceGroup );
|
||||
- rLayout->addWidget( picGroup );
|
||||
- rLayout->addStretch( 1 );
|
||||
-
|
||||
}
|
||||
|
||||
void KDMUsersWidget::makeReadOnly()
|
||||
@@ -214,10 +194,6 @@
|
||||
cbcomplete->setEnabled(false);
|
||||
cbinverted->setEnabled(false);
|
||||
cbusrsrt->setEnabled(false);
|
||||
- rbadmonly->setEnabled(false);
|
||||
- rbprefadm->setEnabled(false);
|
||||
- rbprefusr->setEnabled(false);
|
||||
- rbusronly->setEnabled(false);
|
||||
wstack->setEnabled(false);
|
||||
disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) );
|
||||
userbutton->setAcceptDrops(false);
|
||||
@@ -232,7 +208,6 @@
|
||||
wstack->setEnabled( en );
|
||||
wstack->raiseWidget( cbinverted->isChecked() ? optoutlv : optinlv );
|
||||
en = cbshowlist->isChecked();
|
||||
- faceGroup->setEnabled( en );
|
||||
if (!en) {
|
||||
usercombo->setEnabled( false );
|
||||
userbutton->setEnabled( false );
|
||||
@@ -243,12 +218,6 @@
|
||||
|
||||
void KDMUsersWidget::slotFaceOpts()
|
||||
{
|
||||
- bool en = !rbusronly->isChecked();
|
||||
- usercombo->setEnabled( en );
|
||||
- userbutton->setEnabled( en );
|
||||
- if (en)
|
||||
- slotUserSelected();
|
||||
- else
|
||||
rstuserbutton->setEnabled( false );
|
||||
}
|
||||
|
||||
@@ -257,13 +226,13 @@
|
||||
TQString user = usercombo->currentText();
|
||||
TQImage p;
|
||||
if (user != m_defaultText &&
|
||||
- p.load( m_userPixDir + user + ".face.icon" )) {
|
||||
+ p.load( m_pixDir + user + ".png" )) {
|
||||
rstuserbutton->setEnabled( !getuid() );
|
||||
} else {
|
||||
- p.load( m_userPixDir + ".default.face.icon" );
|
||||
+ p.load( m_pixDir + "default.png" );
|
||||
rstuserbutton->setEnabled( false );
|
||||
}
|
||||
- userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) );
|
||||
+ userbutton->setPixmap( p );
|
||||
}
|
||||
|
||||
|
||||
@@ -272,7 +241,7 @@
|
||||
TQString user( usercombo->currentText() );
|
||||
if (user == m_defaultText)
|
||||
{
|
||||
- user = ".default";
|
||||
+ user = "default";
|
||||
if (KMessageBox::questionYesNo(this, i18n("Save image as default image?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::cancel())
|
||||
!= KMessageBox::Yes)
|
||||
return;
|
||||
@@ -286,8 +255,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- p = p.smoothScale( 48, 48, TQImage::ScaleMin );
|
||||
- TQString userpix = m_userPixDir + user + ".face.icon";
|
||||
+ TQString userpix = m_pixDir + user + ".png";
|
||||
if (!p.save( userpix, "PNG" ))
|
||||
KMessageBox::sorry(this,
|
||||
i18n("There was an error saving the image:\n%1")
|
||||
@@ -319,7 +287,7 @@
|
||||
|
||||
void KDMUsersWidget::slotUnsetUserPix()
|
||||
{
|
||||
- TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" );
|
||||
+ TQFile::remove( m_pixDir + usercombo->currentText() + ".png" );
|
||||
slotUserSelected();
|
||||
}
|
||||
|
||||
@@ -368,11 +336,6 @@
|
||||
|
||||
config->writeEntry( "HiddenUsers", hiddenUsers );
|
||||
config->writeEntry( "SelectedUsers", selectedUsers );
|
||||
-
|
||||
- config->writeEntry( "FaceSource",
|
||||
- rbadmonly->isChecked() ? "AdminOnly" :
|
||||
- rbprefadm->isChecked() ? "PreferAdmin" :
|
||||
- rbprefusr->isChecked() ? "PreferUser" : "UserOnly" );
|
||||
}
|
||||
|
||||
|
||||
@@ -456,16 +419,6 @@
|
||||
cbinverted->setChecked( config->readEntry( "ShowUsers" ) != "Selected" );
|
||||
cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
|
||||
|
||||
- TQString ps = config->readEntry( "FaceSource" );
|
||||
- if (ps == TQString::fromLatin1("UserOnly"))
|
||||
- rbusronly->setChecked(true);
|
||||
- else if (ps == TQString::fromLatin1("PreferUser"))
|
||||
- rbprefusr->setChecked(true);
|
||||
- else if (ps == TQString::fromLatin1("PreferAdmin"))
|
||||
- rbprefadm->setChecked(true);
|
||||
- else
|
||||
- rbadmonly->setChecked(true);
|
||||
-
|
||||
slotUserSelected();
|
||||
|
||||
slotShowOpts();
|
||||
@@ -480,7 +433,6 @@
|
||||
cbcomplete->setChecked( false );
|
||||
cbinverted->setChecked( true );
|
||||
cbusrsrt->setChecked( true );
|
||||
- rbadmonly->setChecked( true );
|
||||
hiddenUsers.clear();
|
||||
selectedUsers.clear();
|
||||
slotShowOpts();
|
||||
diff -u -r kdebase-kdm/kcontrol/kdm/kdm-users.h kdebase-3.5.9/kcontrol/kdm/kdm-users.h
|
||||
--- kcontrol/kdm/kdm-users.h 2005-10-10 12:03:49.000000000 -0300
|
||||
+++ kcontrol/kdm/kdm-users.h 2008-03-06 19:04:12.000000000 -0300
|
||||
@@ -86,14 +86,11 @@
|
||||
QWidgetStack *wstack;
|
||||
KListView *optoutlv, *optinlv;
|
||||
|
||||
- QButtonGroup *faceGroup; // right
|
||||
- QRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;
|
||||
-
|
||||
KComboBox *usercombo; // right below
|
||||
QPushButton *userbutton;
|
||||
QPushButton *rstuserbutton;
|
||||
|
||||
- QString m_userPixDir;
|
||||
+ QString m_pixDir;
|
||||
QString m_defaultText;
|
||||
QStringList hiddenUsers, selectedUsers;
|
||||
QString defminuid, defmaxuid;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,11 @@
|
||||
--- admin/acinclude.m4.in.orig 2010-08-12 23:39:22.000000000 +0100
|
||||
+++ admin/acinclude.m4.in 2011-07-19 13:40:17.619311049 +0100
|
||||
@@ -527,7 +527,7 @@
|
||||
xdg_appsdir='\${datadir}/applications/kde'
|
||||
fi
|
||||
if test -z "$xdg_menudir"; then
|
||||
- xdg_menudir='\${sysconfdir}/xdg/menus'
|
||||
+ xdg_menudir='\${sysconfdir}/xdg/kde/menus'
|
||||
fi
|
||||
if test -z "$xdg_directorydir"; then
|
||||
xdg_directorydir='\${datadir}/desktop-directories'
|
||||
@ -0,0 +1,22 @@
|
||||
--- startkde.orig 2011-07-19 11:58:41.267311384 +0100
|
||||
+++ startkde 2011-07-19 12:02:56.119311786 +0100
|
||||
@@ -16,6 +16,11 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+if [ "$MDV_MENU_STYLE" = "mandriva" ]; then
|
||||
+ XDG_MENU_PREFIX=kde-
|
||||
+ export XDG_MENU_PREFIX=kde-
|
||||
+fi
|
||||
+
|
||||
# Set the background color.
|
||||
# The standard X background is nasty, causing moire effects and exploding
|
||||
# people's heads. We use colours from the standard KDE palette for those with
|
||||
@@ -163,6 +168,7 @@
|
||||
# Allow interested applications, such as the Plasma control wrapper,
|
||||
# to know that this is a Trinity desktop and not a KDE one.
|
||||
export DESKTOP_SESSION=kde3
|
||||
+export DESKTOP="kde"
|
||||
|
||||
# Please see kstartupconfig source for usage.
|
||||
mkdir -m 700 -p $kdehome
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp-- 2007-02-05 09:05:15.000000000 +0100
|
||||
+++ kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp 2007-02-05 09:05:22.000000000 +0100
|
||||
@@ -1008,7 +1008,7 @@
|
||||
TQString HALBackend::listUsingProcesses(const Medium* medium)
|
||||
{
|
||||
TQString proclist, fullmsg;
|
||||
- TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
|
||||
+ TQString cmdline = TQString("/usr/bin/env /sbin/fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
|
||||
FILE *fuser = popen(cmdline.latin1(), "r");
|
||||
|
||||
uint counter = 0;
|
||||
@ -0,0 +1,34 @@
|
||||
--- kdebase-3.5.3/kdesktop/desktop.cc.orig 2006-06-22 21:14:19.000000000 -0300
|
||||
+++ kdebase-3.5.3/kdesktop/desktop.cc 2006-07-12 15:10:12.000000000 -0300
|
||||
@@ -861,6 +861,11 @@
|
||||
KApplication::ShutdownTypeNone );
|
||||
}
|
||||
|
||||
+void KDesktop::logoutWithoutConfirmation()
|
||||
+{
|
||||
+ slotLogoutNoCnf();
|
||||
+}
|
||||
+
|
||||
void KDesktop::logout( KApplication::ShutdownConfirm confirm,
|
||||
KApplication::ShutdownType sdtype )
|
||||
{
|
||||
--- kdebase-3.5.3/kdesktop/desktop.h.orig 2006-04-27 15:06:09.000000000 -0300
|
||||
+++ kdebase-3.5.3/kdesktop/desktop.h 2006-07-12 15:11:14.000000000 -0300
|
||||
@@ -84,6 +84,7 @@
|
||||
virtual void logout();
|
||||
virtual void clearCommandHistory();
|
||||
virtual void runAutoStart();
|
||||
+ virtual void logoutWithoutConfirmation();
|
||||
|
||||
virtual void switchDesktops( int delta );
|
||||
|
||||
--- kdebase-3.5.3/kdesktop/KDesktopIface.h.orig 2006-04-27 15:06:09.000000000 -0300
|
||||
+++ kdebase-3.5.3/kdesktop/KDesktopIface.h 2006-07-12 15:10:12.000000000 -0300
|
||||
@@ -75,6 +75,7 @@
|
||||
* Bye bye
|
||||
*/
|
||||
virtual void logout() = 0;
|
||||
+ virtual void logoutWithoutConfirmation() = 0;
|
||||
/**
|
||||
* Returns whether KDesktop uses a virtual root.
|
||||
*/
|
||||
@ -0,0 +1,24 @@
|
||||
--- kdebase-3.5.4/kcontrol/krdb/krdb.cpp-- 2006-09-14 08:38:52.000000000 +0200
|
||||
+++ kdebase-3.5.4/kcontrol/krdb/krdb.cpp 2006-09-14 08:48:18.000000000 +0200
|
||||
@@ -75,13 +75,20 @@
|
||||
// -----------------------------------------------------------------------------
|
||||
static void applyGtkStyles(bool active, int version)
|
||||
{
|
||||
+ TQString userFile = TQDir::homeDirPath()+userGtkrc(version);
|
||||
+ KConfig kglobalsStyle("kdeglobals", true, false);
|
||||
+ kglobalsStyle.setGroup("General");
|
||||
+ TQString styleName = kglobalsStyle.readEntry("widgetStyle");
|
||||
+ if(!TQDir(userFile).exists() && styleName =="ia_ora")
|
||||
+ return;
|
||||
+
|
||||
TQString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
|
||||
TQCString gtkrc = getenv(gtkEnvVar(version));
|
||||
TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
|
||||
if (list.count() == 0)
|
||||
{
|
||||
list.append(TQString::fromLatin1(sysGtkrc(version)));
|
||||
- list.append(TQDir::homeDirPath()+userGtkrc(version));
|
||||
+ list.append(userFile);
|
||||
}
|
||||
list.remove(gtkkde);
|
||||
list.append(gtkkde);
|
||||
@ -0,0 +1,15 @@
|
||||
--- kdebase-3.5.7/kicker/applets/clock/clock.cpp.orig 2007-09-04 01:18:10.000000000 -0300
|
||||
+++ kdebase-3.5.7/kicker/applets/clock/clock.cpp 2007-09-04 01:19:41.000000000 -0300
|
||||
@@ -1464,11 +1464,7 @@
|
||||
preferences();
|
||||
break;
|
||||
case 103:
|
||||
- proc << locate("exe", "kdesu");
|
||||
- proc << "--nonewdcop";
|
||||
- proc << TQString("%1 kde-clock.desktop --lang %2")
|
||||
- .arg(locate("exe", "kcmshell"))
|
||||
- .arg(KGlobal::locale()->language());
|
||||
+ proc << locate("exe", "drakclock");
|
||||
proc.start(KProcess::DontCare);
|
||||
break;
|
||||
case 104:
|
||||
@ -0,0 +1,27 @@
|
||||
--- kdebase-3.5.7/kdesktop/init.cc.kdesktop_firstrun 2007-09-26 10:15:58.000000000 -0300
|
||||
+++ kdebase-3.5.7/kdesktop/init.cc 2007-09-26 09:32:43.000000000 -0300
|
||||
@@ -87,7 +87,9 @@ static bool testDir( const TQString &_nam
|
||||
else // exists already
|
||||
{
|
||||
closedir( dp );
|
||||
- return false;
|
||||
+ KConfig cfg("kdesktoprc");
|
||||
+ cfg.setGroup("General");
|
||||
+ return cfg.readBoolEntry("FirstRun", true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,7 +204,12 @@ void testLocalInstallation()
|
||||
copyDirectoryFile("directory.autostart", KGlobalSettings::autostartPath(), newRelease);
|
||||
|
||||
if (emptyDesktop)
|
||||
- copyDesktopLinks();
|
||||
+ {
|
||||
+ copyDesktopLinks();
|
||||
+ KConfig cfg("kdesktoprc");
|
||||
+ cfg.setGroup("General");
|
||||
+ cfg.writeEntry("FirstRun", false);
|
||||
+ }
|
||||
|
||||
// Take care of creating or updating trash.desktop
|
||||
const TQString trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdebase-3.5.12/khelpcenter/searchhandlers/khc_htsearch.pl.orig 2011-02-04 15:29:41.658473919 +0000
|
||||
+++ kdebase-3.5.12/khelpcenter/searchhandlers/khc_htsearch.pl 2011-02-04 15:29:57.738474105 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
use open IO => ':utf8';
|
||||
use open ':std';
|
||||
|
||||
-my $htsearchpath="/usr/lib/cgi-bin/htsearch";
|
||||
+my $htsearchpath="/usr/bin/htsearch";
|
||||
|
||||
my $config;
|
||||
my $format;
|
||||
@ -0,0 +1,180 @@
|
||||
diff -purN kdebase-3.5.7.orig/doc/kioslave/index.docbook kdebase-3.5.7/doc/kioslave/index.docbook
|
||||
--- kdebase-3.5.7.orig/doc/kioslave/index.docbook 2007-09-13 18:41:54.000000000 +0200
|
||||
+++ kdebase-3.5.7/doc/kioslave/index.docbook 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
<!ENTITY kio-info SYSTEM "info.docbook">
|
||||
<!ENTITY kio-lan SYSTEM "lan.docbook">
|
||||
<!ENTITY kio-ldap SYSTEM "ldap.docbook">
|
||||
+<!ENTITY kio-lzma SYSTEM "lzma.docbook">
|
||||
<!ENTITY kio-mailto SYSTEM "mailto.docbook">
|
||||
<!ENTITY kio-mac SYSTEM "mac.docbook">
|
||||
<!ENTITY kio-man SYSTEM "man.docbook">
|
||||
@@ -68,6 +69,7 @@
|
||||
&kio-info;
|
||||
&kio-lan;
|
||||
&kio-ldap;
|
||||
+&kio-lzma;
|
||||
&kio-mailto;
|
||||
&kio-mac;
|
||||
&kio-man;
|
||||
diff -purN kdebase-3.5.7.orig/doc/kioslave/lzma.docbook kdebase-3.5.7/doc/kioslave/lzma.docbook
|
||||
--- kdebase-3.5.7.orig/doc/kioslave/lzma.docbook 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ kdebase-3.5.7/doc/kioslave/lzma.docbook 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -0,0 +1,30 @@
|
||||
+<article lang="&language;" id="lzma">
|
||||
+<title>lzma</title>
|
||||
+<articleinfo>
|
||||
+<authorgroup>
|
||||
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
|
||||
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
|
||||
+</authorgroup>
|
||||
+</articleinfo>
|
||||
+
|
||||
+<para><command>lzma</command> is a compression program</para>
|
||||
+
|
||||
+<para>The lzma kioslave is not directly usable, and is intended for use
|
||||
+as a filter. For example, the tar kioslave can filter a file through
|
||||
+the lzma kioslave, in order to display the contents of a <literal
|
||||
+role="extension">tar.lzma</literal> file directly in a &konqueror;
|
||||
+window.</para>
|
||||
+
|
||||
+<para>If you click on a file compressed with a <literal
|
||||
+role="extension">lzma</literal> extension in &konqueror;, this kioslave is
|
||||
+used to uncompress it and display it as a normal (uncompressed)
|
||||
+file.</para>
|
||||
+
|
||||
+<para>If you are a developer, and would like to use the lzma filter, you
|
||||
+can find documentation on using kioslaves at <ulink
|
||||
+url="http://developer.kde.org">http://developer.kde.org</ulink></para>
|
||||
+
|
||||
+<para> See the manual: <ulink url="man:/lzma">lzma</ulink>.
|
||||
+</para>
|
||||
+
|
||||
+</article>
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/filter/lzma.protocol kdebase-3.5.7/kioslave/filter/lzma.protocol
|
||||
--- kdebase-3.5.7.orig/kioslave/filter/lzma.protocol 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ kdebase-3.5.7/kioslave/filter/lzma.protocol 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -0,0 +1,10 @@
|
||||
+[Protocol]
|
||||
+exec=kio_filter
|
||||
+protocol=lzma
|
||||
+mimetype=application/lzma
|
||||
+input=stream
|
||||
+output=stream
|
||||
+reading=true
|
||||
+source=false
|
||||
+DocPath=kioslave/lzma.html
|
||||
+Icon=ark
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/filter/Makefile.am kdebase-3.5.7/kioslave/filter/Makefile.am
|
||||
--- kdebase-3.5.7.orig/kioslave/filter/Makefile.am 2007-09-13 18:41:35.000000000 +0200
|
||||
+++ kdebase-3.5.7/kioslave/filter/Makefile.am 2007-09-13 18:47:03.000000000 +0200
|
||||
@@ -17,5 +17,5 @@ if include_BZIP2
|
||||
BZIP2FILES=bzip.protocol bzip2.protocol
|
||||
endif
|
||||
|
||||
-protocol_DATA = gzip.protocol $(BZIP2FILES)
|
||||
+protocol_DATA = gzip.protocol $(BZIP2FILES) lzma.protocol
|
||||
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/info/kde-info2html kdebase-3.5.7/kioslave/info/kde-info2html
|
||||
--- kdebase-3.5.7.orig/kioslave/info/kde-info2html 2007-09-13 18:41:35.000000000 +0200
|
||||
+++ kdebase-3.5.7/kioslave/info/kde-info2html 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -39,6 +39,8 @@
|
||||
# March 9 2003 Add support for browsing by file. by Luis Pedro Coelho
|
||||
# June 11 2003 Update the layout of the sides to the new infopageslayout.
|
||||
# by Sven Leiber <s.leiber@web.de>
|
||||
+# August 30 2007 Add lzma support.
|
||||
+# by Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
#
|
||||
#-------------------------------------------------------
|
||||
|
||||
@@ -143,6 +145,9 @@ sub FileNotFound {
|
||||
elsif ($DirFileName =~ m/.info.gz$/ ) {
|
||||
open DIR, "-|", "gzip", "-dc", $DirFileName;
|
||||
}
|
||||
+ elsif ($DirFileName =~ m/.info.lzma$/ ) {
|
||||
+ open DIR, "-|", "lzma", "-dc", $DirFileName;
|
||||
+ }
|
||||
else {
|
||||
open DIR, $DirFileName;
|
||||
}
|
||||
@@ -252,6 +257,9 @@ sub infocat {
|
||||
elsif ($infofile =~ m/.info.gz$/ ) {
|
||||
open INFOFILE, "-|", "gzip", "-dc", "$dir/$infofile";
|
||||
}
|
||||
+ elsif ($infofile =~ m/.info.lzma$/ ) {
|
||||
+ open INFOFILE, "-|", "lzma", "-dc", "$dir/$infofile";
|
||||
+ }
|
||||
elsif ($infofile =~ m/.info$/) {
|
||||
open INFOFILE, "-|", "$dir/$infofile";
|
||||
}
|
||||
@@ -427,6 +435,9 @@ sub ReadIndirectTable {
|
||||
open FH1, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} elsif ($FileName =~ /\.bz2$/) {
|
||||
open FH1, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+ } elsif ($FileName =~ /\.lzma$/) {
|
||||
+ open FH1, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+
|
||||
} else {
|
||||
open(FH1, $FileName) || &DieFileNotFound($FileName);
|
||||
}
|
||||
@@ -473,6 +484,8 @@ sub ReadTagTable {
|
||||
open FH, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} elsif ($FileName =~ /\.bz2$/) {
|
||||
open FH, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+ } elsif ($FileName =~ /\.lzma$/) {
|
||||
+ open FH, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} else {
|
||||
open FH, $FileName || &DieFileNotFound($FileName);
|
||||
}
|
||||
@@ -756,6 +769,8 @@ sub InfoNode2HTML {
|
||||
open FH2, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} elsif ($FileName =~ /\.bz2$/) {
|
||||
open FH2, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+ } elsif ($FileName =~ /\.lzma$/) {
|
||||
+ open FH2, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} else {
|
||||
open FH2, $FileName || &DieFileNotFound($FileName);
|
||||
}
|
||||
@@ -985,17 +1000,21 @@ sub FindFile {
|
||||
foreach my $Name ($File, $Alt) {
|
||||
my $gzName = $Name . '.gz';
|
||||
my $bz2Name = $Name . '.bz2';
|
||||
+ my $lzmaName = $Name . '.lzma';
|
||||
|
||||
foreach (@info2html::config::INFODIR) {
|
||||
return "$_/$Name" if -e "$_/$Name";
|
||||
return "$_/$gzName" if -e "$_/$gzName";
|
||||
return "$_/$bz2Name" if -e "$_/$bz2Name";
|
||||
+ return "$_/$lzmaName" if -e "$_/$lzmaName";
|
||||
+
|
||||
}
|
||||
next unless $ENV{INFOPATH};
|
||||
foreach my $i (split(/:/, $ENV{INFOPATH})) {
|
||||
return "$i/$Name" if -e "$i/$Name";
|
||||
return "$i/$gzName" if -e "$i/$gzName";
|
||||
return "$i/$bz2Name" if -e "$i/$bz2Name";
|
||||
+ return "$i/$lzmaName" if -e "$i/$lzmaName";
|
||||
}
|
||||
}
|
||||
return "";
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/man/kio_man.cpp kdebase-3.5.7/kioslave/man/kio_man.cpp
|
||||
--- kdebase-3.5.7.orig/kioslave/man/kio_man.cpp 2007-09-13 18:41:35.000000000 +0200
|
||||
+++ kdebase-3.5.7/kioslave/man/kio_man.cpp 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -68,6 +68,8 @@ void stripExtension( QString *name )
|
||||
pos -= 4;
|
||||
else if ( name->find(".bz", -3) != -1 )
|
||||
pos -= 3;
|
||||
+ else if ( name->find(".lzma", -5) != -1 )
|
||||
+ pos -= 5;
|
||||
|
||||
if ( pos > 0 )
|
||||
pos = name->findRev('.', pos-1);
|
||||
@@ -1311,6 +1313,8 @@ void MANProtocol::showIndex(const QStrin
|
||||
end -= 2;
|
||||
else if ( len >= 4 && strcmp( end-3, ".bz2" ) == 0 )
|
||||
end -= 4;
|
||||
+ else if ( len >= 5 && strcmp( end-4, ".lzma" ) == 0 )
|
||||
+ end -= 5;
|
||||
|
||||
while ( end >= begin && *end != '.' )
|
||||
end--;
|
||||
@ -0,0 +1,26 @@
|
||||
--- kdebase-3.5.7/kdm/kfrontend/kdm_greet.c.fixlang 2007-10-02 16:56:25.000000000 -0300
|
||||
+++ kdebase-3.5.7/kdm/kfrontend/kdm_greet.c 2007-10-02 15:07:58.000000000 -0300
|
||||
@@ -779,7 +779,10 @@ main( int argc ATTR_UNUSED, char **argv
|
||||
LogPanic( "Cannot save $HOME\n" );
|
||||
atexit( cleanup );
|
||||
|
||||
- setenv( "LC_ALL", _language, 1 );
|
||||
+ if ( getenv( "LANG" ) == NULL )
|
||||
+ setenv( "LC_ALL", _language, 1 );
|
||||
+ else
|
||||
+ setenv( "LC_ALL", getenv( "LANG" ), 1 );
|
||||
|
||||
kg_main( argv[0] );
|
||||
|
||||
--- kdebase-3.5.7/kdm/backend/session.c.fixlang 2007-10-02 16:56:58.000000000 -0300
|
||||
+++ kdebase-3.5.7/kdm/backend/session.c 2007-10-02 16:18:21.000000000 -0300
|
||||
@@ -802,6 +802,9 @@ systemEnv( const char *user )
|
||||
env = baseEnv( user );
|
||||
if (td->authFile)
|
||||
env = setEnv( env, "XAUTHORITY", td->authFile );
|
||||
+ char *lang = getenv("LANG");
|
||||
+ if (lang != NULL)
|
||||
+ env = setEnv( env, "LANG", lang );
|
||||
env = setEnv( env, "PATH", td->systemPath );
|
||||
env = setEnv( env, "SHELL", td->systemShell );
|
||||
return env;
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<fontconfig>
|
||||
<!-- Font directory list -->
|
||||
<dir>/opt/kde3/share/apps/konsole/fonts</dir>
|
||||
</fontconfig>
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdebase-3.5.4/kscreensaver.pamd-- 2006-08-02 09:20:53.000000000 +0200
|
||||
+++ kdebase-3.5.4/kscreensaver.pamd 2006-08-02 09:21:36.000000000 +0200
|
||||
@@ -1,4 +1,5 @@
|
||||
#%PAM-1.0
|
||||
-auth sufficient /lib/security/pam_linux_afs.so ignore_root
|
||||
-#auth sufficient /lib/security/pam_linux_afs.so no_unlog ignore_root
|
||||
-auth required /lib/security/pam_pwdb.so shadow nullok
|
||||
+#auth sufficient pam_linux_afs.so ignore_root
|
||||
+#auth sufficient pam_linux_afs.so no_unlog ignore_root
|
||||
+#auth required pam_pwdb.so shadow nullok
|
||||
+auth include system-auth
|
||||
@ -0,0 +1,14 @@
|
||||
--- kcontrol/componentchooser/componentchooser.cpp.nopatch 2011-07-19 13:15:03.679312055 +0100
|
||||
+++ kcontrol/componentchooser/componentchooser.cpp 2011-07-19 13:15:55.218311443 +0100
|
||||
@@ -367,10 +367,7 @@
|
||||
KURL::List urlList;
|
||||
KOpenWithDlg dlg(urlList, i18n("Select preferred Web browser application:"), TQString::null, this);
|
||||
if (dlg.exec() != TQDialog::Accepted) return;
|
||||
- m_browserService = dlg.service();
|
||||
- if (m_browserService)
|
||||
- m_browserExec = m_browserService->desktopEntryName();
|
||||
- else
|
||||
+
|
||||
m_browserExec = dlg.text();
|
||||
|
||||
lineExec->setText(m_browserExec);
|
||||
@ -0,0 +1,11 @@
|
||||
--- ./kicker/kicker/ui/k_mnu.cpp~ 2007-05-14 09:55:40.000000000 +0200
|
||||
+++ ./kicker/kicker/ui/k_mnu.cpp 2007-09-28 07:41:27.000000000 +0200
|
||||
@@ -361,7 +361,7 @@
|
||||
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
|
||||
{
|
||||
if (kapp->authorize("lock_screen"))
|
||||
- sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 );
|
||||
+ sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Lock Current && Start New Session"), 100 );
|
||||
sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 );
|
||||
if (!p) {
|
||||
sessionsMenu->setItemEnabled( 100, false );
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdebase-3.5.10/kcontrol/kcontrol/KControl.desktop 2008-08-19 14:16:46.000000000 -0400
|
||||
+++ kdebase-3.5.10/kcontrol/kcontrol/KControl.desktop.new 2008-08-26 12:30:06.000000000 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
DocPath=kcontrol/index.html
|
||||
X-KDE-StartupNotify=true
|
||||
|
||||
-Name=Control Center
|
||||
+Name=KDE3 Control Center
|
||||
Name[af]=Beheer Sentrum
|
||||
Name[ar]=مركز التحكم
|
||||
Name[az]=İdarə Mərkəzi
|
||||
@ -0,0 +1,27 @@
|
||||
--- kdebase-3.5.9/libkonq/konqbookmarkmanager.h.orig 2008-03-07 14:56:36.000000000 -0300
|
||||
+++ kdebase-3.5.9/libkonq/konqbookmarkmanager.h 2008-03-07 16:36:04.000000000 -0300
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
#include <kbookmarkmanager.h>
|
||||
#include <kstandarddirs.h>
|
||||
+#include <kurl.h>
|
||||
+#include <kio/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 )
|
||||
+ KIO::file_copy(
|
||||
+ KURL::fromPathOrURL( globalBookmarkFile ),
|
||||
+ KURL::fromPathOrURL( bookmarksFile ), -1, false, false
|
||||
+ );
|
||||
+
|
||||
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
|
||||
}
|
||||
return s_bookmarkManager;
|
||||
@ -0,0 +1,30 @@
|
||||
--- kscreensaver/KRandom.desktop~ 2008-02-13 10:40:44.000000000 +0100
|
||||
+++ kscreensaver/KRandom.desktop 2008-02-16 17:07:11.000000000 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
Type=Application
|
||||
Actions=Setup;InWindow;Root;
|
||||
OnlyShowIn=KDE;
|
||||
+NoDisplay=true
|
||||
Name=Random
|
||||
Name[af]=Lukrake
|
||||
Name[ar]=عشوائي
|
||||
@@ -311,4 +312,3 @@
|
||||
Name[wa]=Håyner e purnea raecene (li fond do scribanne)
|
||||
Name[zh_CN]=在 Root 窗口中显示
|
||||
Name[zh_TW]=在 Root 視窗中顯示
|
||||
-NoDisplay=true
|
||||
--- kscreensaver/KBlankscreen.desktop~ 2008-02-13 10:40:44.000000000 +0100
|
||||
+++ kscreensaver/KBlankscreen.desktop 2008-02-16 17:08:14.000000000 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
Type=Application
|
||||
Actions=Setup;InWindow;Root;
|
||||
OnlyShowIn=KDE;
|
||||
+NoDisplay=true
|
||||
Name=Blank Screen
|
||||
Name[af]=Leë Skerm
|
||||
Name[ar]=شاشة فارغة
|
||||
@@ -313,4 +314,3 @@
|
||||
Name[wa]=Håyner e purnea raecene (li fond do scribanne)
|
||||
Name[zh_CN]=在 Root 窗口中显示
|
||||
Name[zh_TW]=在 Root 視窗中顯示
|
||||
-NoDisplay=true
|
||||
@ -0,0 +1,77 @@
|
||||
#!/bin/sh
|
||||
# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
|
||||
# Relies on the 'eject' program, 'cdcontrol' on *BSD
|
||||
#
|
||||
# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
|
||||
#
|
||||
quiet=0
|
||||
if test "$1" = "-q"; then
|
||||
quiet=1
|
||||
shift
|
||||
fi
|
||||
|
||||
if test "$1" = "--help"; then
|
||||
echo "Usage: $0 <name> where name is a device or a mountpoint."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test -z "$1"; then
|
||||
for dev in /dev/cdrom /dev/dvd /dev/dvdram /dev/cdrecorder; do
|
||||
if test -e $dev; then
|
||||
lp=`readlink $dev`
|
||||
if test -n "$lp"; then
|
||||
device=/dev/$lp
|
||||
else
|
||||
device=$dev
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
else
|
||||
device=$1
|
||||
fi
|
||||
|
||||
udi=`dcop kded mediamanager properties $device 2>/dev/null | head -n 1 `
|
||||
if test -n "$udi"; then
|
||||
dcop kded mediamanager unmount "$udi" >/dev/null 2>&1
|
||||
|
||||
block_udi=`hal-get-property --udi $udi --key block.storage_device`
|
||||
|
||||
if test -n "$block_udi"; then
|
||||
need_eject=`hal-get-property --udi $block_udi --key storage.requires_eject`
|
||||
if test "$need_eject" = "false"; then
|
||||
exit 0;
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Checking for stuff in the PATH is ugly with sh.
|
||||
# I guess this is the reason for making this a kde app...
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
OpenBSD)
|
||||
cdio -f $1 eject >/dev/null 2>&1
|
||||
;;
|
||||
*BSD)
|
||||
dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
|
||||
cdcontrol -f $dev eject >/dev/null 2>&1
|
||||
;;
|
||||
*)
|
||||
# Warning, it has to be either eject 2.0.x or >=2.1.5
|
||||
# Otherwise it doesn't work as expected (it requires a
|
||||
# fstab entry for no reason).
|
||||
eject_result=$(dbus-send --system --print-reply --dest=org.freedesktop.Hal $block_udi org.freedesktop.Hal.Device.Storage.Eject array:string:"" | grep int | cut -d\ -f5)
|
||||
# fallback if not true
|
||||
if [ "$eject_result" != "0" ]; then
|
||||
eject $1 >/dev/null 2>&1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if test $? -eq 0; then
|
||||
dcop kdesktop default refreshIcons
|
||||
exit 0
|
||||
elif test $quiet -eq 0; then
|
||||
kdialog --title "KDE Eject" --error "Eject $1 failed!"
|
||||
fi
|
||||
|
||||
exit 1
|
||||
@ -0,0 +1,35 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
# Copyright: MandrakeSoft, licensed under the GPL v2.
|
||||
# modified by Laurent Montel <lmontel@mandrakesoft.com>
|
||||
|
||||
use strict;
|
||||
use MDK::Common;
|
||||
|
||||
foreach my $file (@ARGV) {
|
||||
my $no_theme;
|
||||
# grep return 0 if a match is found
|
||||
$no_theme = 1 if `grep -q -s '^UseTheme=' $file` ;
|
||||
substInFile {
|
||||
if (/SystemPath=(.*)$/) {
|
||||
my $result = $1;
|
||||
s!$!:/usr/X11R6/bin/! if $result !~ m!/usr/X11R6/bin/!;
|
||||
}
|
||||
if (/UserPath=(.*)$/) {
|
||||
my $result = $1;
|
||||
s!$!:/usr/X11R6/bin/! if $result !~ m!/usr/X11R6/bin/!;
|
||||
}
|
||||
s!^(Setup)=.*!$1=/etc/X11/xdm/Xsetup_0!;
|
||||
s!^(Startup)=.*!$1=/etc/X11/xdm/GiveConsole!;
|
||||
s!^(Reset)=.*!$1=/etc/X11/xdm/TakeConsole!;
|
||||
s!^(Xserver)=.*!$1=/etc/X11/xdm/Xservers\nServerVTs=-7\n!;
|
||||
if ($no_theme) {
|
||||
s!^(AuthComplain)=.*!$1=AuthComplain=false\nUseTheme=true\nTheme=/usr/share/mdk/dm!;
|
||||
} else {
|
||||
s!^(AuthComplain)=.*!AuthComplain=false!;
|
||||
}
|
||||
|
||||
} $file;
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
diff -p -up kdebase-3.5.9/khotkeys/khotkeys.desktop.ONLY_KDE kdebase-3.5.9/khotkeys/khotkeys.desktop
|
||||
--- kdebase-3.5.9/khotkeys/khotkeys.desktop.ONLY_KDE 2008-07-04 17:17:19.000000000 -0300
|
||||
+++ kdebase-3.5.9/khotkeys/khotkeys.desktop 2008-07-04 17:21:39.000000000 -0300
|
||||
@@ -1,2 +1,3 @@
|
||||
[Desktop Entry]
|
||||
Hidden=true
|
||||
+OnlyShowIn=KDE
|
||||
Binary file not shown.
@ -0,0 +1,9 @@
|
||||
[Desktop Entry]
|
||||
Name=Mandriva Online Applet
|
||||
Comment=Applet for Mandriva Online
|
||||
Exec=/usr/bin/mdkapplet
|
||||
Icon=mdkonline
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
Categories=X-MandrivaLinux-System-Configuration-Networking;Settings;Network;
|
||||
X-KDE-autostart-after=kdesktop
|
||||
Binary file not shown.
@ -0,0 +1,417 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.7 )
|
||||
#
|
||||
|
||||
# We are running kde3 environment
|
||||
# Let's prepend PATH to allow execution of kde3 apps first
|
||||
PATH=/opt/kde3/bin:$PATH
|
||||
export PATH
|
||||
|
||||
# When the X server dies we get a HUP signal from xinit. We must ignore it
|
||||
# because we still need to do some cleanup.
|
||||
trap 'echo GOT SIGHUP' HUP
|
||||
|
||||
# Check if a KDE session already is running
|
||||
if kcheckrunning >/dev/null 2>&1; then
|
||||
echo "KDE seems to be already running on this display."
|
||||
xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$MDV_MENU_STYLE" = "mandriva" ]; then
|
||||
XDG_MENU_PREFIX=kde-
|
||||
export XDG_MENU_PREFIX=kde-
|
||||
fi
|
||||
|
||||
# For 2008.1 and beyond, Qt4 will be the default environment to build applications and
|
||||
# path will be pointing to qt4 bin dir as usual, so we're explicitly set QTDIR
|
||||
# for qt3 in kde3 environment
|
||||
# Remember that qt3 is in /usr/lib/qt3 even on 64 installs
|
||||
QTDIR=/usr/lib/qt3
|
||||
export QTDIR
|
||||
|
||||
# Set the background to plain grey.
|
||||
# The standard X background is nasty, causing moire effects and exploding
|
||||
# people's heads. We use colours from the standard KDE palette for those with
|
||||
# palettised displays.
|
||||
#if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
|
||||
# xsetroot -solid "#000000"
|
||||
#fi
|
||||
|
||||
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
|
||||
unset DYLD_FORCE_FLAT_NAMESPACE
|
||||
|
||||
# in case we have been started with full pathname spec without being in PATH
|
||||
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
||||
if [ -n "$bindir" ]; then
|
||||
case $PATH in
|
||||
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
||||
*) PATH=$bindir:$PATH; export PATH;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Boot sequence:
|
||||
#
|
||||
# kdeinit is used to fork off processes which improves memory usage
|
||||
# and startup time.
|
||||
#
|
||||
# * kdeinit starts the dcopserver and klauncher first.
|
||||
# * Then kded is started. kded is responsible for keeping the sycoca
|
||||
# database up to date. When an up to date database is present it goes
|
||||
# into the background and the startup continues.
|
||||
# * Then kdeinit starts kcminit. kcminit performs initialisation of
|
||||
# certain devices according to the user's settings
|
||||
#
|
||||
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
||||
|
||||
# The user's personal KDE directory is usually ~/.kde, but this setting
|
||||
# may be overridden by setting KDEHOME.
|
||||
|
||||
kdehome=$HOME/.kde
|
||||
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
|
||||
|
||||
# see kstartupconfig source for usage
|
||||
mkdir -m 700 -p $kdehome
|
||||
mkdir -m 700 -p $kdehome/share
|
||||
mkdir -m 700 -p $kdehome/share/config
|
||||
cat >$kdehome/share/config/startupconfigkeys <<EOF
|
||||
kcminputrc Mouse cursorTheme ''
|
||||
kcminputrc Mouse cursorSize ''
|
||||
kpersonalizerrc General FirstLogin true
|
||||
ksplashrc KSplash Theme Default
|
||||
kcmrandrrc Display ApplyOnStartup false
|
||||
kcmrandrrc [Screen0]
|
||||
kcmrandrrc [Screen1]
|
||||
kcmrandrrc [Screen2]
|
||||
kcmrandrrc [Screen3]
|
||||
kcmfonts General forceFontDPI 0
|
||||
EOF
|
||||
kstartupconfig
|
||||
if test $? -ne 0; then
|
||||
xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
|
||||
fi
|
||||
. $kdehome/share/config/startupconfig
|
||||
|
||||
# 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"
|
||||
if test $? -eq 10; then
|
||||
export XCURSOR_THEME=default
|
||||
elif test -n "$kcminputrc_mouse_cursortheme"; then
|
||||
export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
|
||||
fi
|
||||
if test -n "$kcminputrc_mouse_cursorsize"; then
|
||||
export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$kcmrandrrc_display_applyonstartup" = "true"; then
|
||||
# 4 screens is hopefully enough
|
||||
for scrn in 0 1 2 3; do
|
||||
args=
|
||||
width="\$kcmrandrrc_screen${scrn}_width" ; eval "width=$width"
|
||||
height="\$kcmrandrrc_screen${scrn}_height" ; eval "height=$height"
|
||||
if test -n "${width}" -a -n "${height}"; then
|
||||
args="$args -s ${width}x${height}"
|
||||
fi
|
||||
refresh="\$kcmrandrrc_screen${scrn}_refresh" ; eval "refresh=$refresh"
|
||||
if test -n "${refresh}"; then
|
||||
args="$args -r ${refresh}"
|
||||
fi
|
||||
rotation="\$kcmrandrrc_screen${scrn}_rotation" ; eval "rotation=$rotation"
|
||||
if test -n "${rotation}"; then
|
||||
case "${rotation}" in
|
||||
0)
|
||||
args="$args -o 0"
|
||||
;;
|
||||
90)
|
||||
args="$args -o 1"
|
||||
;;
|
||||
180)
|
||||
args="$args -o 2"
|
||||
;;
|
||||
270)
|
||||
args="$args -o 3"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
reflectx="\$kcmrandrrc_screen${scrn}_reflectx" ; eval "reflectx=$reflectx"
|
||||
if test "${refrectx}" = "true"; then
|
||||
args="$args -x"
|
||||
fi
|
||||
reflecty="\$kcmrandrrc_screen${scrn}_reflecty" ; eval "reflecty=$reflecty"
|
||||
if test "${refrecty}" = "true"; then
|
||||
args="$args -y"
|
||||
fi
|
||||
if test -n "$args"; then
|
||||
xrandr $args
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dl=$DESKTOP_LOCKED
|
||||
unset DESKTOP_LOCKED # Don't want it in the environment
|
||||
|
||||
# Launch splash that doesn't need any KDE libraries here, before
|
||||
# KDE libraries are loaded into memory (which may take some time
|
||||
# with cold caches). Makes the splash appear sooner.
|
||||
# If kpersonalizer needs to be run splash will be started only later.
|
||||
if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then
|
||||
case "$ksplashrc_ksplash_theme" in
|
||||
Simple)
|
||||
ksplashsimple
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$kcmfonts_general_forcefontdpi" -eq 120; then
|
||||
xrdb -quiet -merge -nocpp <<EOF
|
||||
Xft.dpi: 120
|
||||
EOF
|
||||
elif test "$kcmfonts_general_forcefontdpi" -eq 96; then
|
||||
xrdb -quiet -merge -nocpp <<EOF
|
||||
Xft.dpi: 96
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
|
||||
# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
|
||||
#
|
||||
# This is where you can define environment variables that will be available to
|
||||
# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
|
||||
# or eval `gpg-agent --daemon`.
|
||||
# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
|
||||
#
|
||||
# (see end of this file).
|
||||
# For anything else (that doesn't set env vars, or that needs a window manager),
|
||||
# better use the Autostart folder.
|
||||
|
||||
exepath=`kde-config --path exe | tr : '\n'`
|
||||
|
||||
for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
|
||||
for file in "$prefix"*.sh; do
|
||||
test -r "$file" && . "$file"
|
||||
done
|
||||
done
|
||||
|
||||
# Activate the kde font directories.
|
||||
#
|
||||
# There are 4 directories that may be used for supplying fonts for KDE.
|
||||
#
|
||||
# There are two system directories. These belong to the administrator.
|
||||
# There are two user directories, where the user may add her own fonts.
|
||||
#
|
||||
# The 'override' versions are for fonts that should come first in the list,
|
||||
# i.e. if you have a font in your 'override' directory, it will be used in
|
||||
# preference to any other.
|
||||
#
|
||||
# The preference order looks like this:
|
||||
# user override, system override, X, user, system
|
||||
#
|
||||
# Where X is the original font database that was set up before this script
|
||||
# runs.
|
||||
|
||||
usr_odir=$HOME/.fonts/kde-override
|
||||
usr_fdir=$HOME/.fonts
|
||||
|
||||
# Add any user-installed font directories to the X font path
|
||||
kde_fontpaths=$usr_fdir/fontpaths
|
||||
do_usr_fdir=1
|
||||
do_usr_odir=1
|
||||
if test -r "$kde_fontpaths" ; then
|
||||
savifs=$IFS
|
||||
IFS="
|
||||
"
|
||||
for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
|
||||
rfpath=`echo $fpath | sed "s:^~:$HOME:g"`
|
||||
if test -s "$rfpath"/fonts.dir; then
|
||||
xset fp+ "$rfpath"
|
||||
if test "$rfpath" = "$usr_fdir"; then
|
||||
do_usr_fdir=0
|
||||
fi
|
||||
if test "$rfpath" = "$usr_odir"; then
|
||||
do_usr_odir=0
|
||||
fi
|
||||
fi
|
||||
done
|
||||
IFS=$savifs
|
||||
fi
|
||||
|
||||
if test -n "$KDEDIRS"; then
|
||||
kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
|
||||
sys_odir=$kdedirs_first/share/fonts/override
|
||||
sys_fdir=$kdedirs_first/share/fonts
|
||||
else
|
||||
sys_odir=$KDEDIR/share/fonts/override
|
||||
sys_fdir=$KDEDIR/share/fonts
|
||||
fi
|
||||
|
||||
# We run mkfontdir on the user's font dirs (if we have permission) to pick
|
||||
# up any new fonts they may have installed. If mkfontdir fails, we still
|
||||
# add the user's dirs to the font path, as they might simply have been made
|
||||
# read-only by the administrator, for whatever reason.
|
||||
|
||||
# Only do usr_fdir and usr_odir if they are *not* listed in fontpaths
|
||||
test -d "$sys_odir" && xset +fp "$sys_odir"
|
||||
test $do_usr_odir -eq 1 && test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
|
||||
test $do_usr_fdir -eq 1 && test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
|
||||
test -d "$sys_fdir" && xset fp+ "$sys_fdir"
|
||||
|
||||
# Ask X11 to rebuild its font list.
|
||||
xset fp rehash
|
||||
|
||||
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
|
||||
# from some users that they're confused and don't know what to do. This is
|
||||
# especially necessary on slow machines, where starting KDE takes one or two
|
||||
# minutes until anything appears on the screen.
|
||||
#
|
||||
# If the user has overwritten fonts, the cursor font may be different now
|
||||
# so don't move this up.
|
||||
#
|
||||
xsetroot -cursor_name left_ptr
|
||||
|
||||
if [ "$(whoami)" = root ]; then
|
||||
echo
|
||||
# Root interface will point to different profile, no more hardcoded
|
||||
fi
|
||||
|
||||
if [ -e $kdehome/Autostart/alignment-icons.desktop ]; then
|
||||
rm -f $kdehome/Autostart/alignment-icons.desktop
|
||||
fi
|
||||
|
||||
export DESKTOP="kde"
|
||||
|
||||
# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
|
||||
if test -n "$GS_LIB" ; then
|
||||
GS_LIB=$usr_fdir:$GS_LIB
|
||||
export GS_LIB
|
||||
else
|
||||
GS_LIB=$usr_fdir
|
||||
export GS_LIB
|
||||
fi
|
||||
|
||||
# Link "tmp" "socket" and "cache" resources to directory in /tmp
|
||||
# Creates:
|
||||
# - a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
|
||||
# - a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it.
|
||||
# - a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it.
|
||||
# Note: temporary locations can be overriden through the KDETMP and KDEVARTMP
|
||||
# environment variables
|
||||
for resource in tmp cache socket; do
|
||||
if ! lnusertemp $resource >/dev/null; then
|
||||
echo 'startkde: Call to lnusertemp failed (temporary directories full?). Check your installation.' 1>&2
|
||||
xmessage -geometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation."
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# In case of dcop sockets left by a previous session, cleanup
|
||||
dcopserver_shutdown
|
||||
|
||||
echo 'startkde: Starting up...' 1>&2
|
||||
|
||||
if test -z "$dl"; then
|
||||
# the splashscreen and progress indicator
|
||||
case "$ksplashrc_ksplash_theme" in
|
||||
None)
|
||||
;; # nothing
|
||||
Simple)
|
||||
if test "$kpersonalizerrc_general_firstlogin" = "true"; then
|
||||
ksplashsimple
|
||||
fi # otherwise started earlier
|
||||
;;
|
||||
*)
|
||||
ksplash --nodcop
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Mark that full KDE session is running (e.g. Konqueror preloading works only
|
||||
# with full KDE running). The KDE_FULL_SESSION property can be detected by
|
||||
# any X client connected to the same X session, even if not launched
|
||||
# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
|
||||
# however guarantees that the application is launched in the same environment
|
||||
# like the KDE session and that e.g. KDE utilities/libraries are available.
|
||||
# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
|
||||
# The matching tests are:
|
||||
# For $KDE_FULL_SESSION:
|
||||
# if test -n "$KDE_FULL_SESSION"; then ... whatever
|
||||
# For KDE_FULL_SESSION property:
|
||||
# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
|
||||
# if test $? -eq 0; then ... whatever
|
||||
#
|
||||
# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
|
||||
# of the user running the KDE session. It should be rarely needed (e.g.
|
||||
# after sudo to prevent desktop-wide functionality in the new user's kded).
|
||||
#
|
||||
KDE_FULL_SESSION=true
|
||||
export KDE_FULL_SESSION
|
||||
xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
KDE_SESSION_UID=$UID
|
||||
export KDE_SESSION_UID
|
||||
|
||||
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
|
||||
# kdeinit unsets this variable before loading applications.
|
||||
LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup
|
||||
if test $? -ne 0; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not start kdeinit. Check your installation.' 1>&2
|
||||
xmessage -geometry 500x100 "Could not start kdeinit. Check your installation."
|
||||
fi
|
||||
|
||||
# If the session should be locked from the start (locked autologin),
|
||||
# lock now and do the rest of the KDE startup underneath the locker.
|
||||
if test -n "$dl"; then
|
||||
kwrapper kdesktop_lock --forcelock &
|
||||
# Give it some time for starting up. This is somewhat unclean; some
|
||||
# notification would be better.
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
# finally, give the session control to the session manager
|
||||
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
||||
# if the KDEWM environment variable has been set, then it will be used as KDE's
|
||||
# window manager instead of kwin.
|
||||
# if KDEWM is not set, ksmserver will ensure kwin is started.
|
||||
# kwrapper is used to reduce startup time and memory usage
|
||||
# kwrapper does not return usefull error codes such as the exit code of ksmserver.
|
||||
# We only check for 255 which means that the ksmserver process could not be
|
||||
# started, any problems thereafter, e.g. ksmserver failing to initialize,
|
||||
# will remain undetected.
|
||||
test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
|
||||
kwrapper ksmserver $KDEWM
|
||||
if test $? -eq 255; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
|
||||
xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
fi
|
||||
|
||||
# wait if there's any crashhandler shown
|
||||
while dcop | grep -q ^drkonqi- ; do
|
||||
sleep 5
|
||||
done
|
||||
|
||||
echo 'startkde: Shutting down...' 1>&2
|
||||
|
||||
# Clean up
|
||||
kdeinit_shutdown
|
||||
dcopserver_shutdown --wait
|
||||
artsshell -q terminate
|
||||
|
||||
echo 'startkde: Running shutdown scripts...' 1>&2
|
||||
|
||||
# Run scripts found in $KDEDIRS/shutdown
|
||||
for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
|
||||
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
|
||||
test -x "$prefix$file" && "$prefix$file"
|
||||
done
|
||||
done
|
||||
|
||||
unset KDE_FULL_SESSION
|
||||
xprop -root -remove KDE_FULL_SESSION
|
||||
unset KDE_SESSION_UID
|
||||
|
||||
echo 'startkde: Done.' 1>&2
|
||||
@ -0,0 +1,10 @@
|
||||
diff -Naur kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop
|
||||
--- kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop 2008-08-19 21:16:59.000000000 +0300
|
||||
+++ kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop 2009-12-22 00:51:57.122282682 +0200
|
||||
@@ -71,5 +71,5 @@
|
||||
Name[wa]=Ositer e såvrité
|
||||
Name[zh_CN]=安全删除
|
||||
Name[zh_TW]=安全的移除
|
||||
-Exec=kio_media_mounthelper -s %u
|
||||
+Exec=kio_media_mounthelper -u %u
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig 2011-02-04 16:20:42.266474457 +0000
|
||||
+++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp 2011-02-04 16:21:33.580473069 +0000
|
||||
@@ -520,7 +520,7 @@
|
||||
medium->mountableState(
|
||||
libhal_volume_get_device_file(halVolume), /* Device node */
|
||||
clearUdiString,
|
||||
- libhal_volume_get_mount_point(halClearVolume), /* Mount point */
|
||||
+ TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)), /* Mount point */
|
||||
libhal_volume_get_fstype(halClearVolume), /* Filesystem type */
|
||||
libhal_volume_is_mounted(halClearVolume) ); /* Mounted ? */
|
||||
else
|
||||
@ -0,0 +1,9 @@
|
||||
[Desktop Entry]
|
||||
Name=NetApplet
|
||||
Comment=Network monitoring applet
|
||||
Exec=/usr/bin/net_applet
|
||||
Icon=/usr/share/libDrakX/pixmaps/connected.png
|
||||
Type=Application
|
||||
Categories=GTK;System;Monitor;X-MandrivaLinux-CrossDesktop;
|
||||
X-KDE-autostart-after=kdesktop
|
||||
StartupNotify=false
|
||||
@ -0,0 +1,5 @@
|
||||
[Desktop Entry]
|
||||
Type=MimeType
|
||||
Comment=urpmi file
|
||||
MimeType=application/x-urpmi;
|
||||
Patterns=*.urpmi;
|
||||
@ -0,0 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Exec=xsettings-kde
|
||||
Name=XSettings-KDE
|
||||
X-KDE-autostart-after=kdesktop
|
||||
Type=Service
|
||||
OnlyShowIn=KDE;
|
||||
@ -0,0 +1 @@
|
||||
^.(/opt/kde3/lib/.*.so|/opt/kde3/lib/kde3/.*.so)
|
||||
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
ldconfig -X
|
||||
@ -0,0 +1,20 @@
|
||||
--- kdelibs-3.3.2/kio/kfile/kurlbar.cpp-- 2004-12-29 16:50:52.814327086 +0100
|
||||
+++ kdelibs-3.3.2/kio/kfile/kurlbar.cpp 2004-12-29 16:52:25.597617064 +0100
|
||||
@@ -90,7 +90,7 @@ KURLBarItem::KURLBarItem( KURLBar *paren
|
||||
m_url( url ),
|
||||
m_pixmap( 0L ),
|
||||
m_parent( parent ),
|
||||
- m_appLocal( true )
|
||||
+ m_appLocal( false )
|
||||
{
|
||||
init( icon, group, description, persistent );
|
||||
}
|
||||
@@ -102,7 +102,7 @@ KURLBarItem::KURLBarItem( KURLBar *paren
|
||||
m_url( url ),
|
||||
m_pixmap( 0L ),
|
||||
m_parent( parent ),
|
||||
- m_appLocal( true )
|
||||
+ m_appLocal( false )
|
||||
{
|
||||
init( icon, group, description, true /*persistent*/ );
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
Submitted By: zippo zippo@oppiz.net
|
||||
Initial Package Version: kdelibs-3.5.8
|
||||
Date: 2007-12-29
|
||||
Upstream Status: Unknown
|
||||
Origin: zippo zippo@oppiz.net
|
||||
Description: Fixes a LDFLAGS and RPATH issued in locating the QT library.
|
||||
|
||||
--- kdelibs-3.5.10/dcop/dcopidl/Makefile.am~ 2008-08-19 21:18:18.000000000 +0300
|
||||
+++ kdelibs-3.5.10/dcop/dcopidl/Makefile.am 2010-02-15 16:13:22.596733866 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
noinst_HEADERS = yacc.cc.h
|
||||
|
||||
dcopidl_LDADD = $(LIB_QT)
|
||||
-dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
|
||||
+dcopidl_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
|
||||
|
||||
####### Build rules
|
||||
|
||||
--- kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am~ 2008-08-19 21:18:18.000000000 +0300
|
||||
+++ kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am 2010-02-15 16:13:56.370163020 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
noinst_HEADERS = main.h
|
||||
|
||||
dcopidl2cpp_LDADD = $(LIB_QT)
|
||||
-dcopidl2cpp_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
|
||||
+dcopidl2cpp_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
|
||||
|
||||
dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
|
||||
../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdelibs-3.5.12/kdeui/ktip.cpp.orig 2011-02-04 11:30:10.042474496 +0000
|
||||
+++ kdelibs-3.5.12/kdeui/ktip.cpp 2011-02-04 11:30:30.506474344 +0000
|
||||
@@ -302,7 +302,7 @@
|
||||
hbox2->addWidget(ok);
|
||||
|
||||
KConfigGroup config(kapp->config(), "TipOfDay");
|
||||
- mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true));
|
||||
+ mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", false));
|
||||
|
||||
connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip()));
|
||||
connect(prev, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevTip()));
|
||||
@ -0,0 +1,11 @@
|
||||
--- kdelibs-3.5.2/admin/acinclude.m4.in-- 2006-05-03 16:06:13.000000000 +0200
|
||||
+++ kdelibs-3.5.2/admin/acinclude.m4.in 2006-05-03 16:06:22.000000000 +0200
|
||||
@@ -492,7 +492,7 @@
|
||||
xdg_appsdir='\${datadir}/applications/kde'
|
||||
fi
|
||||
if test -z "$xdg_menudir"; then
|
||||
- xdg_menudir='\${sysconfdir}/xdg/menus'
|
||||
+ xdg_menudir='\${sysconfdir}/xdg/kde/menus'
|
||||
fi
|
||||
if test -z "$xdg_directorydir"; then
|
||||
xdg_directorydir='\${datadir}/desktop-directories'
|
||||
@ -0,0 +1,30 @@
|
||||
--- kdelibs-3.5.3/kio/kfile/kpropertiesdialog.cpp.orig 2006-02-03 13:46:21.000000000 -0200
|
||||
+++ kdelibs-3.5.3/kio/kfile/kpropertiesdialog.cpp 2006-07-14 11:11:18.000000000 -0300
|
||||
@@ -2024,6 +2024,7 @@
|
||||
}
|
||||
|
||||
// Draw Checkboxes
|
||||
+ bool allDisable = true;
|
||||
TQCheckBox *cba[3][4];
|
||||
for (int row = 0; row < 3 ; ++row) {
|
||||
for (int col = 0; col < 4; ++col) {
|
||||
@@ -2039,6 +2040,8 @@
|
||||
else if (d->cbRecursive && d->cbRecursive->isChecked())
|
||||
cb->setTristate();
|
||||
|
||||
+ if( d->canChangePermissions)
|
||||
+ allDisable = false;
|
||||
cb->setEnabled( d->canChangePermissions );
|
||||
gl->addWidget (cb, row+2, col+1);
|
||||
switch(col) {
|
||||
@@ -2095,6 +2098,10 @@
|
||||
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+ if ( allDisable )
|
||||
+ dlg.enableButtonOK( false );
|
||||
+
|
||||
if (dlg.exec() != KDialogBase::Accepted)
|
||||
return;
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
--- kdecore/klocale.cpp.orig 2011-02-04 10:59:25.234472351 +0000
|
||||
+++ kdecore/klocale.cpp 2011-02-04 11:01:08.952473215 +0000
|
||||
@@ -138,7 +138,10 @@
|
||||
if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
|
||||
d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
|
||||
d->catalogNames.append( "kio" ); // always include kio.mo
|
||||
+ KGlobal::dirs()->addResourceDir("locale", "/usr/share/locale");
|
||||
+ d->catalogNames.append( "kickoff" );
|
||||
d->catalogNames.append( "xdg-user-dirs" );
|
||||
+ d->catalogNames.append( "mandriva-kde-translation" );
|
||||
}
|
||||
updateCatalogues(); // evaluate this for all languages
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.orig 2007-08-23 14:53:00.000000000 -0300
|
||||
+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-08-23 17:40:02.000000000 -0300
|
||||
@@ -13,6 +13,9 @@
|
||||
static char pwdstring[33];
|
||||
static int cups_local_auth(http_t *http);
|
||||
|
||||
+const char* cupsGetConf( void );
|
||||
+int cupsPutConf( const char* );
|
||||
+
|
||||
const char * /* O - Filename for PPD file */
|
||||
cupsGetConf(void)
|
||||
{
|
||||
@@ -29,6 +32,8 @@
|
||||
char prompt[1024]; /* Prompt string */
|
||||
int digest_tries; /* Number of tries with Digest */
|
||||
static char filename[HTTP_MAX_URI]; /* Local filename */
|
||||
+ char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
|
||||
+
|
||||
|
||||
/*
|
||||
* Connect to the correct server as needed...
|
||||
@@ -108,15 +113,15 @@
|
||||
* See if we should retry the current digest password...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
|
||||
+ if (strncmp( httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0 ||
|
||||
digest_tries > 1 || !pwdstring[0])
|
||||
{
|
||||
/*
|
||||
* Nope - get a password from the user...
|
||||
*/
|
||||
+ httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
|
||||
|
||||
- snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
||||
- cups_server->hostname);
|
||||
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), fqdn );
|
||||
|
||||
if ((password = cupsGetPassword(prompt)) == NULL)
|
||||
break;
|
||||
@@ -135,7 +140,7 @@
|
||||
* Got a password; encode it for the server...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
|
||||
+ if (strncmp( httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0)
|
||||
{
|
||||
/*
|
||||
* Basic authentication...
|
||||
@@ -210,7 +215,7 @@
|
||||
* OK, we need to copy the file...
|
||||
*/
|
||||
|
||||
- while ((bytes = httpRead(cups_server, buffer, sizeof(buffer))) > 0)
|
||||
+ while ((bytes = httpRead2(cups_server, buffer, sizeof(buffer))) > 0)
|
||||
{
|
||||
write(fd, buffer, bytes);
|
||||
}
|
||||
@@ -235,6 +240,7 @@
|
||||
http_status_t status; /* HTTP status from server */
|
||||
char prompt[1024]; /* Prompt string */
|
||||
int digest_tries; /* Number of tries with Digest */
|
||||
+ char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
|
||||
|
||||
if (name == NULL)
|
||||
return 0;
|
||||
@@ -305,11 +311,11 @@
|
||||
break;
|
||||
}
|
||||
else
|
||||
- httpWrite(cups_server, buffer, bytes);
|
||||
+ httpWrite2(cups_server, buffer, bytes);
|
||||
|
||||
if (status == HTTP_CONTINUE)
|
||||
{
|
||||
- httpWrite(cups_server, buffer, 0);
|
||||
+ httpWrite2(cups_server, buffer, 0);
|
||||
while ((status = httpUpdate(cups_server)) == HTTP_CONTINUE);
|
||||
}
|
||||
|
||||
@@ -334,15 +340,16 @@
|
||||
* See if we should retry the current digest password...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
|
||||
+ if (strncmp( httpGetField ( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0 ||
|
||||
digest_tries > 1 || !pwdstring[0])
|
||||
{
|
||||
/*
|
||||
* Nope - get a password from the user...
|
||||
*/
|
||||
|
||||
- snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
||||
- cups_server->hostname);
|
||||
+
|
||||
+ httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
|
||||
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), fqdn );
|
||||
|
||||
if ((password = cupsGetPassword(prompt)) == NULL)
|
||||
break;
|
||||
@@ -361,7 +368,7 @@
|
||||
* Got a password; encode it for the server...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
|
||||
+ if (strncmp(httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0)
|
||||
{
|
||||
/*
|
||||
* Basic authentication...
|
||||
@@ -492,3 +499,4 @@
|
||||
|
||||
return (1);
|
||||
}
|
||||
+
|
||||
--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.orig 2007-08-23 17:56:12.000000000 -0300
|
||||
+++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp 2007-08-23 17:57:53.000000000 -0300
|
||||
@@ -310,7 +310,7 @@
|
||||
}
|
||||
|
||||
#ifdef HAVE_CUPS_NO_PWD_CACHE
|
||||
- strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
|
||||
+ httpSetAuthString( HTTP, NULL, cups_authstring.data() );
|
||||
#endif
|
||||
|
||||
if (dump_ > 0)
|
||||
@@ -320,7 +320,7 @@
|
||||
|
||||
request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
|
||||
#ifdef HAVE_CUPS_NO_PWD_CACHE
|
||||
- cups_authstring = HTTP->authstring;
|
||||
+ cups_authstring = httpGetAuthString( HTTP );
|
||||
#endif
|
||||
httpClose(HTTP);
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- kio/bookmarks/kbookmarkmanager.cc~ 2007-10-06 16:11:19.000000000 +0200
|
||||
+++ kio/bookmarks/kbookmarkmanager.cc 2007-10-06 16:11:19.000000000 +0200
|
||||
@@ -706,7 +706,7 @@
|
||||
config.setGroup("Bookmarks");
|
||||
|
||||
// add bookmark dialog usage - no reparse
|
||||
- s_self->m_advancedaddbookmark = config.readBoolEntry("AdvancedAddBookmarkDialog", false);
|
||||
+ s_self->m_advancedaddbookmark = config.readBoolEntry("AdvancedAddBookmarkDialog", true);
|
||||
|
||||
// these three alter the menu, therefore all need a reparse
|
||||
s_self->m_contextmenu = config.readBoolEntry("ContextMenuActions", true);
|
||||
@ -0,0 +1,63 @@
|
||||
--- kdelibs-3.5.9/kio/kfile/kpropertiesdialog.cpp.orig 2008-02-28 09:52:00.000000000 -0300
|
||||
+++ kdelibs-3.5.9/kio/kfile/kpropertiesdialog.cpp 2008-02-28 10:05:56.000000000 -0300
|
||||
@@ -1771,27 +1771,31 @@
|
||||
strUser = user->pw_name;
|
||||
|
||||
#ifdef Q_OS_UNIX
|
||||
- setgrent();
|
||||
- for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++)
|
||||
- {
|
||||
- if (IamRoot)
|
||||
- groupList += TQString::fromLatin1(ge->gr_name);
|
||||
- else
|
||||
- {
|
||||
- /* pick the groups to which the user belongs */
|
||||
- char ** members = ge->gr_mem;
|
||||
- char * member;
|
||||
- while ((member = *members) != 0L) {
|
||||
- if (strUser == member) {
|
||||
- groupList += TQString::fromLocal8Bit(ge->gr_name);
|
||||
- break;
|
||||
- }
|
||||
- ++members;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- endgrent();
|
||||
-#endif //Q_OS_UNIX
|
||||
+
|
||||
+ gid_t *groups = NULL;
|
||||
+ int ng = 1;
|
||||
+ struct group *mygroup;
|
||||
+ gid_t *newgroups = NULL;
|
||||
+
|
||||
+ groups = (gid_t *) malloc(ng * sizeof(gid_t));
|
||||
+
|
||||
+ if (getgrouplist(strUser, user->pw_gid, groups, &ng) == -1) {
|
||||
+ newgroups = (gid_t *) malloc(ng * sizeof(gid_t));
|
||||
+ if (newgroups != NULL) {
|
||||
+ free(groups);
|
||||
+ groups = newgroups;
|
||||
+ getgrouplist(strUser, user->pw_gid, groups, &ng);
|
||||
+ } else ng = 1;
|
||||
+ }
|
||||
+
|
||||
+ for (i = 0; i < ng; i++) {
|
||||
+ mygroup = getgrgid(groups[i]);
|
||||
+ if (mygroup != NULL) groupList += TQString::fromLocal8Bit(mygroup->gr_name);
|
||||
+ }
|
||||
+
|
||||
+ free(groups);
|
||||
+
|
||||
+#else //Q_OS_UNIX
|
||||
|
||||
/* add the effective Group to the list .. */
|
||||
ge = getgrgid (getegid());
|
||||
@@ -1802,6 +1806,7 @@
|
||||
if (groupList.find(name) == groupList.end())
|
||||
groupList += name;
|
||||
}
|
||||
+#endif //Q_OS_UNIX
|
||||
|
||||
bool isMyGroup = groupList.contains(strGroup);
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,52 @@
|
||||
there appeared some kind of leak or memory overwrite, or double destruct, can't
|
||||
track down where it came from, only thing done (to my knowledge) was to rebuild
|
||||
kde packages due newer dependencies in distro. maybe gcc overoptimizes, but
|
||||
rebuild with gcc 4.4.2 did not help.
|
||||
|
||||
crash happens when kmail send mail window is destructed (you hit send mail
|
||||
button)
|
||||
|
||||
Program received signal SIGSEGV, Segmentation fault.
|
||||
0x00007ffff6dba027 in DCOPObject::~DCOPObject (this=0xdf03b8, __in_chrg=<value optimized out>) at dcopobject.cpp:81
|
||||
81 if ( d->m_signalConnections > 0 && client )
|
||||
(gdb) bt
|
||||
#0 0x00007ffff6dba027 in DCOPObject::~DCOPObject (this=0xdf03b8, __in_chrg=<value optimized out>) at dcopobject.cpp:81
|
||||
#1 0x00007ffff77c6a6b in KMComposeWin::~KMComposeWin (this=0xdefd30, __in_chrg=<value optimized out>, __vtt_parm=<value optimized out>) at kmcomposewin.cpp:490
|
||||
#2 0x00007ffff66b911a in QObject::event(QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#3 0x00007ffff66ee013 in QWidget::event(QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#4 0x00007ffff665a865 in QApplication::internalNotify(QObject*, QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#5 0x00007ffff665b96e in QApplication::notify(QObject*, QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#6 0x00007ffff70aaf28 in KApplication::notify (this=0x7fffffffda10, receiver=0xdefd30, event=0xe72500) at kapplication.cpp:550
|
||||
#7 0x00007ffff665c263 in QApplication::sendPostedEvents(QObject*, int) () from /usr/lib64/libqt-mt.so.3
|
||||
#8 0x00007ffff660acad in QEventLoop::processEvents(unsigned int) () from /usr/lib64/libqt-mt.so.3
|
||||
#9 0x00007ffff6670ba9 in QEventLoop::enterLoop() () from /usr/lib64/libqt-mt.so.3
|
||||
#10 0x00007ffff6670a32 in QEventLoop::exec() () from /usr/lib64/libqt-mt.so.3
|
||||
#11 0x00000000004028cc in main (argc=3, argv=<value optimized out>) at main.cpp:110
|
||||
(gdb) p d
|
||||
$1 = (DCOPObject::DCOPObjectPrivate *) 0x0
|
||||
(gdb) p client
|
||||
$2 = <value optimized out>
|
||||
(gdb) l
|
||||
76 }
|
||||
77
|
||||
78 DCOPObject::~DCOPObject()
|
||||
79 {
|
||||
80 DCOPClient *client = DCOPClient::mainClient();
|
||||
81 if ( d->m_signalConnections > 0 && client )
|
||||
82 client->disconnectDCOPSignal( 0, 0, 0, objId(), 0 );
|
||||
83
|
||||
84 objMap()->remove(ident);
|
||||
85 delete d;
|
||||
(gdb)
|
||||
|
||||
--- kdelibs-3.5.10/dcop/dcopobject.cpp~ 2005-09-10 11:27:23.000000000 +0300
|
||||
+++ kdelibs-3.5.10/dcop/dcopobject.cpp 2010-01-30 07:56:50.818689543 +0200
|
||||
@@ -78,7 +78,7 @@
|
||||
DCOPObject::~DCOPObject()
|
||||
{
|
||||
DCOPClient *client = DCOPClient::mainClient();
|
||||
- if ( d->m_signalConnections > 0 && client )
|
||||
+ if (d && d->m_signalConnections > 0 && client )
|
||||
client->disconnectDCOPSignal( 0, 0, 0, objId(), 0 );
|
||||
|
||||
objMap()->remove(ident);
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEnDCCBAWgAwIBAgIQdTN9mrDhIzuuLX3kRpFi1DANBgkqhkiG9w0BAQUFADBf
|
||||
MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT
|
||||
LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
|
||||
HhcNMDUwMTE5MDAwMDAwWhcNMTUwMTE4MjM1OTU5WjCBsDELMAkGA1UEBhMCVVMx
|
||||
FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
|
||||
dCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cu
|
||||
dmVyaXNpZ24uY29tL3JwYSAoYykwNTEqMCgGA1UEAxMhVmVyaVNpZ24gQ2xhc3Mg
|
||||
MyBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
|
||||
AQEAlcMhEo5AxQ0BX3ZeZpTZcyxYGSK4yfx6OZAqd3J8HT732FXjr0LLhzAC3Fus
|
||||
cOa4RLQrNeuT0hcFfstG1lxToDJRnXRkWPkMmgDqXkRJZHL0zRDihQr5NO6ziGap
|
||||
paRa0A6Yf1gNK1K7hql+LvqySHyN2y1fAXWijQY7i7RhB8m+Ipn4G9G1V2YETTX0
|
||||
kXGWtZkIJZuXyDrzILHdnpgMSmO3ps6wAc74k2rzDG6fsemEe4GYQeaB3D0s57Rr
|
||||
4578CBbXs9W5ZhKZfG1xyE2+xw/j+zet1XWHIWuG0EQUWlR5OZZpVsm5Mc2JYVjh
|
||||
2XYFBa33uQKvp/1HkaIiNFox0QIDAQABo4IBgTCCAX0wEgYDVR0TAQH/BAgwBgEB
|
||||
/wIBADBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYBBQUHAgEWHGh0
|
||||
dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwMQYDVR0fBCowKDAmoCSgIoYgaHR0
|
||||
cDovL2NybC52ZXJpc2lnbi5jb20vcGNhMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBEG
|
||||
CWCGSAGG+EIBAQQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgGA1UEAxMRQ2xhc3Mz
|
||||
Q0EyMDQ4LTEtNDUwHQYDVR0OBBYEFG/sr6DdiqTv9SoQZy0/VYK81+8lMIGABgNV
|
||||
HSMEeTB3oWOkYTBfMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIElu
|
||||
Yy4xNzA1BgNVBAsTLkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlv
|
||||
biBBdXRob3JpdHmCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQEFBQADgYEA
|
||||
w34IRl2RNs9n3Nenr6+4IsOLBHTTsWC85v63RBKBWzFzFGNWxnIu0RoDQ1w4ClBK
|
||||
Tc3athmo9JkNr+P32PF1KGX2av6b9L1S2T/L2hbLpZ4ujmZSeD0m+v6UNohKlV4q
|
||||
TBnvbvqCPy0D79YoszcYz0KyNCFkR9MgazpM3OYDkAw=
|
||||
-----END CERTIFICATE-----
|
||||
@ -0,0 +1,29 @@
|
||||
Many of the Mandriva TDE packages don't currently build without manual intervention.
|
||||
This is largely being caused by automake/autoconf issues which i'm expecting to be
|
||||
solved by the cmake migration in Trinity 3.5.13. Therefore, rather than spend a lot
|
||||
of time trying to fix an obsolete build process, i've got a procedure to work around
|
||||
the problem so that working Trinity packages can be built.
|
||||
|
||||
The build problem is caused compilation failures at a number of points in the build
|
||||
process, with the linker being unable to find various QT classes. This is being
|
||||
caused by an option in the compilation command "-Wl,--as-needed", this option only
|
||||
gets added to the compilation options when the build process is initiated by
|
||||
rpmbuild, if I use the ./configure command with the same options and build the
|
||||
sources manually, then this option is never added and the packages compile normally.
|
||||
Therefore, it is being added by something in the rpmbuild process. So, the current
|
||||
build procedure is:
|
||||
|
||||
1) execute
|
||||
rpmbuild -ba <spec file>
|
||||
as normal.
|
||||
2) If the build process crashes with the qt linking errors, switch to the build
|
||||
directory to perform a manual build.
|
||||
3) ensure /opt/kde3/bin is in the PATH environment variable.
|
||||
4) re-run ./configure, using the options stored in the config.log file.
|
||||
5) start make again. You might need to do a "make clean" if the build still fails
|
||||
with the same error.
|
||||
6) return to the SPEC's directory and execute
|
||||
rpmbuild -bi --short-circuit=i <spec file>
|
||||
followed by
|
||||
rpmbuild -ba --short-circuit=i <spec file>
|
||||
7) You should now have the RPM packages.
|
||||
Loading…
Reference in new issue